1 files changed, 194 insertions, 163 deletions

diff --git a/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
index a4d4885..198b00e 100644
--- a/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
+++ b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
@@ -66,19 +66,8 @@ by default.
  ui/views/examples/webview_example.cc          |  2 +-
  54 files changed, 89 insertions(+), 87 deletions(-)
 
---- a/ash/components/geolocation/simple_geolocation_provider.cc
-+++ b/ash/components/geolocation/simple_geolocation_provider.cc
-@@ -20,7 +20,7 @@ namespace ash {
- namespace {
- 
- const char kDefaultGeolocationProviderUrl[] =
--    "https://www.googleapis.com/geolocation/v1/geolocate?";
-+    "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?";
- 
- }  // namespace
- 
---- a/build/apple/tweak_info_plist.py
-+++ b/build/apple/tweak_info_plist.py
+--- build/apple/tweak_info_plist.py.orig
++++ build/apple/tweak_info_plist.py
 @@ -195,7 +195,7 @@ def _AddKeystoneKeys(plist, bundle_ident
    also requires the |bundle_identifier| argument (com.example.product)."""
    plist['KSVersion'] = plist['CFBundleShortVersionString']
@@ -88,9 +77,9 @@ by default.
  
    _RemoveKeys(plist, 'KSChannelID')
    if base_tag != '':
---- a/chrome/browser/ash/customization/customization_document.cc
-+++ b/chrome/browser/ash/customization/customization_document.cc
-@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const b
+--- chrome/browser/ash/customization/customization_document.cc.orig
++++ chrome/browser/ash/customization/customization_document.cc
+@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const b
  
  // Template URL where to fetch OEM services customization manifest from.
  const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -99,9 +88,9 @@ by default.
  
  // A custom extensions::ExternalLoader that the ServicesCustomizationDocument
  // creates and uses to publish OEM default apps to the extensions system.
---- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
-+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
-@@ -92,7 +92,7 @@ namespace {
+--- chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc.orig
++++ chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+@@ -87,7 +87,7 @@ namespace {
  
  using api::file_manager_private::ProfileInfo;
  
@@ -110,8 +99,8 @@ by default.
  
  // Thresholds for mountCrostini() API.
  constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
---- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
-+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+--- chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc.orig
++++ chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
 @@ -52,8 +52,8 @@ namespace {
  
  const char kGoogleDotCom[] = "google.com";
@@ -123,9 +112,9 @@ by default.
  
  // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the
  // elements of |list| equals |hash|.
---- a/chrome/browser/extensions/install_signer.cc
-+++ b/chrome/browser/extensions/install_signer.cc
-@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
+--- chrome/browser/extensions/install_signer.cc.orig
++++ chrome/browser/extensions/install_signer.cc
+@@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2;
  const size_t kSaltBytes = 32;
  
  const char kBackendUrl[] =
@@ -134,8 +123,8 @@ by default.
  
  const char kPublicKeyPEM[] =                                            \
      "-----BEGIN PUBLIC KEY-----"                                        \
---- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig
++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
 @@ -125,7 +125,7 @@ void OnURLLoadUploadProgress(uint64_t cu
  }  // namespace
  
@@ -145,8 +134,8 @@ by default.
  
  WebRtcEventLogUploaderImpl::Factory::Factory(
      scoped_refptr<base::SequencedTaskRunner> task_runner)
---- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig
++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
 @@ -485,7 +485,7 @@ void WebRtcLogUploader::UploadCompressed
              "Not implemented, it would be good to do so."
          })");
@@ -156,8 +145,8 @@ by default.
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = !upload_url_for_testing_.is_empty()
                                ? upload_url_for_testing_
---- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc
-+++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc
+--- chrome/browser/nacl_host/nacl_infobar_delegate.cc.orig
++++ chrome/browser/nacl_host/nacl_infobar_delegate.cc
 @@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetL
  }
  
@@ -167,8 +156,8 @@ by default.
  }
  
  std::u16string NaClInfoBarDelegate::GetMessageText() const {
---- a/chrome/browser/profiles/profile_avatar_downloader.cc
-+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
+--- chrome/browser/profiles/profile_avatar_downloader.cc.orig
++++ chrome/browser/profiles/profile_avatar_downloader.cc
 @@ -20,7 +20,7 @@
  
  namespace {
@@ -178,8 +167,8 @@ by default.
  }
  
  ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
---- a/chrome/browser/resources/default_apps/external_extensions.json
-+++ b/chrome/browser/resources/default_apps/external_extensions.json
+--- chrome/browser/resources/default_apps/external_extensions.json.orig
++++ chrome/browser/resources/default_apps/external_extensions.json
 @@ -23,17 +23,17 @@
    },
    // Google Sheets
@@ -201,9 +190,9 @@ by default.
    }
  }
  
---- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
-+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
-@@ -192,7 +192,7 @@ const int64_t DownloadFeedback::kMaxUplo
+--- chrome/browser/safe_browsing/download_protection/download_feedback.cc.orig
++++ chrome/browser/safe_browsing/download_protection/download_feedback.cc
+@@ -202,7 +202,7 @@ const int64_t DownloadFeedback::kMaxUplo
  
  // static
  const char DownloadFeedback::kSbFeedbackURL[] =
@@ -212,8 +201,8 @@ by default.
  
  // static
  DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
---- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig
++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 @@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDi
    DCHECK(!bdict_file.empty());
  
@@ -223,9 +212,9 @@ by default.
  
    return GURL(std::string(kDownloadServerUrl) +
                base::ToLowerASCII(bdict_file));
---- a/chrome/browser/supervised_user/supervised_user_service.cc
-+++ b/chrome/browser/supervised_user/supervised_user_service.cc
-@@ -86,7 +86,7 @@ namespace {
+--- chrome/browser/supervised_user/supervised_user_service.cc.orig
++++ chrome/browser/supervised_user/supervised_user_service.cc
+@@ -87,7 +87,7 @@ namespace {
  
  // The URL from which to download a host denylist if no local one exists yet.
  const char kDenylistURL[] =
@@ -234,9 +223,9 @@ by default.
  // The filename under which we'll store the denylist (in the user data dir). The
  // old file will be used as a backup in case the new file has not been loaded
  // yet.
---- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-@@ -50,7 +50,7 @@ const char* kUpdateBrowserRedirectUrl =
+--- chrome/browser/ui/views/outdated_upgrade_bubble_view.cc.orig
++++ chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+@@ -54,7 +54,7 @@ const char* kUpdateBrowserRedirectUrl =
  #else
      // The URL to be used to re-install Chrome when auto-update failed for
      // too long.
@@ -245,9 +234,9 @@ by default.
  #endif
  
  bool g_upgrade_bubble_is_showing = false;
---- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -71,17 +71,17 @@ namespace {
+--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc.orig
++++ chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+@@ -67,17 +67,17 @@ namespace {
  // The URL for the the Learn More page shown on incognito new tab.
  const char kLearnMoreIncognitoUrl[] =
  #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -269,8 +258,8 @@ by default.
  #endif
  
  std::string ReplaceTemplateExpressions(
---- a/chrome/chrome_cleaner/components/recovery_component.cc
-+++ b/chrome/chrome_cleaner/components/recovery_component.cc
+--- chrome/chrome_cleaner/components/recovery_component.cc.orig
++++ chrome/chrome_cleaner/components/recovery_component.cc
 @@ -37,7 +37,7 @@ namespace chrome_cleaner {
  namespace {
  
@@ -280,8 +269,8 @@ by default.
      "&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm"
      "%26v%3D0.0.0.0%26uc&acceptformat=crx3";
  
---- a/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
-+++ b/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
+--- chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc.orig
++++ chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
 @@ -28,7 +28,7 @@
  namespace {
  
@@ -291,8 +280,8 @@ by default.
  
  // Whether the current process is connected to a crash handler process.
  bool g_is_connected_to_crash_handler = false;
---- a/chrome/common/extensions/chrome_extensions_client.cc
-+++ b/chrome/common/extensions/chrome_extensions_client.cc
+--- chrome/common/extensions/chrome_extensions_client.cc.orig
++++ chrome/common/extensions/chrome_extensions_client.cc
 @@ -45,9 +45,9 @@ namespace {
  
  // TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS.
@@ -303,10 +292,10 @@ by default.
 -    "https://www.gstatic.com/chrome/extensions/blocklist";
 +    "trk:270:https://www.gstatic.com/chrome/extensions/blocklist";
  
- }  // namespace
+ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
  
---- a/chrome/installer/setup/google_chrome_behaviors.cc
-+++ b/chrome/installer/setup/google_chrome_behaviors.cc
+--- chrome/installer/setup/google_chrome_behaviors.cc.orig
++++ chrome/installer/setup/google_chrome_behaviors.cc
 @@ -37,7 +37,7 @@ namespace installer {
  namespace {
  
@@ -316,8 +305,19 @@ by default.
  
  bool NavigateToUrlWithEdge(const std::wstring& url) {
    std::wstring protocol_url = L"microsoft-edge:" + url;
---- a/chromecast/crash/linux/minidump_uploader.cc
-+++ b/chromecast/crash/linux/minidump_uploader.cc
+--- chromecast/browser/service/cast_service_simple.cc.orig
++++ chromecast/browser/service/cast_service_simple.cc
+@@ -27,7 +27,7 @@ GURL GetStartupURL() {
+   const base::CommandLine::StringVector& args = command_line->GetArgs();
+ 
+   if (args.empty())
+-    return GURL("http://www.google.com/");
++    return GURL("trk:255:http://www.google.com/");
+ 
+   GURL url(args[0]);
+   if (url.is_valid() && url.has_scheme())
+--- chromecast/crash/linux/minidump_uploader.cc.orig
++++ chromecast/crash/linux/minidump_uploader.cc
 @@ -41,7 +41,7 @@ namespace {
  
  const char kProductName[] = "Eureka";
@@ -327,8 +327,19 @@ by default.
  
  const char kVirtualChannel[] = "virtual-channel";
  
---- a/components/cloud_devices/common/cloud_devices_urls.cc
-+++ b/components/cloud_devices/common/cloud_devices_urls.cc
+--- chromeos/geolocation/simple_geolocation_provider.cc.orig
++++ chromeos/geolocation/simple_geolocation_provider.cc
+@@ -20,7 +20,7 @@ namespace chromeos {
+ namespace {
+ 
+ const char kDefaultGeolocationProviderUrl[] =
+-    "https://www.googleapis.com/geolocation/v1/geolocate?";
++    "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?";
+ 
+ }  // namespace
+ 
+--- components/cloud_devices/common/cloud_devices_urls.cc.orig
++++ components/cloud_devices/common/cloud_devices_urls.cc
 @@ -13,14 +13,14 @@
  namespace cloud_devices {
  
@@ -346,8 +357,8 @@ by default.
  
  }
  
---- a/components/drive/service/drive_api_service.cc
-+++ b/components/drive/service/drive_api_service.cc
+--- components/drive/service/drive_api_service.cc.orig
++++ components/drive/service/drive_api_service.cc
 @@ -75,9 +75,9 @@ namespace drive {
  namespace {
  
@@ -360,9 +371,9 @@ by default.
  const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
  
  // Mime type to create a directory.
---- a/components/feedback/feedback_uploader.cc
-+++ b/components/feedback/feedback_uploader.cc
-@@ -39,7 +39,7 @@ constexpr base::FilePath::CharType kFeed
+--- components/feedback/feedback_uploader.cc.orig
++++ components/feedback/feedback_uploader.cc
+@@ -27,7 +27,7 @@ constexpr base::FilePath::CharType kFeed
      FILE_PATH_LITERAL("Feedback Reports");
  
  constexpr char kFeedbackPostUrl[] =
@@ -371,9 +382,9 @@ by default.
  
  constexpr char kProtoBufMimeType[] = "application/x-protobuf";
  
---- a/components/google/core/common/google_util.cc
-+++ b/components/google/core/common/google_util.cc
-@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
+--- components/google/core/common/google_util.cc.orig
++++ components/google/core/common/google_util.cc
+@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
  
  // Global functions -----------------------------------------------------------
  
@@ -382,9 +393,9 @@ by default.
  
  bool HasGoogleSearchQueryParam(base::StringPiece str) {
    url::Component query(0, static_cast<int>(str.length())), key, value;
---- a/components/history/core/browser/web_history_service.cc
-+++ b/components/history/core/browser/web_history_service.cc
-@@ -43,13 +43,13 @@ namespace history {
+--- components/history/core/browser/web_history_service.cc.orig
++++ components/history/core/browser/web_history_service.cc
+@@ -42,13 +42,13 @@ namespace history {
  namespace {
  
  const char kHistoryOAuthScope[] =
@@ -401,8 +412,8 @@ by default.
  
  const char kHistoryAudioHistoryUrl[] =
      "https://history.google.com/history/api/lookup?client=audio";
---- a/components/metrics/url_constants.cc
-+++ b/components/metrics/url_constants.cc
+--- components/metrics/url_constants.cc.orig
++++ components/metrics/url_constants.cc
 @@ -7,7 +7,7 @@
  namespace metrics {
  
@@ -412,8 +423,8 @@ by default.
  
  const char kNewMetricsServerUrlInsecure[] =
      "http://clientservices.googleapis.com/uma/v2";
---- a/components/safe_browsing/content/browser/client_side_detection_service.cc
-+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
+--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
++++ components/safe_browsing/content/browser/client_side_detection_service.cc
 @@ -62,7 +62,7 @@ const int ClientSideDetectionService::kN
  const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
  
@@ -423,8 +434,8 @@ by default.
  
  struct ClientSideDetectionService::ClientPhishingReportInfo {
    std::unique_ptr<network::SimpleURLLoader> loader;
---- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
-+++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc
+--- components/safe_search_api/safe_search/safe_search_url_checker_client.cc.orig
++++ components/safe_search_api/safe_search/safe_search_url_checker_client.cc
 @@ -28,7 +28,7 @@ namespace safe_search_api {
  namespace {
  
@@ -434,8 +445,8 @@ by default.
  const char kDataContentType[] = "application/x-www-form-urlencoded";
  const char kDataFormat[] = "key=%s&urls=%s";
  
---- a/components/safe_search_api/stub_url_checker.cc
-+++ b/components/safe_search_api/stub_url_checker.cc
+--- components/safe_search_api/stub_url_checker.cc.orig
++++ components/safe_search_api/stub_url_checker.cc
 @@ -21,7 +21,7 @@ namespace safe_search_api {
  namespace {
  
@@ -444,9 +455,9 @@ by default.
 +    "trk:238:https://safesearch.googleapis.com/v1:classify";
  
  std::string BuildResponse(bool is_porn) {
-   base::Value dict(base::Value::Type::DICTIONARY);
---- a/components/translate/core/browser/translate_url_fetcher.cc
-+++ b/components/translate/core/browser/translate_url_fetcher.cc
+   base::DictionaryValue dict;
+--- components/translate/core/browser/translate_url_fetcher.cc.orig
++++ components/translate/core/browser/translate_url_fetcher.cc
 @@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
    if (!extra_request_header_.empty())
      resource_request->headers.AddHeaderFromString(extra_request_header_);
@@ -455,9 +466,9 @@ by default.
    simple_loader_ =
        variations::CreateSimpleURLLoaderWithVariationsHeaderUnknownSignedIn(
            std::move(resource_request),
---- a/components/translate/core/common/translate_util.cc
-+++ b/components/translate/core/common/translate_util.cc
-@@ -21,7 +21,7 @@ const char kDetectLanguageInSubFrames[]
+--- components/translate/core/common/translate_util.cc.orig
++++ components/translate/core/common/translate_util.cc
+@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[]
  
  }  // namespace
  
@@ -466,8 +477,8 @@ by default.
  
  const base::Feature kTranslateSubFrames{"TranslateSubFrames",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
---- a/components/variations/variations_url_constants.cc
-+++ b/components/variations/variations_url_constants.cc
+--- components/variations/variations_url_constants.cc.orig
++++ components/variations/variations_url_constants.cc
 @@ -8,7 +8,7 @@ namespace variations {
  
  // Default server of Variations seed info.
@@ -477,8 +488,8 @@ by default.
  
  const char kDefaultInsecureServerUrl[] =
      "http://clientservices.googleapis.com/chrome-variations/seed";
---- a/content/browser/speech/speech_recognition_engine.cc
-+++ b/content/browser/speech/speech_recognition_engine.cc
+--- content/browser/speech/speech_recognition_engine.cc.orig
++++ content/browser/speech/speech_recognition_engine.cc
 @@ -33,7 +33,7 @@ namespace content {
  namespace {
  
@@ -488,9 +499,9 @@ by default.
  const char kDownstreamUrl[] = "/down?";
  const char kUpstreamUrl[] = "/up?";
  
---- a/content/browser/webauth/authenticator_common.cc
-+++ b/content/browser/webauth/authenticator_common.cc
-@@ -91,9 +91,9 @@ enum class RequestExtension {
+--- content/browser/webauth/authenticator_common.cc.orig
++++ content/browser/webauth/authenticator_common.cc
+@@ -88,9 +88,9 @@ enum class RequestExtension {
  namespace {
  
  constexpr char kGstaticAppId[] =
@@ -502,19 +513,19 @@ by default.
  
  WebAuthenticationDelegate* GetWebAuthenticationDelegate() {
    return GetContentClient()->browser()->GetWebAuthenticationDelegate();
---- a/content/shell/browser/shell_browser_main_parts.cc
-+++ b/content/shell/browser/shell_browser_main_parts.cc
-@@ -84,7 +84,7 @@ GURL GetStartupURL() {
+--- content/shell/browser/shell_browser_main_parts.cc.orig
++++ content/shell/browser/shell_browser_main_parts.cc
+@@ -96,7 +96,7 @@ GURL GetStartupURL() {
  #else
    const base::CommandLine::StringVector& args = command_line->GetArgs();
    if (args.empty())
 -    return GURL("https://www.google.com/");
 +    return GURL("trk:183:https://www.google.com/");
  
- #if BUILDFLAG(IS_WIN)
+ #if defined(OS_WIN)
    GURL url(base::WideToUTF16(args[0]));
---- a/extensions/common/extension_urls.cc
-+++ b/extensions/common/extension_urls.cc
+--- extensions/common/extension_urls.cc.orig
++++ extensions/common/extension_urls.cc
 @@ -26,9 +26,9 @@ bool IsSourceFromAnExtension(const std::
  
  namespace extension_urls {
@@ -527,9 +538,9 @@ by default.
  
  GURL GetWebstoreLaunchURL() {
    extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
---- a/google_apis/gaia/gaia_constants.cc
-+++ b/google_apis/gaia/gaia_constants.cc
-@@ -25,149 +25,149 @@ const char kSyncService[] = "chromiumsyn
+--- google_apis/gaia/gaia_constants.cc.orig
++++ google_apis/gaia/gaia_constants.cc
+@@ -25,133 +25,133 @@ const char kSyncService[] = "chromiumsyn
  const char kRemotingService[] = "chromoting";
  
  // OAuth scopes.
@@ -582,145 +593,125 @@ by default.
 -    "https://www.googleapis.com/auth/userinfo.profile";
 +    "trk:079:https://www.googleapis.com/auth/userinfo.profile";
  
- // OAuth2 scope for access to the parent approval widget.
- const char kParentApprovalOAuth2Scope[] =
--    "https://www.googleapis.com/auth/kids.parentapproval";
-+    "trk:080:https://www.googleapis.com/auth/kids.parentapproval";
- 
  // OAuth2 scope for access to the people API (read-only).
  const char kPeopleApiReadOnlyOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/peopleapi.readonly";
-+    "trk:081:https://www.googleapis.com/auth/peopleapi.readonly";
- 
- // OAuth2 scope for access to the programmatic challenge API (read-only).
- const char kProgrammaticChallengeOAuth2Scope[] =
--    "https://www.googleapis.com/auth/accounts.programmaticchallenge";
-+    "trk:082:https://www.googleapis.com/auth/accounts.programmaticchallenge";
++    "trk:080:https://www.googleapis.com/auth/peopleapi.readonly";
  
  // OAuth2 scope for access to the Reauth flow.
  const char kAccountsReauthOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/accounts.reauth";
-+    "trk:083:https://www.googleapis.com/auth/accounts.reauth";
++    "trk:081:https://www.googleapis.com/auth/accounts.reauth";
  
  // OAuth2 scope for access to audit recording (ARI).
  const char kAuditRecordingOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/auditrecording-pa";
-+    "trk:084:https://www.googleapis.com/auth/auditrecording-pa";
++    "trk:082:https://www.googleapis.com/auth/auditrecording-pa";
  
  // OAuth2 scope for access to clear cut logs.
 -const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog";
-+const char kClearCutOAuth2Scope[] = "trk:085:https://www.googleapis.com/auth/cclog";
++const char kClearCutOAuth2Scope[] = "trk:083:https://www.googleapis.com/auth/cclog";
  
  // OAuth2 scope for FCM, the Firebase Cloud Messaging service.
  const char kFCMOAuthScope[] =
 -    "https://www.googleapis.com/auth/firebase.messaging";
-+    "trk:086:https://www.googleapis.com/auth/firebase.messaging";
++    "trk:084:https://www.googleapis.com/auth/firebase.messaging";
  
  // OAuth2 scope for access to Tachyon api.
 -const char kTachyonOAuthScope[] = "https://www.googleapis.com/auth/tachyon";
-+const char kTachyonOAuthScope[] = "trk:087:https://www.googleapis.com/auth/tachyon";
++const char kTachyonOAuthScope[] = "trk:085:https://www.googleapis.com/auth/tachyon";
  
  // OAuth2 scope for access to the Photos API.
 -const char kPhotosOAuth2Scope[] = "https://www.googleapis.com/auth/photos";
-+const char kPhotosOAuth2Scope[] = "trk:088:https://www.googleapis.com/auth/photos";
++const char kPhotosOAuth2Scope[] = "trk:086:https://www.googleapis.com/auth/photos";
  
  // OAuth2 scope for access to Cast backdrop API.
  const char kCastBackdropOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/cast.backdrop";
-+    "trk:089:https://www.googleapis.com/auth/cast.backdrop";
++    "trk:087:https://www.googleapis.com/auth/cast.backdrop";
  
  // OAuth scope for access to Cloud Translation API.
  const char kCloudTranslationOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/cloud-translation";
-+    "trk:090:https://www.googleapis.com/auth/cloud-translation";
++    "trk:088:https://www.googleapis.com/auth/cloud-translation";
  
  // OAuth2 scope for access to passwords leak checking API.
  const char kPasswordsLeakCheckOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/identity.passwords.leak.check";
-+    "trk:091:https://www.googleapis.com/auth/identity.passwords.leak.check";
++    "trk:089:https://www.googleapis.com/auth/identity.passwords.leak.check";
  
  // OAuth2 scope for access to Chrome safe browsing API.
  const char kChromeSafeBrowsingOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/chrome-safe-browsing";
-+    "trk:092:https://www.googleapis.com/auth/chrome-safe-browsing";
++    "trk:090:https://www.googleapis.com/auth/chrome-safe-browsing";
  
  // OAuth2 scope for access to kid permissions by URL.
  const char kClassifyUrlKidPermissionOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/kid.permission";
-+    "trk:093:https://www.googleapis.com/auth/kid.permission";
++    "trk:091:https://www.googleapis.com/auth/kid.permission";
  const char kKidFamilyReadonlyOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/kid.family.readonly";
-+    "trk:094:https://www.googleapis.com/auth/kid.family.readonly";
++    "trk:092:https://www.googleapis.com/auth/kid.family.readonly";
  
  // OAuth2 scope for access to payments.
  const char kPaymentsOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/wallet.chrome";
-+    "trk:095:https://www.googleapis.com/auth/wallet.chrome";
++    "trk:093:https://www.googleapis.com/auth/wallet.chrome";
  
  const char kCryptAuthOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/cryptauth";
-+    "trk:096:https://www.googleapis.com/auth/cryptauth";
++    "trk:094:https://www.googleapis.com/auth/cryptauth";
  
  // OAuth2 scope for access to Drive.
 -const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive";
-+const char kDriveOAuth2Scope[] = "trk:097:https://www.googleapis.com/auth/drive";
++const char kDriveOAuth2Scope[] = "trk:095:https://www.googleapis.com/auth/drive";
  
  // The scope required for an access token in order to query ItemSuggest.
  const char kDriveReadOnlyOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/drive.readonly";
-+    "trk:098:https://www.googleapis.com/auth/drive.readonly";
++    "trk:096:https://www.googleapis.com/auth/drive.readonly";
  
  // OAuth2 scope for access to Assistant SDK.
  const char kAssistantOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/assistant-sdk-prototype";
-+    "trk:099:https://www.googleapis.com/auth/assistant-sdk-prototype";
++    "trk:097:https://www.googleapis.com/auth/assistant-sdk-prototype";
  
  // OAuth2 scope for access to nearby devices (fast pair) APIs.
  const char kCloudPlatformProjectsOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/cloudplatformprojects";
-+    "trk:100:https://www.googleapis.com/auth/cloudplatformprojects";
++    "trk:098:https://www.googleapis.com/auth/cloudplatformprojects";
  
  // OAuth2 scope for access to nearby sharing.
  const char kNearbyShareOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/nearbysharing-pa";
-+    "trk:101:https://www.googleapis.com/auth/nearbysharing-pa";
++    "trk:099:https://www.googleapis.com/auth/nearbysharing-pa";
  
  // OAuth2 scopes for access to GCM account tracker.
 -const char kGCMGroupServerOAuth2Scope[] = "https://www.googleapis.com/auth/gcm";
-+const char kGCMGroupServerOAuth2Scope[] = "trk:102:https://www.googleapis.com/auth/gcm";
++const char kGCMGroupServerOAuth2Scope[] = "trk:100:https://www.googleapis.com/auth/gcm";
  const char kGCMCheckinServerOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/android_checkin";
-+    "trk:103:https://www.googleapis.com/auth/android_checkin";
++    "trk:101:https://www.googleapis.com/auth/android_checkin";
  
  // OAuth2 scope for access to readonly Chrome web store.
  const char kChromeWebstoreOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/chromewebstore.readonly";
-+    "trk:104:https://www.googleapis.com/auth/chromewebstore.readonly";
++    "trk:102:https://www.googleapis.com/auth/chromewebstore.readonly";
  
  // OAuth2 scope for access to Account Capabilities API.
  const char kAccountCapabilitiesOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/account.capabilities";
-+    "trk:105:https://www.googleapis.com/auth/account.capabilities";
++    "trk:103:https://www.googleapis.com/auth/account.capabilities";
  
  // OAuth2 scope for support content API.
  const char kSupportContentOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/supportcontent";
-+    "trk:106:https://www.googleapis.com/auth/supportcontent";
++    "trk:104:https://www.googleapis.com/auth/supportcontent";
  
  // OAuth 2 scope for NTP Photos module API.
  const char kPhotosModuleOAuth2Scope[] =
--    "https://www.googleapis.com/auth/photos.firstparty.readonly";
-+    "trk:107:https://www.googleapis.com/auth/photos.firstparty.readonly";
- 
- // OAuth 2 scope for NTP Photos module image API.
- const char kPhotosModuleImageOAuth2Scope[] =
--    "https://www.googleapis.com/auth/photos.image.readonly";
-+    "trk:108:https://www.googleapis.com/auth/photos.image.readonly";
- 
- // Used to mint uber auth tokens when needed.
- const char kGaiaSid[] = "sid";
---- a/google_apis/gaia/gaia_urls.cc
-+++ b/google_apis/gaia/gaia_urls.cc
+--- google_apis/gaia/gaia_urls.cc.orig
++++ google_apis/gaia/gaia_urls.cc
 @@ -24,6 +24,7 @@
  namespace {
  
@@ -729,8 +720,8 @@ by default.
  const char kDefaultGoogleUrl[] = "http://google.com";
  const char kDefaultGaiaUrl[] = "https://accounts.google.com";
  const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com";
---- a/google_apis/gcm/engine/gservices_settings.cc
-+++ b/google_apis/gcm/engine/gservices_settings.cc
+--- google_apis/gcm/engine/gservices_settings.cc.orig
++++ google_apis/gcm/engine/gservices_settings.cc
 @@ -30,18 +30,18 @@ const char kRegistrationURLKey[] = "gcm_
  
  const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
@@ -753,8 +744,19 @@ by default.
  const int kMaxSecurePort = 65535;
  
  std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
---- a/remoting/base/breakpad_mac.mm
-+++ b/remoting/base/breakpad_mac.mm
+--- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc.orig
++++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl
+     // These attributes are necessary for working with non-gmail gaia
+     // accounts.
+     const std::string NS_GOOGLE_AUTH_PROTOCOL(
+-        "http://www.google.com/talk/protocol/auth");
++        "trk:179:http://www.google.com/talk/protocol/auth");
+     const jingle_xmpp::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN(
+         NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid");
+     const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT(
+--- remoting/base/breakpad_mac.mm.orig
++++ remoting/base/breakpad_mac.mm
 @@ -50,7 +50,7 @@ void InitializeCrashReporting() {
        breakpad_config[@BREAKPAD_REPORT_INTERVAL] = @"21600";
      }
@@ -764,8 +766,8 @@ by default.
      }
  
      if (!BreakpadCreate(breakpad_config)) {
---- a/remoting/protocol/jingle_messages.cc
-+++ b/remoting/protocol/jingle_messages.cc
+--- remoting/protocol/jingle_messages.cc.orig
++++ remoting/protocol/jingle_messages.cc
 @@ -27,7 +27,7 @@ const char kJabberNamespace[] = "jabber:
  const char kJingleNamespace[] = "urn:xmpp:jingle:1";
  
@@ -775,8 +777,8 @@ by default.
  
  const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
  
---- a/rlz/lib/lib_values.cc
-+++ b/rlz/lib/lib_values.cc
+--- rlz/lib/lib_values.cc.orig
++++ rlz/lib/lib_values.cc
 @@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = "
  //
  
@@ -786,8 +788,37 @@ by default.
  const int kFinancialPort = 443;
  
  // Ping times in 100-nanosecond intervals.
---- a/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
-+++ b/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+--- third_party/libjingle_xmpp/xmpp/constants.cc.orig
++++ third_party/libjingle_xmpp/xmpp/constants.cc
+@@ -194,7 +194,7 @@ const StaticQName QN_SASL_TEMPORARY_AUTH
+ 
+ // These are non-standard.
+ const char NS_GOOGLE_AUTH_PROTOCOL[] =
+-    "http://www.google.com/talk/protocol/auth";
++    "trk:236:http://www.google.com/talk/protocol/auth";
+ const StaticQName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT =
+     { NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result" };
+ const StaticQName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN =
+@@ -338,7 +338,7 @@ const char STR_SHOW_DND[] = "dnd";
+ const char STR_SHOW_XA[] = "xa";
+ const char STR_SHOW_OFFLINE[] = "offline";
+ 
+-const char NS_GOOGLE_PSTN_CONFERENCE[] = "http://www.google.com/pstn-conference";
++const char NS_GOOGLE_PSTN_CONFERENCE[] = "trk:237:http://www.google.com/pstn-conference";
+ const StaticQName QN_GOOGLE_PSTN_CONFERENCE_STATUS = { NS_GOOGLE_PSTN_CONFERENCE, "status" };
+ const StaticQName QN_ATTR_STATUS = { STR_EMPTY, "status" };
+ 
+@@ -433,7 +433,7 @@ const StaticQName QN_MUC_ROLE = { NS_MUC
+ const char STR_AFFILIATION_NONE[] = "none";
+ const char STR_ROLE_PARTICIPANT[] = "participant";
+ 
+-const char NS_GOOGLE_SESSION[] = "http://www.google.com/session";
++const char NS_GOOGLE_SESSION[] = "trk:238:http://www.google.com/session";
+ const StaticQName QN_GOOGLE_CIRCLE_ID = { STR_EMPTY, "google-circle-id" };
+ const StaticQName QN_GOOGLE_USER_ID = { STR_EMPTY, "google-user-id" };
+ const StaticQName QN_GOOGLE_SESSION_BLOCKED = { NS_GOOGLE_SESSION, "blocked" };
+--- ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js.orig
++++ ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
 @@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
    'outputContextFirst': false,
    'position': '{}',
@@ -800,8 +831,8 @@ by default.
    'sticky': false,
    'typingEcho': 0,
    'useIBeamCursor': cvox.ChromeVox.isMac,
---- a/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
-+++ b/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
+--- ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js.orig
++++ ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
 @@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio
            (!cvox.ApiImplementation.siteSpecificScriptLoader ||
             !cvox.ApiImplementation.siteSpecificScriptBase);
@@ -814,8 +845,8 @@ by default.
        if (apiPrefsChanged) {
          var searchInit = prefs['siteSpecificEnhancements'] === 'true' ?
              cvox.SearchLoader.init :
---- a/ui/views/examples/webview_example.cc
-+++ b/ui/views/examples/webview_example.cc
+--- ui/views/examples/webview_example.cc.orig
++++ ui/views/examples/webview_example.cc
 @@ -29,7 +29,7 @@ void WebViewExample::CreateExampleView(V
    webview_->GetWebContents()->SetDelegate(this);
    container->SetLayoutManager(std::make_unique<FillLayout>());