diff --git a/build/LASTCHANGE b/build/LASTCHANGE
index 0a58a322..59fe1341 100644
--- a/build/LASTCHANGE
+++ b/build/LASTCHANGE
@@ -1 +1 @@
-b9c06a0f04c03ea3997e667dff0eb39165741528-
\ No newline at end of file
+5e4e695db5ae34eebbd81741c4add61b263fcca5-
\ No newline at end of file
diff --git a/build/RELEASE b/build/RELEASE
index f8e4194d..c3b80e39 100644
--- a/build/RELEASE
+++ b/build/RELEASE
@@ -1 +1 @@
-106.0.5249.163
\ No newline at end of file
+107.0.5304.96
\ No newline at end of file
diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT
index ea442b6a..18bc3b05 100644
--- a/build/RELEASE_COMMIT
+++ b/build/RELEASE_COMMIT
@@ -1 +1 @@
-8afcb6d66c09af9ccf2f306c5e0d1f997bfea024
\ No newline at end of file
+cc848a50ac06860b606b3adc58a9397b6d171c66
\ No newline at end of file
diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt
index be1f0d76..385f1d77 100644
--- a/build/bromite_patches_list.txt
+++ b/build/bromite_patches_list.txt
@@ -3,7 +3,26 @@ do-not-hide-.orig-files.patch
 Do-not-link-with-libatomic.patch
 do-not-add-suffix-to-package-name.patch
 exit-on-failure-of-inclusion.patch
-Fix-segmentation-platform-build-error.patch
+Disable-safe-browsing.patch
+Remove-signin-and-sync-integrations.patch
+Move-some-account-settings-back-to-privacy-settings.patch
+Remove-contextual-search-manager.patch
+kill-Vision.patch
+kill-Location-fall-back-to-system.patch
+kill-Auth.patch
+Remove-binary-blob-integrations.patch
+Remove-SMS-integration.patch
+Remove-price-shopping-commerce-integrations.patch
+Remove-voice-recognition-integration.patch
+Do-not-compile-QR-code-sharing.patch
+Timezone-customization.patch
+Revert-the-removal-of-an-option-to-block-autoplay.patch
+Add-support-for-ISupportHelpAndFeedback.patch
+JIT-site-settings.patch
+Site-setting-for-images.patch
+Content-settings-infrastructure.patch
+Add-webGL-site-setting.patch
+Add-webRTC-site-settings.patch
 AV1-codec-support.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
@@ -29,9 +48,7 @@ ungoogled-chromium-Disable-intranet-detector.patch
 ungoogled-chromium-no-special-hosts-domains.patch
 ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
-Disable-safe-browsing.patch
 Disable-all-promo-dialogs.patch
-Remove-signin-and-sync-integrations.patch
 Disable-update-scheduler.patch
 Add-English-only-search-engine.patch
 Add-DuckDuckGo-Lite-search-engine.patch
@@ -53,8 +70,6 @@ Add-an-always-incognito-mode.patch
 Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
 Add-option-to-not-persist-tabs-across-sessions.patch
 Add-a-proxy-configuration-page.patch
-Move-some-account-settings-back-to-privacy-settings.patch
-Remove-contextual-search-manager.patch
 Add-custom-tab-intents-privacy-option.patch
 Disable-FLoC-and-privacy-sandbox.patch
 History-number-of-days-privacy-setting.patch
@@ -69,14 +84,6 @@ autofill-miscellaneous.patch
 Enable-native-Android-autofill.patch
 first_run-deactivate-autoupdate-globally.patch
 translate-disable-fetching-of-languages-from-server.patch
-kill-Vision.patch
-kill-Location-fall-back-to-system.patch
-kill-Auth.patch
-Remove-binary-blob-integrations.patch
-Remove-SMS-integration.patch
-Remove-price-shopping-commerce-integrations.patch
-Remove-voice-recognition-integration.patch
-Do-not-compile-QR-code-sharing.patch
 Offer-builtin-autocomplete-for-chrome-flags.patch
 Use-4-tile-rows-never-show-logo.patch
 Disable-various-metrics.patch
@@ -101,7 +108,7 @@ Disable-feeds-support-by-default.patch
 Show-site-settings-for-cookies-javascript-and-ads.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
-Enable-user-agent-freeze-by-default.patch
+Guard-for-user-agent-reduction.patch
 AImageReader-CFI-crash-mitigations.patch
 Add-menu-item-to-view-source.patch
 Revert-removal-of-execution-context-address-space.patch
@@ -114,10 +121,8 @@ Disable-the-DIAL-repeating-discovery.patch
 Block-qjz9zk-or-trk-requests.patch
 Hardening-against-incognito-mode-detection.patch
 Remove-weblayer-dependency-on-Play-Services.patch
-Timezone-customization.patch
 Restore-Simplified-NTP-launch.patch
 Add-option-to-use-home-page-as-NTP.patch
-Revert-the-removal-of-an-option-to-block-autoplay.patch
 Disable-text-fragments-by-default.patch
 disable-WebView-variations-support.patch
 Enable-network-isolation-features.patch
@@ -139,8 +144,6 @@ Revert-Delete-block-external-form-redirects.patch
 Enable-IntentBlockExternalFormRedirectsNoGesture.patch
 Add-flag-to-disable-external-intent-requests.patch
 Logcat-crash-reports-UI.patch
-Add-support-for-ISupportHelpAndFeedback.patch
-JIT-site-settings.patch
 API-level-21-prevent-crash-on-download.patch
 Add-flag-to-disable-vibration.patch
 mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
@@ -149,7 +152,6 @@ Disable-AGSA-by-default.patch
 Allow-building-without-enable_reporting.patch
 Disable-lock-icon-in-address-bar-by-default.patch
 Enable-share-intent.patch
-Site-setting-for-images.patch
 Bromite-auto-updater.patch
 Experimental-user-scripts-support.patch
 Keep-empty-tabs-between-sessions.patch
@@ -177,14 +179,10 @@ Add-lifetime-options-for-permissions.patch
 Disable-crash-reporting.patch
 Samsung-Note-9-SDK27-crazylinker-workaround.patch
 Disable-TLS-resumption.patch
-Partition-DNS-requests-by-top-frame-NIK.patch
 Remove-mremap-from-seccomp-baseline-policy.patch
 Move-navigation-bar-to-bottom.patch
 Welcome-screen.patch
-Content-settings-infrastructure.patch
-Add-webGL-site-setting.patch
 Add-site-engagement-flag.patch
-Add-webRTC-site-settings.patch
 Enable-Certificate-Transparency.patch
 Invalidate-components-public-key.patch
 Improve-plain-text-rendering-on-mobile.patch
@@ -198,11 +196,11 @@ Disable-PrivacyGuide.patch
 Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
 sharing-hub-always-use-visible-URL.patch
 Re-introduce-kWebAuthCable.patch
-Revert-clipboard-user-gesture-requirement-removal.patch
 Enable-HEVC-by-default.patch
 Partition-blobs-by-top-frame-URL.patch
 Override-Navigator-Language.patch
 Disable-add-to-home-screen-prompt.patch
 Remove-HTTP-referrals-in-cross-origin-navigation.patch
-Automated-domain-substitution.patch
 Enable-ECH-by-default.patch
+Disable-StartSurface-feature.patch
+Automated-domain-substitution.patch
diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt
index a24b41ab..188a4659 100644
--- a/build/chromium_patches_list.txt
+++ b/build/chromium_patches_list.txt
@@ -9,4 +9,3 @@ Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 enable-ftrivial-auto-var-init-zero.patch
 Disable-feeds-support-by-default.patch
 Chromium-package-name.patch
-Fix-segmentation-platform-build-error.patch
diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch
index 27993350..b0e4d0b7 100644
--- a/build/patches/AImageReader-CFI-crash-mitigations.patch
+++ b/build/patches/AImageReader-CFI-crash-mitigations.patch
@@ -84,8 +84,8 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2372,9 +2372,9 @@
-     "expiry_milestone": 106
+@@ -2410,9 +2410,9 @@
+     "expiry_milestone": 115
    },
    {
 -    "name": "enable-image-reader",
@@ -152,7 +152,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -121,6 +121,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !BUILDFLAG(IS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -162,7 +162,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -345,6 +348,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
      gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
          kGpuFeatureStatusBlocklisted;
    }
@@ -182,13 +182,13 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
 +disable_aimagereader
+ disable_accelerated_av1_encode
  disable_accelerated_h264_encode
  disable_accelerated_hevc_decode
- disable_accelerated_vp8_decode
 diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -624,6 +624,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -640,6 +640,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -231,7 +231,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -754,6 +754,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
+@@ -750,6 +750,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
  // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled.
  const base::Feature kMediaDrmPreprovisioningAtStartup{
      "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -245,7 +245,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -233,6 +233,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders;
+@@ -232,6 +232,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders;
  MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays;
  MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;
  MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;
diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch
index 2d2d25f6..cf466d53 100644
--- a/build/patches/AV1-codec-support.patch
+++ b/build/patches/AV1-codec-support.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 --- a/third_party/libaom/BUILD.gn
 +++ b/third_party/libaom/BUILD.gn
-@@ -81,7 +81,7 @@ if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
+@@ -85,7 +85,7 @@ if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
        sources += aom_dsp_encoder_asm_sse2_x86_64
        sources += aom_dsp_encoder_asm_ssse3_x86_64
      }
@@ -23,7 +23,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
      include_dirs = libaom_include_dirs
    }
  
-@@ -193,7 +193,7 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
+@@ -197,7 +197,7 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
      configs += [ "//build/config/compiler:no_chromium_code" ]
      if (current_cpu == "arm") {
        configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
@@ -32,7 +32,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
      }
      configs += [ ":libaom_config" ]
  
-@@ -255,6 +255,8 @@ static_library("libaom") {
+@@ -259,6 +259,8 @@ static_library("libaom") {
    if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
        cpu_arch_full == "arm-neon-cpu-detect") {
      deps += [ ":libaom_intrinsics_neon" ]
@@ -44,7 +44,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
 --- a/third_party/libaom/libaom_srcs.gni
 +++ b/third_party/libaom/libaom_srcs.gni
-@@ -666,6 +666,11 @@ aom_rc_interface_sources = [
+@@ -673,6 +673,11 @@ aom_rc_interface_sources = [
    "//third_party/libaom/source/libaom/test/yuv_video_source.h",
  ]
  
diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch
index 18ad74c5..266d85c3 100644
--- a/build/patches/Add-AllowUserCertificates-flag.patch
+++ b/build/patches/Add-AllowUserCertificates-flag.patch
@@ -5,22 +5,22 @@ Subject: Add AllowUserCertificates flag
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 3 +++
- .../chrome/browser/app/flags/ChromeCachedFlags.java         | 1 +
- chrome/browser/about_flags.cc                               | 6 +++++-
- chrome/browser/flag_descriptions.cc                         | 5 +++++
- chrome/browser/flag_descriptions.h                          | 3 +++
- chrome/browser/flags/android/chrome_feature_list.cc         | 4 ++++
- chrome/browser/flags/android/chrome_feature_list.h          | 1 +
- .../chromium/chrome/browser/flags/CachedFeatureFlags.java   | 1 +
- .../chromium/chrome/browser/flags/ChromeFeatureList.java    | 3 +++
- net/android/java/src/org/chromium/net/X509Util.java         | 5 +++++
- 10 files changed, 31 insertions(+), 1 deletion(-)
+ .../src/org/chromium/chrome/browser/app/ChromeActivity.java  | 3 +++
+ .../chromium/chrome/browser/app/flags/ChromeCachedFlags.java | 1 +
+ chrome/browser/about_flags.cc                                | 4 ++++
+ chrome/browser/flag_descriptions.cc                          | 5 +++++
+ chrome/browser/flag_descriptions.h                           | 3 +++
+ chrome/browser/flags/android/chrome_feature_list.cc          | 4 ++++
+ chrome/browser/flags/android/chrome_feature_list.h           | 1 +
+ .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++
+ net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++
+ 10 files changed, 30 insertions(+)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -945,6 +946,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -955,6 +956,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          UpdateMenuItemHelper.getInstance().onStart();
          ChromeActivitySessionTracker.getInstance().onStartWithNative();
          ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -51,12 +51,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3466,7 +3466,11 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName,
-      flag_descriptions::kCSSContainerQueriesDescription, kOsAll,
-      FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)},
--#if BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_ANDROID) // Bromite allow user certificates
+@@ -3595,6 +3595,10 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
+ #endif  // ENABLE_EXTENSIONS
+ #if BUILDFLAG(IS_ANDROID)
 +    {"allow-user-certificates",
 +     flag_descriptions::kAllowUserCertificatesName,
 +     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,
@@ -95,7 +93,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -149,6 +149,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedNoViewCache,
      &feed::kFeedReplaceAll,
      &feed::kInterestFeedContentSuggestions,
@@ -103,7 +101,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
      &feed::kInterestFeedV2,
      &feed::kInterestFeedV2Autoplay,
-@@ -441,6 +442,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
+@@ -453,6 +454,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
      "AdaptiveButtonInTopToolbarCustomizationV2",
      base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -111,7 +109,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 +    "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT};
 +
  const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH",
-                                         base::FEATURE_ENABLED_BY_DEFAULT};
+                                         base::FEATURE_DISABLED_BY_DEFAULT};
  
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
@@ -146,7 +144,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
-@@ -613,6 +614,8 @@ public abstract class ChromeFeatureList {
+@@ -637,6 +638,8 @@ public abstract class ChromeFeatureList {
      public static final String FEED_REPLACE_ALL = "FeedReplaceAll";
  
      /* Alphabetical: */
diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
index 8b2097b6..ccfef6ed 100644
--- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
+++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
@@ -43,7 +43,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -41,7 +41,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_AE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -52,7 +52,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+@@ -51,7 +51,7 @@ const PrepopulatedEngine* const engines_AL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -61,7 +61,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -59,7 +59,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AR[] = {
      &googleen, &google,
      &bing,
      &yahoo_ar,
@@ -70,7 +70,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -67,7 +67,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -68,7 +68,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  const PrepopulatedEngine* const engines_AT[] = {
      &googleen, &google,
      &bing,
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_at,
      &ecosia,
  };
-@@ -77,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AU[] = {
      &googleen, &google,
      &bing,
      &yahoo_au,
@@ -88,7 +88,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -86,7 +86,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_BA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -97,7 +97,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -96,7 +96,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -106,7 +106,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Bulgaria
-@@ -104,7 +104,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -115,7 +115,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -124,7 +124,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -133,7 +133,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -131,7 +131,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -142,7 +142,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -140,7 +140,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -151,7 +151,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -149,7 +149,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BR[] = {
      &googleen, &google,
      &bing,
      &yahoo_br,
@@ -160,7 +160,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -159,7 +159,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -160,7 +160,7 @@ const PrepopulatedEngine* const engines_BY[] = {
      &yandex_by,
      &mail_ru,
      &bing,
@@ -169,7 +169,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Belize
-@@ -167,7 +167,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+@@ -168,7 +168,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -178,7 +178,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -176,7 +176,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CA[] = {
      &googleen, &google,
      &bing,
      &yahoo_ca,
@@ -187,7 +187,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -184,7 +184,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -185,7 +185,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  const PrepopulatedEngine* const engines_CH[] = {
      &googleen, &google,
      &bing,
@@ -196,7 +196,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
      &yahoo_ch,
  };
-@@ -194,7 +194,7 @@ const PrepopulatedEngine* const engines_CL[] = {
+@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CL[] = {
      &googleen, &google,
      &bing,
      &yahoo_cl,
@@ -205,7 +205,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -213,7 +213,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CO[] = {
      &bing,
      &yahoo_co,
      &ecosia,
@@ -214,7 +214,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Costa Rica
-@@ -221,7 +221,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -223,7 +223,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -231,7 +231,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -232,7 +232,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
      &seznam_cz,
      &bing,
      &yahoo,
@@ -232,7 +232,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Germany
-@@ -239,7 +239,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_DE[] = {
      &googleen, &google,
      &bing,
      &ecosia,
@@ -241,7 +241,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_de,
  };
  
-@@ -248,7 +248,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DK[] = {
      &googleen, &google,
      &bing,
      &yahoo_dk,
@@ -250,7 +250,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -257,7 +257,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -259,7 +259,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -268,7 +268,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -268,7 +268,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Ecuador
-@@ -276,7 +276,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+@@ -277,7 +277,7 @@ const PrepopulatedEngine* const engines_EC[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -277,7 +277,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Estonia
-@@ -284,7 +284,7 @@ const PrepopulatedEngine* const engines_EE[] = {
+@@ -285,7 +285,7 @@ const PrepopulatedEngine* const engines_EE[] = {
      &googleen, &google,
      &bing,
      &yandex_ru,
@@ -286,7 +286,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -295,7 +295,7 @@ const PrepopulatedEngine* const engines_EG[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -295,7 +295,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Spain
-@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_ES[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -304,7 +304,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -311,7 +311,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_FI[] = {
      &googleen, &google,
      &bing,
      &yahoo_fi,
@@ -313,7 +313,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -320,7 +320,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+@@ -321,7 +321,7 @@ const PrepopulatedEngine* const engines_FO[] = {
      &googleen, &google,
      &bing,
      &yahoo_dk,
@@ -322,7 +322,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -338,7 +338,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_GB[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -331,7 +331,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -340,7 +340,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -356,7 +356,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -349,7 +349,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -367,7 +367,7 @@ const PrepopulatedEngine* const engines_HK[] = {
      &yahoo_hk,
      &bing,
      &baidu,
@@ -358,7 +358,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Honduras
-@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -367,7 +367,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -383,7 +383,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+@@ -384,7 +384,7 @@ const PrepopulatedEngine* const engines_HR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -376,7 +376,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -392,7 +392,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HU[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -385,7 +385,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -402,7 +402,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_ID[] = {
      &yahoo_id,
      &bing,
      &yandex_com,
@@ -394,7 +394,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Ireland
-@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IE[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -403,7 +403,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IL[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -412,7 +412,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // India
-@@ -428,7 +428,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IN[] = {
      &googleen, &google,
      &bing,
      &yahoo_in,
@@ -421,7 +421,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &info_com,
  };
  
-@@ -438,7 +438,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -439,7 +439,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
      &bing,
      &yahoo,
      &yandex_tr,
@@ -430,7 +430,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Iran
-@@ -447,14 +447,14 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -448,14 +448,14 @@ const PrepopulatedEngine* const engines_IR[] = {
      &bing,
      &yahoo,
      &ask,
@@ -447,7 +447,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -464,7 +464,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -456,7 +456,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -473,7 +473,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_JM[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -465,7 +465,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_JO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -474,7 +474,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JP[] = {
      &googleen, &google,
      &yahoo_jp,
      &bing,
@@ -483,7 +483,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -500,7 +500,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_KE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -492,7 +492,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -518,7 +518,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_KW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -501,7 +501,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -528,7 +528,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -529,7 +529,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
      &yandex_kz,
      &mail_ru,
      &bing,
@@ -510,7 +510,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Lebanon
-@@ -536,7 +536,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_LB[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -519,7 +519,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -544,7 +544,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -545,7 +545,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  const PrepopulatedEngine* const engines_LI[] = {
      &googleen, &google,
      &bing,
@@ -528,7 +528,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -537,7 +537,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  const PrepopulatedEngine* const engines_LU[] = {
      &googleen, &google,
      &bing,
@@ -546,7 +546,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -573,7 +573,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -574,7 +574,7 @@ const PrepopulatedEngine* const engines_LV[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -555,7 +555,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Libya
-@@ -582,7 +582,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_LY[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -564,7 +564,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Morocco
-@@ -591,14 +591,14 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -592,14 +592,14 @@ const PrepopulatedEngine* const engines_MA[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -581,7 +581,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_fr,
      &ecosia,
  };
-@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_ME[] = {
      &bing,
      &yahoo,
      &yandex_ru,
@@ -590,7 +590,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Macedonia
-@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_MK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -599,7 +599,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MX[] = {
      &googleen, &google,
      &bing,
      &yahoo_mx,
@@ -608,7 +608,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -644,7 +644,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MY[] = {
      &googleen, &google,
      &bing,
      &yahoo_my,
@@ -617,7 +617,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -653,7 +653,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_NI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -626,7 +626,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -662,7 +662,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -663,7 +663,7 @@ const PrepopulatedEngine* const engines_NL[] = {
      &googleen, &google,
      &bing,
      &yahoo_nl,
@@ -635,7 +635,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -671,7 +671,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_NO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -644,7 +644,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -681,7 +681,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
      &googleen, &google,
      &bing,
      &yahoo_nz,
@@ -653,7 +653,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -689,7 +689,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_OM[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -662,7 +662,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &petal_search,
  };
  
-@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_PA[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -671,7 +671,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -708,7 +708,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PE[] = {
      &bing,
      &yahoo_pe,
      &ecosia,
@@ -680,7 +680,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Philippines
-@@ -717,7 +717,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PH[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -689,7 +689,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Pakistan
-@@ -725,7 +725,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -726,7 +726,7 @@ const PrepopulatedEngine* const engines_PK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -698,7 +698,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -734,7 +734,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -735,7 +735,7 @@ const PrepopulatedEngine* const engines_PL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -707,7 +707,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -743,7 +743,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_PR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -716,7 +716,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -753,7 +753,7 @@ const PrepopulatedEngine* const engines_PT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -725,7 +725,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -761,7 +761,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_PY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -734,7 +734,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_QA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -743,7 +743,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_RO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -752,7 +752,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -788,7 +788,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -789,7 +789,7 @@ const PrepopulatedEngine* const engines_RS[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -761,7 +761,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -798,7 +798,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RU[] = {
      &yandex_ru,
      &mail_ru,
      &bing,
@@ -770,7 +770,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Rwanda
-@@ -806,7 +806,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -807,7 +807,7 @@ const PrepopulatedEngine* const engines_RW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -779,7 +779,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -816,7 +816,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_SA[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -788,7 +788,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Sweden
-@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -825,7 +825,7 @@ const PrepopulatedEngine* const engines_SE[] = {
      &googleen, &google,
      &bing,
      &yahoo_se,
@@ -797,7 +797,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -833,7 +833,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_SG[] = {
      &googleen, &google,
      &bing,
      &yahoo_sg,
@@ -806,7 +806,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -841,7 +841,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  const PrepopulatedEngine* const engines_SI[] = {
      &googleen, &google,
      &bing,
@@ -815,7 +815,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_com,
  };
-@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  const PrepopulatedEngine* const engines_SK[] = {
      &googleen, &google,
      &bing,
@@ -824,7 +824,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_com,
  };
-@@ -860,7 +860,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -861,7 +861,7 @@ const PrepopulatedEngine* const engines_SV[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -833,7 +833,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -870,7 +870,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SY[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -842,7 +842,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Thailand
-@@ -887,7 +887,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_TN[] = {
      &googleen, &google,
      &bing,
      &yahoo_fr,
@@ -851,7 +851,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -897,7 +897,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TR[] = {
      &yandex_tr,
      &yahoo_tr,
      &bing,
@@ -860,7 +860,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Trinidad and Tobago
-@@ -905,7 +905,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -906,7 +906,7 @@ const PrepopulatedEngine* const engines_TT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -869,7 +869,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -915,7 +915,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -916,7 +916,7 @@ const PrepopulatedEngine* const engines_TW[] = {
      &yahoo_tw,
      &bing,
      &baidu,
@@ -878,7 +878,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Tanzania
-@@ -923,7 +923,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -924,7 +924,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -887,7 +887,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -932,7 +932,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -933,7 +933,7 @@ const PrepopulatedEngine* const engines_UA[] = {
      &googleen, &google,
      &yandex_ua,
      &bing,
@@ -896,7 +896,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -941,7 +941,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -942,7 +942,7 @@ const PrepopulatedEngine* const engines_US[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -905,7 +905,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -950,7 +950,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -951,7 +951,7 @@ const PrepopulatedEngine* const engines_UY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -914,7 +914,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -959,7 +959,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -960,7 +960,7 @@ const PrepopulatedEngine* const engines_VE[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -923,7 +923,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -978,7 +978,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -979,7 +979,7 @@ const PrepopulatedEngine* const engines_YE[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -932,7 +932,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // South Africa
-@@ -986,7 +986,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -987,7 +987,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -941,7 +941,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -995,7 +995,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
+@@ -996,7 +996,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch
index 9d19554f..1dfa6be3 100644
--- a/build/patches/Add-English-only-search-engine.patch
+++ b/build/patches/Add-English-only-search-engine.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -135,6 +135,27 @@
+@@ -136,6 +136,27 @@
        "id": 1
      },
  
@@ -57,7 +57,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -28,7 +28,7 @@ namespace {
+@@ -29,7 +29,7 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {
@@ -66,7 +66,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
  };
-@@ -38,7 +38,7 @@ const PrepopulatedEngine* const engines_default[] = {
+@@ -39,7 +39,7 @@ const PrepopulatedEngine* const engines_default[] = {
  // clang-format off
  // United Arab Emirates
  const PrepopulatedEngine* const engines_AE[] = {
@@ -75,7 +75,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -47,7 +47,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -48,7 +48,7 @@ const PrepopulatedEngine* const engines_AE[] = {
  
  // Albania
  const PrepopulatedEngine* const engines_AL[] = {
@@ -84,7 +84,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -56,7 +56,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = {
  
  // Argentina
  const PrepopulatedEngine* const engines_AR[] = {
@@ -93,7 +93,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ar,
      &duckduckgo,
-@@ -65,7 +65,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  
  // Austria
  const PrepopulatedEngine* const engines_AT[] = {
@@ -102,7 +102,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_at,
-@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = {
+@@ -75,7 +75,7 @@ const PrepopulatedEngine* const engines_AT[] = {
  
  // Australia
  const PrepopulatedEngine* const engines_AU[] = {
@@ -111,7 +111,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_au,
      &duckduckgo,
-@@ -83,7 +83,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -84,7 +84,7 @@ const PrepopulatedEngine* const engines_AU[] = {
  
  // Bosnia and Herzegovina
  const PrepopulatedEngine* const engines_BA[] = {
@@ -120,7 +120,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -92,7 +92,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -93,7 +93,7 @@ const PrepopulatedEngine* const engines_BA[] = {
  
  // Belgium
  const PrepopulatedEngine* const engines_BE[] = {
@@ -129,7 +129,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -101,7 +101,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -102,7 +102,7 @@ const PrepopulatedEngine* const engines_BE[] = {
  
  // Bulgaria
  const PrepopulatedEngine* const engines_BG[] = {
@@ -138,7 +138,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -110,7 +110,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -111,7 +111,7 @@ const PrepopulatedEngine* const engines_BG[] = {
  
  // Bahrain
  const PrepopulatedEngine* const engines_BH[] = {
@@ -147,7 +147,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -119,7 +119,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -120,7 +120,7 @@ const PrepopulatedEngine* const engines_BH[] = {
  
  // Burundi
  const PrepopulatedEngine* const engines_BI[] = {
@@ -156,7 +156,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -128,7 +128,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BI[] = {
  
  // Brunei
  const PrepopulatedEngine* const engines_BN[] = {
@@ -165,7 +165,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -137,7 +137,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BN[] = {
  
  // Bolivia
  const PrepopulatedEngine* const engines_BO[] = {
@@ -174,7 +174,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -147,7 +147,7 @@ const PrepopulatedEngine* const engines_BO[] = {
  
  // Brazil
  const PrepopulatedEngine* const engines_BR[] = {
@@ -183,7 +183,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_br,
      &duckduckgo,
-@@ -155,7 +155,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -156,7 +156,7 @@ const PrepopulatedEngine* const engines_BR[] = {
  
  // Belarus
  const PrepopulatedEngine* const engines_BY[] = {
@@ -192,7 +192,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_by,
      &mail_ru,
      &bing,
-@@ -164,7 +164,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -165,7 +165,7 @@ const PrepopulatedEngine* const engines_BY[] = {
  
  // Belize
  const PrepopulatedEngine* const engines_BZ[] = {
@@ -201,7 +201,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -173,7 +173,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
  
  // Canada
  const PrepopulatedEngine* const engines_CA[] = {
@@ -210,7 +210,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ca,
      &duckduckgo,
-@@ -182,7 +182,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -183,7 +183,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  
  // Switzerland
  const PrepopulatedEngine* const engines_CH[] = {
@@ -219,7 +219,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &ecosia,
-@@ -191,7 +191,7 @@ const PrepopulatedEngine* const engines_CH[] = {
+@@ -192,7 +192,7 @@ const PrepopulatedEngine* const engines_CH[] = {
  
  // Chile
  const PrepopulatedEngine* const engines_CL[] = {
@@ -228,7 +228,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_cl,
      &duckduckgo,
-@@ -203,13 +203,13 @@ const PrepopulatedEngine* const engines_CN[] = {
+@@ -204,13 +204,13 @@ const PrepopulatedEngine* const engines_CN[] = {
      &sogou,
      &baidu,
      &bing,
@@ -244,7 +244,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_co,
      &ecosia,
-@@ -218,7 +218,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_CO[] = {
  
  // Costa Rica
  const PrepopulatedEngine* const engines_CR[] = {
@@ -253,7 +253,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -227,7 +227,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -228,7 +228,7 @@ const PrepopulatedEngine* const engines_CR[] = {
  
  // Czech Republic
  const PrepopulatedEngine* const engines_CZ[] = {
@@ -262,7 +262,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &seznam_cz,
      &bing,
      &yahoo,
-@@ -236,7 +236,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -237,7 +237,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
  
  // Germany
  const PrepopulatedEngine* const engines_DE[] = {
@@ -271,7 +271,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &ecosia,
      &duckduckgo,
-@@ -245,7 +245,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DE[] = {
  
  // Denmark
  const PrepopulatedEngine* const engines_DK[] = {
@@ -280,7 +280,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_dk,
      &duckduckgo,
-@@ -254,7 +254,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -255,7 +255,7 @@ const PrepopulatedEngine* const engines_DK[] = {
  
  // Dominican Republic
  const PrepopulatedEngine* const engines_DO[] = {
@@ -289,7 +289,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -263,7 +263,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -264,7 +264,7 @@ const PrepopulatedEngine* const engines_DO[] = {
  
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
@@ -298,7 +298,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -272,7 +272,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -273,7 +273,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
  
  // Ecuador
  const PrepopulatedEngine* const engines_EC[] = {
@@ -307,7 +307,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -281,7 +281,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+@@ -282,7 +282,7 @@ const PrepopulatedEngine* const engines_EC[] = {
  
  // Estonia
  const PrepopulatedEngine* const engines_EE[] = {
@@ -316,7 +316,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &duckduckgo,
-@@ -290,7 +290,7 @@ const PrepopulatedEngine* const engines_EE[] = {
+@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_EE[] = {
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
@@ -325,7 +325,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -299,7 +299,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -300,7 +300,7 @@ const PrepopulatedEngine* const engines_EG[] = {
  
  // Spain
  const PrepopulatedEngine* const engines_ES[] = {
@@ -334,7 +334,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -308,7 +308,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -309,7 +309,7 @@ const PrepopulatedEngine* const engines_ES[] = {
  
  // Finland
  const PrepopulatedEngine* const engines_FI[] = {
@@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fi,
      &duckduckgo,
-@@ -317,7 +317,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_FI[] = {
  
  // Faroe Islands
  const PrepopulatedEngine* const engines_FO[] = {
@@ -352,7 +352,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_dk,
      &duckduckgo,
-@@ -326,7 +326,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+@@ -327,7 +327,7 @@ const PrepopulatedEngine* const engines_FO[] = {
  
  // France
  const PrepopulatedEngine* const engines_FR[] = {
@@ -361,7 +361,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &qwant,
-@@ -335,7 +335,7 @@ const PrepopulatedEngine* const engines_FR[] = {
+@@ -336,7 +336,7 @@ const PrepopulatedEngine* const engines_FR[] = {
  
  // United Kingdom
  const PrepopulatedEngine* const engines_GB[] = {
@@ -370,7 +370,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -344,7 +344,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -345,7 +345,7 @@ const PrepopulatedEngine* const engines_GB[] = {
  
  // Greece
  const PrepopulatedEngine* const engines_GR[] = {
@@ -379,7 +379,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -353,7 +353,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -354,7 +354,7 @@ const PrepopulatedEngine* const engines_GR[] = {
  
  // Guatemala
  const PrepopulatedEngine* const engines_GT[] = {
@@ -388,7 +388,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -362,7 +362,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_GT[] = {
  
  // Hong Kong
  const PrepopulatedEngine* const engines_HK[] = {
@@ -397,7 +397,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_hk,
      &bing,
      &baidu,
-@@ -371,7 +371,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -372,7 +372,7 @@ const PrepopulatedEngine* const engines_HK[] = {
  
  // Honduras
  const PrepopulatedEngine* const engines_HN[] = {
@@ -406,7 +406,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -380,7 +380,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -381,7 +381,7 @@ const PrepopulatedEngine* const engines_HN[] = {
  
  // Croatia
  const PrepopulatedEngine* const engines_HR[] = {
@@ -415,7 +415,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -389,7 +389,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_HR[] = {
  
  // Hungary
  const PrepopulatedEngine* const engines_HU[] = {
@@ -424,7 +424,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -398,7 +398,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -399,7 +399,7 @@ const PrepopulatedEngine* const engines_HU[] = {
  
  // Indonesia
  const PrepopulatedEngine* const engines_ID[] = {
@@ -433,7 +433,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_id,
      &bing,
      &yandex_com,
-@@ -407,7 +407,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -408,7 +408,7 @@ const PrepopulatedEngine* const engines_ID[] = {
  
  // Ireland
  const PrepopulatedEngine* const engines_IE[] = {
@@ -442,7 +442,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -416,7 +416,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -417,7 +417,7 @@ const PrepopulatedEngine* const engines_IE[] = {
  
  // Israel
  const PrepopulatedEngine* const engines_IL[] = {
@@ -451,7 +451,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -425,7 +425,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_IL[] = {
  
  // India
  const PrepopulatedEngine* const engines_IN[] = {
@@ -460,7 +460,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_in,
      &duckduckgo,
-@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_IN[] = {
  
  // Iraq
  const PrepopulatedEngine* const engines_IQ[] = {
@@ -469,7 +469,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_tr,
-@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -444,7 +444,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -478,7 +478,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -452,7 +452,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_IR[] = {
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -487,7 +487,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -461,7 +461,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -462,7 +462,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -496,7 +496,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -470,7 +470,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -471,7 +471,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -505,7 +505,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -479,7 +479,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -480,7 +480,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -514,7 +514,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -488,7 +488,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -489,7 +489,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -523,7 +523,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_jp,
      &bing,
      &duckduckgo,
-@@ -497,7 +497,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -532,7 +532,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -541,7 +541,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &daum,
      &bing,
-@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -516,7 +516,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -550,7 +550,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -524,7 +524,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -525,7 +525,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -559,7 +559,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -533,7 +533,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -534,7 +534,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -568,7 +568,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -542,7 +542,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -577,7 +577,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -551,7 +551,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -552,7 +552,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -586,7 +586,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -560,7 +560,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -561,7 +561,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -595,7 +595,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -569,7 +569,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -604,7 +604,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -613,7 +613,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -588,7 +588,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -622,7 +622,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -596,7 +596,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -597,7 +597,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -631,7 +631,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_fr,
-@@ -605,7 +605,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -606,7 +606,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -640,7 +640,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &bing,
      &mail_ru,
-@@ -614,7 +614,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -615,7 +615,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -649,7 +649,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -623,7 +623,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -658,7 +658,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -632,7 +632,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -633,7 +633,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -667,7 +667,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo,
-@@ -641,7 +641,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -676,7 +676,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_my,
      &duckduckgo,
-@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -685,7 +685,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -660,7 +660,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -694,7 +694,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo,
-@@ -668,7 +668,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -669,7 +669,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -703,7 +703,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -677,7 +677,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -678,7 +678,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -712,7 +712,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nz,
      &duckduckgo,
-@@ -686,7 +686,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -687,7 +687,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -721,7 +721,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -695,7 +695,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -730,7 +730,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -704,7 +704,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -705,7 +705,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -739,7 +739,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_pe,
      &ecosia,
-@@ -713,7 +713,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -714,7 +714,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -748,7 +748,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -757,7 +757,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -732,7 +732,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -766,7 +766,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -740,7 +740,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -741,7 +741,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -775,7 +775,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -749,7 +749,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -750,7 +750,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -784,7 +784,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -758,7 +758,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -759,7 +759,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -793,7 +793,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -767,7 +767,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -802,7 +802,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -776,7 +776,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -777,7 +777,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -811,7 +811,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -785,7 +785,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -820,7 +820,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_RS[] = {
  
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
@@ -829,7 +829,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &mail_ru,
      &bing,
-@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -804,7 +804,7 @@ const PrepopulatedEngine* const engines_RU[] = {
  
  // Rwanda
  const PrepopulatedEngine* const engines_RW[] = {
@@ -838,7 +838,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -812,7 +812,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -813,7 +813,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -847,7 +847,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -821,7 +821,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -822,7 +822,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -856,7 +856,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo,
-@@ -830,7 +830,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -831,7 +831,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -865,7 +865,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &duckduckgo,
-@@ -839,7 +839,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -874,7 +874,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -848,7 +848,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -849,7 +849,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -883,7 +883,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -857,7 +857,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -892,7 +892,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -901,7 +901,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -876,7 +876,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -910,7 +910,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_th,
      &yandex_ru,
-@@ -884,7 +884,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -885,7 +885,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -919,7 +919,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &duckduckgo,
-@@ -893,7 +893,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -894,7 +894,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -928,7 +928,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -902,7 +902,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -903,7 +903,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -937,7 +937,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -911,7 +911,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -912,7 +912,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -946,7 +946,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -920,7 +920,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -921,7 +921,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -955,7 +955,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -929,7 +929,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -930,7 +930,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -964,7 +964,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ua,
      &bing,
      &duckduckgo,
-@@ -938,7 +938,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -939,7 +939,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -973,7 +973,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -947,7 +947,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -948,7 +948,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -982,7 +982,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -956,7 +956,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -957,7 +957,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -991,7 +991,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -965,7 +965,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -966,7 +966,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -1000,7 +1000,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &yahoo,
      &bing,
-@@ -974,7 +974,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -975,7 +975,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -1009,7 +1009,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -983,7 +983,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -984,7 +984,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -1018,7 +1018,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -992,7 +992,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -993,7 +993,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch
index 00eec8bb..cfa31192 100644
--- a/build/patches/Add-IsCleartextPermitted-flag.patch
+++ b/build/patches/Add-IsCleartextPermitted-flag.patch
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8660,6 +8660,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8862,6 +8862,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRequestDesktopSiteExceptionsName,
       flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1647,6 +1647,10 @@ const char kHttpsOnlyModeDescription[] =
+@@ -1661,6 +1661,10 @@ const char kHttpsOnlyModeDescription[] =
      "Adds a setting under chrome://settings/security to opt-in to HTTPS-First "
      "Mode.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -925,6 +925,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
+@@ -927,6 +927,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
  extern const char kHttpsOnlyModeName[];
  extern const char kHttpsOnlyModeDescription[];
  
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -111,6 +111,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
+@@ -113,6 +113,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
  const base::Feature kEncryptedClientHello{"EncryptedClientHello",
                                            base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -82,7 +82,7 @@ diff --git a/net/base/features.h b/net/base/features.h
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -211,6 +211,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -212,6 +212,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
      }
  
  #if BUILDFLAG(IS_ANDROID)
diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch
index 2353fdfe..3f70a8e4 100644
--- a/build/patches/Add-a-proxy-configuration-page.patch
+++ b/build/patches/Add-a-proxy-configuration-page.patch
@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -25,6 +25,9 @@
+@@ -27,6 +27,9 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
@@ -58,7 +58,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -6,6 +6,10 @@
+@@ -8,6 +8,10 @@ found in the LICENSE file.
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
  
@@ -72,9 +72,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -57,6 +57,7 @@ public class PrivacySettings
-     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
+@@ -70,6 +70,7 @@ public class PrivacySettings
+             SharedPreferencesManager.getInstance();
+     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
  
 +    private static final String PREF_PROXY_OPTIONS = "proxy";
      private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -275,6 +275,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -273,6 +273,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(
        base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
  #endif
@@ -136,12 +136,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 -  return std::make_unique<PrefProxyConfigTrackerImpl>(profile_prefs, nullptr);
 +  // Migrate from profile_prefs to local_state_prefs
 +  if (local_state_prefs->GetBoolean("proxy_migrated") == false) {
-+    const base::Value* dict =
-+        profile_prefs->GetDictionary(proxy_config::prefs::kProxy);
++    const base::Value::Dict& dict =
++        profile_prefs->GetDict(proxy_config::prefs::kProxy);
 +
 +    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";
 +
-+    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict->Clone());
++    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict.Clone());
 +    local_state_prefs->Set(proxy_config::prefs::kProxy, proxy_dict);
 +
 +    local_state_prefs->SetBoolean("proxy_migrated", true);
@@ -192,7 +192,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1014,6 +1016,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1042,6 +1044,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    chrome::enterprise_util::RegisterLocalStatePrefs(registry);
    component_updater::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -637,7 +637,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -282,6 +282,8 @@ static_library("ui") {
+@@ -280,6 +280,8 @@ static_library("ui") {
      "webui/metrics_handler.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -657,7 +657,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
  #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
  #include "chrome/browser/ui/webui/signin_internals_ui.h"
-@@ -781,6 +782,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -782,6 +783,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<MemoryInternalsUI>;
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
@@ -930,9 +930,9 @@ new file mode 100644
 +  net::ProxyConfigWithAnnotation config;
 +  auto availability = proxy_config_service_->GetLatestProxyConfig(&config);
 +
-+  const base::Value* dict =
-+      pref_service_->GetDictionary(proxy_config::prefs::kProxy);
-+  ProxyConfigDictionary proxy_dict(dict->Clone());
++  const PrefService::Preference* const pref =
++      pref_service_->FindPreference(proxy_config::prefs::kProxy);
++  ProxyConfigDictionary proxy_dict(pref->GetValue()->Clone());
 +  ProxyPrefs::ProxyMode mode;
 +  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {
 +    availability = net::ProxyConfigService::CONFIG_UNSET;
@@ -1128,7 +1128,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -46,6 +46,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+@@ -47,6 +47,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
  const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
  const char kChromeUIChromeSigninHost[] = "chrome-signin";
  const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
@@ -1137,7 +1137,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
  const char kChromeUIChromeURLsHost[] = "chrome-urls";
  const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
  const char kChromeUIComponentsHost[] = "components";
-@@ -437,6 +439,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -439,6 +441,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
      kChromeUILockScreenNetworkHost,
      kChromeUILockScreenStartReauthHost,
      kChromeUIMobileSetupHost,
@@ -1145,7 +1145,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
      kChromeUIMultiDeviceSetupHost,
      kChromeUINetworkHost,
      kChromeUINotificationTesterHost,
-@@ -701,6 +704,7 @@ const char* const kChromeHostURLs[] = {
+@@ -704,6 +707,7 @@ const char* const kChromeHostURLs[] = {
  #if !BUILDFLAG(IS_ANDROID)
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
      kChromeUIAppLauncherPageHost,
@@ -1156,7 +1156,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -133,6 +133,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -134,6 +134,8 @@ extern const char kChromeUIMemoryInternalsHost[];
  extern const char kChromeUINTPTilesInternalsHost[];
  extern const char kChromeUINaClHost[];
  extern const char kChromeUINetExportHost[];
@@ -1304,7 +1304,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
 diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
 --- a/components/proxy_config/proxy_policy_handler.cc
 +++ b/components/proxy_config/proxy_policy_handler.cc
-@@ -260,7 +260,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+@@ -264,7 +264,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
              ProxyConfigDictionary::CreateFixedServers(
                  server->GetString(), bypass_list && bypass_list->is_string()
                                           ? bypass_list->GetString()
diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
index 3f0ba749..4c1d7b11 100644
--- a/build/patches/Add-an-always-incognito-mode.patch
+++ b/build/patches/Add-an-always-incognito-mode.patch
@@ -91,7 +91,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -667,6 +667,7 @@ chrome_java_resources = [
+@@ -654,6 +654,7 @@ chrome_java_resources = [
    "java/res/xml/main_preferences.xml",
    "java/res/xml/manage_sync_preferences.xml",
    "java/res/xml/phone_as_a_security_key_accessory_filter.xml",
@@ -110,7 +110,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityUtils.java",
-@@ -958,6 +959,7 @@ chrome_java_sources = [
+@@ -912,6 +913,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -163,7 +163,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -38,6 +38,11 @@
+@@ -40,6 +40,11 @@ found in the LICENSE file.
          android:key="secure_dns"
          android:title="@string/settings_secure_dns_title"
          android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings"/>
@@ -236,15 +236,15 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -56,6 +56,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
- import org.chromium.base.task.PostTask;
+@@ -57,6 +57,7 @@ import org.chromium.base.task.PostTask;
+ import org.chromium.build.annotations.UsedByReflection;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
-@@ -1895,8 +1896,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1899,8 +1900,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          Bundle savedInstanceState = getSavedInstanceState();
  
          // We determine the model as soon as possible so every systems get initialized coherently.
@@ -259,15 +259,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
- import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
- import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
+@@ -93,6 +93,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvi
+ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
  import org.chromium.chrome.browser.device.DeviceClassManager;
-@@ -1817,6 +1818,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1812,6 +1813,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -288,7 +288,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.banners.AppMenuVerbiage;
  import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
  import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
-@@ -101,6 +102,10 @@ import java.util.ArrayList;
+@@ -98,6 +99,10 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.Map;
  
@@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -561,6 +566,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -558,6 +563,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
      }
  
      private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -313,7 +313,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
          // We have to iterate all menu items since same menu item ID may be associated with more
          // than one menu items.
          boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
-@@ -621,7 +633,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -616,7 +628,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
              }
  
              if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -330,7 +330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
              }
              if (item.getItemId() == R.id.menu_group_tabs) {
                  // Disable incognito group tabs when a re-authentication screen is shown.
-@@ -863,7 +883,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -858,7 +878,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          //                is not persisted when adding to the homescreen.
          // * If creating shortcuts it not supported by the current home screen.
          return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
@@ -448,7 +448,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
-@@ -793,7 +796,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -847,7 +850,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
  
      @Override
      public boolean isIncognito() {
@@ -468,7 +468,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  import org.chromium.chrome.browser.ChromeTabbedActivity;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.download.home.DownloadActivity;
-@@ -73,6 +74,10 @@ import org.chromium.ui.widget.Toast;
+@@ -74,6 +75,10 @@ import org.chromium.url.GURL;
  
  import java.io.File;
  
@@ -479,7 +479,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  /**
   * A class containing some utility static methods.
   */
-@@ -317,7 +322,16 @@ public class DownloadUtils {
+@@ -318,7 +323,16 @@ public class DownloadUtils {
          // Offline pages isn't supported in Incognito. This should be checked before calling
          // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found
          // for incognito profile.
@@ -521,7 +521,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  /**
   * Combines and manages the different UI components of browsing history.
   */
-@@ -493,7 +500,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -504,7 +511,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
          return mRootView;
      }
  
@@ -789,7 +789,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
  import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
-@@ -253,6 +254,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -254,6 +255,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
          if (fragment instanceof AdPersonalizationRemovedFragment) {
              ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager());
          }
@@ -912,7 +912,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -126,6 +126,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
+@@ -122,6 +122,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.ui.base.ActivityWindowAndroid;
  import org.chromium.ui.base.DeviceFormFactor;
@@ -921,7 +921,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.ui.base.IntentRequestTracker;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  
-@@ -492,7 +494,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -482,7 +484,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                      mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler();
              mEmptyBackgroundViewWrapper =
                      new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(),
@@ -1046,7 +1046,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4651,6 +4651,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4713,6 +4713,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOfflinePagesLivePageSharingName,
       flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -1113,7 +1113,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -301,6 +301,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
+@@ -299,6 +299,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
    return IdentityManagerFactory::GetForProfile(profile_);
  }
  
@@ -1148,8 +1148,8 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 +#include "chrome/common/pref_names.h"
  #include "components/content_settings/core/browser/content_settings_pref_provider.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
-@@ -96,9 +97,23 @@ scoped_refptr<RefcountedKeyedService>
+ #include "components/permissions/features.h"
+@@ -95,9 +96,23 @@ scoped_refptr<RefcountedKeyedService>
    if (profile->IsOffTheRecord() && !profile->IsGuestSession())
      GetForProfile(original_profile);
  
@@ -1174,7 +1174,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
        /*store_last_modified=*/true,
        profile->ShouldRestoreOldSessionCookies()));
  
-@@ -108,6 +123,9 @@ scoped_refptr<RefcountedKeyedService>
+@@ -107,6 +122,9 @@ scoped_refptr<RefcountedKeyedService>
        HostContentSettingsMap::WEBUI_ALLOWLIST_PROVIDER,
        std::move(allowlist_provider));
  
@@ -1187,7 +1187,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3676,6 +3676,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
+@@ -3758,6 +3758,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
      "Enables to share current loaded page as offline page by saving as MHTML "
      "first.";
  
@@ -1203,7 +1203,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2092,6 +2092,9 @@ extern const char kNotificationPermissionRationaleDescription[];
+@@ -2141,6 +2141,9 @@ extern const char kNotificationPermissionRationaleDescription[];
  extern const char kOfflinePagesLivePageSharingName[];
  extern const char kOfflinePagesLivePageSharingDescription[];
  
@@ -1216,7 +1216,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -533,8 +533,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab",
+@@ -535,8 +535,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab",
  const base::Feature kCCTIncognito{"CCTIncognito",
                                    base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -1226,11 +1226,11 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 +    "CCTIncognitoAvailableToThirdParty", base::FEATURE_ENABLED_BY_DEFAULT};
  
  const base::Feature kCCTPackageNameRecording{"CCTPackageNameRecording",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
-@@ -36,6 +36,9 @@
+@@ -38,6 +38,9 @@
  #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
  #include "components/feed/core/v2/public/feed_api.h"
  #include "components/feed/core/v2/public/feed_service.h"
@@ -1240,7 +1240,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
  #else
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
-@@ -410,6 +413,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -459,6 +462,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1252,9 +1252,9 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
 +#endif
 +
    if (profile->IsOffTheRecord())
-     return NULL;
+     return nullptr;
  
-@@ -417,6 +427,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -466,6 +476,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1267,13 +1267,13 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
 +}
 +
  void HistoryTabHelper::WebContentsDestroyed() {
-   // We update the history for this URL.
-   WebContents* tab = web_contents();
+   translate_observation_.Reset();
+ 
 diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
 --- a/chrome/browser/history/history_tab_helper.h
 +++ b/chrome/browser/history/history_tab_helper.h
-@@ -9,6 +9,8 @@
- #include "build/build_config.h"
+@@ -12,6 +12,8 @@
+ #include "components/translate/core/browser/translate_driver.h"
  #include "content/public/browser/web_contents_observer.h"
  #include "content/public/browser/web_contents_user_data.h"
 +#include "components/prefs/pref_registry_simple.h"
@@ -1281,7 +1281,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
  
  namespace history {
  struct HistoryAddPageArgs;
-@@ -41,6 +43,11 @@ class HistoryTabHelper : public content::WebContentsObserver,
+@@ -51,6 +53,11 @@ class HistoryTabHelper
      force_eligible_tab_for_testing_ = force;
    }
  
@@ -1293,9 +1293,9 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
   private:
    explicit HistoryTabHelper(content::WebContents* web_contents);
    friend class content::WebContentsUserData<HistoryTabHelper>;
-@@ -69,9 +76,6 @@ class HistoryTabHelper : public content::WebContentsObserver,
-                            bool started_from_context_menu,
-                            bool renderer_initiated) override;
+@@ -83,9 +90,6 @@ class HistoryTabHelper
+   void OnLanguageDetermined(
+       const translate::LanguageDetectionDetails& details) override;
  
 -  // Helper function to return the history service.  May return null.
 -  history::HistoryService* GetHistoryService();
@@ -1559,7 +1559,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
  #include "chrome/browser/android/explore_sites/history_statistics_reporter.h"
  #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
-@@ -1389,6 +1390,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1416,6 +1417,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    video_tutorials::RegisterPrefs(registry);
@@ -1568,7 +1568,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 +                              /*default_value=*/false);
 +  HistoryTabHelper::RegisterProfilePrefs(registry);
  #else   // BUILDFLAG(IS_ANDROID)
-   ApcClient::RegisterPrefs(registry);
+   autofill_assistant::AutofillAssistant::RegisterProfilePrefs(registry);
    AppShortcutManager::RegisterProfilePrefs(registry);
 diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
 --- a/chrome/browser/ui/android/native_page/BUILD.gn
@@ -1633,7 +1633,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1168,6 +1168,37 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1151,6 +1151,37 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
          Clears history from all synced devices.
        </message>
@@ -1717,7 +1717,7 @@ new file mode 100644
 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 --- a/chrome/common/pref_names.cc
 +++ b/chrome/common/pref_names.cc
-@@ -3435,6 +3435,12 @@ const char kShowCaretBrowsingDialog[] =
+@@ -3437,6 +3437,12 @@ const char kShowCaretBrowsingDialog[] =
  const char kLacrosLaunchSwitch[] = "lacros_launch_switch";
  #endif
  
@@ -1733,7 +1733,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1215,6 +1215,8 @@ extern const char kDiscountConsentShowInterestIn[];
+@@ -1214,6 +1214,8 @@ extern const char kDiscountConsentShowInterestIn[];
  
  #if BUILDFLAG(IS_ANDROID)
  extern const char kWebXRImmersiveArEnabled[];
@@ -1742,7 +1742,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
  #endif
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1252,6 +1254,10 @@ extern const char kPrivacyGuideViewed[];
+@@ -1251,6 +1253,10 @@ extern const char kPrivacyGuideViewed[];
  
  extern const char kCorsNonWildcardRequestHeadersSupport[];
  
@@ -1791,7 +1791,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
                 bool store_last_modified,
                 bool restore_session);
  
-@@ -86,6 +87,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -88,6 +89,7 @@ class PrefProvider : public UserModifiableProvider {
    raw_ptr<PrefService> prefs_;
  
    const bool off_the_record_;
@@ -1802,7 +1802,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
 diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
 --- a/components/content_settings/core/browser/host_content_settings_map.cc
 +++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -242,6 +242,7 @@ const char* ContentSettingToString(ContentSetting setting) {
+@@ -243,6 +243,7 @@ const char* ContentSettingToString(ContentSetting setting) {
  HostContentSettingsMap::HostContentSettingsMap(
      PrefService* prefs,
      bool is_off_the_record,
@@ -1810,7 +1810,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
      bool store_last_modified,
      bool restore_session)
      : RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()),
-@@ -250,6 +251,7 @@ HostContentSettingsMap::HostContentSettingsMap(
+@@ -251,6 +252,7 @@ HostContentSettingsMap::HostContentSettingsMap(
  #endif
        prefs_(prefs),
        is_off_the_record_(is_off_the_record),
@@ -1818,7 +1818,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
        store_last_modified_(store_last_modified),
        allow_invalid_secondary_pattern_for_testing_(false) {
    TRACE_EVENT0("startup", "HostContentSettingsMap::HostContentSettingsMap");
-@@ -261,7 +263,7 @@ HostContentSettingsMap::HostContentSettingsMap(
+@@ -262,7 +264,7 @@ HostContentSettingsMap::HostContentSettingsMap(
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -1830,7 +1830,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
 --- a/components/content_settings/core/browser/host_content_settings_map.h
 +++ b/components/content_settings/core/browser/host_content_settings_map.h
-@@ -80,6 +80,7 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -81,6 +81,7 @@ class HostContentSettingsMap : public content_settings::Observer,
    // profile or a guest session.
    HostContentSettingsMap(PrefService* prefs,
                           bool is_off_the_record,
@@ -1838,7 +1838,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session);
  
-@@ -450,6 +451,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -442,6 +443,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -1896,7 +1896,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
 diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
 --- a/components/omnibox/browser/base_search_provider.cc
 +++ b/components/omnibox/browser/base_search_provider.cc
-@@ -271,7 +271,7 @@ bool BaseSearchProvider::CanSendRequest(
+@@ -272,7 +272,7 @@ bool BaseSearchProvider::CanSendRequest(
    }
  
    // Don't run if in incognito mode.
@@ -1908,7 +1908,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
 diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
 --- a/components/omnibox/browser/search_provider.cc
 +++ b/components/omnibox/browser/search_provider.cc
-@@ -835,7 +835,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
+@@ -836,7 +836,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
    // keyword input to a keyword suggest server, if any.)
    const TemplateURL* default_url = providers_.GetDefaultProviderURL();
    const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
index ee29bd72..35685f67 100644
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -59,7 +59,6 @@ by a child template that "extends" this file.
+@@ -61,7 +61,6 @@ by a child template that "extends" this file.
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN"
                              android:usesPermissionFlags="neverForLocation"/>
  
@@ -61,7 +61,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 --- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 +++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
-@@ -21,6 +21,20 @@
+@@ -23,6 +23,20 @@ found in the LICENSE file.
              android:visible="false"
              app:showAsAction="ifRoom"
              app:iconTint="@color/default_icon_color_secondary_tint_list" />
@@ -249,7 +249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import android.text.TextUtils;
  import android.util.Pair;
  
-@@ -46,6 +59,32 @@ import java.util.HashMap;
+@@ -43,6 +56,32 @@ import java.util.HashMap;
  import java.util.HashSet;
  import java.util.List;
  
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  /**
   * Provides the communication channel for Android to fetch and manipulate the
   * bookmark model stored in native.
-@@ -737,6 +776,209 @@ public class BookmarkBridge {
+@@ -653,6 +692,209 @@ public class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
      }
  
@@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       * @param query Keyword used for searching bookmarks.
-@@ -1285,6 +1527,39 @@ public class BookmarkBridge {
+@@ -1201,6 +1443,39 @@ public class BookmarkBridge {
          depthList.add(depth);
      }
  
@@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
          List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
          for (int i = 0; i < left.length; i++) {
-@@ -1356,6 +1631,9 @@ public class BookmarkBridge {
+@@ -1272,6 +1547,9 @@ public class BookmarkBridge {
          int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
          void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
                  List<BookmarkId> bookmarksList);
@@ -565,7 +565,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
-@@ -36,6 +36,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
+@@ -34,6 +34,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
  import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
  import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
  import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;
@@ -574,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
  import org.chromium.components.favicon.LargeIconBridge;
  import org.chromium.url.GURL;
-@@ -58,6 +60,8 @@ public class BookmarkManager
+@@ -56,6 +58,8 @@ public class BookmarkManager
      private ComponentName mOpenBookmarkComponentName;
      private ViewGroup mMainView;
      private BookmarkModel mBookmarkModel;
@@ -583,7 +583,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private BookmarkUndoController mUndoController;
      private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
      private BasicNativePage mNativePage;
-@@ -352,6 +356,14 @@ public class BookmarkManager
+@@ -341,6 +345,14 @@ public class BookmarkManager
          mNativePage = nativePage;
      }
  
@@ -598,7 +598,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * @return Current URL representing the UI state of bookmark manager. If no state has been shown
       *         yet in this session, on phone return last used state stored in preference; on tablet
-@@ -532,6 +544,16 @@ public class BookmarkManager
+@@ -521,6 +533,16 @@ public class BookmarkManager
          }
      }
  
@@ -704,7 +704,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1863,6 +1863,13 @@ static_library("browser") {
+@@ -1875,6 +1875,13 @@ static_library("browser") {
      ]
    }
  
@@ -718,7 +718,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -2885,6 +2892,8 @@ static_library("browser") {
+@@ -2891,6 +2898,8 @@ static_library("browser") {
        "autofill/manual_filling_controller.h",
        "autofill/manual_filling_controller_impl.cc",
        "autofill/manual_filling_controller_impl.h",
@@ -727,7 +727,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "autofill/manual_filling_utils.cc",
        "autofill/manual_filling_utils.h",
        "autofill/manual_filling_view_interface.h",
-@@ -3558,8 +3567,6 @@ static_library("browser") {
+@@ -3570,8 +3579,6 @@ static_library("browser") {
        "badging/badge_manager_factory.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -739,7 +739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8654,6 +8654,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8831,6 +8831,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
  #endif
  
@@ -755,7 +755,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -59,6 +59,25 @@
+@@ -60,6 +60,25 @@
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/web_contents.h"
  
@@ -781,7 +781,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  using base::android::AttachCurrentThread;
  using base::android::ConvertUTF16ToJavaString;
  using base::android::ConvertUTF8ToJavaString;
-@@ -76,8 +95,92 @@ using bookmarks::android::JavaBookmarkIdGetType;
+@@ -77,8 +96,92 @@ using bookmarks::android::JavaBookmarkIdGetType;
  using content::BrowserThread;
  using power_bookmarks::PowerBookmarkMeta;
  
@@ -874,7 +874,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  class BookmarkTitleComparer {
   public:
    explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -163,6 +266,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -164,6 +267,10 @@ BookmarkBridge::~BookmarkBridge() {
    if (partner_bookmarks_shim_)
      partner_bookmarks_shim_->RemoveObserver(this);
    reading_list_manager_->RemoveObserver(this);
@@ -885,7 +885,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -573,6 +680,182 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -574,6 +681,182 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -1128,7 +1128,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    void SetBookmarkTitle(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          jlong id,
-@@ -371,12 +391,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -372,12 +392,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    void DestroyJavaObject();
  
    raw_ptr<Profile> profile_;
@@ -1145,7 +1145,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
  
    // Information about the Partner bookmarks (must check for IsLoaded()).
    // This is owned by profile.
-@@ -388,6 +412,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -389,6 +413,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    // Observes the profile destruction and creation.
    base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this};
  
@@ -1251,7 +1251,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6458,6 +6458,11 @@ const char kDisableLacrosTtsSupportDescription[] =
+@@ -6615,6 +6615,11 @@ const char kDisableLacrosTtsSupportDescription[] =
  
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3734,6 +3734,9 @@ extern const char kDisableLacrosTtsSupportName[];
+@@ -3821,6 +3821,9 @@ extern const char kDisableLacrosTtsSupportName[];
  extern const char kDisableLacrosTtsSupportDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCriticalPersistedTabData,
      &kCommerceCoupons,
      &kCCTBackgroundTab,
-@@ -952,6 +953,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService",
+@@ -951,6 +952,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService",
  const base::Feature kWebApkTrampolineOnInitialIntent{
      "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -1301,9 +1301,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -162,6 +162,7 @@ extern const base::Feature kTabReparenting;
- extern const base::Feature kTabSelectionEditorV2;
+@@ -161,6 +161,7 @@ extern const base::Feature kTabSelectionEditorV2;
  extern const base::Feature kTabStripImprovements;
+ extern const base::Feature kDiscoverFeedMultiColumn;
  extern const base::Feature kTabSwitcherOnReturn;
 +extern const base::Feature kBookmarksExportUseSaf;
  extern const base::Feature kTabToGTSAnimation;
@@ -1312,7 +1312,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -588,6 +588,7 @@ public abstract class ChromeFeatureList {
+@@ -612,6 +612,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk";
      public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH";
      public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
@@ -1381,7 +1381,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -99,6 +99,8 @@ public final class ChromePreferenceKeys {
+@@ -100,6 +100,8 @@ public final class ChromePreferenceKeys {
      public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url";
      public static final String BOOKMARKS_LAST_USED_PARENT =
              "enhanced_bookmark_last_used_parent_folder";
@@ -1390,7 +1390,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /**
       * Whether Chrome is set as the default browser.
-@@ -1001,6 +1003,7 @@ public final class ChromePreferenceKeys {
+@@ -1027,6 +1029,7 @@ public final class ChromePreferenceKeys {
                  ASSISTANT_VOICE_SEARCH_ENABLED,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1429,7 +1429,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -404,6 +404,9 @@ static_library("common_lib") {
+@@ -402,6 +402,9 @@ static_library("common_lib") {
      sources += [
        "media/chrome_media_drm_bridge_client.cc",
        "media/chrome_media_drm_bridge_client.h",
diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch
index 72bcfd73..48c8e98f 100644
--- a/build/patches/Add-custom-tab-intents-privacy-option.patch
+++ b/build/patches/Add-custom-tab-intents-privacy-option.patch
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -56,6 +56,16 @@
+@@ -58,6 +58,16 @@ found in the LICENSE file.
          android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
          android:key="do_not_track"
          android:title="@string/do_not_track_title"/>
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
+@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  import org.chromium.chrome.browser.translate.TranslateIntentHandler;
  import org.chromium.chrome.browser.util.AndroidTaskUtils;
  import org.chromium.chrome.browser.vr.VrModuleProvider;
-@@ -57,6 +58,8 @@ import java.lang.annotation.Retention;
+@@ -58,6 +59,8 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  /**
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
-@@ -267,6 +270,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -268,6 +271,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
                  || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
              return false;
-@@ -286,6 +292,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -287,6 +293,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
          newIntent.setData(uri);
          newIntent.setClassName(context, CustomTabActivity.class.getName());
  
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          // Since configureIntentForResizableCustomTab() might change the componenet/class
          // associated with the passed intent, it needs to be called after #setClassName(context,
          // CustomTabActivity.class.getName());
-@@ -421,6 +431,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -431,6 +441,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4800,6 +4800,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4818,6 +4818,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded.">
           Show original
        </message>
diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch
index 8b6e563b..4bba9fa0 100644
--- a/build/patches/Add-exit-menu-item.patch
+++ b/build/patches/Add-exit-menu-item.patch
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -159,6 +159,9 @@
+@@ -161,6 +161,9 @@ found in the LICENSE file.
          <item android:id="@+id/managed_by_menu_id"
              android:title="@string/managed_browser"
              android:icon="@drawable/ic_business" />
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only in the tab switcher -->
-@@ -185,6 +188,9 @@
+@@ -187,6 +190,9 @@ found in the LICENSE file.
          <item android:id="@id/preferences_id"
              android:title="@string/menu_settings"
              android:icon="@drawable/settings_cog" />
@@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -222,6 +222,8 @@ import java.util.HashSet;
+@@ -223,6 +223,8 @@ import java.util.HashSet;
  import java.util.List;
  import java.util.Locale;
  
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  /**
   * This is the main activity for ChromeMobile when not running in document mode.  All the tabs
   * are accessible via a chrome specific tab switching UI.
-@@ -2174,6 +2176,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2183,6 +2185,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          } else if (id == R.id.close_tab) {
              getCurrentTabModel().closeTab(currentTab, true, false, true);
              RecordUserAction.record("MobileTabClosed");
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
+@@ -62,6 +62,7 @@ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
  import org.chromium.chrome.browser.AppHooks;
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2322,6 +2323,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2290,6 +2291,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3511,6 +3511,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3497,6 +3497,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
          Dark theme
        </message>
diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
index c7646535..df8ec877 100644
--- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
+++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -519,6 +519,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
+@@ -521,6 +521,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_ANDROID)
@@ -40,8 +40,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
      {"mode", "always-none"}};
  const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = {
-@@ -4174,7 +4190,11 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsMac | kOsLinux | kOsLacros | kOsWin,
+@@ -4265,7 +4281,11 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsMac | kOsLinux | kOsWin,
       FEATURE_VALUE_TYPE(features::kSystemNotifications)},
  #endif  // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_ANDROID)
@@ -65,7 +65,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/metrics/histogram_functions.h"
-@@ -318,6 +320,15 @@ AutocompleteController::AutocompleteController(
+@@ -327,6 +329,15 @@ AutocompleteController::AutocompleteController(
        is_cros_launcher_(is_cros_launcher),
        search_service_worker_signal_sent_(false),
        template_url_service_(provider_client_->GetTemplateURLService()) {
@@ -84,7 +84,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -475,6 +475,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
    if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
      matches_.push_back(what_you_typed_match);
  
@@ -105,7 +105,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
  #include "base/feature_list.h"
  #include "base/i18n/break_iterator.h"
  #include "base/i18n/case_conversion.h"
-@@ -680,6 +681,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -681,6 +682,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -118,16 +118,16 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -9,6 +9,8 @@
- #include <algorithm>
+@@ -7,6 +7,8 @@
+ #include <stddef.h>
  
  #include "base/check_op.h"
 +#include "base/containers/contains.h"
 +#include "base/command_line.h"
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
- #include "base/ranges/algorithm.h"
-@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+ #include "base/i18n/char_iterator.h"
+@@ -608,6 +610,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
      if (chrome_url && !parts.host.is_valid())
diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch
index fdd0b5c8..7154e27c 100644
--- a/build/patches/Add-flag-for-save-data-header.patch
+++ b/build/patches/Add-flag-for-save-data-header.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4771,7 +4771,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4861,7 +4861,10 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1227,6 +1227,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
+@@ -1230,6 +1230,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
      "Show deprecation notifications and disable functionality for Alt based "
      "six pack deprecations. The Search based versions continue to work.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -647,6 +647,9 @@ extern const char kDeprecateAltClickDescription[];
+@@ -644,6 +644,9 @@ extern const char kDeprecateAltClickDescription[];
  extern const char kDeprecateAltBasedSixPackName[];
  extern const char kDeprecateAltBasedSixPackDescription[];
  
diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch
index f6fc167e..a0aae85c 100644
--- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch
+++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch
@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1018,6 +1018,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
+@@ -1010,6 +1010,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
       switches::kForceDisplayColorProfile, "hdr10"},
  };
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::Choice kMemlogModeChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
-@@ -4695,6 +4700,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4760,6 +4765,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kAndroidPictureInPictureAPIName,
       flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)},
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1794,6 +1794,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
+@@ -1815,6 +1815,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
      "websites abusing the API will still eventually have their setTimeouts "
      "clamped.";
  
@@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1009,6 +1009,9 @@ extern const char kLogJsConsoleMessagesDescription[];
+@@ -1014,6 +1014,9 @@ extern const char kLogJsConsoleMessagesDescription[];
  extern const char kUnthrottledNestedTimeoutName[];
  extern const char kUnthrottledNestedTimeoutDescription[];
  
diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch
index 962bb223..4a9ca406 100644
--- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch
+++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3396,6 +3396,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3527,6 +3527,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebRtcRemoteEventLogName,
       flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)},
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1318,6 +1318,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
+@@ -1332,6 +1332,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
      "Enables image options to be surfaced in the context menu for nodes "
      "covered by transparent overlays.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -726,6 +726,9 @@ extern const char kEnablePortalsDescription[];
+@@ -729,6 +729,9 @@ extern const char kEnablePortalsDescription[];
  extern const char kEnablePortalsCrossOriginName[];
  extern const char kEnablePortalsCrossOriginDescription[];
  
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -287,11 +287,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -283,11 +283,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
  // when in background.
  const base::Feature kResumeBackgroundVideo {
    "resume-background-video",
diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch
index 6f240fd6..9f43d351 100644
--- a/build/patches/Add-flag-to-disable-IPv6-probes.patch
+++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5729,6 +5729,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5850,6 +5850,10 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
       flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3373,6 +3373,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
+@@ -3438,6 +3438,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
      "Enables sending real-time engagement signals (e.g. scroll) through "
      "CustomTabsCallback.";
  
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -792,6 +792,9 @@ extern const char kEnableWasmLazyCompilationName[];
+@@ -795,6 +795,9 @@ extern const char kEnableWasmLazyCompilationName[];
  extern const char kEnableWasmLazyCompilationDescription[];
  
  extern const char kEnableWasmTieringName[];
@@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
  #include "net/log/net_log_with_source.h"
  #include "net/socket/client_socket_factory.h"
  #include "net/socket/datagram_client_socket.h"
-@@ -4074,8 +4075,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -4084,8 +4085,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
    if (last_ipv6_probe_time_.is_null() ||
        (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
            kIPv6ProbePeriodMs) {
diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch
index 403f0d00..86bbedbb 100644
--- a/build/patches/Add-flag-to-disable-external-intent-requests.patch
+++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3389,6 +3389,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3521,6 +3521,9 @@ const FeatureEntry kFeatureEntries[] = {
      {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
       flag_descriptions::kUiPartialSwapDescription, kOsAll,
       SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3735,6 +3735,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
+@@ -3817,6 +3817,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
  const char kPhotoPickerVideoSupportDescription[] =
      "Enables video files to be shown in the Photo Picker dialog";
  
@@ -44,9 +44,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2137,6 +2137,9 @@ extern const char kQueryTilesDescription[];
- extern const char kQueryTilesNTPName[];
- extern const char kQueryTilesNTPDescription[];
+@@ -2188,6 +2188,9 @@ extern const char kQueryTilesNTPDescription[];
+ extern const char kQueryTilesOnStartName[];
+ extern const char kQueryTilesOnStartDescription[];
  extern const char kQueryTilesSingleTierName[];
 +extern const char kDisableExternalIntentRequestsName[];
 +extern const char kDisableExternalIntentRequestsDescription[];
diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch
index 1ecb95b7..a6f8047c 100644
--- a/build/patches/Add-flag-to-disable-vibration.patch
+++ b/build/patches/Add-flag-to-disable-vibration.patch
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7096,6 +7096,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7243,6 +7243,10 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
  #endif
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6104,6 +6104,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
+@@ -6242,6 +6242,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
  
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3727,6 +3727,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+@@ -3814,6 +3814,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
  extern const char kWebUITabStripTabDragIntegrationDescription[];
  #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -83,7 +83,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -332,6 +332,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
+@@ -337,6 +337,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
      kCompositorLockTimeout;
  
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -95,26 +95,26 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -88,6 +88,7 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation(
-       bool);
-   BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable);
-+  BLINK_PLATFORM_EXPORT static void EnableVibration(bool);
-   BLINK_PLATFORM_EXPORT static void EnableCompositeBGColorAnimation(
-       bool enable);
-   BLINK_PLATFORM_EXPORT static void EnableCanvas2dImageChromium(bool);
+@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+   static void EnableFingerprintingCanvasMeasureTextNoise(bool);
+   static void EnableFingerprintingCanvasImageDataNoise(bool);
+   static void EnableFluentScrollbars(bool);
++  static void EnableVibration(bool);
+ 
+   WebRuntimeFeatures() = delete;
+ };
 diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
-@@ -30,6 +30,7 @@
+@@ -29,6 +29,7 @@
+ #include "third_party/blink/renderer/core/frame/local_frame.h"
  #include "third_party/blink/renderer/core/frame/navigator.h"
  #include "third_party/blink/renderer/core/page/page.h"
- #include "third_party/blink/renderer/platform/mojo/mojo_helper.h"
 +#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
  
  // Maximum number of entries in a vibration pattern.
  const unsigned kVibrationPatternLengthMax = 99;
-@@ -153,6 +154,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -152,6 +153,8 @@ bool VibrationController::vibrate(Navigator& navigator,
    // reference to |window| or |navigator| was retained in another window.
    if (!navigator.DomWindow())
      return false;
@@ -126,21 +126,21 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -160,6 +160,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
-   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
+@@ -52,6 +52,10 @@ void WebRuntimeFeatures::EnableTestOnlyFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetTestFeaturesEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableVibration(bool enable) {
 +  RuntimeEnabledFeatures::SetVibrationEnabled(enable);
 +}
 +
- void WebRuntimeFeatures::EnableKeyboardAccessibleTooltip(bool enable) {
-   RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable);
+ void WebRuntimeFeatures::EnableOriginTrialControlledFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetOriginTrialControlledFeaturesEnabled(enable);
  }
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1569,6 +1569,10 @@
+@@ -1786,6 +1786,10 @@
        name: "OrientationEvent",
        status: {"Android": "stable"},
      },
diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch
index 037a7395..aafc81d0 100644
--- a/build/patches/Add-lifetime-options-for-permissions.patch
+++ b/build/patches/Add-lifetime-options-for-permissions.patch
@@ -65,9 +65,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/content_settings/android/BUILD.gn  |  1 +
  .../core/browser/content_settings_utils.cc    | 29 +++++++
  .../core/browser/content_settings_utils.h     |  6 ++
- .../core/browser/host_content_settings_map.cc |  2 +-
- .../core/common/content_settings.cc           |  7 +-
- .../core/common/content_settings.h            |  4 +-
  .../common/content_settings_constraints.h     | 11 +++
  .../page_info/PageInfoController.java         |  4 +-
  .../PermissionParamsListBuilder.java          | 13 ++-
@@ -90,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/permissions/permission_request.h   | 17 +++-
  .../permissions/permission_request_manager.cc | 37 ++++++---
  .../permissions/permission_request_manager.h  | 11 ++-
- 38 files changed, 481 insertions(+), 60 deletions(-)
+ 35 files changed, 472 insertions(+), 56 deletions(-)
 
 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -184,7 +181,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -407,10 +407,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -410,10 +410,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    LacrosFirstRunServiceFactory::GetInstance();
  #endif
    LanguageModelManagerFactory::GetInstance();
@@ -199,7 +196,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -484,6 +484,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -503,6 +503,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
          web_contents);
    }
    video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents);
@@ -260,8 +257,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +import org.chromium.components.content_settings.SessionModel;
  import org.chromium.components.embedder_support.util.Origin;
  import org.chromium.content_public.browser.BrowserContextHandle;
- 
-@@ -523,6 +524,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+ import org.chromium.content_public.browser.ContentFeatureList;
+@@ -528,6 +529,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
      }
  
@@ -273,7 +270,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      private void setUpClearDataPreference() {
          ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
          long usage = mSite.getTotalUsage();
-@@ -915,6 +921,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -926,6 +932,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          if (contentType == mHighlightedPermission) {
              switchPreference.setBackgroundColor(mHighlightColor);
          }
@@ -332,7 +329,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
      insertionFunc(env, static_cast<int>(content_type), list,
                    ConvertOriginToJavaString(env, origin), jembedder,
 -                  /*is_embargoed=*/false);
-+                  /*is_embargoed=*/false, static_cast<int>(settings_it.session_model));
++                  /*is_embargoed=*/false, static_cast<int>(settings_it.metadata.session_model));
    }
  
    // Add any origins which have a default content setting value (thus skipped
@@ -348,7 +345,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -600,6 +600,11 @@
+@@ -602,6 +602,11 @@
        <message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
          URL truncated
        </message>
@@ -374,7 +371,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -184,4 +184,33 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
+@@ -189,6 +189,35 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
    return base::Time::Now() + duration;
  }
  
@@ -392,13 +389,13 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 +
 +bool IsConstraintSessionExpiration(const ContentSettingPatternSource& source,
 +                                   LifetimeMode lifetime_mode) {
-+  if (source.session_model != content_settings::SessionModel::UserSession)
++  if (source.metadata.session_model != content_settings::SessionModel::UserSession)
 +    return false;
 +
 +  LifetimeMode type;
-+  if (source.expiration == base::Time()) {
++  if (source.metadata.expiration == base::Time()) {
 +    type = LifetimeMode::UntilBrowserClosed;
-+  } else if (source.expiration == (base::Time() + base::Hours(1))) {
++  } else if (source.metadata.expiration == (base::Time() + base::Hours(1))) {
 +    type = LifetimeMode::OnlyThisTime;
 +  } else {
 +    type = LifetimeMode::UntilOriginClosed;
@@ -407,13 +404,15 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 +  return lifetime_mode == type;
 +}
 +
- }  // namespace content_settings
+ bool CanTrackLastVisit(ContentSettingsType type) {
+ #if BUILDFLAG(IS_ANDROID)
+   // The notification provider on Android does not support last visit tracking.
 diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
 --- a/components/content_settings/core/browser/content_settings_utils.h
 +++ b/components/content_settings/core/browser/content_settings_utils.h
-@@ -73,6 +73,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
- // Returns the expiration time for a supplied |duration|.
- base::Time GetConstraintExpiration(const base::TimeDelta duration);
+@@ -76,6 +76,12 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration);
+ // Returns whether the given type supports tracking last_visit timestamps.
+ bool CanTrackLastVisit(ContentSettingsType type);
  
 +ContentSettingConstraints GetConstraintSessionExpiration(LifetimeMode lifetime_mode);
 +
@@ -421,71 +420,9 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b
 +    const ContentSettingPatternSource& source,
 +    LifetimeMode lifetime_mode);
 +
- }  // namespace content_settings
+ // Get a timestamp with week-precision.
+ base::Time GetCoarseTime(base::Time time);
  
- #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_UTILS_H_
-diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
---- a/components/content_settings/core/browser/host_content_settings_map.cc
-+++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -847,7 +847,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
-     settings->emplace_back(rule.primary_pattern, rule.secondary_pattern,
-                            std::move(value),
-                            kProviderNamesSourceMap[provider_type].provider_name,
--                           incognito, rule.expiration);
-+                           incognito, rule.expiration, rule.session_model);
-   }
- }
- 
-diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
---- a/components/content_settings/core/common/content_settings.cc
-+++ b/components/content_settings/core/common/content_settings.cc
-@@ -158,13 +158,15 @@ ContentSettingPatternSource::ContentSettingPatternSource(
-     base::Value setting_value,
-     const std::string& source,
-     bool incognito,
--    base::Time expiration)
-+    base::Time expiration,
-+    content_settings::SessionModel session_model)
-     : primary_pattern(primary_pattern),
-       secondary_pattern(secondary_pattern),
-       setting_value(std::move(setting_value)),
-       expiration(expiration),
-       source(source),
--      incognito(incognito) {}
-+      incognito(incognito),
-+      session_model(session_model) {}
- 
- ContentSettingPatternSource::ContentSettingPatternSource() : incognito(false) {}
- 
-@@ -181,6 +183,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=(
-   expiration = other.expiration;
-   source = other.source;
-   incognito = other.incognito;
-+  session_model = other.session_model;
-   return *this;
- }
- 
-diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
---- a/components/content_settings/core/common/content_settings.h
-+++ b/components/content_settings/core/common/content_settings.h
-@@ -49,7 +49,8 @@ struct ContentSettingPatternSource {
-                               base::Value setting_value,
-                               const std::string& source,
-                               bool incognito,
--                              base::Time expiration = base::Time());
-+                              base::Time expiration = base::Time(),
-+                              content_settings::SessionModel session_model = content_settings::SessionModel::Durable);
-   ContentSettingPatternSource(const ContentSettingPatternSource& other);
-   ContentSettingPatternSource();
-   ContentSettingPatternSource& operator=(
-@@ -64,6 +65,7 @@ struct ContentSettingPatternSource {
-   base::Time expiration;
-   std::string source;
-   bool incognito;
-+  content_settings::SessionModel session_model;
- };
- 
- typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
 diff --git a/components/content_settings/core/common/content_settings_constraints.h b/components/content_settings/core/common/content_settings_constraints.h
 --- a/components/content_settings/core/common/content_settings_constraints.h
 +++ b/components/content_settings/core/common/content_settings_constraints.h
@@ -555,7 +492,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
              }
          }
  
-@@ -123,13 +128,15 @@ public class PermissionParamsListBuilder {
+@@ -124,13 +129,15 @@ public class PermissionParamsListBuilder {
          public final String nameMidSentence;
          public final int type;
          public final @ContentSettingValues int setting;
@@ -575,7 +512,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
 --- a/components/page_info/android/page_info_controller_android.cc
 +++ b/components/page_info/android/page_info_controller_android.cc
-@@ -162,6 +162,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -171,6 +171,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
@@ -584,7 +521,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
  
    for (const auto& permission : permission_info_list) {
      if (base::Contains(permissions_to_display, permission.type)) {
-@@ -170,6 +172,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -179,6 +181,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
        if (setting_to_display) {
          user_specified_settings_to_display[permission.type] =
              *setting_to_display;
@@ -593,7 +530,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
        }
      }
    }
-@@ -186,7 +190,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -195,7 +199,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
@@ -603,7 +540,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
      }
    }
  
-@@ -199,7 +204,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -208,7 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
          env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
          ConvertUTF16ToJavaString(env, object_title),
          static_cast<jint>(chosen_object->ui_info.content_settings_type),
@@ -616,19 +553,19 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1084,6 +1084,8 @@ void PageInfo::PresentSitePermissions() {
+@@ -1151,6 +1151,8 @@ void PageInfo::PresentSitePermissions() {
      permission_info.source = info.source;
-     permission_info.is_one_time =
-         (info.session_model == content_settings::SessionModel::OneTime);
+     permission_info.is_one_time = (info.metadata.session_model ==
+                                    content_settings::SessionModel::OneTime);
 +    permission_info.is_user_session =
-+        (info.session_model == content_settings::SessionModel::UserSession);
++        (info.metadata.session_model == content_settings::SessionModel::UserSession);
  
      if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
          info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
 diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
-@@ -178,6 +178,7 @@ class PageInfo {
+@@ -180,6 +180,7 @@ class PageInfo : private content_settings::CookieControlsView {
      content_settings::SettingSource source =
          content_settings::SETTING_SOURCE_NONE;
      bool is_one_time = false;
@@ -1021,7 +958,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -250,6 +250,20 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -252,6 +252,20 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(delete_callback));
  }
  
@@ -1042,7 +979,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  PermissionResult PermissionContextBase::GetPermissionStatus(
      content::RenderFrameHost* render_frame_host,
      const GURL& requesting_origin,
-@@ -441,7 +455,8 @@ void PermissionContextBase::PermissionDecided(
+@@ -443,7 +457,8 @@ void PermissionContextBase::PermissionDecided(
      const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      ContentSetting content_setting,
@@ -1052,7 +989,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
           content_setting == CONTENT_SETTING_BLOCK ||
           content_setting == CONTENT_SETTING_DEFAULT);
-@@ -449,9 +464,9 @@ void PermissionContextBase::PermissionDecided(
+@@ -451,9 +466,9 @@ void PermissionContextBase::PermissionDecided(
                               content_setting);
  
    bool persist = content_setting != CONTENT_SETTING_DEFAULT;
@@ -1064,7 +1001,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  }
  
  content::BrowserContext* PermissionContextBase::browser_context() const {
-@@ -501,11 +516,26 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -503,11 +518,26 @@ void PermissionContextBase::NotifyPermissionSet(
      bool persist,
      ContentSetting content_setting,
      bool is_one_time) {
@@ -1092,7 +1029,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  
    UpdateTabContext(id, requesting_origin,
-@@ -526,6 +556,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -528,6 +558,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                   const GURL& embedding_origin,
                                                   ContentSetting content_setting,
                                                   bool is_one_time) {
@@ -1108,7 +1045,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
    DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-@@ -534,6 +573,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -536,6 +575,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
    content_settings::ContentSettingConstraints constraints = {
        base::Time(), is_one_time ? content_settings::SessionModel::OneTime
                                  : content_settings::SessionModel::Durable};
@@ -1299,7 +1236,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -152,7 +152,7 @@ void PermissionRequestManager::AddRequest(
+@@ -156,7 +156,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1308,7 +1245,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      request->RequestFinished();
      return;
    }
-@@ -228,7 +228,7 @@ void PermissionRequestManager::AddRequest(
+@@ -232,7 +232,7 @@ void PermissionRequestManager::AddRequest(
    if (auto_approval_origin) {
      if (url::Origin::Create(request->requesting_origin()) ==
          auto_approval_origin.value()) {
@@ -1317,7 +1254,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      }
      request->RequestFinished();
      return;
-@@ -487,12 +487,13 @@ void PermissionRequestManager::Accept() {
+@@ -491,12 +491,13 @@ void PermissionRequestManager::Accept() {
    for (requests_iter = requests_.begin(); requests_iter != requests_.end();
         requests_iter++) {
      PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1333,7 +1270,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -500,12 +501,22 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -504,12 +505,22 @@ void PermissionRequestManager::AcceptThisTime() {
    for (requests_iter = requests_.begin(); requests_iter != requests_.end();
         requests_iter++) {
      PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1357,7 +1294,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -527,7 +538,7 @@ void PermissionRequestManager::Deny() {
+@@ -529,7 +540,7 @@ void PermissionRequestManager::Deny() {
    std::vector<PermissionRequest*>::iterator requests_iter;
    for (requests_iter = requests_.begin(); requests_iter != requests_.end();
         requests_iter++) {
@@ -1366,7 +1303,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
    FinalizeCurrentRequests(PermissionAction::DENIED);
  }
-@@ -892,25 +903,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
+@@ -894,25 +905,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1398,7 +1335,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  }
  
  void PermissionRequestManager::CancelledIncludingDuplicates(
-@@ -1090,7 +1101,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
+@@ -1092,7 +1103,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
  void PermissionRequestManager::DoAutoResponseForTesting() {
    switch (auto_response_for_test_) {
      case ACCEPT_ONCE:
@@ -1410,7 +1347,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h
 --- a/components/permissions/permission_request_manager.h
 +++ b/components/permissions/permission_request_manager.h
-@@ -134,8 +134,10 @@ class PermissionRequestManager
+@@ -136,8 +136,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1422,7 +1359,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    bool WasCurrentRequestAlreadyDisplayed() override;
-@@ -272,9 +274,12 @@ class PermissionRequestManager
+@@ -274,9 +276,12 @@ class PermissionRequestManager
  
    // Calls PermissionGranted on a request and all its duplicates.
    void PermissionGrantedIncludingDuplicates(PermissionRequest* request,
diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
index c82b317c..99b1b742 100644
--- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -64,6 +64,10 @@
+@@ -66,6 +66,10 @@ found in the LICENSE file.
          <item android:id="@+id/all_bookmarks_menu_id"
              android:title="@string/menu_bookmarks"
              android:icon="@drawable/btn_star_filled" />
@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/recent_tabs_menu_id"
              android:title="@string/menu_recent_tabs"
              android:icon="@drawable/devices_black_24dp" />
-@@ -182,6 +186,9 @@
+@@ -184,6 +188,9 @@ found in the LICENSE file.
          <item android:id="@+id/menu_group_tabs"
              android:title="@string/menu_group_tabs"
              android:icon="@drawable/ic_widgets" />
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -75,6 +75,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
+@@ -76,6 +76,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -2188,6 +2190,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2197,6 +2199,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
                      () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              // Close only incognito tabs
              CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
-@@ -2240,6 +2244,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2249,6 +2253,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          mTabModalHandler.onOmniboxFocusChanged(hasFocus);
      }
  
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
-@@ -616,6 +616,7 @@ public class BookmarkUtils {
+@@ -614,6 +614,7 @@ public class BookmarkUtils {
          List<BookmarkId> topLevelFolders = new ArrayList<>();
          BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId();
          BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId();
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          BookmarkId othersNodeId = bookmarkModel.getOtherFolderId();
  
          List<BookmarkId> specialFoldersIds =
-@@ -641,6 +642,9 @@ public class BookmarkUtils {
+@@ -639,6 +640,9 @@ public class BookmarkUtils {
          if (bookmarkModel.isFolderVisible(mobileNodeId)) {
              topLevelFolders.add(mobileNodeId);
          }
@@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -436,6 +436,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
+@@ -437,6 +437,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
          top_level_folders.push_back(node.get());
      }
  
@@ -242,7 +242,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
      for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) {
        if (node->is_folder())
          top_level_folders.push_back(node.get());
-@@ -483,6 +488,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -484,6 +489,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
    // Vector to temporarily contain all child bookmarks at same level for sorting
    std::vector<const BookmarkNode*> bookmarks = {
        bookmark_model_->mobile_node(),
@@ -250,7 +250,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -535,6 +541,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
+@@ -536,6 +542,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
    return folder_id_obj;
  }
  
@@ -317,7 +317,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
 diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
 +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
-@@ -117,6 +117,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty(
+@@ -144,6 +144,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty(
        return !is_mobile;
      case bookmarks::BookmarkNode::MOBILE:
        return is_mobile;
@@ -350,7 +350,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3600,6 +3600,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3609,6 +3609,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]">
          Track prices
        </message>
@@ -386,7 +386,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
 diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
 --- a/components/bookmarks/browser/bookmark_codec.cc
 +++ b/components/bookmarks/browser/bookmark_codec.cc
-@@ -34,6 +34,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
+@@ -35,6 +35,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
  const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
  // The value is left as 'synced' for historical reasons.
  const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
@@ -394,33 +394,33 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  const char BookmarkCodec::kVersionKey[] = "version";
  const char BookmarkCodec::kChecksumKey[] = "checksum";
  const char BookmarkCodec::kIdKey[] = "id";
-@@ -76,7 +77,8 @@ BookmarkCodec::~BookmarkCodec() = default;
+@@ -78,7 +79,8 @@ BookmarkCodec::~BookmarkCodec() = default;
  base::Value BookmarkCodec::Encode(BookmarkModel* model,
                                    std::string sync_metadata_str) {
    return Encode(model->bookmark_bar_node(), model->other_node(),
 -                model->mobile_node(), model->root_node()->GetMetaInfoMap(),
 +                model->mobile_node(), model->tabs_collection_node(),
 +                model->root_node()->GetMetaInfoMap(),
+                 model->root_node()->GetUnsyncedMetaInfoMap(),
                  std::move(sync_metadata_str));
  }
- 
-@@ -84,6 +86,7 @@ base::Value BookmarkCodec::Encode(
+@@ -87,6 +89,7 @@ base::Value BookmarkCodec::Encode(
      const BookmarkNode* bookmark_bar_node,
      const BookmarkNode* other_folder_node,
      const BookmarkNode* mobile_folder_node,
 +    const BookmarkNode* tabs_folder_node,
      const BookmarkNode::MetaInfoMap* model_meta_info_map,
+     const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
      std::string sync_metadata_str) {
-   ids_reassigned_ = false;
-@@ -105,6 +108,7 @@ base::Value BookmarkCodec::Encode(
+@@ -109,6 +112,7 @@ base::Value BookmarkCodec::Encode(
    roots.SetKey(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
    roots.SetKey(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
    roots.SetKey(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
 +  roots.SetKey(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
    if (model_meta_info_map)
      roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map));
-   FinalizeChecksum();
-@@ -121,6 +125,7 @@ bool BookmarkCodec::Decode(const base::Value& value,
+   if (model_unsynced_meta_info_map) {
+@@ -130,6 +134,7 @@ bool BookmarkCodec::Decode(const base::Value& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
@@ -428,7 +428,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                             int64_t* max_id,
                             std::string* sync_metadata_str) {
    ids_.clear();
-@@ -128,7 +133,8 @@ bool BookmarkCodec::Decode(const base::Value& value,
+@@ -137,7 +142,8 @@ bool BookmarkCodec::Decode(const base::Value& value,
              base::GUID::ParseLowercase(BookmarkNode::kBookmarkBarNodeGuid),
              base::GUID::ParseLowercase(BookmarkNode::kOtherBookmarksNodeGuid),
              base::GUID::ParseLowercase(BookmarkNode::kMobileBookmarksNodeGuid),
@@ -438,7 +438,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    ids_reassigned_ = false;
    guids_reassigned_ = false;
    ids_valid_ = true;
-@@ -136,12 +142,13 @@ bool BookmarkCodec::Decode(const base::Value& value,
+@@ -145,12 +151,13 @@ bool BookmarkCodec::Decode(const base::Value& value,
    stored_checksum_.clear();
    InitializeChecksum();
    bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
@@ -453,7 +453,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    *max_id = maximum_id_ + 1;
    return success;
  }
-@@ -194,6 +201,7 @@ base::Value BookmarkCodec::EncodeMetaInfo(
+@@ -207,6 +214,7 @@ base::Value BookmarkCodec::EncodeMetaInfo(
  bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                   BookmarkNode* other_folder_node,
                                   BookmarkNode* mobile_folder_node,
@@ -461,7 +461,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                                   const base::Value& value,
                                   std::string* sync_metadata_str) {
    if (!value.is_dict())
-@@ -225,6 +233,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -238,6 +246,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
      return false;
  
    DecodeNode(*bb_value, nullptr, bb_node);
@@ -474,7 +474,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    DecodeNode(*other_folder_value, nullptr, other_folder_node);
    DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
  
-@@ -470,11 +484,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+@@ -508,11 +522,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,
@@ -493,14 +493,14 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
 --- a/components/bookmarks/browser/bookmark_codec.h
 +++ b/components/bookmarks/browser/bookmark_codec.h
 @@ -48,6 +48,7 @@ class BookmarkCodec {
-   base::Value Encode(const BookmarkNode* bookmark_bar_node,
-                      const BookmarkNode* other_folder_node,
-                      const BookmarkNode* mobile_folder_node,
+   base::Value Encode(
+       const BookmarkNode* bookmark_bar_node,
+       const BookmarkNode* other_folder_node,
 +                     const BookmarkNode* tabs_folder_node,
-                      const BookmarkNode::MetaInfoMap* model_meta_info_map,
-                      std::string sync_metadata_str);
- 
-@@ -60,6 +61,7 @@ class BookmarkCodec {
+       const BookmarkNode* mobile_folder_node,
+       const BookmarkNode::MetaInfoMap* model_meta_info_map,
+       const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
+@@ -62,6 +63,7 @@ class BookmarkCodec {
                BookmarkNode* bb_node,
                BookmarkNode* other_folder_node,
                BookmarkNode* mobile_folder_node,
@@ -508,7 +508,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -105,6 +107,7 @@ class BookmarkCodec {
+@@ -113,6 +115,7 @@ class BookmarkCodec {
    // Allows the BookmarkClient to read and a write a string blob from the JSON
    // file. That string captures the bookmarks sync metadata.
    static const char kSyncMetadata[];
@@ -516,7 +516,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
    static const char kDateLastUsed[];
  
    // Possible values for kTypeKey.
-@@ -122,6 +125,7 @@ class BookmarkCodec {
+@@ -130,6 +133,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -524,7 +524,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value& value,
                      std::string* sync_metadata_str);
  
-@@ -133,7 +137,8 @@ class BookmarkCodec {
+@@ -141,7 +145,8 @@ class BookmarkCodec {
    // Reassigns bookmark IDs for all nodes.
    void ReassignIDs(BookmarkNode* bb_node,
                     BookmarkNode* other_node,
@@ -559,7 +559,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
  
    TitledUrlIndex* index() { return index_.get(); }
    std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); }
-@@ -103,6 +104,7 @@ class BookmarkLoadDetails {
+@@ -110,6 +111,7 @@ class BookmarkLoadDetails {
    raw_ptr<BookmarkPermanentNode> bb_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> other_folder_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> mobile_folder_node_ = nullptr;
@@ -570,7 +570,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
 --- a/components/bookmarks/browser/bookmark_model.cc
 +++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -618,7 +618,7 @@ bool BookmarkModel::HasBookmarks() {
+@@ -666,7 +666,7 @@ bool BookmarkModel::HasBookmarks() {
  bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    return bookmark_bar_node_->children().empty() &&
@@ -579,7 +579,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) {
-@@ -871,6 +871,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -920,6 +920,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
    bookmark_bar_node_ = details->bb_node();
    other_node_ = details->other_folder_node();
    mobile_node_ = details->mobile_folder_node();
@@ -590,7 +590,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -121,6 +121,12 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -122,6 +122,12 @@ class BookmarkModel : public BookmarkUndoProvider,
      return mobile_node_;
    }
  
@@ -603,7 +603,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
    bool is_root_node(const BookmarkNode* node) const {
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
      return node == root_;
-@@ -426,6 +432,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider,
    raw_ptr<BookmarkPermanentNode> bookmark_bar_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> other_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> mobile_node_ = nullptr;
@@ -625,7 +625,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmark
  // static
  const char BookmarkNode::kManagedNodeGuid[] =
      "323123f4-9381-5aee-80e6-ea5fca2f7672";
-@@ -225,6 +229,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
+@@ -275,6 +279,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
        visible_when_empty));
  }
  
@@ -662,7 +662,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
    static const char kManagedNodeGuid[];
  
    // A bug in sync caused some problematic GUIDs to be produced.
-@@ -256,6 +258,9 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -270,6 +272,9 @@ class BookmarkPermanentNode : public BookmarkNode {
    static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
        int64_t id,
        bool visible_when_empty);
@@ -688,7 +688,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
 --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
 +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
-@@ -441,6 +441,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+@@ -446,6 +446,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
      case bookmarks::BookmarkNode::BOOKMARK_BAR:
      case bookmarks::BookmarkNode::OTHER_NODE:
      case bookmarks::BookmarkNode::MOBILE:
diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch
index 1352ae57..140f3d94 100644
--- a/build/patches/Add-menu-item-to-view-source.patch
+++ b/build/patches/Add-menu-item-to-view-source.patch
@@ -4,19 +4,19 @@ Subject: Add menu item to view source
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/custom_tabs_menu.xml  |  3 +++
- chrome/android/java/res/menu/main_menu.xml         |  3 +++
- .../chrome/browser/ChromeTabbedActivity.java       |  2 ++
- .../chrome/browser/app/ChromeActivity.java         |  5 +++++
- .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../ui/android/strings/android_chrome_strings.grd  |  4 ++++
- 7 files changed, 32 insertions(+)
+ .../android/java/res/menu/custom_tabs_menu.xml |  3 +++
+ chrome/android/java/res/menu/main_menu.xml     |  3 +++
+ .../chrome/browser/ChromeTabbedActivity.java   |  2 ++
+ .../chrome/browser/app/ChromeActivity.java     |  5 +++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java | 18 ++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java    |  1 +
+ .../android/strings/android_chrome_strings.grd |  4 ++++
+ 7 files changed, 36 insertions(+)
 
 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
 +++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -46,6 +46,9 @@
+@@ -48,6 +48,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:orderInCategory="2" />
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -106,6 +106,9 @@
+@@ -108,6 +108,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2214,6 +2214,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2223,6 +2223,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2428,6 +2428,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2446,6 +2446,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -540,6 +540,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -541,6 +541,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                          isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
  
          updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  
          updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
  
-@@ -1170,6 +1171,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1208,6 +1209,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          stopPriceTrackingMenuItem.setVisible(false);
      }
  
@@ -90,8 +90,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 +    protected void updateViewSourceMenuItem(
 +            Menu menu, Tab currentTab) {
 +        MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
-+        String url = currentTab.getUrl().getSpec();
-+        viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:"));
++        boolean visible = false;
++        if (currentTab != null) {
++                String url = currentTab.getUrl().getSpec();
++                visible = !url.isEmpty() && !url.startsWith("view-source:");
++        }
++        viewSourceMenuItem.setVisible(visible);
 +    }
 +
      /**
diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch
index 53927a01..294bd6a7 100644
--- a/build/patches/Add-option-to-force-tablet-UI.patch
+++ b/build/patches/Add-option-to-force-tablet-UI.patch
@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -390,6 +390,7 @@ public final class ChromePreferenceKeys {
+@@ -414,6 +414,7 @@ public final class ChromePreferenceKeys {
              AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
  
      public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
-@@ -355,7 +355,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -368,7 +368,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
      // OmniboxSuggestionsDropdownEmbedder implementation
      @Override
      public boolean isTablet() {
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1433,6 +1433,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1439,6 +1439,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">
          Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps
        </message>
@@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
    disallowed_extension_deps_ = [
      # Components should largely not depend on //extensions. Since // extensions
      # is not a component target and is linked with //chrome, depending on most
-@@ -667,7 +667,7 @@ test("components_unittests") {
+@@ -673,7 +673,7 @@ test("components_unittests") {
    # On other platforms, no components should depend on Chrome.
    # Since //chrome depends on //extensions, we also only assert_no_deps on
    # extensions targets for non-lacros builds.
@@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
      assert_no_deps = [ "//chrome/*" ]
      assert_no_deps += disallowed_extension_deps_
    }
-@@ -955,7 +955,7 @@ if (!is_ios) {
+@@ -974,7 +974,7 @@ if (!is_ios) {
      # dependency. On other platforms, no components should depend on Chrome.
      # Since //chrome depends on //extensions, we also only assert_no_deps on
      # extensions targets for non-lacros builds.
@@ -156,7 +156,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -34,6 +34,11 @@
+@@ -36,6 +36,11 @@ found in the LICENSE file.
          android:summary="@string/accessibility_tab_switcher_summary"
          android:title="@string/accessibility_tab_switcher_title" />
  
@@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
 --- a/ui/android/BUILD.gn
 +++ b/ui/android/BUILD.gn
-@@ -370,6 +370,8 @@ android_library("ui_no_recycler_view_java") {
+@@ -372,6 +372,8 @@ android_library("ui_no_recycler_view_java") {
    deps = [
      ":ui_java_resources",
      ":ui_utils_java",
diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
index f321ee8f..ae328610 100644
--- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -43,6 +43,11 @@
+@@ -45,6 +45,11 @@ found in the LICENSE file.
          android:title="@string/incognito_settings_title"
          android:summary="@string/incognito_settings_summary"
          android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -38,6 +38,7 @@ import androidx.lifecycle.LifecycleRegistry;
+@@ -39,6 +39,7 @@ import androidx.lifecycle.LifecycleRegistry;
  
  import org.chromium.base.CallbackController;
  import org.chromium.base.CommandLine;
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.base.IntentUtils;
  import org.chromium.base.Log;
  import org.chromium.base.MemoryPressureListener;
-@@ -1312,8 +1313,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1316,8 +1317,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -68,16 +68,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -54,6 +57,8 @@ public class PrivacySettings
-     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
+@@ -67,6 +70,8 @@ public class PrivacySettings
+             SharedPreferencesManager.getInstance();
+     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
  
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
 +
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private IncognitoLockSettings mIncognitoLockSettings;
  
-@@ -115,7 +120,11 @@ public class PrivacySettings
+@@ -132,7 +137,11 @@ public class PrivacySettings
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
              UserPrefs.get(Profile.getLastUsedRegularProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
-@@ -156,6 +165,11 @@ public class PrivacySettings
+@@ -176,6 +185,11 @@ public class PrivacySettings
                      PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
          }
  
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4475,6 +4475,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4438,6 +4438,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>
diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch
index 37c6db7f..59ccd7e3 100644
--- a/build/patches/Add-option-to-use-home-page-as-NTP.patch
+++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
 --- a/chrome/android/java/res/xml/homepage_preferences.xml
 +++ b/chrome/android/java/res/xml/homepage_preferences.xml
-@@ -12,6 +12,11 @@
+@@ -14,6 +14,11 @@ found in the LICENSE file.
          android:summaryOn="@string/text_on"
          android:summaryOff="@string/text_off" />
  
@@ -134,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -401,6 +401,7 @@ public final class ChromePreferenceKeys {
+@@ -425,6 +425,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
              "Chrome.Homepage.PartnerCustomizedDefaultGurl";
  
@@ -156,7 +156,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1248,6 +1248,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1254,6 +1254,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
          Last hour
        </message>
@@ -195,7 +195,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -380,6 +380,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
+@@ -384,6 +384,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
  extern const char kUsedPolicyCertificates[];
  #endif  // BUILDFLAG(IS_CHROMEOS)
  extern const char kShowHomeButton[];
diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch
index 4cf37c22..0a065397 100644
--- a/build/patches/Add-site-engagement-flag.patch
+++ b/build/patches/Add-site-engagement-flag.patch
@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -138,6 +138,7 @@
+@@ -141,6 +141,7 @@
  #include "components/segmentation_platform/public/features.h"
  #include "components/send_tab_to_self/features.h"
  #include "components/services/heap_profiling/public/cpp/switches.h"
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
  #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
  #include "components/signin/public/base/signin_buildflags.h"
-@@ -8768,6 +8769,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8966,6 +8967,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3283,6 +3283,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
+@@ -3320,6 +3320,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
      "Skips starting the service worker and run the fetch handler if the fetch "
      "handler is recognized as skippable.";
  
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1862,6 +1862,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
+@@ -1888,6 +1888,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
  extern const char kSkipServiceWorkerFetchHandlerName[];
  extern const char kSkipServiceWorkerFetchHandlerDescription[];
  
diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch
index 8e1b704c..f984e8ab 100644
--- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch
+++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -67,6 +67,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto
+@@ -66,6 +66,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
  import org.chromium.components.browser_ui.settings.SettingsLauncher;
@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
  import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
  import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer;
-@@ -333,9 +334,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -329,9 +330,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              finish();
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {
diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch
index 3926c7ab..2300b039 100644
--- a/build/patches/Add-webGL-site-setting.patch
+++ b/build/patches/Add-webGL-site-setting.patch
@@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -82,6 +82,9 @@ android_library("java") {
+@@ -89,6 +89,9 @@ android_library("java") {
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java",
    ]
@@ -183,7 +183,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
        <part file="site_settings.grdp" />
 +      <part file="webgl.grdp" />
  
-       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message">
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
          Got it
 diff --git a/components/browser_ui/strings/android/webgl.grdp b/components/browser_ui/strings/android/webgl.grdp
 new file mode 100644
@@ -214,11 +214,11 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 @@ -338,6 +338,7 @@
        <part file="version_ui_strings.grdp" />
        <part file="webapps_strings.grdp" />
-       <part file="user_scripts/strings/userscripts_strings.grdp" />
-+      <part file="browser_ui/strings/android/webgl.grdp" />
  
++      <part file="browser_ui/strings/android/webgl.grdp" />
        <if expr="not is_ios">
          <part file="history_clusters_strings.grdp" />
+       </if>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -246,7 +246,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -155,6 +155,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -156,6 +156,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
    std::string timezone;
    map->GetTimezoneOverrideValue(timezone);
    rules->timezone_override_value = timezone;
@@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
-@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
           content_type == ContentSettingsType::AUTOPLAY ||
           content_type == ContentSettingsType::MIXEDSCRIPT ||
           content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
@@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
  }
  
  void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
-@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -217,6 +218,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
    FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);
    FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
    FilterRulesForType(autoplay_rules, outermost_main_frame_url);
@@ -279,7 +279,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
-@@ -97,6 +97,7 @@ struct RendererContentSettingRules {
+@@ -96,6 +96,7 @@ struct RendererContentSettingRules {
    ContentSettingsForOneType auto_dark_content_rules;
    ContentSettingsForOneType timezone_override_rules;
    std::string timezone_override_value;
@@ -299,7 +299,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
 --- a/components/content_settings/core/common/content_settings_mojom_traits.cc
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
-@@ -104,7 +104,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+@@ -105,7 +105,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           data.ReadMixedContentRules(&out->mixed_content_rules) &&
           data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
           data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
@@ -327,7 +327,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
 --- a/components/content_settings/core/common/content_settings_types.h
 +++ b/components/content_settings/core/common/content_settings_types.h
-@@ -280,6 +280,8 @@ enum class ContentSettingsType : int32_t {
+@@ -276,6 +276,8 @@ enum class ContentSettingsType : int32_t {
    // site instead of the mobile one.
    REQUEST_DESKTOP_SITE,
  
@@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -97,6 +97,7 @@ class SecurityOrigin;
+@@ -96,6 +96,7 @@ class SecurityOrigin;
  class ScriptState;
  class ScriptWrappable;
  class TrustedTypePolicyFactory;
@@ -422,7 +422,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
  
  enum ReasonForCallingCanExecuteScripts {
    kAboutToExecuteScript,
-@@ -105,6 +106,10 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -104,6 +105,10 @@ enum ReasonForCallingCanExecuteScripts {
  
  enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
  
diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch
index 00c967a8..7582795d 100644
--- a/build/patches/Add-webRTC-site-settings.patch
+++ b/build/patches/Add-webRTC-site-settings.patch
@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -85,6 +85,9 @@ android_library("java") {
+@@ -92,6 +92,9 @@ android_library("java") {
    sources += [
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java",
    ]
@@ -179,7 +179,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
        <part file="webgl.grdp" />
 +      <part file="webrtc.grdp" />
  
-       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message">
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
          Got it
 diff --git a/components/browser_ui/strings/android/webrtc.grdp b/components/browser_ui/strings/android/webrtc.grdp
 new file mode 100644
@@ -209,12 +209,12 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 +++ b/components/components_strings.grd
 @@ -339,6 +339,7 @@
        <part file="webapps_strings.grdp" />
-       <part file="user_scripts/strings/userscripts_strings.grdp" />
+ 
        <part file="browser_ui/strings/android/webgl.grdp" />
 +      <part file="browser_ui/strings/android/webrtc.grdp" />
- 
        <if expr="not is_ios">
          <part file="history_clusters_strings.grdp" />
+       </if>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -242,7 +242,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -157,6 +157,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -158,6 +158,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
    rules->timezone_override_value = timezone;
    map->GetSettingsForOneType(ContentSettingsType::WEBGL,
                               &(rules->webgl_rules));
@@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
-@@ -207,7 +207,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
           content_type == ContentSettingsType::MIXEDSCRIPT ||
           content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
           content_type == ContentSettingsType::TIMEZONE_OVERRIDE ||
@@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
  }
  
  void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
-@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -219,6 +220,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
    FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
    FilterRulesForType(autoplay_rules, outermost_main_frame_url);
    FilterRulesForType(webgl_rules, outermost_main_frame_url);
@@ -275,7 +275,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
-@@ -98,6 +98,7 @@ struct RendererContentSettingRules {
+@@ -97,6 +97,7 @@ struct RendererContentSettingRules {
    ContentSettingsForOneType timezone_override_rules;
    std::string timezone_override_value;
    ContentSettingsForOneType webgl_rules;
@@ -295,7 +295,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
 --- a/components/content_settings/core/common/content_settings_mojom_traits.cc
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
-@@ -105,7 +105,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+@@ -106,7 +106,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
           data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
           data.ReadTimezoneOverrideValue(&out->timezone_override_value) &&
@@ -323,7 +323,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
 --- a/components/content_settings/core/common/content_settings_types.h
 +++ b/components/content_settings/core/common/content_settings_types.h
-@@ -282,6 +282,8 @@ enum class ContentSettingsType : int32_t {
+@@ -278,6 +278,8 @@ enum class ContentSettingsType : int32_t {
  
    WEBGL,
  
@@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -767,6 +768,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -765,6 +766,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // origin.
        WebRTCIPHandlingPolicy policy =
            GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch
index a6108adf..0b07d026 100644
--- a/build/patches/Allow-building-without-enable_reporting.patch
+++ b/build/patches/Allow-building-without-enable_reporting.patch
@@ -61,7 +61,7 @@ diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/cont
        body_to_pass.Set(pair.first, pair.second);
 @@ -123,7 +125,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
            kType, *endpoint, context_url_, reporting_source_,
-           network_isolation_key_,
+           network_anonymization_key_,
            /*user_agent=*/absl::nullopt, std::move(body_to_pass));
 -    }
 +#endif
@@ -124,8 +124,8 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
    if (!coop_.report_only_reporting_endpoint)
 @@ -279,12 +274,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
    storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
-       absl::nullopt, std::move(body));
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_, absl::nullopt, std::move(body));
 +#endif
  }
  
@@ -137,9 +137,9 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
    body.Set(kDisposition,
             is_report_only ? kDispositionReporting : kDispositionEnforce);
    body.Set(kEffectivePolicy,
-@@ -292,6 +289,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
-   storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
+@@ -293,6 +290,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_,
        /*user_agent=*/absl::nullopt, std::move(body));
 +#endif
  }
@@ -165,7 +165,7 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne
      if (!rph)
        return;
      rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
-         type, group, url, reporting_source_, network_isolation_key_,
+         type, group, url, reporting_source_, network_anonymization_key_,
          /*user_agent=*/absl::nullopt, std::move(body));
 +#endif
    }
@@ -174,7 +174,7 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -12143,12 +12143,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -12209,12 +12209,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
    base::Value::Dict body;
    if (!reason.empty())
      body.Set("reason", reason);
@@ -182,7 +182,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 -  // Send the crash report to the Reporting API.
 -  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
 -      /*type=*/"crash", /*group=*/"default", last_committed_url_,
--      GetReportingSource(), isolation_info_.network_isolation_key(),
+-      GetReportingSource(), isolation_info_.network_anonymization_key(),
 -      absl::nullopt /* user_agent */, std::move(body));
  }
  
@@ -193,7 +193,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b
 @@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string,
  void ReportResult(int frame_tree_node_id,
                    network::mojom::SignedExchangeReportPtr report,
-                   const net::NetworkIsolationKey& network_isolation_key) {
+                   const net::NetworkAnonymizationKey& network_isolation_key) {
 +#if BUILDFLAG(ENABLE_REPORTING)
    FrameTreeNode* frame_tree_node =
        FrameTreeNode::GloballyFindByID(frame_tree_node_id);
@@ -220,7 +220,7 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc
 diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
 --- a/net/reporting/reporting_service.cc
 +++ b/net/reporting/reporting_service.cc
-@@ -208,6 +208,12 @@ class ReportingServiceImpl : public ReportingService {
+@@ -211,6 +211,12 @@ class ReportingServiceImpl : public ReportingService {
        base::Value::Dict body,
        int depth,
        base::TimeTicks queued_ticks) {
@@ -232,27 +232,27 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 +#endif
      DCHECK(initialized_);
      context_->cache()->AddReport(
-         reporting_source, network_isolation_key, sanitized_url, user_agent,
+         reporting_source, network_anonymization_key, sanitized_url, user_agent,
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -462,10 +462,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
        const absl::optional<base::UnguessableToken>& reporting_source,
-       const net::NetworkIsolationKey& network_isolation_key,
+       const net::NetworkAnonymizationKey& network_anonymization_key,
        const absl::optional<std::string>& user_agent,
 -      base::Value::Dict body) override;
 +      base::Value::Dict body);
    void QueueSignedExchangeReport(
        mojom::SignedExchangeReportPtr report,
--      const net::NetworkIsolationKey& network_isolation_key) override;
-+      const net::NetworkIsolationKey& network_isolation_key);
+-      const net::NetworkAnonymizationKey& network_anonymization_key) override;
++      const net::NetworkAnonymizationKey& network_anonymization_key);
    void AddDomainReliabilityContextForTesting(
        const url::Origin& origin,
        const GURL& upload_url,
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1011,7 +1011,6 @@ mojom("mojom") {
+@@ -1096,7 +1096,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -263,7 +263,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1062,6 +1062,7 @@ interface NetworkContext {
+@@ -1065,6 +1065,7 @@ interface NetworkContext {
    // provided |network_isolation_key|.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -271,13 +271,13 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1075,6 +1076,7 @@ interface NetworkContext {
+@@ -1078,6 +1079,7 @@ interface NetworkContext {
    // Note that this queued report will never be delivered if no reporting
    // endpoint matching is registered for with the provided
    // |network_isolation_key|.
 +  [EnableIf=enable_reporting]
    QueueSignedExchangeReport(SignedExchangeReport report,
-                             NetworkIsolationKey network_isolation_key);
+                             NetworkAnonymizationKey network_anonymization_key);
  
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
@@ -290,7 +290,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
-@@ -2359,9 +2360,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
+@@ -2357,9 +2358,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
    return base::UnguessableToken::Null();
  }
  
@@ -316,7 +316,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
  #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
  #include "third_party/blink/public/common/frame/frame_ad_evidence.h"
-@@ -585,9 +585,9 @@ class CORE_EXPORT LocalFrame final
+@@ -590,9 +590,9 @@ class CORE_EXPORT LocalFrame final
    }
  
    SmoothScrollSequencer& GetSmoothScrollSequencer();
diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch
index 25e93041..1775d738 100644
--- a/build/patches/Allow-playing-audio-in-background.patch
+++ b/build/patches/Allow-playing-audio-in-background.patch
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1218,6 +1218,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1215,6 +1215,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3612,7 +3618,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3609,7 +3615,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
    // Audio only stream is allowed to play when in background.
    // TODO: We should check IsBackgroundOptimizationCandidate here. But we need
    // to move the logic of checking video frames out of that function.
@@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
-@@ -192,6 +192,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -193,6 +193,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
    bool HasVideo() const override;
    bool HasAudio() const override;
  
diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch
index 89c2fd0f..253b0fa9 100644
--- a/build/patches/Ask-user-before-closing-all-tabs.patch
+++ b/build/patches/Ask-user-before-closing-all-tabs.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -502,8 +502,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter",
+@@ -514,8 +514,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter",
  const base::Feature kClearOmniboxFocusAfterNavigation{
      "ClearOmniboxFocusAfterNavigation", base::FEATURE_DISABLED_BY_DEFAULT};
  
diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
index b6a91c1f..c0fdf205 100644
--- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
+++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
@@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -497,7 +497,9 @@ double AudioContext::baseLatency() const {
+@@ -507,7 +507,9 @@ double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());
  
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index 09b2951b..06f71f6e 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -4,21 +4,14 @@ Subject: Automated domain substitution
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- PRESUBMIT.py                                  |   72 +-
- .../cts_config/webview_cts_gcs_path.json      |   28 +-
- android_webview/tools/generate_flag_labels.py |    2 +-
+ .../cts_config/webview_cts_gcs_path.json      |   30 +-
  android_webview/tools/record_netlog.py        |    6 +-
  .../tools/remove_preinstalled_webview.py      |    2 +-
  android_webview/tools/update_cts.py           |    6 +-
  ash/accelerators/accelerator_notifications.cc |    2 +-
- ash/app_list/PRESUBMIT.py                     |    2 +-
  ash/ash_strings.grd                           |   28 +-
- ash/assistant/PRESUBMIT.py                    |    2 +-
  ash/assistant/assistant_setup_controller.cc   |    2 +-
  ash/assistant/util/deep_link_util.cc          |   16 +-
- .../device_activity_controller.cc             |    2 +-
- ash/components/drivefs/drivefs_auth.cc        |    2 +-
- .../simple_geolocation_provider.cc            |    2 +-
  .../multidevice/stub_multidevice_util.cc      |    2 +-
  ash/components/phonehub/url_constants.cc      |    2 +-
  ash/components/timezone/timezone_request.cc   |    2 +-
@@ -28,7 +21,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../fast_pair/device_metadata_fetcher.cc      |    2 +-
  .../fast_pair/footprints_fetcher_impl.cc      |    4 +-
  .../ui/fast_pair/fast_pair_presenter_impl.cc  |    4 +-
- ash/resources/PRESUBMIT.py                    |    4 +-
  .../device_sync/cryptauth_client_impl.cc      |    8 +-
  ash/services/ime/constants.cc                 |    2 +-
  ash/system/eche/eche_tray.cc                  |    2 +-
@@ -38,33 +30,24 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../camera_app_ui/camera_app_untrusted_ui.cc  |    2 +-
  .../resources/js/lib/analytics.js             |   14 +-
  .../resources/strings/camera_strings.grd      |    2 +-
- ash/webui/common/resources/PRESUBMIT.py       |    2 +-
  ash/webui/diagnostics_ui/diagnostics_ui.cc    |    2 +-
- .../diagnostics_ui/resources/PRESUBMIT.py     |    2 +-
  .../diagnostics_ui/resources/network_card.js  |    2 +-
  .../resources/routine_section.js              |    2 +-
  ash/webui/eche_app_ui/eche_alert_generator.cc |    2 +-
- .../firmware_update_ui/resources/PRESUBMIT.py |    2 +-
  .../help_app_kids_magazine_untrusted_ui.cc    |    2 +-
  ash/webui/media_app_ui/media_app_guest_ui.cc  |    2 +-
  .../backend/help_content_provider.cc          |    4 +-
  .../resources/confirmation_page.js            |    2 +-
- .../os_feedback_ui/resources/fake_data.js     |   14 +-
+ .../os_feedback_ui/resources/fake_data.js     |   16 +-
  .../resources/feedback_constants.js           |    6 +-
  .../os_feedback_ui/resources/search_page.js   |    2 +-
  .../personalization_app_ui.cc                 |    2 +-
- .../resources/PRESUBMIT.py                    |    2 +-
- .../print_management/resources/PRESUBMIT.py   |    2 +-
  .../projector_app/projector_xhr_sender.cc     |   12 +-
  .../projector_app/projector_xhr_sender.h      |    2 +-
  .../projector_app/untrusted_projector_ui.cc   |   12 +-
- ash/webui/scanning/resources/PRESUBMIT.py     |    2 +-
  .../scanning/resources/scanning_app.html      |    2 +-
  ash/webui/scanning/resources/scanning_app.js  |    2 +-
  ...boarding_enter_rsu_wp_disable_code_page.js |    2 +-
- .../resources/PRESUBMIT.py                    |    2 +-
- base/PRESUBMIT.py                             |    4 +-
- base/android/jni_generator/PRESUBMIT.py       |    2 +-
  base/android/resource_exclusions.gni          |    2 +-
  base/callback.h                               |    8 +-
  base/debug/debugger_posix.cc                  |    4 +-
@@ -72,7 +55,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  base/ios/device_util.mm                       |    2 +-
  base/memory/raw_ptr.cc                        |    2 +-
  base/memory/raw_ptr_asan_service.cc           |    2 +-
- build/android/PRESUBMIT.py                    |    2 +-
  build/android/gradle/generate_gradle.py       |    2 +-
  .../android/gyp/assert_static_initializers.py |    2 +-
  build/android/gyp/lint.py                     |    2 +-
@@ -80,21 +62,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  build/android/gyp/util/diff_utils.py          |    4 +-
  build/android/gyp/util/protoresources.py      |    2 +-
  .../android/incremental_install/installer.py  |    2 +-
- build/android/pylib/constants/__init__.py     |    2 +-
- build/android/pylib/device_settings.py        |    8 +-
- build/android/pylib/dex/dex_parser.py         |    6 +-
- .../device/local_device_monkey_test_run.py    |    2 +-
- build/android/pylib/local/emulator/avd.py     |    2 +-
- .../json_results_generator.py                 |    2 +-
- .../presentation/test_results_presentation.py |    8 +-
- .../pylib/utils/google_storage_helper.py      |    4 +-
- build/android/pylib/utils/maven_downloader.py |    2 +-
- build/android/pylib/utils/simpleperf.py       |    2 +-
  build/android/resource_sizes.py               |    2 +-
  build/android/test_wrapper/logdog_wrapper.py  |    2 +-
  build/apple/tweak_info_plist.py               |    6 +-
- build/chromeos/PRESUBMIT.py                   |    2 +-
  build/config/android/rules.gni                |    2 +-
+ build/config/chrome_build.gni                 |    2 +-
  build/config/chromeos/args.gni                |    4 +-
  build/config/chromeos/rules.gni               |    6 +-
  build/config/compiler/compiler.gni            |    4 +-
@@ -103,7 +75,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  build/config/ozone.gni                        |    2 +-
  build/config/sanitizers/sanitizers.gni        |    2 +-
  build/config/win/control_flow_guard.gni       |    2 +-
- build/fuchsia/PRESUBMIT.py                    |    2 +-
  build/fuchsia/binary_size_differ.py           |    2 +-
  build/fuchsia/binary_sizes.py                 |    2 +-
  build/fuchsia/pkg_repo.py                     |    2 +-
@@ -111,7 +82,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../linux/sysroot_scripts/install-sysroot.py  |    2 +-
  build/mac_toolchain.py                        |    2 +-
  build/nocompile.gni                           |    2 +-
- build/skia_gold_common/PRESUBMIT.py           |    2 +-
  build/toolchain/cros_toolchain.gni            |    2 +-
  build/toolchain/gcc_toolchain.gni             |    2 +-
  .../lib/common/perf_tests_results_helper.py   |    2 +-
@@ -119,22 +89,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  build/whitespace_file.txt                     |    2 +-
  buildtools/README.txt                         |    4 +-
  buildtools/clang_format/README.txt            |    6 +-
- cc/PRESUBMIT.py                               |    2 +-
- chrome/PRESUBMIT.py                           |    2 +-
- chrome/android/java/src/PRESUBMIT.py          |    2 +-
- chrome/android/webapk/PRESUBMIT.py            |    2 +-
  .../javatest_manifest_config_delta.json       |   12 +-
  .../manifest/maps_go_manifest_config.json     |   10 +-
- chrome/app/PRESUBMIT.py                       |    8 +-
  chrome/app/chromium_strings.grd               |   24 +-
- chrome/app/generated_resources.grd            |  288 +-
+ chrome/app/generated_resources.grd            |  296 +-
  chrome/app/google_chrome_strings.grd          |   24 +-
  chrome/app/resources/locale_settings.grd      |   10 +-
- chrome/app/theme/PRESUBMIT.py                 |    4 +-
  chrome/browser/about_flags.cc                 |    4 +-
  .../browser/android/explore_sites/url_util.cc |    2 +-
  .../explore_sites/url_util_experimental.cc    |    2 +-
- chrome/browser/android/vr/PRESUBMIT.py        |    2 +-
  .../android/webapk/webapk_installer.cc        |    4 +-
  .../app_service/webapk/webapk_install_task.cc |    2 +-
  .../apps/digital_goods/digital_goods_ash.cc   |    2 +-
@@ -153,15 +116,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../customization/customization_document.cc   |    2 +-
  .../enhanced_network_tts_constants.cc         |    2 +-
  .../file_manager/file_manager_string_util.cc  |   14 +-
- .../office_task_selection_helper.cc           |    4 +-
+ .../ash/file_manager/open_with_browser.cc     |    8 +-
  chrome/browser/ash/hats/hats_dialog.cc        |    2 +-
- .../assistive_suggester_client_filter.cc      |   20 +-
+ .../assistive_suggester_client_filter.cc      |   24 +-
  .../ash/input_method/ime_rules_config.h       |   14 +-
  .../easy_unlock/easy_unlock_key_names.cc      |    2 +-
  .../ash/login/gaia_reauth_token_fetcher.cc    |    2 +-
  .../ash/login/marketing_backend_connector.cc  |    4 +-
+ .../connectivity/target_fido_controller.cc    |    4 +-
  .../login/saml/password_sync_token_fetcher.cc |    2 +-
  .../recommend_apps_fetcher_impl.cc            |    4 +-
+ .../default_user_image/default_user_images.cc |    2 +-
  .../arc_dns_resolution_routine.cc             |    6 +-
  .../dns_latency_routine.cc                    |    2 +-
  .../dns_resolution_routine.cc                 |    2 +-
@@ -204,12 +169,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../identity_launch_web_auth_flow_function.cc |    2 +-
  .../chrome_management_api_delegate.cc         |    2 +-
  .../api/platform_keys/platform_keys_api.cc    |    2 +-
- .../chrome_extension_browser_constants.cc     |    2 +-
+ .../chrome_extension_browser_constants.cc     |    4 +-
  .../extensions/external_pref_loader.cc        |    2 +-
  chrome/browser/extensions/install_signer.cc   |    2 +-
  .../chrome_extension_downloader_factory.cc    |    2 +-
  .../updater/chrome_update_client_config.cc    |    2 +-
- chrome/browser/flag_descriptions.cc           |   20 +-
+ chrome/browser/flag_descriptions.cc           |   18 +-
+ .../k_anonymity_service_urls.h                |    6 +-
  .../lacros/lacros_startup_infobar_delegate.cc |    4 +-
  .../service_discovery_client_mac.mm           |    4 +-
  .../long_screenshots_tab_service.cc           |    2 +-
@@ -234,11 +200,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/policy/safe_search_policy_test.h  |    2 +-
  .../chrome_prefetch_service_delegate.cc       |    6 +-
  .../prefetch_proxy/prefetch_proxy_params.cc   |    6 +-
- .../privacy_sandbox_service.cc                |   14 +-
+ .../privacy_sandbox_service.cc                |   22 +-
  .../profiles/profile_avatar_downloader.cc     |    2 +-
  .../push_messaging_constants.cc               |    2 +-
  .../push_messaging_service_impl.cc            |    2 +-
- chrome/browser/resources/PRESUBMIT.py         |    2 +-
  .../browser/resources/about_sys/about_sys.js  |    2 +-
  .../browsing_topics_internals.html            |    4 +-
  .../resources/chromeos/about_os_credits.html  |    6 +-
@@ -279,7 +244,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../default_apps/external_extensions.json     |    2 +-
  .../discards/graph_doc_template.html          |    2 +-
  chrome/browser/resources/downloads/icons.html |    2 +-
- .../resources/gaia_auth_host/PRESUBMIT.py     |    2 +-
  .../resources/gaia_auth_host/authenticator.js |    2 +-
  .../saml_password_attributes.js               |    2 +-
  .../resources/hangout_services/manifest.json  |    2 +-
@@ -298,17 +262,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/resources/omnibox/omnibox.html |    2 +-
  .../resources/omnibox/omnibox_output.js       |    4 +-
  .../browser/resources/pdf/elements/icons.html |    2 +-
- .../plugin_metadata/plugins_chromeos.json     |    2 +-
- .../plugin_metadata/plugins_linux.json        |    4 +-
- .../plugin_metadata/plugins_mac.json          |    4 +-
- .../plugin_metadata/plugins_win.json          |    4 +-
  .../resources/print_preview/ui/icons.html     |    2 +-
  .../settings/about_page/about_page.html       |    4 +-
  .../crostini_disk_resize_dialog.html          |    2 +-
  .../settings/chromeos/device_page/stylus.js   |    2 +-
- .../os_a11y_page/manage_a11y_page.html        |    2 +-
- .../chromeos/os_a11y_page/manage_a11y_page.js |    2 +-
- .../chromeos/os_a11y_page/os_a11y_page.html   |    2 +-
+ .../keyboard_and_text_input_page.js           |    2 +-
+ .../chromeos/os_a11y_page/manage_a11y_page.js |    4 +-
+ .../chromeos/os_a11y_page/os_a11y_page.js     |    2 +-
  .../channel_switcher_dialog.html              |    2 +-
  .../chromeos/os_about_page/os_about_page.html |    2 +-
  .../borealis_page/borealis_detail_view.html   |    2 +-
@@ -330,7 +290,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../extension_telemetry_uploader.cc           |    2 +-
  .../incident_report_uploader_impl.cc          |    4 +-
  .../default_settings_fetcher.cc               |    2 +-
- .../tailored_security_url_observer.cc         |    2 +-
  .../background/ntp_background_service.cc      |    2 +-
  .../search/background/ntp_backgrounds.cc      |   10 +-
  .../browser/share/default_ranking_android.cc  |    8 +-
@@ -341,6 +300,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/ssl/sct_reporting_service.cc   |    4 +-
  .../child_accounts/kids_management_api.cc     |    2 +-
  .../supervised_user_block_interstitial.html   |    2 +-
+ ...supervised_user_block_interstitial_v2.html |    2 +-
  .../supervised_user_service.cc                |    2 +-
  .../supervised_user_url_filter.cc             |   12 +-
  .../strings/android_chrome_strings.grd        |   54 +-
@@ -362,6 +322,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ui/dialogs/outdated_upgrade_bubble.cc     |    2 +-
  .../installation_error_infobar_delegate.cc    |    2 +-
  chrome/browser/ui/managed_ui.cc               |    2 +-
+ .../omnibox/omnibox_pedal_implementations.cc  |   24 +-
  .../quick_answers_ui_controller.cc            |    4 +-
  chrome/browser/ui/signin_view_controller.cc   |    2 +-
  .../toolbar/media_router_contextual_menu.cc   |    6 +-
@@ -373,10 +334,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../plugin_vm/plugin_vm_installer_view.cc     |    2 +-
  .../ui/views/session_crashed_bubble_view.cc   |    2 +-
  .../lens/lens_unified_side_panel_view.cc      |    2 +-
- chrome/browser/ui/webui/PRESUBMIT.py          |    2 +-
  .../app_management_page_handler.cc            |    6 +-
+ .../ash/add_supervision/add_supervision_ui.cc |    4 +-
  .../internals_ui_handler.cc                   |    2 +-
- .../add_supervision/add_supervision_ui.cc     |    4 +-
+ .../cloud_upload/drive_upload_handler.cc      |    2 +-
  .../edu_coexistence_login_handler_chromeos.cc |    2 +-
  .../consolidated_consent_screen_handler.h     |    4 +-
  .../notification_tester_handler.cc            |    2 +-
@@ -390,14 +351,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/ui/webui/ntp/new_tab_ui.cc     |    2 +-
  .../ui/webui/ntp/ntp_resource_cache.cc        |    8 +-
  .../ui/webui/sanitized_image_source.cc        |    6 +-
- .../chromeos/parental_controls_handler.cc     |    2 +-
+ .../settings/ash/parental_controls_handler.cc |    2 +-
  .../webui/settings/reset_settings_handler.cc  |    2 +-
  .../settings_localized_strings_provider.cc    |    6 +-
  ...nin_restriction_policy_fetcher_chromeos.cc |    2 +-
  .../ui/webui/welcome/google_apps_handler.cc   |   12 +-
  .../webui/welcome/ntp_background_handler.cc   |    2 +-
  .../ui/webui/whats_new/whats_new_util.cc      |    4 +-
- chrome/browser/vr/PRESUBMIT.py                |    2 +-
  .../commands/web_app_install_command.cc       |    2 +-
  .../externally_managed_app_manager.cc         |    4 +-
  .../preinstalled_web_apps/gmail.cc            |    6 +-
@@ -413,17 +373,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../preinstalled_web_apps/youtube.cc          |    6 +-
  .../web_applications/web_app_install_task.cc  |    2 +-
  .../chrome_authenticator_request_delegate.cc  |    8 +-
- chrome/chrome_cleaner/PRESUBMIT.py            |    2 +-
  .../components/recovery_component.cc          |    4 +-
  .../crash/crashpad_crash_reporter.cc          |    2 +-
  .../executables/chrome_cleaner_main.cc        |    2 +-
  .../logging/cleaner_logging_service.cc        |    6 +-
  .../chrome_cleaner/logging/dummy_api_keys.cc  |    4 +-
  .../logging/reporter_logging_service.cc       |    6 +-
- .../apps/platform_apps/api/PRESUBMIT.py       |    2 +-
- .../chromeos_system_extension_info.cc         |    2 +-
- chrome/common/extensions/PRESUBMIT.py         |    2 +-
- chrome/common/extensions/api/PRESUBMIT.py     |    2 +-
  .../common/extensions/api/_api_features.json  |    4 +-
  chrome/common/extensions/api/cookies.json     |    2 +-
  chrome/common/extensions/api/debugger.json    |    8 +-
@@ -438,7 +393,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/common/extensions/api/windows.json     |    2 +-
  .../extensions/chrome_extensions_client.cc    |    4 +-
  chrome/common/google_url_loader_throttle.cc   |    4 +-
- chrome/common/url_constants.cc                |  254 +-
+ chrome/common/url_constants.cc                |  256 +-
  .../gaiacp/associated_user_validator.cc       |    2 +-
  .../gaiacp/gaia_credential_base.cc            |    8 +-
  .../credential_provider/gaiacp/gcp_utils.cc   |    4 +-
@@ -495,13 +450,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ...ip_add_to_cart_request_domain_mapping.json |    2 +-
  .../extensions/identity_custom_bindings.js    |    2 +-
  .../mac_notification_service_ns.mm            |    2 +-
- chrome/tools/build/PRESUBMIT.py               |    2 +-
  chrome/tools/webforms_aggregator_tests.py     |    4 +-
  chrome/tools/weburl_links.txt                 |    6 +-
  chrome/updater/branding.gni                   |   12 +-
  chrome/updater/mac/setup/ks_tickets.mm        |    2 +-
- chrome/updater/tools/PRESUBMIT.py             |    2 +-
- chrome/updater/win/signing/PRESUBMIT.py       |    2 +-
  chrome/utility/importer/ie_importer_win.cc    |    2 +-
  .../shell_devtools_discovery_page.html        |    2 +-
  chromecast/browser/webui/cast_webui.cc        |    4 +-
@@ -510,7 +462,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chromecast/crash/linux/minidump_uploader.cc   |    2 +-
  chromecast/net/connectivity_checker_impl.h    |    4 +-
  .../components/dbus/rmad/fake_rmad_client.cc  |    2 +-
- .../connectivity/target_fido_controller.cc    |    4 +-
+ .../device_activity_controller.cc             |    2 +-
+ .../ash/components/drivefs/drivefs_auth.cc    |    2 +-
+ .../simple_geolocation_provider.cc            |    2 +-
+ .../login/auth/recovery/service_constants.cc  |    2 +-
  .../assistant_manager_service_impl.cc         |    2 +-
  chromeos/ash/services/assistant/service.cc    |    2 +-
  chromeos/chromeos_strings.grd                 |    6 +-
@@ -534,8 +489,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../printing/uri_fuzzer_seed_corpus/uri5.txt  |    2 +-
  .../error_page_populator.cc                   |    2 +-
  .../predictor_config_definitions.cc           |    2 +-
- components/autofill/PRESUBMIT.py              |    2 +-
- .../autofill/content/renderer/PRESUBMIT.py    |    2 +-
  .../autofill/content/renderer/form_cache.cc   |    2 +-
  .../renderer/page_passwords_analyser.cc       |    2 +-
  .../password_form_conversion_utils.cc         |    2 +-
@@ -549,14 +502,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../autofill_assistant_onboarding_fetcher.cc  |    2 +-
  .../browser/headless/client_headless.cc       |    2 +-
  .../browser/service/server_url_fetcher.cc     |    2 +-
+ .../launched_configs.cc                       |    4 +-
  .../safe_browsing_triggered_popup_blocker.h   |    4 +-
  .../core/breadcrumb_manager_tab_helper.cc     |    2 +-
- components/browser_sync/PRESUBMIT.py          |    2 +-
  .../strings/android/browser_ui_strings.grd    |    6 +-
  .../core/counters/history_counter.cc          |    2 +-
  .../core/history_notice_utils.cc              |    4 +-
  .../core/captive_portal_detector.cc           |    2 +-
  .../data/log_list.json                        |   22 +-
+ components/commerce/core/account_checker.cc   |   10 +-
  .../resources/cart_domain_cart_url_regex.json |    2 +-
  .../subscriptions_server_proxy.cc             |    4 +-
  .../components_google_chrome_strings.grd      |    2 +-
@@ -566,7 +520,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../reactions/core/reaction_list_factory.cc   |    4 +-
  .../crash/core/app/crash_reporter_client.cc   |    2 +-
  .../crash/core/browser/resources/crashes.js   |    4 +-
- components/cronet/PRESUBMIT.py                |    2 +-
  components/cronet/tools/generate_javadoc.py   |    2 +-
  .../core/html/dom_distiller_viewer.html       |    2 +-
  .../core/javascript/dom_distiller_viewer.js   |    2 +-
@@ -581,7 +534,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/flags_ui/resources/flags.html      |    4 +-
  components/gcm_driver/gcm_account_mapper.cc   |    2 +-
  components/gcm_driver/gcm_client_impl.cc      |    2 +-
- components/google/core/common/google_util.cc  |   26 +-
  .../core/browser/browsing_history_service.cc  |    4 +-
  .../history/core/browser/history_service.cc   |    4 +-
  .../core/browser/web_history_service.cc       |   12 +-
@@ -601,7 +553,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/ntp_tiles/popular_sites_impl.cc    |    2 +-
  .../core/prefetch/prefetch_proto_utils.cc     |    2 +-
  .../core/prefetch/prefetch_server_urls.cc     |    2 +-
- components/omnibox/PRESUBMIT.py               |    2 +-
  .../omnibox/browser/document_provider.cc      |   18 +-
  .../browser/document_suggestions_service.cc   |    4 +-
  .../resources/omnibox_pedal_concepts.json     |   28 +-
@@ -657,7 +608,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../omnibox_pedal_concepts_desktop_vi.json    |    4 +-
  .../omnibox_pedal_concepts_desktop_zh-CN.json |   24 +-
  .../omnibox_pedal_concepts_desktop_zh-TW.json |   24 +-
- .../resources/omnibox_pedal_synonyms.grd      |   88 +-
+ .../resources/omnibox_pedal_synonyms.grd      |  138 +-
+ .../page_content_annotations_model_manager.cc |    2 +-
  .../core/optimization_guide_constants.cc      |    4 +-
  .../core/page_entities_model_executor_impl.cc |    2 +-
  .../core/prediction_manager.cc                |    8 +-
@@ -691,11 +643,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/common/cloud/user_info_fetcher.cc    |    4 +-
  .../common/default_chrome_apps_migrator.cc    |   16 +-
  .../core/common/policy_loader_common.cc       |    4 +-
- .../policy/resources/policy_templates.json    | 2366 ++++++++---------
+ .../policy/resources/policy_templates.json    | 2386 ++++++++---------
  .../request_handler_for_policy.cc             |    2 +-
  .../policy/test_support/signature_provider.h  |    4 +-
  .../syntax_check_policy_template_json.py      |    2 +-
- .../tools/template_writers/PRESUBMIT.py       |    2 +-
  .../template_writers/writers/adm_writer.py    |    4 +-
  .../writers/doc_atomic_groups_writer.py       |    2 +-
  .../template_writers/writers/doc_writer.py    |   10 +-
@@ -756,11 +707,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/resources/terms/terms_zh-TW.html   |    4 +-
  .../browser/client_side_detection_service.cc  |    2 +-
  .../content/browser/triggers/trigger_util.cc  |    2 +-
- .../content/resources/PRESUBMIT.py            |    2 +-
  .../browser/db/v4_protocol_manager_util.cc    |    4 +-
  .../password_protection_service_base.cc       |    2 +-
  .../browser/realtime/url_lookup_service.cc    |    2 +-
  .../tailored_security_service.cc              |    6 +-
+ ...tailored_security_service_observer_util.cc |    2 +-
  .../safe_search_url_checker_client.cc         |    2 +-
  .../safe_search_api/stub_url_checker.cc       |    2 +-
  components/safety_check/url_constants.cc      |    2 +-
@@ -771,7 +722,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/safe_browsing_loud_error_ui.cc       |    4 +-
  .../security_interstitials/core/urls.cc       |    4 +-
  ...ation_guide_segmentation_model_provider.cc |    2 +-
- .../internal/proto/PRESUBMIT.py               |    2 +-
  .../services/quarantine/quarantine_mac.mm     |    2 +-
  .../core/common/disabled_sites.cc             |   16 +-
  .../ios/shared_highlighting_constants.mm      |    2 +-
@@ -780,14 +730,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../identity_manager/access_token_fetcher.cc  |    2 +-
  .../browser/spelling_service_client.cc        |    2 +-
  .../browser/subresource_filter_constants.h    |    8 +-
- .../core/common/PRESUBMIT.py                  |    2 +-
- components/sync/PRESUBMIT.py                  |    2 +-
  components/sync/base/sync_util.h              |    4 +-
  .../standalone_trusted_vault_client.cc        |    2 +-
  ...ted_vault_access_token_fetcher_frontend.cc |    2 +-
  .../trusted_vault_server_constants.h          |    2 +-
- components/sync_bookmarks/PRESUBMIT.py        |    2 +-
- components/sync_sessions/PRESUBMIT.py         |    2 +-
  .../core/browser/translate_ranker_impl.cc     |    6 +-
  .../core/browser/translate_script.cc          |    2 +-
  .../translate/core/common/translate_util.cc   |    2 +-
@@ -795,21 +741,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/ukm/ukm_reporting_service.cc       |    2 +-
  .../top_domains/make_alexa_top_list.py        |    2 +-
  components/url_matcher/url_util.cc            |    4 +-
- components/url_pattern_index/PRESUBMIT.py     |    2 +-
- components/variations/proto/PRESUBMIT.py      |    2 +-
  .../variations/variations_url_constants.cc    |    4 +-
  .../installable/installable_logging.cc        |    2 +-
  components/wifi/wifi_service_win.cc           |    2 +-
  .../render_widget_host_view_cocoa.mm          |    2 +-
  .../aggregation_service_features.cc           |    2 +-
- .../attribution_reporting/PRESUBMIT.py        |    2 +-
  .../indexed_db/indexed_db_backing_store.cc    |    2 +-
  .../indexed_db/indexed_db_reporting.cc        |    2 +-
  .../interest_group_update_manager.cc          |    2 +-
  .../portal/portal_navigation_throttle.cc      |    2 +-
- .../renderer_host/navigation_request.cc       |    4 +-
+ .../renderer_host/navigation_request.cc       |    6 +-
  .../renderer_host/render_frame_host_impl.cc   |    2 +-
- content/browser/resources/PRESUBMIT.py        |    2 +-
  content/browser/resources/gpu/info_view.js    |    2 +-
  .../speech/speech_recognition_engine.cc       |    2 +-
  .../browser/web_contents/web_contents_impl.cc |    2 +-
@@ -817,9 +759,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  content/browser/webauth/client_data_json.cc   |    2 +-
  .../webauth_request_security_checker.cc       |    2 +-
  .../webauth_request_security_checker.h        |    4 +-
- .../webrtc/resources/webrtc_internals.js      |    2 +-
  .../zygote_host/zygote_host_impl_linux.cc     |    2 +-
- content/renderer/PRESUBMIT.py                 |    2 +-
  .../pepper/pepper_media_device_manager.cc     |    2 +-
  content/renderer/render_thread_impl.cc        |   14 +-
  .../shell/browser/shell_browser_main_parts.cc |    2 +-
@@ -831,25 +771,21 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  device/gamepad/xbox_controller_mac.mm         |    2 +-
  docs/enterprise/extension_query.py            |    4 +-
  docs/enterprise/extension_query_py2.py        |    4 +-
- extensions/browser/PRESUBMIT.py               |    2 +-
  .../web_request/web_request_permissions.cc    |    4 +-
  extensions/browser/suggest_permission_util.cc |    4 +-
  .../browser/updater/extension_downloader.cc   |    4 +-
  .../browser/updater/safe_manifest_parser.cc   |    2 +-
- extensions/common/api/PRESUBMIT.py            |    2 +-
  extensions/common/api/_api_features.json      |    2 +-
  .../common/api/extensions_manifest_types.json |    6 +-
  extensions/common/api/i18n.json               |    2 +-
  extensions/common/csp_validator.cc            |    2 +-
  extensions/common/extension_urls.cc           |   12 +-
  extensions/common/manifest_constants.cc       |    6 +-
- extensions/common/permissions/PRESUBMIT.py    |    2 +-
- .../resources/automation/PRESUBMIT.py         |    2 +-
  extensions/strings/extensions_strings.grd     |    4 +-
  google_apis/drive/drive_api_url_generator.cc  |    2 +-
  google_apis/gaia/gaia_auth_fetcher.cc         |    4 +-
  google_apis/gaia/gaia_auth_util.cc            |    8 +-
- google_apis/gaia/gaia_constants.cc            |   82 +-
+ google_apis/gaia/gaia_constants.cc            |   84 +-
  google_apis/gaia/gaia_oauth_client.cc         |    6 +-
  google_apis/gaia/gaia_urls.cc                 |   10 +-
  google_apis/gcm/base/mcs_util.cc              |    2 +-
@@ -859,26 +795,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  google_apis/google_api_keys.cc                |    2 +-
  .../ANGLE/EGL_ANGLE_sync_control_rate.txt     |    2 +-
  .../CHROMIUM/EGL_CHROMIUM_sync_control.txt    |    2 +-
- gpu/PRESUBMIT.py                              |    2 +-
- gpu/command_buffer/PRESUBMIT.py               |    2 +-
  .../iosurface_image_backing_factory.mm        |    2 +-
- gpu/config/PRESUBMIT.py                       |    2 +-
  gpu/config/gpu_control_list_format.txt        |    2 +-
- gpu/ipc/common/PRESUBMIT.py                   |    2 +-
- gpu/vulkan/PRESUBMIT.py                       |    2 +-
  .../lib/browser/protocol/headless_handler.cc  |    2 +-
- infra/config/PRESUBMIT.py                     |    4 +-
- infra/config/scripts/PRESUBMIT.py             |    2 +-
- ios/PRESUBMIT.py                              |    4 +-
  ios/README.txt                                |    2 +-
- ios/build/bots/scripts/PRESUBMIT.py           |    2 +-
  ios/build/bots/scripts/result_sink_util.py    |    4 +-
  ios/build/bots/scripts/test_result_util.py    |    6 +-
  ios/build/bots/scripts/xcode_util.py          |    4 +-
  ios/build/chrome_build.gni                    |    2 +-
  .../app/strings/ios_chromium_strings.grd      |   18 +-
  .../app/strings/ios_google_chrome_strings.grd |   18 +-
- ios/chrome/app/strings/ios_strings.grd        |   32 +-
+ ios/chrome/app/strings/ios_strings.grd        |   34 +-
  ios/chrome/browser/autofill/BUILD.gn          |    4 +-
  .../autofill/automation/automation_action.mm  |    2 +-
  ...chrome_browser_state_removal_controller.mm |    2 +-
@@ -886,7 +813,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ios/chrome/browser/flags/about_flags.mm       |    4 +-
  ios/chrome/browser/omaha/omaha_service.mm     |    2 +-
  .../search_engine_tab_helper.mm               |    8 +-
- ios/chrome/browser/u2f/u2f_controller.mm      |    4 +-
  .../activity_services/activity_type_util.mm   |    2 +-
  .../ui/bookmarks/bookmark_earl_grey.mm        |    2 +-
  .../new_tab_page_app_interface.mm             |    4 +-
@@ -894,7 +820,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/ui/main/scene_controller.mm       |    2 +-
  .../browser/ui/ntp/discover_feed_constants.mm |    2 +-
  ios/chrome/browser/ui/ntp/incognito_view.mm   |    2 +-
- .../ui/ntp/notification_promo_whats_new.mm    |    2 +-
  .../browser/ui/ntp/revamped_incognito_view.mm |    2 +-
  .../ui/qr_scanner/qr_scanner_app_interface.mm |    2 +-
  .../ui/settings/settings_app_interface.mm     |    2 +-
@@ -906,7 +831,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../https_only_mode_blocking_page.mm          |    2 +-
  ios/net/cookies/cookie_store_ios_test_util.mm |    2 +-
  ios/net/crn_http_protocol_handler.mm          |    2 +-
- .../browser/signin/chrome_identity_service.mm |    4 +-
  .../browser/signin/fake_chrome_identity.mm    |    6 +-
  .../signin/fake_chrome_identity_service.mm    |    2 +-
  .../fake_chrome_identity_service_constants.mm |    2 +-
@@ -915,14 +839,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../fake_autocomplete_suggestion.mm           |    4 +-
  ios/web/navigation/navigation_manager_impl.mm |    6 +-
  .../web_state/ui/wk_content_rule_list_util.mm |    2 +-
- ios/web_view/PRESUBMIT.py                     |    2 +-
  ios/web_view/internal/cwv_flags.mm            |    2 +-
  ios/web_view/internal/cwv_web_view.mm         |    2 +-
- media/PRESUBMIT.py                            |    4 +-
  media/base/win/mf_initializer.cc              |    2 +-
  .../native_pixmap_handle_mojom_traits.cc      |   12 +-
  ...stable_video_decoder_types_mojom_traits.cc |  178 +-
- mojo/PRESUBMIT.py                             |    2 +-
  .../src/build_tools/build_paths.py            |    2 +-
  .../src/build_tools/buildbot_common.py        |    2 +-
  .../build_tools/json/naclsdk_manifest.json    |   32 +-
@@ -981,7 +902,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  net/tools/print_certificates.py               |    2 +-
  net/tools/testserver/testserver.py.vpython3   |    4 +-
  .../transport_security_state_generator.cc     |    2 +-
- printing/backend/PRESUBMIT.py                 |    2 +-
  printing/backend/win_helper.cc                |    4 +-
  printing/print_settings_initializer_win.cc    |    2 +-
  remoting/base/breakpad_mac.mm                 |    2 +-
@@ -1036,6 +956,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/afl/src/llvm_mode/Makefile        |    6 +-
  .../afl/src/llvm_mode/afl-clang-fast.c        |    4 +-
  .../android_build_tools/aapt2/3pp/fetch.py    |    4 +-
+ .../apkanalyzer/3pp/fetch.py                  |    2 +-
+ .../apkanalyzer/3pp/install.py                |    2 +-
  .../android_build_tools/lint/3pp/fetch.py     |    2 +-
  .../android_build_tools/lint/3pp/install.py   |    2 +-
  .../manifest_merger/3pp/fetch.py              |    2 +-
@@ -1120,15 +1042,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../3pp/fetch.py                              |    2 +-
  .../3pp/fetch.py                              |    2 +-
  .../Android_SDK_License-December_9_2016.txt   |    4 +-
- .../development/scripts/PRESUBMIT.py          |    2 +-
  .../runner/src/main/Android.mk                |    2 +-
- third_party/blink/PRESUBMIT.py                |    2 +-
+ third_party/androidx/fetch_all_androidx.py    |    2 +-
  .../common/loader/record_load_histograms.cc   |    2 +-
- .../public/common/scheduler/PRESUBMIT.py      |    2 +-
- .../mojom/permissions_policy/PRESUBMIT.py     |    2 +-
- .../mojom/use_counter/metrics/PRESUBMIT.py    |    2 +-
  .../blink/public/strings/blink_strings.grd    |    8 +-
- .../blink/renderer/bindings/PRESUBMIT.py      |    2 +-
  .../renderer/bindings/scripts/utilities.py    |    2 +-
  .../build/scripts/update_css_ranking.py       |    4 +-
  .../core/css/remote_font_face_source.cc       |    2 +-
@@ -1148,7 +1065,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/xmlhttprequest/xml_http_request.cc   |    2 +-
  .../modules/bluetooth/bluetooth_error.cc      |   16 +-
  .../modules/clipboard/clipboard_promise.cc    |    2 +-
- .../credentials_container.cc                  |   10 +-
+ .../credentials_container.cc                  |    6 +-
  .../encryptedmedia/encrypted_media_utils.h    |    2 +-
  .../modules/geolocation/geolocation.cc        |    2 +-
  .../play_app_url_manifest.json                |    2 +-
@@ -1156,13 +1073,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../modules/vibration/vibration_controller.cc |    4 +-
  .../modules/webaudio/audio_context.cc         |    4 +-
  .../modules/webmidi/navigator_web_midi.cc     |    2 +-
- .../blink/renderer/platform/PRESUBMIT.py      |    2 +-
  .../platform/fonts/mac/font_cache_mac.mm      |    4 +-
  .../platform/loader/fetch/resource_error.cc   |    2 +-
  .../loader/fetch/resource_load_scheduler.cc   |    2 +-
  .../platform/weborigin/security_origin.cc     |    2 +-
- third_party/blink/tools/blinkpy/PRESUBMIT.py  |    2 +-
- .../tools/blinkpy/common/config/PRESUBMIT.py  |    2 +-
  .../blink/tools/blinkpy/common/net/git_cl.py  |    4 +-
  .../blinkpy/common/net/results_fetcher.py     |   10 +-
  .../blink/tools/blinkpy/common/net/rpc.py     |    6 +-
@@ -1318,20 +1232,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/libxslt/chromium/roll.py          |    2 +-
  third_party/maldoca/src/maldoca/base/status.h |    2 +-
  .../maldoca/src/maldoca/ole/vba_extract.cc    |    2 +-
- third_party/metrics_proto/PRESUBMIT.py        |    2 +-
  third_party/mozilla/NSPasteboard+Utils.mm     |    2 +-
  third_party/mozilla/NSString+Utils.mm         |    2 +-
  third_party/opus/src/doc/opus_in_isobmff.html |    2 +-
  third_party/opus/src/doc/release.txt          |    6 +-
  third_party/pefile_py3/pefile.py              |    4 +-
- third_party/polymer/v1_0/PRESUBMIT.py         |    2 +-
- .../iron-flex-layout/iron-flex-layout.html    |    2 +-
- .../iron-icon/iron-icon.html                  |    2 +-
- .../neon-animation/neon-animated-pages.html   |    2 +-
- .../paper-progress/paper-progress.html        |    2 +-
- .../paper-ripple/paper-ripple.html            |    2 +-
- .../paper-spinner/paper-spinner-lite.html     |    2 +-
- .../paper-tooltip/paper-tooltip.html          |    2 +-
  third_party/protobuf/CHANGES.txt              |   12 +-
  third_party/protobuf/CONTRIBUTORS.txt         |   70 +-
  third_party/protobuf/cmake/CMakeLists.txt     |    2 +-
@@ -1460,10 +1365,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../tools/third_party/pywebsocket3/setup.py   |    2 +-
  .../wpt/tools/webdriver/webdriver/client.py   |    2 +-
  .../wpt_tools/wpt/tools/wpt/android.py        |    2 +-
- .../wpt_tools/wpt/tools/wpt/browser.py        |   30 +-
+ .../wpt_tools/wpt/tools/wpt/browser.py        |   32 +-
  third_party/wpt_tools/wpt/tools/wpt/run.py    |    4 +-
  .../wpt/tools/wptrunner/requirements.txt      |    2 +-
  .../wpt_tools/wpt/tools/wptrunner/setup.py    |    2 +-
+ .../executors/executorcontentshell.py         |    2 +-
  .../wptrunner/executors/executormarionette.py |   14 +-
  .../wptrunner/formatters/chromium.py          |    2 +-
  third_party/xnnpack/generate_build_gn.py      |    2 +-
@@ -1471,23 +1377,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  tools/accessibility/codereview/mph.py         |    2 +-
  tools/accessibility/inspect/ax_utils.cc       |    2 +-
  tools/accessibility/nvda/README.txt           |    2 +-
- tools/android/checkxmlstyle/PRESUBMIT.py      |    2 +-
  tools/android/checkxmlstyle/checkxmlstyle.py  |    8 +-
- .../customtabs_benchmark/scripts/PRESUBMIT.py |    2 +-
  .../scripts/customtabs_benchmark.py           |    2 +-
  .../scripts/run_benchmark.py                  |    2 +-
  .../scripts/sample_config.json                |    4 +-
- .../android/dependency_analysis/PRESUBMIT.py  |    2 +-
  .../js/src/class_view.html                    |    2 +-
  .../dependency_analysis/js/src/load_graph.js  |    2 +-
  .../js/src/package_view.html                  |    2 +-
  .../dependency_analysis/upload_html_viewer.py |    2 +-
  .../convenience/touch_resources.py            |    2 +-
- tools/android/native_lib_memory/PRESUBMIT.py  |    2 +-
- tools/android/python_utils/PRESUBMIT.py       |    2 +-
  tools/android/sdk_updater/update_sdk.py       |    2 +-
- tools/android/test_health/PRESUBMIT.py        |    2 +-
- tools/binary_size/PRESUBMIT.py                |    2 +-
  tools/binary_size/diagnose_bloat.py           |    4 +-
  tools/binary_size/libsupersize/console.py     |    2 +-
  .../libsupersize/viewer/static/auth-consts.js |    8 +-
@@ -1497,7 +1396,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../libsupersize/viewer/static/viewer.html    |    8 +-
  .../libsupersize/viewer/upload_html_viewer.py |    2 +-
  tools/binary_size/libsupersize/zip_util.py    |    2 +-
- tools/binary_size/print_trybot_sizes.py       |    2 +-
  .../binary_size/trybot_commit_size_checker.py |    4 +-
  tools/bisect-builds.py                        |   30 +-
  tools/bisect_repackage/bisect_repackage.py    |    4 +-
@@ -1507,56 +1405,42 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  tools/captured_sites/refresh.py               |    2 +-
  tools/check_git_config.py                     |   24 +-
  tools/checklicenses/checklicenses.py          |    2 +-
- tools/checkperms/PRESUBMIT.py                 |    2 +-
- tools/checkteamtags/PRESUBMIT.py              |    2 +-
  tools/checkteamtags/checkteamtags.py          |    8 +-
  tools/checkteamtags/extract_components.py     |    2 +-
  .../open_my_editor/ext/background.js          |   26 +-
  .../open_my_editor/ext/manifest.json          |    6 +-
  .../manual-fields-to-ignore.txt               |    2 +-
- tools/clang/scripts/build.py                  |   10 +-
+ tools/clang/scripts/build.py                  |   12 +-
  tools/clang/scripts/include-analysis.html     |   12 +-
  tools/clang/scripts/package.py                |    2 +-
  tools/clang/scripts/update.py                 |    2 +-
  tools/code_coverage/coverage.py               |    8 +-
- .../create_js_source_maps/PRESUBMIT.py        |    2 +-
  tools/cr/cr/base/android.py                   |    2 +-
  tools/cr/main.py                              |    2 +-
  tools/crates/gnrt/test_metadata.json          |    2 +-
  tools/crbug/crbug.js                          |    8 +-
  tools/crbug/pinpoint.js                       |    4 +-
  tools/crbug/user-activity.js                  |    4 +-
- tools/cygprofile/PRESUBMIT.py                 |    2 +-
  .../cygprofile/orderfile_generator_backend.py |    4 +-
  tools/determinism/compare_build_artifacts.py  |    2 +-
  tools/download_optimization_profile.py        |    2 +-
  .../dromaeo_benchmark_runner.py               |   10 +-
  tools/emacs/trybot-mac.txt                    |  232 +-
- tools/find_runtime_symbols/PRESUBMIT.py       |    2 +-
- tools/flags/list_flags.py                     |    4 +-
+ tools/flags/list_flags.py                     |    6 +-
  tools/generate_stubs/generate_stubs.py        |    2 +-
  tools/get_asan_chrome/get_asan_chrome.py      |    6 +-
  tools/git/suggest_owners.py                   |    6 +-
  tools/gn/bootstrap/bootstrap.py               |    2 +-
  tools/gn/roll_gn.py                           |    2 +-
- tools/grit/PRESUBMIT.py                       |    2 +-
  tools/grit/grit/format/rc.py                  |    2 +-
  tools/grit/grit/tool/android2grd.py           |    4 +-
  tools/grit/grit/tool/resize.py                |    2 +-
  tools/grit/pak_util.py                        |    2 +-
  tools/grit/setup.py                           |    4 +-
- tools/infra/PRESUBMIT.py                      |    2 +-
- tools/infra/clobber_cache_utils.py            |    4 +-
- tools/infra/find_bad_builds.py                |    2 +-
- tools/infra/reproduce.py                      |   10 +-
- tools/json_data_generator/PRESUBMIT.py        |    2 +-
- tools/json_schema_compiler/PRESUBMIT.py       |    2 +-
  .../js_externs_generator.py                   |    4 +-
  tools/json_schema_compiler/js_util.py         |    2 +-
  tools/json_schema_compiler/preview.py         |    2 +-
- tools/json_to_struct/PRESUBMIT.py             |    2 +-
  tools/licenses.py                             |   38 +-
- tools/linux/PRESUBMIT.py                      |    2 +-
  tools/mac/download_symbols.py                 |    4 +-
  tools/mac/power/scenarios.py                  |   10 +-
  tools/mb/mb.py                                |    4 +-
@@ -1567,23 +1451,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  tools/md_browser/gitiles_ext_blocks.py        |    2 +-
  tools/md_browser/gitiles_smart_quotes.py      |    2 +-
  tools/md_browser/md_browser.py                |    2 +-
- tools/metrics/actions/PRESUBMIT.py            |    2 +-
  tools/metrics/common/models.py                |    2 +-
- tools/metrics/histograms/PRESUBMIT.py         |    2 +-
  tools/metrics/histograms/expand_owners.py     |   12 +-
  .../metrics/histograms/extract_histograms.py  |    8 +-
  ...ram_configuration_model_test_histograms.py |   68 +-
  tools/metrics/histograms/split_xml.py         |    4 +-
  tools/metrics/md2xml.py                       |    4 +-
- tools/metrics/structured/PRESUBMIT.py         |    2 +-
  tools/metrics/structured/model.py             |    6 +-
- tools/metrics/ukm/PRESUBMIT.py                |    2 +-
  tools/metrics/ukm/xml_validations.py          |    4 +-
  tools/nocompile_driver.py                     |    2 +-
  tools/omahaproxy.py                           |    2 +-
  tools/perfbot-analysis/builder.js             |    4 +-
  tools/perfbot-analysis/bulk-download.js       |    2 +-
- tools/polymer/PRESUBMIT.py                    |    2 +-
  tools/python/google/gethash_timer.py          |    2 +-
  tools/resources/find_unused_resources.py      |    2 +-
  tools/roll_webgl_conformance.py               |    2 +-
@@ -1594,16 +1473,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../site_compare/scrapers/firefox/firefox2.py |    2 +-
  tools/site_compare/scrapers/ie/ie7.py         |    4 +-
  tools/site_compare/utils/browser_iterate.py   |    2 +-
- tools/style_variable_generator/PRESUBMIT.py   |    2 +-
  tools/symsrc/source_index.py                  |    8 +-
- tools/tracing/PRESUBMIT.py                    |    2 +-
  tools/tracing/rename_breakpad.py              |    2 +-
  .../sample_traffic_annotation.cc              |    2 +-
  .../scripts/auditor/auditor.py                |    2 +-
  .../scripts/auditor/util.py                   |    2 +-
  .../scripts/update_annotations_doc.py         |    4 +-
  .../scripts/update_annotations_sheet.py       |    6 +-
- tools/typescript/PRESUBMIT.py                 |    2 +-
  tools/usb_gadget/gadget.py                    |    2 +-
  tools/usb_gadget/msos20_descriptors.py        |    2 +-
  tools/variations/bisect_variations.py         |    2 +-
@@ -1614,7 +1490,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  tools/web_dev_style/resource_checker.py       |    2 +-
  .../CreateTempFilesPerfEvaluation/ReadMe.txt  |    2 +-
  tools/win/RetrieveSymbols/RetrieveSymbols.cpp |    2 +-
- tools/win/ShowThreadNames/ReadMe.txt          |    2 +-
  tools/win/sizeviewer/template.html            |    2 +-
  .../chromevox/background/background.js        |    2 +-
  .../chromevox/background/prefs.js             |    4 +-
@@ -1629,336 +1504,27 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../constrained_window_animation.mm           |    2 +-
  ui/base/cocoa/tool_tip_base_view.mm           |    2 +-
  .../cocoa/underlay_opengl_hosting_window.mm   |    2 +-
- ui/base/ime/PRESUBMIT.py                      |    2 +-
  ui/base/ime/character_composer_sequences.txt  |    2 +-
  .../keycodes/keyboard_code_conversion_mac.mm  |    2 +-
- ui/file_manager/base/gn/PRESUBMIT.py          |    2 +-
  .../file_manager/common/js/mock_chrome.js     |    6 +-
  .../foreground/elements/icons.html            |    2 +-
  .../foreground/js/ui/file_table.js            |    2 +-
- ui/file_manager/file_manager/manifest.json    |   10 +-
  ui/file_manager/image_loader/piex/Makefile    |    2 +-
  ui/gl/gl_image_io_surface_egl.mm              |    2 +-
  ui/ozone/ozone.gni                            |    2 +-
- ui/resources/PRESUBMIT.py                     |    4 +-
  ui/resources/README.txt                       |    4 +-
  ui/resources/resource_check/ico_files.py      |    4 +-
  .../resource_check/resource_scale_factors.py  |    4 +-
  ui/strings/ui_strings.grd                     |    4 +-
- ui/views/PRESUBMIT.py                         |    2 +-
  ui/views/examples/webview_example.cc          |    2 +-
  .../cr_components/app_management/icons.html   |    2 +-
  .../quick_unlock/pin_keyboard_icon.html       |    2 +-
+ .../help_bubble/help_bubble_icons.html        |    2 +-
  ui/webui/resources/cr_elements/icons.html     |    4 +-
- url/third_party/mozilla/LICENSE.txt           |    4 +-
  ...weblayer_security_blocking_page_factory.cc |    2 +-
  weblayer/shell/app/shell_main_params.cc       |    2 +-
- 1649 files changed, 5231 insertions(+), 5231 deletions(-)
+ 1519 files changed, 5093 insertions(+), 5093 deletions(-)
 
-diff --git a/PRESUBMIT.py b/PRESUBMIT.py
---- a/PRESUBMIT.py
-+++ b/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for Chromium.
- 
--See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts/
-+See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts/
- for more details about the presubmit API built into depot_tools.
- """
- 
-@@ -220,7 +220,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is'
-        'prohibited. Please use CrTrackingArea instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       False,
-     ),
-@@ -229,7 +229,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea',
-        'instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       False,
-     ),
-@@ -238,7 +238,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertPointFromBase:] is almost certainly wrong.',
-        'Please use |convertPoint:(point) fromView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -247,7 +247,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertPointToBase:] is almost certainly wrong.',
-        'Please use |convertPoint:(point) toView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -256,7 +256,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertRectFromBase:] is almost certainly wrong.',
-        'Please use |convertRect:(point) fromView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -265,7 +265,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertRectToBase:] is almost certainly wrong.',
-        'Please use |convertRect:(point) toView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -274,7 +274,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.',
-        'Please use |convertSize:(point) fromView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -283,7 +283,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = (
-       (
-        'The use of -[NSView convertSizeToBase:] is almost certainly wrong.',
-        'Please use |convertSize:(point) toView:nil| instead.',
--       'http://dev.chromium.org/developers/coding-style/cocoa-dos-and-donts',
-+       'http://dev.ch40m1um.qjz9zk/developers/coding-style/cocoa-dos-and-donts',
-       ),
-       True,
-     ),
-@@ -511,7 +511,7 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = (
-       (
-         "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use",
-         'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),',
--        'and CallJavascriptFunction(). See https://goo.gl/qivavq.',
-+        'and CallJavascriptFunction(). See https://goo.gl.qjz9zk/qivavq.',
-       ),
-       False,
-       (
-@@ -1082,7 +1082,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = (
- 
- _IPC_ENUM_TRAITS_DEPRECATED = (
-     'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n'
--    'See http://www.chromium.org/Home/chromium-security/education/'
-+    'See http://www.ch40m1um.qjz9zk/Home/chromium-security/education/'
-     'security-tips-for-ipc')
- 
- _LONG_PATH_ERROR = (
-@@ -1234,9 +1234,9 @@ _KNOWN_ROBOTS = set(
-                     'lacros-sdk-version-roller')
-   ) | set('%s@skia-public.iam.gserviceaccount.com' % s
-           for s in ('chromium-autoroll', 'chromium-release-autoroll')
--  ) | set('%s@skia-corp.google.com.iam.gserviceaccount.com' % s
-+  ) | set('%s@skia-corp.9oo91e.qjz9zk.iam.gserviceaccount.com' % s
-           for s in ('chromium-internal-autoroll',)
--  ) | set('%s@owners-cleanup-prod.google.com.iam.gserviceaccount.com' % s
-+  ) | set('%s@owners-cleanup-prod.9oo91e.qjz9zk.iam.gserviceaccount.com' % s
-           for s in ('swarming-tasks',))
- 
- _INVALID_GRD_FILE_LINE = [
-@@ -1646,7 +1646,7 @@ def CheckNoDEPSGIT(input_api, output_api):
-                 'Never commit changes to .DEPS.git. This file is maintained by an\n'
-                 'automated system based on what\'s in DEPS and your changes will be\n'
-                 'overwritten.\n'
--                'See https://sites.google.com/a/chromium.org/dev/developers/how-tos/'
-+                'See https://sites.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/dev/developers/how-tos/'
-                 'get-the-code#Rolling_DEPS\n'
-                 'for more information')
-         ]
-@@ -1838,7 +1838,7 @@ def CheckNoPragmaOnce(input_api, output_api):
-         return [
-             output_api.PresubmitError(
-                 'Do not use #pragma once in header files.\n'
--                'See http://www.chromium.org/developers/coding-style#TOC-File-headers',
-+                'See http://www.ch40m1um.qjz9zk/developers/coding-style#TOC-File-headers',
-                 files)
-         ]
-     return []
-@@ -2078,7 +2078,7 @@ def CheckForVersionControlConflicts(input_api, output_api):
- 
- 
- def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api):
--    pattern = input_api.re.compile('support\.google\.com\/chrome.*/answer')
-+    pattern = input_api.re.compile('support\.9oo91e\.qjz9zk\/chrome.*/answer')
-     errors = []
-     for f in input_api.AffectedFiles():
-         for line_num, line in f.ChangedContents():
-@@ -2201,7 +2201,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api):
-             output_api.PresubmitError(
-                 'The name of PNG files should not have abbreviations. \n'
-                 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n'
--                'Contact oshima@chromium.org if you have questions.', errors))
-+                'Contact oshima@ch40m1um.qjz9zk if you have questions.', errors))
-     return results
- 
- def CheckNoProductIconsAddedToPublicRepo(input_api, output_api):
-@@ -3138,7 +3138,7 @@ def CheckSecurityOwners(input_api, output_api):
-         input_api, output_api)
- 
-     if ipc_results.has_security_sensitive_files:
--        output_api.AppendCC('ipc-security-reviews@chromium.org')
-+        output_api.AppendCC('ipc-security-reviews@ch40m1um.qjz9zk')
- 
-     results = []
- 
-@@ -3440,7 +3440,7 @@ def _CheckAndroidToastUsage(input_api, output_api):
-                 'android.widget.Toast usage is detected. Android toasts use hardware'
-                 ' acceleration, and can be\ncostly on low-end devices. Please use'
-                 ' org.chromium.ui.widget.Toast instead.\n'
--                'Contact dskiba@chromium.org if you have any questions.',
-+                'Contact dskiba@ch40m1um.qjz9zk if you have any questions.',
-                 errors))
- 
-     return results
-@@ -3579,7 +3579,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api):
-         results.append(
-             output_api.PresubmitError(
-                 'APIs from junit.framework.* are deprecated, please use JUnit4 framework'
--                '(org.junit.*) from //third_party/junit. Contact yolandyan@chromium.org'
-+                '(org.junit.*) from //third_party/junit. Contact yolandyan@ch40m1um.qjz9zk'
-                 ' if you have any question.', errors))
-     return results
- 
-@@ -3611,7 +3611,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api):
-             output_api.PresubmitPromptWarning(
-                 'The newly created files include Test classes that inherits from base'
-                 ' class. Please do not use inheritance in JUnit4 tests or add new'
--                ' JUnit3 tests. Contact yolandyan@chromium.org if you have any'
-+                ' JUnit3 tests. Contact yolandyan@ch40m1um.qjz9zk if you have any'
-                 ' questions.', errors))
-     return results
- 
-@@ -3636,7 +3636,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api):
-                 'Annotations in android.test.suitebuilder.annotation have been'
-                 ' deprecated since API level 24. Please use android.support.test.filters'
-                 ' from //third_party/android_support_test_runner:runner_java instead.'
--                ' Contact yolandyan@chromium.org if you have any questions.',
-+                ' Contact yolandyan@ch40m1um.qjz9zk if you have any questions.',
-                 errors))
-     return results
- 
-@@ -3659,7 +3659,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api):
-                 'MDPI assets should be placed in /res/drawable-mdpi/ or '
-                 '/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and'
-                 '/res/drawable-ldrtl/.\n'
--                'Contact newt@chromium.org if you have questions.', errors))
-+                'Contact newt@ch40m1um.qjz9zk if you have questions.', errors))
-     return results
- 
- 
-@@ -4261,7 +4261,7 @@ def CheckGnGlobForward(input_api, output_api):
-                     'The variables "visibility" and "test_only" should be '
-                     'explicitly listed in forward_variables_from(). For more '
-                     'details, see:\n'
--                    'https://chromium.googlesource.com/chromium/src/+/HEAD/'
-+                    'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/'
-                     'build/docs/writing_gn_templates.md'
-                     '#Using-forward_variables_from'))
-         ]
-@@ -4429,7 +4429,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api):
-         'LLVMFuzzerInitialize should not be used, unless your fuzz target needs '
-         'to access command line arguments passed to the fuzzer. Instead, prefer '
-         'static initialization and shared resources as documented in '
--        'https://chromium.googlesource.com/chromium/src/+/main/testing/'
-+        'https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/testing/'
-         'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n'
-         % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER))
- 
-@@ -4467,7 +4467,7 @@ def _CheckNewImagesWarning(input_api, output_api):
-             output_api.PresubmitPromptWarning(
-                 'It looks like you are trying to commit some images. If these are '
-                 'non-test-only images, please make sure to read and apply the tips in '
--                'https://chromium.googlesource.com/chromium/src/+/HEAD/docs/speed/'
-+                'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/docs/speed/'
-                 'binary_size/optimization_advice.md#optimizing-images\nThis check is '
-                 'FYI only and will not block your CL on the CQ.', image_paths))
-     return errors
-@@ -4683,7 +4683,7 @@ _NON_INCLUSIVE_TERMS = (
-             '"# nocheck" or "<!-- nocheck -->"',
-             'at the end of the offending line will bypass this PRESUBMIT error',
-             'but avoid using this whenever possible. Reach out to',
--            'community@chromium.org if you have questions'),
-+            'community@ch40m1um.qjz9zk if you have questions'),
-         True),)
- 
- def ChecksCommon(input_api, output_api):
-@@ -4966,7 +4966,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api):
- 
- def CheckForIPCRules(input_api, output_api):
-     """Check for same IPC rules described in
--    http://www.chromium.org/Home/chromium-security/education/security-tips-for-ipc
-+    http://www.ch40m1um.qjz9zk/Home/chromium-security/education/security-tips-for-ipc
-     """
-     base_pattern = r'IPC_ENUM_TRAITS\('
-     inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern)
-@@ -5253,9 +5253,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api):
-                 'You are adding/modifying code'
-                 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,'
-                 ' PNaCl, PPAPI). See this blog post for more details:\n'
--                'https://blog.chromium.org/2020/08/changes-to-chrome-app-support-timeline.html\n'
-+                'https://blog.ch40m1um.qjz9zk/2020/08/changes-to-chrome-app-support-timeline.html\n'
-                 'and this documentation for options to replace these technologies:\n'
--                'https://developer.chrome.com/docs/apps/migration/\n' +
-+                'https://developer.ch40me.qjz9zk/docs/apps/migration/\n' +
-                 '\n'.join(problems))
-         ]
- 
-@@ -5309,7 +5309,7 @@ def CheckChangeOnCommit(input_api, output_api):
-         input_api.canned_checks.CheckTreeIsOpen(
-             input_api,
-             output_api,
--            json_url='http://chromium-status.appspot.com/current?format=json'))
-+            json_url='http://chromium-status.8pp2p8t.qjz9zk/current?format=json'))
- 
-     results.extend(
-         input_api.canned_checks.CheckPatchFormatted(input_api, output_api))
-@@ -5655,7 +5655,7 @@ def CheckStrings(input_api, output_api):
-         results.append(
-             output_api.PresubmitPromptWarning(
-                 'ICU syntax errors were found in the following strings (problems or '
--                'feedback? Contact rainhard@chromium.org):',
-+                'feedback? Contact rainhard@ch40m1um.qjz9zk):',
-                 items=icu_syntax_errors))
- 
-     return results
-@@ -5985,11 +5985,11 @@ def CheckMPArchApiUsage(input_api, output_api):
- 
-     if not used_apis:
-         if used_fyi_methods:
--            output_api.AppendCC('mparch-reviews+watchfyi@chromium.org')
-+            output_api.AppendCC('mparch-reviews+watchfyi@ch40m1um.qjz9zk')
- 
-         return []
- 
--    output_api.AppendCC('mparch-reviews+watch@chromium.org')
-+    output_api.AppendCC('mparch-reviews+watch@ch40m1um.qjz9zk')
-     message = ('This change uses API(s) that are ambiguous in the presence of '
-                'MPArch features such as bfcache, prerendering, and fenced '
-                'frames.')
-@@ -6003,8 +6003,8 @@ def CheckMPArchApiUsage(input_api, output_api):
-         'See this doc [1] and the comments on the individual APIs '
-         'for guidance and this doc [2] for context. The MPArch review '
-         'watchlist has been CC\'d on this change to help identify any issues.\n'
--        '[1] https://docs.google.com/document/d/13l16rWTal3o5wce4i0RwdpMP5ESELLKr439Faj2BBRo/edit?usp=sharing\n'
--        '[2] https://docs.google.com/document/d/1NginQ8k0w3znuwTiJ5qjYmBKgZDekvEPC22q0I4swxQ/edit?usp=sharing'
-+        '[1] https://docs.9oo91e.qjz9zk/document/d/13l16rWTal3o5wce4i0RwdpMP5ESELLKr439Faj2BBRo/edit?usp=sharing\n'
-+        '[2] https://docs.9oo91e.qjz9zk/document/d/1NginQ8k0w3znuwTiJ5qjYmBKgZDekvEPC22q0I4swxQ/edit?usp=sharing'
-     )
-     return [
-         output_api.PresubmitNotifyResult(message,
 diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/android_webview/tools/cts_config/webview_cts_gcs_path.json
 --- a/android_webview/tools/cts_config/webview_cts_gcs_path.json
 +++ b/android_webview/tools/cts_config/webview_cts_gcs_path.json
@@ -2010,75 +1576,72 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi
 @@ -256,12 +256,12 @@
      "arch": {
        "arm64": {
-         "filename": "arm64/P/android-cts-arm64-9.0_r19.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r19-linux_x86-arm.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r19-linux_x86-arm.zip",
-         "unzip_dir": "arm64/P/9.0_r19"
+         "filename": "arm64/P/android-cts-arm64-9.0_r20.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r20-linux_x86-arm.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r20-linux_x86-arm.zip",
+         "unzip_dir": "arm64/P/9.0_r20"
        },
        "x86": {
-         "filename": "x86/P/android-cts-x86-9.0_r19.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r19-linux_x86-x86.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r19-linux_x86-x86.zip",
-         "unzip_dir": "x86/P/9.0_r19"
+         "filename": "x86/P/android-cts-x86-9.0_r20.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r20-linux_x86-x86.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r20-linux_x86-x86.zip",
+         "unzip_dir": "x86/P/9.0_r20"
        }
      },
 @@ -326,12 +326,12 @@
      "arch": {
        "arm64": {
-         "filename": "arm64/Q/android-cts-arm64-10_r11.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r11-linux_x86-arm.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r11-linux_x86-arm.zip",
-         "unzip_dir": "arm64/Q/10_r11"
+         "filename": "arm64/Q/android-cts-arm64-10_r13.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r13-linux_x86-arm.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r13-linux_x86-arm.zip",
+         "unzip_dir": "arm64/Q/10_r13"
        },
        "x86": {
-         "filename": "x86/Q/android-cts-x86-10_r11.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r11-linux_x86-x86.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r11-linux_x86-x86.zip",
-         "unzip_dir": "x86/Q/10_r11"
+         "filename": "x86/Q/android-cts-x86-10_r13.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r13-linux_x86-x86.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r13-linux_x86-x86.zip",
+         "unzip_dir": "x86/Q/10_r13"
        }
      },
 @@ -419,12 +419,12 @@
      "arch": {
        "arm64": {
-         "filename": "arm64/R/android-cts-arm64-11_r7.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r7-linux_x86-arm.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r7-linux_x86-arm.zip",
-         "unzip_dir": "arm64/R/11_r7/"
+         "filename": "arm64/R/android-cts-arm64-11_r9.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r9-linux_x86-arm.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r9-linux_x86-arm.zip",
+         "unzip_dir": "arm64/R/11_r9/"
        },
        "x86": {
-         "filename": "x86/R/android-cts-x86-11_r7.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r7-linux_x86-x86.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r7-linux_x86-x86.zip",
-         "unzip_dir": "x86/R/11_r7/"
+         "filename": "x86/R/android-cts-x86-11_r9.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r9-linux_x86-x86.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r9-linux_x86-x86.zip",
+         "unzip_dir": "x86/R/11_r9/"
        }
      },
 @@ -537,12 +537,12 @@
      "arch": {
        "arm64": {
-         "filename": "arm64/S/android-cts-arm64-12_r3.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r3-linux_x86-arm.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r3-linux_x86-arm.zip",
-         "unzip_dir": "arm64/R/12_r3/"
+         "filename": "arm64/S/android-cts-arm64-12_r5.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r5-linux_x86-arm.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r5-linux_x86-arm.zip",
+         "unzip_dir": "arm64/S/12_r5/"
        },
        "x86": {
-         "filename": "x86/S/android-cts-x86-12_r3.zip",
--        "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r3-linux_x86-x86.zip",
-+        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r3-linux_x86-x86.zip",
-         "unzip_dir": "x86/R/12_r3/"
+         "filename": "x86/S/android-cts-x86-12_r5.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r5-linux_x86-x86.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r5-linux_x86-x86.zip",
+         "unzip_dir": "x86/S/12_r5/"
+       }
+     },
+@@ -670,7 +670,7 @@
+     "arch": {
+       "x86": {
+         "filename": "x86/T/android-cts-x86-13_r1.zip",
+-        "_origin": "https://dl.google.com/dl/android/cts/android-cts-13_r1-linux_x86-x86.zip",
++        "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-13_r1-linux_x86-x86.zip",
+         "unzip_dir": "x86/T/13_r1/"
        }
      },
-diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/tools/generate_flag_labels.py
---- a/android_webview/tools/generate_flag_labels.py
-+++ b/android_webview/tools/generate_flag_labels.py
-@@ -334,7 +334,7 @@ double-check this picked the correct labels for your new features (labels are
- case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow
- these steps as a final check:
- 
--https://chromium.googlesource.com/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms
-+https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms
- """
-   print(message)
- 
 diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/record_netlog.py
 --- a/android_webview/tools/record_netlog.py
 +++ b/android_webview/tools/record_netlog.py
@@ -2163,18 +1726,6 @@ diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/ac
  
  // Accessibility notification ids.
  const char kDockedMagnifierToggleAccelNotificationId[] =
-diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py
---- a/ash/app_list/PRESUBMIT.py
-+++ b/ash/app_list/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for app_list.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
 --- a/ash/ash_strings.grd
 +++ b/ash/ash_strings.grd
@@ -2230,7 +1781,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
 +        <ph name="ORGANIZATION_NAME">$1<ex>9oo91e.qjz9zk</ex></ph> has <ph name="FEATURE_STATE">$2<ex>activated</ex></ph> <ph name="FEATURE_NAME">$3<ex>Full-screen magnifier</ex></ph>.
        </message>
        <message name="IDS_ASH_HIGH_CONTRAST_SHORTCUT_DISABLED"
-                desc="The label used in the notification used to indicate that, the shortcut for high contrast feature has been disabled.">
+                desc="The label used in the notification used to indicate that, the shortcut for color inversion feature (formerly known as high contrast) has been disabled.">
 @@ -1294,7 +1294,7 @@ This file contains the strings for ash.
           Supervised user
        </message>
@@ -2240,7 +1791,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_ASH_CHILD_USER_IS_MANAGED_BY_ONE_PARENT_NOTICE" desc="Text for notifications showing that this user is managed by parent's account.">
          Account managed by <ph name="MANAGER_EMAIL">$1<ex>user@example.com</ex></ph>
-@@ -1593,7 +1593,7 @@ This file contains the strings for ash.
+@@ -1599,7 +1599,7 @@ This file contains the strings for ash.
          Tap to configure
        </message>
        <message name="IDS_ASH_PHONE_HUB_CONTINUE_BROWSING_TAB_LABEL" desc="Label inside a Phone Hub continue browsing card that describes the index of the card, title of the webpage, and webpage url.">
@@ -2249,7 +1800,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_ASH_PHONE_HUB_CONNECTED_DEVICE_SETTINGS_LABEL" desc="Label for the settings button in the Phone Hub UI that lets users know that the button routes to the ChromeOS Settings app page for connected devices (e.g. to disable Phone Hub features, enable/disable Smartlock, etc)">
          Connected devices settings
-@@ -3277,7 +3277,7 @@ Connect your device to power.
+@@ -3286,7 +3286,7 @@ Connect your device to power.
          Save your <ph name="NAME">$1<ex>Pixel Buds</ex></ph>
        </message>
        <message name="IDS_FAST_PAIR_ASSOCIATE_ACCOUNT_NOTIFICATION_MESSAGE" desc="Notification message shown to ask users if they want to save a Fast Pair device that was paired via classic bluetooth to their Google account.">
@@ -2258,7 +1809,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_FAST_PAIR_SETTINGS_BUTTON" desc="Button title shown to direct users to settings when there is an error connecting with Fast Pair">
          Settings
-@@ -3310,10 +3310,10 @@ Connect your device to power.
+@@ -3319,10 +3319,10 @@ Connect your device to power.
          Connect <ph name="NAME">$1<ex>Pixel Buds</ex></ph> to this Chromebook
        </message>
        <message name="IDS_FAST_PAIR_DISCOVERY_NOTIFICATION_EMAIL_MESSAGE" desc="Notification message shown when there is a device discovered with Fast Pair that includes the user's email address.">
@@ -2271,7 +1822,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_FAST_PAIR_CANCEL_BUTTON" desc="Message on button to tell users to cancel bluetooth device connection with Fast Pair.">
          Cancel
-@@ -3439,7 +3439,7 @@ Connect your device to power.
+@@ -3448,7 +3448,7 @@ Connect your device to power.
          Multiple sign-in has been disabled
        </message>
        <message name="IDS_ASH_MULTIPROFILES_SESSION_ABORT_MESSAGE" desc="Body text for a dialog that describes that the current multi profile session is ending because one user is no longer allowed.">
@@ -2280,7 +1831,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_ASH_MULTIPROFILES_SESSION_ABORT_BUTTON_LABEL" desc="The label for the one (and only) button on a dialog that describes why the multi profile session is ending.">
          Sign out
-@@ -3963,7 +3963,7 @@ Here are some things you can try to get started.
+@@ -3972,7 +3972,7 @@ Here are some things you can try to get started.
          Unlock device to perform the notification action
        </message>
        <message name="IDS_ASH_MESSAGE_CENTER_UNLOCK_TO_PERFORM_ACTION_WITH_USER_ID" desc="The short message to encourage user to unlock the device so that ChromeOS can perform the notification action selected by user after unlocking.">
@@ -2289,18 +1840,6 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
        </message>
        <message name="IDS_ASH_MESSAGE_CENTER_UNLOCK_TO_CHANGE_SETTING" desc="The short message to encourage user to unlock the device to change the lock screen notification setting, so that ChromeOS can show the setting window after unlocking.">
          To see notifications on your lock screen, unlock to change the setting
-diff --git a/ash/assistant/PRESUBMIT.py b/ash/assistant/PRESUBMIT.py
---- a/ash/assistant/PRESUBMIT.py
-+++ b/ash/assistant/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- PRESUBMIT_VERSION = '2.0.0'
 diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assistant_setup_controller.cc
 --- a/ash/assistant/assistant_setup_controller.cc
 +++ b/ash/assistant/assistant_setup_controller.cc
@@ -2318,11 +1857,11 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link
 +++ b/ash/assistant/util/deep_link_util.cc
 @@ -388,21 +388,21 @@ absl::optional<GURL> GetAssistantUrl(
      case DeepLinkType::kLists: {
-       const auto& type = GetDeepLinkParam(params, DeepLinkParam::kType);
+       const auto& type_param = GetDeepLinkParam(params, DeepLinkParam::kType);
        top_level_url =
 -          std::string("https://assistant.google.com/lists/mainview");
 +          std::string("https://assistant.9oo91e.qjz9zk/lists/mainview");
-       by_id_url = (type && type.value().compare("shopping") == 0)
+       by_id_url = (type_param && type_param.value().compare("shopping") == 0)
 -                      ? std::string("https://shoppinglist.google.com/lists/")
 -                      : std::string("https://assistant.google.com/lists/list/");
 +                      ? std::string("https://shoppinglist.9oo91e.qjz9zk/lists/")
@@ -2354,42 +1893,6 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link
  
    if (!IsWebDeepLinkType(type, params))
      return absl::nullopt;
-diff --git a/ash/components/device_activity/device_activity_controller.cc b/ash/components/device_activity/device_activity_controller.cc
---- a/ash/components/device_activity/device_activity_controller.cc
-+++ b/ash/components/device_activity/device_activity_controller.cc
-@@ -57,7 +57,7 @@ static const std::unordered_set<policy::DeviceMode>& DeviceModeEnterprise() {
- 
- // Production edge server for reporting device actives.
- // TODO(https://crbug.com/1267432): Enable passing base url as a runtime flag.
--const char kFresnelBaseUrl[] = "https://crosfresnel-pa.googleapis.com";
-+const char kFresnelBaseUrl[] = "https://crosfresnel-pa.9oo91eapis.qjz9zk";
- 
- // Count the number of PSM device active secret that is set.
- const char kDeviceActiveControllerPsmDeviceActiveSecretIsSet[] =
-diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/drivefs_auth.cc
---- a/ash/components/drivefs/drivefs_auth.cc
-+++ b/ash/components/drivefs/drivefs_auth.cc
-@@ -63,7 +63,7 @@ void DriveFsAuth::GetAccessToken(
-   timer_->Start(
-       FROM_HERE, base::Seconds(30),
-       base::BindOnce(&DriveFsAuth::AuthTimeout, base::Unretained(this)));
--  std::set<std::string> scopes({"https://www.googleapis.com/auth/drive"});
-+  std::set<std::string> scopes({"https://www.9oo91eapis.qjz9zk/auth/drive"});
-   access_token_fetcher_ =
-       std::make_unique<signin::PrimaryAccountAccessTokenFetcher>(
-           kIdentityConsumerId, identity_manager, scopes,
-diff --git a/ash/components/geolocation/simple_geolocation_provider.cc b/ash/components/geolocation/simple_geolocation_provider.cc
---- 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?";
-+    "https://www.9oo91eapis.qjz9zk/geolocation/v1/geolocate?";
- 
- }  // namespace
- 
 diff --git a/ash/components/multidevice/stub_multidevice_util.cc b/ash/components/multidevice/stub_multidevice_util.cc
 --- a/ash/components/multidevice/stub_multidevice_util.cc
 +++ b/ash/components/multidevice/stub_multidevice_util.cc
@@ -2501,7 +2004,7 @@ diff --git a/ash/quick_pair/repository/fast_pair/footprints_fetcher_impl.cc b/as
 diff --git a/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc b/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc
 --- a/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc
 +++ b/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc
-@@ -37,9 +37,9 @@
+@@ -36,9 +36,9 @@
  namespace {
  
  const char kDiscoveryLearnMoreLink[] =
@@ -2513,21 +2016,6 @@ diff --git a/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc b/ash/quick
  
  bool ShouldShowUserEmail(ash::LoginStatus status) {
    switch (status) {
-diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py
---- a/ash/resources/PRESUBMIT.py
-+++ b/ash/resources/PRESUBMIT.py
-@@ -4,9 +4,9 @@
- 
- """Presubmit script for Chromium Ash resources.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools, and see
--https://chromium.googlesource.com/chromium/src/+/HEAD/styleguide/web/web.md
-+https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/styleguide/web/web.md
- for the rules we're checking against here.
- """
- 
 diff --git a/ash/services/device_sync/cryptauth_client_impl.cc b/ash/services/device_sync/cryptauth_client_impl.cc
 --- a/ash/services/device_sync/cryptauth_client_impl.cc
 +++ b/ash/services/device_sync/cryptauth_client_impl.cc
@@ -2578,7 +2066,7 @@ diff --git a/ash/services/ime/constants.cc b/ash/services/ime/constants.cc
 diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc
 --- a/ash/system/eche/eche_tray.cc
 +++ b/ash/system/eche/eche_tray.cc
-@@ -245,7 +245,7 @@ bool EcheTray::PerformAction(const ui::Event& event) {
+@@ -277,7 +277,7 @@ bool EcheTray::PerformAction(const ui::Event& event) {
      HideBubble();
    } else {
  #ifdef FAKE_BUBBLE_FOR_DEBUG
@@ -2693,18 +2181,6 @@ diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd b/ash/
        </message>
        <message desc="Label for detected text on the barcode chip." name="IDS_BARCODE_TEXT_DETECTED">
          Text detected.
-diff --git a/ash/webui/common/resources/PRESUBMIT.py b/ash/webui/common/resources/PRESUBMIT.py
---- a/ash/webui/common/resources/PRESUBMIT.py
-+++ b/ash/webui/common/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Common UI.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/webui/diagnostics_ui/diagnostics_ui.cc b/ash/webui/diagnostics_ui/diagnostics_ui.cc
 --- a/ash/webui/diagnostics_ui/diagnostics_ui.cc
 +++ b/ash/webui/diagnostics_ui/diagnostics_ui.cc
@@ -2717,18 +2193,6 @@ diff --git a/ash/webui/diagnostics_ui/diagnostics_ui.cc b/ash/webui/diagnostics_
    return update;
  }
  
-diff --git a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py b/ash/webui/diagnostics_ui/resources/PRESUBMIT.py
---- a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py
-+++ b/ash/webui/diagnostics_ui/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Diagnostics.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js
 --- a/ash/webui/diagnostics_ui/resources/network_card.js
 +++ b/ash/webui/diagnostics_ui/resources/network_card.js
@@ -2765,18 +2229,6 @@ diff --git a/ash/webui/eche_app_ui/eche_alert_generator.cc b/ash/webui/eche_app_
  
  EcheAlertGenerator::EcheAlertGenerator(LaunchAppHelper* launch_app_helper,
                                         PrefService* pref_service)
-diff --git a/ash/webui/firmware_update_ui/resources/PRESUBMIT.py b/ash/webui/firmware_update_ui/resources/PRESUBMIT.py
---- a/ash/webui/firmware_update_ui/resources/PRESUBMIT.py
-+++ b/ash/webui/firmware_update_ui/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Firmware Update
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc
 --- a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc
 +++ b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc
@@ -2881,6 +2333,15 @@ diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feed
      contentType: HelpContentType.kUnknown,
    },
  ];
+@@ -92,7 +92,7 @@ export const fakeEmptyFeedbackContext = {
+ 
+ /** @type {!FeedbackContext} */
+ export const fakeInternalUserFeedbackContext = {
+-  email: 'test.user@google.com',
++  email: 'test.user@9oo91e.qjz9zk',
+   pageUrl: {url: 'chrome://tab/'},
+   isInternalAccount: true,
+ };
 diff --git a/ash/webui/os_feedback_ui/resources/feedback_constants.js b/ash/webui/os_feedback_ui/resources/feedback_constants.js
 --- a/ash/webui/os_feedback_ui/resources/feedback_constants.js
 +++ b/ash/webui/os_feedback_ui/resources/feedback_constants.js
@@ -2899,7 +2360,7 @@ diff --git a/ash/webui/os_feedback_ui/resources/feedback_constants.js b/ash/webu
 diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_feedback_ui/resources/search_page.js
 --- a/ash/webui/os_feedback_ui/resources/search_page.js
 +++ b/ash/webui/os_feedback_ui/resources/search_page.js
-@@ -267,7 +267,7 @@ export class SearchPageElement extends SearchPageElementBase {
+@@ -285,7 +285,7 @@ export class SearchPageElement extends SearchPageElementBase {
     */
    feedbackWritingGuidanceUrl_() {
      // TODO(xiangdongkong): append ?hl={the application locale} to the url.
@@ -2920,30 +2381,6 @@ diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui
  
  GURL GetGooglePhotosURL() {
    return GURL(kGooglePhotosURL);
-diff --git a/ash/webui/personalization_app/resources/PRESUBMIT.py b/ash/webui/personalization_app/resources/PRESUBMIT.py
---- a/ash/webui/personalization_app/resources/PRESUBMIT.py
-+++ b/ash/webui/personalization_app/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Personalization app.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/ash/webui/print_management/resources/PRESUBMIT.py b/ash/webui/print_management/resources/PRESUBMIT.py
---- a/ash/webui/print_management/resources/PRESUBMIT.py
-+++ b/ash/webui/print_management/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Print Management.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/projector_app/projector_xhr_sender.cc
 --- a/ash/webui/projector_app/projector_xhr_sender.cc
 +++ b/ash/webui/projector_app/projector_xhr_sender.cc
@@ -2988,7 +2425,7 @@ diff --git a/ash/webui/projector_app/projector_xhr_sender.h b/ash/webui/projecto
 diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/projector_app/untrusted_projector_ui.cc
 --- a/ash/webui/projector_app/untrusted_projector_ui.cc
 +++ b/ash/webui/projector_app/untrusted_projector_ui.cc
-@@ -45,13 +45,13 @@ content::WebUIDataSource* CreateProjectorHTMLSource(
+@@ -50,13 +50,13 @@ content::WebUIDataSource* CreateProjectorHTMLSource(
    // Allow fonts.
    source->OverrideContentSecurityPolicy(
        network::mojom::CSPDirectiveName::FontSrc,
@@ -3005,7 +2442,7 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje
        kChromeUIUntrustedProjectorPwaUrl + " blob:;";
    source->OverrideContentSecurityPolicy(
        network::mojom::CSPDirectiveName::MediaSrc,
-@@ -60,11 +60,11 @@ content::WebUIDataSource* CreateProjectorHTMLSource(
+@@ -65,11 +65,11 @@ content::WebUIDataSource* CreateProjectorHTMLSource(
    // Allow images to also handle data urls.
    source->OverrideContentSecurityPolicy(
        network::mojom::CSPDirectiveName::ImgSrc,
@@ -3020,18 +2457,6 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje
  
    source->OverrideContentSecurityPolicy(
        network::mojom::CSPDirectiveName::TrustedTypes,
-diff --git a/ash/webui/scanning/resources/PRESUBMIT.py b/ash/webui/scanning/resources/PRESUBMIT.py
---- a/ash/webui/scanning/resources/PRESUBMIT.py
-+++ b/ash/webui/scanning/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Scanning.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html
 --- a/ash/webui/scanning/resources/scanning_app.html
 +++ b/ash/webui/scanning/resources/scanning_app.html
@@ -3068,51 +2493,6 @@ diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_co
      return unlockPageUrl + this.rsuChallenge_ + '&hwid=' + this.rsuHwid_;
    }
  
-diff --git a/ash/webui/shortcut_customization_ui/resources/PRESUBMIT.py b/ash/webui/shortcut_customization_ui/resources/PRESUBMIT.py
---- a/ash/webui/shortcut_customization_ui/resources/PRESUBMIT.py
-+++ b/ash/webui/shortcut_customization_ui/resources/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Shortcut Customization.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py
---- a/base/PRESUBMIT.py
-+++ b/base/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/base.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-@@ -48,7 +48,7 @@ def _CheckNoInterfacesInBase(input_api, output_api):
-   if len(files):
-     return [ output_api.PresubmitError(
-         'Objective-C interfaces or categories are forbidden in libbase. ' +
--        'See http://groups.google.com/a/chromium.org/group/chromium-dev/' +
-+        'See http://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/group/chromium-dev/' +
-         'browse_thread/thread/efb28c10435987fd',
-         files) ]
-   return []
-diff --git a/base/android/jni_generator/PRESUBMIT.py b/base/android/jni_generator/PRESUBMIT.py
---- a/base/android/jni_generator/PRESUBMIT.py
-+++ b/base/android/jni_generator/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for android buildbot.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/base/android/resource_exclusions.gni b/base/android/resource_exclusions.gni
 --- a/base/android/resource_exclusions.gni
 +++ b/base/android/resource_exclusions.gni
@@ -3146,7 +2526,7 @@ diff --git a/base/callback.h b/base/callback.h
    }
  };
  
-@@ -314,7 +314,7 @@ class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
+@@ -318,7 +318,7 @@ class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
      static_assert(
          AlwaysFalse<Signature>,
          "need to convert a base::RepeatingCallback to base::FunctionRef? "
@@ -3155,7 +2535,7 @@ diff --git a/base/callback.h b/base/callback.h
    }
  
    template <typename Signature>
-@@ -324,7 +324,7 @@ class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
+@@ -328,7 +328,7 @@ class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
          AlwaysFalse<Signature>,
          "using base::BindRepeating() is not necessary with base::FunctionRef; "
          "is it possible to use a capturing lambda directly? If not, please "
@@ -3212,7 +2592,7 @@ diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm
 diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc
 --- a/base/memory/raw_ptr.cc
 +++ b/base/memory/raw_ptr.cc
-@@ -185,7 +185,7 @@ void AsanBackupRefPtrImpl::AsanCheckIfValidExtraction(
+@@ -188,7 +188,7 @@ void AsanBackupRefPtrImpl::AsanCheckIfValidExtraction(
            "Otherwise, it is still likely a bug to rely on the address of an "
            "already freed allocation.\n"
            "Refer to "
@@ -3224,7 +2604,7 @@ diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc
 diff --git a/base/memory/raw_ptr_asan_service.cc b/base/memory/raw_ptr_asan_service.cc
 --- a/base/memory/raw_ptr_asan_service.cc
 +++ b/base/memory/raw_ptr_asan_service.cc
-@@ -189,7 +189,7 @@ void RawPtrAsanService::ErrorReportCallback(const char* report) {
+@@ -215,7 +215,7 @@ void RawPtrAsanService::ErrorReportCallback(const char* report) {
  
    Log("\nMiraclePtr Status: %s\n"
        "Refer to "
@@ -3233,18 +2613,6 @@ diff --git a/base/memory/raw_ptr_asan_service.cc b/base/memory/raw_ptr_asan_serv
        "raw_ptr.md for details.",
        status_body);
  }
-diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py
---- a/build/android/PRESUBMIT.py
-+++ b/build/android/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for android buildbot.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py
 --- a/build/android/gradle/generate_gradle.py
 +++ b/build/android/gradle/generate_gradle.py
@@ -3284,7 +2652,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
 diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
 --- a/build/android/gyp/proguard.py
 +++ b/build/android/gyp/proguard.py
-@@ -361,7 +361,7 @@ def _OptimizeWithR8(options,
+@@ -369,7 +369,7 @@ def _OptimizeWithR8(options,
        # Python will print the original exception as well.
        raise Exception(
            'R8 failed. Please see '
@@ -3293,7 +2661,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
            'android/docs/java_optimization.md#Debugging-common-failures') from e
  
      base_has_imported_lib = False
-@@ -495,7 +495,7 @@ out/Release/apks/YourApk.apk > dex.txt
+@@ -503,7 +503,7 @@ out/Release/apks/YourApk.apk > dex.txt
            stderr += """
  You may need to update build configs to run FragmentActivityReplacer for
  additional targets. See
@@ -3342,184 +2710,10 @@ diff --git a/build/android/incremental_install/installer.py b/build/android/incr
  
  To enable access:
     adb -s {0} shell settings put global {1} 0
-diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
---- a/build/android/pylib/constants/__init__.py
-+++ b/build/android/pylib/constants/__init__.py
-@@ -127,7 +127,7 @@ BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
-                                 os.environ.get('CHROMIUM_OUT_DIR', 'out'),
-                                 'bad_devices.json')
- 
--UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
-+UPSTREAM_FLAKINESS_SERVER = 'test-results.8pp2p8t.qjz9zk'
- 
- # TODO(jbudorick): Remove once unused.
- DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
-diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py
---- a/build/android/pylib/device_settings.py
-+++ b/build/android/pylib/device_settings.py
-@@ -19,9 +19,9 @@ def ConfigureContentSettings(device, desired_settings):
-   """Configures device content setings from a list.
- 
-   Many settings are documented at:
--    http://developer.android.com/reference/android/provider/Settings.Global.html
--    http://developer.android.com/reference/android/provider/Settings.Secure.html
--    http://developer.android.com/reference/android/provider/Settings.System.html
-+    http://developer.8n6r01d.qjz9zk/reference/android/provider/Settings.Global.html
-+    http://developer.8n6r01d.qjz9zk/reference/android/provider/Settings.Secure.html
-+    http://developer.8n6r01d.qjz9zk/reference/android/provider/Settings.System.html
- 
-   Many others are undocumented.
- 
-@@ -164,7 +164,7 @@ DETERMINISTIC_DEVICE_SETTINGS = [
-   ]),
-   ('settings/secure', [
-     ('allowed_geolocation_origins',
--        'http://www.google.co.uk http://www.google.com'),
-+        'http://www.google.co.uk http://www.9oo91e.qjz9zk'),
- 
-     # Ensure that we never get random dialogs like "Unfortunately the process
-     # android.process.acore has stopped", which steal the focus, and make our
-diff --git a/build/android/pylib/dex/dex_parser.py b/build/android/pylib/dex/dex_parser.py
---- a/build/android/pylib/dex/dex_parser.py
-+++ b/build/android/pylib/dex/dex_parser.py
-@@ -286,10 +286,10 @@ class _DexReader:
-   def _DecodeMUtf8(self, string_length, offset):
-     """Returns the string located at the specified offset.
- 
--    See https://source.android.com/devices/tech/dalvik/dex-format#mutf-8
-+    See https://source.8n6r01d.qjz9zk/devices/tech/dalvik/dex-format#mutf-8
- 
-     Ported from the Android Java implementation:
--    https://android.googlesource.com/platform/dalvik/+/fe107fb6e3f308ac5174ebdc5a794ee880c741d9/dx/src/com/android/dex/Mutf8.java#34
-+    https://android.9oo91esource.qjz9zk/platform/dalvik/+/fe107fb6e3f308ac5174ebdc5a794ee880c741d9/dx/src/com/android/dex/Mutf8.java#34
- 
-     Args:
-       string_length: The length of the decoded string.
-@@ -343,7 +343,7 @@ class DexFile:
-   """Represents a single dex file.
- 
-   Parses and exposes access to dex file structure and contents, as described
--  at https://source.android.com/devices/tech/dalvik/dex-format
-+  at https://source.8n6r01d.qjz9zk/devices/tech/dalvik/dex-format
- 
-   Fields:
-     reader: _DexReader object used to decode dex file contents.
-diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/build/android/pylib/local/device/local_device_monkey_test_run.py
---- a/build/android/pylib/local/device/local_device_monkey_test_run.py
-+++ b/build/android/pylib/local/device/local_device_monkey_test_run.py
-@@ -120,6 +120,6 @@ class LocalDeviceMonkeyTestRun(local_device_test_run.LocalDeviceTestRun):
-         # Kill the monkey test process on the device. If you manually
-         # interrupt the test run, this will prevent the monkey test from
-         # continuing to run.
--        device.KillAll('com.android.commands.monkey')
-+        device.KillAll('com.8n6r01d.qjz9zkmands.monkey')
-       except device_errors.CommandFailedError:
-         pass
-diff --git a/build/android/pylib/local/emulator/avd.py b/build/android/pylib/local/emulator/avd.py
---- a/build/android/pylib/local/emulator/avd.py
-+++ b/build/android/pylib/local/emulator/avd.py
-@@ -834,7 +834,7 @@ class _AvdInstance:
-     """Return the snapshot name to load/save.
- 
-     Emulator has a different snapshot process when '-writable-system' flag is
--    set (See https://issuetracker.google.com/issues/135857816#comment8).
-+    set (See https://issuetracker.9oo91e.qjz9zk/issues/135857816#comment8).
- 
-     """
-     if self._writable_system:
-diff --git a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py
---- a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py
-+++ b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py
-@@ -671,7 +671,7 @@ def _EncodeMultipartFormData(fields, files):
-     (content_type, body) ready for httplib.HTTP instance.
- 
-   Source:
--    http://code.google.com/p/rietveld/source/browse/trunk/upload.py
-+    http://code.9oo91e.qjz9zk/p/rietveld/source/browse/trunk/upload.py
-   """
-   BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
-   CRLF = '\r\n'
-diff --git a/build/android/pylib/results/presentation/test_results_presentation.py b/build/android/pylib/results/presentation/test_results_presentation.py
---- a/build/android/pylib/results/presentation/test_results_presentation.py
-+++ b/build/android/pylib/results/presentation/test_results_presentation.py
-@@ -110,7 +110,7 @@ def action_cell(action, data, html_class):
- 
- def flakiness_dashbord_link(test_name, suite_name):
-   url_args = urlencode([('testType', suite_name), ('tests', test_name)])
--  return ('https://test-results.appspot.com/'
-+  return ('https://test-results.8pp2p8t.qjz9zk/'
-          'dashboards/flakiness_dashboard.html#%s' % url_args)
- 
- 
-@@ -276,7 +276,7 @@ def feedback_url(result_details_link):
-   if result_details_link:
-     url_args.append(('comment', 'Please check out: %s' % result_details_link))
-   url_args = urlencode(url_args)
--  return 'https://bugs.chromium.org/p/chromium/issues/entry?%s' % url_args
-+  return 'https://bugs.ch40m1um.qjz9zk/p/chromium/issues/entry?%s' % url_args
- 
- 
- def results_to_html(results_dict, cs_base_url, bucket, test_name,
-@@ -418,7 +418,7 @@ def main():
-   parser = argparse.ArgumentParser()
-   parser.add_argument('--json-file', help='Path of json file.')
-   parser.add_argument('--cs-base-url', help='Base url for code search.',
--                      default='http://cs.chromium.org')
-+                      default='http://cs.ch40m1um.qjz9zk')
-   parser.add_argument('--bucket', help='Google storage bucket.', required=True)
-   parser.add_argument('--builder-name', help='Builder name.')
-   parser.add_argument('--build-number', help='Build number.')
-@@ -512,7 +512,7 @@ def main():
-       args.bucket, builder_name, build_number)
- 
-   if ui_screenshot_set_link:
--    ui_catalog_url = 'https://chrome-ui-catalog.appspot.com/'
-+    ui_catalog_url = 'https://chrome-ui-catalog.8pp2p8t.qjz9zk/'
-     ui_catalog_query = urlencode({'screenshot_source': ui_screenshot_set_link})
-     ui_screenshot_link = '%s?%s' % (ui_catalog_url, ui_catalog_query)
- 
-diff --git a/build/android/pylib/utils/google_storage_helper.py b/build/android/pylib/utils/google_storage_helper.py
---- a/build/android/pylib/utils/google_storage_helper.py
-+++ b/build/android/pylib/utils/google_storage_helper.py
-@@ -28,8 +28,8 @@ from devil.utils import cmd_helper
- _GSUTIL_PATH = os.path.join(
-     host_paths.DIR_SOURCE_ROOT, 'third_party', 'catapult',
-     'third_party', 'gsutil', 'gsutil.py')
--_PUBLIC_URL = 'https://storage.googleapis.com/%s/'
--_AUTHENTICATED_URL = 'https://storage.cloud.google.com/%s/'
-+_PUBLIC_URL = 'https://storage.9oo91eapis.qjz9zk/%s/'
-+_AUTHENTICATED_URL = 'https://storage.cloud.9oo91e.qjz9zk/%s/'
- 
- 
- @decorators.NoRaiseException(default_return_value='')
-diff --git a/build/android/pylib/utils/maven_downloader.py b/build/android/pylib/utils/maven_downloader.py
---- a/build/android/pylib/utils/maven_downloader.py
-+++ b/build/android/pylib/utils/maven_downloader.py
-@@ -36,7 +36,7 @@ class MavenDownloader:
-   # Google Play service are only distributed there, but third party libraries
-   # could use Maven Central or JCenter for example. The default Maven remote
-   # is Maven Central.
--  _REMOTE_REPO = 'https://maven.google.com'
-+  _REMOTE_REPO = 'https://maven.9oo91e.qjz9zk'
- 
-   # Default Maven repository.
-   _DEFAULT_REPO_PATH = os.path.join(
-diff --git a/build/android/pylib/utils/simpleperf.py b/build/android/pylib/utils/simpleperf.py
---- a/build/android/pylib/utils/simpleperf.py
-+++ b/build/android/pylib/utils/simpleperf.py
-@@ -234,7 +234,7 @@ def ConvertSimpleperfToPprof(simpleperf_out_path, build_directory,
-                        'Either the process was idle for the entire profiling '
-                        'period, or something went very wrong (and you should '
-                        'file a bug at crbug.com/new with component '
--                       'Speed>Tracing, and assign it to szager@chromium.org).'
-+                       'Speed>Tracing, and assign it to szager@ch40m1um.qjz9zk).'
-                        % simpleperf_out_path)
- 
-   # Recreate the directory structure locally, and symlink unstripped libs.
 diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py
 --- a/build/android/resource_sizes.py
 +++ b/build/android/resource_sizes.py
-@@ -148,7 +148,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info):
+@@ -145,7 +145,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info):
  def _MeasureApkSignatureBlock(zip_file):
    """Measures the size of the v2 / v3 signing block.
  
@@ -3564,18 +2758,6 @@ diff --git a/build/apple/tweak_info_plist.py b/build/apple/tweak_info_plist.py
  
    _RemoveKeys(plist, 'KSChannelID')
    if base_tag != '':
-diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py
---- a/build/chromeos/PRESUBMIT.py
-+++ b/build/chromeos/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for build/chromeos/.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
@@ -3588,6 +2770,18 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
    #
    # Variables:
    #   output: Path to the output .aar.
+diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
+--- a/build/config/chrome_build.gni
++++ b/build/config/chrome_build.gni
+@@ -15,7 +15,7 @@ declare_args() {
+   # Note: CfT is not intended to be used as a test runner to run tests in this
+   # repository.
+   #
+-  # Design doc: https://goo.gle/chrome-for-testing
++  # Design doc: https://goo.gl.qjz9zke/chrome-for-testing
+   is_chrome_for_testing_branded = false
+ }
+ 
 diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni
 --- a/build/config/chromeos/args.gni
 +++ b/build/config/chromeos/args.gni
@@ -3644,7 +2838,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler
    enable_cet_shadow_stack = target_cpu == "x64"
  
    # If true, optimize for size.
-@@ -233,7 +233,7 @@ declare_args() {
+@@ -238,7 +238,7 @@ declare_args() {
  # results independent of the checkout and build directory names, which
  # in turn is important for goma compile hit rate.
  # Setting this to true may make it harder to debug binaries on Linux, see
@@ -3713,18 +2907,6 @@ diff --git a/build/config/win/control_flow_guard.gni b/build/config/win/control_
    # /DYNAMICBASE (ASLR) is turned off in debug builds, therefore CFG can't be
    # turned on either.
    # ASan and CFG leads to slow process startup. Chromium's test runner uses
-diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py
---- a/build/fuchsia/PRESUBMIT.py
-+++ b/build/fuchsia/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for Fuchsia.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/build/fuchsia/binary_size_differ.py b/build/fuchsia/binary_size_differ.py
 --- a/build/fuchsia/binary_size_differ.py
 +++ b/build/fuchsia/binary_size_differ.py
@@ -3735,8 +2917,8 @@ diff --git a/build/fuchsia/binary_size_differ.py b/build/fuchsia/binary_size_dif
 -_TRYBOT_DOC = 'https://chromium.googlesource.com/chromium/src/+/main/docs/speed/binary_size/fuchsia_binary_size_trybot.md'
 +_TRYBOT_DOC = 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/speed/binary_size/fuchsia_binary_size_trybot.md'
  
- 
- def ComputePackageDiffs(before_sizes_file, after_sizes_file):
+ SIZE_FAILURE = 1
+ ROLLER_SIZE_WARNING = 2
 diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py
 --- a/build/fuchsia/binary_sizes.py
 +++ b/build/fuchsia/binary_sizes.py
@@ -3809,18 +2991,6 @@ diff --git a/build/nocompile.gni b/build/nocompile.gni
  #
  # To use this, create a gyp target with the following form:
  #
-diff --git a/build/skia_gold_common/PRESUBMIT.py b/build/skia_gold_common/PRESUBMIT.py
---- a/build/skia_gold_common/PRESUBMIT.py
-+++ b/build/skia_gold_common/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for //build/skia_gold_common/.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain.gni
 --- a/build/toolchain/cros_toolchain.gni
 +++ b/build/toolchain/cros_toolchain.gni
@@ -3928,54 +3098,6 @@ diff --git a/buildtools/clang_format/README.txt b/buildtools/clang_format/README
  gsutil documentation:
 -  https://developers.google.com/storage/docs/gsutil
 +  https://developers.9oo91e.qjz9zk/storage/docs/gsutil
-diff --git a/cc/PRESUBMIT.py b/cc/PRESUBMIT.py
---- a/cc/PRESUBMIT.py
-+++ b/cc/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for cc.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py
---- a/chrome/PRESUBMIT.py
-+++ b/chrome/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/chrome/android/java/src/PRESUBMIT.py b/chrome/android/java/src/PRESUBMIT.py
---- a/chrome/android/java/src/PRESUBMIT.py
-+++ b/chrome/android/java/src/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for Android Java code.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- 
- This presubmit checks for the following:
-diff --git a/chrome/android/webapk/PRESUBMIT.py b/chrome/android/webapk/PRESUBMIT.py
---- a/chrome/android/webapk/PRESUBMIT.py
-+++ b/chrome/android/webapk/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/android/webapk/shell_apk:webapk
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- 
- This presubmit checks for three rules:
 diff --git a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json
 --- a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json
 +++ b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json
@@ -4036,38 +3158,6 @@ diff --git a/chrome/android/webapk/shell_apk/manifest/maps_go_manifest_config.js
    "distributor": "other",
    "version_code": "1",
    "version_name": "1.0",
-diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py
---- a/chrome/app/PRESUBMIT.py
-+++ b/chrome/app/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/app/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-@@ -18,7 +18,7 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api):
- 
-   These kinds of strings prevent proper localization in some languages. For
-   more information, see the following chromium-dev thread:
--  https://groups.google.com/a/chromium.org/forum/#!msg/chromium-dev/PBs5JfR0Aoc/NOcIHII9u14J
-+  https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/forum/#!msg/chromium-dev/PBs5JfR0Aoc/NOcIHII9u14J
-   """
- 
-   problems = []
-@@ -32,8 +32,8 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api):
-     return [output_api.PresubmitPromptWarning(
-         "Don't use PRODUCT_NAME placeholders in string resources. Instead, add "
-         "separate strings to google_chrome_strings.grd and "
--        "chromium_strings.grd. See http://goo.gl/6614MQ for more information."
--        "Problems with this check? Contact dubroy@chromium.org.",
-+        "chromium_strings.grd. See http://goo.gl.qjz9zk/6614MQ for more information."
-+        "Problems with this check? Contact dubroy@ch40m1um.qjz9zk.",
-         items=problems)]
-   return []
- 
 diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
 --- a/chrome/app/chromium_strings.grd
 +++ b/chrome/app/chromium_strings.grd
@@ -4099,7 +3189,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
        </if>
        <!-- Crash Recovery Dialog -->
-@@ -712,7 +712,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -718,7 +718,7 @@ Permissions you've already given to websites and apps may apply to this account.
  
          <!-- Extension uninstall prompt -->
          <message name="IDS_EXTENSION_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time. Only used when uninstalling an app associated with a particular website.">
@@ -4108,7 +3198,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
  
          <!-- Extension alerts. -->
-@@ -811,7 +811,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -820,7 +820,7 @@ Permissions you've already given to websites and apps may apply to this account.
        <!-- One click sign-in infobar -->
        <if expr="not chromeos_ash">
          <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign-in.">
@@ -4117,7 +3207,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
          <message name="IDS_SYNC_USED_PROFILE_ERROR" desc="An error message shown when user tries to sign in to a profile that is used by other user name before.">
            Someone previously signed in to Chromium on this computer as <ph name="ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. Please create a new Chromium user to keep your information separate.
-@@ -846,7 +846,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps may apply to this account.
            You're signed in to Chromium!
          </message>
          <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The message of the one click sign-in dialog.">
@@ -4126,7 +3216,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
        </if>
  
-@@ -868,7 +868,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -877,7 +877,7 @@ Permissions you've already given to websites and apps may apply to this account.
        <!-- Signin Email Confirmation tab modal dialog -->
        <if expr="not chromeos_ash">
          <message name="IDS_SIGNIN_EMAIL_CONFIRMATION_TITLE" desc="Title of the signin email confirmation tab modal dialog.">
@@ -4135,7 +3225,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
        </if>
  
-@@ -887,10 +887,10 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -896,10 +896,10 @@ Permissions you've already given to websites and apps may apply to this account.
            <ph name="EXISTING_USER">$1<ex>Elisa</ex></ph> is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you.
          </message>
            <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_MANAGED_DEVICE" desc="Body of the web signin interception bubble on a managed device">
@@ -4148,7 +3238,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
          </message>
          <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_V2" desc="Body of the web signin interception bubble. It is shown when the user signs in on the web while they already have another account present in the current profile.">
            Another account is already signed in. To keep your browsing separate, Chromium can create your own profile for you.
-@@ -1390,7 +1390,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -1399,7 +1399,7 @@ Permissions you've already given to websites and apps may apply to this account.
              Welcome to Chromium
            </message>
            <message name="IDS_PRIMARY_PROFILE_FIRST_RUN_SUBTITLE" desc="Subtitle of the landing screen in first run experience for the primary profile. The screen promotes Chromium sync.">
@@ -4235,7 +3325,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <message name="IDS_HELP_MENU" desc="The text label of the Help sub-menu item in the wrench menu">
-@@ -3146,10 +3146,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3158,10 +3158,10 @@ are declared in tools/grit/grit_rule.gni.
          Images were blocked on this page.
        </message>
        <message name="IDS_BLOCKED_COOKIES_UNBLOCK" desc="Radio button choice to unblock a site from setting cookies, displayed in bubble when a page tries to set cookies.">
@@ -4248,7 +3338,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_COOKIES_NO_ACTION" desc="Radio button choice to continue blocking a site from setting cookies, displayed in bubble when a page tries to set cookies.">
          Continue blocking cookies
-@@ -3158,7 +3158,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3170,7 +3170,7 @@ are declared in tools/grit/grit_rule.gni.
          Continue allowing cookies
        </message>
        <message name="IDS_ALLOWED_COOKIES_BLOCK" desc="Radio button choice to block a site to set the cookies, displayed in bubble when a page tries to set cookies.">
@@ -4257,7 +3347,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_IMAGES_NO_ACTION" desc="Radio button choice to continue blocking a site from showing images, displayed in bubble when a page tries to display images.">
          Continue blocking images
-@@ -3170,28 +3170,28 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3182,28 +3182,28 @@ are declared in tools/grit/grit_rule.gni.
          Pop-ups blocked:
        </message>
        <message name="IDS_BLOCKED_POPUPS_REDIRECTS_UNBLOCK" desc="Radio button choice to unblock a site from showing popups and redirects, displayed in bubble when a page tries to display popups or redirects.">
@@ -4293,7 +3383,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK" desc="Radio button choice to block a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
          Always block camera and microphone access
-@@ -3212,19 +3212,19 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3224,19 +3224,19 @@ are declared in tools/grit/grit_rule.gni.
          Continue blocking camera access
        </message>
        <message name="IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
@@ -4318,7 +3408,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT" desc="Explanatory animated text that appears (and then disappears) in the address line when popup is blocked">
          Pop-up blocked
-@@ -3236,7 +3236,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3248,7 +3248,7 @@ are declared in tools/grit/grit_rule.gni.
          JavaScript was blocked on this page.
        </message>
        <message name="IDS_BLOCKED_JAVASCRIPT_UNBLOCK" desc="Radio button choice to unblock a site from running JavaScript, displayed in bubble when a page tries to run JavaScript.">
@@ -4327,7 +3417,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_JAVASCRIPT_NO_ACTION" desc="Radio button choice to continue blocking a site from running JavaScript, displayed in bubble when a page tries to run JavaScript.">
          Continue blocking JavaScript
-@@ -3245,7 +3245,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3257,7 +3257,7 @@ are declared in tools/grit/grit_rule.gni.
          Sound was muted on this page
        </message>
        <message name="IDS_BLOCKED_SOUND_UNBLOCK" desc="Radio button choice to unblock a site from playing sound, displayed in bubble when a page tries to play sound.">
@@ -4336,7 +3426,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_SOUND_NO_ACTION" desc="Radio button choice to continue blocking a site from playing sound, displayed in bubble when a page tries to play sound.">
          Continue muting sound
-@@ -3372,7 +3372,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3384,7 +3384,7 @@ are declared in tools/grit/grit_rule.gni.
        <!-- WebUI Certificate viewer dialog strings. Android uses an OS-level certificate manager. -->
        <if expr="not is_android">
          <message name="IDS_CERT_INFO_DIALOG_TITLE" desc="Title of dialog displaying info about a certificate">
@@ -4345,7 +3435,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_CERT_INFO_GENERAL_TAB_LABEL" desc="Title of the notebook page displaying the basic info about the certificate">
            &amp;General
-@@ -3893,13 +3893,13 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3905,13 +3905,13 @@ are declared in tools/grit/grit_rule.gni.
  
        <!-- Tab sharing infobar -->
        <message name="IDS_TAB_SHARING_INFOBAR_SHARING_CURRENT_TAB_LABEL" desc="Text displayed on an infobar when current tab is being shared.">
@@ -4362,7 +3452,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_TAB_SHARING_INFOBAR_SHARE_BUTTON" desc="Text displayed on the button to share current tab.">
         Share this tab instead
-@@ -3908,7 +3908,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3920,7 +3920,7 @@ are declared in tools/grit/grit_rule.gni.
         Stop sharing
        </message>
        <message name="IDS_TAB_SHARING_INFOBAR_SWITCH_TO_BUTTON" desc="The user is sharing (presenting) a tab via a screensharing app like Google Meet. This button allows the user to continue sharing a tab but view a different tab [url] at the same time. The URL should not appear in the middle of the button in any language; please observe the structure of [message: url].">
@@ -4371,7 +3461,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_TAB_SHARING_INFOBAR_SWITCH_TO_CAPTURER_BUTTON" desc="Text displayed on an infobar button offering to change focus to the capturer if its hostname cannot be determined. (Otherwise, IDS_TAB_SHARING_INFOBAR_SWITCH_TO_BUTTON will be used.)">
         Switch to capturing tab
-@@ -4114,16 +4114,16 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4126,16 +4126,16 @@ are declared in tools/grit/grit_rule.gni.
            Incognito Tab: <ph name="TAB_NAME">$1<ex>Google</ex></ph>
          </message>
          <message name="IDS_TASK_MANAGER_BACKGROUND_APP_PREFIX" desc="The prefix for a Task Manager background app task representing a BackgroundContents">
@@ -4392,7 +3482,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_TASK_MANAGER_PLUGIN_PREFIX" desc="The prefix for a Task Manager plugin row">
            Plugin: <ph name="PLUGIN_NAME">$1<ex>Unknown Plugin</ex></ph>
-@@ -4133,10 +4133,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4145,10 +4145,10 @@ are declared in tools/grit/grit_rule.gni.
          </message>
          <!-- TODO(liuwilliam): crbug/1325318 renaming the rest of existing Prerender to NoStatePrefetch -->
          <message name="IDS_TASK_MANAGER_NO_STATE_PREFETCH_PREFIX" desc="The prefix for a Task Manager No State Prefetch row">
@@ -4405,7 +3495,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_TASK_MANAGER_SPARE_RENDERER_PREFIX" desc="Task Manager row for a 'spare' render process. That is a render process that was started in anticipation of it being needed so that when it is needed it is immediately ready for use">
            Spare Renderer
-@@ -4172,28 +4172,28 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4184,28 +4184,28 @@ are declared in tools/grit/grit_rule.gni.
            Print: <ph name="PRINT_NAME">$1<ex>Google Maps</ex></ph>
          </message>
          <message name="IDS_TASK_MANAGER_SUBFRAME_PREFIX" desc="The prefix for a out-of-process-iframe row in the Task Manager (these processes are created when site isolation is enabled)">
@@ -4442,7 +3532,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_TASK_MANAGER_ARC_PREFIX" desc="The prefix for an ARC general process row">
            App: <ph name="ARC_PROCESS_NAME">$1<ex>com.android.systemui</ex></ph>
-@@ -4424,7 +4424,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4436,7 +4436,7 @@ are declared in tools/grit/grit_rule.gni.
        <message name="IDS_BLOCKLISTED_EXTENSIONS_ALERT_ITEM" desc="Name of the extension that is blocklisted">
          "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
        </message>
@@ -4451,7 +3541,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was blocked by your administrator
        </message>
        <message name="IDS_EXTENSION_ALERT_ITEM_OK" desc="The title of the default button acknowledging the information presented.">
-@@ -4436,10 +4436,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4448,10 +4448,10 @@ are declared in tools/grit/grit_rule.gni.
  
        <!-- Extension/App install dialog strings -->
        <message name="IDS_EXTENSION_PROMPT_APP_CONNECT_FROM_INCOGNITO" desc="Shown when a website tries to connect to an app from Incognito mode, prompting the user to allow or deny the request.">
@@ -4464,7 +3554,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO" desc="Second line in the content area of the extension or app installation prompt. Note that the exact wording is important. This should mean that the extension or app _can_ access the listed privileges, but not necessarily that it will or needs to.">
          It can:
-@@ -4578,22 +4578,22 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4587,22 +4587,22 @@ are declared in tools/grit/grit_rule.gni.
            Change your home page to: <ph name="HOME_PAGE">$1<ex>home.page.com/home.html</ex></ph>
          </message>
          <message name="IDS_EXTENSION_PROMPT_WARNING_1_HOST" desc="Permission string for access to data on one website.">
@@ -4493,7 +3583,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_EXTENSION_PROMPT_WARNING_HOSTS_LIST" desc="Permission string for access to data for an arbitrary list of websites.">
            Read and change your data on a number of websites
-@@ -4602,10 +4602,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4611,10 +4611,10 @@ are declared in tools/grit/grit_rule.gni.
            Read your data on a number of websites
          </message>
          <message name="IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN" desc="Permission string requesting access to data on a website and its sub-domains.">
@@ -4506,16 +3596,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_EXTENSION_PROMPT_WARNING_INPUT" desc="Permission string for access to input.">
            Read and change anything you type
-@@ -4999,16 +4999,16 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5008,16 +5008,16 @@ are declared in tools/grit/grit_rule.gni.
            Allow <ph name="EXTENSIONS_REQUESTING_ACCESS_COUNT">$1<ex>3</ex></ph>?
          </message>
          <message name="IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_TOOLTIP_SINGLE_EXTENSION" desc="The tooltip text of the request access button that appears on the toolbar when an extension requests access to the site">
--          <ph name="EXTENSIONS_REQUESTING_ACCESS">$1<ex>Extension A</ex></ph> is requesting to read and change <ph name="ORIGIN">$2<ex>google.com</ex></ph>
-+          <ph name="EXTENSIONS_REQUESTING_ACCESS">$1<ex>Extension A</ex></ph> is requesting to read and change <ph name="ORIGIN">$2<ex>9oo91e.qjz9zk</ex></ph>
+-          Click to allow "<ph name="EXTENSIONS_REQUESTING_ACCESS">$1<ex>Extension A</ex></ph>"" on <ph name="ORIGIN">$2<ex>google.com</ex></ph>:
++          Click to allow "<ph name="EXTENSIONS_REQUESTING_ACCESS">$1<ex>Extension A</ex></ph>"" on <ph name="ORIGIN">$2<ex>9oo91e.qjz9zk</ex></ph>:
          </message>
          <message name="IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_TOOLTIP_MULTIPLE_EXTENSIONS" desc="The tooltip text of the request access button that appears on the toolbar when an extension requests access to the site">
--          Requesting to read and change <ph name="ORIGIN">$1<ex>google.com</ex></ph>:
-+          Requesting to read and change <ph name="ORIGIN">$1<ex>9oo91e.qjz9zk</ex></ph>:
+-          Click to allow on <ph name="ORIGIN">$1<ex>google.com</ex></ph>:
++          Click to allow on <ph name="ORIGIN">$1<ex>9oo91e.qjz9zk</ex></ph>:
          </message>
          <message name="IDS_EXTENSIONS_REQUEST_ACCESS_BUBBLE_SINGLE_EXTENSION_TITLE" desc="The title of the request access bubble to tell the user to accept the bubble to always run the extension on the site.">
 -          Always allow "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" to run on <ph name="ORIGIN">$2<ex>google.com</ex></ph>?
@@ -4527,7 +3617,28 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_EXTENSIONS_REQUEST_ACCESS_BUBBLE_OK_BUTTON_LABEL" desc="The label of the button to allow the extension(s) to run on the site.">
            Always allow
-@@ -5025,16 +5025,16 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5035,16 +5035,16 @@ are declared in tools/grit/grit_rule.gni.
+           Requested to read &amp; change
+         </message>
+         <message name="IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_FOOTER_DESCRIPTION_ALL_EXTENSIONS_ALLOWED_ACCESS" desc="The description in the footer of the card that shows up on mouse hover of a toolbar action when all extensions have access to the current site.">
+-          All extensions can read &amp; change <ph name="HOST">$1<ex>google.com</ex></ph>
++          All extensions can read &amp; change <ph name="HOST">$1<ex>9oo91e.qjz9zk</ex></ph>
+         </message>
+         <message name="IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_FOOTER_DESCRIPTION_ALL_EXTENSIONS_BLOCKED_ACCESS" desc="The description in the footer of the card that shows up on mouse hover of a toolbar action when all extensions cannot access the current site.">
+-          You blocked all extensions from <ph name="HOST">$1<ex>google.com</ex></ph>
++          You blocked all extensions from <ph name="HOST">$1<ex>9oo91e.qjz9zk</ex></ph>
+         </message>
+          <message name="IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_FOOTER_DESCRIPTION_EXTENSION_HAS_ACESSS" desc="The description in the footer of the card that shows up on mouse hover of a toolbar action when the extension has access to the current site.">
+-          This extension can read &amp; change <ph name="HOST">$1<ex>google.com</ex></ph>
++          This extension can read &amp; change <ph name="HOST">$1<ex>9oo91e.qjz9zk</ex></ph>
+         </message>
+         <message name="IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_FOOTER_DESCRIPTION_EXTENSION_REQUESTS_ACESSS" desc="The description in the footer of the card that shows up on mouse hover of a toolbar action when the extension requests access to the current site.">
+-          Click this extension's icon to read &amp; change <ph name="HOST">$1<ex>google.com</ex></ph>
++          Click this extension's icon to read &amp; change <ph name="HOST">$1<ex>9oo91e.qjz9zk</ex></ph>
+         </message>
+ 
+         <if expr="not use_titlecase">
+@@ -5055,16 +5055,16 @@ are declared in tools/grit/grit_rule.gni.
              This can read and change site data
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_ALL_EXTENSIONS_GRANTED" desc="The label in an extension's page access submenu when the user allowed all extensions on the current page (sentence case).">
@@ -4547,7 +3658,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES_V2" desc="The label in an extension's context menu to always allow the extension access on all sites (sentence case).">
              Always on all sites
-@@ -5046,7 +5046,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5076,7 +5076,7 @@ are declared in tools/grit/grit_rule.gni.
              When you click the extension
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE" desc="The label in an extension's context menu to always allow the extension access to the current origin (sentence case).">
@@ -4556,7 +3667,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES" desc="The label in an extension's context menu to always allow the extension access on all sites (sentence case).">
              On all sites
-@@ -5099,16 +5099,16 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5129,16 +5129,16 @@ are declared in tools/grit/grit_rule.gni.
              This Can Read and Change Site Data
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_ALL_EXTENSIONS_GRANTED" desc="The label in an extension's page access submenu when the user allowed all extensions on the current page (title case).">
@@ -4576,7 +3687,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES_V2" desc="The label in an extension's context menu to always allow the extension access on all sites (title case).">
              Always on All Sites
-@@ -5120,7 +5120,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5150,7 +5150,7 @@ are declared in tools/grit/grit_rule.gni.
              When You Click the Extension
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE" desc="The label in an extension's context menu to always allow the extension access to the current origin (title case).">
@@ -4585,7 +3696,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
            </message>
            <message name="IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES" desc="The label in an extension's context menu to always allow the extension access on all sites (title case).">
              On All Sites
-@@ -5425,7 +5425,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5455,7 +5455,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Change back to <ph name="OLD_SEARCH_PROVIDER">$1<ex>DuckDuckGo</ex></ph>?
        </message>
        <message name="IDS_EXTENSION_SEARCH_OVERRIDDEN_DIALOG_BODY_GENERIC" desc="The body of the dialog informing the user that the default search engine has been overridden by an extension, indicating which extension now controls it.">
@@ -4594,7 +3705,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <!-- End Extension Settings Overridden Dialog strings. -->
        <!-- Force Installed Deprecated Apps Deletion Dialog strings. -->
-@@ -5551,28 +5551,28 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5581,28 +5581,28 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Permissions
        </message>
        <message name="IDS_EXTENSIONS_MENU_SITE_ACCESS_TAB_HAS_ACCESS_SECTION_TITLE" desc="Header for section of extensions that can access the current site's data. $1 is replaced with the current site.">
@@ -4629,7 +3740,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_EXTENSIONS_MENU_SITE_ACCESS_TAB_USER_SETTINGS_CUSTOMIZE_EACH_TEXT" desc="Text of the allow all extensions option in the user settings options inside the site access tab.">
          Customize permissions for each extension
-@@ -5859,10 +5859,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5908,10 +5908,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Update password for <ph name="ORIGIN">$1<ex>example.com</ex></ph>?
        </message>
        <message name="IDS_SAVE_PASSWORD_SIGNED_IN_MESSAGE_DESCRIPTION_GOOGLE_ACCOUNT" desc="The description of save password message when the user is signed in.">
@@ -4642,7 +3753,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_SAVE_PASSWORD_FOOTER" desc="The footer text of the bubble that offers user to save a password to Chrome.">
          Passwords are saved in your Google Account so you can use them on any device
-@@ -5871,7 +5871,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5920,7 +5920,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Google Password Manager
        </message>
        <message name="IDS_PASSWORD_BUBBLES_FOOTER_SYNCED_TO_ACCOUNT" desc="The footer text of the bubbles that offers users to save, update or manage stored passwords in Chrome and synced to their Google account.">
@@ -4651,7 +3762,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_PASSWORD_BUBBLES_FOOTER_SAVING_ON_DEVICE" desc="The footer text of the bubbles that offers users to save, update or manage stored passwords only locally in Chrome.">
          Passwords are saved to <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google Password Manager</ex></ph> on this device.
-@@ -5880,7 +5880,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5929,7 +5929,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
            You can view and manage saved passwords in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google Password Manager</ex></ph>.
        </message>
        <message name="IDS_PASSWORD_GENERATION_PROMPT_GOOGLE_PASSWORD_MANAGER" desc="Autofill dropdown text describing password generation.">
@@ -4660,7 +3771,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_PASSWORD_MANAGEMENT_BUBBLE_FOOTER_ACCOUNT_STORE_USERS" desc="The footer text of the managment bubble the lists saved password for this website. This is used only for account store users.">
          Passwords are saved to <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google Password Manager</ex></ph>.
-@@ -5889,10 +5889,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5938,10 +5938,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
          You can view and manage saved passwords in Google Password Manager
        </message>
        <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SIGNED_IN_MESSAGE_DESCRIPTION" desc="The description of the Google Password Manager's save password message when the user is signed in.">
@@ -4673,7 +3784,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <if expr="use_titlecase">
          <message name="IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN" desc="In Title Case: The title of the Sign in button in the account chooser when there is one account.">
-@@ -6340,7 +6340,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6368,7 +6368,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
        </message>
        <if expr="not use_titlecase">
          <message name="IDS_PASTE_AND_GO" desc="The text label of the Paste And Go menu item when the clipboard contains a URL">
@@ -4682,7 +3793,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_PASTE_AND_SEARCH" desc="The text label of the Paste And Go menu item when the clipboard contains a string to search for">
            Pa&amp;ste and search for “<ph name="SEARCH_TERMS">$1<ex>flowers</ex></ph>”
-@@ -6351,7 +6351,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6379,7 +6379,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
        </if>
        <if expr="use_titlecase">
          <message name="IDS_PASTE_AND_GO" desc="In Title Case: The text label of the Paste And Go menu item when the clipboard contains a URL">
@@ -4691,7 +3802,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_PASTE_AND_SEARCH" desc="In Title Case: The text label of the Paste And Go menu item when the clipboard contains a string to search for">
            Pa&amp;ste and Search for “<ph name="SEARCH_TERMS">$1<ex>flowers</ex></ph>”
-@@ -6361,7 +6361,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6389,7 +6389,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          </message>
        </if>
        <message name="IDS_OMNIBOX_KEYWORD_HINT" desc="Shown to the user when the url in the omnibox has a keyword associated with it. $1 is replaced with an image showing the tab key. $2 is replaced with the description of the keyword.">
@@ -4700,7 +3811,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_OMNIBOX_EXTENSION_KEYWORD_HINT" desc="Shown to the user when the word(s) in the omnibox has an extension keyword associated with it. $1 is replaced with an image showing the tab key. $2 is replaced with the description of the keyword.">
          Press <ph name="SEARCH_KEY">$1<ex>Tab</ex></ph> to send commands to <ph name="EXTENSION_NAME">$2<ex>Google Talk</ex></ph>
-@@ -6370,16 +6370,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6398,16 +6398,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Tab
        </message>
        <message name="IDS_OMNIBOX_KEYWORD_HINT_TOUCH" desc="Shown to the user when the url in the omnibox has a keyword associated with it and we are in touch mode (i.e. the on screen keyboard is visible).">
@@ -4720,7 +3831,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_OMNIBOX_CLEAR_ALL" desc="Accessibility text for the button that deletes all text input from the omnibox on touch devices.">
          Clear input
-@@ -6827,7 +6827,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6855,7 +6855,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          memories from Google Photos
        </message>
        <message name="IDS_NTP_MODULES_PHOTOS_INFO" desc="Text shown in the body of the info dialog of the Photos module.">
@@ -4729,7 +3840,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          <ph name="BREAK">&lt;br&gt;</ph>
          <ph name="BREAK">&lt;br&gt;</ph>
          You can manage settings for this card from the card menu or see more options in Customize Chrome.
-@@ -6882,10 +6882,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6910,10 +6910,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
          About this card
        </message>
        <message name="IDS_NTP_MODULES_TASKS_INFO" desc="Text shown in the body of the info dialog of a task module.">
@@ -4742,7 +3853,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_NTP_MODULES_SHOPPING_TASKS_INFO_CLOSE" desc="Text shown on close button of a task module.">
          Close
-@@ -7261,7 +7261,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7298,7 +7298,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
            Stay in Chrome
          </message>
          <message name="IDS_INTENT_PICKER_BUBBLE_VIEW_INITIATING_ORIGIN" desc="The label for the initiating origin of the intent picker.">
@@ -4751,7 +3862,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_INTENT_CHIP_OPEN_IN_APP" desc="The label of a button or dialog to open the current webpage in an installed app.">
            Open in app
-@@ -7269,7 +7269,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7306,7 +7306,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
  
          <if expr="is_chromeos">
            <then>
@@ -4760,7 +3871,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
                Always use the <ph name="APP">$1<ex>YouTube</ex></ph> app to open supported web links?
              </message>
              <message name="IDR_INTENT_PICKER_SUPPORTED_LINKS_INFOBAR_OK_LABEL" desc="The label of a confirm button for an infobar asking if the user wants to open web links in an app. If clicked, the selected app will always be opened when clicking supported web links.">
-@@ -7423,7 +7423,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7460,7 +7460,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          This site has been blocked from seeing text and images copied to the clipboard
        </message>
        <message name="IDS_BLOCKED_CLIPBOARD_UNBLOCK" desc="Radio button choice to unblock a site from reading the system clipboard.">
@@ -4769,16 +3880,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_CLIPBOARD_NO_ACTION" desc="Radio button choice to continue blocking a site from reading the system clipboard.">
          Continue blocking this site from seeing the clipboard
-@@ -7562,7 +7562,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
-         The page has become unresponsive. You can wait for it to become responsive or close it.
+@@ -7605,7 +7605,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+         other {You can wait for them to become responsive or exit the pages.}}
        </message>
        <message name="IDS_BROWSER_HANGMONITOR_IFRAME_TITLE" desc="The text of a row of the 'Hung Page' dialog when a page is not hung but contains an iframe that is hung.">
 -        <ph name="HUNG_IFRAME_URL">$1<ex>google.com</ex></ph>, in <ph name="PAGE_TITLE">$2<ex>YouTube</ex></ph>.
 +        <ph name="HUNG_IFRAME_URL">$1<ex>9oo91e.qjz9zk</ex></ph>, in <ph name="PAGE_TITLE">$2<ex>YouTube</ex></ph>.
        </message>
-       <message name="IDS_BROWSER_HANGMONITOR_RENDERER_INFOBAR_END" desc="The label of the 'close' button for the hung renderer infobar">
-         Close
-@@ -7599,7 +7599,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+       <message name="IDS_BROWSER_HANGMONITOR_RENDERER_WAIT" desc="The label of the 'wait' button, which exits the dialog without doing anything and continues to wait for the page to become responsive.">
+         Wait
+@@ -7639,7 +7639,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          Automatically sign in to websites using stored credentials. When the feature is disabled, you will be asked for confirmation every time before signing in to a website.
        </message>
        <message name="IDS_PASSWORDS_VIA_FEDERATION" desc="Text for federated credential's value.">
@@ -4787,7 +3898,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <!-- Confirm MessageBox Dialog -->
-@@ -7857,10 +7857,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -7877,10 +7877,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
            Suggest strong password
          </message>
          <message name="IDS_PASSWORD_GENERATION_DIALOG_DESCRIPTION" desc="Text for password generation dialog, explaining that the password will be saved in Google Account.">
@@ -4800,7 +3911,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
          <message name="IDS_CONFIRM_USERNAME_DIALOG_TITLE" desc="The title of the confirm username dialog." formatter_data="android_java">
            Confirm your username
-@@ -8053,7 +8053,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -8073,7 +8073,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          Clear browsing data
        </message>
        <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE" desc="A dialog informing the user that their Chrome browsing history was deleted, but other forms of history can still be found on Google My Activity.">
@@ -4809,7 +3920,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE" desc="Title of a dialog that informs the user that the deletion of Chrome's browsing data has been completed.">
          Cleared Chrome data
-@@ -8063,7 +8063,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -8083,7 +8083,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
        </message>
        <!-- TODO(crbug.com/1099260): Add proper strings and make them translateable. -->
        <message name="IDS_CLEAR_BROWSING_DATA_PASSWORDS_NOTICE" desc="Body text of a dialog informing the user that some of their passwords were not successfully deleted." translateable="false">
@@ -4818,7 +3929,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_CLEAR_BROWSING_DATA_PASSWORDS_NOTICE_TITLE" desc="Title of a dialog informing the user that some of their passwords were not successfully deleted." translateable="false">
          Some passwords were not deleted
-@@ -8284,7 +8284,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -8304,7 +8304,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          Uploading (<ph name="PROGRESS_PERCENT">$1<ex>27</ex></ph>%)...
        </message>
        <message name="IDS_LOAD_STATE_WAITING_FOR_RESPONSE">
@@ -4827,7 +3938,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <!-- Tab Context Menu -->
-@@ -8705,7 +8705,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -8725,7 +8725,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
        </message>
  
        <message name="IDS_CLIENT_CERT_DIALOG_TEXT" desc="The text in the dialog that prompts for a certificate when doing SSL client authentication.">
@@ -4836,7 +3947,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <!-- NSS PKCS #11 password dialog -->
-@@ -8713,10 +8713,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -8733,10 +8733,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
         Sign in to Security Device
        </message>
        <message name="IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT" desc="The text in the dialog that prompts for security device password for cert enrollment.">
@@ -4849,7 +3960,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_LIST_CERTS" desc="The text in the dialog that prompts for security device password when using the certificate manager without taking a specific action (eg, just loading the cert manager).">
         Please sign in to <ph name="TOKEN_NAME">$1<ex>Software Security Device</ex></ph>.
-@@ -9025,7 +9025,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -9045,7 +9045,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          Sending link to <ph name="DEVICE_NAME">$1<ex>Ted's Pixel2</ex></ph>
        </message>
         <message name="IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK" desc="Text with a link to a page where the user can manage the devices they can share a tab to.">
@@ -4858,7 +3969,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_SIGN_IN_PROMO_LABEL" desc = "Text when a signed out user attempts to use send-tab-to-self, then sees a sign-in promo.">
          To send this tab to another device, sign in to Chrome on both devices
-@@ -9896,16 +9896,16 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -9949,16 +9949,16 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
            This will separate your browsing from <ph name="EXISTING_USER">$1<ex>bob@example.com</ex></ph>
          </message>
          <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_SWITCH_BUBBLE_DESC_V2" desc="Description for the profile switch interception bubble">
@@ -4878,7 +3989,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
        </if>
  
-@@ -9920,10 +9920,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -9973,10 +9973,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          Can't sign in
        </message>
        <message name="IDS_SIGNIN_ERROR_EMAIL_TITLE" desc="Title of the signin error tab modal dialog when username can be retrieved to display.">
@@ -4891,7 +4002,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_SIGNIN_ERROR_CLOSE_BUTTON_LABEL" desc="Label of the Close button in the signin error dialog.">
          Close
-@@ -9948,13 +9948,13 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -10001,13 +10001,13 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          This wasn't me.
        </message>
        <message name="IDS_SIGNIN_EMAIL_CONFIRMATION_CREATE_PROFILE_RADIO_BUTTON_SUBTITLE" desc="Subtitle of radio button to create a new profile.">
@@ -4907,7 +4018,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_SIGNIN_EMAIL_CONFIRMATION_CLOSE_BUTTON_LABEL" desc="Label of the close button in the signin email confirmation dialog.">
          Cancel
-@@ -10009,7 +10009,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -10056,7 +10056,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
          Open <ph name="APPLICATION">$1<ex>Adobe Acrobat</ex></ph>?
        </message>
        <message name="IDS_EXTERNAL_PROTOCOL_MESSAGE_WITH_INITIATING_ORIGIN" desc="External Protocol Dialog message when initiated by another website">
@@ -4916,7 +4027,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_EXTERNAL_PROTOCOL_MESSAGE" desc="External Protocol Dialog message when the initiating website is unknown">
          A website wants to open this application.
-@@ -10020,8 +10020,8 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
+@@ -10067,8 +10067,8 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Google
        <message name="IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT" desc="Button in External Protocol Dialog that does not launch the application associated with the protocol">
          Cancel
        </message>
@@ -4927,7 +4038,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <if expr="chromeos_ash">
          <message name="IDS_EXTERNAL_PROTOCOL_CLOSE_BUTTON_TEXT" desc="Button in External Protocol Dialog that closes the dialog">
-@@ -10607,7 +10607,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10672,7 +10672,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
                  Wrong index.
          </message>
          <message name="IDS_JAVASCRIPT_UNSUPPORTED_ERROR_APPLESCRIPT_MAC" desc="Error dialog title to be displayed when the user attempts to execute JavaScript via AppleScript. Mac-only.">
@@ -4936,7 +4047,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </message>
        </if> <!-- is_macosx -->
  
-@@ -11034,7 +11034,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11099,7 +11099,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          This site has been blocked from accessing your location.
        </message>
        <message name="IDS_BLOCKED_GEOLOCATION_UNBLOCK" desc="Radio button choice to unblock a site from accessing the system location.">
@@ -4945,7 +4056,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_GEOLOCATION_NO_ACTION" desc="Radio button choice to continue blocking a site from accessing the system location.">
          Continue blocking this site from accessing your location
-@@ -11077,7 +11077,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11142,7 +11142,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          This site has been blocked from having full control of MIDI devices.
        </message>
        <message name="IDS_BLOCKED_MIDI_SYSEX_UNBLOCK" desc="Radio button choice to unblock a site from using MIDI system exclusive messages.">
@@ -4954,7 +4065,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_MIDI_SYSEX_NO_ACTION" desc="Radio button choice to continue blocking a site from using MIDI system exclusive messages.">
          Continue blocking this site from having full control of MIDI devices
-@@ -11165,7 +11165,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11230,7 +11230,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Google Account</ex></ph>
        </message>
        <message name="IDS_PASSWORDS_WEB_LINK" translateable="false">
@@ -4963,7 +4074,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <if expr="is_android">
          <message name="IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT_INFOBAR" desc="A message that the browser shows after saving a password it has autogenerated for the user. This message appears in an infobar and contains a link to all the user's saved autogenerated passwords. The link text is a separate string in the translation console and appears here as placeholder text.">
-@@ -11197,10 +11197,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11262,10 +11262,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
          Undo
        </message>
        <message name="IDS_MANAGE_PASSWORDS_UNDO_TOOLTIP" desc="Tooltip text for restoring a deleted password (undoing removal)">
@@ -4976,7 +4087,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <message name="IDS_MANAGE_PASSWORDS_SHOW_PASSWORD" desc="The tooltip of a button that is used in the manage pending password bubble for revealing the password.">
-@@ -11311,19 +11311,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11376,19 +11376,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
          An extension triggered full screen.
        </message>
        <message name="IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN" desc="Text displayed in the bubble when a page has gone fullscreen. (With a domain URL to display)">
@@ -4999,7 +4110,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_FULLSCREEN_ENTERED_MOUSELOCK" desc="Text displayed in the bubble to inform the user that the page has locked the mouse. (No domain to be shown, e.g. from filesystem page)">
          This page has disabled your mouse cursor.
-@@ -11346,7 +11346,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11411,7 +11411,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          This site has been blocked from using motion sensors.
        </message>
        <message name="IDS_BLOCKED_SENSORS_UNBLOCK" desc="Radio button choice to unblock a site from using device's sensors, displayed in bubble when blocked indicator icon is clicked.">
@@ -5008,7 +4119,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_BLOCKED_SENSORS_NO_ACTION" desc="Radio button choice to continue blocking a site from using device's motion or light sensors, displayed in bubble when blocked indicator icon is clicked.">
          Continue blocking sensor access
-@@ -11373,7 +11373,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11438,7 +11438,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          Continue allowing sensor access
        </message>
        <message name="IDS_ALLOWED_SENSORS_BLOCK" desc="Radio button choice to block a site from accessing device's sensors, displayed in bubble when location bar indicator inside is clicked.">
@@ -5017,7 +4128,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
  
        <!-- Shelf strings -->
-@@ -11574,7 +11574,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11642,7 +11642,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          <ph name="APP_NAME">$1<ex>Google Hangouts</ex></ph> wants to share the contents of your screen.
        </message>
        <message name="IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED" desc="Text for the window picker dialog shown when desktop capture is requested by an app to be used by a tab.">
@@ -5026,7 +4137,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_SCREEN" desc="Text for the checkbox on the window picker dialog which is displayed when attempting to share a screen. In that case, when checked, system audio will be shared; otherwise only video.">
          Share system audio
-@@ -11694,8 +11694,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11765,8 +11765,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
        <message name="IDS_TAB_AX_LABEL_SERIAL_CONNECTED_FORMAT" desc="Accessibility label text, when a tab is connected to a serial port. Example: 'Google Photos - Serial port connected'">
          <ph name="WINDOW_TITLE">$1<ex>Google Photos</ex></ph> - Serial port connected
        </message>
@@ -5037,7 +4148,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_TAB_AX_LABEL_CRASHED_FORMAT" desc="Accessibility label text, when a tab has crashed. Example: 'Google Search - Crashed'">
          <ph name="WINDOW_TITLE">$1<ex>Google Search</ex></ph> - Crashed
-@@ -11912,7 +11912,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11986,7 +11986,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
  
      <!-- WebUsb Notification -->
      <message name="IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION" desc="Content for notification shown to the user when a USB device gets plugged in.">
@@ -5046,7 +4157,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
      </message>
      <message name="IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION_TITLE" desc="Title for notification shown to the user when a USB device gets plugged in.">
        <ph name="USB_DEVICE_NAME">$1<ex>Nexus 5</ex></ph> detected
-@@ -12024,7 +12024,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12098,7 +12098,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <!-- Serial port chooser -->
      <if expr="not is_android">
        <message name="IDS_SERIAL_PORT_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce serial port chooser details to the user in a popup when it is from a website.">
@@ -5055,7 +4166,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_SERIAL_PORT_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce serial port chooser details to the user in a popup when it is from a Chrome extension.">
          "<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" wants to connect to a serial port
-@@ -12064,7 +12064,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12138,7 +12138,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <!-- HID (Human Interface Device) chooser -->
      <if expr="not is_android">
        <message name="IDS_HID_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce the Human Interface Device (HID) chooser details to the user in a popup when it is from a website.">
@@ -5064,7 +4175,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_HID_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce Human Interface Device (HID) chooser details to the user in a popup when it is from a Chrome extension.">
          "<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" wants to connect to a HID device
-@@ -12149,7 +12149,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12223,7 +12223,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <!-- Font Access chooser -->
      <if expr="not is_android">
        <message name="IDS_FONT_ACCESS_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce Local Font Access chooser details to the user in a popup when it is from a website.">
@@ -5073,7 +4184,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_FONT_ACCESS_CHOOSER_NO_FONTS_FOUND_PROMPT" desc="The label shown to the user to inform them that no fonts were found matching the requirements that the application provided.">
          No matching font found.
-@@ -12280,7 +12280,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12354,7 +12354,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <if expr="is_android">
        <message name="IDS_SECURITY_KEY_ATTESTATION_INFOBAR_QUESTION" desc="An infobar prompt shown to a user when a website wants to see information that identifies the user's Security Key, such as make and model number. The 'make' of a device is the brand name of the manufacturer, e.g. Yubikey is a make of Security Key. The 'model' of a device is the specific product, e.g. Yubikey Neo is a model of Security Key.">
          <ph name="URL">
@@ -5082,7 +4193,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          </ph> wants to see the make and model of your Security Key
        </message>
      </if>
-@@ -12489,13 +12489,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12563,13 +12563,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <!-- Web-modal dialog shown during Web Authenticaton API requests. -->
      <if expr="toolkit_views">
        <message name="IDS_WEBAUTHN_GENERIC_TITLE" desc="Title of most dialogs shown while the user is authenticating on a web site using a security key.">
@@ -5098,7 +4209,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_WEBAUTHN_TRANSPORT_SELECTION_DESCRIPTION" desc="Description in the dialog instructing the user to choose how they want to connect their security key with their computer, e.g. USB or Bluetooth.">
          Pick an option
-@@ -12599,7 +12599,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12673,7 +12673,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
        </message>
  
        <message name="IDS_WEBAUTHN_CABLEV2_SERVERLINK_DESCRIPTION" desc="Contents of the dialog shown when the user tries to sign-in using a phone as a security key.">
@@ -5107,7 +4218,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_WEBAUTHN_CABLEV2_SERVERLINK_TROUBLE" desc="This message is shown as a link below IDS_WEBAUTHN_CABLEV2_SERVERLINK_DESCRIPTION. The 'it' referenced here is the notification mentioned in that message.">
          Didn't get it?
-@@ -12617,7 +12617,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12691,7 +12691,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          Security key request
        </message>
        <message name="IDS_WEBAUTHN_CABLEV2_2ND_FACTOR_DESCRIPTION" desc="The contents of a dialog shown when the user tries to sign-in using a phone as a security key, or tries to register their phone as a security key for a future sign-in. A security key is traditionally a small USB device that is touched to confirm a sign-in (e.g. a gNubby) and, in this context, the phone is replacing the need for a separate device. The placeholder for the notification title will be replaced with the string that will appear in the notification on the phone. These messages are 4300134428943426639 and 581442427601260656.">
@@ -5116,7 +4227,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_WEBAUTHN_CABLEV2_ADD_PHONE" desc="The label on a button-like element in a list of options. Clicking this causes Chrome to show a QR code that the user can scan with their phone to use that phone for signing into a website. Here 'phone' is used as a short hand for smartphone.">
          Use phone with a QR code
-@@ -12713,7 +12713,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12787,7 +12787,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
        </message>
  
        <!-- WebAuthn account selection for resident keys -->
@@ -5125,7 +4236,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
          Select an account to sign in
        </message>
        <message name="IDS_WEBAUTHN_UNKNOWN_ACCOUNT" desc="Label shown to the user on the list of account names if the account stored does not have a name associated to it.">
-@@ -12729,7 +12729,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12803,7 +12803,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
          Your security key can't be used with this site
        </message>
        <message name="IDS_WEBAUTHN_ERROR_MISSING_CAPABILITY_DESC" desc="The description on a dialog informing the user that the security key (an external physical device for user authentication) that they selected does not support some capability that the site requested.">
@@ -5134,7 +4245,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_WEBAUTHN_STORAGE_FULL_DESC" desc="The description on a dialog informing the user that the security key (an external physical device for user authentication) that they selected does not have enough storage capacity to create the requested account.">
          Your security key does not have enough space for any more accounts.
-@@ -12738,13 +12738,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12812,13 +12812,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
          Allow this site to see your security key?
        </message>
        <message name="IDS_WEBAUTHN_REQUEST_ATTESTATION_PERMISSION_DESC" desc="The description on a dialog informing the user that the website wants to see information that identifies the user's Security Key, such as make and model number. The 'make' of a device is the brand name of the manufacturer, e.g. Yubikey is a make of Security Key. The 'model' of a device is the specific product, e.g. Yubikey Neo is a model of Security Key.">
@@ -5150,7 +4261,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
        </message>
        <message name="IDS_WEBAUTHN_ALLOW_ATTESTATION" desc="Label on button to allow a website to see information that identifies the user's Security Key, such as make and model number. The 'make' of a device is the brand name of the manufacturer, e.g. Yubikey is a make of Security Key. The 'model' of a device is the specific product, e.g. Yubikey Neo is a model of Security Key.">
          Allow
-@@ -13123,7 +13123,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -13197,7 +13197,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
  
      <!-- App uninstall prompt for Google -->
      <message name="IDS_APP_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX_FOR_GOOGLE" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time for Google hostnames. Only used when uninstalling an app associated with a Google hostname.">
@@ -5159,7 +4270,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
      </message>
  
      <message name="IDS_APP_UNINSTALL_PROMPT_LEARN_MORE" desc="The label that the user can click to learn more about removing associated data at uninstall time.">
-@@ -13471,7 +13471,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -13551,7 +13551,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
      <message name="IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_TITLE" desc="CONTEXT: there are updates to the Chrome browser each month. Just after the user accepts the latest update, this message will appear. The user must make a choice, and this page can’t be dismissed until they do. The title of the page. * The title needs to be framed so that clicking the accept button makes sense * “Help us” is intended to convey a sense of collaboration. Privacy Sandbox is an ongoing multi-year effort. There are sites participating to help us and we also need users to agree to these trials so that we can measure the effectiveness of the features we're building. * “build” is intended to convey that this is a process. The user is agreeing to an effort rather than a stable set of features. Something like “make” doesn't have the same nuance.* “private web” is the promise of privacy sandbox.">
        Help us build a more private web
      </message>
@@ -5199,7 +4310,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
        </if>
        <!-- Crash Recovery Dialog -->
-@@ -749,7 +749,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -755,7 +755,7 @@ Permissions you've already given to websites and apps may apply to this account.
  
          <!-- Extension uninstall prompt -->
          <message name="IDS_EXTENSION_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time. Only used when uninstalling an app associated with a particular website.">
@@ -5208,7 +4319,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
  
          <!-- Extension alerts. -->
-@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -864,7 +864,7 @@ Permissions you've already given to websites and apps may apply to this account.
        <!-- One click sign-in infobar -->
        <if expr="not chromeos_ash">
          <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign-in.">
@@ -5217,7 +4328,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
          <message name="IDS_SYNC_USED_PROFILE_ERROR" desc="An error message shown when user tries to sign in to a profile that is used by other user name before.">
            Someone previously signed in to Chrome on this computer as <ph name="ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. Please create a new Chrome user to keep your information separate.
-@@ -890,7 +890,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -899,7 +899,7 @@ Permissions you've already given to websites and apps may apply to this account.
            You're signed in to Chrome!
          </message>
          <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The message of the one click sign-in dialog.">
@@ -5226,7 +4337,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
        </if>
  
-@@ -912,7 +912,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -921,7 +921,7 @@ Permissions you've already given to websites and apps may apply to this account.
        <!-- Signin Email Confirmation tab modal dialog -->
        <if expr="not chromeos_ash">
          <message name="IDS_SIGNIN_EMAIL_CONFIRMATION_TITLE" desc="Title of the signin email confirmation tab modal dialog.">
@@ -5235,7 +4346,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
        </if>
  
-@@ -931,10 +931,10 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -940,10 +940,10 @@ Permissions you've already given to websites and apps may apply to this account.
            <ph name="EXISTING_USER">$1<ex>Elisa</ex></ph> is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you.
          </message>
          <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_MANAGED_DEVICE" desc="Body of the web signin interception bubble on a managed device">
@@ -5248,7 +4359,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
          </message>
          <message name="IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_V2" desc="Body of the web signin interception bubble. It is shown when the user signs in on the web while they already have another account present in the current profile.">
            Another account is already signed in. To keep your browsing separate, Chrome can create your own profile for you.
-@@ -1485,7 +1485,7 @@ Permissions you've already given to websites and apps may apply to this account.
+@@ -1494,7 +1494,7 @@ Permissions you've already given to websites and apps may apply to this account.
              Welcome to Chrome
            </message>
            <message name="IDS_PRIMARY_PROFILE_FIRST_RUN_SUBTITLE" desc="Subtitle of the landing screen in first run experience for the primary profile. The screen promotes Chrome sync.">
@@ -5297,25 +4408,10 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc
        </message>
  
      </messages>
-diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py
---- a/chrome/app/theme/PRESUBMIT.py
-+++ b/chrome/app/theme/PRESUBMIT.py
-@@ -4,9 +4,9 @@
- 
- """Presubmit script for Chromium theme resources.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools, and see
--https://chromium.googlesource.com/chromium/src/+/main/styleguide/web/web.md
-+https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/styleguide/web/web.md
- for the rules we're checking against here.
- """
- 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4510,7 +4510,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4597,7 +4597,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSyncSandboxDescription, kOsAll,
       SINGLE_VALUE_TYPE_AND_VALUE(
           syncer::kSyncServiceURL,
@@ -5324,7 +4420,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #if !BUILDFLAG(IS_ANDROID)
      {"block-migrated-default-chrome-app-sync",
       flag_descriptions::kBlockMigratedDefaultChromeAppSyncName,
-@@ -4795,7 +4795,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4885,7 +4885,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSetMarketUrlForTestingName,
       flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
       SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
@@ -5357,18 +4453,6 @@ diff --git a/chrome/browser/android/explore_sites/url_util_experimental.cc b/chr
    std::string field_trial_param = base::GetFieldTrialParamValueByFeature(
        chrome::android::kExploreSites, kBaseURLOption);
    if (field_trial_param.empty())
-diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/PRESUBMIT.py
---- a/chrome/browser/android/vr/PRESUBMIT.py
-+++ b/chrome/browser/android/vr/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/browser/android/vr
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
 --- a/chrome/browser/android/webapk/webapk_installer.cc
 +++ b/chrome/browser/android/webapk/webapk_installer.cc
@@ -5518,7 +4602,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome
 diff --git a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc
 --- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc
 +++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc
-@@ -82,7 +82,7 @@ constexpr int kAlphaLeftMargin = 8;
+@@ -84,7 +84,7 @@ constexpr int kAlphaLeftMargin = 8;
  constexpr int kAlphaLeftMarginSmall = 4;
  
  constexpr char kFeedbackUrl[] =
@@ -5567,7 +4651,7 @@ diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/br
 diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc
 --- a/chrome/browser/ash/borealis/borealis_util.cc
 +++ b/chrome/browser/ash/borealis/borealis_util.cc
-@@ -43,7 +43,7 @@ namespace {
+@@ -44,7 +44,7 @@ namespace {
  
  // Base feedback form URL, without query parameters for prefilling.
  static constexpr char kFeedbackUrl[] =
@@ -5627,7 +4711,7 @@ diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_consta
 diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrome/browser/ash/file_manager/file_manager_string_util.cc
 --- a/chrome/browser/ash/file_manager/file_manager_string_util.cc
 +++ b/chrome/browser/ash/file_manager/file_manager_string_util.cc
-@@ -34,29 +34,29 @@ namespace {
+@@ -32,29 +32,29 @@ namespace {
  
  // Location of the page to buy more storage for Google Drive.
  const char kGoogleDriveBuyStorageUrl[] =
@@ -5664,25 +4748,32 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom
  
  // Location of the help page for low space warning in the downloads directory.
  const int kDownloadsLowSpaceWarningHelpNumber = 1061547;
-diff --git a/chrome/browser/ash/file_manager/office_task_selection_helper.cc b/chrome/browser/ash/file_manager/office_task_selection_helper.cc
---- a/chrome/browser/ash/file_manager/office_task_selection_helper.cc
-+++ b/chrome/browser/ash/file_manager/office_task_selection_helper.cc
-@@ -223,13 +223,13 @@ void OfficeTaskSelectionHelper::OnGetDriveFsMetadataForWebDriveOffice(
-     InvalidateCandidate();
-     EndAdjustTasks();
-     return;
--  } else if (hosted_url.host() == "drive.google.com") {
-+  } else if (hosted_url.host() == "drive.9oo91e.qjz9zk") {
-     UMA_HISTOGRAM_ENUMERATION(kWebDriveOfficeMetricName,
-                               WebDriveOfficeTaskResult::DRIVE_ALTERNATE_URL);
-     InvalidateCandidate();
-     EndAdjustTasks();
-     return;
--  } else if (hosted_url.host() != "docs.google.com") {
-+  } else if (hosted_url.host() != "docs.9oo91e.qjz9zk") {
+diff --git a/chrome/browser/ash/file_manager/open_with_browser.cc b/chrome/browser/ash/file_manager/open_with_browser.cc
+--- a/chrome/browser/ash/file_manager/open_with_browser.cc
++++ b/chrome/browser/ash/file_manager/open_with_browser.cc
+@@ -184,18 +184,18 @@ bool OpenNewTabForHostedOfficeFile(const GURL& url) {
+     LOG(ERROR) << "Invalid URL";
+     return false;
+   }
+-  if (url_with_query_param.host() == "drive.google.com") {
++  if (url_with_query_param.host() == "drive.9oo91e.qjz9zk") {
      UMA_HISTOGRAM_ENUMERATION(
-         kWebDriveOfficeMetricName,
-         WebDriveOfficeTaskResult::UNEXPECTED_ALTERNATE_URL);
+         file_tasks::kDriveErrorMetricName,
+         file_tasks::OfficeDriveErrors::DRIVE_ALTERNATE_URL);
+-    LOG(ERROR) << "URL was from drive.google.com";
++    LOG(ERROR) << "URL was from drive.9oo91e.qjz9zk";
+     return false;
+   }
+-  if (url_with_query_param.host() != "docs.google.com") {
++  if (url_with_query_param.host() != "docs.9oo91e.qjz9zk") {
+     UMA_HISTOGRAM_ENUMERATION(
+         file_tasks::kDriveErrorMetricName,
+         file_tasks::OfficeDriveErrors::UNEXPECTED_ALTERNATE_URL);
+-    LOG(ERROR) << "URL was not from docs.google.com";
++    LOG(ERROR) << "URL was not from docs.9oo91e.qjz9zk";
+     return false;
+   }
+ 
 diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc
 --- a/chrome/browser/ash/hats/hats_dialog.cc
 +++ b/chrome/browser/ash/hats/hats_dialog.cc
@@ -5736,6 +4827,18 @@ diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.c
  };
  
  const char* kTestUrls[] = {
+@@ -137,9 +137,9 @@ const char* kAllowedAppsForMultiWordSuggester[] = {
+ 
+ const char* kDeniedDomainAndPathsForDiacritics[][2] = {
+     // Google Slides: delete on insert does not work
+-    {"docs.google.com", "/presentation"},
++    {"docs.9oo91e.qjz9zk", "/presentation"},
+     // Google Docs: delete on insert does not work
+-    {"docs.google.com", "/document"},
++    {"docs.9oo91e.qjz9zk", "/document"},
+ };
+ 
+ const char* kDeniedAppsForDiacritics[] = {
 diff --git a/chrome/browser/ash/input_method/ime_rules_config.h b/chrome/browser/ash/input_method/ime_rules_config.h
 --- a/chrome/browser/ash/input_method/ime_rules_config.h
 +++ b/chrome/browser/ash/input_method/ime_rules_config.h
@@ -5806,6 +4909,20 @@ diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/br
  const char kChromebookEmailServicePath[] = "v2/chromebookEmailPreferences";
  constexpr size_t kResponseMaxBodySize = 4 * 1024 * 1024;  // 4MiB
  
+diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_fido_controller.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_fido_controller.cc
+--- a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_fido_controller.cc
++++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_fido_controller.cc
+@@ -18,8 +18,8 @@ namespace ash::quick_start {
+ 
+ namespace {
+ 
+-const char kRelyingPartyId[] = "google.com";
+-const char kOrigin[] = "https://accounts.google.com";
++const char kRelyingPartyId[] = "9oo91e.qjz9zk";
++const char kOrigin[] = "https://accounts.9oo91e.qjz9zk";
+ const char kCtapRequestType[] = "webauthn.get";
+ 
+ const uint8_t kAuthenticatorGetAssertionCommand = 0x02;
 diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc
 --- a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc
 +++ b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc
@@ -5834,6 +4951,18 @@ diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetc
  
  constexpr int kResponseErrorNotEnoughApps = 5;
  
+diff --git a/chrome/browser/ash/login/users/default_user_image/default_user_images.cc b/chrome/browser/ash/login/users/default_user_image/default_user_images.cc
+--- a/chrome/browser/ash/login/users/default_user_image/default_user_images.cc
++++ b/chrome/browser/ash/login/users/default_user_image/default_user_images.cc
+@@ -292,7 +292,7 @@ const char kDefaultUrlPrefix[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER_";
+ const char kZeroDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER";
+ // TODO(b/244369871): Support 1x/2x images based on pixel density.
+ const char kGstaticImagePrefix[] =
+-    "https://www.gstatic.com/chromecast/home/chromeos/avatars/"
++    "https://www.95tat1c.qjz9zk/chromecast/home/chromeos/avatars/"
+     "default_200_percent/";
+ 
+ }  // namespace
 diff --git a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
 --- a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
 +++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
@@ -5853,7 +4982,7 @@ diff --git a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routi
 diff --git a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
 --- a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
 +++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
-@@ -43,7 +43,7 @@ constexpr base::TimeDelta kBadLatencyMs =
+@@ -44,7 +44,7 @@ constexpr base::TimeDelta kBadLatencyMs =
      base::Milliseconds(util::kDnsPotentialProblemLatencyMs);
  constexpr base::TimeDelta kVeryBadLatencyMs =
      base::Milliseconds(util::kDnsProblemLatencyMs);
@@ -6073,7 +5202,7 @@ diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_not
 diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
 --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
 +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
-@@ -54,17 +54,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf";
+@@ -53,17 +53,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf";
  
  // The url to download the proto of the complete list of wallpaper collections.
  constexpr char kBackdropCollectionsUrl[] =
@@ -6094,7 +5223,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom
      "image?rt=b";
  
  // The label used to return exclusive content or filter unwanted images.
-@@ -75,7 +75,7 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook";
+@@ -74,7 +74,7 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook";
  
  // The URL to download an album's photos from a user's Google Photos library.
  constexpr char kGooglePhotosAlbumUrl[] =
@@ -6103,7 +5232,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom
      "collectionById:read";
  
  // The collectionById endpoint accepts a "return_order" parameter that
-@@ -85,7 +85,7 @@ constexpr char kGooglePhotosAlbumShuffledOrder[] = "2";
+@@ -84,7 +84,7 @@ constexpr char kGooglePhotosAlbumShuffledOrder[] = "2";
  
  // The URL to download the albums in a user's Google Photos library.
  constexpr char kGooglePhotosAlbumsUrl[] =
@@ -6112,7 +5241,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom
      "userCollections:read";
  
  constexpr net::NetworkTrafficAnnotationTag
-@@ -113,7 +113,7 @@ constexpr net::NetworkTrafficAnnotationTag
+@@ -112,7 +112,7 @@ constexpr net::NetworkTrafficAnnotationTag
  
  // The URL to download whether the user is allowed to access Google Photos data.
  constexpr char kGooglePhotosEnabledUrl[] =
@@ -6121,7 +5250,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom
  
  constexpr net::NetworkTrafficAnnotationTag
      kGooglePhotosEnabledTrafficAnnotation =
-@@ -139,11 +139,11 @@ constexpr net::NetworkTrafficAnnotationTag
+@@ -138,11 +138,11 @@ constexpr net::NetworkTrafficAnnotationTag
  
  // The URL to download a photo from a user's Google Photos library.
  constexpr char kGooglePhotosPhotoUrl[] =
@@ -6179,7 +5308,7 @@ diff --git a/chrome/browser/autofill_assistant/password_change/apc_onboarding_co
 diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrome/browser/browser_switcher/browser_switcher_service.cc
 --- a/chrome/browser/browser_switcher/browser_switcher_service.cc
 +++ b/chrome/browser/browser_switcher/browser_switcher_service.cc
-@@ -55,7 +55,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation =
+@@ -54,7 +54,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation =
              "an alternative browser. This is often on the organization's "
              "intranet. For more information on Internet Explorer's Enterprise "
              "Mode, see: "
@@ -6356,7 +5485,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1174,7 +1174,7 @@ void LaunchURL(base::WeakPtr<ChromeContentBrowserClient> client,
+@@ -1185,7 +1185,7 @@ void LaunchURL(base::WeakPtr<ChromeContentBrowserClient> client,
                "'allow-top-navigation-by-user-activation', "
                "'allow-top-navigation', or "
                "'allow-popups'. See "
@@ -6365,7 +5494,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
                "https://chromeenterprise.google/policies/"
                "#SandboxExternalProtocolBlocked");
            return;
-@@ -1190,7 +1190,7 @@ void LaunchURL(base::WeakPtr<ChromeContentBrowserClient> client,
+@@ -1201,7 +1201,7 @@ void LaunchURL(base::WeakPtr<ChromeContentBrowserClient> client,
                "'allow-top-navigation-by-user-activation', "
                "'allow-top-navigation', or "
                "'allow-popups'. See "
@@ -6426,7 +5555,7 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome
 diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc
 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc
 +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc
-@@ -22,7 +22,7 @@ namespace enterprise_connectors {
+@@ -29,7 +29,7 @@ namespace enterprise_connectors {
  
  namespace {
  
@@ -6583,7 +5712,7 @@ diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flo
 diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
 +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -85,7 +85,7 @@ namespace {
+@@ -89,7 +89,7 @@ namespace {
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  const char kPlayIntentPrefix[] =
@@ -6616,6 +5745,14 @@ diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/c
  
  // The link to the site permissions settings page.
  const char kExtensionsSitePermissionsURL[] =
+@@ -20,6 +20,6 @@ const char kExtensionsSitePermissionsURL[] =
+ // TODO(crbug.com/1353587): This link is likely temporary, and may need to be
+ // replaced later.
+ const char kShowAccessRequestsInToolbarHelpURL[] =
+-    "https://support.google.com/chrome_webstore/answer/2664769";
++    "https://support.9oo91e.qjz9zk/chrome_webstore/answer/2664769";
+ 
+ }  // namespace chrome_extension_constants
 diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
 --- a/chrome/browser/extensions/external_pref_loader.cc
 +++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -6667,7 +5804,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -223,7 +223,7 @@ const char kU2FPermissionPromptDescription[] =
+@@ -213,7 +213,7 @@ const char kU2FPermissionPromptDescription[] =
      "Key API (CryptoToken). The U2F Security "
      "Key API has been deprecated and will be removed soon. For more "
      "information, refer to the deprecation announcement at "
@@ -6676,7 +5813,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
  const char kWebFilterInterstitialRefreshName[] =
-@@ -238,7 +238,7 @@ const char kU2FSecurityKeyAPIDescription[] =
+@@ -228,7 +228,7 @@ const char kU2FSecurityKeyAPIDescription[] =
      "Enable the legacy U2F Security Key API (CryptoToken). The U2F Security "
      "Key API has been deprecated and will be removed soon. For more "
      "information, refer to the deprecation announcement at "
@@ -6685,7 +5822,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kLoadCryptoTokenExtensionName[] =
      "Load the CryptoToken component extension ";
-@@ -1197,7 +1197,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] =
+@@ -1200,7 +1200,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] =
  const char kBlockInsecurePrivateNetworkRequestsDescription[] =
      "Prevents non-secure contexts from making subresource requests to "
      "more-private IP addresses. See also: "
@@ -6694,7 +5831,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kPrivateNetworkAccessSendPreflightsName[] =
      "Send Private Network Access preflights";
-@@ -1205,7 +1205,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] =
+@@ -1208,7 +1208,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] =
      "Enables sending Private Network Access preflights ahead of requests to "
      "more-private IP addresses. Failed preflights display warnings in DevTools "
      "without failing entire request. See also: "
@@ -6703,7 +5840,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kPrivateNetworkAccessRespectPreflightResultsName[] =
      "Respect the result of Private Network Access preflights";
-@@ -1213,7 +1213,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] =
+@@ -1216,7 +1216,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] =
      "Enables sending Private Network Access preflights ahead of requests to "
      "more-private IP addresses. These preflight requests must succeed in order "
      "for the request to proceed. See also: "
@@ -6712,7 +5849,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kPrivateNetworkAccessPreflightShortTimeoutName[] =
      "Reduce waiting time for Private Network Access preflights response";
-@@ -1221,7 +1221,7 @@ const char kPrivateNetworkAccessPreflightShortTimeoutDescription[] =
+@@ -1224,7 +1224,7 @@ const char kPrivateNetworkAccessPreflightShortTimeoutDescription[] =
      "Reduce the waiting time for Private Network Access preflights to 200 "
      "milliseconds. The default timeout period for requests is 5 minutes."
      "See also: "
@@ -6721,7 +5858,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kDeprecateAltClickName[] =
      "Enable Alt+Click deprecation notifications";
-@@ -2442,7 +2442,7 @@ const char kQuickIntensiveWakeUpThrottlingAfterLoadingDescription[] =
+@@ -2475,7 +2475,7 @@ const char kQuickIntensiveWakeUpThrottlingAfterLoadingDescription[] =
      "throttling after 10 seconds instead of the default 5 minutes. Intensive "
      "throttling will limit wake ups, from setTimeout and setInterval tasks "
      "with a high nesting level and delayed scheduler.postTask tasks, to 1 per "
@@ -6730,7 +5867,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
      "info.";
  
  const char kSettingsAppNotificationSettingsName[] =
-@@ -2468,7 +2468,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
+@@ -2501,7 +2501,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
  const char kReduceUserAgentDescription[] =
      "Reduce (formerly, \"freeze\") the amount of information available in "
      "the User-Agent request header. "
@@ -6739,16 +5876,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =
-@@ -2489,7 +2489,7 @@ const char kIntensiveWakeUpThrottlingName[] =
- const char kIntensiveWakeUpThrottlingDescription[] =
-     "When enabled, wake ups from DOM Timers are limited to 1 per minute in a "
-     "page that has been hidden for 5 minutes. For additional details, see "
--    "https://www.chromestatus.com/feature/4718288976216064.";
-+    "https://www.ch40mestatus.qjz9zk/feature/4718288976216064.";
- 
- const char kSafetyCheckPermissionsName[] = "Permission Modules on Safety Check";
- const char kSafetyCheckPermissionsDescription[] =
-@@ -2524,7 +2524,7 @@ const char kThirdPartyStoragePartitioningName[] =
+@@ -2550,7 +2550,7 @@ const char kThirdPartyStoragePartitioningName[] =
  const char kThirdPartyStoragePartitioningDescription[] =
      "Enables partitioning of third-party storage by top-level site. "
      "Note: this is under active development and may result in unexpected "
@@ -6757,6 +5885,35 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
      "entry?labels=StoragePartitioning-trial-bugs&components=Blink%3EStorage.";
  
  const char kScrollableTabStripFlagId[] = "scrollable-tabstrip";
+diff --git a/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h b/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h
+--- a/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h
++++ b/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h
+@@ -6,7 +6,7 @@
+ #define CHROME_BROWSER_K_ANONYMITY_SERVICE_K_ANONYMITY_SERVICE_URLS_H_
+ 
+ constexpr char kKAnonymityAuthServer[] =
+-    "https://chromekanonymityauth-pa.googleapis.com";
++    "https://chromekanonymityauth-pa.9oo91eapis.qjz9zk";
+ constexpr char kGenNonUniqueUserIdPath[] = "/v1/generateShortIdentifier";
+ constexpr char kFetchKeysPathFmt[] =
+     "/v1/%d/fetchKeys?key=%s";  // Put the short ID in the path.
+@@ -14,14 +14,14 @@ constexpr char kIssueTrustTokenPathFmt[] =
+     "/v1/%d/issueTrustToken";  // Put the short ID in the path.
+ 
+ constexpr char kKAnonymityJoinSetServer[] =
+-    "https://chromekanonymity-pa.googleapis.com";
++    "https://chromekanonymity-pa.9oo91eapis.qjz9zk";
+ constexpr char kJoinSetPath[] =
+     "/v1/join?key=";  // TODO: Set this when we know the correct path.
+ constexpr char kJoinSetOhttpPath[] =
+     "/v1/proxy/keys?key=";  // TODO: Set this when we know the correct path.
+ 
+ constexpr char kKAnonymityQuerySetServer[] =
+-    "https://chromekanonymityquery-pa.googleapis.com";
++    "https://chromekanonymityquery-pa.9oo91eapis.qjz9zk";
+ constexpr char kQuerySetPath[] =
+     "/v1/query?key=";  // TODO: Set this when we know the correct path.
+ constexpr char kQuerySetOhttpPath[] =
 diff --git a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc
 --- a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc
 +++ b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc
@@ -6824,7 +5981,7 @@ diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_
 diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
 --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
 +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
-@@ -30,9 +30,9 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider";
+@@ -36,9 +36,9 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider";
  
  // List of origins allowed to use a PresentationRequest to initiate mirroring.
  constexpr std::array<base::StringPiece, 3> kPresentationApiAllowlist = {
@@ -7118,7 +6275,7 @@ diff --git a/chrome/browser/permissions/quiet_permission_prompt_model_android.cc
 diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b/chrome/browser/platform_keys/extension_key_permissions_service.cc
 --- a/chrome/browser/platform_keys/extension_key_permissions_service.cc
 +++ b/chrome/browser/platform_keys/extension_key_permissions_service.cc
-@@ -136,7 +136,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
+@@ -130,7 +130,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
    // implemented for secondary profiles in Lacros.
    CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile())
        << "Attempted to use an incorrect profile. Please file a bug at "
@@ -7130,7 +6287,7 @@ diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b
 diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc
 --- a/chrome/browser/platform_keys/extension_platform_keys_service.cc
 +++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc
-@@ -162,7 +162,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
+@@ -161,7 +161,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
    // implemented for secondary profiles in Lacros.
    CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile())
        << "Attempted to use an incorrect profile. Please file a bug at "
@@ -7154,7 +6311,7 @@ diff --git a/chrome/browser/policy/safe_search_policy_test.h b/chrome/browser/po
 diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc
 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc
 +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc
-@@ -35,7 +35,7 @@ std::string ChromePrefetchServiceDelegate::GetAcceptLanguageHeader() {
+@@ -37,7 +37,7 @@ std::string ChromePrefetchServiceDelegate::GetAcceptLanguageHeader() {
  }
  
  GURL ChromePrefetchServiceDelegate::GetDefaultPrefetchProxyHost() {
@@ -7163,7 +6320,7 @@ diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_s
  }
  
  std::string ChromePrefetchServiceDelegate::GetAPIKey() {
-@@ -43,11 +43,11 @@ std::string ChromePrefetchServiceDelegate::GetAPIKey() {
+@@ -45,11 +45,11 @@ std::string ChromePrefetchServiceDelegate::GetAPIKey() {
  }
  
  GURL ChromePrefetchServiceDelegate::GetDefaultDNSCanaryCheckURL() {
@@ -7210,9 +6367,9 @@ diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_pa
 diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
-@@ -604,14 +604,14 @@ void PrivacySandboxService::SetTopicAllowed(
- base::flat_map<net::SchemefulSite, net::SchemefulSite>
- PrivacySandboxService::GetFirstPartySets() {
+@@ -629,18 +629,18 @@ PrivacySandboxService::GetFirstPartySets() const {
+   }
+ 
    if (privacy_sandbox::kPrivacySandboxFirstPartySetsUISampleSets.Get()) {
 -    return {{net::SchemefulSite(GURL("https://youtube.com")),
 -             net::SchemefulSite(GURL("https://google.com"))},
@@ -7227,11 +6384,27 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc b/chrome/
 +            {net::SchemefulSite(GURL("https://9oo91e.qjz9zk.au")),
 +             net::SchemefulSite(GURL("https://9oo91e.qjz9zk"))},
              {net::SchemefulSite(GURL("https://google.de")),
--             net::SchemefulSite(GURL("https://google.com"))}};
-+             net::SchemefulSite(GURL("https://9oo91e.qjz9zk"))}};
+-             net::SchemefulSite(GURL("https://google.com"))},
+-            {net::SchemefulSite(GURL("https://chromium.org")),
+-             net::SchemefulSite(GURL("https://chromium.org"))},
++             net::SchemefulSite(GURL("https://9oo91e.qjz9zk"))},
++            {net::SchemefulSite(GURL("https://ch40m1um.qjz9zk")),
++             net::SchemefulSite(GURL("https://ch40m1um.qjz9zk"))},
+             {net::SchemefulSite(GURL("https://googlesource.org")),
+-             net::SchemefulSite(GURL("https://chromium.org"))}};
++             net::SchemefulSite(GURL("https://ch40m1um.qjz9zk"))}};
    }
  
    // TODO(crbug.com/1332513): Retrieve set information from FPS delegate.
+@@ -665,7 +665,7 @@ bool PrivacySandboxService::IsPartOfManagedFirstPartySet(
+     const net::SchemefulSite& site) const {
+   if (privacy_sandbox::kPrivacySandboxFirstPartySetsUISampleSets.Get()) {
+     return GetFirstPartySets()[site] ==
+-           net::SchemefulSite(GURL("https://chromium.org"));
++           net::SchemefulSite(GURL("https://ch40m1um.qjz9zk"));
+   }
+   // TODO(crbug.com/1332513): Retrieve set information from FPS delegate.
+   return false;
 diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
 --- a/chrome/browser/profiles/profile_avatar_downloader.cc
 +++ b/chrome/browser/profiles/profile_avatar_downloader.cc
@@ -7259,7 +6432,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/
 diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
 +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
-@@ -100,7 +100,7 @@ const char kSilentPushUnsupportedMessage[] =
+@@ -99,7 +99,7 @@ const char kSilentPushUnsupportedMessage[] =
      "Chrome currently only supports the Push API for subscriptions that will "
      "result in user-visible messages. You can indicate this by calling "
      "pushManager.subscribe({userVisibleOnly: true}) instead. See "
@@ -7268,18 +6441,6 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chro
  
  // Message displayed in the console (as an error) when a GCM Sender ID is used
  // to create a subscription, which is unsupported. The subscription request will
-diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PRESUBMIT.py
---- a/chrome/browser/resources/PRESUBMIT.py
-+++ b/chrome/browser/resources/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for files in chrome/browser/resources.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/resources/about_sys/about_sys.js
 --- a/chrome/browser/resources/about_sys/about_sys.js
 +++ b/chrome/browser/resources/about_sys/about_sys.js
@@ -7295,7 +6456,7 @@ diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/re
 diff --git a/chrome/browser/resources/browsing_topics/browsing_topics_internals.html b/chrome/browser/resources/browsing_topics/browsing_topics_internals.html
 --- a/chrome/browser/resources/browsing_topics/browsing_topics_internals.html
 +++ b/chrome/browser/resources/browsing_topics/browsing_topics_internals.html
-@@ -45,8 +45,8 @@
+@@ -47,8 +47,8 @@ found in the LICENSE file.
      <div id="hosts-classification-input-area-div" class="hosts-classification-input-area-div">
        <textarea id="input-hosts-textarea" class="input-hosts-textarea" placeholder=
  "One host per line. For example:
@@ -7340,7 +6501,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo
 diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js
 --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js
 +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js
-@@ -138,7 +138,7 @@ export class Magnifier {
+@@ -140,7 +140,7 @@ export class Magnifier {
        this.isInitializing_ = false;
      }, Magnifier.IGNORE_FOCUS_UPDATES_INITIALIZATION_MS);
  
@@ -7352,25 +6513,25 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo
 diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js
 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js
 +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js
-@@ -222,7 +222,7 @@ export class CommandHandler extends CommandHandlerInterface {
-             QueueMode.FLUSH);
-         return false;
-       case 'reportIssue':
--        let url = 'https://code.google.com/p/chromium/issues/entry?' +
-+        let url = 'https://code.9oo91e.qjz9zk/p/chromium/issues/entry?' +
-             'labels=Type-Bug,Pri-2,OS-Chrome&' +
-             'components=OS>Accessibility>ChromeVox&' +
-             'description=';
-@@ -320,7 +320,7 @@ export class CommandHandler extends CommandHandlerInterface {
-       case 'showTalkBackKeyboardShortcuts':
-         chrome.tabs.create({
-           url:
--              'https://support.google.com/accessibility/android/answer/6110948',
-+              'https://support.9oo91e.qjz9zk/accessibility/android/answer/6110948',
-         });
-         return false;
-       case 'showTtsSettings':
-@@ -1581,13 +1581,13 @@ export class CommandHandler extends CommandHandlerInterface {
+@@ -1634,7 +1634,7 @@ export class CommandHandler extends CommandHandlerInterface {
+ 
+   /** @private */
+   reportIssue_() {
+-    let url = 'https://code.google.com/p/chromium/issues/entry?' +
++    let url = 'https://code.9oo91e.qjz9zk/p/chromium/issues/entry?' +
+         'labels=Type-Bug,Pri-2,OS-Chrome&' +
+         'components=OS>Accessibility>ChromeVox&' +
+         'description=';
+@@ -1660,7 +1660,7 @@ export class CommandHandler extends CommandHandlerInterface {
+   /** @private */
+   showTalkBackKeyboardShortcuts_() {
+     chrome.tabs.create({
+-      url: 'https://support.google.com/accessibility/android/answer/6110948',
++      url: 'https://support.9oo91e.qjz9zk/accessibility/android/answer/6110948',
+     });
+   }
+ 
+@@ -1835,13 +1835,13 @@ export class CommandHandler extends CommandHandlerInterface {
    init() {
      ChromeVoxKbHandler.commandHandler = command => this.onCommand(command);
  
@@ -7493,7 +6654,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt
 diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html
 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html
 +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@ found in the LICENSE file.
              <span class="i18n" msgid="options_natural_voices_explanation">
              </span>
              <a target="_blank" rel="noreferrer"
@@ -7562,7 +6723,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man
 diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js
 --- a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js
 +++ b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js
-@@ -61,7 +61,7 @@ export class SwitchAccess {
+@@ -63,7 +63,7 @@ export class SwitchAccess {
       */
      this.enableImprovedTextInput_ = false;
  
@@ -8112,7 +7273,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of
  
      this.termsError = false;
      this.usingOfflineTermsForTesting_ = false;
-@@ -763,7 +763,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase {
+@@ -768,7 +768,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase {
            if (results && results.length == 1 && typeof results[0] == 'string') {
              self.showUrlOverlay(results[0]);
            } else {
@@ -8124,7 +7285,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of
 diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js
 --- a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js
 +++ b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js
-@@ -133,7 +133,7 @@ class ConsolidatedConsent extends ConsolidatedConsentScreenElementBase {
+@@ -156,7 +156,7 @@ class ConsolidatedConsent extends ConsolidatedConsentScreenElementBase {
       * The hostname of the url where the terms of service will be fetched.
       * Overwritten by tests to load terms of service from local test server.
       */
@@ -8136,19 +7297,19 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated
 diff --git a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html
 --- a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html
 +++ b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html
-@@ -176,7 +176,7 @@
-           <div>
-             Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
-           </div>
--          <div id="googleUrl">www.google.com</div>
-+          <div id="googleUrl">www.9oo91e.qjz9zk</div>
-         </div>
+@@ -157,7 +157,7 @@ found in the LICENSE file.
+       <div>
+         Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
        </div>
+-      <div id="googleUrl">www.google.com</div>
++      <div id="googleUrl">www.9oo91e.qjz9zk</div>
+     </div>
+   </div>
  
 diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html
 --- a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html
 +++ b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html
-@@ -41,7 +41,7 @@
+@@ -25,7 +25,7 @@ found in the LICENSE file.
                                          'email': <email>,
                                          'password': <typed password> }
                        If user did not type domain |email| will be added by
@@ -8160,9 +7321,9 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login
 diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login.js b/chrome/browser/resources/chromeos/login/screens/login/offline_login.js
 --- a/chrome/browser/resources/chromeos/login/screens/login/offline_login.js
 +++ b/chrome/browser/resources/chromeos/login/screens/login/offline_login.js
-@@ -8,7 +8,7 @@
+@@ -25,7 +25,7 @@ import {OobeDialogHostBehavior} from '../../components/behaviors/oobe_dialog_hos
+ import {OobeI18nBehavior, OobeI18nBehaviorInterface} from '../../components/behaviors/oobe_i18n_behavior.m.js';
  
- /* #js_imports_placeholder */
  
 -const DEFAULT_EMAIL_DOMAIN = '@gmail.com';
 +const DEFAULT_EMAIL_DOMAIN = '@9ma1l.qjz9zk';
@@ -8172,7 +7333,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login
 diff --git a/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js b/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js
 --- a/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js
 +++ b/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js
-@@ -34,7 +34,7 @@ Polymer({
+@@ -35,7 +35,7 @@ Polymer({
      /** @private */
      url_: {
        type: String,
@@ -8195,7 +7356,7 @@ diff --git a/chrome/browser/resources/chromeos/parent_access/flows/local_web_app
 diff --git a/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js b/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js
 --- a/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js
 +++ b/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js
-@@ -19,10 +19,10 @@ const parentAccessUIHandler =
+@@ -18,10 +18,10 @@ const parentAccessUIHandler = ParentAccessUIHandler.getRemote();
   * @const {!Array<string>}
   */
  const ALLOWED_HOSTS = [
@@ -8209,7 +7370,7 @@ diff --git a/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js
 +  '9oo91e.qjz9zk',
  ];
  
- Polymer({
+ class ParentAccessUi extends PolymerElement {
 diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js
 --- a/chrome/browser/resources/cryptotoken/enroller.js
 +++ b/chrome/browser/resources/cryptotoken/enroller.js
@@ -8258,22 +7419,10 @@ diff --git a/chrome/browser/resources/downloads/icons.html b/chrome/browser/reso
        -->
        <g id="remove-circle"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11H7v-2h10v2z"></path></g>
      </defs>
-diff --git a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py b/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py
---- a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py
-+++ b/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for gaia_auth_host
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js
 --- a/chrome/browser/resources/gaia_auth_host/authenticator.js
 +++ b/chrome/browser/resources/gaia_auth_host/authenticator.js
-@@ -709,7 +709,7 @@ cr.define('cr.login', function() {
+@@ -719,7 +719,7 @@ cr.define('cr.login', function() {
          url = appendParam(
              url, 'continue',
              data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl +
@@ -8487,7 +7636,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js
 diff --git a/chrome/browser/resources/new_tab_page/modules/photos/module.html b/chrome/browser/resources/new_tab_page/modules/photos/module.html
 --- a/chrome/browser/resources/new_tab_page/modules/photos/module.html
 +++ b/chrome/browser/resources/new_tab_page/modules/photos/module.html
-@@ -567,7 +567,7 @@
+@@ -566,7 +566,7 @@
        </a>
      </template>
      <template id="exploreCardElement" is="dom-if" if="[[showExploreMore_]]">
@@ -8541,60 +7690,6 @@ diff --git a/chrome/browser/resources/pdf/elements/icons.html b/chrome/browser/r
        -->
        <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g>
        <g id="bookmark"><path d="M17 3H7c-1.1 0-1.99.9-1.99 2L5 21l7-3 7 3V5c0-1.1-.9-2-2-2z"></path></g>
-diff --git a/chrome/browser/resources/plugin_metadata/plugins_chromeos.json b/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
---- a/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
-+++ b/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
-@@ -25,7 +25,7 @@
-     ],
-     "lang": "en-US",
-     "name": "Adobe Flash Player",
--    "help_url": "https://support.google.com/chrome/?p=plugin_flash",
-+    "help_url": "https://support.9oo91e.qjz9zk/chrome/?p=plugin_flash",
-     "url": "http://get.adobe.com/flashplayer/",
-     "displayurl": true,
-     "group_name_matcher": "*Shockwave Flash*",
-diff --git a/chrome/browser/resources/plugin_metadata/plugins_linux.json b/chrome/browser/resources/plugin_metadata/plugins_linux.json
---- a/chrome/browser/resources/plugin_metadata/plugins_linux.json
-+++ b/chrome/browser/resources/plugin_metadata/plugins_linux.json
-@@ -17,8 +17,8 @@
-     ],
-     "lang": "en-US",
-     "name": "Adobe Flash Player",
--    "help_url": "https://support.google.com/chrome/?p=plugin_flash",
--    "url": "https://support.google.com/chrome/answer/6258784",
-+    "help_url": "https://support.9oo91e.qjz9zk/chrome/?p=plugin_flash",
-+    "url": "https://support.9oo91e.qjz9zk/chrome/answer/6258784",
-     "displayurl": true,
-     "group_name_matcher": "*Shockwave Flash*",
-     "plugin_is_deprecated": true
-diff --git a/chrome/browser/resources/plugin_metadata/plugins_mac.json b/chrome/browser/resources/plugin_metadata/plugins_mac.json
---- a/chrome/browser/resources/plugin_metadata/plugins_mac.json
-+++ b/chrome/browser/resources/plugin_metadata/plugins_mac.json
-@@ -14,8 +14,8 @@
-     ],
-     "lang": "en-US",
-     "name": "Adobe Flash Player",
--    "url": "https://support.google.com/chrome/answer/6258784",
--    "help_url": "https://support.google.com/chrome/?p=plugin_flash",
-+    "url": "https://support.9oo91e.qjz9zk/chrome/answer/6258784",
-+    "help_url": "https://support.9oo91e.qjz9zk/chrome/?p=plugin_flash",
-     "displayurl": true,
-     "group_name_matcher": "*Shockwave Flash*",
-     "plugin_is_deprecated": true
-diff --git a/chrome/browser/resources/plugin_metadata/plugins_win.json b/chrome/browser/resources/plugin_metadata/plugins_win.json
---- a/chrome/browser/resources/plugin_metadata/plugins_win.json
-+++ b/chrome/browser/resources/plugin_metadata/plugins_win.json
-@@ -14,8 +14,8 @@
-     ],
-     "lang": "en-US",
-     "name": "Adobe Flash Player",
--    "help_url": "https://support.google.com/chrome/?p=plugin_flash",
--    "url": "https://support.google.com/chrome/answer/6258784",
-+    "help_url": "https://support.9oo91e.qjz9zk/chrome/?p=plugin_flash",
-+    "url": "https://support.9oo91e.qjz9zk/chrome/answer/6258784",
-     "displayurl": true,
-     "group_name_matcher": "*Shockwave Flash*",
-     "plugin_is_deprecated": true
 diff --git a/chrome/browser/resources/print_preview/ui/icons.html b/chrome/browser/resources/print_preview/ui/icons.html
 --- a/chrome/browser/resources/print_preview/ui/icons.html
 +++ b/chrome/browser/resources/print_preview/ui/icons.html
@@ -8652,22 +7747,10 @@ diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/
      'collection/promotion_30023cb_stylus_apps';
  
  /**
-diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html
---- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html
-+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html
-@@ -417,7 +417,7 @@
-     if="[[shouldShowAdditionalFeaturesLink_(isKioskModeActive_, isGuest_)]]">
-   <a class="settings-box inherit-color no-outline" tabindex="-1"
-       id="additionalFeaturesLink" target="_blank"
--      href="https://chrome.google.com/webstore/category/collection/3p_accessibility_extensions">
-+      href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions">
-     <div class="start settings-box-text">
-       $i18n{additionalFeaturesTitle}
-     </div>
-diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
---- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
-+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
-@@ -322,7 +322,7 @@ class SettingsManageA11YPageElement extends SettingsManageA11YPageElementBase {
+diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.js b/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.js
+--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.js
++++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.js
+@@ -131,7 +131,7 @@ class SettingsKeyboardAndTextInputPageElement extends
        /** @protected */
        dictationLearnMoreUrl_: {
          type: String,
@@ -8676,18 +7759,39 @@ diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y
        },
  
        /**
-diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html
---- a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html
-+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html
-@@ -70,7 +70,7 @@
-         if="[[shouldShowAdditionalFeaturesLink_(isKioskModeActive_, isGuest_)]]">
-       <a class="settings-box inherit-color no-outline" tabindex="-1"
-           id="additionalFeaturesLink" target="_blank"
--          href="https://chrome.google.com/webstore/category/collection/3p_accessibility_extensions">
-+          href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions">
-         <div class="start settings-box-text">
-           $i18n{additionalFeaturesTitle}
-         </div>
+diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
+--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
++++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js
+@@ -313,7 +313,7 @@ class SettingsManageA11YPageElement extends SettingsManageA11YPageElementBase {
+       /** @protected */
+       dictationLearnMoreUrl_: {
+         type: String,
+-        value: 'https://support.google.com/chromebook?p=text_dictation_m100',
++        value: 'https://support.9oo91e.qjz9zk/chromebook?p=text_dictation_m100',
+       },
+ 
+       /**
+@@ -823,7 +823,7 @@ class SettingsManageA11YPageElement extends SettingsManageA11YPageElementBase {
+   /** @private */
+   onAdditionalFeaturesClick_() {
+     window.open(
+-        'https://chrome.google.com/webstore/category/collection/3p_accessibility_extensions');
++        'https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions');
+   }
+ }
+ 
+diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.js b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.js
+--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.js
++++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.js
+@@ -290,7 +290,7 @@ class OsSettingsA11YPageElement extends OsSettingsA11YPageElementBase {
+   /** @private */
+   onAdditionalFeaturesClick_() {
+     window.open(
+-        'https://chrome.google.com/webstore/category/collection/3p_accessibility_extensions');
++        'https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions');
+   }
+ }
+ 
 diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html b/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html
 --- a/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html
 +++ b/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html
@@ -8763,7 +7867,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou
 diff --git a/chrome/browser/resources/settings/settings_shared.css b/chrome/browser/resources/settings/settings_shared.css
 --- a/chrome/browser/resources/settings/settings_shared.css
 +++ b/chrome/browser/resources/settings/settings_shared.css
-@@ -135,7 +135,7 @@ cr-radio-group:focus {
+@@ -134,7 +134,7 @@ cr-radio-group:focus {
   * of the content. However, in some cases we might want to allow the
   * width to be smaller than the content (i.e. for long text to ellipsis).
   * In such cases this class should be applied.
@@ -8839,7 +7943,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc
 diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc
 --- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc
 +++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc
-@@ -91,7 +91,7 @@ ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const {
+@@ -105,7 +105,7 @@ ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const {
  
  GURL ChromeEnterpriseRealTimeUrlLookupService::GetRealTimeLookupUrl() const {
    std::string endpoint =
@@ -8851,7 +7955,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.c
 diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
 --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
 +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -911,7 +911,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const {
+@@ -910,7 +910,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const {
    std::string account_email = account_info.email;
    // This page will prompt for re-auth and then will prompt for a new password.
    std::string account_url =
@@ -8860,7 +7964,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
        "password?utm_source=Google&utm_campaign=PhishGuard";
    url::RawCanonOutputT<char> percent_encoded_email;
    url::RawCanonOutputT<char> percent_encoded_account_url;
-@@ -920,7 +920,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const {
+@@ -919,7 +919,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const {
    url::EncodeURIComponent(account_url.c_str(), account_url.length(),
                            &percent_encoded_account_url);
    GURL change_password_url = GURL(base::StringPrintf(
@@ -8872,7 +7976,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
 diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc b/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc
 --- a/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc
 +++ b/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc
-@@ -32,10 +32,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10);
+@@ -33,10 +33,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10);
  constexpr base::TimeDelta kScanningTimeout = base::Minutes(5);
  
  const char kSbEnterpriseUploadUrl[] =
@@ -8989,18 +8093,6 @@ diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  }  // namespace
-diff --git a/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc b/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc
---- a/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc
-+++ b/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc
-@@ -29,7 +29,7 @@ namespace {
- const int kThresholdForInFlowNotificationMinutes = 5;
- 
- bool CanQueryTailoredSecurityForUrl(GURL url) {
--  return url.DomainIs("google.com") || url.DomainIs("youtube.com");
-+  return url.DomainIs("9oo91e.qjz9zk") || url.DomainIs("y0u1ub3.qjz9zk");
- }
- 
- bool CanQueryTailoredSecurity(Profile* profile) {
 diff --git a/chrome/browser/search/background/ntp_background_service.cc b/chrome/browser/search/background/ntp_background_service.cc
 --- a/chrome/browser/search/background/ntp_background_service.cc
 +++ b/chrome/browser/search/background/ntp_background_service.cc
@@ -9191,6 +8283,18 @@ diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources
  <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
  <link rel="stylesheet" href="supervised_user_block_interstitial.css">
  <script src="../../../../../ui/webui/resources/js/cr.js"></script>
+diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html
+--- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html
++++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html
+@@ -5,7 +5,7 @@
+ <meta name="viewport"
+     content="initial-scale=1, minimum-scale=1, width=device-width">
+ <title>$i18n{blockPageTitle}</title>
+-<link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet">
++<link href="https://f0ntz.9oo91e8p1.qjz9zk/css?family=Google+Sans" rel="stylesheet">
+ <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
+ <link rel="stylesheet" href="supervised_user_block_interstitial_v2.css">
+ <script src="../../../../../ui/webui/resources/js/assert.js"></script>
 diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
 --- a/chrome/browser/supervised_user/supervised_user_service.cc
 +++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -9206,18 +8310,18 @@ diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/
 diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc
 --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
 +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
-@@ -89,8 +89,8 @@ bool IsNonStandardUrlScheme(const GURL& effective_url) {
+@@ -88,8 +88,8 @@ bool IsNonStandardUrlScheme(const GURL& effective_url) {
  bool IsAlwaysAllowedHost(const GURL& effective_url) {
    // Allow navigations to allowed origins.
-   static const char* const kAllowedHosts[] = {
--      "accounts.google.com", "families.google.com", "familylink.google.com",
--      "myaccount.google.com", "support.google.com"};
-+      "accounts.9oo91e.qjz9zk", "families.9oo91e.qjz9zk", "familylink.9oo91e.qjz9zk",
-+      "myaccount.9oo91e.qjz9zk", "support.9oo91e.qjz9zk"};
+   constexpr auto kAllowedHosts = base::MakeFixedFlatSet<base::StringPiece>(
+-      {"accounts.google.com", "families.google.com", "familylink.google.com",
+-       "myaccount.google.com", "policies.google.com", "support.google.com"});
++      {"accounts.9oo91e.qjz9zk", "families.9oo91e.qjz9zk", "familylink.9oo91e.qjz9zk",
++       "myaccount.9oo91e.qjz9zk", "policies.9oo91e.qjz9zk", "support.9oo91e.qjz9zk"});
  
-   for (const char* allowedHost : kAllowedHosts) {
-     if (allowedHost == effective_url.host_piece())
-@@ -108,7 +108,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) {
+   return base::Contains(kAllowedHosts, effective_url.host_piece());
+ }
+@@ -103,7 +103,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) {
        // The Chrome sync dashboard is linked to from within Chrome settings.
        // Allow both the initial URL that is loaded, and the URL to which it
        // redirects.
@@ -9226,7 +8330,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro
  
    for (const char* allowedUrlPrefix : kAllowedUrlPrefixes) {
      if (base::StartsWith(effective_url.spec(), allowedUrlPrefix))
-@@ -119,7 +119,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) {
+@@ -114,7 +114,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) {
  
  bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) {
    // Play Store terms of service path:
@@ -9235,7 +8339,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro
    static const char* kPlayTermsPath = "/about/play-terms";
    // Check Play Store terms of service.
    // path_piece is checked separately from the host to match international pages
-@@ -133,8 +133,8 @@ bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) {
+@@ -128,8 +128,8 @@ bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) {
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  bool IsCrxWebstoreOrDownloadUrl(const GURL& effective_url) {
    static const char* const kCrxDownloadUrls[] = {
@@ -9258,7 +8362,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
  CHAR_LIMIT guidelines:
    Certain strings need character limits to prevent a long translation from breaking the UI.
-@@ -1124,7 +1124,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
+@@ -1130,7 +1130,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
        <message name="IDS_PRIVACY_SANDBOX_NOTICE_SHEET_CLOSED_DESCRIPTION" desc="The accessibility string read when the Privacy Sandbox prompt bottom sheet is closed.">
          Privacy Sandbox prompt closed
        </message>
@@ -9267,7 +8371,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          Help us build a better web
        </message>
        <message name="IDS_PRIVACY_SANDBOX_NOTICE_SHEET_DESCRIPTION" desc="* “Chrome is finding new ways”: “finding” is meant to convey a work in progress, like “build” in the title. The features are live and functional, but still in beta. So we want a verb that’s stronger than “exploring” but weaker than “launching”. * “reduce tracking”: This used to read “reduce cross-site tracking”, but we’ve dropped “cross-site” because it makes the idea unnecessarily complicated. * “estimate your interests”: Topics of interest include things like “Live comedy” and “Rock music”. Chrome estimates these interests based on the sites users visit. It’s an “estimation”, and we don’t want to suggest that we know with certainty the user’s interests. Avoid words like “guess”, “establish”, “define”, etc. (in place of “estimate”). * “Then” is an important keyword. It suggests some amount of time later. The first step is that interests are generated. Later (minutes or weeks), a different site might request interests.">
-@@ -1154,7 +1154,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
+@@ -1160,7 +1160,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
          Choose another provider
        </message>
        <message name="IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY" desc="Text that displays a link to the privacy policy of the resolver selected from a dropdown menu">
@@ -9276,7 +8380,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of a managed environment">
          This setting is disabled on managed browsers
-@@ -1184,7 +1184,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
+@@ -1190,7 +1190,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you
        <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_DIALOG_DATA_TEXT" desc="Text of the dialog that is shown after the deletion of browsing history items finished, indicating that the selected data has been removed, but there may be other forms of browsing history still present in user's Google account.">
          The selected data has been removed from Chrome and your synced devices.
  
@@ -9285,7 +8389,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_CLEAR_CACHE_TITLE" desc="Title for Clear Cache in Clear Browsing Data dialog">
          Cached images and files
-@@ -1323,7 +1323,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1329,7 +1329,7 @@ Your Google account may have other forms of browsing history like searches and a
          Basic
        </message>
        <message name="IDS_ANDROID_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
@@ -9294,7 +8398,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_ANDROID_HISTORY_BLOCKED_SITE" desc="The text displayed in the history page indicating that a visit to a web site was blocked due to an administrator policy.">
          Blocked site
-@@ -1925,10 +1925,10 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1931,10 +1931,10 @@ Your Google account may have other forms of browsing history like searches and a
          Waiting for details of parents.
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_ONE_PARENT_NAME" desc="String for name of single parent for child account.">
@@ -9307,7 +8411,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_TITLE" desc="Title of the Content setting, which controls which websites a child is allowed to visit.">
          Content
-@@ -2003,22 +2003,22 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2009,22 +2009,22 @@ Your Google account may have other forms of browsing history like searches and a
          Google Terms of Service
        </message>
        <message name="IDS_GOOGLE_TERMS_OF_SERVICE_URL" desc="URL for Google terms of service" translateable="false">
@@ -9334,7 +8438,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
  
        <!-- Sign-in strings -->
-@@ -2044,7 +2044,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2050,7 +2050,7 @@ Your Google account may have other forms of browsing history like searches and a
          Also clear your Chrome data from this device
        </message>
        <message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to display for sign out of Chrome dialog when the account has enterprise management, and all user data will be erased">
@@ -9343,7 +8447,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SIGN_IN_GETTING_ACCOUNT_MANAGEMENT_POLICY" desc="Title of progress bar dialog for getting management policy">
          Contacting Google. This may take a minute…
-@@ -2118,7 +2118,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2124,7 +2124,7 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_SYNC_ENCRYPTION" desc="Preference category name for sync encryption. [CHAR_LIMIT=32]">
          Encryption
        </message>
@@ -9352,7 +8456,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          Review your synced data
        </message>
        <message name="IDS_SYNC_PASSPHRASE_TYPE_TITLE" desc="Title of sync passphrase type dialog. [CHAR_LIMIT=24]">
-@@ -2149,7 +2149,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2155,7 +2155,7 @@ Your Google account may have other forms of browsing history like searches and a
          Your data was encrypted with your <ph name="BEGIN_LINK">&lt;learnmore&gt;</ph>sync passphrase<ph name="END_LINK">&lt;/learnmore&gt;</ph> on <ph name="TIME">%1$s<ex>Sept 1, 2012</ex></ph>. Enter it to start sync.
        </message>
        <message name="IDS_SYNC_ACCOUNT_INFO"  desc="The message that appears in the options dialog indicating that the user is signed in with the given email address.">
@@ -9361,7 +8465,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SYNC_PASSPHRASE_CANNOT_BE_BLANK" desc="Inform user that they cannot use a blank password [CHAR_LIMIT=40]">
          This field cannot be blank
-@@ -2965,7 +2965,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2974,7 +2974,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_SIGNIN_FRE_DISMISS_BUTTON" desc="Button on the very first screen of Chrome to continue without signing into Chrome. Ensure consistency with OneGoogle strings while still omitting “Chrome” (see e.g. TC ID 5336438894576002929).">
          Use without an account
        </message>
@@ -9370,7 +8474,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          By continuing, you agree to the <ph name="BEGIN_TOS_LINK">&lt;TOS_LINK&gt;</ph>Terms of Service<ph name="END_TOS_LINK">&lt;/TOS_LINK&gt;</ph>.\nTo help improve the app, Chrome sends usage and crash data to Google. <ph name="BEGIN_UMA_LINK">&lt;UMA_LINK&gt;</ph>Manage<ph name="END_UMA_LINK">&lt;/UMA_LINK&gt;</ph>
        </message>
        <message name="IDS_SIGNIN_FRE_FOOTER_TOS" desc="The text is displayed in a footer on the very first screen of Chrome. The link ‘Terms of Service’ opens the Google Terms of Service.">
-@@ -2974,7 +2974,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2983,7 +2983,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_SIGNIN_FRE_FOOTER_TOS_WITH_SUPERVISED_USER" desc="The text is displayed in a footer on the very first screen of Chrome. The link 'Terms of Service' opens the Google Terms of Service. The link 'Privacy Policy' opens the Google Privacy Policy.">
          By continuing, you agree to the <ph name="BEGIN_TOS_LINK">&lt;TOS_LINK&gt;</ph>Terms of Service<ph name="END_TOS_LINK">&lt;/TOS_LINK&gt;</ph> and <ph name="BEGIN_PRIVACY_LINK">&lt;PRIVACY_LINK&gt;</ph>Privacy\u00A0Policy<ph name="END_PRIVACY_LINK">&lt;/PRIVACY_LINK&gt;</ph>.
        </message>
@@ -9379,7 +8483,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          To help improve the app, Chrome sends usage and crash data to Google. <ph name="BEGIN_UMA_LINK">&lt;UMA_LINK&gt;</ph>Manage<ph name="END_UMA_LINK">&lt;/UMA_LINK&gt;</ph>
        </message>
        <message name="IDS_SIGNIN_FRE_UMA_DIALOG_TITLE" desc="Title of the dialog where users can change their Chrome metric sharing settings, like usage data. This appears when they open the Chrome app for the first time on their phone.">
-@@ -3044,16 +3044,16 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3053,16 +3053,16 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_SIGNIN_DETAILS_DESCRIPTION" desc="Message with a link to customize Sync settings. Shown on the screen that asks the user to turn on Sync.">
          You can always choose what to sync in <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>settings<ph name="END_LINK1">&lt;/LINK1&gt;</ph>.
        </message>
@@ -9400,7 +8504,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          History and more
        </message>
        <message name="IDS_SIGNIN_ACCEPT_BUTTON" desc="Text for the confirmation button in the sign-in screen. By clicking this button users signs in and turns on Sync. [CHAR_LIMIT=20]">
-@@ -4109,7 +4109,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4124,7 +4124,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_ACCESSIBILITY_OMNIBOX_SHOWING_SUGGESTIONS_FOR_WEBSITE" desc="Whenever the User is visiting a Website, when they click the Omnibox, we will announce this message, if we have suggestions to show.">
          Showing suggestions for <ph name="WEBSITE_TITLE">%1$s<ex>Crater Lake National Park (U.S. National Park Service)</ex></ph>
        </message>
@@ -9409,7 +8513,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          Chrome action button: <ph name="ACTION">%s<ex>clear browsing data</ex></ph>
        </message>
        <message name="IDS_ACCESSIBILITY_OMNIBOX_SUGGESTED_ITEMS" desc="Announcement about the presence and volume of suggestions below the Omnibox.">
-@@ -4360,7 +4360,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4378,7 +4378,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- WebUsb Picker UI strings -->
        <message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user.">
@@ -9418,7 +8522,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_USB_CHOOSER_DIALOG_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided.">
          No compatible devices found
-@@ -4397,7 +4397,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4415,7 +4415,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Running in <ph name="APP_NAME">%1$s<ex>Chromium</ex></ph>
        </message>
        <message name="IDS_TWA_RUNNING_IN_CHROME_V2" desc="Updated message on a snackbar indicating that the current Activity may use Chrome data (the rest of the app may not be).">
@@ -9427,7 +8531,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_TWA_CLEAR_DATA_DIALOG_TITLE" desc="Title of the clear data dialog showing after user uninstalls or clears data of an app hosting a Trusted Web Activity">
          <ph name="APP_NAME">%1$s<ex>YouTube</ex></ph> also has data in Chrome
-@@ -4756,7 +4756,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4774,7 +4774,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Sending to <ph name="device_name">%1$s<ex>Tanya's Pixel 2</ex></ph>...
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_NOTIFICATION_CONTEXT_TEXT" desc="Text displayed as the second line of a notification indicating the domain and the device the tab is shared from.">
@@ -9436,7 +8540,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_CONTENT_DESCRIPTION" desc="Accessibility string read when the bottom sheet is opened. It describes the bottom sheet where a user can pick a device to share the tab with.">
          List of devices to share a tab with.
-@@ -4795,7 +4795,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4813,7 +4813,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
            Page sent. To see it, open Chrome on your <ph name="device_type">%1$s<ex>phone</ex></ph>
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK" desc="Text with a link to a page where the user can manage the devices they can share a tab to.">
@@ -9445,7 +8549,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_WHEN_SIGNED_IN_UNAVAILABLE" desc="Instructions for the user to enable the feature when it's currently unavailable.">
          You can send tabs between devices that are signed in with the same Google Account
-@@ -5810,7 +5810,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -5828,7 +5828,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Your browser is managed by your administrator
        </message>
        <message name="IDS_MANAGEMENT_SUBTITLE_MANAGED_BY" desc="The title of the chrome://management page when the browser runs in an environment managed by a known organization. (e.g. Employer owned device enrolled to CBCM)">
@@ -9454,7 +8558,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE" desc="The title of the chrome://management page when the browser runs in an environment which is not not managed by any organization. (e.g. A personal device bought at a store)">
          Your browser is not managed
-@@ -5825,7 +5825,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -5843,7 +5843,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Update password?
        </message>
        <message name="IDS_PASSWORD_EDIT_DIALOG_SYNCED_FOOTER_GOOGLE" desc="Footer for a dialog which allows users to see and edit passwords while saving/updating a new credential. Displayed for users who are syncing passwords.">
@@ -9490,7 +8594,7 @@ diff --git a/chrome/browser/ui/app_list/search/common/string_util.cc b/chrome/br
 diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h
 --- a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h
 +++ b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h
-@@ -112,7 +112,7 @@ class ItemSuggestCache {
+@@ -115,7 +115,7 @@ class ItemSuggestCache {
    // The url of the service that fetches descriptions given image pixels.
    static constexpr base::FeatureParam<std::string> kServerUrl{
        &kExperiment, "server_url",
@@ -9552,7 +8656,7 @@ diff --git a/chrome/browser/ui/ash/calendar/calendar_keyed_service.cc b/chrome/b
 diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
 +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@
  namespace {
  
  const char kKeyboardShortcutHelpPageUrl[] =
@@ -9588,7 +8692,7 @@ diff --git a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc b/chr
 diff --git a/chrome/browser/ui/ash/system_tray_client_impl.cc b/chrome/browser/ui/ash/system_tray_client_impl.cc
 --- a/chrome/browser/ui/ash/system_tray_client_impl.cc
 +++ b/chrome/browser/ui/ash/system_tray_client_impl.cc
-@@ -88,7 +88,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr;
+@@ -87,7 +87,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr;
  // The prefix a calendar event URL *must* have in order to be launched by the
  // calendar web app.
  const char* kOfficialCalendarUrlPrefix =
@@ -9699,7 +8803,7 @@ diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc
 diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc
 --- a/chrome/browser/ui/managed_ui.cc
 +++ b/chrome/browser/ui/managed_ui.cc
-@@ -55,7 +55,7 @@ absl::optional<std::string> GetEnterpriseAccountDomain(Profile* profile) {
+@@ -68,7 +68,7 @@ absl::optional<std::string> GetEnterpriseAccountDomain(Profile* profile) {
    const std::string domain =
        enterprise_util::GetDomainFromEmail(profile->GetProfileUserName());
    // Heuristic for most common consumer Google domains -- these are not managed.
@@ -9708,6 +8812,117 @@ diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc
      return absl::nullopt;
    return domain;
  }
+diff --git a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
+--- a/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
++++ b/chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
+@@ -759,7 +759,7 @@ class OmniboxPedalCreateGoogleDoc : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC),
+-            GURL("https://docs.google.com/document/u/0/"
++            GURL("https://docs.9oo91e.qjz9zk/document/u/0/"
+                  "create?usp=chrome_actions")) {}
+ 
+   const gfx::VectorIcon& GetVectorIcon() const override {
+@@ -819,7 +819,7 @@ class OmniboxPedalCreateGoogleSheet : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET),
+-            GURL("https://docs.google.com/spreadsheets/u/0/"
++            GURL("https://docs.9oo91e.qjz9zk/spreadsheets/u/0/"
+                  "create?usp=chrome_actions")) {}
+ 
+   const gfx::VectorIcon& GetVectorIcon() const override {
+@@ -879,7 +879,7 @@ class OmniboxPedalCreateGoogleSlide : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE),
+-            GURL("https://docs.google.com/presentation/u/0/"
++            GURL("https://docs.9oo91e.qjz9zk/presentation/u/0/"
+                  "create?usp=chrome_actions")) {}
+ 
+   const gfx::VectorIcon& GetVectorIcon() const override {
+@@ -939,7 +939,7 @@ class OmniboxPedalCreateGoogleCalendarEvent : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT),
+-            GURL("https://calendar.google.com/calendar/u/0/r/"
++            GURL("https://calendar.9oo91e.qjz9zk/calendar/u/0/r/"
+                  "eventedit?usp=chrome_actions")) {}
+ 
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+@@ -1001,7 +1001,7 @@ class OmniboxPedalCreateGoogleSite : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE),
+-            GURL("https://sites.google.com/u/0/create?usp=chrome_actions")) {}
++            GURL("https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions")) {}
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+   const gfx::VectorIcon& GetVectorIcon() const override {
+     return vector_icons::kGoogleSitesIcon;
+@@ -1061,7 +1061,7 @@ class OmniboxPedalCreateGoogleKeepNote : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE),
+-            GURL("https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE")) {}
++            GURL("https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE")) {}
+ 
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+   const gfx::VectorIcon& GetVectorIcon() const override {
+@@ -1122,7 +1122,7 @@ class OmniboxPedalCreateGoogleForm : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM),
+-            GURL("https://docs.google.com/forms/u/0/"
++            GURL("https://docs.9oo91e.qjz9zk/forms/u/0/"
+                  "create?usp=chrome_actions")) {}
+ 
+   const gfx::VectorIcon& GetVectorIcon() const override {
+@@ -1181,7 +1181,7 @@ class OmniboxPedalSeeChromeTips : public OmniboxPedal {
+                          IDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUGGESTION_CONTENTS,
+                          IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUFFIX,
+                          IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS),
+-            GURL("https://www.google.com/chrome/tips/")) {}
++            GURL("https://www.9oo91e.qjz9zk/chrome/tips/")) {}
+ 
+   std::vector<SynonymGroupSpec> SpecifySynonymGroups(
+       bool locale_is_english) const override {
+@@ -1236,7 +1236,7 @@ class OmniboxPedalManageGoogleAccount : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT),
+-            GURL("https://myaccount.google.com/"
++            GURL("https://myaccount.9oo91e.qjz9zk/"
+                  "?utm_source=ga-chrome-actions&utm_medium=manageGA")) {}
+ 
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+@@ -1298,7 +1298,7 @@ class OmniboxPedalChangeGooglePassword : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD),
+-            GURL("https://myaccount.google.com/signinoptions/"
++            GURL("https://myaccount.9oo91e.qjz9zk/signinoptions/"
+                  "password?utm_source=ga-chrome-actions&utm_medium=changePW")) {
+   }
+ 
+@@ -1473,7 +1473,7 @@ class OmniboxPedalFindMyPhone : public OmniboxPedalAuthRequired {
+                          IDS_OMNIBOX_PEDAL_FIND_MY_PHONE_SUGGESTION_CONTENTS,
+                          IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE_SUFFIX,
+                          IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE),
+-            GURL("https://myaccount.google.com/"
++            GURL("https://myaccount.9oo91e.qjz9zk/"
+                  "find-your-phone?utm_source=ga-chrome-actions&utm_medium="
+                  "findYourPhone")) {}
+ 
+@@ -1531,7 +1531,7 @@ class OmniboxPedalManageGooglePrivacy : public OmniboxPedalAuthRequired {
+                 IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUGGESTION_CONTENTS,
+                 IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUFFIX,
+                 IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY),
+-            GURL("https://myaccount.google.com/"
++            GURL("https://myaccount.9oo91e.qjz9zk/"
+                  "data-and-privacy?utm_source=ga-chrome-actions&utm_medium="
+                  "managePrivacy")) {}
+ 
 diff --git a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc
 --- a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc
 +++ b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc
@@ -9726,7 +8941,7 @@ diff --git a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc b/ch
 diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/signin_view_controller.cc
 --- a/chrome/browser/ui/signin_view_controller.cc
 +++ b/chrome/browser/ui/signin_view_controller.cc
-@@ -328,7 +328,7 @@ void SigninViewController::ShowDiceSigninTab(
+@@ -330,7 +330,7 @@ void SigninViewController::ShowDiceSigninTab(
      DCHECK(google_apis::HasOAuthClientConfigured())
          << "You must configure the OAuth client ID and client secret in order "
             "to sign in to Chromium. See instruction at "
@@ -9756,7 +8971,7 @@ diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/
 diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
 --- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
 +++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
-@@ -242,7 +242,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) {
+@@ -325,7 +325,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) {
            [](Profile* profile) {
              NavigateParams params(
                  profile,
@@ -9840,27 +9055,15 @@ diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/bro
 diff --git a/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc b/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc
 --- a/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc
 +++ b/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc
-@@ -55,7 +55,7 @@ namespace lens {
+@@ -68,7 +68,7 @@ namespace lens {
  constexpr int kDefaultSidePanelHeaderHeight = 40;
  constexpr gfx::Insets kLensLabelButtonMargins = gfx::Insets::VH(12, 0);
  constexpr char kStaticLoadingScreenURL[] =
 -    "https://www.gstatic.com/lens/chrome/lens_side_panel_loading.html";
 +    "https://www.95tat1c.qjz9zk/lens/chrome/lens_side_panel_loading.html";
  
- LensUnifiedSidePanelView::LensUnifiedSidePanelView(BrowserView* browser_view) {
-   browser_view_ = browser_view;
-diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py
---- a/chrome/browser/ui/webui/PRESUBMIT.py
-+++ b/chrome/browser/ui/webui/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for files in chrome/browser/ui/webui.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
+ LensUnifiedSidePanelView::LensUnifiedSidePanelView(BrowserView* browser_view)
+     : browser_view_(browser_view) {
 diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
 --- a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
 +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc
@@ -9873,7 +9076,7 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  constexpr char const* kAppIdsWithHiddenStoragePermission[] = {
-@@ -557,7 +557,7 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) {
+@@ -568,7 +568,7 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) {
    proxy->AppRegistryCache().ForOneApp(app_id, [&proxy](const apps::AppUpdate&
                                                             update) {
      if (update.InstallSource() == apps::InstallSource::kPlayStore) {
@@ -9882,7 +9085,7 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.
                 update.PublisherId());
        if (base::FeatureList::IsEnabled(apps::kAppServiceLaunchWithoutMojom)) {
          proxy->LaunchAppWithUrl(arc::kPlayStoreAppId, ui::EF_NONE, url,
-@@ -567,7 +567,7 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) {
+@@ -578,7 +578,7 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) {
                                  apps::mojom::LaunchSource::kFromChromeInternal);
        }
      } else if (update.InstallSource() == apps::InstallSource::kChromeWebStore) {
@@ -9891,21 +9094,9 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.
        if (base::FeatureList::IsEnabled(apps::kAppServiceLaunchWithoutMojom)) {
          proxy->LaunchAppWithUrl(extensions::kWebStoreAppId, ui::EF_NONE, url,
                                  apps::LaunchSource::kFromChromeInternal);
-diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
---- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
-+++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
-@@ -68,7 +68,7 @@ void AutofillCacheResetter::ResetCache(Callback callback) {
-       content::BrowsingDataFilterBuilder::Create(
-           content::BrowsingDataFilterBuilder::Mode::kDelete);
-   filter_builder->AddOrigin(
--      url::Origin::Create(GURL("https://content-autofill.googleapis.com")));
-+      url::Origin::Create(GURL("https://content-autofill.9oo91eapis.qjz9zk")));
-   remover_->RemoveWithFilterAndReply(
-       base::Time::Min(), base::Time::Max(),
-       content::BrowsingDataRemover::DATA_TYPE_CACHE,
-diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc
---- a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc
-+++ b/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc
+diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc
+--- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc
++++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc
 @@ -48,7 +48,7 @@ bool MaybeShowConfirmSignoutDialog() {
  }
  
@@ -9924,6 +9115,30 @@ diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui
    }
  
    source->DisableTrustedTypesCSP();
+diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
+--- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
++++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
+@@ -71,7 +71,7 @@ void AutofillCacheResetter::ResetCache(Callback callback) {
+       content::BrowsingDataFilterBuilder::Create(
+           content::BrowsingDataFilterBuilder::Mode::kDelete);
+   filter_builder->AddOrigin(
+-      url::Origin::Create(GURL("https://content-autofill.googleapis.com")));
++      url::Origin::Create(GURL("https://content-autofill.9oo91eapis.qjz9zk")));
+   remover_->RemoveWithFilterAndReply(
+       base::Time::Min(), base::Time::Max(),
+       content::BrowsingDataRemover::DATA_TYPE_CACHE,
+diff --git a/chrome/browser/ui/webui/chromeos/cloud_upload/drive_upload_handler.cc b/chrome/browser/ui/webui/chromeos/cloud_upload/drive_upload_handler.cc
+--- a/chrome/browser/ui/webui/chromeos/cloud_upload/drive_upload_handler.cc
++++ b/chrome/browser/ui/webui/chromeos/cloud_upload/drive_upload_handler.cc
+@@ -328,7 +328,7 @@ void DriveUploadHandler::OnGetDriveMetadata(
+ 
+   // URLs for editing Office files in Web Drive all have a "docs.google.com"
+   // host.
+-  if (hosted_url.host() != "docs.google.com") {
++  if (hosted_url.host() != "docs.9oo91e.qjz9zk") {
+     if (timed_out) {
+       OnEndUpload(GURL(),
+                   "Unexpected alternate URL - Drive editing unavailable");
 diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc
 --- a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc
 +++ b/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc
@@ -9939,7 +9154,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_lo
 diff --git a/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h
 --- a/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h
 +++ b/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h
-@@ -16,9 +16,9 @@ class ConsolidatedConsentScreen;
+@@ -18,9 +18,9 @@ class ConsolidatedConsentScreen;
  namespace chromeos {
  namespace {
  const char kGoogleEulaDefaultUrl[] =
@@ -10136,9 +9351,9 @@ diff --git a/chrome/browser/ui/webui/sanitized_image_source.cc b/chrome/browser/
    };
  
    for (const char* const suffix : kGooglePhotosHostSuffixes) {
-diff --git a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc
---- a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc
-+++ b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc
+diff --git a/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc
+--- a/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc
++++ b/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc
 @@ -30,7 +30,7 @@
  namespace chromeos {
  namespace settings {
@@ -10163,7 +9378,7 @@ diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1638,7 +1638,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1664,7 +1664,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
    // The link to the Advanced Protection Program landing page, with a referrer
    // from Chrome settings.
    GURL advanced_protection_url(
@@ -10172,7 +9387,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
    advanced_protection_url = net::AppendQueryParameter(advanced_protection_url,
                                                        "utm_source", "Chrome");
    advanced_protection_url = net::AppendQueryParameter(
-@@ -1800,7 +1800,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source,
+@@ -1826,7 +1826,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source,
        "privacySandboxPageExplanation1Phase2",
        l10n_util::GetStringFUTF16(
            IDS_SETTINGS_PRIVACY_SANDBOX_PAGE_EXPLANATION1_PHASE2,
@@ -10181,7 +9396,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
  
    // The complete FLoC explanation string must be built from two strings,
    // one provided by the Privacy Sandbox service, and one with a URL
-@@ -1810,7 +1810,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source,
+@@ -1836,7 +1836,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source,
                                         7) +
        u" " +  // Whitespace is a valid separator w.r.t l10n.
        l10n_util::GetStringFUTF16(IDS_SETTINGS_PRIVACY_SANDBOX_FLOC_TRIAL_ACTIVE,
@@ -10277,18 +9492,6 @@ diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.cc b/chrome/browse
  
  bool g_is_remote_content_disabled = false;
  
-diff --git a/chrome/browser/vr/PRESUBMIT.py b/chrome/browser/vr/PRESUBMIT.py
---- a/chrome/browser/vr/PRESUBMIT.py
-+++ b/chrome/browser/vr/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/browser/vr
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/browser/web_applications/commands/web_app_install_command.cc b/chrome/browser/web_applications/commands/web_app_install_command.cc
 --- a/chrome/browser/web_applications/commands/web_app_install_command.cc
 +++ b/chrome/browser/web_applications/commands/web_app_install_command.cc
@@ -10492,7 +9695,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/messages_dogf
 diff --git a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc
 --- a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc
 +++ b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc
-@@ -165,7 +165,7 @@ std::vector<PreinstalledWebAppMigration> GetPreinstalledWebAppMigrations(
+@@ -164,7 +164,7 @@ std::vector<PreinstalledWebAppMigration> GetPreinstalledWebAppMigrations(
              kMigrateDefaultChromeAppToWebAppsGSuite.name, profile)) {
        PreinstalledWebAppMigration keep_migration;
        keep_migration.install_url =
@@ -10501,7 +9704,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_
        keep_migration.expected_web_app_id = kGoogleKeepAppId;
        keep_migration.old_chrome_app_id = extension_misc::kGoogleKeepAppId;
        migrations.push_back(std::move(keep_migration));
-@@ -175,21 +175,21 @@ std::vector<PreinstalledWebAppMigration> GetPreinstalledWebAppMigrations(
+@@ -174,21 +174,21 @@ std::vector<PreinstalledWebAppMigration> GetPreinstalledWebAppMigrations(
              kMigrateDefaultChromeAppToWebAppsNonGSuite.name, profile)) {
        PreinstalledWebAppMigration books_migration;
        books_migration.install_url =
@@ -10564,7 +9767,7 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br
 diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
 +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -312,7 +312,7 @@ bool ChromeWebAuthenticationDelegate::OriginMayUseRemoteDesktopClientOverride(
+@@ -309,7 +309,7 @@ bool ChromeWebAuthenticationDelegate::OriginMayUseRemoteDesktopClientOverride(
    }
  
    constexpr char kGoogleCorpCrdOrigin[] =
@@ -10573,7 +9776,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/
    if (caller_origin == url::Origin::Create(GURL(kGoogleCorpCrdOrigin))) {
      return true;
    }
-@@ -359,7 +359,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation(
+@@ -356,7 +356,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation(
      const url::Origin& caller_origin,
      const std::string& relying_party_id) {
    constexpr char kGoogleCorpAppId[] =
@@ -10582,7 +9785,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/
  
    // If the RP ID is actually the Google corp App ID (because the request is
    // actually a U2F request originating from cryptotoken), or is listed in the
-@@ -995,11 +995,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension(
+@@ -999,11 +999,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension(
    // everything to QR-code or sync-based pairing, we don't want use of the
    // extension to spread without consideration. Therefore it's limited to
    // origins that are already depending on it and test sites.
@@ -10596,18 +9799,6 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/
    DCHECK(test_site.is_valid());
    return origin.IsSameOriginWith(test_site);
  }
-diff --git a/chrome/chrome_cleaner/PRESUBMIT.py b/chrome/chrome_cleaner/PRESUBMIT.py
---- a/chrome/chrome_cleaner/PRESUBMIT.py
-+++ b/chrome/chrome_cleaner/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting chrome/chrome_cleaner/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/chrome_cleaner/components/recovery_component.cc b/chrome/chrome_cleaner/components/recovery_component.cc
 --- a/chrome/chrome_cleaner/components/recovery_component.cc
 +++ b/chrome/chrome_cleaner/components/recovery_component.cc
@@ -10728,54 +9919,6 @@ diff --git a/chrome/chrome_cleaner/logging/reporter_logging_service.cc b/chrome/
              destination: GOOGLE_OWNED_SERVICE
            }
            policy {
-diff --git a/chrome/common/apps/platform_apps/api/PRESUBMIT.py b/chrome/common/apps/platform_apps/api/PRESUBMIT.py
---- a/chrome/common/apps/platform_apps/api/PRESUBMIT.py
-+++ b/chrome/common/apps/platform_apps/api/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/chrome/common/apps/platform_apps.
- 
--See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc b/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc
---- a/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc
-+++ b/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc
-@@ -37,7 +37,7 @@ const ChromeOSSystemExtensionInfos& getMap() {
-   static const ChromeOSSystemExtensionInfos kExtensionIdToExtensionInfoMap{
-       {/*extension_id=*/"gogonhoemckpdpadfnjnpgbjpbjnodgc",
-        {/*manufacturers=*/{"HP", "ASUS"},
--        /*pwa_origin=*/"*://www.google.com/*"}},
-+        /*pwa_origin=*/"*://www.9oo91e.qjz9zk/*"}},
-       {/*extension_id=*/"alnedpmllcfpgldkagbfbjkloonjlfjb",
-        {/*manufacturers=*/{"HP"},
-         /*pwa_origin=*/"https://hpcs-appschr.hpcloud.hp.com/*"}},
-diff --git a/chrome/common/extensions/PRESUBMIT.py b/chrome/common/extensions/PRESUBMIT.py
---- a/chrome/common/extensions/PRESUBMIT.py
-+++ b/chrome/common/extensions/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting extensions.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/chrome/common/extensions/api/PRESUBMIT.py b/chrome/common/extensions/api/PRESUBMIT.py
---- a/chrome/common/extensions/api/PRESUBMIT.py
-+++ b/chrome/common/extensions/api/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/extensions/common.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
 --- a/chrome/common/extensions/api/_api_features.json
 +++ b/chrome/common/extensions/api/_api_features.json
@@ -10788,7 +9931,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext
    "browserAction.openPopup": [{
      "channel": "dev",
      "dependencies": ["manifest:browser_action"],
-@@ -959,7 +959,7 @@
+@@ -960,7 +960,7 @@
    }, {
      "channel": "dev",
      "contexts": ["web_page"],
@@ -11142,7 +10285,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
-@@ -103,238 +103,238 @@ const char kChromeSearchScheme[] = "chrome-search";
+@@ -103,241 +103,241 @@ const char kChromeSearchScheme[] = "chrome-search";
  const char kChromeUIUntrustedNewTabPageUrl[] =
      "chrome-untrusted://new-tab-page/";
  
@@ -11232,6 +10375,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
 -const char kGooglePhotosURL[] = "https://photos.google.com";
 +const char kGooglePhotosURL[] = "https://photos.9oo91e.qjz9zk";
  
+ const char kHighEfficiencyModeLearnMoreUrl[] =
+-    "https://support.google.com/chrome/?p=chrome_performance_snooze";
++    "https://support.9oo91e.qjz9zk/chrome/?p=chrome_performance_snooze";
+ 
  const char kLearnMoreReportingURL[] =
 -    "https://support.google.com/chrome/?p=ui_usagestat";
 +    "https://support.9oo91e.qjz9zk/chrome/?p=ui_usagestat";
@@ -11450,7 +10597,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
  
  const char kArcPrivacyPolicyURLPath[] = "arc/privacy_policy";
  
-@@ -343,10 +343,10 @@ const char kArcTermsURLPath[] = "arc/terms";
+@@ -346,10 +346,10 @@ const char kArcTermsURLPath[] = "arc/terms";
  // TODO(crbug.com/1010321): Remove 'm100' prefix from link once Bluetooth Revamp
  // has shipped.
  const char kBluetoothPairingLearnMoreUrl[] =
@@ -11463,7 +10610,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
  
  const char kChromeOSAssetHost[] = "chromeos-asset";
  const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/";
-@@ -361,16 +361,16 @@ const char kChromeOSGestureEducationHelpURL[] =
+@@ -364,16 +364,16 @@ const char kChromeOSGestureEducationHelpURL[] =
      "chrome://help-app/help/sub/3399710/id/9739838";
  
  const char kChromePaletteHelpURL[] =
@@ -11484,7 +10631,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
  
  const char kEchoLearnMoreURL[] =
      "chrome://help-app/help/sub/3399709/id/2703646";
-@@ -379,125 +379,125 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html";
+@@ -382,125 +382,125 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html";
  
  const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf";
  
@@ -12352,7 +11499,7 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe
 diff --git a/chrome/renderer/cart/commerce_hint_agent.cc b/chrome/renderer/cart/commerce_hint_agent.cc
 --- a/chrome/renderer/cart/commerce_hint_agent.cc
 +++ b/chrome/renderer/cart/commerce_hint_agent.cc
-@@ -58,7 +58,7 @@ constexpr unsigned kLengthLimit = 4096;
+@@ -57,7 +57,7 @@ constexpr unsigned kLengthLimit = 4096;
  constexpr char kAmazonDomain[] = "amazon.com";
  constexpr char kEbayDomain[] = "ebay.com";
  constexpr char kElectronicExpressDomain[] = "electronicexpress.com";
@@ -12408,18 +11555,6 @@ diff --git a/chrome/services/mac_notifications/mac_notification_service_ns.mm b/
  - (void)userNotificationCenter:(NSUserNotificationCenter*)center
      didRemoveDeliveredNotifications:(NSArray*)notifications {
    for (NSUserNotification* notification in notifications) {
-diff --git a/chrome/tools/build/PRESUBMIT.py b/chrome/tools/build/PRESUBMIT.py
---- a/chrome/tools/build/PRESUBMIT.py
-+++ b/chrome/tools/build/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for FILES.cfg controlling which files are archived.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/tools/webforms_aggregator_tests.py b/chrome/tools/webforms_aggregator_tests.py
 --- a/chrome/tools/webforms_aggregator_tests.py
 +++ b/chrome/tools/webforms_aggregator_tests.py
@@ -12510,30 +11645,6 @@ diff --git a/chrome/updater/mac/setup/ks_tickets.mm b/chrome/updater/mac/setup/k
      serverType_ = [@"Omaha" retain];
      ticketVersion_ = 1;
    }
-diff --git a/chrome/updater/tools/PRESUBMIT.py b/chrome/updater/tools/PRESUBMIT.py
---- a/chrome/updater/tools/PRESUBMIT.py
-+++ b/chrome/updater/tools/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for chrome/updater/tools/.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/chrome/updater/win/signing/PRESUBMIT.py b/chrome/updater/win/signing/PRESUBMIT.py
---- a/chrome/updater/win/signing/PRESUBMIT.py
-+++ b/chrome/updater/win/signing/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for chrome/updater/win/signing/.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
 --- a/chrome/utility/importer/ie_importer_win.cc
 +++ b/chrome/utility/importer/ie_importer_win.cc
@@ -12643,20 +11754,54 @@ diff --git a/chromeos/ash/components/dbus/rmad/fake_rmad_client.cc b/chromeos/as
      "cr50reset?challenge="
      "HRBXHV84NSTHT25WJECYQKB8SARWFTMSWNGFT2FVEEPX69VE99USV3QFBEANDVXGQVL93QK2M6"
      "P3DNV4&hwid=SAMUSTEST_2082";
-diff --git a/chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller.cc b/chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller.cc
---- a/chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller.cc
-+++ b/chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller.cc
-@@ -18,8 +18,8 @@ namespace ash::quick_start {
+diff --git a/chromeos/ash/components/device_activity/device_activity_controller.cc b/chromeos/ash/components/device_activity/device_activity_controller.cc
+--- a/chromeos/ash/components/device_activity/device_activity_controller.cc
++++ b/chromeos/ash/components/device_activity/device_activity_controller.cc
+@@ -57,7 +57,7 @@ static const std::unordered_set<policy::DeviceMode>& DeviceModeEnterprise() {
  
+ // Production edge server for reporting device actives.
+ // TODO(https://crbug.com/1267432): Enable passing base url as a runtime flag.
+-const char kFresnelBaseUrl[] = "https://crosfresnel-pa.googleapis.com";
++const char kFresnelBaseUrl[] = "https://crosfresnel-pa.9oo91eapis.qjz9zk";
+ 
+ // Count the number of PSM device active secret that is set.
+ const char kDeviceActiveControllerPsmDeviceActiveSecretIsSet[] =
+diff --git a/chromeos/ash/components/drivefs/drivefs_auth.cc b/chromeos/ash/components/drivefs/drivefs_auth.cc
+--- a/chromeos/ash/components/drivefs/drivefs_auth.cc
++++ b/chromeos/ash/components/drivefs/drivefs_auth.cc
+@@ -63,7 +63,7 @@ void DriveFsAuth::GetAccessToken(
+   timer_->Start(
+       FROM_HERE, base::Seconds(30),
+       base::BindOnce(&DriveFsAuth::AuthTimeout, base::Unretained(this)));
+-  std::set<std::string> scopes({"https://www.googleapis.com/auth/drive"});
++  std::set<std::string> scopes({"https://www.9oo91eapis.qjz9zk/auth/drive"});
+   access_token_fetcher_ =
+       std::make_unique<signin::PrimaryAccountAccessTokenFetcher>(
+           kIdentityConsumerId, identity_manager, scopes,
+diff --git a/chromeos/ash/components/geolocation/simple_geolocation_provider.cc b/chromeos/ash/components/geolocation/simple_geolocation_provider.cc
+--- a/chromeos/ash/components/geolocation/simple_geolocation_provider.cc
++++ b/chromeos/ash/components/geolocation/simple_geolocation_provider.cc
+@@ -20,7 +20,7 @@ namespace ash {
  namespace {
  
--const char kRelyingPartyId[] = "google.com";
--const char kOrigin[] = "https://accounts.google.com";
-+const char kRelyingPartyId[] = "9oo91e.qjz9zk";
-+const char kOrigin[] = "https://accounts.9oo91e.qjz9zk";
- const char kCtapRequestType[] = "webauthn.get";
+ const char kDefaultGeolocationProviderUrl[] =
+-    "https://www.googleapis.com/geolocation/v1/geolocate?";
++    "https://www.9oo91eapis.qjz9zk/geolocation/v1/geolocate?";
  
- const uint8_t kAuthenticatorGetAssertionCommand = 0x02;
+ }  // namespace
+ 
+diff --git a/chromeos/ash/components/login/auth/recovery/service_constants.cc b/chromeos/ash/components/login/auth/recovery/service_constants.cc
+--- a/chromeos/ash/components/login/auth/recovery/service_constants.cc
++++ b/chromeos/ash/components/login/auth/recovery/service_constants.cc
+@@ -11,7 +11,7 @@ namespace ash {
+ namespace {
+ 
+ const char kTestingRecoveryServiceUrl[] =
+-    "https://autopush-chromeoslogin-pa.sandbox.googleapis.com";
++    "https://autopush-chromeoslogin-pa.sandbox.9oo91eapis.qjz9zk";
+ 
+ const char kTestingHsmPublicKey[] =
+     "3059301306072a8648ce3d020106082a8648ce3d03010703420004240237734dac9e973653"
 diff --git a/chromeos/ash/services/assistant/assistant_manager_service_impl.cc b/chromeos/ash/services/assistant/assistant_manager_service_impl.cc
 --- a/chromeos/ash/services/assistant/assistant_manager_service_impl.cc
 +++ b/chromeos/ash/services/assistant/assistant_manager_service_impl.cc
@@ -12684,7 +11829,7 @@ diff --git a/chromeos/ash/services/assistant/service.cc b/chromeos/ash/services/
 diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd
 --- a/chromeos/chromeos_strings.grd
 +++ b/chromeos/chromeos_strings.grd
-@@ -2109,7 +2109,7 @@ Try tapping the mic to ask me anything.
+@@ -2112,7 +2112,7 @@ Try tapping the mic to ask me anything.
          Photos
        </message>
        <message name="IDS_PERSONALIZATION_APP_GOOGLE_PHOTOS_ZERO_STATE_MESSAGE" desc="Message shown in the Google Photos page in the wallpaper app when the user has no photos.">
@@ -12693,7 +11838,7 @@ diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd
        </message>
        <message name="IDS_PERSONALIZATION_APP_MY_IMAGES" desc="Label for the local images page in wallpaper app.">
          My Images
-@@ -2267,10 +2267,10 @@ Try tapping the mic to ask me anything.
+@@ -2270,10 +2270,10 @@ Try tapping the mic to ask me anything.
          Celsius
        </message>
        <message name="IDS_PERSONALIZATION_APP_AMBIENT_MODE_ALBUMS_SUBPAGE_GOOGLE_PHOTOS_TITLE" desc="Label for the subpage to select albums of Google Photos in ambient mode.">
@@ -12884,30 +12029,6 @@ diff --git a/components/assist_ranker/predictor_config_definitions.cc b/componen
      "contextual_search/test_ranker_model_20171109_short_words_v2.pb.bin";
  
  const base::FeatureParam<std::string>*
-diff --git a/components/autofill/PRESUBMIT.py b/components/autofill/PRESUBMIT.py
---- a/components/autofill/PRESUBMIT.py
-+++ b/components/autofill/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/components/autofill.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/components/autofill/content/renderer/PRESUBMIT.py b/components/autofill/content/renderer/PRESUBMIT.py
---- a/components/autofill/content/renderer/PRESUBMIT.py
-+++ b/components/autofill/content/renderer/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/components/autofill/content/renderer.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
 --- a/components/autofill/content/renderer/form_cache.cc
 +++ b/components/autofill/content/renderer/form_cache.cc
@@ -12959,7 +12080,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
 diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc
 --- a/components/autofill/core/browser/autofill_experiments.cc
 +++ b/components/autofill/core/browser/autofill_experiments.cc
-@@ -212,9 +212,9 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service,
+@@ -209,9 +209,9 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service,
    // @googlemail, @gmail, @google, or @chromium domains.
    // example.com is on the list because ChromeOS tests rely on using this. That
    // should be fine, since example.com is an IANA reserved domain.
@@ -13005,7 +12126,7 @@ diff --git a/components/autofill/core/browser/data_model/test_data_creator.cc b/
 diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
 --- a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
 +++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
-@@ -42,7 +42,7 @@ namespace autofill {
+@@ -41,7 +41,7 @@ namespace autofill {
  namespace {
  // Default timeout for user to respond to WebAuthn prompt.
  constexpr int kWebAuthnTimeoutMs = 3 * 60 * 1000;  // 3 minutes
@@ -13085,7 +12206,7 @@ diff --git a/components/autofill_assistant/browser/autofill_assistant_onboarding
 diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc
 --- a/components/autofill_assistant/browser/headless/client_headless.cc
 +++ b/components/autofill_assistant/browser/headless/client_headless.cc
-@@ -37,7 +37,7 @@
+@@ -39,7 +39,7 @@
  
  namespace autofill_assistant {
  
@@ -13106,6 +12227,22 @@ diff --git a/components/autofill_assistant/browser/service/server_url_fetcher.cc
  const char kScriptEndpoint[] = "/v1/supportsSite2";
  const char kActionEndpoint[] = "/v1/actions2";
  const char kTriggersEndpoint[] = "/v1/triggers";
+diff --git a/components/autofill_assistant/browser/starter_heuristic_configs/launched_configs.cc b/components/autofill_assistant/browser/starter_heuristic_configs/launched_configs.cc
+--- a/components/autofill_assistant/browser/starter_heuristic_configs/launched_configs.cc
++++ b/components/autofill_assistant/browser/starter_heuristic_configs/launched_configs.cc
+@@ -19,10 +19,10 @@ namespace {
+ // relevant for the given intents. This list should be updated occasionally to
+ // ensure that we keep filtering most of the noise.
+ const char kSharedShoppingConfigWithoutIntent[] = R"(
+-    "denylistedDomains": ["google.com", "facebook.com", "ampproject.org",
++    "denylistedDomains": ["9oo91e.qjz9zk", "f8c3b00k.qjz9zk", "ampproject.org",
+                         "pornhub.com", "xnxx.com", "xvideos.com", "twitter.com",
+                         "instagram.com", "craigslist.org", "yahoo.com",
+-                        "googleadservices.com", "youtube.com",
++                        "9oo91eadservices.qjz9zk", "y0u1ub3.qjz9zk",
+                         "zillow.com", "wikipedia.org", "xhamster.com",
+                         "pinterest.com", "reddit.com", "indeed.com",
+                         "dailymail.co.uk", "weather.com", "mlb.com",
 diff --git a/components/blocked_content/safe_browsing_triggered_popup_blocker.h b/components/blocked_content/safe_browsing_triggered_popup_blocker.h
 --- a/components/blocked_content/safe_browsing_triggered_popup_blocker.h
 +++ b/components/blocked_content/safe_browsing_triggered_popup_blocker.h
@@ -13135,18 +12272,6 @@ diff --git a/components/breadcrumbs/core/breadcrumb_manager_tab_helper.cc b/comp
  }
  
  }  // namespace
-diff --git a/components/browser_sync/PRESUBMIT.py b/components/browser_sync/PRESUBMIT.py
---- a/components/browser_sync/PRESUBMIT.py
-+++ b/components/browser_sync/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for browser_sync component.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -13320,6 +12445,47 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components
            "mmd": 86400,
            "state": {
              "retired": {
+diff --git a/components/commerce/core/account_checker.cc b/components/commerce/core/account_checker.cc
+--- a/components/commerce/core/account_checker.cc
++++ b/components/commerce/core/account_checker.cc
+@@ -20,7 +20,7 @@
+ 
+ namespace {
+ 
+-const char kOAuthScope[] = "https://www.googleapis.com/auth/chromememex";
++const char kOAuthScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromememex";
+ const char kOAuthName[] = "chromememex_svc";
+ const char kGetHttpMethod[] = "GET";
+ const char kPostHttpMethod[] = "POST";
+@@ -29,7 +29,7 @@ const char kEmptyPostData[] = "";
+ const int64_t kTimeoutMs = 10000;
+ 
+ const char kNotificationsPrefUrl[] =
+-    "https://memex-pa.googleapis.com/v1/notifications/preferences";
++    "https://memex-pa.9oo91eapis.qjz9zk/v1/notifications/preferences";
+ const char kPriceTrackEmailPref[] = "price_track_email";
+ const char kPreferencesKey[] = "preferences";
+ 
+@@ -95,8 +95,8 @@ void AccountChecker::FetchWaaStatus() {
+   // figure out a better way to keep these parameters in sync.
+   const char waa_oauth_name[] = "web_history";
+   const char waa_query_url[] =
+-      "https://history.google.com/history/api/lookup?client=web_app";
+-  const char waa_oauth_scope[] = "https://www.googleapis.com/auth/chromesync";
++      "https://history.9oo91e.qjz9zk/history/api/lookup?client=web_app";
++  const char waa_oauth_scope[] = "https://www.9oo91eapis.qjz9zk/auth/chromesync";
+   const char waa_content_type[] = "application/json; charset=UTF-8";
+   const char waa_get_method[] = "GET";
+   const int64_t waa_timeout_ms = 30000;
+@@ -124,7 +124,7 @@ void AccountChecker::FetchWaaStatus() {
+           setting:
+             "This fetch is only enabled for signed-in users. There's no "
+             "direct Chromium's setting to disable this, but users can manage "
+-            "their preferences by visiting myactivity.google.com."
++            "their preferences by visiting myactivity.9oo91e.qjz9zk."
+           chrome_policy {
+             BrowserSignin {
+               policy_options {mode: MANDATORY}
 diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
 --- a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
 +++ b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json
@@ -13335,7 +12501,7 @@ diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_
 diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 --- a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 +++ b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  namespace {
  
  // For creating endpoint fetcher.
@@ -13344,15 +12510,15 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
  const char kOAuthName[] = "subscriptions_svc";
  const char kGetHttpMethod[] = "GET";
  const char kPostHttpMethod[] = "POST";
-@@ -31,7 +31,7 @@ const char kEmptyPostData[] = "";
- const int64_t kTimeoutMs = 1000;
+@@ -36,7 +36,7 @@ constexpr base::FeatureParam<int> kTimeoutMs{&commerce::kShoppingList,
+                                              kTimeoutParam, kDefaultTimeoutMs};
  
  const char kDefaultServiceBaseUrl[] =
 -    "https://memex-pa.googleapis.com/v1/shopping/subscriptions";
 +    "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/subscriptions";
  const char kBaseUrlParam[] = "subscriptions_service_base_url";
  constexpr base::FeatureParam<std::string> kServiceBaseUrl{
-     &commerce::kCommercePriceTracking, kBaseUrlParam, kDefaultServiceBaseUrl};
+     &commerce::kShoppingList, kBaseUrlParam, kDefaultServiceBaseUrl};
 diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd
 --- a/components/components_google_chrome_strings.grd
 +++ b/components/components_google_chrome_strings.grd
@@ -13454,18 +12620,6 @@ diff --git a/components/crash/core/browser/resources/crashes.js b/components/cra
    for (const param in params) {
      href = appendParam(href, param, params[param]);
    }
-diff --git a/components/cronet/PRESUBMIT.py b/components/cronet/PRESUBMIT.py
---- a/components/cronet/PRESUBMIT.py
-+++ b/components/cronet/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for src/components/cronet.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py
 --- a/components/cronet/tools/generate_javadoc.py
 +++ b/components/cronet/tools/generate_javadoc.py
@@ -13999,49 +13153,6 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
  const int64_t kDefaultUserSerialNumber = 0LL;
  const int kDestroyGCMStoreDelayMS = 5 * 60 * 1000;  // 5 minutes.
  
-diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
---- a/components/google/core/common/google_util.cc
-+++ b/components/google/core/common/google_util.cc
-@@ -110,18 +110,18 @@ bool IsGoogleAssociatedDomainUrl(const GURL& url) { // disabled on Bromite
-   // Some domains don't have international TLD extensions, so testing for them
-   // is very straightforward.
-   static const char* kSuffixesToSetHeadersFor[] = {
--      ".android.com",
--      ".doubleclick.com",
--      ".doubleclick.net",
--      ".ggpht.com",
--      ".googleadservices.com",
--      ".googleapis.com",
--      ".googlesyndication.com",
--      ".googleusercontent.com",
--      ".googlevideo.com",
--      ".gstatic.com",
--      ".litepages.googlezip.net",
--      ".ytimg.com",
-+      ".8n6r01d.qjz9zk",
-+      ".60u613cl1c4.c0m.qjz9zk",
-+      ".60u613cl1c4.n3t.qjz9zk",
-+      ".99pht.qjz9zk",
-+      ".9oo91eadservices.qjz9zk",
-+      ".9oo91eapis.qjz9zk",
-+      ".9oo91esyndication.qjz9zk",
-+      ".9oo91eusercontent.qjz9zk",
-+      ".9oo91evideo.qjz9zk",
-+      ".95tat1c.qjz9zk",
-+      ".litepages.9oo91e21p.qjz9zk",
-+      ".yt1mg.qjz9zk",
-   };
-   const std::string host = url.host();
-   for (size_t i = 0; i < std::size(kSuffixesToSetHeadersFor); ++i) {
-@@ -133,7 +133,7 @@ bool IsGoogleAssociatedDomainUrl(const GURL& url) { // disabled on Bromite
- 
-   // Exact hostnames in lowercase to set headers for.
-   static const char* kHostsToSetHeadersFor[] = {
--      "googleweblight.com",
-+      "9oo91eweblight.qjz9zk",
-   };
-   for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) {
-     if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i]))
 diff --git a/components/history/core/browser/browsing_history_service.cc b/components/history/core/browser/browsing_history_service.cc
 --- a/components/history/core/browser/browsing_history_service.cc
 +++ b/components/history/core/browser/browsing_history_service.cc
@@ -14066,7 +13177,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo
 diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
 --- a/components/history/core/browser/history_service.cc
 +++ b/components/history/core/browser/history_service.cc
-@@ -1329,7 +1329,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
+@@ -1356,7 +1356,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
            semantics {
              description:
                "If a user who syncs their browsing history deletes history "
@@ -14075,7 +13186,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
                "host to execute the corresponding deletion serverside."
              trigger:
                "Deleting browsing history for a given time range, e.g. from the "
-@@ -1371,7 +1371,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
+@@ -1398,7 +1398,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
            semantics {
              description:
                "If a user who syncs their browsing history deletes urls from  "
@@ -14155,19 +13266,19 @@ diff --git a/components/keyed_service/core/keyed_service_base_factory.cc b/compo
 diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc
 --- a/components/lens/lens_features.cc
 +++ b/components/lens/lens_features.cc
-@@ -44,7 +44,7 @@ const base::FeatureParam<bool> kEnableSidePanelForLens{
+@@ -47,7 +47,7 @@ const base::FeatureParam<bool> kEnableSidePanelForLens{
      &kLensStandalone, "enable-side-panel", true};
  
  constexpr base::FeatureParam<std::string> kHomepageURLForLens{
 -    &kLensStandalone, "lens-homepage-url", "https://lens.google.com/"};
 +    &kLensStandalone, "lens-homepage-url", "https://lens.9oo91e.qjz9zk/"};
  
- constexpr base::FeatureParam<int> kMaxPixelsForRegionSearch{
-     &kLensImageCompression, "region-search-dimensions-max-pixels", 1000};
+ constexpr base::FeatureParam<bool> kEnableLensHtmlRedirectFix{
+     &kLensStandalone, "lens-html-redirect-fix", true};
 diff --git a/components/media_router/common/media_source.h b/components/media_router/common/media_source.h
 --- a/components/media_router/common/media_source.h
 +++ b/components/media_router/common/media_source.h
-@@ -22,7 +22,7 @@ constexpr char kRemotePlaybackPresentationUrlScheme[] = "remote-playback";
+@@ -27,7 +27,7 @@ constexpr char kRemotePlaybackPresentationUrlScheme[] = "remote-playback";
  
  // URL prefix used by legacy Cast presentations.
  constexpr char kLegacyCastPresentationUrlPrefix[] =
@@ -14381,18 +13492,6 @@ diff --git a/components/offline_pages/core/prefetch/prefetch_server_urls.cc b/co
  const char kPrefetchExperimentHeaderName[] = "X-Offline-Prefetch-Experiment";
  const char kPrefetchOperationHeaderName[] = "X-Offline-Prefetch-Operation";
  const char kPrefetchTestingHeaderName[] = "X-Offline-Prefetch-Testing";
-diff --git a/components/omnibox/PRESUBMIT.py b/components/omnibox/PRESUBMIT.py
---- a/components/omnibox/PRESUBMIT.py
-+++ b/components/omnibox/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting components/omnibox/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc
 --- a/components/omnibox/browser/document_provider.cc
 +++ b/components/omnibox/browser/document_provider.cc
@@ -16532,146 +15631,294 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_zh-TW.j
 diff --git a/components/omnibox/resources/omnibox_pedal_synonyms.grd b/components/omnibox/resources/omnibox_pedal_synonyms.grd
 --- a/components/omnibox/resources/omnibox_pedal_synonyms.grd
 +++ b/components/omnibox/resources/omnibox_pedal_synonyms.grd
-@@ -227,182 +227,182 @@
+@@ -175,7 +175,7 @@
+         inside, within, for, how, the, an, do, in, my, on, to, a, i
+       </message>
+       <!-- Pedal #1: CLEAR_BROWSING_DATA -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_REQUIRED_CLEAR_BROWSER_CACHE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CLEAR_BROWSING_DATA Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Clear browsing data' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_REQUIRED_CLEAR_BROWSER_CACHE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CLEAR_BROWSING_DATA Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Clear browsing data' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         clear browser cache, clear history, delete cookies, erase browsing history
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CLEAR_BROWSING_DATA Pedal's 'google chrome' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Clear browsing data' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -189,7 +189,7 @@
+       </message>
+ 
+       <!-- Pedal #2: MANAGE_PASSWORDS -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_REQUIRED_MANAGE_CHROME_PASSWORDS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_PASSWORDS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage passwords in settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_REQUIRED_MANAGE_CHROME_PASSWORDS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_PASSWORDS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage passwords in settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         manage chrome passwords, view password in chrome
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_PASSWORDS Pedal's 'google chrome' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage passwords in settings' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -203,7 +203,7 @@
+       </message>
+ 
+       <!-- Pedal #3: UPDATE_CREDIT_CARD -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_REQUIRED_MANAGE_PAYMENT_METHODS" is_accessibility_with_no_ui="true" desc="Whole phrases for the UPDATE_CREDIT_CARD Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Update payment information in settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_REQUIRED_MANAGE_PAYMENT_METHODS" is_accessibility_with_no_ui="true" desc="Whole phrases for the UPDATE_CREDIT_CARD Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Update payment information in settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         manage payment methods, update credit card
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the UPDATE_CREDIT_CARD Pedal's 'google chrome' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Update payment information in settings' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -217,7 +217,7 @@
+       </message>
+ 
+       <!-- Pedal #4: LAUNCH_INCOGNITO -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_REQUIRED_ENTER_INCOGNITO_MODE" is_accessibility_with_no_ui="true" desc="Whole phrases for the LAUNCH_INCOGNITO Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Launch an incognito browser window' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_REQUIRED_ENTER_INCOGNITO_MODE" is_accessibility_with_no_ui="true" desc="Whole phrases for the LAUNCH_INCOGNITO Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Launch an incognito browser window' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         enter incognito mode, new incognito window, open incognito tab
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the LAUNCH_INCOGNITO Pedal's 'google chrome' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Launch an incognito browser window' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -231,7 +231,7 @@
+       </message>
+ 
+       <!-- Pedal #5: TRANSLATE -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_REQUIRED_TRANSLATE_THIS_PAGE" is_accessibility_with_no_ui="true" desc="Whole phrases for the TRANSLATE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Translate the current page' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_REQUIRED_TRANSLATE_THIS_PAGE" is_accessibility_with_no_ui="true" desc="Whole phrases for the TRANSLATE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Translate the current page' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         translate this page, translate webpage
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the TRANSLATE Pedal's 'google chrome' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Translate the current page' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -245,7 +245,7 @@
+       </message>
+ 
+       <!-- Pedal #6: UPDATE_CHROME -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_UPDATE_CHROME" is_accessibility_with_no_ui="true" desc="Whole phrases for the UPDATE_CHROME Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Update Chrome' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_UPDATE_CHROME" is_accessibility_with_no_ui="true" desc="Whole phrases for the UPDATE_CHROME Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Update Chrome' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         update chrome, upgrade browser
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the UPDATE_CHROME Pedal's 'google chrome' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Update Chrome' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -256,7 +256,7 @@
+       </message>
+ 
+       <!-- Pedal #7: RUN_CHROME_SAFETY_CHECK -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_REQUIRED_RUN_CHROME_SAFETY_CHECK" is_accessibility_with_no_ui="true" desc="Whole phrases for the RUN_CHROME_SAFETY_CHECK Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Run a Safety Check in Chrome settings' via chrome://settings/safetyCheck?activateSafetyCheck but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_REQUIRED_RUN_CHROME_SAFETY_CHECK" is_accessibility_with_no_ui="true" desc="Whole phrases for the RUN_CHROME_SAFETY_CHECK Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Run a Safety Check in Chrome settings' via chrome://settings/safetyCheck?activateSafetyCheck but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         run chrome safety check, run safety check
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_OPTIONAL_ACTIVATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the RUN_CHROME_SAFETY_CHECK Pedal's 'activate' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Run a Safety Check in Chrome settings' via chrome://settings/safetyCheck?activateSafetyCheck but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -273,7 +273,7 @@
+       </message>
+ 
+       <!-- Pedal #8: MANAGE_SECURITY_SETTINGS -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ONE_REQUIRED_MANAGE_SECURITY_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SECURITY_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your Safe Browsing and more in Chrome settings' via chrome://settings/security but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ONE_REQUIRED_MANAGE_SECURITY_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SECURITY_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your Safe Browsing and more in Chrome settings' via chrome://settings/security but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         manage security settings
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ANY_OPTIONAL_GOOGLE_CHROME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_SECURITY_SETTINGS Pedal's 'google chrome' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage your Safe Browsing and more in Chrome settings' via chrome://settings/security but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -287,7 +287,7 @@
+       </message>
+ 
+       <!-- Pedal #9: MANAGE_COOKIES -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ONE_REQUIRED_CHROME_COOKIE_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_COOKIES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your cookie preferences in Chrome settings' via chrome://settings/cookies but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ONE_REQUIRED_CHROME_COOKIE_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_COOKIES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your cookie preferences in Chrome settings' via chrome://settings/cookies but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         chrome cookie settings, cookies use, disallow all third-party cookies, manage cookie settings, manage cookies
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ONE_REQUIRED_COOKIE_SETTINGS" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_COOKIES Pedal's 'cookie settings' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your cookie preferences in Chrome settings' via chrome://settings/cookies but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -301,7 +301,7 @@
+       </message>
+ 
+       <!-- Pedal #10: MANAGE_ADDRESSES -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_ADD_ADDRESS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_ADDRESSES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Add and manage addresses in Chrome settings' via chrome://settings/addresses but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_ADD_ADDRESS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_ADDRESSES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Add and manage addresses in Chrome settings' via chrome://settings/addresses but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         add address, change shipping address, edit addresses, manage addresses
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_CONTROL" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_ADDRESSES Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Add and manage addresses in Chrome settings' via chrome://settings/addresses but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -315,7 +315,7 @@
+       </message>
+ 
+       <!-- Pedal #11: MANAGE_SYNC -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ONE_REQUIRED_CHANGE_CHROME_BROWSER_SYNC_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SYNC Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage what info you sync in Chrome settings' via chrome://settings/syncSetup/advanced but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ONE_REQUIRED_CHANGE_CHROME_BROWSER_SYNC_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SYNC Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage what info you sync in Chrome settings' via chrome://settings/syncSetup/advanced but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         change chrome browser sync settings, change chrome sync, edit sync, edit sync settings, manage sync
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ONE_REQUIRED_SYNC_SETTINGS" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_SYNC Pedal's 'sync settings' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage what info you sync in Chrome settings' via chrome://settings/syncSetup/advanced but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -326,7 +326,7 @@
+       </message>
+ 
+       <!-- Pedal #12: MANAGE_SITE_SETTINGS -->
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ONE_REQUIRED_ADJUST_SITE_PERMISSIONS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SITE_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage permissions and data stored across sites in Chrome settings' via chrome://settings/content but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ONE_REQUIRED_ADJUST_SITE_PERMISSIONS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_SITE_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage permissions and data stored across sites in Chrome settings' via chrome://settings/content but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         adjust site permissions, change permissions, control site settings, manage site settings, site settings chrome
+       </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ONE_REQUIRED_SITE_PERMISSIONS" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_SITE_SETTINGS Pedal's 'site permissions' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage permissions and data stored across sites in Chrome settings' via chrome://settings/content but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -337,147 +337,147 @@
        </message>
  
        <!-- Pedal #13: CREATE_GOOGLE_DOC -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_GOOGLE_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_GOOGLE_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_CREATE_GOOGLE_DOC" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_DOC Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_CREATE_GOOGLE_DOC" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_DOC Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google doc, make new google doc, open google document
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_GOOGLE_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_GOOGLE_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          google workspace, google chrome, workspace, browser, g suite, google, chrome, gsuite
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_DOCUMENT" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'document' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'document' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_DOCUMENT" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'document' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'document' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_DOCUMENT" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'document' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.google.com/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_DOCUMENT" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_DOC Pedal's 'document' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Doc quickly (like doc.new)' via https://docs.9oo91e.qjz9zk/document/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          document, doc
        </message>
  
        <!-- Pedal #14: CREATE_GOOGLE_SHEET -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_CREATE_GOOGLE_SHEET" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SHEET Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_CREATE_GOOGLE_SHEET" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SHEET Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google sheet, create workspace spreadsheet, new google sheet, start new google sheet
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_GOOGLE_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_GOOGLE_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_GOOGLE_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_GOOGLE_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'google workspace' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          google workspace, google chrome, workspace, browser, g suite, google, chrome
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_SPREADSHEET" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'spreadsheet' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'spreadsheet' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_SPREADSHEET" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'spreadsheet' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'spreadsheet' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_SPREADSHEET" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'spreadsheet' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_SPREADSHEET" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SHEET Pedal's 'spreadsheet' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Sheet quickly (like sheet.new)' via https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          spreadsheet, sheets, sheet, trix
        </message>
  
        <!-- Pedal #15: CREATE_GOOGLE_SLIDE -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'create' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'create' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE_GOOGLE_SLIDE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SLIDE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE_GOOGLE_SLIDE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SLIDE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google slide, make new deck, new google presentation, start google preso
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'create' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'create' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_PRESENTATION" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'presentation' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'presentation' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_PRESENTATION" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'presentation' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'presentation' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_PRESENTATION" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'presentation' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_PRESENTATION" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'presentation' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          presentation, slides, slide, preso, deck
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.google.com/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SLIDE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create new Google Slides quickly (like slide.new)' via https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          workspace, browser, g suite, google, chrome
        </message>
  
        <!-- Pedal #16: CREATE_GOOGLE_CALENDAR_EVENT -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_SCHEDULE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'schedule' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'schedule' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_SCHEDULE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'schedule' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'schedule' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_CREATE_GOOGLE_CAL_INVITE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_CREATE_GOOGLE_CAL_INVITE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google cal invite, create google calendar event, create new cal invite, new cal event, new google calendar invite
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_SCHEDULE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'schedule' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_SCHEDULE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'schedule' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          schedule, create, start, open, make, new, add
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          workspace, calendar, browser, g suite, google, chrome, cal
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_MEETING" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'meeting' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'meeting' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_MEETING" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'meeting' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'meeting' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_MEETING" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'meeting' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_MEETING" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_CALENDAR_EVENT Pedal's 'meeting' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Calendar event quickly (like cal.new)' via https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          meeting, invite, event
        </message>
  
        <!-- Pedal #17: CREATE_GOOGLE_SITE -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_CREATE_GOOGLE_SITE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SITE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_CREATE_GOOGLE_SITE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_SITE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google site, make google website, new google site, open new google site
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          workspace, browser, g suite, google, chrome
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_WEBSITE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'website' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'website' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_WEBSITE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'website' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'website' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_WEBSITE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'website' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.google.com/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_WEBSITE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_SITE Pedal's 'website' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Site quickly (like site.new)' via https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          website, site
        </message>
  
        <!-- Pedal #18: CREATE_GOOGLE_KEEP_NOTE -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_CREATE_GOOGLE_KEEP_NOTE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_KEEP_NOTE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_CREATE_GOOGLE_KEEP_NOTE" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_KEEP_NOTE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google keep note, create google note, make new google keep note, new google note, start google note
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          workspace, browser, g suite, google, chrome, keep
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_NOTES" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'notes' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'notes' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_NOTES" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'notes' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'notes' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_NOTES" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'notes' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_NOTES" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_KEEP_NOTE Pedal's 'notes' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Keep note quickly (like keep.new)' via https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          notes, note
        </message>
  
        <!-- Pedal #19: CREATE_GOOGLE_FORM -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_CREATE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'create' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_CREATE_GOOGLE_FORM" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_FORM Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_CREATE_GOOGLE_FORM" is_accessibility_with_no_ui="true" desc="Whole phrases for the CREATE_GOOGLE_FORM Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         create google form, make new google form, new google form, start google survey
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_CREATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'create' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          create, start, open, make, new
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_WORKSPACE" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'workspace' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_WORKSPACE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'workspace' group. To trigger, ANY number of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          workspace, browser, g suite, chrome, google
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_SURVEY" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'survey' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'survey' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_SURVEY" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'survey' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'survey' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_SURVEY" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'survey' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.google.com/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_SURVEY" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CREATE_GOOGLE_FORM Pedal's 'survey' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Create a new Google Form quickly (like form.new)' via https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          survey, forms, form, quiz
        </message>
  
        <!-- Pedal #21: SEE_CHROME_TIPS -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_OPTIONAL_MAKE_THE_MOST_OF" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'make the most of' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'make the most of' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_OPTIONAL_MAKE_THE_MOST_OF" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'make the most of' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'make the most of' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_CHROME_FEATURES" is_accessibility_with_no_ui="true" desc="Whole phrases for the SEE_CHROME_TIPS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_CHROME_FEATURES" is_accessibility_with_no_ui="true" desc="Whole phrases for the SEE_CHROME_TIPS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         chrome features, learn google chrome features, new google chrome features, see chrome tips
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_OPTIONAL_MAKE_THE_MOST_OF" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'make the most of' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_OPTIONAL_MAKE_THE_MOST_OF" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'make the most of' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          make the most of, understand, explore, learn, visit, see
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          browser, google
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_NEW_CHROME_FEATURES" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'new chrome features' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'new chrome features' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_NEW_CHROME_FEATURES" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'new chrome features' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'new chrome features' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_NEW_CHROME_FEATURES" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'new chrome features' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.google.com/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_NEW_CHROME_FEATURES" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SEE_CHROME_TIPS Pedal's 'new chrome features' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Learn about new Chrome features' via https://www.9oo91e.qjz9zk/chrome/tips/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          new chrome features, chrome tips center, chrome features, chrome tips
        </message>
  
        <!-- Pedal #22: MANAGE_GOOGLE_ACCOUNT -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_GOOGLE_ACCOUNT" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'google account' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google account' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_GOOGLE_ACCOUNT" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'google account' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google account' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL_MY_GOOGLE_ACCOUNT" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_GOOGLE_ACCOUNT Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL_MY_GOOGLE_ACCOUNT" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_GOOGLE_ACCOUNT Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         control my google account, fix google account, manage google account, manage my google account
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_GOOGLE_ACCOUNT" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'google account' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_GOOGLE_ACCOUNT" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'google account' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          google account
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          browser, chrome
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'control' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'control' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.google.com/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_ACCOUNT Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage your Google Account' via https://myaccount.9oo91e.qjz9zk/ but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          control, manage, adjust, fix
        </message>
  
        <!-- Pedal #24: CHANGE_GOOGLE_PASSWORD -->
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_GOOGLE_ACCOUNT_PASSWORD" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'google account password' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google account password' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_GOOGLE_ACCOUNT_PASSWORD" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'google account password' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'google account password' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE_GMAIL_PASSWORD" is_accessibility_with_no_ui="true" desc="Whole phrases for the CHANGE_GOOGLE_PASSWORD Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE_GMAIL_PASSWORD" is_accessibility_with_no_ui="true" desc="Whole phrases for the CHANGE_GOOGLE_PASSWORD Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
+         change gmail password, change my gmail password, google password change, reset gmail account password
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_GOOGLE_ACCOUNT_PASSWORD" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'google account password' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_GOOGLE_ACCOUNT_PASSWORD" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'google account password' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          google account password, gmail account password, google password, gmail password
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ANY_OPTIONAL_BROWSER" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'browser' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ANY_OPTIONAL_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'browser' group. To trigger, ANY number of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          browser, chrome, google
        </message>
--      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'change' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'change' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
-+      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'change' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Do not translate the list word for word; rather, list the various ways users typing in the target language might describe this synonym group's concept when trying to perform this Pedal's action. Each Pedal has a few such groups, some required and some optional, and this list represents just one (the 'change' group). Being able to identify presence of specific concepts in the query enables the Pedals system to help the user perform the desired action.">
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'change' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.google.com/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CHANGE_GOOGLE_PASSWORD Pedal's 'change' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Change the password for your Google Account' via https://myaccount.9oo91e.qjz9zk/signinoptions/password but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
          change, update, reset, fix
        </message>
  
@@ -16680,85 +15927,142 @@ diff --git a/components/omnibox/resources/omnibox_pedal_synonyms.grd b/component
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CLOSE_INCOGNITO_WINDOWS_ONE_REQUIRED_CLOSE_INCOGNITO_WINDOW" is_accessibility_with_no_ui="true" desc="Whole phrases for the CLOSE_INCOGNITO_WINDOWS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Close incognito browser windows' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          close incognito window, end incognito
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CLOSE_INCOGNITO_WINDOWS_ONE_REQUIRED_DELETE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CLOSE_INCOGNITO_WINDOWS Pedal's 'delete' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Close incognito browser windows' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -488,7 +488,7 @@
+       </message>
  
        <!-- Pedal #27: PLAY_CHROME_DINO_GAME -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_PLAY_CHROME_DINO_GAME_ONE_REQUIRED_CHROME_DINO" is_accessibility_with_no_ui="true" desc="Whole phrases for the PLAY_CHROME_DINO_GAME Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Play the Dino Run game in Chrome' via chrome://dino but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_PLAY_CHROME_DINO_GAME_ONE_REQUIRED_CHROME_DINO" is_accessibility_with_no_ui="true" desc="Whole phrases for the PLAY_CHROME_DINO_GAME Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Play the Dino Run game in Chrome' via chrome://dino but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          chrome dino, dino game, play dino run
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_PLAY_CHROME_DINO_GAME_ONE_REQUIRED_PLAY_CHROME_DINO_GAME" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the PLAY_CHROME_DINO_GAME Pedal's 'play chrome dino game' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Play the Dino Run game in Chrome' via chrome://dino but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -496,26 +496,26 @@
+       </message>
  
        <!-- Pedal #28: FIND_MY_PHONE -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_FIND_LOST_PHONE" is_accessibility_with_no_ui="true" desc="Whole phrases for the FIND_MY_PHONE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Locate a lost device' via https://myaccount.google.com/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_FIND_LOST_PHONE" is_accessibility_with_no_ui="true" desc="Whole phrases for the FIND_MY_PHONE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Locate a lost device' via https://myaccount.9oo91e.qjz9zk/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          find lost phone, find my device
        </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_HELP_ME_LOCATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the FIND_MY_PHONE Pedal's 'help me locate' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Locate a lost device' via https://myaccount.google.com/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_HELP_ME_LOCATE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the FIND_MY_PHONE Pedal's 'help me locate' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Locate a lost device' via https://myaccount.9oo91e.qjz9zk/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+         help me locate, help me find, help to find, help locate, help find, identify, where is, locate, find
+       </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_LOST_DEVICE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the FIND_MY_PHONE Pedal's 'lost device' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Locate a lost device' via https://myaccount.google.com/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_LOST_DEVICE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the FIND_MY_PHONE Pedal's 'lost device' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Locate a lost device' via https://myaccount.9oo91e.qjz9zk/find-your-phone but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+         lost device, lost phone, device, phone
+       </message>
  
        <!-- Pedal #29: MANAGE_GOOGLE_PRIVACY -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_CHANGE_GOOGLE_PRIVACY_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_GOOGLE_PRIVACY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage Google privacy (control the use of their data)' via https://myaccount.google.com/data-and-privacy but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_CHANGE_GOOGLE_PRIVACY_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_GOOGLE_PRIVACY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage Google privacy (control the use of their data)' via https://myaccount.9oo91e.qjz9zk/data-and-privacy but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          change google privacy settings, manage google privacy
        </message>
+-      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_MANAGE_GOOGLE_PRIVACY_SETTINGS" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_PRIVACY Pedal's 'manage google privacy settings' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage Google privacy (control the use of their data)' via https://myaccount.google.com/data-and-privacy but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
++      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_MANAGE_GOOGLE_PRIVACY_SETTINGS" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_GOOGLE_PRIVACY Pedal's 'manage google privacy settings' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Manage Google privacy (control the use of their data)' via https://myaccount.9oo91e.qjz9zk/data-and-privacy but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+         manage google privacy settings, change google privacy settings, edit google privacy settings, change my privacy on google, edit my privacy on google, google privacy settings, google privacy controls, google account privacy, google privacy checkup, manage google privacy, change google privacy, edit google privacy, google privacy
+       </message>
  
        <!-- Pedal #31: MANAGE_CHROME_SETTINGS -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_REQUIRED_CHANGE_CHROME_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Get to Chrome settings' via chrome://settings but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_REQUIRED_CHANGE_CHROME_SETTINGS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_SETTINGS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Get to Chrome settings' via chrome://settings but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          change chrome settings, manage settings
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_OPTIONAL_CONTROL" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_CHROME_SETTINGS Pedal's 'control' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Get to Chrome settings' via chrome://settings but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -526,7 +526,7 @@
+       </message>
  
        <!-- Pedal #32: MANAGE_CHROME_DOWNLOADS -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_MANAGE_CHROME_DOWNLOADS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_DOWNLOADS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Access downloaded files in Chrome' via chrome://downloads but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_MANAGE_CHROME_DOWNLOADS" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_DOWNLOADS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Access downloaded files in Chrome' via chrome://downloads but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          manage chrome downloads, view downloads
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_CONTROL" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_CHROME_DOWNLOADS Pedal's 'control' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Access downloaded files in Chrome' via chrome://downloads but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -537,7 +537,7 @@
+       </message>
  
        <!-- Pedal #33: VIEW_CHROME_HISTORY -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_SEE_CHROME_HISTORY" is_accessibility_with_no_ui="true" desc="Whole phrases for the VIEW_CHROME_HISTORY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'See the full Chrome history page' via chrome://history but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_SEE_CHROME_HISTORY" is_accessibility_with_no_ui="true" desc="Whole phrases for the VIEW_CHROME_HISTORY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'See the full Chrome history page' via chrome://history but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          see chrome history, view browsing history
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_REVISIT" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the VIEW_CHROME_HISTORY Pedal's 'revisit' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'See the full Chrome history page' via chrome://history but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -548,7 +548,7 @@
+       </message>
  
        <!-- Pedal #34: SHARE_THIS_PAGE -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SHARE_THIS_PAGE_ONE_REQUIRED_SHARE_THIS_PAGE" is_accessibility_with_no_ui="true" desc="Whole phrases for the SHARE_THIS_PAGE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Learn about and use the Sharing Hub' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SHARE_THIS_PAGE_ONE_REQUIRED_SHARE_THIS_PAGE" is_accessibility_with_no_ui="true" desc="Whole phrases for the SHARE_THIS_PAGE Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Learn about and use the Sharing Hub' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          share this page, share this tab
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SHARE_THIS_PAGE_ONE_REQUIRED_SHARE_LINK_WITH_QR_CODE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SHARE_THIS_PAGE Pedal's 'share link with qr code' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Learn about and use the Sharing Hub' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -556,7 +556,7 @@
+       </message>
  
        <!-- Pedal #35: MANAGE_CHROME_ACCESSIBILITY -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROME_ACCESSIBILITY" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_ACCESSIBILITY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Personalize Chrome based on abilities and preferences for assistive technology' via chrome://settings/accessibility but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROME_ACCESSIBILITY" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_ACCESSIBILITY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Personalize Chrome based on abilities and preferences for assistive technology' via chrome://settings/accessibility but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          customize chrome accessibility, manage accessibility settings
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_OPTIONAL_CUSTOMIZE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_CHROME_ACCESSIBILITY Pedal's 'customize' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Personalize Chrome based on abilities and preferences for assistive technology' via chrome://settings/accessibility but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -567,7 +567,7 @@
+       </message>
  
        <!-- Pedal #36: CUSTOMIZE_CHROME_FONTS -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_REQUIRED_CHANGE_BROWSER_FONT" is_accessibility_with_no_ui="true" desc="Whole phrases for the CUSTOMIZE_CHROME_FONTS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Adjust font sizes and font types in Chrome' via chrome://settings/fonts but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_REQUIRED_CHANGE_BROWSER_FONT" is_accessibility_with_no_ui="true" desc="Whole phrases for the CUSTOMIZE_CHROME_FONTS Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Adjust font sizes and font types in Chrome' via chrome://settings/fonts but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          change browser font, chrome fonts
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_OPTIONAL_CUSTOMIZE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CUSTOMIZE_CHROME_FONTS Pedal's 'customize' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Adjust font sizes and font types in Chrome' via chrome://settings/fonts but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -581,7 +581,7 @@
+       </message>
  
        <!-- Pedal #37: MANAGE_CHROME_THEMES -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_REQUIRED_CUSTOMIZE_CHROME_APPEARANCE" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_THEMES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Change themes in Chrome' via chrome://new-tab-page/?customize=backgrounds but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_REQUIRED_CUSTOMIZE_CHROME_APPEARANCE" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROME_THEMES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Change themes in Chrome' via chrome://new-tab-page/?customize=backgrounds but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          customize chrome appearance, manage chrome themes
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_OPTIONAL_CUSTOMIZE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_CHROME_THEMES Pedal's 'customize' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Change themes in Chrome' via chrome://new-tab-page/?customize=backgrounds but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -592,7 +592,7 @@
+       </message>
  
        <!-- Pedal #38: CUSTOMIZE_SEARCH_ENGINES -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_REQUIRED_ADD_CUSTOM_SEARCH" is_accessibility_with_no_ui="true" desc="Whole phrases for the CUSTOMIZE_SEARCH_ENGINES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage search engines in Chrome' via chrome://settings/searchEngines but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_REQUIRED_ADD_CUSTOM_SEARCH" is_accessibility_with_no_ui="true" desc="Whole phrases for the CUSTOMIZE_SEARCH_ENGINES Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage search engines in Chrome' via chrome://settings/searchEngines but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          add custom search, manage search engines, search engines
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_OPTIONAL_CUSTOMIZE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the CUSTOMIZE_SEARCH_ENGINES Pedal's 'customize' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage search engines in Chrome' via chrome://settings/searchEngines but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -606,7 +606,7 @@
+       </message>
  
        <!-- Pedal #39: MANAGE_CHROMEOS_ACCESSIBILITY -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROMEOS_ACCESSIBILITY" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROMEOS_ACCESSIBILITY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage accessibility settings in ChromeOS settings' via chrome://os-settings/manageAccessibility but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROMEOS_ACCESSIBILITY" is_accessibility_with_no_ui="true" desc="Whole phrases for the MANAGE_CHROMEOS_ACCESSIBILITY Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Manage accessibility settings in ChromeOS settings' via chrome://os-settings/manageAccessibility but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          customize chromeos accessibility, manage accessibility settings
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_OPTIONAL_CUSTOMIZE" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the MANAGE_CHROMEOS_ACCESSIBILITY Pedal's 'customize' group. To trigger, exactly ONE of this group is OPTIONAL. Context: The user is typing into the omnibox to find a way to 'Manage accessibility settings in ChromeOS settings' via chrome://os-settings/manageAccessibility but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+@@ -617,7 +617,7 @@
+       </message>
  
        <!-- Pedal #40: SET_CHROME_AS_DEFAULT_BROWSER -->
 -      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_REQUIRED_ALWAYS_OPEN_LINKS_IN_CHROME" is_accessibility_with_no_ui="true" desc="Whole phrases for the SET_CHROME_AS_DEFAULT_BROWSER Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Set Chrome as the system's default browser in iOS settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.google.com/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
 +      <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_REQUIRED_ALWAYS_OPEN_LINKS_IN_CHROME" is_accessibility_with_no_ui="true" desc="Whole phrases for the SET_CHROME_AS_DEFAULT_BROWSER Pedal's solitary triggering group. Context: The user is typing into the search bar to find a way to 'Set Chrome as the system's default browser in iOS settings' but the user is not sure how to describe this action. The input text is scanned for any phrases in this comma-separated list to determine whether the action button should appear. Do not translate the list 1:1 phrase for phrase. List several (~3-15) queries that users typing in the target language might search to perform this Pedal's action. Delimit each separate query phrase with a comma, including variations for the gender, plurals, etc. For other instructions, please see doc: https://docs.9oo91e.qjz9zk/document/d/1cggNrwZvEbt9Hv_zMryByvgR8Vr4yal_V8Rxg1AOugw/edit">
          always open links in chrome, always use chrome, chrome as default, default browser, delete safari, how to make chrome default browser, main browser, make chrome default, make chrome default browser, make chrome my default browser, open links in chrome, pick chrome as default browser, primary browser, remove safari, search in chrome, set chrome as default, set chrome as default browser, standard browser
        </message>
+       <message name="IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_REQUIRED_HOW_TO_MAKE_CHROME_MY_DEFAULT_BROWSER" translateable="false" is_accessibility_with_no_ui="true" desc="Synonyms for the SET_CHROME_AS_DEFAULT_BROWSER Pedal's 'how to make chrome my default browser' group. To trigger, exactly ONE of this group is REQUIRED. Context: The user is typing into the omnibox to find a way to 'Set Chrome as the system's default browser in iOS settings' but the user is not sure how to describe this action. The input text is scanned for any words included in this synonym group to determine whether this concept is present in the query. Note: This string is not translated; it's used for triggering in English only.">
+diff --git a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc
+--- a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc
++++ b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc
+@@ -28,7 +28,7 @@ namespace optimization_guide {
+ namespace {
  
+ const char kPageTopicsModelMetadataTypeUrl[] =
+-    "type.googleapis.com/"
++    "type.9oo91eapis.qjz9zk/"
+     "google.internal.chrome.optimizationguide.v1.PageTopicsModelMetadata";
+ 
+ // The current version the client supports for the topics model. This
 diff --git a/components/optimization_guide/core/optimization_guide_constants.cc b/components/optimization_guide/core/optimization_guide_constants.cc
 --- a/components/optimization_guide/core/optimization_guide_constants.cc
 +++ b/components/optimization_guide/core/optimization_guide_constants.cc
@@ -16790,7 +16094,7 @@ diff --git a/components/optimization_guide/core/page_entities_model_executor_imp
 diff --git a/components/optimization_guide/core/prediction_manager.cc b/components/optimization_guide/core/prediction_manager.cc
 --- a/components/optimization_guide/core/prediction_manager.cc
 +++ b/components/optimization_guide/core/prediction_manager.cc
-@@ -148,19 +148,19 @@ bool ShouldFetchModels(bool off_the_record, bool component_updates_enabled) {
+@@ -150,19 +150,19 @@ bool ShouldFetchModels(bool off_the_record, bool component_updates_enabled) {
  // Returns whether the model metadata proto is on the server allowlist.
  bool IsModelMetadataTypeOnServerAllowlist(const proto::Any& model_metadata) {
    return model_metadata.type_url() ==
@@ -16968,7 +16272,7 @@ diff --git a/components/password_manager/core/browser/password_manager_constants
 diff --git a/components/password_manager/core/browser/password_reuse_detector.cc b/components/password_manager/core/browser/password_reuse_detector.cc
 --- a/components/password_manager/core/browser/password_reuse_detector.cc
 +++ b/components/password_manager/core/browser/password_reuse_detector.cc
-@@ -323,7 +323,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() {
+@@ -338,7 +338,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() {
        *gaia_password_hash_data_list_, [](const PasswordHashData& data) {
          std::string email =
              CanonicalizeUsername(data.username, data.is_gaia_password);
@@ -17148,7 +16452,7 @@ diff --git a/components/permissions/constants.cc b/components/permissions/consta
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -50,33 +50,33 @@ const char kPermissionBlockedKillSwitchMessage[] =
+@@ -52,33 +52,33 @@ const char kPermissionBlockedKillSwitchMessage[] =
  const char kPermissionBlockedRepeatedDismissalsMessage[] =
      "%s permission has been blocked as the user has dismissed the permission "
      "prompt several times. This can be reset in Site Settings. See "
@@ -17190,7 +16494,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -47,28 +47,28 @@ const char kAbusiveNotificationRequestsEnforcementMessage[] =
+@@ -48,28 +48,28 @@ const char kAbusiveNotificationRequestsEnforcementMessage[] =
      "the site tends to show permission requests that mislead, trick, or force "
      "users into allowing notifications. You should fix the issues as soon as "
      "possible and submit your site for another review. Learn more at "
@@ -17394,7 +16698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'group',
        'caption': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types''',
        'desc': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types.''',
-@@ -1346,7 +1346,7 @@
+@@ -1350,7 +1350,7 @@
      },
      {
        'name': 'FirstPartySets',
@@ -17403,7 +16707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'group',
        'caption': '''First-Party Sets Settings''',
        'desc': '''Controls policies for the First-Party Sets feature.''',
-@@ -1356,7 +1356,7 @@
+@@ -1360,7 +1360,7 @@
      },
      {
        'name': 'HomepageLocation',
@@ -17412,7 +16716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'],
-@@ -1366,7 +1366,7 @@
+@@ -1370,7 +1370,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -17421,7 +16725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 1,
        'caption': '''Configure the home page URL''',
        'tags': [],
-@@ -1383,7 +1383,7 @@
+@@ -1387,7 +1387,7 @@
      },
      {
        'name': 'HomepageIsNewTabPage',
@@ -17430,7 +16734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
-@@ -1415,7 +1415,7 @@
+@@ -1419,7 +1419,7 @@
      },
      {
        'name': 'NewTabPageLocation',
@@ -17439,7 +16743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:58-', 'chrome_os:58-', 'ios:99-'],
-@@ -1424,7 +1424,7 @@
+@@ -1428,7 +1428,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -17448,7 +16752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 360,
        'caption': '''Configure the New Tab page URL''',
        'tags': [],
-@@ -1443,7 +1443,7 @@
+@@ -1447,7 +1447,7 @@
      },
      {
        'name': 'DefaultBrowserSettingEnabled',
@@ -17457,7 +16761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'],
-@@ -1470,12 +1470,12 @@
+@@ -1474,12 +1474,12 @@
  
        Leaving the policy unset means <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> lets users control whether it's the default and, if not, whether user notifications should appear.
  
@@ -17472,7 +16776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.win:8-'],
-@@ -1498,7 +1498,7 @@
+@@ -1502,7 +1502,7 @@
      },
      {
        'name': 'AlternateErrorPagesEnabled',
@@ -17481,7 +16785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -1532,7 +1532,7 @@
+@@ -1536,7 +1536,7 @@
      },
      {
        'name': 'SearchSuggestEnabled',
@@ -17490,7 +16794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -1569,7 +1569,7 @@
+@@ -1573,7 +1573,7 @@
      },
      {
        'name': 'NativeWindowOcclusionEnabled',
@@ -17499,7 +16803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -1607,7 +1607,7 @@
+@@ -1611,7 +1611,7 @@
      },
      {
        'name': 'WindowOcclusionEnabled',
@@ -17508,7 +16812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -1643,7 +1643,7 @@
+@@ -1647,7 +1647,7 @@
      },
      {
        'name': 'DnsPrefetchingEnabled',
@@ -17517,7 +16821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'],
-@@ -1669,7 +1669,7 @@
+@@ -1673,7 +1673,7 @@
      },
      {
        'name': 'NetworkPredictionOptions',
@@ -17526,7 +16830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -1710,7 +1710,7 @@
+@@ -1714,7 +1714,7 @@
      },
      {
        'name': 'WPADQuickCheckEnabled',
@@ -17535,7 +16839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ],
-@@ -1742,7 +1742,7 @@
+@@ -1746,7 +1746,7 @@
      },
      {
        'name': 'DisableSpdy',
@@ -17544,7 +16848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'],
-@@ -1767,7 +1767,7 @@
+@@ -1771,7 +1771,7 @@
      },
      {
        'name': 'DisabledSchemes',
@@ -17553,7 +16857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -1794,7 +1794,7 @@
+@@ -1798,7 +1798,7 @@
      },
      {
        'name': 'GetDisplayMediaSetSelectAllScreensAllowedForUrls',
@@ -17562,7 +16866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -1816,7 +1816,7 @@
+@@ -1820,7 +1820,7 @@
      },
      {
        'name': 'GloballyScopeHTTPAuthCacheEnabled',
@@ -17571,7 +16875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -1851,7 +1851,7 @@
+@@ -1855,7 +1855,7 @@
      },
      {
        'name': 'DNSInterceptionChecksEnabled',
@@ -17580,7 +16884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -1883,7 +1883,7 @@
+@@ -1887,7 +1887,7 @@
      },
      {
        'name': 'IntranetRedirectBehavior',
@@ -17589,7 +16893,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -1931,7 +1931,7 @@
+@@ -1935,7 +1935,7 @@
      },
      {
        'name': 'Http09OnNonDefaultPortsEnabled',
@@ -17598,7 +16902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:54-77', 'chrome_os:54-77'],
-@@ -1966,7 +1966,7 @@
+@@ -1970,7 +1970,7 @@
      },
      {
        'name': 'JavascriptEnabled',
@@ -17607,7 +16911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:30-'],
-@@ -2000,7 +2000,7 @@
+@@ -2004,7 +2004,7 @@
      },
      {
        'name': 'IncognitoEnabled',
@@ -17616,7 +16920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:11-', 'chrome_os:11-', 'android:30-'],
-@@ -2034,7 +2034,7 @@
+@@ -2038,7 +2038,7 @@
      },
      {
        'name': 'IncognitoModeAvailability',
@@ -17625,7 +16929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -2088,7 +2088,7 @@
+@@ -2092,7 +2092,7 @@
      },
      {
        'name': 'SavingBrowserHistoryDisabled',
@@ -17634,7 +16938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -2122,7 +2122,7 @@
+@@ -2126,7 +2126,7 @@
      },
      {
        'name': 'AllowDeletingBrowserHistory',
@@ -17643,7 +16947,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:57-', 'chrome_os:57-'],
-@@ -2151,7 +2151,7 @@
+@@ -2155,7 +2155,7 @@
      },
      {
        'name': 'HistoryClustersVisible',
@@ -17651,8 +16955,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
 +      'owners': ['file://components/history_clusters/OWNERS', 'mahmadi@ch40m1um.qjz9zk', 'chrome-journeys@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-       'supported_on': ['chrome.*:97-', 'chrome_os:97-'],
-@@ -2193,7 +2193,7 @@
+       'supported_on': ['chrome.*:97-', 'chrome_os:97-', 'android:107-'],
+@@ -2197,7 +2197,7 @@
      },
      {
        'name': 'AllowDinosaurEasterEgg',
@@ -17661,7 +16965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:48-', 'chrome.*:48-'],
-@@ -2223,7 +2223,7 @@
+@@ -2227,7 +2227,7 @@
      },
      {
        'name': 'ForceLegacyDefaultReferrerPolicy',
@@ -17670,7 +16974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-87', 'chrome_os:80-87'],
-@@ -2256,7 +2256,7 @@
+@@ -2260,7 +2260,7 @@
      },
      {
        'name': 'RemoteAccessClientFirewallTraversal',
@@ -17679,7 +16983,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:14-16', 'chrome_os:14-16'],
-@@ -2279,7 +2279,7 @@
+@@ -2283,7 +2283,7 @@
      },
      {
        'name': 'RemoteAccessHostClientDomain',
@@ -17688,7 +16992,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:22-', 'chrome_os:41-'],
-@@ -2297,7 +2297,7 @@
+@@ -2301,7 +2301,7 @@
      },
      {
        'name': 'RemoteAccessHostClientDomainList',
@@ -17697,7 +17001,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -2324,7 +2324,7 @@
+@@ -2328,7 +2328,7 @@
      },
      {
        'name': 'RemoteAccessHostFirewallTraversal',
@@ -17706,7 +17010,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:14-', 'chrome_os:41-'],
-@@ -2354,7 +2354,7 @@
+@@ -2358,7 +2358,7 @@
      },
      {
        'name': 'RemoteAccessHostDomain',
@@ -17715,7 +17019,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:22-', 'chrome_os:41-'],
-@@ -2372,7 +2372,7 @@
+@@ -2376,7 +2376,7 @@
      },
      {
        'name': 'RemoteAccessHostDomainList',
@@ -17724,7 +17028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -2399,7 +2399,7 @@
+@@ -2403,7 +2403,7 @@
      },
      {
        'name': 'RemoteAccessHostRequireTwoFactor',
@@ -17733,7 +17037,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:22-22'],
-@@ -2422,7 +2422,7 @@
+@@ -2426,7 +2426,7 @@
      },
      {
        'name': 'RemoteAccessHostTalkGadgetPrefix',
@@ -17742,7 +17046,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:22-75', 'chrome_os:41-75'],
-@@ -2438,17 +2438,17 @@
+@@ -2442,17 +2442,17 @@
        'tags': [],
        'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it.
  
@@ -17764,7 +17068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:23-'],
-@@ -2478,7 +2478,7 @@
+@@ -2482,7 +2482,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowClientPairing',
@@ -17773,7 +17077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:30-'],
-@@ -2508,7 +2508,7 @@
+@@ -2512,7 +2512,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowGnubbyAuth',
@@ -17782,7 +17086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:35-'],
-@@ -2541,7 +2541,7 @@
+@@ -2545,7 +2545,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowRelayedConnection',
@@ -17791,7 +17095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:36-', 'chrome_os:86-'],
-@@ -2571,7 +2571,7 @@
+@@ -2575,7 +2575,7 @@
      },
      {
        'name': 'RemoteAccessHostUdpPortRange',
@@ -17800,7 +17104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:36-', 'chrome_os:41-'],
-@@ -2593,7 +2593,7 @@
+@@ -2597,7 +2597,7 @@
      },
      {
        'name': 'RemoteAccessHostMatchUsername',
@@ -17809,7 +17113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.linux:25-', 'chrome.mac:25-'],
-@@ -2622,7 +2622,7 @@
+@@ -2626,7 +2626,7 @@
      },
      {
        'name': 'RemoteAccessHostTokenUrl',
@@ -17818,7 +17122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:28-'],
-@@ -2645,7 +2645,7 @@
+@@ -2649,7 +2649,7 @@
      },
      {
        'name': 'RemoteAccessHostTokenValidationUrl',
@@ -17827,7 +17131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:28-'],
-@@ -2666,7 +2666,7 @@
+@@ -2670,7 +2670,7 @@
      },
      {
        'name': 'RemoteAccessHostTokenValidationCertificateIssuer',
@@ -17836,7 +17140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:28-'],
-@@ -2685,7 +2685,7 @@
+@@ -2689,7 +2689,7 @@
      },
      {
        'name': 'RemoteAccessHostDebugOverridePolicies',
@@ -17845,7 +17149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:25-47','chrome_os:42-47'],
-@@ -2705,7 +2705,7 @@
+@@ -2709,7 +2709,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance',
@@ -17854,7 +17158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:55-'],
-@@ -2735,7 +2735,7 @@
+@@ -2739,7 +2739,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowFileTransfer',
@@ -17863,7 +17167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:74-'],
-@@ -2766,7 +2766,7 @@
+@@ -2770,7 +2770,7 @@
      },
      {
        'name': 'RemoteAccessHostEnableUserInterface',
@@ -17872,7 +17176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:88-'],
-@@ -2798,7 +2798,7 @@
+@@ -2802,7 +2802,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowRemoteAccessConnections',
@@ -17881,7 +17185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:89-'],
-@@ -2829,7 +2829,7 @@
+@@ -2833,7 +2833,7 @@
      },
      {
        'name': 'RemoteAccessHostMaximumSessionDurationMinutes',
@@ -17890,7 +17194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 30, 'maximum': 10080 },
        'supported_on': ['chrome.*:89-'],
-@@ -2850,7 +2850,7 @@
+@@ -2854,7 +2854,7 @@
      },
      {
        'name': 'RemoteAccessHostClipboardSizeBytes',
@@ -17899,7 +17203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 2147483647 },
        'supported_on': ['chrome.*:97-', 'chrome_os:97-'],
-@@ -2879,7 +2879,7 @@
+@@ -2883,7 +2883,7 @@
      },
      {
        'name': 'RemoteAccessHostAllowRemoteSupportConnections',
@@ -17908,7 +17212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:97-', 'chrome_os:97-'],
-@@ -2914,7 +2914,7 @@
+@@ -2918,7 +2918,7 @@
      },
      {
        'name': 'DeviceAllowMGSToStoreDisplayProperties',
@@ -17917,7 +17221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type' : 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:90-'],
-@@ -2941,7 +2941,7 @@
+@@ -2945,7 +2945,7 @@
      },
      {
        'name': 'PrintingEnabled',
@@ -17926,7 +17230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -2976,7 +2976,7 @@
+@@ -2980,7 +2980,7 @@
      },
      {
        'name': 'CloudPrintProxyEnabled',
@@ -17935,7 +17239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:17-'],
-@@ -3005,7 +3005,7 @@
+@@ -3009,7 +3009,7 @@
      },
      {
        'name': 'PrintingAllowedColorModes',
@@ -17944,7 +17248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3046,7 +3046,7 @@
+@@ -3050,7 +3050,7 @@
      },
      {
        'name': 'PrintingAllowedDuplexModes',
@@ -17953,7 +17257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3089,7 +3089,7 @@
+@@ -3093,7 +3093,7 @@
      },
      {
        'name': 'PrintingAllowedPinModes',
@@ -17962,7 +17266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3130,7 +3130,7 @@
+@@ -3134,7 +3134,7 @@
      },
      {
        'name': 'PrintingAllowedBackgroundGraphicsModes',
@@ -17971,7 +17275,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3172,7 +3172,7 @@
+@@ -3176,7 +3176,7 @@
+     },
+     {
+       'name': 'DevicePrintingClientNameTemplate',
+-      'owners': ['ust@google.com', 'srad@google.com'],
++      'owners': ['ust@9oo91e.qjz9zk', 'srad@9oo91e.qjz9zk'],
+       'type': 'string',
+       'schema': { 'type': 'string' },
+       'future_on': ['chrome_os'],
+@@ -3206,7 +3206,7 @@
      },
      {
        'name': 'PrintingColorDefault',
@@ -17980,7 +17293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3207,7 +3207,7 @@
+@@ -3241,7 +3241,7 @@
      },
      {
        'name': 'PrintingDuplexDefault',
@@ -17989,7 +17302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3248,7 +3248,7 @@
+@@ -3282,7 +3282,7 @@
      },
      {
        'name': 'PrintingPinDefault',
@@ -17998,7 +17311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3283,7 +3283,7 @@
+@@ -3317,7 +3317,7 @@
      },
      {
        'name': 'PrintingBackgroundGraphicsDefault',
@@ -18007,7 +17320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -3319,7 +3319,7 @@
+@@ -3353,7 +3353,7 @@
      },
      {
        'name': 'PrintingPaperSizeDefault',
@@ -18016,7 +17329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -3506,7 +3506,7 @@
+@@ -3540,7 +3540,7 @@
      },
      {
        'name': 'PrintingSendUsernameAndFilenameEnabled',
@@ -18025,7 +17338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:72-'],
-@@ -3535,7 +3535,7 @@
+@@ -3569,7 +3569,7 @@
      },
      {
        'name': 'PrintingMaxSheetsAllowed',
@@ -18034,7 +17347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 1 },
        'supported_on': ['chrome_os:84-'],
-@@ -3553,7 +3553,7 @@
+@@ -3587,7 +3587,7 @@
      },
      {
        'name': 'AppCacheForceEnabled',
@@ -18043,7 +17356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:84-95', 'chrome_os:84-95', 'android:84-95', 'webview_android:84-95'],
-@@ -3582,7 +3582,7 @@
+@@ -3616,7 +3616,7 @@
      },
      {
        'name': 'PrintJobHistoryExpirationPeriod',
@@ -18052,7 +17365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': -1 },
        'supported_on': ['chrome_os:79-'],
-@@ -3604,7 +3604,7 @@
+@@ -3638,7 +3638,7 @@
      },
      {
        'name': 'PrintingAPIExtensionsWhitelist',
@@ -18061,7 +17374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -3628,7 +3628,7 @@
+@@ -3662,7 +3662,7 @@
      },
      {
        'name': 'PrintingAPIExtensionsAllowlist',
@@ -18070,7 +17383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -3649,7 +3649,7 @@
+@@ -3683,7 +3683,7 @@
      },
      {
        'name': 'ForceSafeSearch',
@@ -18079,7 +17392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'],
-@@ -3683,7 +3683,7 @@
+@@ -3717,7 +3717,7 @@
      },
      {
        'name': 'ForceGoogleSafeSearch',
@@ -18088,7 +17401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'],
-@@ -3713,7 +3713,7 @@
+@@ -3747,7 +3747,7 @@
      },
      {
        'name': 'ForceYouTubeSafetyMode',
@@ -18097,7 +17410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'],
-@@ -3748,7 +3748,7 @@
+@@ -3782,7 +3782,7 @@
      },
      {
        'name': 'ForceYouTubeRestrict',
@@ -18106,7 +17419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -3793,7 +3793,7 @@
+@@ -3827,7 +3827,7 @@
      },
      {
        'name': 'SafeBrowsingEnabled',
@@ -18115,7 +17428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -3828,7 +3828,7 @@
+@@ -3862,7 +3862,7 @@
  
        If you set this policy, users can't change it or override the "Enable phishing and malware protection" setting in Chrome. If not set, "Enable phishing and malware protection" is set to True, but the user can change it.
  
@@ -18124,7 +17437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If the policy <ph name="SAFE_BROWSING_PROTECTION_LEVEL_POLICY_NAME">SafeBrowsingProtectionLevel</ph> is set, the value of the policy <ph name="SAFE_BROWSING_ENABLED_POLICY_NAME">SafeBrowsingEnabled</ph> is ignored.
  
-@@ -3836,7 +3836,7 @@
+@@ -3870,7 +3870,7 @@
      },
      {
        'name': 'SafeBrowsingProtectionLevel',
@@ -18133,7 +17446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -3887,12 +3887,12 @@
+@@ -3921,12 +3921,12 @@
  
        If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting.
  
@@ -18148,7 +17461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -3931,7 +3931,7 @@
+@@ -3965,7 +3965,7 @@
      },
      {
        'name': 'PasswordManagerEnabled',
@@ -18157,7 +17470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -3969,7 +3969,7 @@
+@@ -4003,7 +4003,7 @@
      },
      {
        'name': 'PasswordManagerAllowShowPasswords',
@@ -18166,7 +17479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-50', 'chrome_os:11-50'],
-@@ -3992,7 +3992,7 @@
+@@ -4026,7 +4026,7 @@
      },
      {
        'name': 'PasswordLeakDetectionEnabled',
@@ -18175,7 +17488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -4028,7 +4028,7 @@
+@@ -4062,7 +4062,7 @@
      },
      {
        'name': 'PasswordDismissCompromisedAlertEnabled',
@@ -18184,7 +17497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -4063,7 +4063,7 @@
+@@ -4097,7 +4097,7 @@
      },
      {
        'name': 'AutoFillEnabled',
@@ -18193,7 +17506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -4101,7 +4101,7 @@
+@@ -4135,7 +4135,7 @@
      },
      {
        'name': 'AutofillAddressEnabled',
@@ -18202,7 +17515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -4136,7 +4136,7 @@
+@@ -4170,7 +4170,7 @@
      },
      {
        'name': 'AutofillCreditCardEnabled',
@@ -18211,7 +17524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -4171,7 +4171,7 @@
+@@ -4205,7 +4205,7 @@
      },
      {
        'name': 'DisabledPlugins',
@@ -18220,7 +17533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4202,7 +4202,7 @@
+@@ -4236,7 +4236,7 @@
      },
      {
        'name': 'EnabledPlugins',
@@ -18229,7 +17542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4233,7 +4233,7 @@
+@@ -4267,7 +4267,7 @@
      },
      {
        'name': 'DisabledPluginsExceptions',
@@ -18238,7 +17551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4266,7 +4266,7 @@
+@@ -4300,7 +4300,7 @@
      },
      {
        'name': 'AlwaysOpenPdfExternally',
@@ -18247,7 +17560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:55-'],
-@@ -4298,7 +4298,7 @@
+@@ -4332,7 +4332,7 @@
      },
      {
        'name': 'DisablePluginFinder',
@@ -18256,7 +17569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:11-64', 'chrome_os:11-64'],
-@@ -4328,7 +4328,7 @@
+@@ -4362,7 +4362,7 @@
      },
      {
        'name': 'SyncDisabled',
@@ -18265,7 +17578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'ios:96-'],
-@@ -4361,7 +4361,7 @@
+@@ -4395,7 +4395,7 @@
      },
      {
        'name': 'SyncTypesListDisabled',
@@ -18274,7 +17587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4383,7 +4383,7 @@
+@@ -4417,7 +4417,7 @@
      },
      {
        'name': 'RoamingProfileSupportEnabled',
@@ -18283,7 +17596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'],
-@@ -4413,7 +4413,7 @@
+@@ -4447,7 +4447,7 @@
      },
      {
        'name': 'RoamingProfileLocation',
@@ -18292,7 +17605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'],
-@@ -4429,7 +4429,7 @@
+@@ -4463,7 +4463,7 @@
  
        If you set this policy, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will use the provided directory to store the roaming copy of the profiles if the <ph name="ROAMING_PROFILE_SUPPORT_ENABLED_POLICY_NAME">RoamingProfileSupportEnabled</ph> policy has been enabled. If the <ph name="ROAMING_PROFILE_SUPPORT_ENABLED_POLICY_NAME">RoamingProfileSupportEnabled</ph> policy is disabled or left unset the value stored in this policy is not used.
  
@@ -18301,7 +17614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        On non-Windows platforms, this policy must be set for roaming profiles to work.
  
-@@ -4438,7 +4438,7 @@
+@@ -4472,7 +4472,7 @@
      },
      {
        'name': 'SigninAllowed',
@@ -18310,7 +17623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:27-', 'android:38-'],
-@@ -4471,7 +4471,7 @@
+@@ -4505,7 +4505,7 @@
      },
      {
        'name': 'EnableDeprecatedWebBasedSignin',
@@ -18319,7 +17632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:35-42'],
-@@ -4494,7 +4494,7 @@
+@@ -4528,7 +4528,7 @@
      },
      {
        'name': 'UserDataDir',
@@ -18328,7 +17641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.win:11-', 'chrome.mac:11-'],
-@@ -4513,14 +4513,14 @@
+@@ -4547,14 +4547,14 @@
  
        If you set this policy, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a directory used for other purposes, because <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> manages its contents.
  
@@ -18345,7 +17658,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:13-'],
-@@ -4537,12 +4537,12 @@
+@@ -4571,12 +4571,12 @@
  
        If not set, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> uses the default cache directory, but users can change that setting with the --disk-cache-dir command line flag.
  
@@ -18360,7 +17673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome.*:17-'],
-@@ -4566,7 +4566,7 @@
+@@ -4600,7 +4600,7 @@
      },
      {
        'name': 'MediaCacheSize',
@@ -18369,7 +17682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome.*:17-71'],
-@@ -4588,7 +4588,7 @@
+@@ -4622,7 +4622,7 @@
      },
      {
        'name': 'DownloadBubbleEnabled',
@@ -18378,7 +17691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*: 102-', 'chrome_os: 102-'],
-@@ -4618,7 +4618,7 @@
+@@ -4652,7 +4652,7 @@
      },
      {
        'name': 'DownloadRestrictions',
@@ -18387,7 +17700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -4664,7 +4664,7 @@
+@@ -4698,7 +4698,7 @@
        'tags': ['local-data-access'],
        'desc': '''Setting the policy means users can't bypass download security decisions.
  
@@ -18396,7 +17709,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        * Malicious, as flagged by the Safe Browsing server
        * Uncommon or unwanted, as flagged by the Safe Browsing server
-@@ -4682,12 +4682,12 @@
+@@ -4716,12 +4716,12 @@
  
        4: Blocks malicious files flagged by the Safe Browsing server, does not block dangerous file types. Recommended.
  
@@ -18411,7 +17724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:11-', 'chrome_os:35-'],
-@@ -4707,13 +4707,13 @@
+@@ -4741,13 +4741,13 @@
  
        Leaving the policy unset means Chrome uses the default download directory, and users can change it.
  
@@ -18427,7 +17740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4741,7 +4741,7 @@
+@@ -4775,7 +4775,7 @@
      },
      {
        'name': 'AutoOpenAllowedForURLs',
@@ -18436,7 +17749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -4765,11 +4765,11 @@
+@@ -4799,11 +4799,11 @@
  
        If this policy isn't set, all downloads where the file type is in <ph name="AUTO_OPEN_FILE_TYPES_POLICY_NAME">AutoOpenFileTypes</ph> will automatically open.
  
@@ -18450,7 +17763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -4803,13 +4803,13 @@
+@@ -4837,13 +4837,13 @@
  
        If this policy is not set, no protocols can launch without a prompt by default. Users may opt out of prompts on a per-protocol/per-site basis unless the <ph name="EXTERNAL_PROTOCOL_DIALOG_SHOW_ALWAYS_OPEN_CHECKBOX_POLICY_NAME">ExternalProtocolDialogShowAlwaysOpenCheckbox</ph> policy is set to Disabled. This policy has no impact on per-protocol/per-site prompt exemptions set by users.
  
@@ -18466,7 +17779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:61-'],
-@@ -4844,7 +4844,7 @@
+@@ -4878,7 +4878,7 @@
      },
      {
        'name': 'ClearSiteDataOnExit',
@@ -18475,7 +17788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'],
-@@ -4863,7 +4863,7 @@
+@@ -4897,7 +4897,7 @@
      },
      {
        'name': 'CaptivePortalAuthenticationIgnoresProxy',
@@ -18484,7 +17797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:41-'],
-@@ -4893,7 +4893,7 @@
+@@ -4927,7 +4927,7 @@
      },
      {
        'name': 'ProxyMode',
@@ -18493,7 +17806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -4962,11 +4962,11 @@
+@@ -4996,11 +4996,11 @@
  
        Leaving the policy unset lets users choose the proxy settings.
  
@@ -18507,7 +17820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -5023,7 +5023,7 @@
+@@ -5057,7 +5057,7 @@
            If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps.
  
            For detailed examples, visit:
@@ -18516,7 +17829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
            If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.
  
-@@ -5032,7 +5032,7 @@
+@@ -5066,7 +5066,7 @@
      },
      {
        'name': 'ProxyServer',
@@ -18525,7 +17838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -5055,12 +5055,12 @@
+@@ -5089,12 +5089,12 @@
  
         Leave this policy unset if you selected any other mode for setting proxy policies.
  
@@ -18540,7 +17853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -5083,12 +5083,12 @@
+@@ -5117,12 +5117,12 @@
  
         Leave this policy unset if you selected any other mode for setting proxy policies.
  
@@ -18555,7 +17868,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -5111,13 +5111,13 @@
+@@ -5145,13 +5145,13 @@
  
         Leave this policy unset if you selected any other mode for setting proxy policies.
  
@@ -18571,7 +17884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -5167,12 +5167,12 @@
+@@ -5201,12 +5201,12 @@
            * <ph name="PROXY_MODE_ENUM_FIXED_SERVERS">fixed_servers</ph>, the <ph name="PROXY_SERVER_PROXY_SETTINGS_FIELD">ProxyServer</ph> and <ph name="PROXY_BYPASS_LIST_PROXY_SETTINGS_FIELD">ProxyBypassList</ph> fields are used.
            * <ph name="PROXY_MODE_ENUM_PAC_SCRIPT">pac_script</ph>, the <ph name="PROXY_BYPASS_LIST_PROXY_PAC_URL">ProxyPacUrl</ph>, <ph name="PROXY_PAC_MANDATORY_PROXY_SETTINGS_FIELD">ProxyPacMandatory</ph> and <ph name="PROXY_BYPASS_LIST_PROXY_SETTINGS_FIELD">ProxyBypassList</ph> fields are used.
  
@@ -18586,7 +17899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'],
-@@ -5203,7 +5203,7 @@
+@@ -5237,7 +5237,7 @@
      },
      {
        'name': 'AllHttpAuthSchemesAllowedForOrigins',
@@ -18595,7 +17908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': { 'type': 'array', 'items': { 'type': 'string' } },
        'supported_on': ['chrome.*:100-','android:100-','chrome_os:100-'],
-@@ -5218,12 +5218,12 @@
+@@ -5252,12 +5252,12 @@
        'tags': [],
        'desc': '''Setting the policy specifies for which origins to allow all the HTTP authentication schemes <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> supports regardless of the <ph name="AUTH_SCHEMES_POLICY_NAME">AuthSchemes</ph> policy.
  
@@ -18610,7 +17923,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'],
-@@ -5252,7 +5252,7 @@
+@@ -5286,7 +5286,7 @@
      },
      {
        'name': 'EnableAuthNegotiatePort',
@@ -18619,7 +17932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:9-','chrome_os:62-'],
-@@ -5281,7 +5281,7 @@
+@@ -5315,7 +5315,7 @@
      },
      {
        'name': 'BasicAuthOverHttpEnabled',
@@ -18628,7 +17941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:88-','chrome_os:88-'],
-@@ -5313,7 +5313,7 @@
+@@ -5347,7 +5347,7 @@
      },
      {
        'name': 'AuthServerWhitelist',
@@ -18637,7 +17950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:9-100','android:46-100','webview_android:49-100','chrome_os:62-100'],
-@@ -5336,7 +5336,7 @@
+@@ -5370,7 +5370,7 @@
      },
      {
        'name': 'AuthServerAllowlist',
@@ -18646,7 +17959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:86-','android:86-','webview_android:86-','chrome_os:86-'],
-@@ -5357,7 +5357,7 @@
+@@ -5391,7 +5391,7 @@
      },
      {
        'name': 'AuthNegotiateDelegateWhitelist',
@@ -18655,7 +17968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:9-100','android:46-100','chrome_os:62-100'],
-@@ -5378,7 +5378,7 @@
+@@ -5412,7 +5412,7 @@
      },
      {
        'name': 'AuthNegotiateDelegateAllowlist',
@@ -18664,7 +17977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:86-','android:86-','chrome_os:86-'],
-@@ -5397,7 +5397,7 @@
+@@ -5431,7 +5431,7 @@
      },
      {
        'name': 'AuthNegotiateDelegateByKdcPolicy',
@@ -18673,7 +17986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.linux:74-','chrome.mac:74-','chrome_os:74-'],
-@@ -5427,7 +5427,7 @@
+@@ -5461,7 +5461,7 @@
      },
      {
        'name': 'BrowserLabsEnabled',
@@ -18682,7 +17995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema' : {'type': 'boolean'},
        'supported_on': ['chrome.*:89-', 'chrome_os:93-'],
-@@ -5459,7 +5459,7 @@
+@@ -5493,7 +5493,7 @@
      },
      {
        'name': 'GSSAPILibraryName',
@@ -18691,7 +18004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.linux:9-'],
-@@ -5477,7 +5477,7 @@
+@@ -5511,7 +5511,7 @@
      },
      {
        'name': 'AuthAndroidNegotiateAccountType',
@@ -18700,7 +18013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['android:46-','webview_android:49-'],
-@@ -5489,13 +5489,13 @@
+@@ -5523,13 +5523,13 @@
        'id': 305,
        'caption': '''Account type for <ph name="HTTP_NEGOTIATE">HTTP Negotiate</ph> authentication''',
        'tags': [],
@@ -18716,7 +18029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:13-','chrome_os:62-'],
-@@ -5526,7 +5526,7 @@
+@@ -5560,7 +5560,7 @@
      },
      {
        'name': 'NtlmV2Enabled',
@@ -18725,7 +18038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'],
-@@ -5557,7 +5557,7 @@
+@@ -5591,7 +5591,7 @@
      },
      {
        'name': 'ExtensionInstallBlacklist',
@@ -18734,7 +18047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5583,7 +5583,7 @@
+@@ -5617,7 +5617,7 @@
      {
  
        'name': 'ExtensionInstallBlocklist',
@@ -18743,7 +18056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5608,7 +5608,7 @@
+@@ -5642,7 +5642,7 @@
      },
      {
        'name': 'ExtensionInstallAllowlist',
@@ -18752,7 +18065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5633,7 +5633,7 @@
+@@ -5667,7 +5667,7 @@
      },
      {
        'name': 'ExtensionInstallWhitelist',
@@ -18761,7 +18074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5656,7 +5656,7 @@
+@@ -5690,7 +5690,7 @@
      },
      {
        'name': 'ExtensionInstallForcelist',
@@ -18770,7 +18083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5668,7 +5668,7 @@
+@@ -5702,7 +5702,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -18779,7 +18092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 34,
        'caption': '''Configure the list of force-installed apps and extensions''',
        'tags': ['full-admin-access'],
-@@ -5684,15 +5684,15 @@
+@@ -5718,15 +5718,15 @@
  
        The source code of any extension may be altered by users through developer tools, potentially rendering the extension dysfunctional. If this is a concern, set the <ph name="DEVELOPER_TOOLS_DISABLED_POLICY_NAME">DeveloperToolsDisabled</ph> policy.
  
@@ -18798,7 +18111,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -5711,14 +5711,14 @@
+@@ -5745,14 +5745,14 @@
        'tags': ['full-admin-access', 'system-security'],
        'desc': '''Setting the policy specifies which URLs may install extensions, apps, and themes. Before <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 21, users could click on a link to a *.crx file, and <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> would offer to install the file after a few warnings. Afterwards, such files must be downloaded and dragged to the <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> settings page. This setting allows specific URLs to have the old, easier installation flow.
  
@@ -18815,7 +18128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'deprecated': True,
        'schema': { 'type': 'boolean' },
-@@ -5750,7 +5750,7 @@
+@@ -5784,7 +5784,7 @@
      },
      {
        'name': 'ExtensionAllowedTypes',
@@ -18824,7 +18137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -5836,7 +5836,7 @@
+@@ -5870,7 +5870,7 @@
      },
      {
        'name': 'ExtensionSettings',
@@ -18833,7 +18146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -5931,7 +5931,7 @@
+@@ -5965,7 +5965,7 @@
            },
          },
        },
@@ -18842,7 +18155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome.*:62-', 'chrome_os:62-'],
        'future_on': ['fuchsia'],
        'features': {
-@@ -5989,13 +5989,13 @@
+@@ -6023,13 +6023,13 @@
        'tags': [],
        'desc': '''Setting the policy controls extension management settings for <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>, including any controlled by existing extension-related policies. The policy supersedes any legacy policies that might be set.
  
@@ -18858,7 +18171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-'],
-@@ -6024,12 +6024,12 @@
+@@ -6058,12 +6058,12 @@
  
        Setting this policy to Disabled or leaving it unset allows external extensions to be installed.
  
@@ -18873,7 +18186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
-@@ -6059,7 +6059,7 @@
+@@ -6093,7 +6093,7 @@
      },
      {
        'name': 'DeveloperToolsDisabled',
@@ -18882,7 +18195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:9-', 'chrome_os:11-'],
-@@ -6095,7 +6095,7 @@
+@@ -6129,7 +6129,7 @@
      },
      {
        'name': 'DeveloperToolsAvailability',
@@ -18891,7 +18204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6202,7 +6202,7 @@
+@@ -6236,7 +6236,7 @@
      },
      {
        'name': 'RestoreOnStartup',
@@ -18900,7 +18213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6255,7 +6255,7 @@
+@@ -6289,7 +6289,7 @@
      },
      {
        'name': 'RestoreOnStartupURLs',
@@ -18909,7 +18222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -6268,7 +6268,7 @@
+@@ -6302,7 +6302,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -18918,7 +18231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 38,
        'caption': '''URLs to open on startup''',
        'tags': [],
-@@ -6280,7 +6280,7 @@
+@@ -6314,7 +6314,7 @@
      },
      {
        'name': 'BlockThirdPartyCookies',
@@ -18927,7 +18240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:10-', 'chrome_os:11-', 'android:83-'],
-@@ -6315,7 +6315,7 @@
+@@ -6349,7 +6349,7 @@
      },
      {
        'name': 'DefaultSearchProviderEnabled',
@@ -18936,7 +18249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -6357,7 +6357,7 @@
+@@ -6391,7 +6391,7 @@
      },
      {
        'name': 'DefaultSearchProviderContextMenuAccessAllowed',
@@ -18945,7 +18258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:85-', 'chrome_os:85-'],
-@@ -6391,7 +6391,7 @@
+@@ -6425,7 +6425,7 @@
      },
      {
        'name': 'DefaultSearchProviderName',
@@ -18954,7 +18267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6416,7 +6416,7 @@
+@@ -6450,7 +6450,7 @@
      },
      {
        'name': 'DefaultSearchProviderKeyword',
@@ -18963,7 +18276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6441,7 +6441,7 @@
+@@ -6475,7 +6475,7 @@
      },
      {
        'name': 'DefaultSearchProviderSearchURL',
@@ -18972,7 +18285,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6466,7 +6466,7 @@
+@@ -6500,7 +6500,7 @@
      },
      {
        'name': 'DefaultSearchProviderSuggestURL',
@@ -18981,7 +18294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6491,7 +6491,7 @@
+@@ -6525,7 +6525,7 @@
      },
      {
        'name': 'DefaultSearchProviderInstantURL',
@@ -18990,7 +18303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:10-63', 'chrome_os:11-63', 'android:30-63'],
-@@ -6515,7 +6515,7 @@
+@@ -6549,7 +6549,7 @@
      },
      {
        'name': 'DefaultSearchProviderIconURL',
@@ -18999,7 +18312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6540,7 +6540,7 @@
+@@ -6574,7 +6574,7 @@
      },
      {
        'name': 'DefaultSearchProviderEncodings',
@@ -19008,7 +18321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -6568,7 +6568,7 @@
+@@ -6602,7 +6602,7 @@
      },
      {
        'name': 'DefaultSearchProviderAlternateURLs',
@@ -19017,7 +18330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -6596,7 +6596,7 @@
+@@ -6630,7 +6630,7 @@
      },
      {
        'name': 'DefaultSearchProviderSearchTermsReplacementKey',
@@ -19026,7 +18339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:25-63', 'chrome_os:25-63', 'android:30-63'],
-@@ -6618,7 +6618,7 @@
+@@ -6652,7 +6652,7 @@
      },
      {
        'name': 'DefaultSearchProviderImageURL',
@@ -19035,7 +18348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6643,7 +6643,7 @@
+@@ -6677,7 +6677,7 @@
      },
      {
        'name': 'DefaultSearchProviderNewTabURL',
@@ -19044,7 +18357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6668,7 +6668,7 @@
+@@ -6702,7 +6702,7 @@
      },
      {
        'name': 'DefaultSearchProviderSearchURLPostParams',
@@ -19053,7 +18366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6693,7 +6693,7 @@
+@@ -6727,7 +6727,7 @@
      },
      {
        'name': 'DefaultSearchProviderSuggestURLPostParams',
@@ -19062,7 +18375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6718,7 +6718,7 @@
+@@ -6752,7 +6752,7 @@
      },
      {
        'name': 'DefaultSearchProviderInstantURLPostParams',
@@ -19071,7 +18384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:29-63', 'chrome_os:29-63', 'android:30-63'],
-@@ -6740,7 +6740,7 @@
+@@ -6774,7 +6774,7 @@
      },
      {
        'name': 'DefaultSearchProviderImageURLPostParams',
@@ -19080,7 +18393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -6765,7 +6765,7 @@
+@@ -6799,7 +6799,7 @@
      },
      {
        'name': 'DefaultCookiesSetting',
@@ -19089,7 +18402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6810,7 +6810,7 @@
+@@ -6844,7 +6844,7 @@
      },
      {
        'name': 'DefaultImagesSetting',
@@ -19098,7 +18411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6844,7 +6844,7 @@
+@@ -6878,7 +6878,7 @@
      },
      {
        'name': 'DefaultJavaScriptSetting',
@@ -19107,7 +18420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6878,7 +6878,7 @@
+@@ -6912,7 +6912,7 @@
      },
      {
        'name': 'DefaultPluginsSetting',
@@ -19116,7 +18429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6919,7 +6919,7 @@
+@@ -6953,7 +6953,7 @@
      },
      {
        'name': 'DefaultPopupsSetting',
@@ -19125,7 +18438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6958,7 +6958,7 @@
+@@ -6992,7 +6992,7 @@
      },
      {
        'name': 'DefaultNotificationsSetting',
@@ -19134,7 +18447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -6997,7 +6997,7 @@
+@@ -7031,7 +7031,7 @@
      },
      {
        'name': 'DefaultGeolocationSetting',
@@ -19143,7 +18456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7037,7 +7037,7 @@
+@@ -7071,7 +7071,7 @@
      },
      {
        'name': 'DefaultMediaStreamSetting',
@@ -19152,7 +18465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7071,7 +7071,7 @@
+@@ -7105,7 +7105,7 @@
      },
      {
        'name': 'DefaultWebBluetoothGuardSetting',
@@ -19161,7 +18474,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7106,7 +7106,7 @@
+@@ -7140,7 +7140,7 @@
      },
      {
        'name': 'DefaultKeygenSetting',
@@ -19170,7 +18483,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7140,7 +7140,7 @@
+@@ -7174,7 +7174,7 @@
      },
      {
        'name': 'DefaultSensorsSetting',
@@ -19179,7 +18492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7175,7 +7175,7 @@
+@@ -7209,7 +7209,7 @@
      },
      {
        'name': 'DefaultWebUsbGuardSetting',
@@ -19188,7 +18501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7210,7 +7210,7 @@
+@@ -7244,7 +7244,7 @@
      },
      {
        'name': 'WebUsbAllowDevicesForUrls',
@@ -19197,7 +18510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -7243,7 +7243,7 @@
+@@ -7277,7 +7277,7 @@
        },
        'example_value': [{
          'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -19206,7 +18519,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        }],
        'id': 486,
        'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs.''',
-@@ -7260,7 +7260,7 @@
+@@ -7294,7 +7294,7 @@
      },
      {
        'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls',
@@ -19215,7 +18528,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -7293,7 +7293,7 @@
+@@ -7327,7 +7327,7 @@
        },
        'example_value': [{
          'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -19224,7 +18537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        }],
        'id': 603,
        'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs on the login screen.''',
-@@ -7308,7 +7308,7 @@
+@@ -7342,7 +7342,7 @@
      },
      {
        'name': 'WebUsbAskForUrls',
@@ -19233,7 +18546,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7330,11 +7330,11 @@
+@@ -7364,11 +7364,11 @@
  
        URL patterns must not conflict with <ph name="WEB_USB_ASK_FOR_URLS_POLICY_NAME">WebUsbAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19247,7 +18560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7356,11 +7356,11 @@
+@@ -7390,11 +7390,11 @@
  
        URL patterns can't conflict with <ph name="WEB_USB_ASK_FOR_URLS_POLICY_NAME">WebUsbAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19261,7 +18574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7395,7 +7395,7 @@
+@@ -7429,7 +7429,7 @@
      },
      {
        'name': 'SerialAskForUrls',
@@ -19270,7 +18583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7419,11 +7419,11 @@
+@@ -7453,11 +7453,11 @@
  
        URL patterns must not conflict with <ph name="SERIAL_BLOCKED_FOR_URLS_POLICY_NAME">SerialBlockedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19284,7 +18597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7447,11 +7447,11 @@
+@@ -7481,11 +7481,11 @@
  
        URL patterns can't conflict with <ph name="SERIAL_ASK_FOR_URLS_POLICY_NAME">SerialAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19298,7 +18611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7477,7 +7477,7 @@
+@@ -7511,7 +7511,7 @@
      },
      {
        'name': 'SerialAllowUsbDevicesForUrls',
@@ -19307,7 +18620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -7534,7 +7534,7 @@
+@@ -7568,7 +7568,7 @@
      },
      {
        'name': 'DefaultWebHidGuardSetting',
@@ -19316,7 +18629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7571,7 +7571,7 @@
+@@ -7605,7 +7605,7 @@
      },
      {
        'name': 'WebHidAskForUrls',
@@ -19325,7 +18638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7583,7 +7583,7 @@
+@@ -7617,7 +7617,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -19334,7 +18647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 944,
        'caption': '''Allow the WebHID API on these sites''',
        'tags': ['website-sharing'],
-@@ -7601,11 +7601,11 @@
+@@ -7635,11 +7635,11 @@
  
        URL patterns must not conflict with <ph name="WEB_HID_BLOCKED_FOR_URLS_POLICY_NAME">WebHidBlockedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19348,7 +18661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7617,7 +7617,7 @@
+@@ -7651,7 +7651,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -19357,7 +18670,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 945,
        'caption': '''Block the WebHID API on these sites''',
        'tags': [],
-@@ -7635,11 +7635,11 @@
+@@ -7669,11 +7669,11 @@
  
        URL patterns can't conflict with <ph name="WEB_HID_ASK_FOR_URLS_POLICY_NAME">WebHidAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19371,7 +18684,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7651,7 +7651,7 @@
+@@ -7685,7 +7685,7 @@
          'dynamic_refresh': True,
          'per_profile': False,
        },
@@ -19380,7 +18693,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 953,
        'caption': '''Automatically grant permission to sites to connect to any HID device.''',
        'tags': ['website-sharing'],
-@@ -7665,7 +7665,7 @@
+@@ -7699,7 +7699,7 @@
      },
      {
        'name': 'WebHidAllowDevicesForUrls',
@@ -19389,7 +18702,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -7707,7 +7707,7 @@
+@@ -7741,7 +7741,7 @@
        },
        'example_value': [{
          'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -19398,7 +18711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        }],
        'id': 954,
        'caption': '''Automatically grant permission to these sites to connect to HID devices with the given vendor and product IDs.''',
-@@ -7720,7 +7720,7 @@
+@@ -7754,7 +7754,7 @@
      },
      {
        'name': 'WebHidAllowDevicesWithHidUsagesForUrls',
@@ -19407,7 +18720,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -7762,7 +7762,7 @@
+@@ -7796,7 +7796,7 @@
        },
        'example_value': [{
          'usages': [{'usage_page': 1234, 'usage': 5678}],
@@ -19416,7 +18729,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        }],
        'id': 955,
        'caption': '''Automatically grant permission to these sites to connect to HID devices containing top-level collections with the given HID usage.''',
-@@ -7775,7 +7775,7 @@
+@@ -7809,7 +7809,7 @@
      },
      {
        'name': 'DefaultFileHandlingGuardSetting',
@@ -19425,7 +18738,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7810,7 +7810,7 @@
+@@ -7844,7 +7844,7 @@
      },
      {
        'name': 'FileHandlingAllowedForUrls',
@@ -19434,7 +18747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7834,11 +7834,11 @@
+@@ -7868,11 +7868,11 @@
  
        URL patterns must not conflict with <ph name="FILE_HANDLING_BLOCKED_FOR_URLS_POLICY_NAME">FileHandlingBlockedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19448,7 +18761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7862,11 +7862,11 @@
+@@ -7896,11 +7896,11 @@
  
        URL patterns must not conflict with <ph name="FILE_HANDLING_ALLOWED_FOR_URLS_POLICY_NAME">FileHandlingAllowedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19462,7 +18775,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7901,7 +7901,7 @@
+@@ -7935,7 +7935,7 @@
      },
      {
        'name': 'DefaultFileSystemWriteGuardSetting',
@@ -19471,7 +18784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -7936,7 +7936,7 @@
+@@ -7970,7 +7970,7 @@
      },
      {
        'name': 'FileSystemReadAskForUrls',
@@ -19480,7 +18793,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7958,11 +7958,11 @@
+@@ -7992,11 +7992,11 @@
  
        URL patterns must not conflict with <ph name="FILE_SYSTEM_READ_BLOCKED_FOR_URLS_POLICY_NAME">FileSystemReadBlockedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19494,7 +18807,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -7984,11 +7984,11 @@
+@@ -8018,11 +8018,11 @@
  
        URL patterns can't conflict with <ph name="FILE_SYSTEM_READ_ASK_FOR_URLS_POLICY_NAME">FileSystemReadAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19508,7 +18821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8010,11 +8010,11 @@
+@@ -8044,11 +8044,11 @@
  
        URL patterns must not conflict with <ph name="FILE_SYSTEM_WRITE_BLOCKED_FOR_URLS_POLICY_NAME">FileSystemWriteBlockedForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19522,7 +18835,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8036,11 +8036,11 @@
+@@ -8070,11 +8070,11 @@
  
        URL patterns can't conflict with <ph name="FILE_SYSTEM_WRITE_ASK_FOR_URLS_POLICY_NAME">FileSystemWriteAskForUrls</ph>. Neither policy takes precedence if a URL matches with both.
  
@@ -19536,7 +18849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8101,7 +8101,7 @@
+@@ -8135,7 +8135,7 @@
      },
      {
        'name': 'DeviceLoginScreenAutoSelectCertificateForUrls',
@@ -19545,7 +18858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8156,11 +8156,11 @@
+@@ -8190,11 +8190,11 @@
  
        If this policy is left not set, no auto-selection will be done for any site.
  
@@ -19559,7 +18872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8186,11 +8186,11 @@
+@@ -8220,11 +8220,11 @@
  
            See also policies <ph name="COOKIES_BLOCKED_FOR_URLS_POLICY_NAME">CookiesBlockedForUrls</ph> and <ph name="COOKIES_SESSIONS_ONLY_FOR_URLS">CookiesSessionOnlyForUrls</ph>. Note that there must be no conflicting URL patterns between these three policies - it is unspecified which policy takes precedence.
  
@@ -19573,7 +18886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8216,11 +8216,11 @@
+@@ -8250,11 +8250,11 @@
  
        While no specific policy takes precedence, see <ph name="COOKIES_ALLOWED_FOR_URLS_POLICY_NAME">CookiesAllowedForUrls</ph> and <ph name="COOKIES_SESSION_ONLY_FOR_URLS_POLICY_NAME">CookiesSessionOnlyForUrls</ph>. URL patterns among these 3 policies must not conflict.
  
@@ -19587,7 +18900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8246,11 +8246,11 @@
+@@ -8280,11 +8280,11 @@
  
        While no specific policy takes precedence, see <ph name="COOKIES_BLOCKED_FOR_URLS_POLICY_NAME">CookiesBlockedForUrls</ph> and <ph name="COOKIES_ALLOWED_FOR_URLS_POLICY_NAME">CookiesAllowedForUrls</ph>. URL patterns among these 3 policies must not conflict.
  
@@ -19601,7 +18914,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8270,13 +8270,13 @@
+@@ -8304,13 +8304,13 @@
  
        Leaving the policy unset means <ph name="DEFAULT_IMAGES_SETTING_ENABLED_POLICY_NAME">DefaultImagesSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19617,7 +18930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8296,13 +8296,13 @@
+@@ -8330,13 +8330,13 @@
  
        Leaving the policy unset means <ph name="DEFAULT_IMAGE_SETTING_ENABLED_POLICY_NAME">DefaultImagesSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19633,7 +18946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8322,11 +8322,11 @@
+@@ -8356,11 +8356,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_JAVA_SCRIPT_SETTING_POLICY_NAME">DefaultJavaScriptSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19647,7 +18960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8346,11 +8346,11 @@
+@@ -8380,11 +8380,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_JAVA_SCRIPT_SETTING_POLICY_NAME">DefaultJavaScriptSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19661,7 +18974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -8387,7 +8387,7 @@
+@@ -8421,7 +8421,7 @@
      },
      {
        'name': 'ClipboardAllowedForUrls',
@@ -19670,7 +18983,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8408,11 +8408,11 @@
+@@ -8442,11 +8442,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_CLIPBOARD_SETTING">DefaultClipboardSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19684,7 +18997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8432,11 +8432,11 @@
+@@ -8466,11 +8466,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_CLIPBOARD_SETTING">DefaultClipboardSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19698,7 +19011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8456,11 +8456,11 @@
+@@ -8490,11 +8490,11 @@
  
            If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.
  
@@ -19712,7 +19025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8480,11 +8480,11 @@
+@@ -8514,11 +8514,11 @@
  
            If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.
  
@@ -19726,7 +19039,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -8516,13 +8516,13 @@
+@@ -8550,13 +8550,13 @@
        'caption': '''Default legacy <ph name="ATTRIBUTE_SAMESITE_NAME">SameSite</ph> cookie behavior setting''',
        'tags': [],
        'deprecated': True,
@@ -19742,7 +19055,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8542,17 +8542,17 @@
+@@ -8576,17 +8576,17 @@
        'id': 624,
        'caption': '''Revert to legacy <ph name="ATTRIBUTE_SAMESITE_NAME">SameSite</ph> behavior for cookies on these sites''',
        'tags': [],
@@ -19763,7 +19076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:91-'],
-@@ -8579,7 +8579,7 @@
+@@ -8613,7 +8613,7 @@
      },
      {
        'name': 'LensRegionSearchEnabled',
@@ -19772,7 +19085,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:94-', 'chrome_os:94-'],
-@@ -8607,7 +8607,7 @@
+@@ -8641,7 +8641,7 @@
      },
      {
        'name': 'SideSearchEnabled',
@@ -19781,7 +19094,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema' : {'type': 'boolean'},
        'supported_on': ['chrome_os:96-', 'chrome.*:101-'],
-@@ -8638,9 +8638,9 @@
+@@ -8672,9 +8672,9 @@
      {
        'name': 'InsecurePrivateNetworkRequestsAllowed',
        'owners': [
@@ -19794,7 +19107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        ],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -8687,9 +8687,9 @@
+@@ -8721,9 +8721,9 @@
      {
        'name': 'InsecurePrivateNetworkRequestsAllowedForUrls',
        'owners': [
@@ -19807,7 +19120,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        ],
        'type': 'list',
        'schema': {
-@@ -8717,11 +8717,11 @@
+@@ -8751,11 +8751,11 @@
  
            For origins not covered by the patterns specified here, the global default value will be used either from the <ph name="INSECURE_PRIVATE_NETWORK_REQUESTS_ALLOWED_POLICY_NAME">InsecurePrivateNetworkRequestsAllowed</ph> policy, if it is set, or the user's personal configuration otherwise.
  
@@ -19821,7 +19134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8741,11 +8741,11 @@
+@@ -8775,11 +8775,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_PLUGINS_SETTING_POLICY_NAME">DefaultPluginsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19835,7 +19148,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8765,11 +8765,11 @@
+@@ -8799,11 +8799,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_PLUGINS_SETTING_POLICY_NAME">DefaultPluginsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19849,7 +19162,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8794,11 +8794,11 @@
+@@ -8828,11 +8828,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_POPUPS_SETTING_POLICY_NAME">DefaultPopupsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19863,7 +19176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -8829,7 +8829,7 @@
+@@ -8863,7 +8863,7 @@
          'can_be_recommended': True,
          'can_be_mandatory' : False,
        },
@@ -19872,7 +19185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 268,
        'caption': '''Register protocol handlers''',
        'tags': [],
-@@ -8840,7 +8840,7 @@
+@@ -8874,7 +8874,7 @@
      },
      {
        'name': 'PopupsBlockedForUrls',
@@ -19881,7 +19194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8865,11 +8865,11 @@
+@@ -8899,11 +8899,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_POPUPS_SETTING_POLICY_NAME">DefaultPopupsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19895,7 +19208,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8889,11 +8889,11 @@
+@@ -8923,11 +8923,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_NOTIFICATIONS_SETTING_POLICY_NAME">DefaultNotificationsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19909,7 +19222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8913,11 +8913,11 @@
+@@ -8947,11 +8947,11 @@
  
        Leaving the policy unset means <ph name="DEFAULT_NOTIFICATIONS_SETTING_POLICY_NAME">DefaultNotificationsSetting</ph> applies for all sites, if it's set. If not, the user's personal setting applies.
  
@@ -19923,7 +19236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8939,7 +8939,7 @@
+@@ -8973,7 +8973,7 @@
  
        If the same URL pattern exists in both this policy and the <ph name="SENSORS_BLOCKED_FOR_URLS_POLICY_NAME">SensorsBlockedForUrls</ph> policy, the latter is prioritized and access to motion or light sensors will be blocked.
  
@@ -19932,7 +19245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      {
        'name': 'SensorsBlockedForUrls',
-@@ -8965,11 +8965,11 @@
+@@ -8999,11 +8999,11 @@
  
        If the same URL pattern exists in both this policy and the <ph name="SENSORS_ALLOWED_FOR_URLS_POLICY_NAME">SensorsAllowedForUrls</ph> policy, this policy is prioritized and access to motion or light sensors will be blocked.
  
@@ -19946,7 +19259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -8997,7 +8997,7 @@
+@@ -9031,7 +9031,7 @@
      },
      {
        'name': 'NativeMessagingBlocklist',
@@ -19955,7 +19268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9023,7 +9023,7 @@
+@@ -9057,7 +9057,7 @@
      },
      {
        'name': 'NativeMessagingWhitelist',
@@ -19964,7 +19277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9051,7 +9051,7 @@
+@@ -9085,7 +9085,7 @@
      },
      {
        'name': 'NativeMessagingAllowlist',
@@ -19973,7 +19286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9077,7 +9077,7 @@
+@@ -9111,7 +9111,7 @@
      },
      {
        'name': 'NativeMessagingUserLevelHosts',
@@ -19982,7 +19295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:34-'],
-@@ -9106,7 +9106,7 @@
+@@ -9140,7 +9140,7 @@
      },
      {
        'name': 'Disable3DAPIs',
@@ -19991,7 +19304,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:9-', 'chrome_os:11-'],
-@@ -9135,7 +9135,7 @@
+@@ -9169,7 +9169,7 @@
      },
      {
        'name': 'PolicyRefreshRate',
@@ -20000,7 +19313,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 1800000, 'maximum': 86400000 },
        'supported_on': ['chrome_os:11-', 'chrome.*:79-', 'ios:90-'],
-@@ -9156,7 +9156,7 @@
+@@ -9190,7 +9190,7 @@
      },
      {
        'name': 'MaxInvalidationFetchDelay',
@@ -20009,7 +19322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 1000, 'maximum': 300000 },
        'supported_on': ['chrome.*:30-', 'chrome_os:30-'],
-@@ -9176,7 +9176,7 @@
+@@ -9210,7 +9210,7 @@
      },
      {
        'name': 'ChromeFrameRendererSettings',
@@ -20018,7 +19331,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -9208,7 +9208,7 @@
+@@ -9242,7 +9242,7 @@
      },
      {
        'name': 'RenderInChromeFrameList',
@@ -20027,7 +19340,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9227,11 +9227,11 @@
+@@ -9261,11 +9261,11 @@
  
            If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
  
@@ -20041,7 +19354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9250,11 +9250,11 @@
+@@ -9284,11 +9284,11 @@
  
            If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
  
@@ -20055,7 +19368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_frame:19-32'],
-@@ -9272,7 +9272,7 @@
+@@ -9306,7 +9306,7 @@
      },
      {
        'name': 'SkipMetadataCheck',
@@ -20064,7 +19377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_frame:31-32'],
-@@ -9294,7 +9294,7 @@
+@@ -9328,7 +9328,7 @@
      },
      {
        'name': 'ChromeFrameContentTypes',
@@ -20073,16 +19386,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -9315,7 +9315,7 @@
+@@ -9349,7 +9349,7 @@
      },
      {
        'name': 'ChromeOsLockOnIdleSuspend',
--      'owners': ['xiyuan@chromium.org', 'ultrotter@chromium.org'],
-+      'owners': ['xiyuan@ch40m1um.qjz9zk', 'ultrotter@ch40m1um.qjz9zk'],
+-      'owners': ['xiyuan@chromium.org', 'ultrotter@chromium.org', 'chromeos-power@google.com'],
++      'owners': ['xiyuan@ch40m1um.qjz9zk', 'ultrotter@ch40m1um.qjz9zk', 'chromeos-power@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:9-'],
-@@ -9351,7 +9351,7 @@
+@@ -9391,7 +9391,7 @@
      },
      {
        'name': 'ChromeOsMultiProfileUserBehavior',
@@ -20091,7 +19404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -9405,7 +9405,7 @@
+@@ -9445,7 +9445,7 @@
      },
      {
        'name': 'SecondaryGoogleAccountSigninAllowed',
@@ -20100,7 +19413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:65-'],
-@@ -9441,7 +9441,7 @@
+@@ -9481,7 +9481,7 @@
      },
      {
        'name': 'SecondaryGoogleAccountUsage',
@@ -20109,7 +19422,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -9482,7 +9482,7 @@
+@@ -9522,7 +9522,7 @@
      },
      {
        'name': 'ForceLogoutUnauthenticatedUserEnabled',
@@ -20118,7 +19431,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -9512,7 +9512,7 @@
+@@ -9552,7 +9552,7 @@
      },
      {
        'name': 'SecurityTokenSessionBehavior',
@@ -20127,7 +19440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -9548,7 +9548,7 @@
+@@ -9588,7 +9588,7 @@
      },
      {
        'name': 'SecurityTokenSessionNotificationSeconds',
@@ -20136,7 +19449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 },
        'supported_on': ['chrome_os:90-'],
-@@ -9564,7 +9564,7 @@
+@@ -9604,7 +9604,7 @@
      },
      {
        'name': 'TargetBlankImpliesNoOpener',
@@ -20145,7 +19458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:88-102', 'chrome_os:88-102', 'android:88-102'],
-@@ -9594,11 +9594,11 @@
+@@ -9634,11 +9634,11 @@
  
        This policy was removed in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> version 102.
  
@@ -20159,7 +19472,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'],
-@@ -9626,7 +9626,7 @@
+@@ -9666,7 +9666,7 @@
      },
      {
        'name': 'AppRecommendationZeroStateEnabled',
@@ -20168,7 +19481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:75-99'],
-@@ -9659,7 +9659,7 @@
+@@ -9699,7 +9699,7 @@
      },
      {
        'name': 'TranslateEnabled',
@@ -20177,7 +19490,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -9699,7 +9699,7 @@
+@@ -9739,7 +9739,7 @@
      },
      {
        'name': 'AllowOutdatedPlugins',
@@ -20186,7 +19499,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:12-87', 'chrome_os:12-87'],
-@@ -9733,7 +9733,7 @@
+@@ -9773,7 +9773,7 @@
      },
      {
        'name': 'AlwaysAuthorizePlugins',
@@ -20195,7 +19508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:13-64', 'chrome_os:13-64'],
-@@ -9762,7 +9762,7 @@
+@@ -9802,7 +9802,7 @@
      },
      {
        'name': 'RunAllFlashInAllowMode',
@@ -20204,7 +19517,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:63-88', 'chrome_os:63-88'],
-@@ -9795,7 +9795,7 @@
+@@ -9835,7 +9835,7 @@
      },
      {
        'name': 'BookmarkBarEnabled',
@@ -20213,7 +19526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:12-', 'chrome_os:12-'],
-@@ -9830,7 +9830,7 @@
+@@ -9870,7 +9870,7 @@
      },
      {
        'name': 'EditBookmarksEnabled',
@@ -20222,7 +19535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -9864,7 +9864,7 @@
+@@ -9904,7 +9904,7 @@
      },
      {
        'name': 'ShowAppsShortcutInBookmarkBar',
@@ -20231,7 +19544,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:37-'],
-@@ -9898,7 +9898,7 @@
+@@ -9938,7 +9938,7 @@
      },
      {
        'name': 'AllowFileSelectionDialogs',
@@ -20240,7 +19553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:12-'],
-@@ -9928,7 +9928,7 @@
+@@ -9968,7 +9968,7 @@
      },
      {
        'name': 'SecurityKeyPermitAttestation',
@@ -20249,7 +19562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': ['website-sharing'],
        'type': 'list',
        'schema': {
-@@ -9950,7 +9950,7 @@
+@@ -9990,7 +9990,7 @@
      },
      {
        'name': 'LoadCryptoTokenExtension',
@@ -20258,7 +19571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -9978,7 +9978,7 @@
+@@ -10018,7 +10018,7 @@
      },
      {
        'name': 'U2fSecurityKeyApiEnabled',
@@ -20267,7 +19580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -10010,11 +10010,11 @@
+@@ -10050,11 +10050,11 @@
  
        This is a temporary opt-out mechanism. The U2F API will be removed from Chrome in Chrome 104, at which point this policy will cease to be supported.
  
@@ -20281,7 +19594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': ['full-admin-access'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -10048,7 +10048,7 @@
+@@ -10088,7 +10088,7 @@
      },
      {
        'name': 'GCFUserDataDir',
@@ -20290,7 +19603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_frame:12-32'],
-@@ -10064,14 +10064,14 @@
+@@ -10104,14 +10104,14 @@
  
        If you set this policy, <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> will use the provided directory.
  
@@ -20307,7 +19620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:11-'],
-@@ -10092,7 +10092,7 @@
+@@ -10132,7 +10132,7 @@
      },
      {
        'name': 'ImportBookmarks',
@@ -20316,7 +19629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-'],
-@@ -10124,7 +10124,7 @@
+@@ -10164,7 +10164,7 @@
      },
      {
        'name': 'ImportHistory',
@@ -20325,7 +19638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-'],
-@@ -10156,7 +10156,7 @@
+@@ -10196,7 +10196,7 @@
      },
      {
        'name': 'ImportHomepage',
@@ -20334,7 +19647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-'],
-@@ -10186,7 +10186,7 @@
+@@ -10226,7 +10226,7 @@
      },
      {
        'name': 'ImportSearchEngine',
@@ -20343,7 +19656,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-'],
-@@ -10217,7 +10217,7 @@
+@@ -10257,7 +10257,7 @@
      },
      {
        'name': 'ImportSavedPasswords',
@@ -20352,7 +19665,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-'],
-@@ -10248,7 +10248,7 @@
+@@ -10288,7 +10288,7 @@
      },
      {
        'name': 'ImportAutofillFormData',
@@ -20361,7 +19674,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:39-'],
-@@ -10279,7 +10279,7 @@
+@@ -10319,7 +10319,7 @@
      },
      {
        'name': 'MaxConnectionsPerProxy',
@@ -20370,7 +19683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome.*:14-'],
-@@ -10299,7 +10299,7 @@
+@@ -10339,7 +10339,7 @@
      },
      {
        'name': 'HideWebStorePromo',
@@ -20379,7 +19692,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:15-21', 'chrome_os:15-21'],
-@@ -10317,7 +10317,7 @@
+@@ -10357,7 +10357,7 @@
      },
      {
        'name': 'URLBlacklist',
@@ -20388,7 +19701,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10340,7 +10340,7 @@
+@@ -10380,7 +10380,7 @@
        'tags': ['filtering'],
        'desc': '''This policy is deprecated, please use the '<ph name="URL_BLOCKLIST_POLICY_NAME">URLBlocklist</ph>' policy instead.
  
@@ -20397,7 +19710,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        From <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest.
  
-@@ -10349,7 +10349,7 @@
+@@ -10389,7 +10389,7 @@
      },
      {
        'name': 'URLWhitelist',
@@ -20406,7 +19719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10372,7 +10372,7 @@
+@@ -10412,7 +10412,7 @@
        'tags': [],
        'desc': '''This policy is deprecated, please use the '<ph name="URL_ALLOWLIST_POLICY_NAME">URLAllowlist</ph>' policy instead.
  
@@ -20415,7 +19728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        This policy also allows enabling the automatic invocation by the browser of external application registered as protocol handlers for the listed protocols like "tel:" or "ssh:".
  
-@@ -10383,7 +10383,7 @@
+@@ -10423,7 +10423,7 @@
      },
      {
        'name': 'URLBlocklist',
@@ -20424,7 +19737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10405,7 +10405,7 @@
+@@ -10445,7 +10445,7 @@
        'id': 736,
        'caption': '''Block access to a list of URLs''',
        'tags': ['filtering'],
@@ -20433,7 +19746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        From <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest.
  
-@@ -10416,7 +10416,7 @@
+@@ -10456,7 +10456,7 @@
      },
      {
        'name': 'URLAllowlist',
@@ -20442,7 +19755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10438,7 +10438,7 @@
+@@ -10478,7 +10478,7 @@
        'id': 737,
        'caption': '''Allow access to a list of URLs''',
        'tags': [],
@@ -20451,7 +19764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        This policy also allows enabling the automatic invocation by the browser of external application registered as protocol handlers for the listed protocols like "tel:" or "ssh:".
  
-@@ -10451,7 +10451,7 @@
+@@ -10491,7 +10491,7 @@
      },
      {
        'name': 'PolicyAtomicGroupsEnabled',
@@ -20460,7 +19773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:105-', 'ios:105-'],
-@@ -10482,7 +10482,7 @@
+@@ -10522,7 +10522,7 @@
      },
      {
        'name': 'PolicyListMultipleSourceMergeList',
@@ -20469,7 +19782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10519,7 +10519,7 @@
+@@ -10559,7 +10559,7 @@
      },
      {
        'name': 'PolicyDictionaryMultipleSourceMergeList',
@@ -20478,7 +19791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -10591,7 +10591,7 @@
+@@ -10631,7 +10631,7 @@
      },
      {
        'name': 'CloudUserPolicyMerge',
@@ -20487,7 +19800,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:92-', 'android:97-'],
-@@ -10626,7 +10626,7 @@
+@@ -10666,7 +10666,7 @@
      },
      {
        'name': 'EnableExperimentalPolicies',
@@ -20496,7 +19809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -10656,7 +10656,7 @@
+@@ -10696,7 +10696,7 @@
      },
      {
        'name': 'PolicyScopeDetection',
@@ -20505,7 +19818,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.mac:105-107'],
-@@ -10690,10 +10690,10 @@
+@@ -10730,10 +10730,10 @@
      },
      {
        'name': 'OpenNetworkConfiguration',
@@ -20518,7 +19831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:16-'],
        'features': {
          'dynamic_refresh': True,
-@@ -10708,10 +10708,10 @@
+@@ -10748,10 +10748,10 @@
      },
      {
        'name': 'DeviceOpenNetworkConfiguration',
@@ -20531,7 +19844,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:16-'],
        'device_only': True,
        'features': {
-@@ -10726,7 +10726,7 @@
+@@ -10766,7 +10766,7 @@
      },
      {
        'name': 'DeviceKerberosEncryptionTypes',
@@ -20540,7 +19853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -10773,7 +10773,7 @@
+@@ -10813,7 +10813,7 @@
      },
      {
        'name': 'DeviceUserPolicyLoopbackProcessingMode',
@@ -20549,7 +19862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -10816,7 +10816,7 @@
+@@ -10856,7 +10856,7 @@
      },
      {
        'name': 'DeviceMachinePasswordChangeRate',
@@ -20558,7 +19871,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 },
        'supported_on': ['chrome_os:66-'],
-@@ -10839,7 +10839,7 @@
+@@ -10879,7 +10879,7 @@
      },
      {
        'name': 'DeviceGpoCacheLifetime',
@@ -20567,7 +19880,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 },
        'supported_on': ['chrome_os:73-'],
-@@ -10862,7 +10862,7 @@
+@@ -10902,7 +10902,7 @@
      },
      {
        'name': 'DeviceAuthDataCacheLifetime',
@@ -20576,7 +19889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 },
        'supported_on': ['chrome_os:73-'],
-@@ -10885,7 +10885,7 @@
+@@ -10925,7 +10925,7 @@
      },
      {
        'name': 'ChromadToCloudMigrationEnabled',
@@ -20585,7 +19898,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -10919,7 +10919,7 @@
+@@ -10959,7 +10959,7 @@
      },
      {
        'name': 'CloudPrintSubmitEnabled',
@@ -20594,7 +19907,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:17-101'],
-@@ -10950,7 +10950,7 @@
+@@ -10990,7 +10990,7 @@
      },
      {
        'name': 'EnterpriseWebStoreURL',
@@ -20603,7 +19916,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'],
-@@ -10967,7 +10967,7 @@
+@@ -11007,7 +11007,7 @@
      },
      {
        'name': 'EnterpriseWebStoreName',
@@ -20612,7 +19925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'],
-@@ -10984,7 +10984,7 @@
+@@ -11024,7 +11024,7 @@
      },
      {
        'name': 'DisablePrintPreview',
@@ -20621,7 +19934,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:18-'],
-@@ -11013,7 +11013,7 @@
+@@ -11053,7 +11053,7 @@
      },
      {
        'name': 'PrintHeaderFooter',
@@ -20630,7 +19943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-', 'chrome.*:70-'],
-@@ -11048,7 +11048,7 @@
+@@ -11088,7 +11088,7 @@
      },
      {
        'name': 'DefaultPrinterSelection',
@@ -20639,7 +19952,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'validation_schema': {
-@@ -11090,7 +11090,7 @@
+@@ -11130,7 +11130,7 @@
      },
      {
        'name': 'DisableSSLRecordSplitting',
@@ -20648,7 +19961,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:18-46', 'chrome_os:18-46'],
-@@ -11109,7 +11109,7 @@
+@@ -11149,7 +11149,7 @@
      },
      {
        'name': 'EnableOnlineRevocationChecks',
@@ -20657,7 +19970,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:19-', 'chrome_os:19-'],
-@@ -11140,7 +11140,7 @@
+@@ -11180,7 +11180,7 @@
      },
      {
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
@@ -20666,7 +19979,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
-@@ -11170,7 +11170,7 @@
+@@ -11210,7 +11210,7 @@
      },
      {
        'name': 'EnableSha1ForLocalAnchors',
@@ -20675,7 +19988,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:54-71', 'chrome_os:54-71', 'android:54-71'],
-@@ -11201,7 +11201,7 @@
+@@ -11241,7 +11241,7 @@
      },
      {
        'name': 'EnableCommonNameFallbackForLocalAnchors',
@@ -20684,7 +19997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:58-65', 'chrome_os:58-65', 'android:58-65'],
-@@ -11232,7 +11232,7 @@
+@@ -11272,7 +11272,7 @@
      },
      {
        'name': 'EnableSymantecLegacyInfrastructure',
@@ -20693,7 +20006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:66-75', 'chrome_os:66-75', 'android:66-75'],
-@@ -11265,7 +11265,7 @@
+@@ -11305,7 +11305,7 @@
      },
      {
        'name': 'BuiltinCertificateVerifierEnabled',
@@ -20701,8 +20014,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
 +      'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-       'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-'],
-@@ -11301,7 +11301,7 @@
+       'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-106'],
+@@ -11341,7 +11341,7 @@
      },
      {
        'name': 'ChromeRootStoreEnabled',
@@ -20711,7 +20024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:105-', 'chrome.mac:105-'],
-@@ -11337,7 +11337,7 @@
+@@ -11377,7 +11377,7 @@
      },
      {
        'name': 'ForceEphemeralProfiles',
@@ -20720,7 +20033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:32-'],
-@@ -11370,7 +11370,7 @@
+@@ -11410,7 +11410,7 @@
      },
      {
        'name': 'GaiaOfflineSigninTimeLimitDays',
@@ -20729,7 +20042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': -1, 'maximum': 365 },
        'supported_on': ['chrome_os:90-'],
-@@ -11395,7 +11395,7 @@
+@@ -11435,7 +11435,7 @@
      },
      {
        'name': 'SAMLOfflineSigninTimeLimit',
@@ -20738,7 +20051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': -1 },
        'supported_on': ['chrome_os:34-'],
-@@ -11419,7 +11419,7 @@
+@@ -11459,7 +11459,7 @@
      },
      {
        'name': 'GaiaLockScreenOfflineSigninTimeLimitDays',
@@ -20747,7 +20060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -11452,7 +11452,7 @@
+@@ -11492,7 +11492,7 @@
      },
      {
        'name': 'SamlLockScreenOfflineSigninTimeLimitDays',
@@ -20756,7 +20069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -11485,7 +11485,7 @@
+@@ -11525,7 +11525,7 @@
      },
      {
        'name': 'AutoCleanUpStrategy',
@@ -20765,7 +20078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -11525,7 +11525,7 @@
+@@ -11565,7 +11565,7 @@
      },
      {
        'name': 'EnableDeviceGranularReporting',
@@ -20774,7 +20087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -11555,7 +11555,7 @@
+@@ -11595,7 +11595,7 @@
      },
      {
        'name': 'ReportDeviceVersionInfo',
@@ -20783,7 +20096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:18-'],
-@@ -11585,7 +11585,7 @@
+@@ -11625,7 +11625,7 @@
      },
      {
        'name': 'ReportDeviceActivityTimes',
@@ -20792,7 +20105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:18-'],
-@@ -11615,7 +11615,7 @@
+@@ -11655,7 +11655,7 @@
      },
      {
        'name': 'ReportDeviceAudioStatus',
@@ -20801,7 +20114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -11647,7 +11647,7 @@
+@@ -11687,7 +11687,7 @@
      },
      {
        'name': 'ReportDeviceAudioStatusCheckingRateMs',
@@ -20810,7 +20123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 60000 },
        'supported_on': ['chrome_os:103-'],
-@@ -11670,7 +11670,7 @@
+@@ -11710,7 +11710,7 @@
      },
      {
        'name': 'ReportDeviceBootMode',
@@ -20819,7 +20132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:18-'],
-@@ -11700,7 +11700,7 @@
+@@ -11740,7 +11740,7 @@
      },
      {
        'name': 'ReportDeviceLocation',
@@ -20828,7 +20141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -11732,7 +11732,7 @@
+@@ -11772,7 +11772,7 @@
      },
      {
        'name': 'ReportDeviceNetworkConfiguration',
@@ -20837,7 +20150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -11764,7 +11764,7 @@
+@@ -11804,7 +11804,7 @@
      },
      {
        'name': 'ReportDeviceNetworkInterfaces',
@@ -20846,7 +20159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -11797,7 +11797,7 @@
+@@ -11837,7 +11837,7 @@
      },
      {
        'name': 'ReportDeviceNetworkStatus',
@@ -20855,7 +20168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -11829,7 +11829,7 @@
+@@ -11869,7 +11869,7 @@
      },
      {
        'name': 'ReportDeviceNetworkTelemetryCollectionRateMs',
@@ -20864,7 +20177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 60000 },
        'supported_on': ['chrome_os:103-'],
-@@ -11852,7 +11852,7 @@
+@@ -11892,7 +11892,7 @@
      },
      {
        'name': 'ReportDeviceNetworkTelemetryEventCheckingRateMs',
@@ -20873,7 +20186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 60000 },
        'supported_on': ['chrome_os:103-'],
-@@ -11875,7 +11875,7 @@
+@@ -11915,7 +11915,7 @@
      },
      {
        'name': 'ReportDeviceUsers',
@@ -20882,7 +20195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:32-'],
-@@ -11905,7 +11905,7 @@
+@@ -11945,7 +11945,7 @@
      },
      {
        'name': 'ReportDeviceHardwareStatus',
@@ -20891,7 +20204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:42-'],
-@@ -11938,7 +11938,7 @@
+@@ -11978,7 +11978,7 @@
      },
      {
        'name': 'ReportDeviceSessionStatus',
@@ -20900,7 +20213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:42-'],
-@@ -11968,7 +11968,7 @@
+@@ -12008,7 +12008,7 @@
      },
      {
        'name': 'ReportDeviceSecurityStatus',
@@ -20909,7 +20222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -12000,7 +12000,7 @@
+@@ -12040,7 +12040,7 @@
      },
      {
        'name': 'ReportDeviceGraphicsStatus',
@@ -20918,7 +20231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -12033,7 +12033,7 @@
+@@ -12073,7 +12073,7 @@
      },
      {
        'name': 'ReportDeviceCrashReportInfo',
@@ -20927,7 +20240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-'],
-@@ -12066,7 +12066,7 @@
+@@ -12106,7 +12106,7 @@
      },
      {
        'name': 'ReportDeviceOsUpdateStatus',
@@ -20936,7 +20249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -12098,7 +12098,7 @@
+@@ -12138,7 +12138,7 @@
      },
      {
        'name': 'ReportDevicePowerStatus',
@@ -20945,7 +20258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:73-'],
-@@ -12118,7 +12118,7 @@
+@@ -12168,7 +12168,7 @@
      },
      {
        'name': 'ReportDevicePeripherals',
@@ -20954,7 +20267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:101-'],
-@@ -12149,7 +12149,7 @@
+@@ -12199,7 +12199,7 @@
      },
      {
        'name': 'ReportDeviceStorageStatus',
@@ -20963,7 +20276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:73-'],
-@@ -12170,7 +12170,7 @@
+@@ -12230,7 +12230,7 @@
      },
      {
        'name': 'ReportDeviceBoardStatus',
@@ -20972,7 +20285,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:73-'],
-@@ -12190,7 +12190,7 @@
+@@ -12260,7 +12260,7 @@
      },
      {
        'name': 'ReportDeviceCpuInfo',
@@ -20981,7 +20294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -12211,7 +12211,7 @@
+@@ -12291,7 +12291,7 @@
      },
      {
        'name': 'ReportDeviceTimezoneInfo',
@@ -20990,7 +20303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-'],
-@@ -12232,7 +12232,7 @@
+@@ -12322,7 +12322,7 @@
      },
      {
        'name': 'ReportDeviceMemoryInfo',
@@ -20999,7 +20312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-'],
-@@ -12253,7 +12253,7 @@
+@@ -12353,7 +12353,7 @@
      },
      {
        'name': 'ReportDeviceBacklightInfo',
@@ -21008,7 +20321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-'],
-@@ -12274,7 +12274,7 @@
+@@ -12384,7 +12384,7 @@
      },
      {
        'name': 'ReportDeviceAppInfo',
@@ -21017,7 +20330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -12295,7 +12295,7 @@
+@@ -12415,7 +12415,7 @@
      },
      {
        'name': 'ReportDeviceBluetoothInfo',
@@ -21026,7 +20339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -12316,7 +12316,7 @@
+@@ -12446,7 +12446,7 @@
      },
      {
        'name': 'ReportDeviceFanInfo',
@@ -21035,7 +20348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -12337,7 +12337,7 @@
+@@ -12477,7 +12477,7 @@
      },
      {
        'name': 'ReportDeviceVpdInfo',
@@ -21044,7 +20357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -12359,7 +12359,7 @@
+@@ -12509,7 +12509,7 @@
      },
      {
        'name': 'ReportDeviceSystemInfo',
@@ -21053,7 +20366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -12380,7 +12380,7 @@
+@@ -12540,7 +12540,7 @@
      },
      {
        'name': 'ReportDevicePrintJobs',
@@ -21062,7 +20375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -12412,7 +12412,7 @@
+@@ -12572,7 +12572,7 @@
      },
      {
        'name': 'ReportDeviceLoginLogout',
@@ -21071,7 +20384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -12444,7 +12444,7 @@
+@@ -12604,7 +12604,7 @@
      },
      {
        'name': 'ReportCRDSessions',
@@ -21080,7 +20393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:99-'],
-@@ -12476,7 +12476,7 @@
+@@ -12636,7 +12636,7 @@
      },
      {
        'name': 'ReportUploadFrequency',
@@ -21089,7 +20402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 60000 },
        'supported_on': ['chrome_os:42-'],
-@@ -12496,7 +12496,7 @@
+@@ -12656,7 +12656,7 @@
      },
      {
        'name': 'ReportArcStatusEnabled',
@@ -21098,7 +20411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:55-'],
-@@ -12525,7 +12525,7 @@
+@@ -12685,7 +12685,7 @@
      },
      {
        'name': 'ReportCrostiniUsageEnabled',
@@ -21107,7 +20420,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -12554,7 +12554,7 @@
+@@ -12714,7 +12714,7 @@
+     },
+     {
+       'name': 'ReportDeviceSignalStrengthEventDrivenTelemetry',
+-      'owners': ['anasr@google.com', 'cros-reporting-team@google.com'],
++      'owners': ['anasr@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'],
+       'type': 'string-enum-list',
+       'schema': {
+         'type': 'array',
+@@ -12760,7 +12760,7 @@
      },
      {
        'name': 'HeartbeatEnabled',
@@ -21116,7 +20438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:43-'],
-@@ -12584,7 +12584,7 @@
+@@ -12790,7 +12790,7 @@
      },
      {
        'name': 'HeartbeatFrequency',
@@ -21125,7 +20447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 30000 },
        'supported_on': ['chrome_os:43-'],
-@@ -12604,7 +12604,7 @@
+@@ -12810,7 +12810,7 @@
      },
      {
        'name': 'LogUploadEnabled',
@@ -21134,7 +20456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:46-'],
-@@ -12634,7 +12634,7 @@
+@@ -12840,7 +12840,7 @@
      },
      {
        'name': 'DeviceUserWhitelist',
@@ -21143,7 +20465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -12647,11 +12647,11 @@
+@@ -12853,11 +12853,11 @@
          'dynamic_refresh': True,
        },
        'deprecated': True,
@@ -21157,7 +20479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the <ph name="DEVICE_ALLOW_NEW_USERS_POLICY_NAME">DeviceAllowNewUsers</ph> policy to be configured appropriately.
  
-@@ -12662,7 +12662,7 @@
+@@ -12868,7 +12868,7 @@
      },
      {
        'name': 'DeviceUserAllowlist',
@@ -21166,7 +20488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -12674,11 +12674,11 @@
+@@ -12880,11 +12880,11 @@
        'features': {
          'dynamic_refresh': True,
        },
@@ -21180,7 +20502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the <ph name="DEVICE_ALLOW_NEW_USERS_POLICY_NAME">DeviceAllowNewUsers</ph> policy to be configured appropriately.
        If <ph name="DEVICE_FAMILY_LINK_ACCOUNTS_ALLOWED_POLICY_NAME">DeviceFamilyLinkAccountsAllowed</ph> is enabled, Family Link users will be allowed additionally to the accounts defined in this policy.''',
-@@ -12686,7 +12686,7 @@
+@@ -12892,7 +12892,7 @@
      },
      {
        'name': 'DeviceAllowNewUsers',
@@ -21189,7 +20511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:12-'],
-@@ -12717,7 +12717,7 @@
+@@ -12923,7 +12923,7 @@
      },
      {
        'name': 'DeviceGuestModeEnabled',
@@ -21198,7 +20520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:12-'],
-@@ -12745,7 +12745,7 @@
+@@ -12951,7 +12951,7 @@
      },
      {
        'name': 'DeviceShowUserNamesOnSignin',
@@ -21207,7 +20529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:12-'],
-@@ -12775,7 +12775,7 @@
+@@ -12981,7 +12981,7 @@
      },
      {
        'name': 'DeviceDataRoamingEnabled',
@@ -21216,7 +20538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:12-'],
-@@ -12803,7 +12803,7 @@
+@@ -13009,7 +13009,7 @@
      },
      {
        'name': 'DeviceMetricsReportingEnabled',
@@ -21225,7 +20547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:14-'],
-@@ -12825,7 +12825,7 @@
+@@ -13031,7 +13031,7 @@
      },
      {
        'name': 'ChromeOsReleaseChannel',
@@ -21234,7 +20556,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -12863,7 +12863,7 @@
+@@ -13069,7 +13069,7 @@
      },
      {
        'name': 'ChromeOsReleaseChannelDelegated',
@@ -21243,7 +20565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:19-'],
-@@ -12881,7 +12881,7 @@
+@@ -13087,7 +13087,7 @@
      },
      {
        'name': 'DeviceReleaseLtsTag',
@@ -21252,7 +20574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:86-'],
-@@ -12897,7 +12897,7 @@
+@@ -13103,7 +13103,7 @@
      },
      {
        'name': 'DeviceChannelDowngradeBehavior',
@@ -21261,7 +20583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -12942,7 +12942,7 @@
+@@ -13148,7 +13148,7 @@
      },
      {
        'name': 'DeviceEphemeralUsersEnabled',
@@ -21270,7 +20592,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:19-'],
-@@ -12958,7 +12958,7 @@
+@@ -13164,7 +13164,7 @@
      },
      {
        'name': 'DeviceStartUpUrls',
@@ -21279,7 +20601,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -12970,7 +12970,7 @@
+@@ -13176,7 +13176,7 @@
          'dynamic_refresh': True,
        },
        'deprecated': True,
@@ -21288,7 +20610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 137,
        'caption': '''Load specified urls on demo login''',
        'tags': [],
-@@ -12980,7 +12980,7 @@
+@@ -13186,7 +13186,7 @@
      },
      {
        'name': 'DeviceIdleLogoutTimeout',
@@ -21297,7 +20619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:19-40'],
-@@ -13001,7 +13001,7 @@
+@@ -13207,7 +13207,7 @@
      },
      {
        'name': 'DeviceIdleLogoutWarningDuration',
@@ -21306,7 +20628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:19-40'],
-@@ -13022,7 +13022,7 @@
+@@ -13228,7 +13228,7 @@
      },
      {
        'name': 'DeviceLoginScreenSaverId',
@@ -21315,7 +20637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:19-40'],
-@@ -13041,7 +13041,7 @@
+@@ -13247,7 +13247,7 @@
      },
      {
        'name': 'DeviceLoginScreenSaverTimeout',
@@ -21324,7 +20646,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:19-40'],
-@@ -13062,7 +13062,7 @@
+@@ -13268,7 +13268,7 @@
      },
      {
        'name': 'DeviceAppPack',
@@ -21333,7 +20655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13074,7 +13074,7 @@
+@@ -13280,7 +13280,7 @@
          'dynamic_refresh': True,
        },
        'deprecated': True,
@@ -21342,7 +20664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 135,
        'caption': '''List of AppPack extensions''',
        'tags': [],
-@@ -13086,7 +13086,7 @@
+@@ -13292,7 +13292,7 @@
      },
      {
        'name': 'DeviceAutoUpdateDisabled',
@@ -21351,7 +20673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:19-'],
-@@ -13106,7 +13106,7 @@
+@@ -13312,7 +13312,7 @@
      },
      {
        'name': 'DeviceAutoUpdateP2PEnabled',
@@ -21360,7 +20682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:31-'],
-@@ -13127,7 +13127,7 @@
+@@ -13333,7 +13333,7 @@
      },
      {
        'name': 'DeviceRollbackAllowedMilestones',
@@ -21369,7 +20691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -13155,7 +13155,7 @@
+@@ -13361,7 +13361,7 @@
      },
      {
        'name': 'DeviceRollbackToTargetVersion',
@@ -21378,7 +20700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -13194,7 +13194,7 @@
+@@ -13400,7 +13400,7 @@
      },
      {
        'name': 'DeviceTargetVersionPrefix',
@@ -21387,7 +20709,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:19-'],
-@@ -13219,7 +13219,7 @@
+@@ -13425,7 +13425,7 @@
      },
      {
        'name': 'DeviceTargetVersionSelector',
@@ -21396,7 +20718,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:95-'],
-@@ -13248,7 +13248,7 @@
+@@ -13454,7 +13454,7 @@
      },
      {
        'name': 'DeviceUpdateScatterFactor',
@@ -21405,7 +20727,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:20-'],
-@@ -13264,7 +13264,7 @@
+@@ -13470,7 +13470,7 @@
      },
      {
        'name': 'DeviceUpdateAllowedConnectionTypes',
@@ -21414,7 +20736,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13285,7 +13285,7 @@
+@@ -13491,7 +13491,7 @@
      },
      {
        'name': 'DeviceUpdateHttpDownloadsEnabled',
@@ -21423,7 +20745,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -13305,7 +13305,7 @@
+@@ -13511,7 +13511,7 @@
      },
      {
        'name': 'DeviceLocalAccounts',
@@ -21432,7 +20754,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13327,7 +13327,7 @@
+@@ -13533,7 +13533,7 @@
      },
      {
        'name': 'KioskCRXManifestUpdateURLIgnored',
@@ -21441,7 +20763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -13362,7 +13362,7 @@
+@@ -13568,7 +13568,7 @@
      },
      {
        'name': 'DeviceLocalAccountAutoLoginId',
@@ -21450,7 +20772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:26-'],
-@@ -13381,7 +13381,7 @@
+@@ -13587,7 +13587,7 @@
      },
      {
        'name': 'DeviceLocalAccountAutoLoginDelay',
@@ -21459,7 +20781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:26-'],
-@@ -13402,7 +13402,7 @@
+@@ -13608,7 +13608,7 @@
      },
      {
        'name': 'DeviceLocalAccountAutoLoginBailoutEnabled',
@@ -21468,7 +20790,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:28-'],
-@@ -13421,7 +13421,7 @@
+@@ -13627,7 +13627,7 @@
      },
      {
        'name': 'DeviceLocalAccountPromptForNetworkWhenOffline',
@@ -21477,7 +20799,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:33-'],
-@@ -13440,7 +13440,7 @@
+@@ -13646,7 +13646,7 @@
      },
      {
        'name': 'DeviceLocalAccountManagedSessionEnabled',
@@ -21486,7 +20808,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -13454,7 +13454,7 @@
+@@ -13660,7 +13660,7 @@
        'caption': '''Allow managed session on device''',
        'tags': [],
        'desc': '''Note that this policy is deprecated and will be removed in <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph> version 88. Public sessions are no longer supported. Please use <ph name="DEVICE_LOCAL_ACCOUNTS_POLICY_NAME">DeviceLocalAccounts</ph> to configure managed-guest sessions instead.
@@ -21495,7 +20817,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If this policy is set to true or left unset, managed guest session will take on "Managed Session" behaviour which lifts many of the restrictions that are in place for regular "Public Sessions".
  
-@@ -13462,7 +13462,7 @@
+@@ -13668,7 +13668,7 @@
      },
      {
        'name': 'DeviceBlockDevmode',
@@ -21504,7 +20826,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:37-'],
-@@ -13481,7 +13481,7 @@
+@@ -13687,7 +13687,7 @@
        'arc_support': 'This policy controls <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph> developer mode only. If you want to prevent access to Android Developer Options, you need to set the <ph name="DEVELOPER_TOOLS_DISABLED_POLICY_NAME">DeveloperToolsDisabled</ph> policy.',
      }, {
        'name': 'ManagedGuestSessionAutoLaunchNotificationReduced',
@@ -21513,7 +20835,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-88'],
-@@ -13505,7 +13505,7 @@
+@@ -13711,7 +13711,7 @@
      },
      {
        'name': 'ManagedGuestSessionPrivacyWarningsEnabled',
@@ -21522,7 +20844,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -13529,7 +13529,7 @@
+@@ -13735,7 +13735,7 @@
      },
      {
        'name': 'BackgroundModeEnabled',
@@ -21531,7 +20853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
-@@ -13550,7 +13550,7 @@
+@@ -13756,7 +13756,7 @@
      },
      {
        'name': 'DriveDisabled',
@@ -21540,7 +20862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:19-'],
-@@ -13569,7 +13569,7 @@
+@@ -13775,7 +13775,7 @@
      },
      {
        'name': 'DriveDisabledOverCellular',
@@ -21549,7 +20871,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:19-'],
-@@ -13588,7 +13588,7 @@
+@@ -13794,7 +13794,7 @@
      },
      {
        'name': 'PinnedLauncherApps',
@@ -21558,7 +20880,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13600,20 +13600,20 @@
+@@ -13806,20 +13806,20 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -21582,7 +20904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:21-'],
-@@ -13634,7 +13634,7 @@
+@@ -13840,7 +13840,7 @@
      },
      {
        'name': 'DisableSafeBrowsingProceedAnyway',
@@ -21591,7 +20913,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -13656,11 +13656,11 @@
+@@ -13862,11 +13862,11 @@
  
        Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears.
  
@@ -21605,7 +20927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:44-84', 'chrome_os:44-84'],
-@@ -13677,11 +13677,11 @@
+@@ -13883,11 +13883,11 @@
  
        Setting this policy to false stops users from choosing to send some system information and page content to Google servers. If this setting is true or not configured, then users will be allowed to send some system information and page content to Safe Browsing to help detect dangerous apps and sites.
  
@@ -21619,7 +20941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:22-', 'chrome_os:22-'],
-@@ -13718,7 +13718,7 @@
+@@ -13924,7 +13924,7 @@
      },
      {
        'name': 'ExternalStorageDisabled',
@@ -21628,7 +20950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:22-'],
-@@ -13736,7 +13736,7 @@
+@@ -13942,7 +13942,7 @@
      },
      {
        'name': 'ExternalStorageReadOnly',
@@ -21637,7 +20959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 343,
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -13754,7 +13754,7 @@
+@@ -13960,7 +13960,7 @@
      },
      {
        'name': 'AudioOutputAllowed',
@@ -21646,7 +20968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:23-'],
-@@ -13774,7 +13774,7 @@
+@@ -13980,7 +13980,7 @@
      },
      {
        'name': 'AudioCaptureAllowed',
@@ -21655,7 +20977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:25-', 'chrome_os:23-'],
-@@ -13796,7 +13796,7 @@
+@@ -14002,7 +14002,7 @@
      },
      {
        'name': 'AudioCaptureAllowedUrls',
@@ -21664,7 +20986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13814,11 +13814,11 @@
+@@ -14020,11 +14020,11 @@
        'tags': ['website-sharing'],
        'desc': '''Setting the policy means you specify the URL list whose patterns get matched to the security origin of the requesting URL. A match grants access to audio capture devices without prompt
  
@@ -21678,7 +21000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:25-', 'chrome_os:25-'],
-@@ -13839,7 +13839,7 @@
+@@ -14045,7 +14045,7 @@
      },
      {
        'name': 'VideoCaptureAllowedUrls',
@@ -21687,7 +21009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -13857,11 +13857,11 @@
+@@ -14063,11 +14063,11 @@
        'tags': ['website-sharing'],
        'desc': '''Setting the policy means you specify the URL list whose patterns get matched to the security origin of the requesting URL. A match grants access to video capture devices without prompt
  
@@ -21701,7 +21023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:22-', 'chrome.*:22-'],
-@@ -13878,7 +13878,7 @@
+@@ -14084,7 +14084,7 @@
      },
      {
        'name': 'SystemTimezone',
@@ -21710,7 +21032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:22-'],
-@@ -13898,7 +13898,7 @@
+@@ -14104,7 +14104,7 @@
      },
      {
        'name': 'SystemUse24HourClock',
@@ -21719,7 +21041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:30-'],
-@@ -13920,7 +13920,7 @@
+@@ -14126,7 +14126,7 @@
      },
      {
        'name': 'TouchVirtualKeyboardEnabled',
@@ -21728,7 +21050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:37-' ],
-@@ -13947,7 +13947,7 @@
+@@ -14153,7 +14153,7 @@
      },
      {
        'name': 'ShowLogoutButtonInTray',
@@ -21737,7 +21059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:25-'],
-@@ -13965,7 +13965,7 @@
+@@ -14171,7 +14171,7 @@
      },
      {
        'name': 'BuiltInDnsClientEnabled',
@@ -21746,7 +21068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -13992,7 +13992,7 @@
+@@ -14198,7 +14198,7 @@
      },
      {
        'name': 'DnsOverHttpsMode',
@@ -21755,7 +21077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -14048,7 +14048,7 @@
+@@ -14254,7 +14254,7 @@
      },
      {
        'name': 'DnsOverHttpsTemplates',
@@ -21764,7 +21086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -14077,7 +14077,7 @@
+@@ -14283,7 +14283,7 @@
      },
      {
        'name': 'AdditionalDnsQueryTypesEnabled',
@@ -21773,7 +21095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -14115,7 +14115,7 @@
+@@ -14321,7 +14321,7 @@
      },
      {
        'name': 'ShelfAutoHideBehavior',
@@ -21782,7 +21104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -14152,7 +14152,7 @@
+@@ -14358,7 +14358,7 @@
      },
      {
        'name': 'ShelfAlignment',
@@ -21791,7 +21113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
  # In shelf_prefs.cc, there are 3 const char[] defining kShelfAlignmentLocal values:
  # ash::kShelfAlignmentBottom = "Bottom", ash::kShelfAlignmnetLeft = "Left",
-@@ -14207,7 +14207,7 @@
+@@ -14413,7 +14413,7 @@
      },
      {
        'name': 'SystemFeaturesDisableList',
@@ -21800,7 +21122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -14293,7 +14293,7 @@
+@@ -14499,7 +14499,7 @@
      },
      {
        'name': 'SystemFeaturesDisableMode',
@@ -21809,7 +21131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -14335,7 +14335,7 @@
+@@ -14541,7 +14541,7 @@
      },
      {
        'name': 'FloatingAccessibilityMenuEnabled',
@@ -21818,7 +21140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:84-'],
-@@ -14355,7 +14355,7 @@
+@@ -14561,7 +14561,7 @@
      },
      {
        'name': 'UserDisplayName',
@@ -21827,7 +21149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:25-'],
-@@ -14377,7 +14377,7 @@
+@@ -14583,7 +14583,7 @@
      },
      {
        'name': 'SessionLengthLimit',
@@ -21836,7 +21158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:25-'],
-@@ -14399,7 +14399,7 @@
+@@ -14605,7 +14605,7 @@
      },
      {
        'name': 'FullscreenAllowed',
@@ -21845,7 +21167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'],
-@@ -14421,7 +14421,7 @@
+@@ -14627,7 +14627,7 @@
        'id': 804,
        'name': 'FullscreenAlertEnabled',
        'caption': '''Enable fullscreen alert''',
@@ -21854,7 +21176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean'},
        'supported_on': ['chrome_os:88-'],
-@@ -14454,7 +14454,7 @@
+@@ -14660,7 +14660,7 @@
        'id': 930,
        'name': 'KeepFullscreenWithoutNotificationUrlAllowList',
        'caption': '''List of URLs which are allowed to remain in full screen mode without showing a notification''',
@@ -21863,7 +21185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -14473,13 +14473,13 @@
+@@ -14679,13 +14679,13 @@
        'tags': [],
        'desc': '''Configure a list of URLs that are allowed to stay in full screen mode without showing a notification when the device returns from the lock screen.
  
@@ -21879,7 +21201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14510,7 +14510,7 @@
+@@ -14716,7 +14716,7 @@
      },
      {
        'name': 'ScreenOffDelayAC',
@@ -21888,7 +21210,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14541,7 +14541,7 @@
+@@ -14747,7 +14747,7 @@
      },
      {
        'name': 'ScreenLockDelayAC',
@@ -21897,7 +21219,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14574,7 +14574,7 @@
+@@ -14780,7 +14780,7 @@
      },
      {
        'name': 'IdleWarningDelayAC',
@@ -21906,7 +21228,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14605,7 +14605,7 @@
+@@ -14811,7 +14811,7 @@
      },
      {
        'name': 'IdleDelayAC',
@@ -21915,7 +21237,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14634,7 +14634,7 @@
+@@ -14840,7 +14840,7 @@
      },
      {
        'name': 'ScreenDimDelayBattery',
@@ -21924,7 +21246,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14665,7 +14665,7 @@
+@@ -14871,7 +14871,7 @@
      },
      {
        'name': 'ScreenOffDelayBattery',
@@ -21933,7 +21255,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14696,7 +14696,7 @@
+@@ -14902,7 +14902,7 @@
      },
      {
        'name': 'ScreenLockDelayBattery',
@@ -21942,7 +21264,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14729,7 +14729,7 @@
+@@ -14935,7 +14935,7 @@
      },
      {
        'name': 'IdleWarningDelayBattery',
@@ -21951,7 +21273,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14760,7 +14760,7 @@
+@@ -14966,7 +14966,7 @@
      },
      {
        'name': 'IdleDelayBattery',
@@ -21960,7 +21282,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -14789,7 +14789,7 @@
+@@ -14995,7 +14995,7 @@
      },
      {
        'name': 'IdleAction',
@@ -21969,7 +21291,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -14836,7 +14836,7 @@
+@@ -15042,7 +15042,7 @@
      },
      {
        'name': 'IdleActionAC',
@@ -21978,7 +21300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -14885,7 +14885,7 @@
+@@ -15091,7 +15091,7 @@
      },
      {
        'name': 'IdleActionBattery',
@@ -21987,7 +21309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -14934,7 +14934,7 @@
+@@ -15140,7 +15140,7 @@
      },
      {
        'name': 'LidCloseAction',
@@ -21996,7 +21318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -14979,7 +14979,7 @@
+@@ -15185,7 +15185,7 @@
      },
      {
        'name': 'PowerManagementUsesAudioActivity',
@@ -22005,7 +21327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:26-'],
-@@ -14997,7 +14997,7 @@
+@@ -15203,7 +15203,7 @@
      },
      {
        'name': 'PowerManagementUsesVideoActivity',
@@ -22014,7 +21336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:26-'],
-@@ -15016,7 +15016,7 @@
+@@ -15222,7 +15222,7 @@
      },
      {
        'name': 'PresentationIdleDelayScale',
@@ -22023,7 +21345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:26-28'],
-@@ -15033,7 +15033,7 @@
+@@ -15239,7 +15239,7 @@
      },
      {
        'name': 'PresentationScreenDimDelayScale',
@@ -22032,7 +21354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:29-'],
-@@ -15053,7 +15053,7 @@
+@@ -15259,7 +15259,7 @@
      },
      {
        'name': 'AllowWakeLocks',
@@ -22041,7 +21363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:71-'],
-@@ -15082,7 +15082,7 @@
+@@ -15288,7 +15288,7 @@
      },
      {
        'name': 'AllowScreenWakeLocks',
@@ -22050,7 +21372,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:28-'],
-@@ -15111,7 +15111,7 @@
+@@ -15317,7 +15317,7 @@
      },
      {
        'name': 'UserActivityScreenDimDelayScale',
@@ -22059,7 +21381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:29-'],
-@@ -15131,7 +15131,7 @@
+@@ -15337,7 +15337,7 @@
      },
      {
        'name': 'WaitForInitialUserActivity',
@@ -22068,7 +21390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:32-'],
-@@ -15149,7 +15149,7 @@
+@@ -15355,7 +15355,7 @@
      },
      {
        'name': 'PowerManagementIdleSettings',
@@ -22077,7 +21399,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -15253,7 +15253,7 @@
+@@ -15459,7 +15459,7 @@
      },
      {
        'name': 'ScreenLockDelays',
@@ -22086,7 +21408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -15290,7 +15290,7 @@
+@@ -15496,7 +15496,7 @@
      },
      {
        'name': 'DeviceLoginScreenPowerManagement',
@@ -22095,7 +21417,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -15378,7 +15378,7 @@
+@@ -15584,7 +15584,7 @@
      },
      {
        'name': 'DeviceAllowRedeemChromeOsRegistrationOffers',
@@ -22104,7 +21426,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:26-'],
-@@ -15407,7 +15407,7 @@
+@@ -15613,7 +15613,7 @@
      },
      {
        'name': 'TermsOfServiceURL',
@@ -22113,7 +21435,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:26-'],
-@@ -15427,7 +15427,7 @@
+@@ -15633,7 +15633,7 @@
      },
      {
        'name': 'ShowAccessibilityOptionsInSystemTrayMenu',
@@ -22122,7 +21444,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:27-'],
-@@ -15448,7 +15448,7 @@
+@@ -15654,7 +15654,7 @@
      },
      {
        'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu',
@@ -22131,7 +21453,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:80-'],
-@@ -15469,7 +15469,7 @@
+@@ -15675,7 +15675,7 @@
      },
      {
        'name': 'LargeCursorEnabled',
@@ -22140,7 +21462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -15488,7 +15488,7 @@
+@@ -15694,7 +15694,7 @@
      },
      {
        'name': 'SpokenFeedbackEnabled',
@@ -22149,7 +21471,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -15507,7 +15507,7 @@
+@@ -15713,7 +15713,7 @@
      },
      {
        'name': 'HighContrastEnabled',
@@ -22158,7 +21480,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -15526,7 +15526,7 @@
+@@ -15732,7 +15732,7 @@
      },
      {
        'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled',
@@ -22167,7 +21489,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -15552,7 +15552,7 @@
+@@ -15758,7 +15758,7 @@
      },
      {
        'name': 'AccessibilityShortcutsEnabled',
@@ -22176,7 +21498,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -15577,7 +15577,7 @@
+@@ -15783,7 +15783,7 @@
      },
      {
        'name': 'VirtualKeyboardEnabled',
@@ -22185,7 +21507,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:34-'],
-@@ -15596,7 +15596,7 @@
+@@ -15802,7 +15802,7 @@
      },
      {
        'name': 'VirtualKeyboardFeatures',
@@ -22194,7 +21516,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -15648,7 +15648,7 @@
+@@ -15854,7 +15854,7 @@
      },
      {
        'name': 'StickyKeysEnabled',
@@ -22203,7 +21525,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:76-'],
-@@ -15667,7 +15667,7 @@
+@@ -15873,7 +15873,7 @@
      },
      {
        'name': 'SelectToSpeakEnabled',
@@ -22212,7 +21534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:77-'],
-@@ -15692,7 +15692,7 @@
+@@ -15898,7 +15898,7 @@
      },
      {
        'name': 'DictationEnabled',
@@ -22221,7 +21543,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15717,7 +15717,7 @@
+@@ -15923,7 +15923,7 @@
      },
      {
        'name': 'KeyboardFocusHighlightEnabled',
@@ -22230,7 +21552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15744,7 +15744,7 @@
+@@ -15950,7 +15950,7 @@
      },
      {
        'name': 'CursorHighlightEnabled',
@@ -22239,7 +21561,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15771,7 +15771,7 @@
+@@ -15977,7 +15977,7 @@
      },
      {
        'name': 'CaretHighlightEnabled',
@@ -22248,7 +21570,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15798,7 +15798,7 @@
+@@ -16004,7 +16004,7 @@
      },
      {
        'name': 'MonoAudioEnabled',
@@ -22257,7 +21579,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15825,7 +15825,7 @@
+@@ -16031,7 +16031,7 @@
      },
      {
        'name': 'AutoclickEnabled',
@@ -22266,7 +21588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15852,7 +15852,7 @@
+@@ -16058,7 +16058,7 @@
      },
      {
        'name': 'KeyboardDefaultToFunctionKeys',
@@ -22275,7 +21597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:35-'],
-@@ -15871,7 +15871,7 @@
+@@ -16077,7 +16077,7 @@
      },
      {
        'name': 'ScreenMagnifierType',
@@ -22284,7 +21606,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -15910,7 +15910,7 @@
+@@ -16116,7 +16116,7 @@
      },
      {
        'name': 'DeviceLoginScreenDefaultLargeCursorEnabled',
@@ -22293,7 +21615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -15932,7 +15932,7 @@
+@@ -16138,7 +16138,7 @@
      },
      {
        'name': 'DeviceLoginScreenLargeCursorEnabled',
@@ -22302,7 +21624,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:78-'],
-@@ -15957,7 +15957,7 @@
+@@ -16163,7 +16163,7 @@
      },
      {
        'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled',
@@ -22311,7 +21633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -15979,7 +15979,7 @@
+@@ -16185,7 +16185,7 @@
      },
      {
        'name': 'DeviceLoginScreenSpokenFeedbackEnabled',
@@ -22320,7 +21642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16004,7 +16004,7 @@
+@@ -16210,7 +16210,7 @@
      },
      {
        'name': 'DeviceLoginScreenDefaultHighContrastEnabled',
@@ -22329,7 +21651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -16026,7 +16026,7 @@
+@@ -16232,7 +16232,7 @@
      },
      {
        'name': 'DeviceLoginScreenHighContrastEnabled',
@@ -22338,7 +21660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16051,7 +16051,7 @@
+@@ -16257,7 +16257,7 @@
      },
      {
        'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled',
@@ -22347,7 +21669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:34-'],
-@@ -16076,7 +16076,7 @@
+@@ -16282,7 +16282,7 @@
      },
      {
        'name': 'DeviceLoginScreenVirtualKeyboardEnabled',
@@ -22356,7 +21678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16101,7 +16101,7 @@
+@@ -16307,7 +16307,7 @@
      },
      {
        'name': 'PrimaryMouseButtonSwitch',
@@ -22365,7 +21687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -16126,7 +16126,7 @@
+@@ -16332,7 +16332,7 @@
      },
      {
        'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch',
@@ -22374,7 +21696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:81-'],
-@@ -16151,7 +16151,7 @@
+@@ -16357,7 +16357,7 @@
      },
      {
        'name': 'SharedClipboardEnabled',
@@ -22383,7 +21705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:79-', 'chrome_os:79-', 'android:79-'],
-@@ -16178,7 +16178,7 @@
+@@ -16384,7 +16384,7 @@
      },
      {
        'name': 'DeviceLoginScreenDefaultScreenMagnifierType',
@@ -22392,7 +21714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -16222,7 +16222,7 @@
+@@ -16428,7 +16428,7 @@
      },
      {
        'name': 'DeviceLoginScreenScreenMagnifierType',
@@ -22401,7 +21723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -16269,7 +16269,7 @@
+@@ -16475,7 +16475,7 @@
      },
      {
        'name': 'DeviceLoginScreenDictationEnabled',
@@ -22410,7 +21732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16294,7 +16294,7 @@
+@@ -16500,7 +16500,7 @@
      },
      {
        'name': 'DeviceLoginScreenSelectToSpeakEnabled',
@@ -22419,7 +21741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16319,7 +16319,7 @@
+@@ -16525,7 +16525,7 @@
      },
      {
        'name': 'DeviceLoginScreenCursorHighlightEnabled',
@@ -22428,7 +21750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16344,7 +16344,7 @@
+@@ -16550,7 +16550,7 @@
      },
      {
        'name': 'DeviceLoginScreenCaretHighlightEnabled',
@@ -22437,7 +21759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16369,7 +16369,7 @@
+@@ -16575,7 +16575,7 @@
      },
      {
        'name': 'DeviceLoginScreenMonoAudioEnabled',
@@ -22446,7 +21768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16396,7 +16396,7 @@
+@@ -16602,7 +16602,7 @@
      },
      {
        'name': 'DeviceLoginScreenAutoclickEnabled',
@@ -22455,7 +21777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16423,7 +16423,7 @@
+@@ -16629,7 +16629,7 @@
      },
      {
        'name': 'DeviceLoginScreenStickyKeysEnabled',
@@ -22464,7 +21786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16448,7 +16448,7 @@
+@@ -16654,7 +16654,7 @@
      },
      {
        'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled',
@@ -22473,7 +21795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -16475,7 +16475,7 @@
+@@ -16681,7 +16681,7 @@
      },
      {
        'name': 'HideWebStoreIcon',
@@ -22482,7 +21804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:26-', 'chrome_os:68-'],
-@@ -16496,7 +16496,7 @@
+@@ -16702,7 +16702,7 @@
      },
      {
        'name': 'DeviceStartUpFlags',
@@ -22491,7 +21813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -16518,7 +16518,7 @@
+@@ -16724,7 +16724,7 @@
      },
      {
        'name': 'UptimeLimit',
@@ -22500,7 +21822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:29-'],
-@@ -16539,7 +16539,7 @@
+@@ -16745,7 +16745,7 @@
      },
      {
        'name': 'RebootAfterUpdate',
@@ -22509,7 +21831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:29-'],
-@@ -16563,7 +16563,7 @@
+@@ -16769,7 +16769,7 @@
      },
      {
        'name': 'VariationsRestrictParameter',
@@ -22518,7 +21840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:27-', 'android:34-'],
-@@ -16585,7 +16585,7 @@
+@@ -16791,7 +16791,7 @@
      },
      {
        'name': 'DeviceVariationsRestrictParameter',
@@ -22527,7 +21849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:28-'],
-@@ -16606,7 +16606,7 @@
+@@ -16812,7 +16812,7 @@
      },
      {
        'name': 'ChromeVariations',
@@ -22536,7 +21858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -16644,7 +16644,7 @@
+@@ -16850,7 +16850,7 @@
        'tags': [],
        'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
  
@@ -22545,7 +21867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        Setting the <ph name="VARIATIONS_ENABLED_OPTION_NAME">VariationsEnabled</ph> (value 0), or leaving the policy not set allows all variations to be applied to the browser.
  
-@@ -16654,7 +16654,7 @@
+@@ -16860,7 +16860,7 @@
      },
      {
        'name': 'DeviceChromeVariations',
@@ -22554,7 +21876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -16689,7 +16689,7 @@
+@@ -16895,7 +16895,7 @@
        'tags': [],
        'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph> device.
  
@@ -22563,7 +21885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        Setting the <ph name="VARIATIONS_ENABLED_OPTION_NAME">VariationsEnabled</ph> (value 0), or leaving the policy not set allows all variations to be applied to <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph>.
  
-@@ -16699,7 +16699,7 @@
+@@ -16905,7 +16905,7 @@
      },
      {
        'name': 'AttestationEnabledForDevice',
@@ -22572,7 +21894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:28-'],
-@@ -16718,7 +16718,7 @@
+@@ -16924,7 +16924,7 @@
      },
      {
        'name': 'AttestationEnabledForUser',
@@ -22581,7 +21903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:28-'],
-@@ -16736,7 +16736,7 @@
+@@ -16942,7 +16942,7 @@
      },
      {
        'name': 'AttestationExtensionAllowlist',
@@ -22590,7 +21912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -16757,7 +16757,7 @@
+@@ -16963,7 +16963,7 @@
      },
      {
        'name': 'AttestationExtensionWhitelist',
@@ -22599,7 +21921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -16781,7 +16781,7 @@
+@@ -16987,7 +16987,7 @@
      },
      {
        'name': 'AttestationForContentProtectionEnabled',
@@ -22608,7 +21930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:31-'],
-@@ -16800,7 +16800,7 @@
+@@ -17006,7 +17006,7 @@
      },
      {
        'name': 'SuppressChromeFrameTurndownPrompt',
@@ -22617,7 +21939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': '''Suppress the <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> turndown prompt''',
        'tags': [],
        'desc': '''Suppresses the turndown prompt that appears when a site is rendered by <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>.''',
-@@ -16816,7 +16816,7 @@
+@@ -17022,7 +17022,7 @@
      },
      {
        'name': 'SupervisedUsersEnabled',
@@ -22626,7 +21948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'deprecated': True,
-@@ -16839,7 +16839,7 @@
+@@ -17045,7 +17045,7 @@
      },
      {
        'name': 'SupervisedUserCreationEnabled',
@@ -22635,7 +21957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'deprecated': True,
-@@ -16863,7 +16863,7 @@
+@@ -17069,7 +17069,7 @@
        # It, however, needs to be here both because this is the source of the list of Chrome's App
        # Restrictions on Android, and to avoid possible future naming conflicts with policies.
        'name': 'SupervisedUserContentProviderEnabled',
@@ -22644,7 +21966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'deprecated': True,
-@@ -16882,7 +16882,7 @@
+@@ -17088,7 +17088,7 @@
      },
      {
        'name': 'ManagedBookmarks',
@@ -22653,7 +21975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -16916,20 +16916,20 @@
+@@ -17122,20 +17122,20 @@
            "toplevel_name": "My managed bookmarks folder"
          }, {
            "name": "Google",
@@ -22678,7 +22000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
              }
            ]
          }
-@@ -16937,13 +16937,13 @@
+@@ -17143,13 +17143,13 @@
        'id': 227,
        'caption': '''Managed Bookmarks''',
        'tags': [],
@@ -22694,7 +22016,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'deprecated': True,
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -16962,7 +16962,7 @@
+@@ -17168,7 +17168,7 @@
      },
      {
        'name': 'UserAvatarImage',
@@ -22703,7 +22025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -16999,7 +16999,7 @@
+@@ -17205,7 +17205,7 @@
      },
      {
        'name': 'WallpaperImage',
@@ -22712,7 +22034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -17034,7 +17034,7 @@
+@@ -17240,7 +17240,7 @@
      },
      {
        'name': 'EnableDeprecatedWebPlatformFeatures',
@@ -22721,7 +22043,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -17073,7 +17073,7 @@
+@@ -17279,7 +17279,7 @@
      },
      {
        'name': 'DeviceTransferSAMLCookies',
@@ -22730,7 +22052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:38-'],
-@@ -17099,7 +17099,7 @@
+@@ -17305,7 +17305,7 @@
      },
      {
        'name': 'DeviceAutofillSAMLUsername',
@@ -22738,8 +22060,17 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
 +      'owners': ['andreydav@9oo91e.qjz9zk', 'chromeos-commercial-identity@9oo91e.qjz9zk'],
        'type': 'string',
        'schema': { 'type': 'string' },
-       'future_on': ['chrome_os'],
-@@ -17124,7 +17124,7 @@
+       'supported_on': ['chrome_os:107-'],
+@@ -17330,7 +17330,7 @@
+     },
+     {
+       'name': 'RecoveryFactorBehavior',
+-      'owners': ['anastasiian@chromium.org', 'cros-lurs@google.com'],
++      'owners': ['anastasiian@ch40m1um.qjz9zk', 'cros-lurs@9oo91e.qjz9zk'],
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+       'items': [
+@@ -17368,7 +17368,7 @@
      },
      {
        'name': 'EasyUnlockAllowed',
@@ -22748,7 +22079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:38-'],
-@@ -17145,7 +17145,7 @@
+@@ -17389,7 +17389,7 @@
      },
      {
        'name': 'SessionLocales',
@@ -22757,7 +22088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17173,7 +17173,7 @@
+@@ -17417,7 +17417,7 @@
      },
      {
        'name': 'BrowserGuestModeEnabled',
@@ -22766,7 +22097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:38-', 'chrome_os:100-'],
-@@ -17194,7 +17194,7 @@
+@@ -17438,7 +17438,7 @@
      },
      {
        'name': 'BrowserGuestModeEnforced',
@@ -22775,7 +22106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:77-'],
-@@ -17213,7 +17213,7 @@
+@@ -17457,7 +17457,7 @@
      },
      {
        'name': 'BrowserAddPersonEnabled',
@@ -22784,7 +22115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:39-', 'chrome_os:100-'],
-@@ -17234,7 +17234,7 @@
+@@ -17478,7 +17478,7 @@
      },
      {
        'name': 'ForceBrowserSignin',
@@ -22793,7 +22124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'deprecated': True,
        'schema': { 'type': 'boolean' },
-@@ -17256,7 +17256,7 @@
+@@ -17500,7 +17500,7 @@
      },
      {
        'name': 'BrowserSignin',
@@ -22802,7 +22133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -17296,13 +17296,13 @@
+@@ -17540,13 +17540,13 @@
  
        If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser. On all platforms except <ph name="IOS_NAME">iOS</ph>, the user is automatically signed in to the browser when signed in to Google web services like Gmail. Being signed in to the browser means the user's account information will be kept by the browser. However, it does not mean that <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Sync will be turned on by default; the user must separately opt-in to use this feature. Enabling this policy will prevent the user from turning off the setting that allows browser sign-in. To control the availability of <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Sync, use the <ph name="SYNC_POLICY_NAME">SyncDisabled</ph> policy.
  
@@ -22818,7 +22149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -17363,7 +17363,7 @@
+@@ -17607,7 +17607,7 @@
      },
      {
        'name': 'SSLVersionFallbackMin',
@@ -22827,7 +22158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -17408,7 +17408,7 @@
+@@ -17652,7 +17652,7 @@
      },
      {
        'name': 'SSLVersionMax',
@@ -22836,7 +22167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -17487,7 +17487,7 @@
+@@ -17731,7 +17731,7 @@
      },
      {
        'name': 'CertificateTransparencyEnforcementDisabledForUrls',
@@ -22845,7 +22176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17511,11 +17511,11 @@
+@@ -17755,11 +17755,11 @@
  
        Leaving the policy unset means that if certificates requiring disclosure through Certificate Transparency aren't disclosed, then <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> doesn't trust those certificates.
  
@@ -22859,7 +22190,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17549,7 +17549,7 @@
+@@ -17793,7 +17793,7 @@
      },
      {
        'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas',
@@ -22868,7 +22199,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17577,7 +17577,7 @@
+@@ -17821,7 +17821,7 @@
      },
      {
        'name': 'RC4Enabled',
@@ -22877,7 +22208,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -17602,7 +17602,7 @@
+@@ -17846,7 +17846,7 @@
      },
      {
        'name': 'DHEEnabled',
@@ -22886,7 +22217,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -17629,7 +17629,7 @@
+@@ -17873,7 +17873,7 @@
      },
      {
        'name': 'ContextualSearchEnabled',
@@ -22895,7 +22226,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -17660,7 +17660,7 @@
+@@ -17904,7 +17904,7 @@
      },
      {
        'name': 'DeviceRebootOnShutdown',
@@ -22904,7 +22235,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:41-'],
-@@ -17678,7 +17678,7 @@
+@@ -17922,7 +17922,7 @@
      },
      {
        'name': 'ExtensionCacheSize',
@@ -22913,7 +22244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:43-'],
-@@ -17697,7 +17697,7 @@
+@@ -17941,7 +17941,7 @@
      },
      {
        'name': 'DeviceLoginScreenDomainAutoComplete',
@@ -22922,7 +22253,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [ 'chrome_os:44-'],
-@@ -17715,7 +17715,7 @@
+@@ -17959,7 +17959,7 @@
      },
      {
        'name': 'ForceMaximizeOnFirstRun',
@@ -22931,7 +22262,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:43-'],
-@@ -17733,7 +17733,7 @@
+@@ -17977,7 +17977,7 @@
      },
      {
        'name': 'SSLErrorOverrideAllowed',
@@ -22940,7 +22271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'],
-@@ -17752,7 +17752,7 @@
+@@ -17996,7 +17996,7 @@
      },
      {
        'name': 'SSLErrorOverrideAllowedForOrigins',
@@ -22949,7 +22280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17774,11 +17774,11 @@
+@@ -18018,11 +18018,11 @@
  
        Leaving the policy unset means <ph name="SSL_ERROR_OVERRIDE_ALLOWED_POLICY_NAME">SSLErrorOverrideAllowed</ph> applies for all sites.
  
@@ -22963,7 +22294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -17789,7 +17789,7 @@
+@@ -18033,7 +18033,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -22972,7 +22303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 865,
        'caption': '''Allow origins to query for device attributes''',
        'tags': [],
-@@ -17799,7 +17799,7 @@
+@@ -18043,7 +18043,7 @@
      },
      {
        'name': 'QuicAllowed',
@@ -22981,7 +22312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:43-', 'chrome_os:43-'],
-@@ -17818,7 +17818,7 @@
+@@ -18062,7 +18062,7 @@
      },
      {
        'name': 'KeyPermissions',
@@ -22990,7 +22321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -17861,7 +17861,7 @@
+@@ -18105,7 +18105,7 @@
      },
      {
        'name': 'WelcomePageOnOSUpgradeEnabled',
@@ -22999,7 +22330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome.win:45-62'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -17880,7 +17880,7 @@
+@@ -18124,7 +18124,7 @@
      },
      {
        'name': 'HardwareAccelerationModeEnabled',
@@ -23008,7 +22339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:46-'],
-@@ -17899,7 +17899,7 @@
+@@ -18143,7 +18143,7 @@
      },
      {
        'name': 'UnifiedDesktopEnabledByDefault',
@@ -23017,7 +22348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:47-'],
-@@ -17918,7 +17918,7 @@
+@@ -18162,7 +18162,7 @@
      },
      {
        'name': 'DisplayRotationDefault',
@@ -23026,7 +22357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -17963,7 +17963,7 @@
+@@ -18207,7 +18207,7 @@
      },
      {
        'name': 'ArcEnabled',
@@ -23035,7 +22366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:50-'],
-@@ -17981,7 +17981,7 @@
+@@ -18225,7 +18225,7 @@
      },
      {
        'name': 'ArcPolicy',
@@ -23044,7 +22375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'description_schema': {
-@@ -18041,7 +18041,7 @@
+@@ -18285,7 +18285,7 @@
      },
      {
        'name': 'AllowKioskAppControlChromeVersion',
@@ -23053,7 +22384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:51-'],
-@@ -18063,7 +18063,7 @@
+@@ -18307,7 +18307,7 @@
      },
      {
        'name': 'NewWindowsInKioskAllowed',
@@ -23062,7 +22393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -18093,7 +18093,7 @@
+@@ -18337,7 +18337,7 @@
      },
      {
        'name': 'LoginAuthenticationBehavior',
@@ -23071,7 +22402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -18129,7 +18129,7 @@
+@@ -18375,7 +18375,7 @@
      },
      {
        'name': 'UsbDetachableWhitelist',
@@ -23080,7 +22411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -18170,7 +18170,7 @@
+@@ -18416,7 +18416,7 @@
      },
      {
        'name': 'UsbDetachableAllowlist',
@@ -23089,7 +22420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -18207,7 +18207,7 @@
+@@ -18453,7 +18453,7 @@
      },
      {
        'name': 'DeviceAllowBluetooth',
@@ -23098,7 +22429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:52-'],
-@@ -18227,7 +18227,7 @@
+@@ -18473,7 +18473,7 @@
      },
      {
        'name': 'SuppressUnsupportedOSWarning',
@@ -23107,7 +22438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': '''Suppress the unsupported OS warning''',
        'desc': '''Setting the policy to Enabled suppresses the warning that appears when <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is running on an unsupported computer or operating system.
  
-@@ -18246,7 +18246,7 @@
+@@ -18492,7 +18492,7 @@
      },
      {
        'name': 'DeviceQuirksDownloadEnabled',
@@ -23116,7 +22447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:51-'],
-@@ -18280,7 +18280,7 @@
+@@ -18526,7 +18526,7 @@
      },
      {
        'name': 'SystemTimezoneAutomaticDetection',
@@ -23125,7 +22456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -18334,7 +18334,7 @@
+@@ -18580,7 +18580,7 @@
      },
      {
        'name': 'TaskManagerEndProcessEnabled',
@@ -23134,16 +22465,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': '''Enable ending processes in Task Manager''',
        'desc': '''Setting the policy to Disabled prevents users from ending processes in the Task Manager.
  
-@@ -18353,7 +18353,7 @@
+@@ -18599,7 +18599,7 @@
      },
      {
        'name': 'DeviceShowLowDiskSpaceNotification',
--      'owners': ['vsavu@chromium.org'],
-+      'owners': ['vsavu@ch40m1um.qjz9zk'],
+-      'owners': ['vsavu@google.com'],
++      'owners': ['vsavu@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -18391,7 +18391,7 @@
+@@ -18637,7 +18637,7 @@
      },
      {
        'name': 'NetworkThrottlingEnabled',
@@ -23152,7 +22483,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'caption': '''Enable throttling network bandwidth''',
        'desc': '''Setting the policy turns network throttling on or off. This means that the system is throttled to achieve the provided upload and download rates (in kbits/s). It applies to all users and interfaces on the device.''',
-@@ -18426,7 +18426,7 @@
+@@ -18672,7 +18672,7 @@
      },
      {
        'name': 'DeviceWiFiFastTransitionEnabled',
@@ -23161,7 +22492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'caption': '''Enable 802.11r Fast Transition''',
        'desc': '''Setting the policy to Enabled means that Fast Transition is used when the wireless access point supports it. It applies to all users and interfaces on the device.
-@@ -18445,7 +18445,7 @@
+@@ -18691,7 +18691,7 @@
      },
      {
        'name': 'DeviceWiFiAllowed',
@@ -23170,7 +22501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'caption': '''Enable WiFi''',
        'desc': '''Setting the policy to Disabled means <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></ph> turns off Wi-Fi, and users can't change it.
-@@ -18464,7 +18464,7 @@
+@@ -18710,7 +18710,7 @@
      },
      {
        'name': 'DeviceDockMacAddressSource',
@@ -23179,7 +22510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': '''Device MAC address source when docked''',
        'desc': '''Setting the policy lets the administrator change the MAC (media access control) address when connecting a device to the dock. When a dock is connected to some device models, by default, the device's designated dock's MAC address helps identify the device on Ethernet.
  
-@@ -18509,7 +18509,7 @@
+@@ -18755,7 +18755,7 @@
      },
      {
        'name': 'LoginVideoCaptureAllowedUrls',
@@ -23188,7 +22519,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -18533,7 +18533,7 @@
+@@ -18779,7 +18779,7 @@
      },
      {
        'name': 'DeviceLoginScreenExtensions',
@@ -23197,7 +22528,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -18544,7 +18544,7 @@
+@@ -18790,7 +18790,7 @@
        'features': {
          'dynamic_refresh': True,
        },
@@ -23206,7 +22537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 336,
        'caption': '''Configure the list of installed apps and extensions on the login screen''',
        'tags': ['full-admin-access'],
-@@ -18557,13 +18557,13 @@
+@@ -18803,13 +18803,13 @@
  
        If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
  
@@ -23223,7 +22554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': '''Permit locking the screen''',
        'desc': '''Setting the policy to Enabled or leaving it unset lets users who authenticate with a password lock the screen.
  
-@@ -18581,7 +18581,7 @@
+@@ -18827,7 +18827,7 @@
      },
      {
        'name': 'ArcCertificatesSyncMode',
@@ -23232,7 +22563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -18614,7 +18614,7 @@
+@@ -18860,7 +18860,7 @@
      },
      {
        'name': 'AllowedDomainsForApps',
@@ -23241,7 +22572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'],
-@@ -18624,7 +18624,7 @@
+@@ -18870,7 +18870,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -23250,7 +22581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 331,
        'caption': '''Define domains allowed to access <ph name="GOOGLE_WORKSPACE_PRODUCT_NAME">Google Workspace</ph>''',
        'tags': ['filtering'],
-@@ -18634,11 +18634,11 @@
+@@ -18880,11 +18880,11 @@
  
        Users cannot change or override this setting.
  
@@ -23264,7 +22595,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [ 'chrome.*:52-74', 'chrome_os:52-74' ],
-@@ -18734,7 +18734,7 @@
+@@ -18980,7 +18980,7 @@
      },
      {
        'name': 'ArcBackupRestoreEnabled',
@@ -23273,7 +22604,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:53-67'],
-@@ -18752,7 +18752,7 @@
+@@ -18998,7 +18998,7 @@
      },
      {
        'name': 'ArcLocationServiceEnabled',
@@ -23282,7 +22613,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:57-67'],
-@@ -18770,7 +18770,7 @@
+@@ -19016,7 +19016,7 @@
      },
      {
        'name': 'NTPContentSuggestionsEnabled',
@@ -23291,7 +22622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:54-','ios:93-'],
-@@ -18801,7 +18801,7 @@
+@@ -19047,7 +19047,7 @@
      },
      {
        'name': 'NTPCustomBackgroundEnabled',
@@ -23300,7 +22631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -18833,7 +18833,7 @@
+@@ -19079,7 +19079,7 @@
      },
      {
        'name': 'NTPCardsVisible',
@@ -23309,7 +22640,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:88-', 'chrome_os:88-'],
-@@ -18873,7 +18873,7 @@
+@@ -19119,7 +19119,7 @@
      },
      {
        'name': 'NTPMiddleSlotAnnouncementVisible',
@@ -23318,7 +22649,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:99-', 'chrome_os:99-'],
-@@ -18907,7 +18907,7 @@
+@@ -19153,7 +19153,7 @@
      },
      {
        'name': 'WebRtcUdpPortRange',
@@ -23327,7 +22658,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:54-'],
-@@ -18926,7 +18926,7 @@
+@@ -19172,7 +19172,7 @@
      },
      {
        'name': 'WebRtcLocalIpsAllowedUrls',
@@ -23336,7 +22667,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -18949,7 +18949,7 @@
+@@ -19195,7 +19195,7 @@
      },
      {
        'name': 'ComponentUpdatesEnabled',
@@ -23345,7 +22676,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:105-', 'ios:105-'],
-@@ -18969,7 +18969,7 @@
+@@ -19215,7 +19215,7 @@
      },
      {
        'name': 'NativePrinters',
@@ -23354,7 +22685,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -18993,7 +18993,7 @@
+@@ -19239,7 +19239,7 @@
                'properties': {
                  'effective_model': {
                    'type': 'string',
@@ -23363,7 +22694,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
                  },
                  'autoconf': {
                    'type': 'boolean',
-@@ -19049,7 +19049,7 @@
+@@ -19295,7 +19295,7 @@
      },
      {
        'name': 'Printers',
@@ -23372,7 +22703,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -19073,7 +19073,7 @@
+@@ -19319,7 +19319,7 @@
                'properties': {
                  'effective_model': {
                    'type': 'string',
@@ -23381,7 +22712,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
                  },
                  'autoconf': {
                    'type': 'boolean',
-@@ -19126,7 +19126,7 @@
+@@ -19372,7 +19372,7 @@
      },
      {
        'name': 'NativePrintersBulkConfiguration',
@@ -23390,7 +22721,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 382,
        'type': 'external',
        'schema': {
-@@ -19159,7 +19159,7 @@
+@@ -19405,7 +19405,7 @@
      },
      {
        'name': 'PrintersBulkConfiguration',
@@ -23399,7 +22730,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 770,
        'type': 'external',
        'schema': {
-@@ -19189,7 +19189,7 @@
+@@ -19435,7 +19435,7 @@
      },
      {
        'name': 'NativePrintersBulkAccessMode',
@@ -23408,7 +22739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 383,
        'supported_on': ['chrome_os:65-100'],
        'type': 'int-enum',
-@@ -19237,7 +19237,7 @@
+@@ -19483,7 +19483,7 @@
      },
      {
        'name': 'PrintersBulkAccessMode',
@@ -23417,7 +22748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 772,
        'supported_on': ['chrome_os:86-'],
        'type': 'int-enum',
-@@ -19282,7 +19282,7 @@
+@@ -19528,7 +19528,7 @@
      },
      {
        'name': 'NativePrintersBulkBlacklist',
@@ -23426,7 +22757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:65-100'],
        'id': 384,
        'type': 'list',
-@@ -19304,7 +19304,7 @@
+@@ -19550,7 +19550,7 @@
      },
      {
        'name': 'PrintersBulkBlocklist',
@@ -23435,7 +22766,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:86-'],
        'id': 779,
        'type': 'list',
-@@ -19323,7 +19323,7 @@
+@@ -19569,7 +19569,7 @@
      },
      {
        'name': 'NativePrintersBulkWhitelist',
@@ -23444,7 +22775,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:65-100'],
        'id': 385,
        'type': 'list',
-@@ -19345,7 +19345,7 @@
+@@ -19591,7 +19591,7 @@
      },
      {
        'name': 'PrintersBulkAllowlist',
@@ -23453,7 +22784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:86-'],
        'id': 780,
        'type': 'list',
-@@ -19364,7 +19364,7 @@
+@@ -19610,7 +19610,7 @@
      },
      {
        'name': 'DeviceNativePrinters',
@@ -23462,7 +22793,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 386,
        'device_only': True,
        'type': 'external',
-@@ -19402,7 +19402,7 @@
+@@ -19648,7 +19648,7 @@
      },
      {
        'name': 'DeviceNativePrintersAccessMode',
@@ -23471,7 +22802,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 387,
        'device_only': True,
        'supported_on': ['chrome_os:73-100'],
-@@ -19450,7 +19450,7 @@
+@@ -19696,7 +19696,7 @@
      },
      {
        'name': 'DeviceNativePrintersBlacklist',
@@ -23480,7 +22811,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:73-100'],
        'device_only': True,
        'id': 388,
-@@ -19472,7 +19472,7 @@
+@@ -19718,7 +19718,7 @@
      },
      {
        'name': 'DeviceNativePrintersWhitelist',
@@ -23489,7 +22820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:73-100'],
        'device_only': True,
        'id': 389,
-@@ -19495,7 +19495,7 @@
+@@ -19741,7 +19741,7 @@
      },
      {
        'name': 'DevicePrinters',
@@ -23498,7 +22829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 743,
        'device_only': True,
        'type': 'external',
-@@ -19530,7 +19530,7 @@
+@@ -19776,7 +19776,7 @@
      },
      {
        'name': 'DevicePrintersAccessMode',
@@ -23507,7 +22838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 733,
        'device_only': True,
        'supported_on': ['chrome_os:87-'],
-@@ -19575,7 +19575,7 @@
+@@ -19821,7 +19821,7 @@
      },
      {
        'name': 'DevicePrintersBlocklist',
@@ -23516,7 +22847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:87-'],
        'device_only': True,
        'id': 734,
-@@ -19594,7 +19594,7 @@
+@@ -19840,7 +19840,7 @@
      },
      {
        'name': 'DevicePrintersAllowlist',
@@ -23525,7 +22856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:87-'],
        'device_only': True,
        'id': 735,
-@@ -19614,7 +19614,7 @@
+@@ -19860,7 +19860,7 @@
      },
      {
        'name': 'TPMFirmwareUpdateSettings',
@@ -23534,7 +22865,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:63-'],
        'device_only': True,
        'id': 390,
-@@ -19667,7 +19667,7 @@
+@@ -19913,7 +19913,7 @@
      },
      {
        'name': 'MinimumRequiredChromeVersion',
@@ -23543,7 +22874,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:64-81'],
        'device_only': True,
        'type': 'string',
-@@ -19693,7 +19693,7 @@
+@@ -19939,7 +19939,7 @@
      },
      {
        'name': 'DeviceMinimumVersion',
@@ -23552,7 +22883,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:86-'],
        'device_only': True,
        'type': 'dict',
-@@ -19777,7 +19777,7 @@
+@@ -20023,7 +20023,7 @@
      },
      {
        'name': 'DeviceMinimumVersionAueMessage',
@@ -23561,7 +22892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:86-'],
        'device_only': True,
        'type': 'string',
-@@ -19801,7 +19801,7 @@
+@@ -20047,7 +20047,7 @@
      },
      {
        'name': 'QuickUnlockModeAllowlist',
@@ -23570,7 +22901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -19856,7 +19856,7 @@
+@@ -20102,7 +20102,7 @@
      },
      {
        'name': 'QuickUnlockModeWhitelist',
@@ -23579,7 +22910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -19914,7 +19914,7 @@
+@@ -20160,7 +20160,7 @@
      },
      {
        'name': 'QuickUnlockTimeout',
@@ -23588,7 +22919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -19957,7 +19957,7 @@
+@@ -20203,7 +20203,7 @@
      },
      {
        'name': 'WebAuthnFactors',
@@ -23597,7 +22928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -20011,7 +20011,7 @@
+@@ -20257,7 +20257,7 @@
      },
      {
        'name': 'PinUnlockMinimumLength',
@@ -23606,7 +22937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:57-'],
-@@ -20029,7 +20029,7 @@
+@@ -20275,7 +20275,7 @@
      },
      {
        'name': 'PinUnlockMaximumLength',
@@ -23615,7 +22946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'supported_on': ['chrome_os:57-'],
-@@ -20047,7 +20047,7 @@
+@@ -20293,7 +20293,7 @@
      },
      {
        'name': 'PinUnlockWeakPinsAllowed',
@@ -23624,7 +22955,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:57-'],
-@@ -20065,7 +20065,7 @@
+@@ -20311,7 +20311,7 @@
      },
      {
        'name': 'DeviceWallpaperImage',
@@ -23633,7 +22964,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -20098,7 +20098,7 @@
+@@ -20344,7 +20344,7 @@
      },
      {
        'name': 'DeviceLoginScreenLocales',
@@ -23642,7 +22973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -20119,7 +20119,7 @@
+@@ -20365,7 +20365,7 @@
      },
      {
        'name': 'DeviceLoginScreenInputMethods',
@@ -23651,7 +22982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -20140,7 +20140,7 @@
+@@ -20386,7 +20386,7 @@
      },
      {
        'name': 'DeviceLoginScreenSystemInfoEnforced',
@@ -23660,7 +22991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:79-'],
-@@ -20163,7 +20163,7 @@
+@@ -20409,7 +20409,7 @@
      },
      {
        'name': 'SmsMessagesAllowed',
@@ -23669,7 +23000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -20184,7 +20184,7 @@
+@@ -20430,7 +20430,7 @@
      },
      {
        'name': 'WifiSyncAndroidAllowed',
@@ -23678,7 +23009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:89-'],
-@@ -20207,7 +20207,7 @@
+@@ -20453,7 +20453,7 @@
      },
      {
        'name': 'SmartLockSigninAllowed',
@@ -23687,7 +23018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:71-'],
-@@ -20228,7 +20228,7 @@
+@@ -20474,7 +20474,7 @@
      },
      {
        'name': 'InstantTetheringAllowed',
@@ -23696,7 +23027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:60-'],
-@@ -20249,7 +20249,7 @@
+@@ -20495,7 +20495,7 @@
      },
      {
        'name': 'PhoneHubAllowed',
@@ -23705,7 +23036,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:89-'],
-@@ -20270,7 +20270,7 @@
+@@ -20516,7 +20516,7 @@
      },
      {
        'name': 'PhoneHubCameraRollAllowed',
@@ -23714,7 +23045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -20301,7 +20301,7 @@
+@@ -20547,7 +20547,7 @@
      },
      {
        'name': 'PhoneHubNotificationsAllowed',
@@ -23723,7 +23054,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:89-'],
-@@ -20321,7 +20321,7 @@
+@@ -20567,7 +20567,7 @@
      },
      {
        'name': 'PhoneHubTaskContinuationAllowed',
@@ -23732,7 +23063,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:89-'],
-@@ -20341,7 +20341,7 @@
+@@ -20587,7 +20587,7 @@
      },
      {
        'name': 'EcheAllowed',
@@ -23741,7 +23072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:99-'],
-@@ -20372,7 +20372,7 @@
+@@ -20618,7 +20618,7 @@
      },
      {
        'name': 'NearbyShareAllowed',
@@ -23750,7 +23081,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:91-'],
-@@ -20393,7 +20393,7 @@
+@@ -20639,7 +20639,7 @@
      },
      {
        'name': 'DevicePciPeripheralDataAccessEnabled',
@@ -23759,7 +23090,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:90-'],
-@@ -20424,7 +20424,7 @@
+@@ -20670,7 +20670,7 @@
      },
      {
        'name': 'BrowserNetworkTimeQueriesEnabled',
@@ -23768,7 +23099,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:60-'],
-@@ -20454,7 +20454,7 @@
+@@ -20700,7 +20700,7 @@
      },
      {
        'name': 'DeviceSecondFactorAuthentication',
@@ -23777,7 +23108,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -20497,7 +20497,7 @@
+@@ -20743,7 +20743,7 @@
      },
      {
        'name': 'PrintPreviewUseSystemDefaultPrinter',
@@ -23786,7 +23117,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': [
-@@ -20530,7 +20530,7 @@
+@@ -20776,7 +20776,7 @@
      },
      {
        'name': 'DeviceEcryptfsMigrationStrategy',
@@ -23795,7 +23126,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -20576,7 +20576,7 @@
+@@ -20822,7 +20822,7 @@
      },
      {
        'name': 'EcryptfsMigrationStrategy',
@@ -23804,7 +23135,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -20632,7 +20632,7 @@
+@@ -20878,7 +20878,7 @@
      },
      {
        'name': 'SchedulerConfiguration',
@@ -23813,7 +23144,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -20669,7 +20669,7 @@
+@@ -20915,7 +20915,7 @@
      },
      {
        'name': 'NoteTakingAppsLockScreenWhitelist',
@@ -23822,7 +23153,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -20699,7 +20699,7 @@
+@@ -20945,7 +20945,7 @@
      },
      {
        'name': 'NoteTakingAppsLockScreenAllowlist',
@@ -23831,7 +23162,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -20726,7 +20726,7 @@
+@@ -20972,7 +20972,7 @@
      },
      {
        'name': 'CastReceiverEnabled',
@@ -23840,7 +23171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -20746,7 +20746,7 @@
+@@ -20992,7 +20992,7 @@
      },
      {
        'name': 'CastReceiverName',
@@ -23849,7 +23180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'future_on': ['chrome_os'],
-@@ -20766,7 +20766,7 @@
+@@ -21012,7 +21012,7 @@
      },
      {
        'name': 'DeviceOffHours',
@@ -23858,7 +23189,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -20849,7 +20849,7 @@
+@@ -21095,7 +21095,7 @@
      },
      {
        'name': 'CloudPolicyOverridesPlatformPolicy',
@@ -23867,7 +23198,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean'},
        'supported_on': [
-@@ -20877,7 +20877,7 @@
+@@ -21123,7 +21123,7 @@
      },
      {
        'name': 'CloudUserPolicyOverridesCloudMachinePolicy',
@@ -23876,7 +23207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:96-', 'android:97-', 'ios:105-'],
-@@ -20912,7 +20912,7 @@
+@@ -21158,7 +21158,7 @@
      },
      {
        'name': 'PromptForDownloadLocation',
@@ -23885,7 +23216,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean'},
        'supported_on': ['chrome.*:64-', 'chrome_os:64-', 'android:92-'],
-@@ -20931,7 +20931,7 @@
+@@ -21177,7 +21177,7 @@
      },
      {
        'name': 'UnaffiliatedArcAllowed',
@@ -23894,7 +23225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:64-'],
-@@ -20949,7 +20949,7 @@
+@@ -21195,7 +21195,7 @@
      },
      {
        'name': 'DeviceArcDataSnapshotHours',
@@ -23903,7 +23234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -21001,7 +21001,7 @@
+@@ -21247,7 +21247,7 @@
      },
      {
        'name': 'IsolateOrigins',
@@ -23912,7 +23243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -21029,7 +21029,7 @@
+@@ -21275,7 +21275,7 @@
      },
      {
        'name': 'SitePerProcess',
@@ -23921,7 +23252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -21053,7 +21053,7 @@
+@@ -21299,7 +21299,7 @@
      },
      {
        'name': 'DeviceLoginScreenIsolateOrigins',
@@ -23930,7 +23261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:66-76'],
-@@ -21076,7 +21076,7 @@
+@@ -21322,7 +21322,7 @@
      },
      {
        'name': 'DeviceLoginScreenSitePerProcess',
@@ -23939,7 +23270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:66-76'],
-@@ -21097,7 +21097,7 @@
+@@ -21343,7 +21343,7 @@
      },
      {
        'name': 'IsolateOriginsAndroid',
@@ -23948,7 +23279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['android:68-'],
-@@ -21124,7 +21124,7 @@
+@@ -21370,7 +21370,7 @@
      },
      {
        'name': 'SitePerProcessAndroid',
@@ -23957,7 +23288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:68-'],
-@@ -21149,7 +21149,7 @@
+@@ -21395,7 +21395,7 @@
      },
      {
        'name': 'SharedArrayBufferUnrestrictedAccessAllowed',
@@ -23966,7 +23297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:91-', 'chrome_os:91-'],
-@@ -21175,7 +21175,7 @@
+@@ -21421,7 +21421,7 @@
        'caption': '''Specifies whether SharedArrayBuffers can be used in a non cross-origin-isolated context''',
        'tags': ['system-security'],
        'desc': '''
@@ -23975,7 +23306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        When set to Enabled, sites can use SharedArrayBuffer with no restrictions.
  
-@@ -21183,7 +21183,7 @@
+@@ -21429,7 +21429,7 @@
      },
      {
        'name': 'SandboxExternalProtocolBlocked',
@@ -23984,7 +23315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:96-', 'chrome_os:96-'],
-@@ -21209,7 +21209,7 @@
+@@ -21455,7 +21455,7 @@
        'caption': 'Allow Chrome to block navigations toward external protocols in sandboxed iframes',
        'tags': ['system-security'],
        'desc': '''Chrome will block navigations toward external protocols inside
@@ -23993,7 +23324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        When True, this lets Chrome blocks those navigations.
  
-@@ -21222,7 +21222,7 @@
+@@ -21468,7 +21468,7 @@
      },
      {
        'name': 'CrossOriginWebAssemblyModuleSharingEnabled',
@@ -24002,7 +23333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:94-98', 'chrome_os:94-98'],
-@@ -21256,7 +21256,7 @@
+@@ -21502,7 +21502,7 @@
      },
      {
        'name': 'DisplayCapturePermissionsPolicyEnabled',
@@ -24011,7 +23342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:94-', 'chrome_os:94-'],
-@@ -21294,7 +21294,7 @@
+@@ -21540,7 +21540,7 @@
      },
      {
        'name': 'WebDriverOverridesIncompatiblePolicies',
@@ -24020,7 +23351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:65-79'],
-@@ -21322,7 +21322,7 @@
+@@ -21568,7 +21568,7 @@
      },
      {
        'name': 'UnsafelyTreatInsecureOriginAsSecure',
@@ -24029,7 +23360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -21356,7 +21356,7 @@
+@@ -21602,7 +21602,7 @@
      },
      {
        'name': 'DefaultDownloadDirectory',
@@ -24038,7 +23369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:64-', 'chrome_os:64-'],
-@@ -21377,11 +21377,11 @@
+@@ -21623,11 +21623,11 @@
  
        This policy has no effect if the policy <ph name="DOWNLOAD_DIRECTORY_POLICY_NAME">DownloadDirectory</ph> is set.
  
@@ -24052,7 +23383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome_os:65-'],
-@@ -21400,7 +21400,7 @@
+@@ -21646,7 +21646,7 @@
      },
      {
        'name': 'DeviceHostnameUserConfigurable',
@@ -24061,7 +23392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -21433,7 +21433,7 @@
+@@ -21679,7 +21679,7 @@
      },
      {
        'name': 'AbusiveExperienceInterventionEnforce',
@@ -24070,7 +23401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -21463,7 +21463,7 @@
+@@ -21709,7 +21709,7 @@
      },
      {
        'name': 'SpellcheckLanguage',
@@ -24079,7 +23410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -21494,7 +21494,7 @@
+@@ -21740,7 +21740,7 @@
      },
      {
        'name': 'SpellcheckLanguageBlacklist',
@@ -24088,7 +23419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -21528,7 +21528,7 @@
+@@ -21774,7 +21774,7 @@
      },
      {
        'name': 'SpellcheckLanguageBlocklist',
@@ -24097,7 +23428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -21559,7 +21559,7 @@
+@@ -21805,7 +21805,7 @@
      },
      {
        'name': 'ThirdPartyBlockingEnabled',
@@ -24106,7 +23437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:65-'],
-@@ -21577,7 +21577,7 @@
+@@ -21823,7 +21823,7 @@
      },
      {
        'name': 'SpellcheckEnabled',
@@ -24115,7 +23446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -21614,7 +21614,7 @@
+@@ -21860,7 +21860,7 @@
      },
      {
        'name': 'AdsSettingForIntrusiveAdsSites',
@@ -24124,7 +23455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -21649,7 +21649,7 @@
+@@ -21895,7 +21895,7 @@
      },
      {
        'name': 'RestrictAccountsToPatterns',
@@ -24133,7 +23464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -21660,7 +21660,7 @@
+@@ -21906,7 +21906,7 @@
          'dynamic_refresh': True,
          'per_profile': False,
        },
@@ -24142,7 +23473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 410,
        'caption': '''Restrict accounts that are visible in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>''',
        'tags': [],
-@@ -21674,7 +21674,7 @@
+@@ -21920,7 +21920,7 @@
      },
      {
        'name': 'PasswordProtectionWarningTrigger',
@@ -24151,7 +23482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -21724,7 +21724,7 @@
+@@ -21970,7 +21970,7 @@
      {
        'id': 419,
        'name': 'RelaunchNotification',
@@ -24160,7 +23491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'features': {
          'dynamic_refresh': True,
-@@ -21760,7 +21760,7 @@
+@@ -22006,7 +22006,7 @@
      {
        'id': 420,
        'name': 'RelaunchNotificationPeriod',
@@ -24169,7 +23500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'features': {
          'dynamic_refresh': True,
-@@ -21782,7 +21782,7 @@
+@@ -22028,7 +22028,7 @@
      {
        'id': 567,
        'name': 'RelaunchHeadsUpPeriod',
@@ -24178,7 +23509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'features': {
          'dynamic_refresh': True,
-@@ -21803,7 +21803,7 @@
+@@ -22049,7 +22049,7 @@
      {
        'id': 854,
        'name': 'RelaunchWindow',
@@ -24187,7 +23518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'features': {
          'dynamic_refresh': True,
-@@ -21874,7 +21874,7 @@
+@@ -22120,7 +22120,7 @@
      },
      {
        'name': 'VirtualMachinesAllowed',
@@ -24196,7 +23527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:66-'],
-@@ -21893,7 +21893,7 @@
+@@ -22139,7 +22139,7 @@
      },
      {
        'name': 'CrostiniAllowed',
@@ -24205,7 +23536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -21909,7 +21909,7 @@
+@@ -22155,7 +22155,7 @@
      },
      {
        'name': 'DeviceUnaffiliatedCrostiniAllowed',
@@ -24214,7 +23545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -21925,7 +21925,7 @@
+@@ -22171,7 +22171,7 @@
      },
      {
        'name': 'CrostiniExportImportUIAllowed',
@@ -24223,7 +23554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:74-'],
-@@ -21941,7 +21941,7 @@
+@@ -22187,7 +22187,7 @@
      },
      {
        'name': 'CrostiniRootAccessAllowed',
@@ -24232,7 +23563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -21960,7 +21960,7 @@
+@@ -22206,7 +22206,7 @@
      },
      {
        'name': 'CrostiniAnsiblePlaybook',
@@ -24241,25 +23572,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -22000,7 +22000,7 @@
+@@ -22246,7 +22246,7 @@
      },
      {
        'name': 'CrostiniArcAdbSideloadingAllowed',
--      'owners': ['janagrill@chromium.org', 'okalitova@chromium.org'],
-+      'owners': ['janagrill@ch40m1um.qjz9zk', 'okalitova@ch40m1um.qjz9zk'],
+-      'owners': ['janagrill@google.com', 'okalitova@chromium.org'],
++      'owners': ['janagrill@9oo91e.qjz9zk', 'okalitova@ch40m1um.qjz9zk'],
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -22038,7 +22038,7 @@
+@@ -22284,7 +22284,7 @@
      },
      {
        'name': 'DeviceCrostiniArcAdbSideloadingAllowed',
--      'owners': ['janagrill@chromium.org', 'okalitova@chromium.org'],
-+      'owners': ['janagrill@ch40m1um.qjz9zk', 'okalitova@ch40m1um.qjz9zk'],
+-      'owners': ['janagrill@google.com', 'okalitova@chromium.org'],
++      'owners': ['janagrill@9oo91e.qjz9zk', 'okalitova@ch40m1um.qjz9zk'],
        'device_only': True,
        'type': 'int-enum',
        'schema': {
-@@ -22079,7 +22079,7 @@
+@@ -22325,7 +22325,7 @@
      },
      {
        'name': 'CrostiniPortForwardingAllowed',
@@ -24268,7 +23599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -22099,7 +22099,7 @@
+@@ -22345,7 +22345,7 @@
      },
      {
        'name': 'SystemTerminalSshAllowed',
@@ -24277,7 +23608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -22129,7 +22129,7 @@
+@@ -22375,7 +22375,7 @@
      },
      {
        'name': 'SafeBrowsingWhitelistDomains',
@@ -24286,7 +23617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22155,7 +22155,7 @@
+@@ -22401,7 +22401,7 @@
      },
      {
        'name': 'SafeBrowsingAllowlistDomains',
@@ -24295,7 +23626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22181,7 +22181,7 @@
+@@ -22427,7 +22427,7 @@
      },
      {
        'name': 'PasswordProtectionLoginURLs',
@@ -24304,7 +23635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22197,15 +22197,15 @@
+@@ -22443,15 +22443,15 @@
        'id': 423,
        'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''',
        'tags': [],
@@ -24323,7 +23654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:69-', 'chrome_os:69-'],
-@@ -22218,15 +22218,15 @@
+@@ -22464,15 +22464,15 @@
        'id': 424,
        'caption': '''Configure the change password URL.''',
        'tags': [],
@@ -24342,7 +23673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:66-', 'chrome_os:66-', 'android: 87-'],
-@@ -22245,12 +22245,12 @@
+@@ -22491,12 +22491,12 @@
  
        If you set this policy, users can't change it. If not set, users can decide whether to send reports or not.
  
@@ -24357,7 +23688,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': ['chrome.*:66-80'],
-@@ -22270,7 +22270,7 @@
+@@ -22516,7 +22516,7 @@
      },
      {
        'name': 'CloudManagementEnrollmentToken',
@@ -24366,7 +23697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'supported_on': [
-@@ -22290,11 +22290,11 @@
+@@ -22536,11 +22536,11 @@
        'tags': [],
        'desc': '''Setting the policy means <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> tries to register itself with <ph name="CHROME_BROWSER_CLOUD_MANAGEMENT_NAME">Chrome Browser Cloud Management</ph>. The value of this policy is an enrollment token you can retrieve from the <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME">Google Admin console</ph>.
  
@@ -24380,7 +23711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:72-'],
-@@ -22312,11 +22312,11 @@
+@@ -22558,11 +22558,11 @@
  
        Setting the policy to Disabled or leaving it unset renders <ph name="CHROME_BROWSER_CLOUD_MANAGEMENT_NAME">Chrome Browser Cloud Management</ph> optional and doesn't block <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> launch process if failed.
  
@@ -24394,7 +23725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'],
-@@ -22337,7 +22337,7 @@
+@@ -22583,7 +22583,7 @@
      },
      {
        'name': 'AutoplayWhitelist',
@@ -24403,7 +23734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22357,11 +22357,11 @@
+@@ -22603,11 +22603,11 @@
  
        Setting the policy lets videos play automatically (without user consent) with audio content in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If <ph name="AUTOPLAY_ALLOWED_POLICY_NAME">AutoplayAllowed</ph> policy is set to True, then this policy has no effect. If <ph name="AUTOPLAY_ALLOWED_POLICY_NAME">AutoplayAllowed</ph> is set to False, then any URL patterns set in this policy can still play. If this policy changes while <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is running, it only applies to newly opened tabs.
  
@@ -24417,7 +23748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22379,11 +22379,11 @@
+@@ -22625,11 +22625,11 @@
        'tags': [],
        'desc': '''Setting the policy lets videos play automatically (without user consent) with audio content in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If <ph name="AUTOPLAY_ALLOWED_POLICY_NAME">AutoplayAllowed</ph> policy is set to True, then this policy has no effect. If <ph name="AUTOPLAY_ALLOWED_POLICY_NAME">AutoplayAllowed</ph> is set to False, then any URL patterns set in this policy can still play. If this policy changes while <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is running, it only applies to newly opened tabs.
  
@@ -24431,7 +23762,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:67-67', 'chrome_os:67-67'],
-@@ -22398,13 +22398,13 @@
+@@ -22644,13 +22644,13 @@
        'tags': [],
        'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead.
  
@@ -24447,7 +23778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:67-100'],
-@@ -22428,7 +22428,7 @@
+@@ -22674,7 +22674,7 @@
      },
      {
        'name': 'UserPrintersAllowed',
@@ -24456,7 +23787,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -22449,7 +22449,7 @@
+@@ -22695,7 +22695,7 @@
      },
      {
        'name': 'ChromeCleanupEnabled',
@@ -24465,7 +23796,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:68-'],
-@@ -22469,7 +22469,7 @@
+@@ -22715,7 +22715,7 @@
      },
      {
        'name': 'ChromeCleanupReportingEnabled',
@@ -24474,7 +23805,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:68-'],
-@@ -22491,7 +22491,7 @@
+@@ -22737,7 +22737,7 @@
      },
      {
        'name': 'AllowedLanguages',
@@ -24483,7 +23814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22515,7 +22515,7 @@
+@@ -22761,7 +22761,7 @@
      },
      {
        'name': 'AllowedInputMethods',
@@ -24492,7 +23823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -22541,7 +22541,7 @@
+@@ -22787,7 +22787,7 @@
      },
      {
        'name': 'ArcAppInstallEventLoggingEnabled',
@@ -24501,7 +23832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:67-'],
-@@ -22558,7 +22558,7 @@
+@@ -22804,7 +22804,7 @@
      },
      {
        'name': 'ExtensionInstallEventLoggingEnabled',
@@ -24510,7 +23841,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-106'],
-@@ -22576,7 +22576,7 @@
+@@ -22823,7 +22823,7 @@
      },
      {
        'name': 'UsageTimeLimit',
@@ -24519,7 +23850,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -22729,7 +22729,7 @@
+@@ -22976,7 +22976,7 @@
      },
      {
        'name': 'ArcBackupRestoreServiceEnabled',
@@ -24528,7 +23859,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -22771,7 +22771,7 @@
+@@ -23018,7 +23018,7 @@
      },
      {
        'name': 'ArcGoogleLocationServicesEnabled',
@@ -24537,7 +23868,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -22813,7 +22813,7 @@
+@@ -23060,7 +23060,7 @@
      },
      {
        'name': 'EnableSyncConsent',
@@ -24546,7 +23877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean'},
        'supported_on': ['chrome_os:66-'],
-@@ -22831,7 +22831,7 @@
+@@ -23078,7 +23078,7 @@
      },
      {
        'name': 'ContextualSuggestionsEnabled',
@@ -24555,7 +23886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:69-75'],
-@@ -22852,7 +22852,7 @@
+@@ -23099,7 +23099,7 @@
      },
      {
        'name': 'DeviceAutoUpdateTimeRestrictions',
@@ -24564,7 +23895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -22939,7 +22939,7 @@
+@@ -23186,7 +23186,7 @@
      {
        'id': 454,
        'name': 'PromotionalTabsEnabled',
@@ -24573,7 +23904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'tags': [],
        'features': {
          'dynamic_refresh': True,
-@@ -22959,7 +22959,7 @@
+@@ -23206,7 +23206,7 @@
      },
      {
        'name': 'SafeSitesFilterBehavior',
@@ -24582,7 +23913,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -22998,7 +22998,7 @@
+@@ -23245,7 +23245,7 @@
      },
      {
        'name': 'OverrideSecurityRestrictionsOnInsecureOrigin',
@@ -24591,7 +23922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23023,7 +23023,7 @@
+@@ -23270,7 +23270,7 @@
      },
      {
        'name': 'DeviceUpdateStagingSchedule',
@@ -24600,7 +23931,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -23068,7 +23068,7 @@
+@@ -23315,7 +23315,7 @@
      },
      {
        'name': 'TabFreezingEnabled',
@@ -24609,7 +23940,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:79-79', 'chrome_os:79-79'],
-@@ -23083,7 +23083,7 @@
+@@ -23330,7 +23330,7 @@
        'tags': [],
        'desc': '''Controls whether <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> can freeze tabs that have been in the background for at least 5 minutes.
  
@@ -24618,7 +23949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If the policy is set to false, no tabs will be frozen.''',
      },
-@@ -23111,7 +23111,7 @@
+@@ -23358,7 +23358,7 @@
      {
        'id': 462,
        'name': 'NetworkFileSharesAllowed',
@@ -24627,7 +23958,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean', },
        'tags': [],
-@@ -23126,7 +23126,7 @@
+@@ -23373,7 +23373,7 @@
      },
      {
        'name': 'WebRtcEventLogCollectionAllowed',
@@ -24636,7 +23967,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:70-', 'chrome_os:70-'],
-@@ -23147,7 +23147,7 @@
+@@ -23394,7 +23394,7 @@
      },
      {
        'name': 'PowerSmartDimEnabled',
@@ -24645,7 +23976,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:70-'],
-@@ -23165,7 +23165,7 @@
+@@ -23412,7 +23412,7 @@
      },
      {
        'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts',
@@ -24654,7 +23985,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23191,7 +23191,7 @@
+@@ -23438,7 +23438,7 @@
      {
        'id': 467,
        'name': 'NetBiosShareDiscoveryEnabled',
@@ -24663,7 +23994,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean', },
        'tags': [],
-@@ -23209,7 +23209,7 @@
+@@ -23456,7 +23456,7 @@
      },
      {
        'name': 'ManagedConfigurationPerOrigin',
@@ -24672,7 +24003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -23230,12 +23230,12 @@
+@@ -23477,12 +23477,12 @@
          'per_profile': True,
        },
        'example_value': [{
@@ -24688,7 +24019,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
          'managed_configuration_hash' : 'djio12easd89u12aws'
        }],
        'id': 813,
-@@ -23248,7 +23248,7 @@
+@@ -23495,7 +23495,7 @@
      },
      {
        'name': 'WebAppInstallForceList',
@@ -24697,7 +24028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -23285,18 +23285,18 @@
+@@ -23533,18 +23533,18 @@
          'per_profile': True,
        },
        'example_value': [{
@@ -24715,12 +24046,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
          'default_launch_container': 'window',
          'fallback_app_name': 'Editor'
        }, {
--        'url': 'https://docs.google.com/sheets',
-+        'url': 'https://docs.9oo91e.qjz9zk/sheets',
+-        'url': 'https://docs.google.com/document/d/ds187akjqih89',
++        'url': 'https://docs.9oo91e.qjz9zk/document/d/ds187akjqih89',
          'default_launch_container': 'window',
-         'custom_name': 'Spreadsheets'
-       }, {
-@@ -23352,7 +23352,7 @@
+         'install_as_shortcut': True,
+         'custom_name': 'My important document'
+@@ -23611,7 +23611,7 @@
      {
        'id': 470,
        'name': 'ReportVersionData',
@@ -24729,7 +24060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23377,7 +23377,7 @@
+@@ -23636,7 +23636,7 @@
      {
        'id': 471,
        'name': 'ReportPolicyData',
@@ -24738,7 +24069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23402,7 +23402,7 @@
+@@ -23661,7 +23661,7 @@
      {
        'id': 472,
        'name': 'ReportMachineIDData',
@@ -24747,7 +24078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23426,7 +23426,7 @@
+@@ -23685,7 +23685,7 @@
      {
        'id': 473,
        'name': 'ReportUserIDData',
@@ -24756,7 +24087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23451,7 +23451,7 @@
+@@ -23710,7 +23710,7 @@
      {
        'id': 499,
        'name': 'ReportExtensionsAndPluginsData',
@@ -24765,7 +24096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23476,7 +23476,7 @@
+@@ -23735,7 +23735,7 @@
      {
        'id': 500,
        'name': 'ReportSafeBrowsingData',
@@ -24774,7 +24105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing'],
-@@ -23502,7 +23502,7 @@
+@@ -23761,7 +23761,7 @@
      {
        'id': 608,
        'name': 'CloudExtensionRequestEnabled',
@@ -24783,7 +24114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing', 'google-sharing'],
-@@ -23529,7 +23529,7 @@
+@@ -23788,7 +23788,7 @@
      {
        'id': 493,
        'name': 'CloudReportingEnabled',
@@ -24792,7 +24123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean' },
        'tags': ['admin-sharing', 'google-sharing'],
-@@ -23569,7 +23569,7 @@
+@@ -23828,7 +23828,7 @@
      {
        'id': 942,
        'name': 'CloudProfileReportingEnabled',
@@ -24801,7 +24132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean'},
        'tags': ['admin-sharing', 'google-sharing'],
-@@ -23606,7 +23606,7 @@
+@@ -23865,7 +23865,7 @@
      {
        'id': 962,
        'name': 'CloudReportingUploadFrequency',
@@ -24810,7 +24141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 3 , 'maximum': 24},
        'supported_on': ['chrome.*:101-', 'chrome_os:101-', 'android:101-', 'ios:101-'],
-@@ -23632,7 +23632,7 @@
+@@ -23891,7 +23891,7 @@
      },
      {
        'name': 'EnterpriseHardwarePlatformAPIEnabled',
@@ -24819,7 +24150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:71-', 'chrome_os:71-', 'android:71-'],
-@@ -23653,7 +23653,7 @@
+@@ -23912,7 +23912,7 @@
      },
      {
        'name': 'VpnConfigAllowed',
@@ -24828,7 +24159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:71-'],
-@@ -23672,7 +23672,7 @@
+@@ -23931,7 +23931,7 @@
      {
        'id': 489,
        'name': 'NTLMShareAuthenticationEnabled',
@@ -24837,7 +24168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean', },
        'tags': [],
-@@ -23690,7 +23690,7 @@
+@@ -23949,7 +23949,7 @@
      },
      {
        'name': 'NetworkFileSharesPreconfiguredShares',
@@ -24846,7 +24177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -23735,7 +23735,7 @@
+@@ -23994,7 +23994,7 @@
      },
      {
        'name': 'ScreenBrightnessPercent',
@@ -24855,7 +24186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -23775,7 +23775,7 @@
+@@ -24034,7 +24034,7 @@
      {
        'id': 494,
        'name': 'AlternativeBrowserPath',
@@ -24864,7 +24195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {'type': 'string'},
        'features': {
-@@ -23794,7 +23794,7 @@
+@@ -24053,7 +24053,7 @@
      {
        'id': 495,
        'name': 'AlternativeBrowserParameters',
@@ -24873,7 +24204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23826,7 +23826,7 @@
+@@ -24085,7 +24085,7 @@
      {
        'id': 530,
        'name': 'BrowserSwitcherChromePath',
@@ -24882,7 +24213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {'type': 'string'},
        'features': {
-@@ -23846,7 +23846,7 @@
+@@ -24105,7 +24105,7 @@
      {
        'id': 531,
        'name': 'BrowserSwitcherChromeParameters',
@@ -24891,7 +24222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23873,7 +23873,7 @@
+@@ -24132,7 +24132,7 @@
      {
        'id': 496,
        'name': 'BrowserSwitcherUrlList',
@@ -24900,7 +24231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23901,7 +23901,7 @@
+@@ -24160,7 +24160,7 @@
      {
        'id': 497,
        'name': 'BrowserSwitcherUrlGreylist',
@@ -24909,7 +24240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -23929,7 +23929,7 @@
+@@ -24188,7 +24188,7 @@
      {
        'id': 498,
        'name': 'BrowserSwitcherUseIeSitelist',
@@ -24918,7 +24249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': True,
-@@ -23946,12 +23946,12 @@
+@@ -24205,12 +24205,12 @@
  
        When this policy is false or unset, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> does not use <ph name="IE_PRODUCT_NAME">Internet Explorer®</ph>'s <ph name="IEEM_SITELIST_POLICY">SiteList</ph> policy as a source of rules for switching browsers.
  
@@ -24933,7 +24264,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'example_value': 'http://example.com/sitelist.xml',
-@@ -23967,12 +23967,12 @@
+@@ -24226,12 +24226,12 @@
  
        Leaving it unset (or set to a invalid URL) means <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> doesn't use the policy as a source of rules for switching browsers.
  
@@ -24948,7 +24279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'example_value': 'http://example.com/greylist.xml',
-@@ -23988,12 +23988,12 @@
+@@ -24247,12 +24247,12 @@
  
        Leaving it unset (or set to a invalid URL) means <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> doesn't use the policy as a source of rules for not switching browsers.
  
@@ -24963,7 +24294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' },
        'example_value': 10000,
-@@ -24012,7 +24012,7 @@
+@@ -24271,7 +24271,7 @@
      {
        'id': 517,
        'name': 'BrowserSwitcherEnabled',
@@ -24972,7 +24303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': True,
-@@ -24031,7 +24031,7 @@
+@@ -24290,7 +24290,7 @@
      {
        'id': 866,
        'name': 'BrowserSwitcherParsingMode',
@@ -24981,7 +24312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -24075,7 +24075,7 @@
+@@ -24334,7 +24334,7 @@
      {
        'id': 519,
        'name': 'BrowserSwitcherKeepLastChromeTab',
@@ -24990,7 +24321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': False,
-@@ -24093,7 +24093,7 @@
+@@ -24352,7 +24352,7 @@
      },
      {
        'name': 'DeviceDisplayResolution',
@@ -24999,7 +24330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -24134,7 +24134,7 @@
+@@ -24393,7 +24393,7 @@
      },
      {
        'name': 'PluginVmAllowed',
@@ -25008,16 +24339,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:72-'],
-@@ -24152,7 +24152,7 @@
+@@ -24411,7 +24411,7 @@
      },
      {
        'name': 'UserPluginVmAllowed',
--      'owners': ['okalitova@chromium.org', 'janagrill@chromium.org'],
-+      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@ch40m1um.qjz9zk'],
+-      'owners': ['okalitova@chromium.org', 'janagrill@google.com'],
++      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:84-'],
-@@ -24172,7 +24172,7 @@
+@@ -24431,7 +24431,7 @@
      },
      {
        'name': 'PluginVmLicenseKey',
@@ -25026,7 +24357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {
          'sensitiveValue': True,
-@@ -24194,7 +24194,7 @@
+@@ -24453,7 +24453,7 @@
      },
      {
        'name': 'PluginVmUserId',
@@ -25035,7 +24366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {
          'sensitiveValue': True,
-@@ -24213,7 +24213,7 @@
+@@ -24472,7 +24472,7 @@
      },
      {
        'name': 'PluginVmImage',
@@ -25044,25 +24375,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -24244,7 +24244,7 @@
+@@ -24503,7 +24503,7 @@
      },
      {
        'name': 'PluginVmDataCollectionAllowed',
--      'owners': ['okalitova@chromium.org', 'janagrill@chromium.org'],
-+      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@ch40m1um.qjz9zk'],
+-      'owners': ['okalitova@chromium.org', 'janagrill@google.com'],
++      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -24263,7 +24263,7 @@
+@@ -24522,7 +24522,7 @@
      },
      {
        'name': 'PluginVmRequiredFreeDiskSpace',
--      'owners': ['okalitova@chromium.org', 'janagrill@chromium.org'],
-+      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@ch40m1um.qjz9zk'],
+-      'owners': ['okalitova@chromium.org', 'janagrill@google.com'],
++      'owners': ['okalitova@ch40m1um.qjz9zk', 'janagrill@9oo91e.qjz9zk'],
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -24286,7 +24286,7 @@
+@@ -24545,7 +24545,7 @@
      },
      {
        'name': 'ParentAccessCodeConfig',
@@ -25071,7 +24402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'sensitiveValue': True,
-@@ -24364,7 +24364,7 @@
+@@ -24623,7 +24623,7 @@
      },
      {
        'name': 'ClientCertificateManagementAllowed',
@@ -25080,7 +24411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -24404,7 +24404,7 @@
+@@ -24663,7 +24663,7 @@
      {
        'id': 520,
        'name': 'DeviceRebootOnUserSignout',
@@ -25089,7 +24420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -24451,7 +24451,7 @@
+@@ -24710,7 +24710,7 @@
      },
      {
        'name': 'ForceNetworkInProcess',
@@ -25098,7 +24429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:72-83'],
-@@ -24468,7 +24468,7 @@
+@@ -24727,7 +24727,7 @@
      },
      {
        'name': 'AssistantOnboardingMode',
@@ -25107,7 +24438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -24508,7 +24508,7 @@
+@@ -24767,7 +24767,7 @@
      },
      {
        'name': 'VoiceInteractionContextEnabled',
@@ -25116,7 +24447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:74-'],
-@@ -24526,7 +24526,7 @@
+@@ -24785,7 +24785,7 @@
      },
      {
        'name': 'VoiceInteractionHotwordEnabled',
@@ -25125,7 +24456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:74-'],
-@@ -24544,7 +24544,7 @@
+@@ -24803,7 +24803,7 @@
      },
      {
        'name': 'AssistantVoiceMatchEnabledDuringOobe',
@@ -25134,7 +24465,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:93-'],
-@@ -24573,7 +24573,7 @@
+@@ -24832,7 +24832,7 @@
+     },
+     {
+       'name': 'AssistantWebEnabled',
+-      'owners': ['file://components/autofill_assistant/OWNERS', 'brunobraga@google.com', 'jkeitel@google.com'],
++      'owners': ['file://components/autofill_assistant/OWNERS', 'brunobraga@9oo91e.qjz9zk', 'jkeitel@9oo91e.qjz9zk'],
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+       'supported_on': [
+@@ -24872,7 +24872,7 @@
      },
      {
        'name': 'VoiceInteractionQuickAnswersEnabled',
@@ -25143,7 +24483,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:84-88'],
-@@ -24596,7 +24596,7 @@
+@@ -24895,7 +24895,7 @@
      },
      {
        'name': 'QuickAnswersEnabled',
@@ -25152,7 +24492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -24627,7 +24627,7 @@
+@@ -24926,7 +24926,7 @@
      },
      {
        'name': 'QuickAnswersDefinitionEnabled',
@@ -25161,7 +24501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -24657,7 +24657,7 @@
+@@ -24956,7 +24956,7 @@
      },
      {
        'name': 'QuickAnswersTranslationEnabled',
@@ -25170,7 +24510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -24687,7 +24687,7 @@
+@@ -24986,7 +24986,7 @@
      },
      {
        'name': 'QuickAnswersUnitConversionEnabled',
@@ -25179,7 +24519,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -24717,7 +24717,7 @@
+@@ -25016,7 +25016,7 @@
      },
      {
        'name': 'DeviceWilcoDtcAllowed',
@@ -25188,7 +24528,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:74-'],
-@@ -24736,7 +24736,7 @@
+@@ -25035,7 +25035,7 @@
      },
      {
        'name': 'AllowPopupsDuringPageUnload',
@@ -25197,7 +24537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'deprecated': True,
-@@ -24757,11 +24757,11 @@
+@@ -25056,11 +25056,11 @@
  
        This policy was removed in Chrome 88 and is ignored if set.
  
@@ -25211,7 +24551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -24790,7 +24790,7 @@
+@@ -25089,7 +25089,7 @@
      },
      {
        'name': 'DevicePowerPeakShiftEnabled',
@@ -25220,7 +24560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:75-'],
-@@ -24811,7 +24811,7 @@
+@@ -25110,7 +25110,7 @@
      },
      {
        'name': 'DevicePowerPeakShiftBatteryThreshold',
@@ -25229,7 +24569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -24834,7 +24834,7 @@
+@@ -25133,7 +25133,7 @@
      },
      {
        'name': 'DevicePowerPeakShiftDayConfig',
@@ -25238,7 +24578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -24913,7 +24913,7 @@
+@@ -25212,7 +25212,7 @@
      },
      {
        'name': 'DeviceBootOnAcEnabled',
@@ -25247,7 +24587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:75-'],
-@@ -24934,7 +24934,7 @@
+@@ -25233,7 +25233,7 @@
      },
      {
        'name': 'DeviceUsbPowerShareEnabled',
@@ -25256,7 +24596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:75-'],
-@@ -24959,7 +24959,7 @@
+@@ -25258,7 +25258,7 @@
      },
      {
        'name': 'SignedHTTPExchangeEnabled',
@@ -25265,7 +24605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:75-', 'chrome_os:75-'],
-@@ -24989,7 +24989,7 @@
+@@ -25288,7 +25288,7 @@
      },
      {
        'name': 'ContextAwareAccessSignalsAllowlist',
@@ -25274,12 +24614,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome.*:95-', 'chrome_os:95-'],
        'future_on': ['fuchsia'],
        'type': 'list',
-@@ -25018,11 +25018,11 @@
+@@ -25317,11 +25317,11 @@
  
        For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server.
  
--      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https: //cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''',
-+      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https: //cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''',
+-      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''',
++      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''',
      },
      {
        'name': 'DeviceLoginScreenContextAwareAccessSignalsAllowlist',
@@ -25288,12 +24628,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'future_on': ['chrome_os'],
        'device_only': True,
        'type': 'list',
-@@ -25050,11 +25050,11 @@
+@@ -25349,11 +25349,11 @@
  
        This policy will only impact the attestation flow on the login and lock screen. To change the in-session attestation flow, please use the <ph name="CONTEXT_AWARE_ACCESS_SIGNALS_ALLOWLIST_POLICY_NAME">ContextAwareAccessSignalsAllowlist</ph> policy.
  
--      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https: //cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''',
-+      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https: //cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''',
+-      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''',
++      For detailed information on valid <ph name="URL_LABEL">URL</ph> patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''',
      },
      {
        'name': 'DeviceQuickFixBuildToken',
@@ -25302,7 +24642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {
          'type': 'string',
-@@ -25077,7 +25077,7 @@
+@@ -25376,7 +25376,7 @@
      },
      {
        'name': 'SamlInSessionPasswordChangeEnabled',
@@ -25311,7 +24651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:98-'],
-@@ -25111,7 +25111,7 @@
+@@ -25410,7 +25410,7 @@
      },
      {
        'name': 'LockScreenReauthenticationEnabled',
@@ -25320,7 +24660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:98-'],
-@@ -25129,7 +25129,7 @@
+@@ -25428,7 +25428,7 @@
      },
      {
        'name': 'UserFeedbackAllowed',
@@ -25329,7 +24669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -25161,7 +25161,7 @@
+@@ -25460,7 +25460,7 @@
      },
      {
        'name': 'SamlPasswordExpirationAdvanceWarningDays',
@@ -25338,7 +24678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -25187,7 +25187,7 @@
+@@ -25486,7 +25486,7 @@
      },
      {
        'name': 'DeviceAdvancedBatteryChargeModeEnabled',
@@ -25347,7 +24687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:75-'],
-@@ -25208,7 +25208,7 @@
+@@ -25507,7 +25507,7 @@
      },
      {
        'name': 'DeviceAdvancedBatteryChargeModeDayConfig',
@@ -25356,7 +24696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -25275,7 +25275,7 @@
+@@ -25574,7 +25574,7 @@
      },
      {
        'name': 'DeviceBatteryChargeMode',
@@ -25365,7 +24705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -25326,7 +25326,7 @@
+@@ -25625,7 +25625,7 @@
      },
      {
        'name': 'DeviceBatteryChargeCustomStartCharging',
@@ -25374,7 +24714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -25349,7 +25349,7 @@
+@@ -25648,7 +25648,7 @@
      },
      {
        'name': 'DeviceBatteryChargeCustomStopCharging',
@@ -25383,7 +24723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -25372,7 +25372,7 @@
+@@ -25671,7 +25671,7 @@
      },
      {
        'name': 'DeviceScheduledUpdateCheck',
@@ -25392,7 +24732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'type': 'dict',
        'schema': {
-@@ -25418,7 +25418,7 @@
+@@ -25717,7 +25717,7 @@
      },
      {
        'name': 'DeviceScheduledReboot',
@@ -25401,7 +24741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'type': 'dict',
        'schema': {
-@@ -25472,7 +25472,7 @@
+@@ -25771,7 +25771,7 @@
      },
      {
        'name': 'KerberosEnabled',
@@ -25410,7 +24750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:87-'],
-@@ -25493,7 +25493,7 @@
+@@ -25792,7 +25792,7 @@
      },
      {
        'name': 'KerberosRememberPasswordEnabled',
@@ -25419,7 +24759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:87-'],
-@@ -25514,7 +25514,7 @@
+@@ -25813,7 +25813,7 @@
      },
      {
        'name': 'KerberosAddAccountsAllowed',
@@ -25428,7 +24768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:87-'],
-@@ -25535,7 +25535,7 @@
+@@ -25834,7 +25834,7 @@
      },
      {
        'name': 'KerberosAccounts',
@@ -25437,7 +24777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -25612,7 +25612,7 @@
+@@ -25911,7 +25911,7 @@
      },
      {
        'name': 'KerberosDomainAutocomplete',
@@ -25446,7 +24786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'future_on': ['chrome_os'],
-@@ -25633,7 +25633,7 @@
+@@ -25932,7 +25932,7 @@
      },
      {
        'name': 'KerberosDefaultConfiguration',
@@ -25455,7 +24795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': { 'type': 'string' },
        'future_on': ['chrome_os'],
-@@ -25654,7 +25654,7 @@
+@@ -25953,7 +25953,7 @@
      },
      {
        'name': 'CommandLineFlagSecurityWarningsEnabled',
@@ -25464,7 +24804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:76-'],
-@@ -25686,7 +25686,7 @@
+@@ -25985,7 +25985,7 @@
      },
      {
        'name': 'StartupBrowserWindowLaunchSuppressed',
@@ -25473,7 +24813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:76-'],
-@@ -25707,7 +25707,7 @@
+@@ -26006,7 +26006,7 @@
      {
        'id': 571,
        'name': 'DevicePowerwashAllowed',
@@ -25482,7 +24822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -25727,7 +25727,7 @@
+@@ -26026,7 +26026,7 @@
      },
      {
        'name': 'ExternalPrintServers',
@@ -25491,7 +24831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -25772,7 +25772,7 @@
+@@ -26071,7 +26071,7 @@
      },
      {
        'name': 'DeviceExternalPrintServers',
@@ -25500,7 +24840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -25821,7 +25821,7 @@
+@@ -26120,7 +26120,7 @@
      },
      {
        'name': 'VmManagementCliAllowed',
@@ -25509,7 +24849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:77-'],
-@@ -25841,7 +25841,7 @@
+@@ -26140,7 +26140,7 @@
      },
      {
        'name': 'CACertificateManagementAllowed',
@@ -25518,7 +24858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -25879,7 +25879,7 @@
+@@ -26178,7 +26178,7 @@
      {
        'id': 581,
        'name': 'LockScreenMediaPlaybackEnabled',
@@ -25527,7 +24867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -25899,7 +25899,7 @@
+@@ -26198,7 +26198,7 @@
      },
      {
        'name': 'OnFileDownloadedEnterpriseConnector',
@@ -25536,7 +24876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26059,11 +26059,11 @@
+@@ -26358,11 +26358,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph>, <ph name="ENTERPRISE_CONNECTOR_MESSAGE_FIELD">message</ph>, <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph>, <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> and <ph name="ENTERPRISE_CONNECTOR_TAG_FIELD">tag</ph> fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields.
  
@@ -25550,7 +24890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26223,11 +26223,11 @@
+@@ -26522,11 +26522,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph>, <ph name="ENTERPRISE_CONNECTOR_MESSAGE_FIELD">message</ph>, <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph>, <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> and <ph name="ENTERPRISE_CONNECTOR_TAG_FIELD">tag</ph> fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields.
  
@@ -25564,7 +24904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26383,11 +26383,11 @@
+@@ -26682,11 +26682,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph>, <ph name="ENTERPRISE_CONNECTOR_MESSAGE_FIELD">message</ph>, <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph>, <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> and <ph name="ENTERPRISE_CONNECTOR_TAG_FIELD">tag</ph> fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields.
  
@@ -25578,7 +24918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26533,11 +26533,11 @@
+@@ -26832,11 +26832,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph>, <ph name="ENTERPRISE_CONNECTOR_MESSAGE_FIELD">message</ph>, <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph>, <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> and <ph name="ENTERPRISE_CONNECTOR_TAG_FIELD">tag</ph> fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The administrator is able to configure messages of up to 200 characters.
  
@@ -25592,7 +24932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26724,11 +26724,11 @@
+@@ -27023,11 +27023,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph>, <ph name="ENTERPRISE_CONNECTOR_MESSAGE_FIELD">message</ph>, <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph>, <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> and <ph name="ENTERPRISE_CONNECTOR_TAG_FIELD">tag</ph> fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The <ph name="ENTERPRISE_CONNECTOR_LEARN_MORE_URL_FIELD">learn_more_url</ph> field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> field is optional and contains the language of the message. An empty <ph name="ENTERPRISE_CONNECTOR_LANGUAGE_FIELD">language</ph> field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The <ph name="ENTERPRISE_CONNECTOR_CUSTOM_MESSAGES_FIELD">custom_messages</ph> list can have zero or more entries, where each entry is required to have non-empty message and tag fields.
  
@@ -25606,7 +24946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -26778,11 +26778,11 @@
+@@ -27077,11 +27077,11 @@
  
        The <ph name="ENTERPRISE_CONNECTOR_SERVICE_PROVIDER_FIELD">service_provider</ph> field identifies which reporting service provider the settings correspond to and the <ph name="ENTERPRISE_CONNECTOR_ENABLED_EVENT_NAMES_FIELD">enabled_event_names</ph> field identifies which events are enabled for this provider.
  
@@ -25620,7 +24960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -26821,11 +26821,11 @@
+@@ -27120,11 +27120,11 @@
  
        If this policy is set to ‘Enabled’, URLs will be sent to be scanned in real time under enterprise ToS. It will result in Chrome sending URLs to Google Cloud or third parties of your choosing to check them in real time. The consumer version of Safe Browsing real time lookup will be switched off.
  
@@ -25634,7 +24974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:78-'],
-@@ -26841,11 +26841,11 @@
+@@ -27140,11 +27140,11 @@
  
        Setting the policy to Disabled has a detrimental effect on <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s security and stability as unknown and potentially hostile code can load inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s renderer processes. Only turn off the policy if there are compatibility issues with third-party software that must run inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s renderer processes.
  
@@ -25648,7 +24988,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:104-'],
-@@ -26872,11 +26872,11 @@
+@@ -27171,11 +27171,11 @@
  
        Setting the policy to Disabled has a detrimental effect on the security and stability of <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> as it will weaken the sandbox that renderer processes use. Only turn off the policy if there are compatibility issues with third-party software that must run inside renderer processes.
  
@@ -25662,7 +25002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -26903,11 +26903,11 @@
+@@ -27202,11 +27202,11 @@
  
        Setting the policy to Disabled has a detrimental effect on <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s security and stability as unknown and potentially hostile code can load inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s browser process. Only turn off the policy if there are compatibility issues with third-party software that must run inside <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s browser process.
  
@@ -25676,7 +25016,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -26934,7 +26934,7 @@
+@@ -27233,7 +27233,7 @@
      },
      {
        'name': 'AllowSyncXHRInPageDismissal',
@@ -25685,7 +25025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'deprecated': True,
-@@ -26957,11 +26957,11 @@
+@@ -27256,11 +27256,11 @@
  
        This policy was removed in Chrome 99.
  
@@ -25699,7 +25039,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -26987,7 +26987,7 @@
+@@ -27286,7 +27286,7 @@
      {
        'id': 626,
        'name': 'TLS13HardeningForLocalAnchorsEnabled',
@@ -25708,7 +25048,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -27012,7 +27012,7 @@
+@@ -27311,7 +27311,7 @@
      },
      {
        'name': 'AudioSandboxEnabled',
@@ -25717,7 +25057,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:79-', 'chrome.linux:79-', 'chrome.mac:79-'],
-@@ -27033,7 +27033,7 @@
+@@ -27332,7 +27332,7 @@
      },
      {
        'name': 'CorsMitigationList',
@@ -25726,7 +25066,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -27051,19 +27051,19 @@
+@@ -27350,19 +27350,19 @@
        'tags': [],
        'desc': '''Enable <ph name="CORS">CORS</ph> check mitigations in the new <ph name="CORS">CORS</ph> implementation, allowing Extensions to keep compatible behavior, and allowing <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to send specified headers without <ph name="CORS">CORS</ph> checks.
  
@@ -25749,7 +25089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:79-83', 'chrome_os:79-83'],
-@@ -27084,13 +27084,13 @@
+@@ -27383,13 +27383,13 @@
  
        This policy will be removed after a couple of milestones.
  
@@ -25765,7 +25105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:79-100'],
        'id': 631,
        'features': {
-@@ -27118,7 +27118,7 @@
+@@ -27417,7 +27417,7 @@
      },
      {
        'name': 'ExternalPrintServersAllowlist',
@@ -25774,7 +25114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:86-'],
        'id': 750,
        'features': {
-@@ -27143,7 +27143,7 @@
+@@ -27442,7 +27442,7 @@
      },
      {
        'name': 'DeviceExternalPrintServersAllowlist',
@@ -25783,7 +25123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'future_on': ['chrome_os'],
        # TODO(https://crbug.com/1100777): Remove |future|.
        'id': 731,
-@@ -27170,7 +27170,7 @@
+@@ -27469,7 +27469,7 @@
      },
      {
        'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox',
@@ -25792,7 +25132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -27204,7 +27204,7 @@
+@@ -27503,7 +27503,7 @@
      },
      {
        'name': 'DefaultInsecureContentSetting',
@@ -25801,7 +25141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -27240,7 +27240,7 @@
+@@ -27539,7 +27539,7 @@
      },
      {
        'name': 'InsecureContentAllowedForUrls',
@@ -25810,7 +25150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -27260,11 +27260,11 @@
+@@ -27559,11 +27559,11 @@
  
            If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, and users will be allowed to set exceptions to allow it for specific sites.
  
@@ -25824,7 +25164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -27284,11 +27284,11 @@
+@@ -27583,11 +27583,11 @@
  
            If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, but users will be allowed to set exceptions to allow it for specific sites.
  
@@ -25838,7 +25178,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'type': 'list',
        'schema': {
-@@ -27312,11 +27312,11 @@
+@@ -27611,11 +27611,11 @@
  
        URLs must have HTTPS scheme, e.g. "https://example.com".
  
@@ -25852,7 +25192,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type' : 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:80-'],
-@@ -27334,7 +27334,7 @@
+@@ -27633,7 +27633,7 @@
      },
      {
        'name': 'PerAppTimeLimits',
@@ -25861,7 +25201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -27461,7 +27461,7 @@
+@@ -27760,7 +27760,7 @@
      },
      {
        'name': 'WebComponentsV0Enabled',
@@ -25870,7 +25210,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': True,
-@@ -27484,7 +27484,7 @@
+@@ -27783,7 +27783,7 @@
      },
      {
        'name': 'UseLegacyFormControls',
@@ -25879,7 +25219,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': True,
-@@ -27507,7 +27507,7 @@
+@@ -27806,7 +27806,7 @@
      },
      {
        'name': 'EventPathEnabled',
@@ -25888,7 +25228,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'example_value': True,
-@@ -27547,7 +27547,7 @@
+@@ -27846,7 +27846,7 @@
      },
      {
        'name': 'ClickToCallEnabled',
@@ -25897,7 +25237,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -27560,7 +27560,7 @@
+@@ -27859,7 +27859,7 @@
        'id': 645,
        'caption': '''Enable the Click to Call Feature''',
        'tags': [],
@@ -25906,7 +25246,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If this policy is set to enabled, the capability of sending phone numbers to Android devices will be enabled for the Chrome user.
  
-@@ -27572,7 +27572,7 @@
+@@ -27871,7 +27871,7 @@
      },
      {
        'name': 'UserDataSnapshotRetentionLimit',
@@ -25915,7 +25255,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0 },
        'supported_on': ['chrome.*:83-'],
-@@ -27594,7 +27594,7 @@
+@@ -27893,7 +27893,7 @@
      },
      {
        'name': 'PrinterTypeDenyList',
@@ -25924,7 +25264,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -27662,7 +27662,7 @@
+@@ -27961,7 +27961,7 @@
      },
      {
        'name': 'PrintPostScriptMode',
@@ -25933,7 +25273,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -27702,7 +27702,7 @@
+@@ -28001,7 +28001,7 @@
      },
      {
        'name': 'PrintRasterizationMode',
@@ -25942,7 +25282,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -27742,7 +27742,7 @@
+@@ -28041,7 +28041,7 @@
      },
      {
        'name': 'PrintPdfAsImageAvailability',
@@ -25951,7 +25291,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -27775,7 +27775,7 @@
+@@ -28074,7 +28074,7 @@
      },
      {
        'name': 'PrintRasterizePdfDpi',
@@ -25960,7 +25300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': {
          'type': 'integer',
-@@ -27802,7 +27802,7 @@
+@@ -28101,7 +28101,7 @@
      },
      {
        'name': 'PrintPdfAsImageDefault',
@@ -25969,7 +25309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -27838,7 +27838,7 @@
+@@ -28137,7 +28137,7 @@
      },
      {
        'name': 'DeletePrintJobHistoryAllowed',
@@ -25978,7 +25318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -27861,7 +27861,7 @@
+@@ -28160,7 +28160,7 @@
      },
      {
        'name': 'AmbientAuthenticationInPrivateModesEnabled',
@@ -25987,7 +25327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -27917,7 +27917,7 @@
+@@ -28216,7 +28216,7 @@
      },
      {
        'name': 'PaymentMethodQueryEnabled',
@@ -25996,7 +25336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-', 'chrome_os:80-', 'android:80-'],
-@@ -27938,7 +27938,7 @@
+@@ -28237,7 +28237,7 @@
      },
      {
        'name': 'StricterMixedContentTreatmentEnabled',
@@ -26005,7 +25345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
-@@ -27960,7 +27960,7 @@
+@@ -28259,7 +28259,7 @@
      },
      {
        'name': 'PerAppTimeLimitsWhitelist',
@@ -26014,7 +25354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 658,
        'features': {
          'dynamic_refresh': True,
-@@ -28004,8 +28004,8 @@
+@@ -28303,8 +28303,8 @@
          'url_list': [
            "chrome://*",
            "file://*",
@@ -26025,7 +25365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
          ],
          'app_list': [
            {
-@@ -28034,7 +28034,7 @@
+@@ -28333,7 +28333,7 @@
      },
      {
        'name': 'PerAppTimeLimitsAllowlist',
@@ -26034,7 +25374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'id': 762,
        'features': {
          'dynamic_refresh': True,
-@@ -28077,8 +28077,8 @@
+@@ -28376,8 +28376,8 @@
          'url_list': [
            "chrome://*",
            "file://*",
@@ -26045,7 +25385,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
          ],
          'app_list': [
            {
-@@ -28105,7 +28105,7 @@
+@@ -28404,7 +28404,7 @@
      },
      {
        'name': 'LocalDiscoveryEnabled',
@@ -26054,7 +25394,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:81-87', 'chrome_os:81-87'],
-@@ -28138,7 +28138,7 @@
+@@ -28437,7 +28437,7 @@
      },
      {
        'name': 'ScreenCaptureAllowed',
@@ -26063,7 +25403,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:81-', 'chrome_os:81-'],
-@@ -28168,7 +28168,7 @@
+@@ -28467,7 +28467,7 @@
      },
      {
        'name': 'ScreenCaptureAllowedByOrigins',
@@ -26072,7 +25412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -28192,11 +28192,11 @@
+@@ -28491,11 +28491,11 @@
  
        If a site matches a URL pattern in this policy, the <ph name="SCREEN_CAPTURE_ALLOWED_POLICY_NAME">ScreenCaptureAllowed</ph> will not be considered.
  
@@ -26086,7 +25426,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -28220,11 +28220,11 @@
+@@ -28519,11 +28519,11 @@
  
        If a site matches a URL pattern in this policy, the following policies will not be considered: <ph name="SCREEN_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">ScreenCaptureAllowedByOrigins</ph>, <ph name="SCREEN_CAPTURE_ALLOWED_POLICY_NAME">ScreenCaptureAllowed</ph>.
  
@@ -26100,7 +25440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -28250,11 +28250,11 @@
+@@ -28549,11 +28549,11 @@
  
        If a site matches a URL pattern in this policy, the following policies will not be considered: <ph name="WINDOW_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">WindowCaptureAllowedByOrigins</ph>, <ph name="SCREEN_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">ScreenCaptureAllowedByOrigins</ph>, <ph name="SCREEN_CAPTURE_ALLOWED_POLICY_NAME">ScreenCaptureAllowed</ph>.
  
@@ -26114,7 +25454,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -28278,11 +28278,11 @@
+@@ -28577,11 +28577,11 @@
  
        If a site matches a URL pattern in this policy, the following policies will not be considered: <ph name="TAB_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">TabCaptureAllowedByOrigins</ph>, <ph name="WINDOW_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">WindowCaptureAllowedByOrigins</ph>, <ph name="SCREEN_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME">ScreenCaptureAllowedByOrigins</ph>, <ph name="SCREEN_CAPTURE_ALLOWED_POLICY_NAME">ScreenCaptureAllowed</ph>.
  
@@ -26128,7 +25468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:81-81'],
-@@ -28301,7 +28301,7 @@
+@@ -28600,7 +28600,7 @@
      },
      {
        'name': 'SystemProxySettings',
@@ -26137,7 +25477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'supported_on': ['chrome_os:87-'],
        'device_only': True,
        'id': 672,
-@@ -28357,7 +28357,7 @@
+@@ -28656,7 +28656,7 @@
      },
      {
        'name': 'DeviceLoginScreenPrivacyScreenEnabled',
@@ -26146,7 +25486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'device_only': True,
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -28385,7 +28385,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema
+@@ -28684,7 +28684,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema
      },
      {
        'name': 'PrivacyScreenEnabled',
@@ -26155,7 +25495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:83-'],
-@@ -28412,7 +28412,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co
+@@ -28711,7 +28711,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co
      },
      {
        'name': 'AllowNativeNotifications',
@@ -26164,7 +25504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.linux:83-100'],
-@@ -28467,7 +28467,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
+@@ -28766,7 +28766,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
      },
      {
        'name': 'RequiredClientCertificateForUser',
@@ -26173,7 +25513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -28519,7 +28519,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
+@@ -28818,7 +28818,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
      },
      {
        'name': 'RequiredClientCertificateForDevice',
@@ -26182,7 +25522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -28571,7 +28571,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
+@@ -28870,7 +28870,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
      },
      {
        'name': 'AdvancedProtectionAllowed',
@@ -26191,7 +25531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:83-', 'chrome_os:83-'],
-@@ -28589,7 +28589,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
+@@ -28888,7 +28888,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not
      },
      {
        'name': 'ScrollToTextFragmentEnabled',
@@ -26200,7 +25540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:83-', 'chrome_os:83-', 'android:83-'],
-@@ -28611,7 +28611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -28910,7 +28910,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'LoginDisplayPasswordButtonEnabled',
@@ -26209,7 +25549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -28630,7 +28630,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -28929,7 +28929,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'AccessibilityImageLabelsEnabled',
@@ -26218,7 +25558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:84-', 'chrome.*:84-'],
-@@ -28682,7 +28682,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -28981,7 +28981,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'IntensiveWakeUpThrottlingEnabled',
@@ -26227,7 +25567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-', 'chrome.*:85-', 'android:85-'],
-@@ -28721,7 +28721,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29020,7 +29020,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'BackForwardCacheEnabled',
@@ -26236,7 +25576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:86-'],
-@@ -28756,7 +28756,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29055,7 +29055,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'PinUnlockAutosubmitEnabled',
@@ -26245,7 +25585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -28782,7 +28782,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29081,7 +29081,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'EmojiSuggestionEnabled',
@@ -26254,7 +25594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-'],
-@@ -28801,7 +28801,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29100,7 +29100,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'UserAgentClientHintsEnabled',
@@ -26263,7 +25603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:84-93', 'chrome.*:84-93', 'android:84-93'],
-@@ -28823,7 +28823,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29122,7 +29122,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'UserAgentClientHintsGREASEUpdateEnabled',
@@ -26272,7 +25612,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:98-', 'chrome.*:98-', 'android:98-'],
-@@ -28854,7 +28854,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29153,7 +29153,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'UrlParamFilterEnabled',
@@ -26281,7 +25621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:102-', 'chrome.*:102-', 'android:102-'],
-@@ -28884,7 +28884,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29183,7 +29183,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'SuggestedContentEnabled',
@@ -26290,7 +25630,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:85-'],
-@@ -28906,7 +28906,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29205,7 +29205,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'ShowFullUrlsInAddressBar',
@@ -26299,7 +25639,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:86-', 'chrome.*:86-'],
-@@ -28930,7 +28930,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29229,7 +29229,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'InsecureFormsWarningsEnabled',
@@ -26308,7 +25648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:86-', 'chrome_os:86-', 'android:86-'],
-@@ -28950,7 +28950,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29249,7 +29249,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'LookalikeWarningAllowlistDomains',
@@ -26317,7 +25657,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -28977,7 +28977,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29276,7 +29276,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'CCTToSDialogEnabled',
@@ -26326,7 +25666,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:86-86'],
-@@ -29007,7 +29007,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29306,7 +29306,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'TosDialogBehavior',
@@ -26335,7 +25675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -29050,7 +29050,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29349,7 +29349,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'CloudPrintWarningsSuppressed',
@@ -26344,7 +25684,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:86-87', 'chrome_os:86-87'],
-@@ -29080,7 +29080,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29379,7 +29379,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'EnableDeprecatedPrivetPrinting',
@@ -26353,7 +25693,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:89-93', 'chrome_os:89-93'],
-@@ -29110,7 +29110,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29409,7 +29409,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DataLeakPreventionClipboardCheckSizeLimit',
@@ -26362,7 +25702,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer' , 'minimum' : 0 },
        'supported_on': ['chrome_os:93-'],
-@@ -29129,7 +29129,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29428,7 +29428,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DataLeakPreventionReportingEnabled',
@@ -26371,7 +25711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:92-'],
-@@ -29161,7 +29161,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29460,7 +29460,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DataLeakPreventionRulesList',
@@ -26380,7 +25720,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -29248,18 +29248,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29547,18 +29547,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR
            'sources': {
              'urls': [
                'salesforce.com',
@@ -26405,7 +25745,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
                'company.com'
              ]
            },
-@@ -29292,8 +29292,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29591,8 +29591,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR
            'sources': {
              'urls': [
                'salesforce.com',
@@ -26416,7 +25756,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
                'company.com'
              ]
            },
-@@ -29340,13 +29340,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29639,13 +29639,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
        Notes:
        - PRIVACY_SCREEN restriction doesn't block the ability to turn on privacy screen, but enforces it when the restriction class is set to BLOCK.
        - Destinations cannot be empty in case one of the restrictions is CLIPBOARD, but they don't make any difference for the remaining restrictions.
@@ -26432,7 +25772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:87-', 'chrome_os:87-'],
-@@ -29380,7 +29380,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29679,7 +29679,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'MediaRecommendationsEnabled',
@@ -26441,7 +25781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:87-', 'chrome_os:87-'],
-@@ -29408,7 +29408,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29707,7 +29707,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DeviceFamilyLinkAccountsAllowed',
@@ -26450,7 +25790,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:87-'],
-@@ -29432,7 +29432,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29731,7 +29731,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'EduCoexistenceToSVersion',
@@ -26459,7 +25799,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {
          'type': 'string',
-@@ -29457,7 +29457,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29756,7 +29756,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'BrowsingDataLifetime',
@@ -26468,7 +25808,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -29513,7 +29513,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29812,7 +29812,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'LacrosAllowed',
@@ -26477,7 +25817,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:88-95'],
-@@ -29546,7 +29546,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29845,7 +29845,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'LacrosSecondaryProfilesAllowed',
@@ -26486,7 +25826,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.linux:91-92', 'chrome_os:91-'],
-@@ -29580,7 +29580,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29879,7 +29879,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'LacrosAvailability',
@@ -26495,7 +25835,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -29646,7 +29646,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -29945,7 +29945,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+     },
+     {
+       'name': 'LacrosDataBackwardMigrationMode',
+-      'owners': ['janagrill@google.com', 'vsavu@google.com'],
++      'owners': ['janagrill@9oo91e.qjz9zk', 'vsavu@9oo91e.qjz9zk'],
+       'type': 'string-enum',
+       'schema': {
+         'type': 'string',
+@@ -30000,7 +30000,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'IntegratedWebAuthenticationAllowed',
@@ -26504,7 +25853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:89-93'],
-@@ -29674,7 +29674,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30028,7 +30028,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'ClearBrowsingDataOnExitList',
@@ -26513,7 +25862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',
        'schema': {
          'type': 'array',
-@@ -29761,7 +29761,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30115,7 +30115,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'ProfilePickerOnStartupAvailability',
@@ -26522,7 +25871,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -29810,7 +29810,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30164,7 +30164,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'SigninInterceptionEnabled',
@@ -26531,7 +25880,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:89-'],
-@@ -29847,7 +29847,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30201,7 +30201,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'WebXRImmersiveArEnabled',
@@ -26540,7 +25889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:90-'],
-@@ -29880,7 +29880,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30234,7 +30234,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'SendDownloadToCloudEnterpriseConnector',
@@ -26549,7 +25898,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -29967,7 +29967,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30321,7 +30321,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DeviceSystemWideTracingEnabled',
@@ -26558,7 +25907,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:90-'],
-@@ -30001,7 +30001,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30355,7 +30355,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'WebAppSettings',
@@ -26567,7 +25916,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -30048,13 +30048,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30402,13 +30402,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR
  
        This policy maps a Web App ID to its specific setting. A default configuration can be set using the special ID <ph name="DEFAULT_SCOPE">"*"</ph>, which applies to all web apps without a custom configuration in this policy.
  
@@ -26583,7 +25932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 },
        'default': 0,
-@@ -30077,7 +30077,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30431,7 +30431,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'SuppressDifferentOriginSubframeDialogs',
@@ -26592,7 +25941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:91-', 'chrome_os:91-', 'android:91-'],
-@@ -30101,7 +30101,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30455,7 +30455,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
        'id': 829,
        'caption': '''Suppress JavaScript Dialogs triggered from different origin subframes''',
        'tags': [],
@@ -26601,7 +25950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
         This policy allows overriding that change.
         If the policy is set to enabled or unset, JavaScript dialogs triggered from a different origin subframe will be blocked.
         If the policy is set to disabled, JavaScript dialogs triggered from a different origin subframe will not be blocked.
-@@ -30110,7 +30110,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30464,7 +30464,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DeviceBorealisAllowed',
@@ -26610,7 +25959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:91-'],
-@@ -30139,7 +30139,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30493,7 +30493,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'UserBorealisAllowed',
@@ -26619,7 +25968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:91-'],
-@@ -30168,7 +30168,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30522,7 +30522,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'AudioProcessHighPriorityEnabled',
@@ -26628,7 +25977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:90-'],
-@@ -30205,7 +30205,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30559,7 +30559,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'ForcedLanguages',
@@ -26637,7 +25986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -30230,7 +30230,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30584,7 +30584,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'BrowserThemeColor',
@@ -26646,7 +25995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string',
        'schema': {
          'type': 'string',
-@@ -30255,7 +30255,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30609,7 +30609,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'WebRtcIPHandling',
@@ -26655,7 +26004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -30298,7 +30298,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30652,7 +30652,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'PdfAnnotationsEnabled',
@@ -26664,7 +26013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:91-'],
-@@ -30329,7 +30329,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
+@@ -30683,7 +30683,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR
      },
      {
        'name': 'DeviceAllowedBluetoothServices',
@@ -26673,7 +26022,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -30353,7 +30353,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
+@@ -30707,7 +30707,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
      },
      {
        'name': 'ExplicitlyAllowedNetworkPorts',
@@ -26682,7 +26031,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum-list',  # this would be 'int-enum-list' if it was supported.
        'schema': {
          'type': 'array',
-@@ -30449,7 +30449,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
+@@ -30803,7 +30803,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
      },
      {
        'name': 'DeviceDebugPacketCaptureAllowed',
@@ -26691,7 +26040,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:92-'],
-@@ -30482,7 +30482,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
+@@ -30836,7 +30836,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
      },
      {
        'name': 'SuggestLogoutAfterClosingLastWindow',
@@ -26700,7 +26049,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:92-'],
-@@ -30511,7 +30511,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
+@@ -30865,7 +30865,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
      },
      {
        'name': 'TripleDESEnabled',
@@ -26709,7 +26058,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {
          'type': 'boolean',
-@@ -30552,7 +30552,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
+@@ -30906,7 +30906,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2<ex>Google ChromeOS</ex></
      },
      {
        'name': 'ManagedAccountsSigninRestriction',
@@ -26718,7 +26067,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -30631,7 +30631,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -30985,7 +30985,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'UnmanagedDeviceSignalsConsentFlowEnabled',
@@ -26727,7 +26076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': [
-@@ -30664,7 +30664,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31019,7 +31019,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'LockIconInAddressBarEnabled',
@@ -26736,7 +26085,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -30695,7 +30695,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31050,7 +31050,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DefaultJavaScriptJitSetting',
@@ -26745,7 +26094,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -30734,7 +30734,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31089,7 +31089,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'JavaScriptJitAllowedForSites',
@@ -26754,7 +26103,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -30752,7 +30752,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31107,7 +31107,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'tags': [],
        'desc': '''Allows you to set a list of site url patterns that specify sites which are allowed to run JavaScript with JIT (Just In Time) compiler enabled.
  
@@ -26763,7 +26112,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
            JavaScript JIT policy exceptions will only be enforced at a site granularity (eTLD+1). A policy set for only subdomain.site.com will not correctly apply to site.com or subdomain.site.com since they both resolve to the same eTLD+1 (site.com) for which there is no policy. In this case, policy must be set on site.com to apply correctly for both site.com and subdomain.site.com.
  
-@@ -30762,7 +30762,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31117,7 +31117,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'JavaScriptJitBlockedForSites',
@@ -26772,7 +26121,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -30782,7 +30782,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31137,7 +31137,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
  
            Disabling the JavaScript JIT will mean that <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> may render web content more slowly, and may also disable parts of JavaScript including WebAssembly. Disabling the JavaScript JIT may allow <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to render web content in a more secure configuration.
  
@@ -26781,7 +26130,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
            JavaScript JIT policy exceptions will only be enforced at a site granularity (eTLD+1). A policy set for only subdomain.site.com will not correctly apply to site.com or subdomain.site.com since they both resolve to the same eTLD+1 (site.com) for which there is no policy. In this case, policy must be set on site.com to apply correctly for both site.com and subdomain.site.com.
  
-@@ -30792,7 +30792,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31147,7 +31147,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'HttpsOnlyMode',
@@ -26790,7 +26139,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -30837,7 +30837,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31192,7 +31192,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DesktopSharingHubEnabled',
@@ -26799,7 +26148,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'items': [
-@@ -30867,7 +30867,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31222,7 +31222,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeviceRestrictedManagedGuestSessionEnabled',
@@ -26808,7 +26157,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -30897,7 +30897,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31252,7 +31252,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'RestrictedManagedGuestSessionExtensionCleanupExemptList',
@@ -26817,7 +26166,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': {
          'type': 'array',
-@@ -30921,7 +30921,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31276,7 +31276,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'ArcAppToWebAppSharingEnabled',
@@ -26826,7 +26175,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:94-'],
-@@ -30982,7 +30982,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31337,7 +31337,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'ChromeAppsEnabled',
@@ -26835,7 +26184,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-'],
-@@ -31013,7 +31013,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31368,7 +31368,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'FullRestoreEnabled',
@@ -26844,7 +26193,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -31042,7 +31042,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31397,7 +31397,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'GhostWindowEnabled',
@@ -26853,7 +26202,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-'],
-@@ -31071,7 +31071,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31426,7 +31426,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'WebSQLInThirdPartyContextEnabled',
@@ -26862,7 +26211,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:96-100', 'chrome.*:96-100', 'chrome_os:96-100'],
-@@ -31101,7 +31101,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31456,7 +31456,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeviceLoginScreenPromptOnMultipleMatchingCertificates',
@@ -26871,7 +26220,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'device_only': True,
-@@ -31132,7 +31132,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31487,7 +31487,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'PromptOnMultipleMatchingCertificates',
@@ -26880,7 +26229,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:96-', 'chrome.*:96-'],
-@@ -31162,7 +31162,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31517,7 +31517,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'AccessCodeCastEnabled',
@@ -26889,7 +26238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:102-', 'chrome.*:102-'],
-@@ -31193,7 +31193,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31548,7 +31548,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'AccessCodeCastDeviceDuration',
@@ -26898,7 +26247,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 0 },
        'supported_on': ['chrome_os:103-', 'chrome.*:103-'],
-@@ -31217,7 +31217,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31572,7 +31572,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'NetworkServiceSandboxEnabled',
@@ -26907,7 +26256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.win:96-'],
-@@ -31248,7 +31248,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31603,7 +31603,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeskTemplatesEnabled',
@@ -26916,7 +26265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -31275,7 +31275,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31630,7 +31630,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'PreconfiguredDeskTemplates',
@@ -26925,7 +26274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'external',
        'schema': {
          'type': 'object',
-@@ -31338,7 +31338,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31693,7 +31693,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'CORSNonWildcardRequestHeadersSupport',
@@ -26934,7 +26283,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'default': True,
-@@ -31364,7 +31364,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31719,7 +31719,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'tags': [],
        'desc': '''Configures support of CORS non-wildcard request headers.
  
@@ -26943,7 +26292,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
  
        If this policy is not set, or set to True, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will support the CORS non-wildcard request headers and behave as described above.
  
-@@ -31374,7 +31374,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31729,7 +31729,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeviceI18nShortcutsEnabled',
@@ -26952,7 +26301,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:97-'],
-@@ -31409,7 +31409,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31764,7 +31764,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'CopyPreventionSettings',
@@ -26961,7 +26310,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -31450,14 +31450,14 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31805,14 +31805,14 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
  
        The <ph name="ENTERPRISE_CONNECTOR_ENABLE_FIELD">enable</ph> and <ph name="ENTERPRISE_CONNECTOR_DISABLE_FIELD">disable</ph> URL lists control which sites are allowed to write to the clipboard. A clipboard write is blocked if the URL matches a pattern in 'enable' and doesn't match a pattern in 'disable'. A copy is not blocked if the URL does not match any pattern.
  
@@ -26978,7 +26327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -31495,12 +31495,12 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31850,12 +31850,12 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
  
        To learn more about the <ph name="USER_AGENT_REDUCTION_FEATURE_NAME">User-Agent Reduction</ph> and its timeline, read here:
  
@@ -26993,7 +26342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -31560,8 +31560,8 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31915,8 +31915,8 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      {
        'name': 'OriginAgentClusterDefaultEnabled',
        'owners': [
@@ -27004,7 +26353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        ],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -31603,13 +31603,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -31958,13 +31958,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        site-keyed agent clusters. As a consequence, the document.domain accessor
        remains settable by default. This matches the legacy behaviour.
  
@@ -27020,7 +26369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['chrome_os'],
-@@ -31645,7 +31645,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32000,7 +32000,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'ProjectorEnabled',
@@ -27029,7 +26378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:99-'],
-@@ -31677,7 +31677,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32032,7 +32032,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeviceKeylockerForStorageEncryptionEnabled',
@@ -27038,7 +26387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean', },
        'tags': [],
-@@ -31711,7 +31711,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32066,7 +32066,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DefaultWindowPlacementSetting',
@@ -27047,7 +26396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -31749,7 +31749,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32104,7 +32104,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'WindowPlacementAllowedForUrls',
@@ -27056,7 +26405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': { 'type': 'array', 'items': { 'type': 'string' } },
        'supported_on': ['chrome.*:100-', 'chrome_os:100-'],
-@@ -31764,13 +31764,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32119,13 +32119,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'example_value': ['https://www.example.com', '[*.]example.edu'],
        'desc': '''Allows you to set a list of site url patterns that specify sites which will automatically grant the window placement permission. This will extend the ability of sites to see information about the device's screens and use that information to open and place windows or request fullscreen on specific screens.
  
@@ -27072,7 +26421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': { 'type': 'array', 'items': { 'type': 'string' } },
        'supported_on': ['chrome.*:100-', 'chrome_os:100-'],
-@@ -31785,13 +31785,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32140,13 +32140,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'example_value': ['https://www.example.com', '[*.]example.edu'],
        'desc': '''Allows you to set a list of site url patterns that specify sites which will automatically deny the window placement permission. This will limit the ability of sites to see information about the device's screens and use that information to open and place windows or request fullscreen on specific screens.
  
@@ -27088,7 +26437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int-enum',
        'schema': {
          'type': 'integer',
-@@ -31829,7 +31829,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32184,7 +32184,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'LocalFontsAllowedForUrls',
@@ -27097,7 +26446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': { 'type': 'array', 'items': { 'type': 'string' } },
        'supported_on': ['chrome.*:103-', 'chrome_os:103-'],
-@@ -31844,13 +31844,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32199,13 +32199,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'example_value': ['https://www.example.com', '[*.]example.edu'],
        'desc': '''Sets a list of site url patterns that specify sites which will automatically grant the local fonts permission. This will extend the ability of sites to see information about local fonts.
  
@@ -27113,7 +26462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'list',
        'schema': { 'type': 'array', 'items': { 'type': 'string' } },
        'supported_on': ['chrome.*:103-', 'chrome_os:103-'],
-@@ -31865,13 +31865,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32220,13 +32220,13 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
        'example_value': ['https://www.example.com', '[*.]example.edu'],
        'desc': '''Sets a list of site url patterns that specify sites which will automatically deny the local fonts permission. This will limit the ability of sites to see information about local fonts.
  
@@ -27129,7 +26478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': {'type': 'boolean', },
        'tags': [],
-@@ -31901,7 +31901,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32256,7 +32256,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'ExemptDomainFileTypePairsFromFileTypeDownloadWarnings',
@@ -27138,7 +26487,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -31939,7 +31939,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32294,7 +32294,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
  
        If you enable this policy:
  
@@ -27147,7 +26496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        * The file type extension entered must be in lower-cased ASCII. The leading separator should not be included when listing the file type extension, so list "jnlp" should be used instead of ".jnlp".
  
        Example:
-@@ -31958,7 +31958,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32313,7 +32313,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'FirstPartySetsEnabled',
@@ -27156,7 +26505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'features' : {
-@@ -31991,7 +31991,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32346,7 +32346,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'FirstPartySetsOverrides',
@@ -27165,7 +26514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'object',
-@@ -32083,7 +32083,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32503,7 +32503,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DeviceEncryptedReportingPipelineEnabled',
@@ -27174,7 +26523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:100-'],
-@@ -32113,7 +32113,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32533,7 +32533,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'IsolatedAppsDeveloperModeAllowed',
@@ -27183,7 +26532,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'features': {
-@@ -32143,7 +32143,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32563,7 +32563,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'FloatingWorkspaceEnabled',
@@ -27192,7 +26541,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:100-'],
-@@ -32171,7 +32171,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32591,7 +32591,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'OptimizationGuideFetchingEnabled',
@@ -27201,7 +26550,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:101-103', 'chrome.*:101-103', 'chrome_os:101-103', 'ios:101-103'],
-@@ -32200,7 +32200,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32620,7 +32620,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'WebSQLAccess',
@@ -27210,7 +26559,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['android:101-', 'chrome.*:101-', 'chrome_os:101-'],
-@@ -32230,7 +32230,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32650,7 +32650,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'WebSQLNonSecureContextEnabled',
@@ -27218,8 +26567,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
 +      'owners': ['ayui@ch40m1um.qjz9zk', 'chrome-owp-storage@9oo91e.qjz9zk'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
-       'supported_on': ['android:105-110', 'chrome.*:105-110', 'chrome_os:105-110'],
-@@ -32260,7 +32260,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+       'supported_on': ['android:105-', 'chrome.*:105-', 'chrome_os:105-'],
+@@ -32680,7 +32680,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'SetTimeoutWithout1MsClampEnabled',
@@ -27228,7 +26577,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:101-107', 'chrome.*:101-107', 'android:101-107'],
-@@ -32304,7 +32304,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32724,7 +32724,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'AllowChromeDataInBackups',
@@ -27237,7 +26586,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on': ['ios'],
-@@ -32332,7 +32332,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32752,7 +32752,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'DevicePowerAdaptiveChargingEnabled',
@@ -27246,7 +26595,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:102-'],
-@@ -32395,7 +32395,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32815,7 +32815,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'OsColorMode',
@@ -27255,7 +26604,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'string-enum',
        'schema': {
          'type': 'string',
-@@ -32441,7 +32441,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32861,7 +32861,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'InsightsExtensionEnabled',
@@ -27264,7 +26613,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:103-'],
-@@ -32473,7 +32473,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32893,7 +32893,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'EnterpriseAuthenticationAppLinkPolicy',
@@ -27273,7 +26622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'dict',
        'schema': {
          'type': 'array',
-@@ -32506,12 +32506,12 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32926,12 +32926,12 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
  
        If there is no valid app installed to handle authentication url on the device, navigation will continue in <ph name="WEBVIEW_PRODUCT_NAME">Android WebView</ph>.
  
@@ -27288,7 +26637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:102-'],
-@@ -32544,7 +32544,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32964,7 +32964,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'ScreenTimeEnabled',
@@ -27297,7 +26646,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'future_on':['chrome.mac'],
-@@ -32574,7 +32574,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -32994,7 +32994,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'UnthrottledNestedTimeoutEnabled',
@@ -27306,7 +26655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome_os:104-106', 'chrome.*:104-106', 'android:104-106'],
-@@ -32619,7 +32619,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -33040,7 +33040,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      {
        'name': 'IdleProfileCloseTimeout',
        'caption': 'Timeout until idle profile is closed',
@@ -27315,7 +26664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'int',
        'schema': { 'type': 'integer', 'minimum': 5 },
        'default': 0,
-@@ -32641,7 +32641,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -33062,7 +33062,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      },
      {
        'name': 'EncryptedClientHelloEnabled',
@@ -27324,7 +26673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:105-', 'chrome_os:105-', 'android:105-'],
-@@ -32676,7 +32676,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
+@@ -33097,7 +33097,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PRIMARY_ACCOUNT_KEEP_EXISTIN
      {
        'name': 'EnterpriseProfileCreationKeepBrowsingData',
        'caption': 'Keep browsing data when creating enterprise profile by default',
@@ -27333,7 +26682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'default': False,
-@@ -32712,7 +32712,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+@@ -33133,7 +33133,7 @@ This policy has no effect if the option to keep existing browsing data is not av
      },
      {
        'name': 'PersistentQuotaEnabled',
@@ -27342,7 +26691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'type': 'main',
        'schema': { 'type': 'boolean' },
        'supported_on': ['chrome.*:106-107', 'chrome_os:106-107', 'android:106-107'],
-@@ -32743,7 +32743,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+@@ -33166,7 +33166,7 @@ This policy has no effect if the option to keep existing browsing data is not av
      },
      {
        'name': 'PrefixedStorageInfoEnabled',
@@ -27351,7 +26700,45 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
        'caption': 'Re-enable the deprecated window.webkitStorageInfo API',
        'type': 'main',
        'schema': { 'type': 'boolean' },
-@@ -32862,7 +32862,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+@@ -33198,7 +33198,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+     },
+     {
+       'name': 'HighEfficiencyModeEnabled',
+-      'owners': ['anthonyvd@chromium.org', 'file://components/performance_manager/OWNERS'],
++      'owners': ['anthonyvd@ch40m1um.qjz9zk', 'file://components/performance_manager/OWNERS'],
+       'caption': 'Enable High Efficiency Mode',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+@@ -33231,7 +33231,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+     },
+     {
+       'name': 'BatterySaverModeAvailability',
+-      'owners': ['anthonyvd@chromium.org', 'file://components/performance_manager/OWNERS'],
++      'owners': ['anthonyvd@ch40m1um.qjz9zk', 'file://components/performance_manager/OWNERS'],
+       'caption': 'Enable Battery Saver Mode',
+       'type': 'int-enum',
+       'schema': {
+@@ -33275,7 +33275,7 @@ This policy has no effect if the option to keep existing browsing data is not av
+     },
+     {
+       'name': 'TabDiscardingExceptions',
+-      'owners': ['anthonyvd@chromium.org', 'file://components/performance_manager/OWNERS'],
++      'owners': ['anthonyvd@ch40m1um.qjz9zk', 'file://components/performance_manager/OWNERS'],
+       'caption': 'URL pattern Exceptions to tab discarding',
+       'type': 'list',
+       'schema': {
+@@ -33298,8 +33298,8 @@ This policy has no effect if the option to keep existing browsing data is not av
+     {
+       'name': 'StrictMimetypeCheckForWorkerScriptsEnabled',
+       'owners': [
+-        'vogelheim@chromium.org',
+-        'chrome-security-owp-team@google.com'
++        'vogelheim@ch40m1um.qjz9zk',
++        'chrome-security-owp-team@9oo91e.qjz9zk'
+       ],
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+@@ -33424,7 +33424,7 @@ This policy has no effect if the option to keep existing browsing data is not av
      },
      'doc_banner': {
        'desc': '''A banner shown at the top of the policy documentation''',
@@ -27360,7 +26747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      'doc_intro': {
        'desc': '''Introduction text for the generated policy documentation''',
-@@ -32870,13 +32870,13 @@ This policy has no effect if the option to keep existing browsing data is not av
+@@ -33432,13 +33432,13 @@ This policy has no effect if the option to keep existing browsing data is not av
  
  These policies are strictly intended to be used to configure instances of <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors.
  
@@ -27376,7 +26763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      'doc_policy_in_atomic_group': {
        'desc': '''Label notifying that a policy is part of an atomic policy group''',
-@@ -32952,11 +32952,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -33514,11 +33514,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
      },
      'doc_complex_policies_on_windows': {
        'desc': '''Text pointing the user to a help article for complex policies on Windows''',
@@ -27390,7 +26777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      'doc_legacy_single_line_label': {
        'desc': '''A label for the legacy single-line textbox for a policy also has a more user-friendly multi-line textbox. See http://crbug/829328''',
-@@ -32980,7 +32980,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -33542,7 +33542,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
      },
      'doc_schema_description_link': {
        'desc': '''Text pointing the user to the expanded documentation page for this policy, containing the information about schema and formatting.''',
@@ -27399,7 +26786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      'deprecated_policy_group_caption': {
        'desc': '''Localized name for the deprecated policies folder, for Microsoft's Group Policy Editor.''',
-@@ -32992,7 +32992,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -33554,7 +33554,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
      },
      'deprecated_policy_desc': {
        'desc': '''Description shared by all deprecated policies, in Microsoft Windows' Group Policy Editor.''',
@@ -27408,7 +26795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
      'removed_policy_group_caption': {
        'desc': '''Localized name for the removed policies folder, for Microsoft's Group Policy Editor.''',
-@@ -33004,7 +33004,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -33566,7 +33566,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
      },
      'removed_policy_desc': {
        'desc': '''Description shared by all removed policies, in Microsoft Windows' Group Policy Editor.''',
@@ -27417,7 +26804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
      },
    },
    # Legacy device policies that don't have a 1:1 mapping between template and
-@@ -33334,7 +33334,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -33898,7 +33898,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
      {
        'id': 6,
        'name': 'RestoreOnStartup',
@@ -27464,18 +26851,6 @@ diff --git a/components/policy/tools/syntax_check_policy_template_json.py b/comp
            policy.get('name'))
  
      # If 'label' is present, it must be a string.
-diff --git a/components/policy/tools/template_writers/PRESUBMIT.py b/components/policy/tools/template_writers/PRESUBMIT.py
---- a/components/policy/tools/template_writers/PRESUBMIT.py
-+++ b/components/policy/tools/template_writers/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- # found in the LICENSE file.
- """Template writers unittests presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into gcl.
- """
- 
 diff --git a/components/policy/tools/template_writers/writers/adm_writer.py b/components/policy/tools/template_writers/writers/adm_writer.py
 --- a/components/policy/tools/template_writers/writers/adm_writer.py
 +++ b/components/policy/tools/template_writers/writers/adm_writer.py
@@ -28442,18 +27817,6 @@ diff --git a/components/safe_browsing/content/browser/triggers/trigger_util.cc b
                          base::CompareCase::SENSITIVE) &&
           base::StartsWith(frame_url.path_piece(), "/safeframe",
                            base::CompareCase::SENSITIVE);
-diff --git a/components/safe_browsing/content/resources/PRESUBMIT.py b/components/safe_browsing/content/resources/PRESUBMIT.py
---- a/components/safe_browsing/content/resources/PRESUBMIT.py
-+++ b/components/safe_browsing/content/resources/PRESUBMIT.py
-@@ -57,7 +57,7 @@ def CheckVersionUpdatedInDownloadFileTypeList(input_api, output_api):
- 
-     results.append(
-         output_api.PresubmitPromptWarning(
--            'Please make sure you have read https://chromium.googlesource.com'
-+            'Please make sure you have read https://chromium.9oo91esource.qjz9zk'
-             + '/chromium/src/+/HEAD/chrome/browser/resources/safe_browsing/' +
-             'README.md before editing the download_file_types config files.'))
- 
 diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
 --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
 +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
@@ -28490,7 +27853,7 @@ diff --git a/components/safe_browsing/core/browser/password_protection/password_
 diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
 --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
 +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
-@@ -171,7 +171,7 @@ void RealTimeUrlLookupService::Shutdown() {
+@@ -178,7 +178,7 @@ void RealTimeUrlLookupService::Shutdown() {
  
  GURL RealTimeUrlLookupService::GetRealTimeLookupUrl() const {
    return GURL(
@@ -28502,7 +27865,7 @@ diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service.c
 diff --git a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
 --- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
 +++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc
-@@ -44,10 +44,10 @@ namespace {
+@@ -47,10 +47,10 @@ namespace {
  const int kRepeatingCheckTailoredSecurityBitDelayInMinutes = 5;
  
  constexpr char kAPIScope[] =
@@ -28515,7 +27878,7 @@ diff --git a/components/safe_browsing/core/browser/tailored_security_service/tai
  
  // The maximum number of retries for the SimpleURLLoader requests.
  const size_t kMaxRetries = 1;
-@@ -331,7 +331,7 @@ void TailoredSecurityService::StartRequest(
+@@ -334,7 +334,7 @@ void TailoredSecurityService::StartRequest(
                                            R"(
          semantics {
            description:
@@ -28524,6 +27887,18 @@ diff --git a/components/safe_browsing/core/browser/tailored_security_service/tai
              "Enhanced Safe Browsing enabled."
            trigger:
              "This request is sent every 5 minutes as long as the user does not"
+diff --git a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc
+--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc
++++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc
+@@ -16,7 +16,7 @@ namespace safe_browsing {
+ const int kThresholdForInFlowNotificationMinutes = 5;
+ 
+ bool CanQueryTailoredSecurityForUrl(GURL url) {
+-  return url.DomainIs("google.com") || url.DomainIs("youtube.com");
++  return url.DomainIs("9oo91e.qjz9zk") || url.DomainIs("y0u1ub3.qjz9zk");
+ }
+ 
+ bool CanShowUnconsentedTailoredSecurityDialog(
 diff --git 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
 --- 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
@@ -28651,18 +28026,6 @@ diff --git a/components/segmentation_platform/internal/execution/optimization_gu
      "google.internal.chrome.optimizationguide.v1.SegmentationModelMetadata";
  
  absl::optional<optimization_guide::proto::Any> GetModelFetchConfig() {
-diff --git a/components/segmentation_platform/internal/proto/PRESUBMIT.py b/components/segmentation_platform/internal/proto/PRESUBMIT.py
---- a/components/segmentation_platform/internal/proto/PRESUBMIT.py
-+++ b/components/segmentation_platform/internal/proto/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- 
- """
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/services/quarantine/quarantine_mac.mm b/components/services/quarantine/quarantine_mac.mm
 --- a/components/services/quarantine/quarantine_mac.mm
 +++ b/components/services/quarantine/quarantine_mac.mm
@@ -28804,7 +28167,7 @@ diff --git a/components/signin/public/identity_manager/access_token_fetcher.cc b
 diff --git a/components/spellcheck/browser/spelling_service_client.cc b/components/spellcheck/browser/spelling_service_client.cc
 --- a/components/spellcheck/browser/spelling_service_client.cc
 +++ b/components/spellcheck/browser/spelling_service_client.cc
-@@ -39,7 +39,7 @@ namespace {
+@@ -36,7 +36,7 @@ namespace {
  
  // The REST endpoint for requesting spell checking and sending user feedback.
  const char kSpellingServiceRestURL[] =
@@ -28844,30 +28207,6 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_const
  
  }  // namespace subresource_filter
  
-diff --git a/components/subresource_filter/core/common/PRESUBMIT.py b/components/subresource_filter/core/common/PRESUBMIT.py
---- a/components/subresource_filter/core/common/PRESUBMIT.py
-+++ b/components/subresource_filter/core/common/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for subresource_filter component's core/common directory.
- 
--See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/components/sync/PRESUBMIT.py b/components/sync/PRESUBMIT.py
---- a/components/sync/PRESUBMIT.py
-+++ b/components/sync/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for sync component.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/sync/base/sync_util.h b/components/sync/base/sync_util.h
 --- a/components/sync/base/sync_util.h
 +++ b/components/sync/base/sync_util.h
@@ -28888,7 +28227,7 @@ diff --git a/components/sync/base/sync_util.h b/components/sync/base/sync_util.h
 diff --git a/components/sync/trusted_vault/standalone_trusted_vault_client.cc b/components/sync/trusted_vault/standalone_trusted_vault_client.cc
 --- a/components/sync/trusted_vault/standalone_trusted_vault_client.cc
 +++ b/components/sync/trusted_vault/standalone_trusted_vault_client.cc
-@@ -35,7 +35,7 @@ constexpr base::TaskTraits kBackendTaskTraits = {
+@@ -36,7 +36,7 @@ constexpr base::TaskTraits kBackendTaskTraits = {
      base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN};
  
  constexpr char kDefaultTrustedVaultServiceURL[] =
@@ -28921,30 +28260,6 @@ diff --git a/components/sync/trusted_vault/trusted_vault_server_constants.h b/co
      "google.internal.identity.securitydomain.v1.JoinSecurityDomainErrorDetail";
  inline constexpr char kGetSecurityDomainURLPathAndQuery[] =
      "users/me/securitydomains/chromesync?view=2";
-diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/PRESUBMIT.py
---- a/components/sync_bookmarks/PRESUBMIT.py
-+++ b/components/sync_bookmarks/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for sync_bookmarks component.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/components/sync_sessions/PRESUBMIT.py b/components/sync_sessions/PRESUBMIT.py
---- a/components/sync_sessions/PRESUBMIT.py
-+++ b/components/sync_sessions/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for sync_sessions component.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/components/translate/core/browser/translate_ranker_impl.cc
 --- a/components/translate/core/browser/translate_ranker_impl.cc
 +++ b/components/translate/core/browser/translate_ranker_impl.cc
@@ -29049,30 +28364,6 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti
  
  // Maximum filters allowed. Filters over this index are ignored.
  const size_t kMaxFiltersAllowed = 1000;
-diff --git a/components/url_pattern_index/PRESUBMIT.py b/components/url_pattern_index/PRESUBMIT.py
---- a/components/url_pattern_index/PRESUBMIT.py
-+++ b/components/url_pattern_index/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for components/url_pattern_index directory.
- 
--See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/components/variations/proto/PRESUBMIT.py b/components/variations/proto/PRESUBMIT.py
---- a/components/variations/proto/PRESUBMIT.py
-+++ b/components/variations/proto/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- 
- """
--See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- USE_PYTHON3 = True
 diff --git a/components/variations/variations_url_constants.cc b/components/variations/variations_url_constants.cc
 --- a/components/variations/variations_url_constants.cc
 +++ b/components/variations/variations_url_constants.cc
@@ -29115,7 +28406,7 @@ diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-@@ -776,7 +776,7 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -777,7 +777,7 @@ void ExtractUnderlines(NSAttributedString* string,
    // TODO(suzhe): We should send mouse events to the input method first if it
    // wants to handle them. But it won't work without implementing method
    // - (NSUInteger)characterIndexForPoint:.
@@ -29136,18 +28427,6 @@ diff --git a/content/browser/aggregation_service/aggregation_service_features.cc
          "publicKeys"};
  
  }  // namespace content
-diff --git a/content/browser/attribution_reporting/PRESUBMIT.py b/content/browser/attribution_reporting/PRESUBMIT.py
---- a/content/browser/attribution_reporting/PRESUBMIT.py
-+++ b/content/browser/attribution_reporting/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for the content/browser/attribution_reporting directory.
- 
--See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc
 --- a/content/browser/indexed_db/indexed_db_backing_store.cc
 +++ b/content/browser/indexed_db/indexed_db_backing_store.cc
@@ -29199,7 +28478,16 @@ diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/brow
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -5494,7 +5494,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
+@@ -1986,7 +1986,7 @@ void NavigationRequest::BeginNavigation() {
+           blink::mojom::ConsoleMessageLevel::kWarning,
+           "FLEDGE will deprecate supporting iframes to render the winning ad. "
+           "Please use fenced frames instead. See "
+-          "https://developer.chrome.com/en/docs/privacy-sandbox/fenced-frame/"
++          "https://developer.ch40me.qjz9zk/en/docs/privacy-sandbox/fenced-frame/"
+           "#examples");
+     }
+ 
+@@ -5562,7 +5562,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
    const char* console_message =
        "Subresource requests whose URLs contain embedded credentials (e.g. "
        "`https://user:pass@host/`) are blocked. See "
@@ -29208,7 +28496,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
        "details.";
    parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
                                console_message);
-@@ -5725,7 +5725,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
+@@ -5793,7 +5793,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
          base::StringPrintf(
              "Navigating a cross-origin opener to a download (%s) is "
              "deprecated, see "
@@ -29220,7 +28508,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -399,7 +399,7 @@ int g_next_accessibility_reset_token = 1;
+@@ -400,7 +400,7 @@ int g_next_accessibility_reset_token = 1;
  // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell.
  bool g_allow_injecting_javascript = false;
  
@@ -29229,18 +28517,6 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
  
  typedef std::unordered_map<GlobalRenderFrameHostId,
                             RenderFrameHostImpl*,
-diff --git a/content/browser/resources/PRESUBMIT.py b/content/browser/resources/PRESUBMIT.py
---- a/content/browser/resources/PRESUBMIT.py
-+++ b/content/browser/resources/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for files in content/browser/resources.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resources/gpu/info_view.js
 --- a/content/browser/resources/gpu/info_view.js
 +++ b/content/browser/resources/gpu/info_view.js
@@ -29268,7 +28544,7 @@ diff --git a/content/browser/speech/speech_recognition_engine.cc b/content/brows
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -6986,7 +6986,7 @@ void WebContentsImpl::RunJavaScriptDialog(
+@@ -6977,7 +6977,7 @@ void WebContentsImpl::RunJavaScriptDialog(
              base::StringPrintf(
                  "A different origin subframe tried to create a JavaScript "
                  "dialog. This is no longer allowed and was blocked. See "
@@ -29280,7 +28556,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/webauth/authenticator_common.cc
 --- a/content/browser/webauth/authenticator_common.cc
 +++ b/content/browser/webauth/authenticator_common.cc
-@@ -116,8 +116,8 @@ absl::optional<std::string> MakeCredentialU2fAppIdOverride(
+@@ -122,8 +122,8 @@ absl::optional<std::string> MakeCredentialU2fAppIdOverride(
      return options->relying_party.id;
    }
    if (options->google_legacy_app_id_support &&
@@ -29294,7 +28570,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w
 diff --git a/content/browser/webauth/client_data_json.cc b/content/browser/webauth/client_data_json.cc
 --- a/content/browser/webauth/client_data_json.cc
 +++ b/content/browser/webauth/client_data_json.cc
-@@ -158,7 +158,7 @@ std::string BuildClientDataJson(ClientDataJsonParams params) {
+@@ -162,7 +162,7 @@ std::string BuildClientDataJson(ClientDataJsonParams params) {
      ret.append(R"(,"other_keys_can_be_added_here":")");
      ret.append(
          "do not compare clientDataJSON against a template. See "
@@ -29318,7 +28594,7 @@ diff --git a/content/browser/webauth/webauth_request_security_checker.cc b/conte
 diff --git a/content/browser/webauth/webauth_request_security_checker.h b/content/browser/webauth/webauth_request_security_checker.h
 --- a/content/browser/webauth/webauth_request_security_checker.h
 +++ b/content/browser/webauth/webauth_request_security_checker.h
-@@ -42,9 +42,9 @@ class CONTENT_EXPORT WebAuthRequestSecurityChecker
+@@ -40,9 +40,9 @@ class CONTENT_EXPORT WebAuthRequestSecurityChecker
    // Legacy App IDs, which google.com origins are allowed to assert for
    // compatibility reasons.
    static constexpr char kGstaticAppId[] =
@@ -29330,18 +28606,6 @@ diff --git a/content/browser/webauth/webauth_request_security_checker.h b/conten
  
    explicit WebAuthRequestSecurityChecker(RenderFrameHost* host);
    WebAuthRequestSecurityChecker(const WebAuthRequestSecurityChecker&) = delete;
-diff --git a/content/browser/webrtc/resources/webrtc_internals.js b/content/browser/webrtc/resources/webrtc_internals.js
---- a/content/browser/webrtc/resources/webrtc_internals.js
-+++ b/content/browser/webrtc/resources/webrtc_internals.js
-@@ -344,7 +344,7 @@ function addPeerConnection(data) {
-         'compatibility issues on modern browsers. The standardized SDP ' +
-         'format, \"unified-plan\", has been used by default since M72 ' +
-         '(January, 2019). Dropping support for Plan B is targeted for ' +
--        'M93. See https://www.chromestatus.com/feature/5823036655665152 ' +
-+        'M93. See https://www.ch40mestatus.qjz9zk/feature/5823036655665152 ' +
-         'for more details.');
-     }
-   }
 diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc
 +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -29354,18 +28618,6 @@ diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/bro
             "docs/linux/suid_sandbox_development.md for more information on "
             "developing with the SUID sandbox. "
             "If you want to live dangerously and need an immediate workaround, "
-diff --git a/content/renderer/PRESUBMIT.py b/content/renderer/PRESUBMIT.py
---- a/content/renderer/PRESUBMIT.py
-+++ b/content/renderer/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for content/renderer
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc
 --- a/content/renderer/pepper/pepper_media_device_manager.cc
 +++ b/content/renderer/pepper/pepper_media_device_manager.cc
@@ -29547,18 +28799,6 @@ diff --git a/docs/enterprise/extension_query_py2.py b/docs/enterprise/extension_
      request_parameters = ''
      browsers_processed = 0
      while True:
-diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py
---- a/extensions/browser/PRESUBMIT.py
-+++ b/extensions/browser/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/extensions/browser.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/extensions/browser/api/web_request/web_request_permissions.cc
 --- a/extensions/browser/api/web_request/web_request_permissions.cc
 +++ b/extensions/browser/api/web_request/web_request_permissions.cc
@@ -29623,18 +28863,6 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
  
  void ReportError(ParseUpdateManifestCallback callback,
                   const ManifestParseFailure& failure) {
-diff --git a/extensions/common/api/PRESUBMIT.py b/extensions/common/api/PRESUBMIT.py
---- a/extensions/common/api/PRESUBMIT.py
-+++ b/extensions/common/api/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/extensions/common.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
 --- a/extensions/common/api/_api_features.json
 +++ b/extensions/common/api/_api_features.json
@@ -29718,7 +28946,7 @@ diff --git a/extensions/common/extension_urls.cc b/extensions/common/extension_u
  
  GURL GetWebstoreLaunchURL() {
    extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
-@@ -94,9 +94,9 @@ bool IsBlocklistUpdateUrl(const GURL& url) {
+@@ -104,9 +104,9 @@ bool IsBlocklistUpdateUrl(const GURL& url) {
  }
  
  bool IsSafeBrowsingUrl(const url::Origin& origin, base::StringPiece path) {
@@ -29756,30 +28984,6 @@ diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifes
  const char kManifestVersionTooHighWarning[] =
      "The maximum currently-supported manifest version is *, but this is *.  "
      "Certain features may not work as expected.";
-diff --git a/extensions/common/permissions/PRESUBMIT.py b/extensions/common/permissions/PRESUBMIT.py
---- a/extensions/common/permissions/PRESUBMIT.py
-+++ b/extensions/common/permissions/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for src/extensions/common/permissions.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/extensions/renderer/resources/automation/PRESUBMIT.py b/extensions/renderer/resources/automation/PRESUBMIT.py
---- a/extensions/renderer/resources/automation/PRESUBMIT.py
-+++ b/extensions/renderer/resources/automation/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for files in extensions/renderer/resources/automation.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/extensions/strings/extensions_strings.grd b/extensions/strings/extensions_strings.grd
 --- a/extensions/strings/extensions_strings.grd
 +++ b/extensions/strings/extensions_strings.grd
@@ -29809,7 +29013,7 @@ diff --git a/google_apis/drive/drive_api_url_generator.cc b/google_apis/drive/dr
 diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -580,7 +580,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token,
+@@ -571,7 +571,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token,
    // know what sessions already exist in the browser.  The fetcher needs to be
    // created such that it sends the cookies with the request, which is
    // different from all other requests the fetcher can make.
@@ -29818,7 +29022,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
    std::string query = MakeMergeSessionQuery(uber_token, external_cc_result,
                                              continue_url, source_);
    net::NetworkTrafficAnnotationTag traffic_annotation =
-@@ -732,7 +732,7 @@ void GaiaAuthFetcher::StartListAccounts() {
+@@ -723,7 +723,7 @@ void GaiaAuthFetcher::StartListAccounts() {
          })");
    CreateAndStartGaiaFetcher(
        " ",  // To force an HTTP POST.
@@ -29855,7 +29059,7 @@ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_uti
 diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc
 --- a/google_apis/gaia/gaia_constants.cc
 +++ b/google_apis/gaia/gaia_constants.cc
-@@ -17,152 +17,152 @@ const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
+@@ -17,156 +17,156 @@ const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
  const char kGaiaService[] = "gaia";
  
  // OAuth scopes.
@@ -30047,6 +29251,11 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant
 -const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow";
 +const char kFeedOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/googlenow";
  
+ // OAuth 2 scope for the k-Anonymity Service API.
+ const char kKAnonymityServiceOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chromekanonymity";
++    "https://www.9oo91eapis.qjz9zk/auth/chromekanonymity";
+ 
  // Used to mint uber auth tokens when needed.
  const char kGaiaSid[] = "sid";
 diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
@@ -30153,7 +29362,7 @@ diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_prob
 diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc
 --- a/google_apis/google_api_keys.cc
 +++ b/google_apis/google_api_keys.cc
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
  namespace google_apis {
  
  const char kAPIKeysDevelopersHowToURL[] =
@@ -30186,34 +29395,10 @@ diff --git a/gpu/GLES2/extensions/CHROMIUM/EGL_CHROMIUM_sync_control.txt b/gpu/G
  
  Status
  
-diff --git a/gpu/PRESUBMIT.py b/gpu/PRESUBMIT.py
---- a/gpu/PRESUBMIT.py
-+++ b/gpu/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for gpu.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-diff --git a/gpu/command_buffer/PRESUBMIT.py b/gpu/command_buffer/PRESUBMIT.py
---- a/gpu/command_buffer/PRESUBMIT.py
-+++ b/gpu/command_buffer/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Enforces command buffer autogen matches script output.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm b/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm
 --- a/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm
 +++ b/gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm
-@@ -175,7 +175,7 @@ class DawnIOSurfaceRepresentation : public DawnImageRepresentation {
+@@ -177,7 +177,7 @@ class DawnIOSurfaceRepresentation : public DawnImageRepresentation {
    WGPUTexture texture_ = nullptr;
    WGPUTextureFormat wgpu_format_;
  
@@ -30222,18 +29407,6 @@ diff --git a/gpu/command_buffer/service/shared_image/iosurface_image_backing_fac
    // created and pass a pointer to them around?
    DawnProcTable dawn_procs_;
  };
-diff --git a/gpu/config/PRESUBMIT.py b/gpu/config/PRESUBMIT.py
---- a/gpu/config/PRESUBMIT.py
-+++ b/gpu/config/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Enforces workaround list is alphabetically sorted.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/gpu/config/gpu_control_list_format.txt b/gpu/config/gpu_control_list_format.txt
 --- a/gpu/config/gpu_control_list_format.txt
 +++ b/gpu/config/gpu_control_list_format.txt
@@ -30246,30 +29419,6 @@ diff --git a/gpu/config/gpu_control_list_format.txt b/gpu/config/gpu_control_lis
  // 6. "multi_gpu_style" is a string, valid values include:
  //      a) "optimus": NVIDIA dual GPU
  //      b) "amd_switchable": AMD dual GPU
-diff --git a/gpu/ipc/common/PRESUBMIT.py b/gpu/ipc/common/PRESUBMIT.py
---- a/gpu/ipc/common/PRESUBMIT.py
-+++ b/gpu/ipc/common/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Enforces Vulkan types autogen matches script output.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/gpu/vulkan/PRESUBMIT.py b/gpu/vulkan/PRESUBMIT.py
---- a/gpu/vulkan/PRESUBMIT.py
-+++ b/gpu/vulkan/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Enforces Vulkan function pointer autogen matches script output.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/browser/protocol/headless_handler.cc
 --- a/headless/lib/browser/protocol/headless_handler.cc
 +++ b/headless/lib/browser/protocol/headless_handler.cc
@@ -30282,60 +29431,6 @@ diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/br
      return;
    }
  
-diff --git a/infra/config/PRESUBMIT.py b/infra/config/PRESUBMIT.py
---- a/infra/config/PRESUBMIT.py
-+++ b/infra/config/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Enforces luci-milo.cfg consistency.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-@@ -177,7 +177,7 @@ def CheckOutagesConfigOnCommit(input_api, output_api):
-                'but you still wish to land it, please add the footer '
-                '{} with a reason.').format(_IGNORE_OUTAGE_FOOTER),
-               ('For more information on outages configuration, '
--               'see https://chromium.googlesource.com/chromium/src/+/HEAD/infra/config/outages'
-+               'see https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/infra/config/outages'
-                ),
-           ])),
-       ]
-diff --git a/infra/config/scripts/PRESUBMIT.py b/infra/config/scripts/PRESUBMIT.py
---- a/infra/config/scripts/PRESUBMIT.py
-+++ b/infra/config/scripts/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """PRESUBMIT for scripts.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/ios/PRESUBMIT.py b/ios/PRESUBMIT.py
---- a/ios/PRESUBMIT.py
-+++ b/ios/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for ios.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-@@ -120,7 +120,7 @@ def _CheckHasNoIncludeDirectives(input_api, output_api):
-       'directive%(plural)s instead. '
-       'Consider replacing all existing `#include` with `#import` (if any) in '
-       'this file for the code clean up. See '
--      'https://chromium.googlesource.com/chromium/src.git/+/refs/heads/main'
-+      'https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/refs/heads/main'
-       '/styleguide/objective-c/objective-c.md#import-and-include-in-the-directory'
-       ' for more details. '
-       '\n\nAffected file%(plural)s:' % {'plural': plural_suffix,
 diff --git a/ios/README.txt b/ios/README.txt
 --- a/ios/README.txt
 +++ b/ios/README.txt
@@ -30344,18 +29439,6 @@ diff --git a/ios/README.txt b/ios/README.txt
 -https://sites.google.com/a/chromium.org/dev/developers/design-documents/structure-of-layered-components-within-the-chromium-codebase
 +https://sites.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/dev/developers/design-documents/structure-of-layered-components-within-the-chromium-codebase
  for a description of the structure underneath this directory.
-diff --git a/ios/build/bots/scripts/PRESUBMIT.py b/ios/build/bots/scripts/PRESUBMIT.py
---- a/ios/build/bots/scripts/PRESUBMIT.py
-+++ b/ios/build/bots/scripts/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for ios test runner scripts.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts/result_sink_util.py
 --- a/ios/build/bots/scripts/result_sink_util.py
 +++ b/ios/build/bots/scripts/result_sink_util.py
@@ -30470,7 +29553,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st
        </message>
        <message name="IDS_IOS_MANAGED_DISCONNECT_DIALOG_TITLE_UNITY" desc="Title of the dialog shown when signing out of a managed account.[Length: 50em] [iOS only].">
          Clear your Chromium data from this device?
-@@ -384,7 +384,7 @@ Things to consider:
+@@ -384,13 +384,13 @@ Things to consider:
          You are signing in with an account managed by <ph name="DOMAIN">$1<ex>doe.com</ex></ph> and giving its administrator control over your Chromium data. Your data will become permanently tied to this account. Signing out of Chromium will delete your data from this device, but it will remain stored in your Google Account.
        </message>
        <message name="IDS_IOS_MANAGED_SWITCH_SUBTITLE" desc="The subtitle of the Switch from a managed account dialog. [300em]">
@@ -30479,8 +29562,6 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st
        </message>
        <message name="IDS_IOS_MANAGED_SYNC_WITH_USER_POLICY_SUBTITLE" desc="The subtitle of the Sync with a managed account dialog when User Policy is enabled (alternative to IDS_IOS_MANAGED_SIGNIN_SUBTITLE). [300em][iOS only]">
          Your organization <ph name="DOMAIN">$1<ex>doe.com</ex></ph> will have access to your Chromium data, bookmarks, history, passwords and other settings you store in this account. When you sign out, your data will be cleared from this device.  However, your data will remain stored in your managed Google Account and be available to your organization. Your organization can also set user policies specific to that account that can change the behavior of Chromium.
-@@ -393,7 +393,7 @@ Things to consider:
-         Tip: <ph name="BEGIN_LINK"><ex>BEGIN_LINK</ex>BEGIN_LINK</ph>Move Chromium to your dock<ph name="END_LINK"><ex>END_LINK</ex>END_LINK</ph>
        </message>
        <message name="IDS_IOS_OPTIONS_IMPORT_DATA_HEADER" desc="The header for the Import Data settings screen. [400em]">
 -        <ph name="USER_EMAIL1">$1<ex>johndoe@gmail.com</ex></ph> was using Chromium and left bookmarks, passwords, and other settings on this device.
@@ -30489,7 +29570,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st
        <message name="IDS_IOS_PAGE_INFO_CHROME_PAGE_LABEL" desc="Label to display at the top of the site information screen when the page you are on is a Chromium page.">
          Chromium Page
 @@ -477,7 +477,7 @@ Things to consider:
-         Choose whether to clear your Chromium data from this device or keep it
+         Some Chromium features won’t be available anymore.
        </message>
        <message name="IDS_IOS_SIGNOUT_DIALOG_TITLE_WITH_SYNCING_MANAGED_ACCOUNT" desc="The signout dialog title. This dialog is used when the user have a managed account (other than gmail account) [iOS only].">
 -        Your account is managed by <ph name="HOSTED_DOMAIN">$1<ex>google.com</ex></ph>, so your Chromium data will be cleared from this device
@@ -30549,7 +29630,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a
        </message>
        <message name="IDS_IOS_MANAGED_DISCONNECT_DIALOG_TITLE_UNITY" desc="Title of the dialog shown when signing out of a managed account.[Length: 50em] [iOS only].">
          Clear your Chrome data from this device?
-@@ -384,7 +384,7 @@ Things to consider:
+@@ -384,13 +384,13 @@ Things to consider:
          You are signing in with an account managed by <ph name="DOMAIN">$1<ex>doe.com</ex></ph> and giving its administrator control over your Chrome data. Your data will become permanently tied to this account. Signing out of Chrome will delete your data from this device, but it will remain stored in your Google Account.
        </message>
        <message name="IDS_IOS_MANAGED_SWITCH_SUBTITLE" desc="The subtitle of the Switch from a managed account dialog. [300em]">
@@ -30558,8 +29639,6 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a
        </message>
        <message name="IDS_IOS_MANAGED_SYNC_WITH_USER_POLICY_SUBTITLE" desc="The subtitle of the Sync with a managed account dialog when User Policy is enabled (alternative to IDS_IOS_MANAGED_SIGNIN_SUBTITLE). [300em][iOS only]">
          Your organization <ph name="DOMAIN">$1<ex>doe.com</ex></ph> will have access to your Chrome data, bookmarks, history, passwords and other settings you store in this account. When you sign out, your data will be cleared from this device.  However, your data will remain stored in your managed Google Account and be available to your organization. Your organization can also set user policies specific to that account that can change the behavior of Chrome.
-@@ -393,7 +393,7 @@ Things to consider:
-         Tip: <ph name="BEGIN_LINK"><ex>BEGIN_LINK</ex>BEGIN_LINK</ph>Move Chrome to your dock<ph name="END_LINK"><ex>END_LINK</ex>END_LINK</ph>
        </message>
        <message name="IDS_IOS_OPTIONS_IMPORT_DATA_HEADER" desc="The header for the Import Data settings screen. [400em]">
 -        <ph name="USER_EMAIL1">$1<ex>johndoe@gmail.com</ex></ph> was using Chrome and left bookmarks, passwords, and other settings on this device.
@@ -30568,7 +29647,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a
        <message name="IDS_IOS_PAGE_INFO_CHROME_PAGE_LABEL" desc="Label to display at the top of the site information screen when the page you are on is a Google Chrome page.">
          Google Chrome Page
 @@ -477,7 +477,7 @@ Things to consider:
-         Choose whether to clear your Chrome data from this device or keep it
+         Some Chrome features won’t be available anymore.
        </message>
        <message name="IDS_IOS_SIGNOUT_DIALOG_TITLE_WITH_SYNCING_MANAGED_ACCOUNT" desc="The signout dialog title. This dialog is used when the user have a managed account (other than gmail account) [iOS only].">
 -        Your account is managed by <ph name="HOSTED_DOMAIN">$1<ex>google.com</ex></ph>, so your Chrome data will be cleared from this device
@@ -30601,7 +29680,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a
 diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd
 --- a/ios/chrome/app/strings/ios_strings.grd
 +++ b/ios/chrome/app/strings/ios_strings.grd
-@@ -382,7 +382,7 @@ locale.  The strings in this file are specific to iOS.
+@@ -385,7 +385,7 @@ locale.  The strings in this file are specific to iOS.
          Current Webpage is on Incognito
        </message>
        <message name="IDS_IOS_BANDWIDTH_MANAGEMENT_LEARN_URL" translateable="false">
@@ -30610,7 +29689,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_BANDWIDTH_MANAGEMENT_SETTINGS" desc="Title for the bandwidth management panel in settings [Length: 30em] [iOS only]">
          Bandwidth
-@@ -550,7 +550,7 @@ locale.  The strings in this file are specific to iOS.
+@@ -553,7 +553,7 @@ locale.  The strings in this file are specific to iOS.
          You won't be signed out of your Google Account.
        </message>
        <message name="IDS_IOS_CLEAR_BROWSING_DATA_FOOTER_ACCOUNT_AND_HISTORY" desc="Footer message in the settings to clear browsing data that informs the user that clearing browsing data will not sign them out of Chrome and that other forms of history will still be available.">
@@ -30619,7 +29698,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_CLEAR_BROWSING_DATA_FOOTER_GOOGLE_DSE" desc="Footer message in the settings to clear browsing data that informs the user they can seperately delete their search history and/or other account info at the 2 links provided.">
          <ph name="BEGIN_LINK">BEGIN_LINK</ph>Search history<ph name="END_LINK">END_LINK</ph> and <ph name="BEGIN_LINK">BEGIN_LINK</ph>other forms of activity<ph name="END_LINK">END_LINK</ph> may be saved in your Google Account when you’re signed in. You can delete them anytime.
-@@ -582,8 +582,8 @@ See your search engine’s instructions for deleting your search history, if app
+@@ -585,8 +585,8 @@ See your search engine’s instructions for deleting your search history, if app
        <message name="IDS_IOS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK_BUTTON" desc="Title of a button that closes the dialog informing the user to open the Google My Activity. [Length: 15em]">
          Ok, got it
        </message>
@@ -30630,7 +29709,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_BEGINNING_OF_TIME" desc="Label of a time range option. This is used to specify that the user wishes to clear their browsing data since the beginning of time. In titlecase.">
          All Time
-@@ -1129,7 +1129,7 @@ See your search engine’s instructions for deleting your search history, if app
+@@ -1132,7 +1132,7 @@ See your search engine’s instructions for deleting your search history, if app
            You'll find your history here
        </message>
        <message name="IDS_IOS_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
@@ -30639,7 +29718,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_HTTP_LOGIN_DIALOG_PASSWORD_PLACEHOLDER" desc="The placeholder text for the password on the http login dialog [Length: 20em] [iOS only]">
          Password
-@@ -1292,7 +1292,7 @@ See your search engine’s instructions for deleting your search history, if app
+@@ -1295,7 +1295,7 @@ See your search engine’s instructions for deleting your search history, if app
          Manage Sync
        </message>
        <message name="IDS_IOS_REMOVE_ACCOUNT_ALERT_TITLE" desc="Title of the alert view when the remove account button is clicked.">
@@ -30648,7 +29727,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_REMOVE_ACCOUNT_LABEL" desc="Button label for removing an account.">
        Remove
-@@ -1785,7 +1785,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
+@@ -1797,7 +1797,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
          Passwords are saved in your Google Account so you can use them on any device.
        </message>
        <message name="IDS_SAVE_PASSWORD_FOOTER_DISPLAYING_USER_EMAIL" desc="The footer text of the infobar that offers user to save/update a password to Chrome; also display's current user's email.">
@@ -30657,7 +29736,16 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_PERMISSIONS_CAMERA" desc="Usually used to show whether user has enabled a site's permission to use the device camera.">
          Camera
-@@ -1842,7 +1842,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
+@@ -1851,7 +1851,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
+         Sync Isn't Working
+       </message>
+       <message name="IDS_IOS_POST_RESTORE_SIGN_IN_ALERT_PROMO_MESSAGE" desc="The message text of the alert post restore sign-in promo. [iOS only]">
+-        Sign in again to your account <ph name="USER_NAME">$1<ex>example@gmail.com</ex></ph>
++        Sign in again to your account <ph name="USER_NAME">$1<ex>example@9ma1l.qjz9zk</ex></ph>
+       </message>
+       <message name="IDS_IOS_PROMOS_MANAGER_ALERT_PROMO_DEFAULT_PRIMARY_BUTTON_TEXT" desc="The default text for the primary button alert promo. [iOS only]">
+         OK
+@@ -1875,7 +1875,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
          Google Privacy Policy
        </message>
        <message name="IDS_IOS_PRIVACY_POLICY_URL" translateable="false">
@@ -30666,7 +29754,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_PROGRESS_BAR_ACCESSIBILITY" desc="Text read by voice over to inform the user about the progress of the page load. [Read by Text To Speech].">
          Page load progress bar, <ph name="EMAIL">$1<ex>20%</ex></ph> loaded.
-@@ -1914,7 +1914,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
+@@ -1947,7 +1947,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
          Added to Reading List
        </message>
        <message name="IDS_IOS_READING_LIST_ENTRY_ACCESSIBILITY_LABEL" desc="Accessibility label for a reading list entry. Summarizes fields in the reading list entry (title, status and url). Read by Text To Speech.">
@@ -30675,7 +29763,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_READING_LIST_ACCESSIBILITY_STATE_DOWNLOADED" desc="Accessibility label for the offline status of the reading list entry. Read by Text To Speech.">
          Available offline
-@@ -2287,7 +2287,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
+@@ -2320,7 +2320,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
          3. Select Chrome
        </message>
        <message name="IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT" desc="Header text with link for the view in Settings for managing saved passwords. [Length: unlimited] [iOS only]">
@@ -30684,7 +29772,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER" desc="Header text with link for the view in Settings for managing saved passwords. [Length: unlimited] [iOS only]">
          Create, save, and manage your passwords so you can easily sign in to sites and apps. <ph name="BEGIN_LINK">BEGIN_LINK</ph>Learn more<ph name="END_LINK">END_LINK</ph>
-@@ -2646,7 +2646,7 @@ Try to use a unique password for every site.
+@@ -2679,7 +2679,7 @@ Try to use a unique password for every site.
          Active <ph name="Days">$1<ex>2</ex></ph> Days Ago
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK" desc="Text with a link to a page where the user can manage the devices they can share a tab to.">
@@ -30693,7 +29781,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_SHARE_MESSAGES_COMPLETE" desc="Message shown when message share has been sent. [Length: Unknown. Keep it short.] [iOS only]">
          Message sent.
-@@ -2852,12 +2852,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>reset sync<ph name=
+@@ -2885,12 +2885,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>reset sync<ph name=
          Enter Passphrase
        </message>
        <message name="IDS_IOS_SYNC_ENTER_PASSPHRASE_BODY_WITH_EMAIL" desc="Instructions for the dialog where the user enters the passphrase.">
@@ -30708,7 +29796,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
  
  Your data was encrypted with your sync passphrase on <ph name="TIME">$2<ex>Sept 1, 2012</ex></ph>. Enter it to start sync.
        </message>
-@@ -3177,10 +3177,10 @@ Your data was encrypted with your sync passphrase on <ph name="TIME">$2<ex>Sept
+@@ -3204,10 +3204,10 @@ Your data was encrypted with your sync passphrase on <ph name="TIME">$2<ex>Sept
          Learn More
        </message>
        <message name="IDS_IOS_TOOLS_MENU_FOLLOW" desc="The iOS menu item for following web content. [iOS only]">
@@ -30721,7 +29809,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
        </message>
        <message name="IDS_IOS_TOOLS_MENU_TRANSLATE" desc="The iOS menu item for translating the current page [iOS only]" meaning="Open the translate infobar [Length: unlimited]">
          Translate
-@@ -3192,7 +3192,7 @@ Your data was encrypted with your sync passphrase on <ph name="TIME">$2<ex>Sept
+@@ -3219,7 +3219,7 @@ Your data was encrypted with your sync passphrase on <ph name="TIME">$2<ex>Sept
          Help
        </message>
        <message name="IDS_IOS_TOOLS_MENU_HELP_URL" translateable="false">
@@ -30733,7 +29821,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios
 diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/BUILD.gn
 --- a/ios/chrome/browser/autofill/BUILD.gn
 +++ b/ios/chrome/browser/autofill/BUILD.gn
-@@ -189,7 +189,7 @@ autofill_test_files = [
+@@ -182,7 +182,7 @@ autofill_test_files = [
    "//components/test/data/autofill/heuristics/input/049_register_ebay.com.html",
    "//components/test/data/autofill/heuristics/input/050_register_ecomm.dell.com.html",
    "//components/test/data/autofill/heuristics/input/051_register_epson.com.html",
@@ -30742,7 +29830,7 @@ diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/
    "//components/test/data/autofill/heuristics/input/053_register_gymboree.com.html",
    "//components/test/data/autofill/heuristics/input/054_register_hotels.com.html",
    "//components/test/data/autofill/heuristics/input/055_register_imdb.com.html",
-@@ -369,7 +369,7 @@ autofill_test_files = [
+@@ -362,7 +362,7 @@ autofill_test_files = [
    "//components/test/data/autofill/heuristics/output/049_register_ebay.com.out",
    "//components/test/data/autofill/heuristics/output/050_register_ecomm.dell.com.out",
    "//components/test/data/autofill/heuristics/output/051_register_epson.com.out",
@@ -30778,7 +29866,7 @@ diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_contr
 diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc
 --- a/ios/chrome/browser/chrome_url_constants.cc
 +++ b/ios/chrome/browser/chrome_url_constants.cc
-@@ -82,62 +82,62 @@ const char* const kChromeHostURLs[] = {
+@@ -84,62 +84,62 @@ const char* const kChromeHostURLs[] = {
  const size_t kNumberOfChromeHostURLs = std::size(kChromeHostURLs);
  
  const char kSyncGoogleDashboardURL[] =
@@ -30860,7 +29948,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr
  
  const char kReadingListReferrerURL[] =
      "chrome://do_not_consider_for_most_visited/reading_list";
-@@ -145,4 +145,4 @@ const char kReadingListReferrerURL[] =
+@@ -147,4 +147,4 @@ const char kReadingListReferrerURL[] =
  const char kChromeUIAboutNewTabURL[] = "about://newtab/";
  
  const char kManagementLearnMoreURL[] =
@@ -30869,7 +29957,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr
 diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
 --- a/ios/chrome/browser/flags/about_flags.mm
 +++ b/ios/chrome/browser/flags/about_flags.mm
-@@ -602,7 +602,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
+@@ -610,7 +610,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos,
       SINGLE_VALUE_TYPE_AND_VALUE(
           syncer::kSyncServiceURL,
@@ -30878,7 +29966,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/
      {"wallet-service-use-sandbox",
       flag_descriptions::kWalletServiceUseSandboxName,
       flag_descriptions::kWalletServiceUseSandboxDescription, flags_ui::kOsIos,
-@@ -1239,7 +1239,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() {
+@@ -1274,7 +1274,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() {
        base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) :
            @YES,
        base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) :
@@ -30890,7 +29978,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/
 diff --git a/ios/chrome/browser/omaha/omaha_service.mm b/ios/chrome/browser/omaha/omaha_service.mm
 --- a/ios/chrome/browser/omaha/omaha_service.mm
 +++ b/ios/chrome/browser/omaha/omaha_service.mm
-@@ -227,7 +227,7 @@ class XmlWrapper {
+@@ -231,7 +231,7 @@ class XmlWrapper {
  //     <event.../>
  //   </app>
  // </response>
@@ -30905,7 +29993,7 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios
 @@ -32,7 +32,7 @@ bool IsFormSubmit(const web::NavigationItem* item) {
  }
  
- // Generates a keyword from |item|. This code is based on:
+ // Generates a keyword from `item`. This code is based on:
 -// https://cs.chromium.org/chromium/src/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
 +// https://cs.ch40m1um.qjz9zk/chromium/src/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
  std::u16string GenerateKeywordFromNavigationItem(
@@ -30921,7 +30009,7 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios
                                                   const GURL& osdd_url) {
    // Checks to see if we should generate a keyword based on the OSDD, and if
 @@ -162,7 +162,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url,
-   // new keyword will be created when done. For |render_frame_id| arg, it's used
+   // new keyword will be created when done. For `render_frame_id` arg, it's used
    // by network::ResourceRequest::render_frame_id, we don't use Blink so leave
    // it to be the default value defined here:
 -  //   https://cs.chromium.org/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=194;
@@ -30931,28 +30019,13 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios
                           url::Origin::Create(web_state_->GetLastCommittedURL()),
 @@ -173,7 +173,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url,
  
- // Creates a TemplateURL by |searchable_url| and adds it to TemplateURLService.
+ // Creates a TemplateURL by `searchable_url` and adds it to TemplateURLService.
  // This code is based on:
 -// https://cs.chromium.org/chromium/src/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
 +// https://cs.ch40m1um.qjz9zk/chromium/src/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
  void SearchEngineTabHelper::AddTemplateURLBySearchableURL(
      const GURL& searchable_url) {
    if (!searchable_url.is_valid()) {
-diff --git a/ios/chrome/browser/u2f/u2f_controller.mm b/ios/chrome/browser/u2f/u2f_controller.mm
---- a/ios/chrome/browser/u2f/u2f_controller.mm
-+++ b/ios/chrome/browser/u2f/u2f_controller.mm
-@@ -214,9 +214,9 @@ const char kRequestIDKey[] = "requestId";
-   NSString* sourceDomain = base::SysUTF8ToNSString(sourceURL.host());
-   // Convert this condition to checking membership in a set if any new cases
-   // need to be added.
--  return [sourceDomain isEqualToString:@"u2fdemo.appspot.com"] ||
-+  return [sourceDomain isEqualToString:@"u2fdemo.8pp2p8t.qjz9zk"] ||
-          [sourceDomain
--             isEqualToString:@"chromeiostesting-dot-u2fdemo.appspot.com"];
-+             isEqualToString:@"chromeiostesting-dot-u2fdemo.8pp2p8t.qjz9zk"];
- }
- 
- @end
 diff --git a/ios/chrome/browser/ui/activity_services/activity_type_util.mm b/ios/chrome/browser/ui/activity_services/activity_type_util.mm
 --- a/ios/chrome/browser/ui/activity_services/activity_type_util.mm
 +++ b/ios/chrome/browser/ui/activity_services/activity_type_util.mm
@@ -30980,7 +30053,7 @@ diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm b/ios/chrome/
 diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
 --- a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
 +++ b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm
-@@ -107,7 +107,7 @@ ContentSuggestion CreateSuggestion(Category category,
+@@ -106,7 +106,7 @@ ContentSuggestion CreateSuggestion(Category category,
      std::string index = base::SysNSStringToUTF8(@(i).stringValue);
      suggestions.push_back(
          CreateSuggestion([self category], "chromium" + index,
@@ -30989,7 +30062,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interfac
    }
    [self provider]->FireSuggestionsChanged([self category],
                                            std::move(suggestions));
-@@ -128,7 +128,7 @@ ContentSuggestion CreateSuggestion(Category category,
+@@ -127,7 +127,7 @@ ContentSuggestion CreateSuggestion(Category category,
    std::string index = base::NumberToString(suggestionNumber);
    std::vector<ContentSuggestion> suggestions;
    suggestions.push_back(CreateSuggestion([self category], "chromium" + index,
@@ -31024,7 +30097,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io
 diff --git a/ios/chrome/browser/ui/main/scene_controller.mm b/ios/chrome/browser/ui/main/scene_controller.mm
 --- a/ios/chrome/browser/ui/main/scene_controller.mm
 +++ b/ios/chrome/browser/ui/main/scene_controller.mm
-@@ -1678,7 +1678,7 @@ bool IsSigninForcedByPolicy() {
+@@ -1681,7 +1681,7 @@ bool IsSigninForcedByPolicy() {
      return;
    if (self.sceneState.appState.initStage == InitStageFirstRun) {
      // This case is possible when using force FRE flag and opening chrome
@@ -31057,18 +30130,6 @@ diff --git a/ios/chrome/browser/ui/ntp/incognito_view.mm b/ios/chrome/browser/ui
  
  GURL GetUrlWithLang(const GURL& url) {
    std::string locale = GetApplicationContext()->GetApplicationLocale();
-diff --git a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm b/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
---- a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
-+++ b/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm
-@@ -134,7 +134,7 @@ bool NotificationPromoWhatsNew::Init() {
-       break;
-     case experimental_flags::WHATS_NEW_MOVE_TO_DOCK_TIP:
-       InjectFakePromo("2", "moveToDockTip", "url", "",
--                      "https://support.google.com/chrome/?p=iphone_dock&ios=1",
-+                      "https://support.9oo91e.qjz9zk/chrome/?p=iphone_dock&ios=1",
-                       "MoveToDockTipPromo", "logoWithRoundedRectangle");
-       break;
-     case experimental_flags::WHATS_NEW_REVIEW_UPDATED_TOS:
 diff --git a/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm b/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm
 --- a/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm
 +++ b/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm
@@ -31084,7 +30145,7 @@ diff --git a/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm b/ios/chrome/b
 diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
 --- a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
 +++ b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
-@@ -82,7 +82,7 @@ using scanner::CameraState;
+@@ -81,7 +81,7 @@ using scanner::CameraState;
        ios::TemplateURLServiceFactory::GetForBrowserState(
            chrome_test_util::GetOriginalBrowserState());
  
@@ -31246,25 +30307,6 @@ diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_ha
        StripPostSpecificHeaders(request_);
      }
    }
-diff --git a/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm b/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm
---- a/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm
-+++ b/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm
-@@ -134,13 +134,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity(
- 
- NSString* ChromeIdentityService::GetCachedHostedDomainForIdentity(
-     ChromeIdentity* identity) {
--  // @gmail.com accounts are end consumer accounts so it is safe to return @""
-+  // @9ma1l.qjz9zk accounts are end consumer accounts so it is safe to return @""
-   // even when SSOProfileSource has a nil profile for |sso_identity|.
-   //
-   // Note: This is also needed during the sign-in flow as it avoids waiting for
-   // the profile of |sso_identity| to be fetched from the server.
-   if (gaia::ExtractDomainName(base::SysNSStringToUTF8(identity.userEmail)) ==
--      "gmail.com") {
-+      "9ma1l.qjz9zk") {
-     return @"";
-   }
-   return nil;
 diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm
 --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm
 +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm
@@ -31302,7 +30344,7 @@ diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_serv
 +NSString* const kIdentityEmailFormat = @"%@@9ma1l.qjz9zk";
  NSString* const kIdentityGaiaIDFormat = @"%@ID";
  
- NSString* FakeGetHostedDomainForIdentity(ChromeIdentity* identity) {
+ NSString* FakeGetHostedDomainForIdentity(id<SystemIdentity> identity) {
 diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm
 --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm
 +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm
@@ -31370,7 +30412,7 @@ diff --git a/ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm b/ios/sh
 --- a/ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm
 +++ b/ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm
 @@ -394,7 +394,7 @@ NSAttributedString* calculatorText() {
-       suggestionIconType:DEFAULT_FAVICON
+       suggestionIconType:OmniboxSuggestionIconType::kDefaultFavicon
                  isAnswer:NO
                  imageURL:[[CrURL alloc]
 -                             initWithGURL:GURL("https://ssl.gstatic.com/onebox/"
@@ -31416,18 +30458,6 @@ diff --git a/ios/web/web_state/ui/wk_content_rule_list_util.mm b/ios/web/web_sta
        @"if-top-url" : @[ @"file://.*" ],
        @"resource-type" : @[
          // Allow opening crbug from chrome:// urls
-diff --git a/ios/web_view/PRESUBMIT.py b/ios/web_view/PRESUBMIT.py
---- a/ios/web_view/PRESUBMIT.py
-+++ b/ios/web_view/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for ios/web_view.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ios/web_view/internal/cwv_flags.mm b/ios/web_view/internal/cwv_flags.mm
 --- a/ios/web_view/internal/cwv_flags.mm
 +++ b/ios/web_view/internal/cwv_flags.mm
@@ -31443,7 +30473,7 @@ diff --git a/ios/web_view/internal/cwv_flags.mm b/ios/web_view/internal/cwv_flag
 diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_web_view.mm
 --- a/ios/web_view/internal/cwv_web_view.mm
 +++ b/ios/web_view/internal/cwv_web_view.mm
-@@ -865,7 +865,7 @@ BOOL gChromeContextMenuEnabled = NO;
+@@ -851,7 +851,7 @@ BOOL gChromeContextMenuEnabled = NO;
      // e.g., triggered by JavaScript "window.open()" function. In that case, if
      // |self| is not created by the WKWebViewConfiguration provided by WebKit's
      // delegate method
@@ -31452,27 +30482,6 @@ diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_w
      // then calling |web::EnsureWebViewCreatedWithConfiguration()| here would
      // result in a crash (https://crbug.com/1054276). Now, we lazily create the
      // WKWebView inside |_webState| when |wkConfiguration| is not nil, and the
-diff --git a/media/PRESUBMIT.py b/media/PRESUBMIT.py
---- a/media/PRESUBMIT.py
-+++ b/media/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for Chromium media component.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
-@@ -151,7 +151,7 @@ def _CheckForHistogramOffByOne(input_api, output_api):
-       ' - The max value (3rd argument) should be an enum value equal to the\n'
-       '   last valid value, e.g. FOO_MAX = LAST_VALID_FOO.\n'
-       ' - 1 must be added to that max value.\n'
--      'Contact dalecurtis@chromium.org if you have questions.' , problems)]
-+      'Contact dalecurtis@ch40m1um.qjz9zk if you have questions.' , problems)]
- 
-   return []
- 
 diff --git a/media/base/win/mf_initializer.cc b/media/base/win/mf_initializer.cc
 --- a/media/base/win/mf_initializer.cc
 +++ b/media/base/win/mf_initializer.cc
@@ -32325,18 +31334,6 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
  
    return input.power_efficient;
  }
-diff --git a/mojo/PRESUBMIT.py b/mojo/PRESUBMIT.py
---- a/mojo/PRESUBMIT.py
-+++ b/mojo/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for mojo
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/native_client_sdk/src/build_tools/build_paths.py b/native_client_sdk/src/build_tools/build_paths.py
 --- a/native_client_sdk/src/build_tools/build_paths.py
 +++ b/native_client_sdk/src/build_tools/build_paths.py
@@ -33242,7 +32239,7 @@ diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h
 diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 --- a/net/dns/dns_transaction.cc
 +++ b/net/dns/dns_transaction.cc
-@@ -415,7 +415,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+@@ -414,7 +414,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
            data: "The domain name that is being requested"
            destination: OTHER
            destination_other: "The user configured DNS over HTTPS server, which"
@@ -33270,7 +32267,7 @@ diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_
 diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
 --- a/net/http/http_server_properties.cc
 +++ b/net/http/http_server_properties.cc
-@@ -156,8 +156,8 @@ HttpServerProperties::HttpServerProperties(
+@@ -157,8 +157,8 @@ HttpServerProperties::HttpServerProperties(
        broken_alternative_services_(kMaxRecentlyBrokenAlternativeServiceEntries,
                                     this,
                                     tick_clock_),
@@ -33324,7 +32321,7 @@ diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_
 diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
 --- a/net/quic/quic_stream_factory.cc
 +++ b/net/quic/quic_stream_factory.cc
-@@ -2279,10 +2279,10 @@ QuicStreamFactory::CreateCryptoConfigHandle(
+@@ -2291,10 +2291,10 @@ QuicStreamFactory::CreateCryptoConfigHandle(
  
    quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config();
    crypto_config->set_user_agent_id(params_.user_agent_id);
@@ -33396,18 +32393,6 @@ diff --git a/net/tools/transport_security_state_generator/transport_security_sta
          // This entry is deliberately used as an exclusion.
          continue;
        }
-diff --git a/printing/backend/PRESUBMIT.py b/printing/backend/PRESUBMIT.py
---- a/printing/backend/PRESUBMIT.py
-+++ b/printing/backend/PRESUBMIT.py
-@@ -5,7 +5,7 @@
- """
- Presubmit script for the printing backend.
- 
--See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API.
- """
- 
 diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
 --- a/printing/backend/win_helper.cc
 +++ b/printing/backend/win_helper.cc
@@ -33519,7 +32504,7 @@ diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_
 diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py
 --- a/remoting/host/linux/linux_me2me_host.py
 +++ b/remoting/host/linux/linux_me2me_host.py
-@@ -1891,7 +1891,7 @@ def watch_for_resolution_changes(initial_size):
+@@ -1906,7 +1906,7 @@ def watch_for_resolution_changes(initial_size):
  def setup_argument_parser():
    EPILOG = """This script is not intended for use by end-users. To configure
  Chrome Remote Desktop, please install the app from the Chrome
@@ -33528,7 +32513,7 @@ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux
    parser = argparse.ArgumentParser(
        usage="Usage: %(prog)s [options] [ -- [ X server options ] ]",
        epilog=EPILOG)
-@@ -2101,7 +2101,7 @@ def main():
+@@ -2116,7 +2116,7 @@ def main():
          "WARNING: This system uses GDM. Some GDM versions have a bug that "
          "prevents local login while Chrome Remote Desktop is running. If you "
          "run into this issue, you can stop Chrome Remote Desktop by visiting "
@@ -33552,7 +32537,7 @@ diff --git a/remoting/host/linux/remoting_user_session.cc b/remoting/host/linux/
 diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
 --- a/remoting/host/remoting_me2me_host.cc
 +++ b/remoting/host/remoting_me2me_host.cc
-@@ -213,7 +213,7 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED";
+@@ -217,7 +217,7 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED";
  
  // The default email domain for Googlers. Used to determine whether the host's
  // email address is Google-internal or not.
@@ -33575,7 +32560,7 @@ diff --git a/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.j
 diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc
 --- a/remoting/host/setup/start_host_main.cc
 +++ b/remoting/host/setup/start_host_main.cc
-@@ -195,7 +195,7 @@ int StartHostMain(int argc, char** argv) {
+@@ -203,7 +203,7 @@ int StartHostMain(int argc, char** argv) {
      fprintf(stdout,
              "You need a web browser to use this command. Please visit\n");
      fprintf(stdout,
@@ -33649,9 +32634,9 @@ diff --git a/remoting/ios/facade/remoting_oauth_authentication.mm b/remoting/ios
 diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
 --- a/remoting/protocol/fake_session.cc
 +++ b/remoting/protocol/fake_session.cc
-@@ -17,7 +17,7 @@
- namespace remoting {
- namespace protocol {
+@@ -16,7 +16,7 @@
+ 
+ namespace remoting::protocol {
  
 -const char kTestJid[] = "host1@gmail.com/chromoting123";
 +const char kTestJid[] = "host1@9ma1l.qjz9zk/chromoting123";
@@ -33807,7 +32792,7 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c
 diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
 --- a/sandbox/policy/win/sandbox_win.cc
 +++ b/sandbox/policy/win/sandbox_win.cc
-@@ -445,7 +445,7 @@ NtQueryObjectFunction g_QueryObject = NULL;
+@@ -437,7 +437,7 @@ NtQueryObjectFunction g_QueryObject = NULL;
  
  static const char* kDuplicateHandleWarning =
      "You are attempting to duplicate a privileged handle into a sandboxed"
@@ -34176,6 +33161,30 @@ diff --git a/third_party/android_build_tools/aapt2/3pp/fetch.py b/third_party/an
  _FILE_NAME = 'aapt2-{0}-linux.jar'
  
  
+diff --git a/third_party/android_build_tools/apkanalyzer/3pp/fetch.py b/third_party/android_build_tools/apkanalyzer/3pp/fetch.py
+--- a/third_party/android_build_tools/apkanalyzer/3pp/fetch.py
++++ b/third_party/android_build_tools/apkanalyzer/3pp/fetch.py
+@@ -9,7 +9,7 @@ import argparse
+ import re
+ import urllib.request
+ 
+-_REPO_URL = 'https://dl.google.com/android/maven2'
++_REPO_URL = 'https://dl.9oo91e.qjz9zk/android/maven2'
+ _GROUP_NAME = 'com/android/tools/apkparser'
+ _MODULE_NAME = 'apkanalyzer'
+ _OVERRIDE_LATEST = None
+diff --git a/third_party/android_build_tools/apkanalyzer/3pp/install.py b/third_party/android_build_tools/apkanalyzer/3pp/install.py
+--- a/third_party/android_build_tools/apkanalyzer/3pp/install.py
++++ b/third_party/android_build_tools/apkanalyzer/3pp/install.py
+@@ -51,7 +51,7 @@ _POM_TEMPLATE = """\
+     <repository>
+       <id>google</id>
+       <name>google</name>
+-      <url>https://maven.google.com/</url>
++      <url>https://maven.9oo91e.qjz9zk/</url>
+     </repository>
+   </repositories>
+ </project>
 diff --git a/third_party/android_build_tools/lint/3pp/fetch.py b/third_party/android_build_tools/lint/3pp/fetch.py
 --- a/third_party/android_build_tools/lint/3pp/fetch.py
 +++ b/third_party/android_build_tools/lint/3pp/fetch.py
@@ -35187,18 +34196,6 @@ diff --git a/third_party/android_deps/licenses/Android_SDK_License-December_9_20
  
  1.4 "Google" means Google LLC, a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
  
-diff --git a/third_party/android_platform/development/scripts/PRESUBMIT.py b/third_party/android_platform/development/scripts/PRESUBMIT.py
---- a/third_party/android_platform/development/scripts/PRESUBMIT.py
-+++ b/third_party/android_platform/development/scripts/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """scripts presubmit script
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/third_party/android_support_test_runner/runner/src/main/Android.mk b/third_party/android_support_test_runner/runner/src/main/Android.mk
 --- a/third_party/android_support_test_runner/runner/src/main/Android.mk
 +++ b/third_party/android_support_test_runner/runner/src/main/Android.mk
@@ -35211,18 +34208,18 @@ diff --git a/third_party/android_support_test_runner/runner/src/main/Android.mk
  include $(CLEAR_VARS)
  
  LOCAL_SRC_FILES := $(call all-java-files-under, java) \
-diff --git a/third_party/blink/PRESUBMIT.py b/third_party/blink/PRESUBMIT.py
---- a/third_party/blink/PRESUBMIT.py
-+++ b/third_party/blink/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Top-level presubmit script for Blink.
- 
--See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
+diff --git a/third_party/androidx/fetch_all_androidx.py b/third_party/androidx/fetch_all_androidx.py
+--- a/third_party/androidx/fetch_all_androidx.py
++++ b/third_party/androidx/fetch_all_androidx.py
+@@ -212,7 +212,7 @@ def _write_cipd_yaml(libs_dir, version, cipd_yaml_path, experimental=False):
+             data_files.append(os.path.join(androidx_rel_lib_dir, lib_file))
  
+     if experimental:
+-        package = 'experimental/google.com/' + os.getlogin() + '/androidx'
++        package = 'experimental/9oo91e.qjz9zk/' + os.getlogin() + '/androidx'
+     else:
+         package = 'chromium/third_party/androidx'
+     contents = [
 diff --git a/third_party/blink/common/loader/record_load_histograms.cc b/third_party/blink/common/loader/record_load_histograms.cc
 --- a/third_party/blink/common/loader/record_load_histograms.cc
 +++ b/third_party/blink/common/loader/record_load_histograms.cc
@@ -35235,42 +34232,6 @@ diff --git a/third_party/blink/common/loader/record_load_histograms.cc b/third_p
        base::UmaHistogramSparse("Net.ErrorCodesForHTTPSGoogleMainFrame3",
                                 -net_error);
      }
-diff --git a/third_party/blink/public/common/scheduler/PRESUBMIT.py b/third_party/blink/public/common/scheduler/PRESUBMIT.py
---- a/third_party/blink/public/common/scheduler/PRESUBMIT.py
-+++ b/third_party/blink/public/common/scheduler/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Blink feature-policy presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
- 
-diff --git a/third_party/blink/public/mojom/permissions_policy/PRESUBMIT.py b/third_party/blink/public/mojom/permissions_policy/PRESUBMIT.py
---- a/third_party/blink/public/mojom/permissions_policy/PRESUBMIT.py
-+++ b/third_party/blink/public/mojom/permissions_policy/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Blink feature-policy presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
- 
-diff --git a/third_party/blink/public/mojom/use_counter/metrics/PRESUBMIT.py b/third_party/blink/public/mojom/use_counter/metrics/PRESUBMIT.py
---- a/third_party/blink/public/mojom/use_counter/metrics/PRESUBMIT.py
-+++ b/third_party/blink/public/mojom/use_counter/metrics/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Blink presubmit script for use counter metrics enums.
- 
--See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts/
-+See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts/
- for more details about the presubmit API built into gcl.
- """
- 
 diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/blink/public/strings/blink_strings.grd
 --- a/third_party/blink/public/strings/blink_strings.grd
 +++ b/third_party/blink/public/strings/blink_strings.grd
@@ -35283,7 +34244,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl
      for more details.
      Note that all output references are relative to the output directory
      which is specified at build time. -->
-@@ -671,14 +671,14 @@ below:
+@@ -665,14 +665,14 @@ below:
  # The contents of this file are subject to the Mozilla Public License Version
  # 1.1 (the "License"); you may not use this file except in compliance with
  # the License. You may obtain a copy of the License at
@@ -35300,7 +34261,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl
  #
  # The Initial Developer of the Original Code is
  # Netscape Communications Corporation.
-@@ -687,7 +687,7 @@ below:
+@@ -681,7 +681,7 @@ below:
  #
  # Contributor(s):
  #   Mitch <mstoltz@netscape.com> (original author)
@@ -35309,18 +34270,6 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl
  #
  # Alternatively, the contents of this file may be used under the terms of
  # either of the GNU General Public License Version 2 or later (the "GPL"),
-diff --git a/third_party/blink/renderer/bindings/PRESUBMIT.py b/third_party/blink/renderer/bindings/PRESUBMIT.py
---- a/third_party/blink/renderer/bindings/PRESUBMIT.py
-+++ b/third_party/blink/renderer/bindings/PRESUBMIT.py
-@@ -27,7 +27,7 @@
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- """Blink bindings presubmit script
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
- 
 diff --git a/third_party/blink/renderer/bindings/scripts/utilities.py b/third_party/blink/renderer/bindings/scripts/utilities.py
 --- a/third_party/blink/renderer/bindings/scripts/utilities.py
 +++ b/third_party/blink/renderer/bindings/scripts/utilities.py
@@ -35369,7 +34318,7 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2440,7 +2440,7 @@ void Element::UpdatePopupAttribute(String value) {
+@@ -2459,7 +2459,7 @@ void Element::UpdatePopupAttribute(String value) {
          "https://html.spec.whatwg.org/multipage/"
          "dom.html#custom-data-attribute. This usage will *likely cause site "
          "breakage* when the popup API ships: "
@@ -35466,7 +34415,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 diff --git a/third_party/blink/renderer/core/html/media/html_media_element.cc b/third_party/blink/renderer/core/html/media/html_media_element.cc
 --- a/third_party/blink/renderer/core/html/media/html_media_element.cc
 +++ b/third_party/blink/renderer/core/html/media/html_media_element.cc
-@@ -1017,7 +1017,7 @@ void HTMLMediaElement::InvokeLoadAlgorithm() {
+@@ -1026,7 +1026,7 @@ void HTMLMediaElement::InvokeLoadAlgorithm() {
        // with the result and an "AbortError" DOMException.
        RejectPlayPromises(DOMExceptionCode::kAbortError,
                           "The play() request was interrupted by a new load "
@@ -35475,7 +34424,7 @@ diff --git a/third_party/blink/renderer/core/html/media/html_media_element.cc b/
      }
  
      // 4.7 - If seeking is true, set it to false.
-@@ -4498,7 +4498,7 @@ void HTMLMediaElement::RejectScheduledPlayPromises() {
+@@ -4524,7 +4524,7 @@ void HTMLMediaElement::RejectScheduledPlayPromises() {
    RejectPlayPromisesInternal(
        DOMExceptionCode::kAbortError,
        String::Format(
@@ -35508,7 +34457,7 @@ diff --git a/third_party/blink/renderer/core/html/portal/html_portal_element.cc
 diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc
 --- a/third_party/blink/renderer/core/loader/frame_loader.cc
 +++ b/third_party/blink/renderer/core/loader/frame_loader.cc
-@@ -1807,7 +1807,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url,
+@@ -1806,7 +1806,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url,
          "1.1, which are deprecated and will be disabled in the future. Once "
          "disabled, users will be prevented from loading these resources. "
          "Servers should enable TLS 1.2 or later. See "
@@ -35517,7 +34466,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_part
          "information.";
    } else {
      console_message =
-@@ -1816,7 +1816,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url,
+@@ -1815,7 +1815,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url,
          "1.1, which are deprecated and will be disabled in the future. Once "
          "disabled, users will be prevented from loading these resources. The "
          "server should enable TLS 1.2 or later. See "
@@ -35582,7 +34531,7 @@ diff --git a/third_party/blink/renderer/core/script/document_write_intervention.
 diff --git a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
 --- a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
 +++ b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
-@@ -1129,7 +1129,7 @@ void XMLHttpRequest::CreateRequest(scoped_refptr<EncodedFormData> http_body,
+@@ -1120,7 +1120,7 @@ void XMLHttpRequest::CreateRequest(scoped_refptr<EncodedFormData> http_body,
          HandleNetworkError();
          ThrowForLoadFailureIfNeeded(exception_state,
                                      "Synchronous XHR in page dismissal. See "
@@ -35643,7 +34592,7 @@ diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc b/t
 diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
 --- a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
 +++ b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
-@@ -521,7 +521,7 @@ void ClipboardPromise::RequestPermission(
+@@ -522,7 +522,7 @@ void ClipboardPromise::RequestPermission(
  
    constexpr char kFeaturePolicyMessage[] =
        "The Clipboard API has been blocked because of a permissions policy "
@@ -35655,16 +34604,7 @@ diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b
 diff --git a/third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc
 --- a/third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc
 +++ b/third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc
-@@ -1093,7 +1093,7 @@ ScriptPromise CredentialsContainer::get(ScriptState* script_state,
-               "'preferred', which is probably not what you want. If in doubt, "
-               "set "
-               "to 'discouraged'. See "
--              "https://chromium.googlesource.com/chromium/src/+/master/content/"
-+              "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/content/"
-               "browser/webauth/uv_preferred.md for details."));
-     }
- 
-@@ -1483,13 +1483,13 @@ ScriptPromise CredentialsContainer::create(
+@@ -1550,13 +1550,13 @@ ScriptPromise CredentialsContainer::create(
            options->publicKey()->rp()->id()
                ? options->publicKey()->rp()->id()
                : resolver->GetExecutionContext()->GetSecurityOrigin()->Domain();
@@ -35680,16 +34620,7 @@ diff --git a/third_party/blink/renderer/modules/credentialmanagement/credentials
        }
      }
      if (options->publicKey()->extensions()->hasPayment() &&
-@@ -1547,7 +1547,7 @@ ScriptPromise CredentialsContainer::create(
-             "call. This defaults to 'preferred', which is probably not what "
-             "you "
-             "want. If in doubt, set to 'discouraged'. See "
--            "https://chromium.googlesource.com/chromium/src/+/master/content/"
-+            "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/content/"
-             "browser/webauth/uv_preferred.md for details"));
-   }
- 
-@@ -1592,7 +1592,7 @@ ScriptPromise CredentialsContainer::create(
+@@ -1643,7 +1643,7 @@ ScriptPromise CredentialsContainer::create(
                "default algorithm identifiers: ES256 and RS256. This can "
                "result in registration failures on incompatible "
                "authenticators. See "
@@ -35736,7 +34667,7 @@ diff --git a/third_party/blink/renderer/modules/manifest/fuzzer_seed_corpus/play
 diff --git a/third_party/blink/renderer/modules/payments/payment_request.cc b/third_party/blink/renderer/modules/payments/payment_request.cc
 --- a/third_party/blink/renderer/modules/payments/payment_request.cc
 +++ b/third_party/blink/renderer/modules/payments/payment_request.cc
-@@ -89,9 +89,9 @@ using ::payments::mojom::blink::PaymentValidationErrors;
+@@ -88,9 +88,9 @@ using ::payments::mojom::blink::PaymentValidationErrors;
  using ::payments::mojom::blink::PaymentValidationErrorsPtr;
  
  const char kHasEnrolledInstrumentDebugName[] = "hasEnrolledInstrument";
@@ -35752,7 +34683,7 @@ diff --git a/third_party/blink/renderer/modules/payments/payment_request.cc b/th
 diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
-@@ -198,12 +198,12 @@ bool VibrationController::Vibrate(const VibrationPattern& pattern) {
+@@ -197,12 +197,12 @@ bool VibrationController::Vibrate(const VibrationPattern& pattern) {
        message =
            "Blocked call to navigator.vibrate inside a cross-origin "
            "iframe because the frame has never been activated by the user: "
@@ -35770,7 +34701,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -632,14 +632,14 @@ bool AudioContext::IsAllowedToStart() const {
+@@ -667,14 +667,14 @@ bool AudioContext::IsAllowedToStart() const {
            mojom::ConsoleMessageSource::kOther,
            mojom::ConsoleMessageLevel::kWarning,
            "The AudioContext was not allowed to start. It must be resumed (or "
@@ -35799,18 +34730,6 @@ diff --git a/third_party/blink/renderer/modules/webmidi/navigator_web_midi.cc b/
  
  }  // namespace
  
-diff --git a/third_party/blink/renderer/platform/PRESUBMIT.py b/third_party/blink/renderer/platform/PRESUBMIT.py
---- a/third_party/blink/renderer/platform/PRESUBMIT.py
-+++ b/third_party/blink/renderer/platform/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for changes affecting Source/platform.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/third_party/blink/renderer/platform/fonts/mac/font_cache_mac.mm b/third_party/blink/renderer/platform/fonts/mac/font_cache_mac.mm
 --- a/third_party/blink/renderer/platform/fonts/mac/font_cache_mac.mm
 +++ b/third_party/blink/renderer/platform/fonts/mac/font_cache_mac.mm
@@ -35868,30 +34787,6 @@ diff --git a/third_party/blink/renderer/platform/weborigin/security_origin.cc b/
  }
  
  void SecurityOrigin::GrantLoadLocalResources() {
-diff --git a/third_party/blink/tools/blinkpy/PRESUBMIT.py b/third_party/blink/tools/blinkpy/PRESUBMIT.py
---- a/third_party/blink/tools/blinkpy/PRESUBMIT.py
-+++ b/third_party/blink/tools/blinkpy/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """blinkpy/ presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
- 
-diff --git a/third_party/blink/tools/blinkpy/common/config/PRESUBMIT.py b/third_party/blink/tools/blinkpy/common/config/PRESUBMIT.py
---- a/third_party/blink/tools/blinkpy/common/config/PRESUBMIT.py
-+++ b/third_party/blink/tools/blinkpy/common/config/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """config/ presubmit script for Blink.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into gcl.
- """
- 
 diff --git a/third_party/blink/tools/blinkpy/common/net/git_cl.py b/third_party/blink/tools/blinkpy/common/net/git_cl.py
 --- a/third_party/blink/tools/blinkpy/common/net/git_cl.py
 +++ b/third_party/blink/tools/blinkpy/common/net/git_cl.py
@@ -35937,7 +34832,7 @@ diff --git a/third_party/blink/tools/blinkpy/common/net/results_fetcher.py b/thi
      """
  
      def __init__(self, web, luci_auth, builders=None):
-@@ -139,7 +139,7 @@ class TestResultsFetcher(object):
+@@ -140,7 +140,7 @@ class TestResultsFetcher(object):
  
          This is used for fetching the retry data which is now contained in
          test_results_summary.json which cannot be fetched from
@@ -35946,7 +34841,7 @@ diff --git a/third_party/blink/tools/blinkpy/common/net/results_fetcher.py b/thi
          resultDB is the ideal solution.
          """
          return self.get_full_builder_url(RESULTS_SUMMARY_URL_BASE,
-@@ -317,7 +317,7 @@ class TestResultsFetcher(object):
+@@ -318,7 +318,7 @@ class TestResultsFetcher(object):
  
          The URLs look like:
              https://results.usercontent.cr.dev/invocations/ \
@@ -36243,7 +35138,7 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/
                           '/+/main/docs/testing/web_platform_tests.md'
                           '#GitHub-credentials for instructions on how to set '
                           'your credentials up.')
-@@ -309,7 +309,7 @@ class TestImporter(object):
+@@ -295,7 +295,7 @@ class TestImporter(object):
                  'If the rubber-stamper bot rejects the CL, you either need to '
                  'modify the benign file patterns, or manually CR+1 and land the '
                  'import yourself if it touches code files. See https://chromium.'
@@ -36252,7 +35147,7 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/
                  'appengine/rubber-stamper/README.md')
              self.git_cl.run([
                  'upload', '-f', '--send-mail', '--enable-auto-submit',
-@@ -595,7 +595,7 @@ class TestImporter(object):
+@@ -581,7 +581,7 @@ class TestImporter(object):
              'expectations for those tests; if this CL is large and causes\n'
              'a few new failures, please fix the failures by adding new\n'
              'lines to TestExpectations rather than reverting. See:\n'
@@ -36264,7 +35159,7 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/
 diff --git a/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py b/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py
 --- a/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py
 +++ b/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py
-@@ -164,7 +164,7 @@ class WPTResultsProcessor(object):
+@@ -171,7 +171,7 @@ class WPTResultsProcessor(object):
              failing_results_jsonp (str): Path to write failing JSONP results to.
  
          See Also:
@@ -38472,18 +37367,6 @@ diff --git a/third_party/maldoca/src/maldoca/ole/vba_extract.cc b/third_party/ma
  }
  
  // Do the smallest amount of work (in our context) to determine that
-diff --git a/third_party/metrics_proto/PRESUBMIT.py b/third_party/metrics_proto/PRESUBMIT.py
---- a/third_party/metrics_proto/PRESUBMIT.py
-+++ b/third_party/metrics_proto/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for metrics_proto.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into gcl.
- """
- 
 diff --git a/third_party/mozilla/NSPasteboard+Utils.mm b/third_party/mozilla/NSPasteboard+Utils.mm
 --- a/third_party/mozilla/NSPasteboard+Utils.mm
 +++ b/third_party/mozilla/NSPasteboard+Utils.mm
@@ -38571,102 +37454,6 @@ diff --git a/third_party/pefile_py3/pefile.py b/third_party/pefile_py3/pefile.py
  
  import collections
  import os
-diff --git a/third_party/polymer/v1_0/PRESUBMIT.py b/third_party/polymer/v1_0/PRESUBMIT.py
---- a/third_party/polymer/v1_0/PRESUBMIT.py
-+++ b/third_party/polymer/v1_0/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Chromium presubmit script for third_party/polymer/v1_0.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout.html b/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout.html
---- a/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout.html
-+++ b/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout.html
-@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- 
- <!--
- The `<iron-flex-layout>` component provides simple ways to use
--[CSS flexible box layout](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Flexible_boxes),
-+[CSS flexible box layout](https://developer.m0z111a.qjz9zk/en-US/docs/Web/Guide/CSS/Flexible_boxes),
- also known as flexbox. This component provides two different ways to use flexbox:
- 
- 1. [Layout classes](https://github.com/PolymerElements/iron-flex-layout/tree/master/iron-flex-layout-classes.html).
-diff --git a/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon.html b/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon.html
---- a/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon.html
-+++ b/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon.html
-@@ -57,7 +57,7 @@ See the [iron-icons demo](iron-icons?view=demo:demo/index.html) to see the icons
- in the various iconsets.
- 
- To load a subset of icons from one of the default `iron-icons` sets, you can
--use the [poly-icon](https://poly-icon.appspot.com/) tool. It allows you
-+use the [poly-icon](https://poly-icon.8pp2p8t.qjz9zk/) tool. It allows you
- to select individual icons, and creates an iconset from them that you can
- use directly in your elements.
- 
-diff --git a/third_party/polymer/v1_0/components-chromium/neon-animation/neon-animated-pages.html b/third_party/polymer/v1_0/components-chromium/neon-animation/neon-animated-pages.html
---- a/third_party/polymer/v1_0/components-chromium/neon-animation/neon-animated-pages.html
-+++ b/third_party/polymer/v1_0/components-chromium/neon-animation/neon-animated-pages.html
-@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- <link rel="import" href="neon-animation-runner-behavior.html">
- 
- <!--
--Material design: [Meaningful transitions](https://www.google.com/design/spec/animation/meaningful-transitions.html)
-+Material design: [Meaningful transitions](https://www.9oo91e.qjz9zk/design/spec/animation/meaningful-transitions.html)
- 
- `neon-animated-pages` manages a set of pages and runs an animation when switching between them. Its
- children pages should implement `Polymer.NeonAnimatableBehavior` and define `entry` and `exit`
-diff --git a/third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress.html b/third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress.html
---- a/third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress.html
-+++ b/third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress.html
-@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- <link rel="import" href="../paper-styles/color.html">
- 
- <!--
--Material design: [Progress & activity](https://www.google.com/design/spec/components/progress-activity.html)
-+Material design: [Progress & activity](https://www.9oo91e.qjz9zk/design/spec/components/progress-activity.html)
- 
- The progress bars are for situations where the percentage completed can be
- determined. They give users a quick sense of how much longer an operation
-diff --git a/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple.html b/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple.html
---- a/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple.html
-+++ b/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple.html
-@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- <link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
- 
- <!--
--Material design: [Surface reaction](https://www.google.com/design/spec/animation/responsive-interaction.html#responsive-interaction-surface-reaction)
-+Material design: [Surface reaction](https://www.9oo91e.qjz9zk/design/spec/animation/responsive-interaction.html#responsive-interaction-surface-reaction)
- 
- `paper-ripple` provides a visual effect that other paper elements can
- use to simulate a rippling effect emanating from the point of contact.  The
-diff --git a/third_party/polymer/v1_0/components-chromium/paper-spinner/paper-spinner-lite.html b/third_party/polymer/v1_0/components-chromium/paper-spinner/paper-spinner-lite.html
---- a/third_party/polymer/v1_0/components-chromium/paper-spinner/paper-spinner-lite.html
-+++ b/third_party/polymer/v1_0/components-chromium/paper-spinner/paper-spinner-lite.html
-@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- <link rel="import" href="paper-spinner-styles.html">
- 
- <!--
--Material design: [Progress & activity](https://www.google.com/design/spec/components/progress-activity.html)
-+Material design: [Progress & activity](https://www.9oo91e.qjz9zk/design/spec/components/progress-activity.html)
- 
- Element providing a single color material design circular spinner.
- 
-diff --git a/third_party/polymer/v1_0/components-chromium/paper-tooltip/paper-tooltip.html b/third_party/polymer/v1_0/components-chromium/paper-tooltip/paper-tooltip.html
---- a/third_party/polymer/v1_0/components-chromium/paper-tooltip/paper-tooltip.html
-+++ b/third_party/polymer/v1_0/components-chromium/paper-tooltip/paper-tooltip.html
-@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
- 
- 
- <!--
--Material design: [Tooltips](https://www.google.com/design/spec/components/tooltips.html)
-+Material design: [Tooltips](https://www.9oo91e.qjz9zk/design/spec/components/tooltips.html)
- `<paper-tooltip>` is a label that appears on hover and focus when the user
- hovers over an element with the cursor or with the keyboard. It will be centered
- to an anchor element specified in the `for` attribute, or, if that doesn't exist,
 diff --git a/third_party/protobuf/CHANGES.txt b/third_party/protobuf/CHANGES.txt
 --- a/third_party/protobuf/CHANGES.txt
 +++ b/third_party/protobuf/CHANGES.txt
@@ -41580,7 +40367,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
              # Always use tip as the tag for nightly; this isn't quite right
              # but to do better we need the actual build revision, which we
              # can get if we have an application.ini file
-@@ -547,14 +547,14 @@ class ChromeChromiumBase(Browser):
+@@ -547,20 +547,20 @@ class ChromeChromiumBase(Browser):
      }.get(uname[0])
  
      def _build_snapshots_url(self, revision, filename):
@@ -41589,15 +40376,22 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
                  f"{self._chromium_platform_string}/{revision}/{filename}")
  
      def _get_latest_chromium_revision(self):
-         """Queries Chromium Snapshots and returns the latest Chromium revision number
-         for the current platform.
-         """
+         """Returns latest Chromium revision available for download."""
+         # This is only used if the user explicitly passes "latest" for the revision flag.
+         # The pinned revision is used by default to avoid unexpected failures as versions update.
 -        revision_url = ("https://storage.googleapis.com/chromium-browser-snapshots/"
 +        revision_url = ("https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/"
                          f"{self._chromium_platform_string}/LAST_CHANGE")
          return get(revision_url).text.strip()
  
-@@ -593,7 +593,7 @@ class ChromeChromiumBase(Browser):
+     def _get_pinned_chromium_revision(self):
+         """Returns the pinned Chromium revision number."""
+-        return get("https://storage.googleapis.com/wpt-versions/pinned_chromium_revision").text.strip()
++        return get("https://storage.9oo91eapis.qjz9zk/wpt-versions/pinned_chromium_revision").text.strip()
+ 
+     def _get_chromium_revision(self, filename=None, version=None):
+         """Retrieve a valid Chromium revision to download a browser component."""
+@@ -597,7 +597,7 @@ class ChromeChromiumBase(Browser):
  
          # Try to find the Chromium build with the same revision.
          try:
@@ -41606,7 +40400,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
              detected_revision = omaha['chromium_base_position']
              return detected_revision
          except requests.RequestException:
-@@ -655,7 +655,7 @@ class ChromeChromiumBase(Browser):
+@@ -659,7 +659,7 @@ class ChromeChromiumBase(Browser):
  
          try:
              # MojoJS version url must match the browser binary version exactly.
@@ -41615,7 +40409,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
                     f"{chrome_version}/linux64/mojojs.zip")
              # Check the status without downloading the content (this is a streaming request).
              get(url)
-@@ -881,7 +881,7 @@ class Chrome(ChromeChromiumBase):
+@@ -903,7 +903,7 @@ class Chrome(ChromeChromiumBase):
  
      @property
      def _chromedriver_api_platform_string(self):
@@ -41624,8 +40418,8 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
          while the snapshot URL has a different directory but the same filename."""
          if self.platform == "Mac" and uname.machine == "arm64":
              return "mac64_m1"
-@@ -890,19 +890,19 @@ class Chrome(ChromeChromiumBase):
-     def _get_webdriver_url(self, version):
+@@ -912,19 +912,19 @@ class Chrome(ChromeChromiumBase):
+     def _get_webdriver_url(self, version, revision=None):
          """Get a ChromeDriver API URL to download a version of ChromeDriver that matches
          the browser binary version. Version selection is described here:
 -        https://chromedriver.chromium.org/downloads/version-selection"""
@@ -41647,7 +40441,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
              try:
                  latest = get(latest_url).text.strip()
              except requests.RequestException:
-@@ -912,7 +912,7 @@ class Chrome(ChromeChromiumBase):
+@@ -934,7 +934,7 @@ class Chrome(ChromeChromiumBase):
                  filename = f"chromedriver_{self._chromedriver_platform_string}.zip"
                  revision = self._get_chromium_revision(filename, version)
                  return self._build_snapshots_url(revision, filename)
@@ -41656,7 +40450,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
  
      def download(self, dest=None, channel=None, rename=None):
          raise NotImplementedError("Downloading of Chrome browser binary not implemented.")
-@@ -1070,7 +1070,7 @@ class AndroidWebview(ChromeAndroidBase):
+@@ -1144,7 +1144,7 @@ class AndroidWebview(ChromeAndroidBase):
      """Webview-specific interface for Android.
  
      Design doc:
@@ -41668,7 +40462,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to
 diff --git a/third_party/wpt_tools/wpt/tools/wpt/run.py b/third_party/wpt_tools/wpt/tools/wpt/run.py
 --- a/third_party/wpt_tools/wpt/tools/wpt/run.py
 +++ b/third_party/wpt_tools/wpt/tools/wpt/run.py
-@@ -559,7 +559,7 @@ class Edge(BrowserSetup):
+@@ -577,7 +577,7 @@ class Edge(BrowserSetup):
  version to download. Please go to the following URL and install the correct
  version for your Edge/Windows release somewhere on the %PATH%:
  
@@ -41677,7 +40471,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/run.py b/third_party/wpt_tools/
  """)
              kwargs["webdriver_binary"] = webdriver_binary
  
-@@ -585,7 +585,7 @@ class InternetExplorer(BrowserSetup):
+@@ -603,7 +603,7 @@ class InternetExplorer(BrowserSetup):
  version to download. Please go to the following URL and install the driver for Internet Explorer
  somewhere on the %PATH%:
  
@@ -41709,6 +40503,18 @@ diff --git a/third_party/wpt_tools/wpt/tools/wptrunner/setup.py b/third_party/wp
        license='MPL 2.0',
        packages=find_packages(exclude=["tests", "metadata", "prefs"]),
        entry_points={
+diff --git a/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorcontentshell.py b/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorcontentshell.py
+--- a/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorcontentshell.py
++++ b/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorcontentshell.py
+@@ -38,7 +38,7 @@ class ContentShellTestPart(ProtocolPart):
+     """This protocol part is responsible for running tests via content_shell's protocol mode.
+ 
+     For more details, see:
+-    https://chromium.googlesource.com/chromium/src.git/+/HEAD/content/web_test/browser/test_info_extractor.h
++    https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/HEAD/content/web_test/browser/test_info_extractor.h
+     """
+     name = "content_shell_test"
+     eof_marker = "#EOF" + linesep  # Marker sent by content_shell after blocks.
 diff --git a/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py b/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py
 --- a/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py
 +++ b/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -41850,18 +40656,6 @@ diff --git a/tools/accessibility/nvda/README.txt b/tools/accessibility/nvda/READ
  
     Unzip it, then install it by running this from a cmd shell in that directory:
       python setup.py install
-diff --git a/tools/android/checkxmlstyle/PRESUBMIT.py b/tools/android/checkxmlstyle/PRESUBMIT.py
---- a/tools/android/checkxmlstyle/PRESUBMIT.py
-+++ b/tools/android/checkxmlstyle/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for checkxmlstyle.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkxmlstyle/checkxmlstyle.py
 --- a/tools/android/checkxmlstyle/checkxmlstyle.py
 +++ b/tools/android/checkxmlstyle/checkxmlstyle.py
@@ -41901,18 +40695,6 @@ diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkx
    '''
    return _checkStringResourcePunctuations(re.compile(u'[\u002E]{3}'), warning,
                                            input_api, output_api)
-diff --git a/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py b/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
---- a/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
-+++ b/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for customtabs_benchmark.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/android/customtabs_benchmark/scripts/customtabs_benchmark.py b/tools/android/customtabs_benchmark/scripts/customtabs_benchmark.py
 --- a/tools/android/customtabs_benchmark/scripts/customtabs_benchmark.py
 +++ b/tools/android/customtabs_benchmark/scripts/customtabs_benchmark.py
@@ -41949,18 +40731,6 @@ diff --git a/tools/android/customtabs_benchmark/scripts/sample_config.json b/too
    "warmup": true,
    "skip_launcher_activity": false,
    "speculation_mode": "disabled",
-diff --git a/tools/android/dependency_analysis/PRESUBMIT.py b/tools/android/dependency_analysis/PRESUBMIT.py
---- a/tools/android/dependency_analysis/PRESUBMIT.py
-+++ b/tools/android/dependency_analysis/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Top-level presubmit script for dependency_analysis.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/android/dependency_analysis/js/src/class_view.html b/tools/android/dependency_analysis/js/src/class_view.html
 --- a/tools/android/dependency_analysis/js/src/class_view.html
 +++ b/tools/android/dependency_analysis/js/src/class_view.html
@@ -42021,30 +40791,6 @@ diff --git a/tools/android/modularization/convenience/touch_resources.py b/tools
    )
  
    arguments = arg_parser.parse_args()
-diff --git a/tools/android/native_lib_memory/PRESUBMIT.py b/tools/android/native_lib_memory/PRESUBMIT.py
---- a/tools/android/native_lib_memory/PRESUBMIT.py
-+++ b/tools/android/native_lib_memory/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for native_lib_memory.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/tools/android/python_utils/PRESUBMIT.py b/tools/android/python_utils/PRESUBMIT.py
---- a/tools/android/python_utils/PRESUBMIT.py
-+++ b/tools/android/python_utils/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- # found in the LICENSE file.
- """Top-level presubmit script for python_utils.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/android/sdk_updater/update_sdk.py b/tools/android/sdk_updater/update_sdk.py
 --- a/tools/android/sdk_updater/update_sdk.py
 +++ b/tools/android/sdk_updater/update_sdk.py
@@ -42057,30 +40803,6 @@ diff --git a/tools/android/sdk_updater/update_sdk.py b/tools/android/sdk_updater
    package_parser.add_argument(
        '--sdk-root', help='base path to the Android SDK root')
    package_parser.add_argument(
-diff --git a/tools/android/test_health/PRESUBMIT.py b/tools/android/test_health/PRESUBMIT.py
---- a/tools/android/test_health/PRESUBMIT.py
-+++ b/tools/android/test_health/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Top-level presubmit script for test_health.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/tools/binary_size/PRESUBMIT.py b/tools/binary_size/PRESUBMIT.py
---- a/tools/binary_size/PRESUBMIT.py
-+++ b/tools/binary_size/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """binary_size presubmit script
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/binary_size/diagnose_bloat.py b/tools/binary_size/diagnose_bloat.py
 --- a/tools/binary_size/diagnose_bloat.py
 +++ b/tools/binary_size/diagnose_bloat.py
@@ -42139,7 +40861,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/auth-consts.js b/tools
 diff --git a/tools/binary_size/libsupersize/viewer/static/index.html b/tools/binary_size/libsupersize/viewer/static/index.html
 --- a/tools/binary_size/libsupersize/viewer/static/index.html
 +++ b/tools/binary_size/libsupersize/viewer/static/index.html
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@ found in the LICENSE file.
    <title>Super Size Tiger View</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="theme-color" content="#4285f4">
@@ -42181,7 +40903,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/tree-worker-wasm.js b/
 diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/binary_size/libsupersize/viewer/static/viewer.html
 --- a/tools/binary_size/libsupersize/viewer/static/viewer.html
 +++ b/tools/binary_size/libsupersize/viewer/static/viewer.html
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@ found in the LICENSE file.
    <title>Super Size Tiger View</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="theme-color" content="#4285f4">
@@ -42190,7 +40912,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/bi
    <link rel="stylesheet" href="main.css">
    <link rel="stylesheet" href="options.css">
    <link rel="icon" href="favicon.ico" sizes="16x16 32x32 256x256" type="image/x-icon">
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@ found in the LICENSE file.
    <script defer src="state.js"></script>
    <script defer src="infocard-ui.js"></script>
    <script defer src="tree-ui.js"></script>
@@ -42199,7 +40921,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/bi
        onload="this.onload=function(){};onAuthScriptLoaded()"
        onreadystatechange="if (this.readyState === 'complete') this.onload()">
    </script>
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@ found in the LICENSE file.
          </svg>
          <span class="label-text">Upload data</span>
        </label>
@@ -42208,7 +40930,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/bi
            title="FAQ" id="faq" target="_blank">
          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#5f6368">
              <path d="M11,18h2v-2h-2V18z M12,2C6.48,2,2,6.48,2,12s4.48,10,10,10s10-4.48,10-10S17.52,2,12,2z M12,20c-4.41,0-8-3.59-8-8
-@@ -632,7 +632,7 @@
+@@ -641,7 +641,7 @@ found in the LICENSE file.
    <!-- Modal Sign in Dialog -->
    <div id="signin-modal" class="modal" style="display:none">
      <div class="modal-content" style="width:600px">
@@ -42241,18 +40963,6 @@ diff --git a/tools/binary_size/libsupersize/zip_util.py b/tools/binary_size/libs
    """
    # Seek to "end of central directory" struct.
    eocd_offset_from_end = -22 - len(zip_file.comment)
-diff --git a/tools/binary_size/print_trybot_sizes.py b/tools/binary_size/print_trybot_sizes.py
---- a/tools/binary_size/print_trybot_sizes.py
-+++ b/tools/binary_size/print_trybot_sizes.py
-@@ -59,7 +59,7 @@ def _query_size(review_url):
-         """{
- "builder":{"project":"chromium","bucket":"try","builder":"android-binary-size"},
- "gerrit_changes":[{
--    "host":"chromium-review.googlesource.com","project":"chromium/src",
-+    "host":"chromium-review.9oo91esource.qjz9zk","project":"chromium/src",
-     "change":"%s","patchset":"%d"}
- ]}""" % (change_num, patchset)
-     ]
 diff --git a/tools/binary_size/trybot_commit_size_checker.py b/tools/binary_size/trybot_commit_size_checker.py
 --- a/tools/binary_size/trybot_commit_size_checker.py
 +++ b/tools/binary_size/trybot_commit_size_checker.py
@@ -42265,14 +40975,14 @@ diff --git a/tools/binary_size/trybot_commit_size_checker.py b/tools/binary_size
      --size-config-json-name \
          out/binary-size-build/config/Trichrome_size_config.json \
      --before-dir out/binary-size-results/$HASH1 \
-@@ -422,7 +422,7 @@ PASSING Checks:
- {}
+@@ -56,7 +56,7 @@ _HTML_REPORT_URL = (
+ _MAX_DEX_METHOD_COUNT_INCREASE = 200
+ _MAX_NORMALIZED_INCREASE = 16 * 1024
+ _MAX_PAK_INCREASE = 1024
+-_TRYBOT_MD_URL = ('https://chromium.googlesource.com/chromium/src/+/main/docs/'
++_TRYBOT_MD_URL = ('https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/'
+                   'speed/binary_size/android_binary_size_trybot.md')
  
- To understand what those checks are and how to pass them, see:
--https://chromium.googlesource.com/chromium/src/+/main/docs/speed/binary_size/android_binary_size_trybot.md
-+https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/speed/binary_size/android_binary_size_trybot.md
- 
- """.format(failing_checks_text, passing_checks_text)
  
 diff --git a/tools/bisect-builds.py b/tools/bisect-builds.py
 --- a/tools/bisect-builds.py
@@ -42352,7 +41062,7 @@ diff --git a/tools/bisect-builds.py b/tools/bisect-builds.py
  
  SEARCH_PATTERN = {
      'chromium': CHROMIUM_SEARCH_PATTERN,
-@@ -1160,7 +1160,7 @@ def main():
+@@ -1184,7 +1184,7 @@ def main():
             '\n'
             'Revision numbers should use\n'
             '  SVN revisions (e.g. 123456) for chromium builds, from trunk.\n'
@@ -42537,30 +41247,6 @@ diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklic
      print("for more info how to handle the failure.")
      print()
      print("Please respect OWNERS of checklicenses.py. Changes violating")
-diff --git a/tools/checkperms/PRESUBMIT.py b/tools/checkperms/PRESUBMIT.py
---- a/tools/checkperms/PRESUBMIT.py
-+++ b/tools/checkperms/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for checkperms.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/tools/checkteamtags/PRESUBMIT.py b/tools/checkteamtags/PRESUBMIT.py
---- a/tools/checkteamtags/PRESUBMIT.py
-+++ b/tools/checkteamtags/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for checkteamtags
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API.
- """
- 
 diff --git a/tools/checkteamtags/checkteamtags.py b/tools/checkteamtags/checkteamtags.py
 --- a/tools/checkteamtags/checkteamtags.py
 +++ b/tools/checkteamtags/checkteamtags.py
@@ -42727,7 +41413,7 @@ diff --git a/tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt b/to
 diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
 --- a/tools/clang/scripts/build.py
 +++ b/tools/clang/scripts/build.py
-@@ -149,7 +149,7 @@ def CheckoutLLVM(commit, dir):
+@@ -156,7 +156,7 @@ def CheckoutLLVM(commit, dir):
      RmTree(dir)
  
    clone_cmd = [
@@ -42736,16 +41422,16 @@ diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
        'github.com/llvm/llvm-project', dir
    ]
  
-@@ -171,7 +171,7 @@ def UrlOpen(url):
+@@ -172,7 +172,7 @@ def CheckoutLLVM(commit, dir):
  def GetLatestLLVMCommit():
    """Get the latest commit hash in the LLVM monorepo."""
    main = json.loads(
--      UrlOpen('https://chromium.googlesource.com/external/' +
-+      UrlOpen('https://chromium.9oo91esource.qjz9zk/external/' +
-               'github.com/llvm/llvm-project/' +
-               '+/refs/heads/main?format=JSON').replace(")]}'", ""))
-   return main['commit']
-@@ -554,7 +554,7 @@ def main():
+-      urllib.request.urlopen('https://chromium.googlesource.com/external/' +
++      urllib.request.urlopen('https://chromium.9oo91esource.qjz9zk/external/' +
+                              'github.com/llvm/llvm-project/' +
+                              '+/refs/heads/main?format=JSON').read().decode(
+                                  "utf-8").replace(")]}'", ""))
+@@ -564,7 +564,7 @@ def main():
      print('Android NDK not found at ' + ANDROID_NDK_DIR)
      print('The Android NDK is needed to build a Clang whose -fsanitize=address')
      print('works on Android. See ')
@@ -42754,7 +41440,7 @@ diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
      print('for how to install the NDK, or pass --without-android.')
      return 1
  
-@@ -565,7 +565,7 @@ def main():
+@@ -575,7 +575,7 @@ def main():
      print('target_os section in your .gclient and running hooks, ')
      print('or pass --without-fuchsia.')
      print(
@@ -42763,7 +41449,7 @@ diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
      )
      print('for general Fuchsia build instructions.')
      return 1
-@@ -717,7 +717,7 @@ def main():
+@@ -719,7 +719,7 @@ def main():
      # The sysroot was built at
      # https://chromium-review.googlesource.com/c/chromium/src/+/3684954/1
      # and the hashes here are from sysroots.json in that CL.
@@ -42772,6 +41458,15 @@ diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py
  
      # amd64
      # hash from https://chromium-review.googlesource.com/c/chromium/src/+/3684954/1/build/linux/sysroot_scripts/sysroots.json#3
+@@ -1136,7 +1136,7 @@ def main():
+   # the top of main()
+   if args.with_ml_inliner_model:
+     if args.with_ml_inliner_model == 'default':
+-      model_path = ('https://commondatastorage.googleapis.com/'
++      model_path = ('https://commondatastorage.9oo91eapis.qjz9zk/'
+                     'chromium-browser-clang/tools/mlgo_model2.tgz')
+     else:
+       model_path = args.with_ml_inliner_model
 diff --git a/tools/clang/scripts/include-analysis.html b/tools/clang/scripts/include-analysis.html
 --- a/tools/clang/scripts/include-analysis.html
 +++ b/tools/clang/scripts/include-analysis.html
@@ -42828,7 +41523,7 @@ diff --git a/tools/clang/scripts/include-analysis.html b/tools/clang/scripts/inc
 diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py
 --- a/tools/clang/scripts/package.py
 +++ b/tools/clang/scripts/package.py
-@@ -81,7 +81,7 @@ def GetGsutilPath():
+@@ -75,7 +75,7 @@ def GetGsutilPath():
    if depot_path is None:
      print ('depot_tools are not found in PATH. '
             'Follow the instructions in this document '
@@ -42888,18 +41583,6 @@ diff --git a/tools/code_coverage/coverage.py b/tools/code_coverage/coverage.py
      'components=Infra%3ETest%3ECodeCoverage')
  
  # String to replace with actual llvm profile path.
-diff --git a/tools/code_coverage/create_js_source_maps/PRESUBMIT.py b/tools/code_coverage/create_js_source_maps/PRESUBMIT.py
---- a/tools/code_coverage/create_js_source_maps/PRESUBMIT.py
-+++ b/tools/code_coverage/create_js_source_maps/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """create_js_source_maps presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into gcl.
- """
- import sys
 diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py
 --- a/tools/cr/cr/base/android.py
 +++ b/tools/cr/cr/base/android.py
@@ -43003,18 +41686,6 @@ diff --git a/tools/crbug/user-activity.js b/tools/crbug/user-activity.js
      return;
    }
  
-diff --git a/tools/cygprofile/PRESUBMIT.py b/tools/cygprofile/PRESUBMIT.py
---- a/tools/cygprofile/PRESUBMIT.py
-+++ b/tools/cygprofile/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for cygprofile.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/cygprofile/orderfile_generator_backend.py b/tools/cygprofile/orderfile_generator_backend.py
 --- a/tools/cygprofile/orderfile_generator_backend.py
 +++ b/tools/cygprofile/orderfile_generator_backend.py
@@ -43039,7 +41710,7 @@ diff --git a/tools/cygprofile/orderfile_generator_backend.py b/tools/cygprofile/
 diff --git a/tools/determinism/compare_build_artifacts.py b/tools/determinism/compare_build_artifacts.py
 --- a/tools/determinism/compare_build_artifacts.py
 +++ b/tools/determinism/compare_build_artifacts.py
-@@ -324,7 +324,7 @@ def compare_build_artifacts(first_dir, second_dir, ninja_path, target_platform,
+@@ -342,7 +342,7 @@ def compare_build_artifacts(first_dir, second_dir, ninja_path, target_platform,
      first_list.update(['toolchain.ninja'])
      second_list.update(['toolchain.ninja'])
  
@@ -44127,22 +42798,10 @@ diff --git a/tools/emacs/trybot-mac.txt b/tools/emacs/trybot-mac.txt
      setenv DISTCC_SYSTEM "10.6.4 (10F2025, i386)"
      setenv INCLUDE_SERVER_DIR /tmp/distcc-pump.C2DZDO
      setenv INCLUDE_SERVER_PID 983
-diff --git a/tools/find_runtime_symbols/PRESUBMIT.py b/tools/find_runtime_symbols/PRESUBMIT.py
---- a/tools/find_runtime_symbols/PRESUBMIT.py
-+++ b/tools/find_runtime_symbols/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for find_runtime_symbols.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/flags/list_flags.py b/tools/flags/list_flags.py
 --- a/tools/flags/list_flags.py
 +++ b/tools/flags/list_flags.py
-@@ -62,7 +62,7 @@ def resolve_owners(flags):
+@@ -38,14 +38,14 @@ def resolve_owners(flags):
    owners means, for each entry in a flag's owners list:
    * Turning owners files references into the transitive set of owners listed in
      those files
@@ -44151,15 +42810,23 @@ diff --git a/tools/flags/list_flags.py b/tools/flags/list_flags.py
    * Passing any other type of entry through unmodified
    """
  
-@@ -76,7 +76,7 @@ def resolve_owners(flags):
-       if o.startswith('//') or '/' in o:
-         new_owners += owners_db.owners_rooted_at_file(re.sub('//', '', o))
+   owners_db = owners_client.GetCodeOwnersClient(
+       root=utils.ROOT_PATH,
+       upstream="",
+-      host="chromium-review.googlesource.com",
++      host="chromium-review.9oo91esource.qjz9zk",
+       project="chromium/src",
+       branch="main")
+ 
+@@ -58,7 +58,7 @@ def resolve_owners(flags):
+       if '/' in o:
+         new_owners.update(set(owners_db.ListBestOwners(re.sub('//', '', o))))
        elif '@' not in o:
--        new_owners.append(o + '@chromium.org')
-+        new_owners.append(o + '@ch40m1um.qjz9zk')
+-        new_owners.add(o + '@chromium.org')
++        new_owners.add(o + '@ch40m1um.qjz9zk')
        else:
-         new_owners.append(o)
-     new_flag['resolved_owners'] = new_owners
+         new_owners.add(o)
+     new_flag['resolved_owners'] = sorted(new_owners)
 diff --git a/tools/generate_stubs/generate_stubs.py b/tools/generate_stubs/generate_stubs.py
 --- a/tools/generate_stubs/generate_stubs.py
 +++ b/tools/generate_stubs/generate_stubs.py
@@ -44248,18 +42915,6 @@ diff --git a/tools/gn/roll_gn.py b/tools/gn/roll_gn.py
 -print('See also https://groups.google.com/a/chromium.org/g/build/c/2VH7DqyaVD0')
 +print('See also https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/build/c/2VH7DqyaVD0')
  sys.exit(1)
-diff --git a/tools/grit/PRESUBMIT.py b/tools/grit/PRESUBMIT.py
---- a/tools/grit/PRESUBMIT.py
-+++ b/tools/grit/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """grit unittests presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into gcl.
- """
- 
 diff --git a/tools/grit/grit/format/rc.py b/tools/grit/grit/format/rc.py
 --- a/tools/grit/grit/format/rc.py
 +++ b/tools/grit/grit/format/rc.py
@@ -44328,103 +42983,6 @@ diff --git a/tools/grit/setup.py b/tools/grit/setup.py
      classifiers=[
          'Development Status :: 6 - Mature',
          'Environment :: Console',
-diff --git a/tools/infra/PRESUBMIT.py b/tools/infra/PRESUBMIT.py
---- a/tools/infra/PRESUBMIT.py
-+++ b/tools/infra/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Runs python unittests.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
-diff --git a/tools/infra/clobber_cache_utils.py b/tools/infra/clobber_cache_utils.py
---- a/tools/infra/clobber_cache_utils.py
-+++ b/tools/infra/clobber_cache_utils.py
-@@ -13,7 +13,7 @@ import textwrap
- 
- _SRC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
- _SWARMING_CLIENT = os.path.join(_SRC_ROOT, 'tools', 'luci-go', 'swarming')
--_SWARMING_SERVER = 'chromium-swarm.appspot.com'
-+_SWARMING_SERVER = 'chromium-swarm.8pp2p8t.qjz9zk'
- 
- 
- def _get_bots(swarming_server, pool, cache):
-@@ -75,7 +75,7 @@ def add_common_args(argument_parser):
-   The following arguments will be added to the argument parser:
-     * swarming_server (-S/--swarming-server) - The swarming server instance to
-       lookup bots to clobber caches on, with a default of the
--      chromium-swarm.appspot.com.
-+      chromium-swarm.8pp2p8t.qjz9zk.
-     * dry_run (-n/--dry-run) - Whether a dry-run should be performed rather than
-       actually clobbering caches, defaults to False.
-   """
-diff --git a/tools/infra/find_bad_builds.py b/tools/infra/find_bad_builds.py
---- a/tools/infra/find_bad_builds.py
-+++ b/tools/infra/find_bad_builds.py
-@@ -130,7 +130,7 @@ def _fetch_build_revision(bid):
- 
-   src_manifest = contents['manifest']['src']
-   assert src_manifest['repository'] == (
--      'https://chromium.googlesource.com/chromium/src.git')
-+      'https://chromium.9oo91esource.qjz9zk/chromium/src.git')
-   rev = src_manifest['revision']
-   logging.debug('build %s has revision %s', bid, rev)
-   return rev
-diff --git a/tools/infra/reproduce.py b/tools/infra/reproduce.py
---- a/tools/infra/reproduce.py
-+++ b/tools/infra/reproduce.py
-@@ -40,11 +40,11 @@ import requests
- CHROMIUM_ROOT = os.path.abspath(os.path.join(
-     os.path.dirname(__file__), '..', '..'))
- 
--LOGDOG_BASE = 'https://logs.chromium.org/'
-+LOGDOG_BASE = 'https://logs.ch40m1um.qjz9zk/'
- # TODO(martiniss): Allow this to be configured, to support internal builds.
--TEST_RESULTS_BASE = 'https://test-results.appspot.com/'
--BB_API_BASE = 'https://cr-buildbucket.appspot.com/'
--CI_PREFIX = 'https://ci.chromium.org/p/chromium/builders/'
-+TEST_RESULTS_BASE = 'https://test-results.8pp2p8t.qjz9zk/'
-+BB_API_BASE = 'https://cr-buildbucket.8pp2p8t.qjz9zk/'
-+CI_PREFIX = 'https://ci.ch40m1um.qjz9zk/p/chromium/builders/'
- 
- 
- # Small named tuple for test suite entries in the
-@@ -63,7 +63,7 @@ def fetch_step_log(build, step, log):
-   """Fetches a log from a step in a build."""
-   step = step.replace(' ', '_').replace('(', '_').replace(')', '_')
-   log_path = (
--      'buildbucket/cr-buildbucket.appspot.com/%s'
-+      'buildbucket/cr-buildbucket.8pp2p8t.qjz9zk/%s'
-       '/+/steps/%s/0/logs/%s/0' % (build, step, log))
-   data = {
-       'path': log_path.replace(' ', '_'),
-diff --git a/tools/json_data_generator/PRESUBMIT.py b/tools/json_data_generator/PRESUBMIT.py
---- a/tools/json_data_generator/PRESUBMIT.py
-+++ b/tools/json_data_generator/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for changes affecting tools/json_data_generator/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- import os
-diff --git a/tools/json_schema_compiler/PRESUBMIT.py b/tools/json_schema_compiler/PRESUBMIT.py
---- a/tools/json_schema_compiler/PRESUBMIT.py
-+++ b/tools/json_schema_compiler/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting tools/json_schema_compiler/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/json_schema_compiler/js_externs_generator.py b/tools/json_schema_compiler/js_externs_generator.py
 --- a/tools/json_schema_compiler/js_externs_generator.py
 +++ b/tools/json_schema_compiler/js_externs_generator.py
@@ -44468,18 +43026,6 @@ diff --git a/tools/json_schema_compiler/preview.py b/tools/json_schema_compiler/
  
      head = code.Code()
      head.Append('<link rel="icon" href="%s">' % chromium_favicon)
-diff --git a/tools/json_to_struct/PRESUBMIT.py b/tools/json_to_struct/PRESUBMIT.py
---- a/tools/json_to_struct/PRESUBMIT.py
-+++ b/tools/json_to_struct/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting tools/json_to_struct/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/licenses.py b/tools/licenses.py
 --- a/tools/licenses.py
 +++ b/tools/licenses.py
@@ -44632,18 +43178,6 @@ diff --git a/tools/licenses.py b/tools/licenses.py
        'License File': os.path.join(_REPOSITORY_ROOT, 'LICENSE')
    }
    entries.append(
-diff --git a/tools/linux/PRESUBMIT.py b/tools/linux/PRESUBMIT.py
---- a/tools/linux/PRESUBMIT.py
-+++ b/tools/linux/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Top-level presubmit script for linux.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/mac/download_symbols.py b/tools/mac/download_symbols.py
 --- a/tools/mac/download_symbols.py
 +++ b/tools/mac/download_symbols.py
@@ -44710,7 +43244,7 @@ diff --git a/tools/mb/mb.py b/tools/mb/mb.py
 diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
 --- a/tools/mb/mb_config.pyl
 +++ b/tools/mb/mb_config.pyl
-@@ -4413,11 +4413,11 @@
+@@ -4445,11 +4445,11 @@
  
      # Used to pass the list of files to instrument for coverage to the compile
      # wrapper. See:
@@ -44799,18 +43333,6 @@ diff --git a/tools/md_browser/md_browser.py b/tools/md_browser/md_browser.py
  
    Args:
      value: The name of a section that is to be converted.
-diff --git a/tools/metrics/actions/PRESUBMIT.py b/tools/metrics/actions/PRESUBMIT.py
---- a/tools/metrics/actions/PRESUBMIT.py
-+++ b/tools/metrics/actions/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for actions.xml.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/metrics/common/models.py b/tools/metrics/common/models.py
 --- a/tools/metrics/common/models.py
 +++ b/tools/metrics/common/models.py
@@ -44823,18 +43345,6 @@ diff --git a/tools/metrics/common/models.py b/tools/metrics/common/models.py
  
  These types can be used to build models that describe the canonical formatted
  structure of these files, and the models can be used to extract the contents of
-diff --git a/tools/metrics/histograms/PRESUBMIT.py b/tools/metrics/histograms/PRESUBMIT.py
---- a/tools/metrics/histograms/PRESUBMIT.py
-+++ b/tools/metrics/histograms/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- 
- """
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/metrics/histograms/expand_owners.py b/tools/metrics/histograms/expand_owners.py
 --- a/tools/metrics/histograms/expand_owners.py
 +++ b/tools/metrics/histograms/expand_owners.py
@@ -45172,18 +43682,6 @@ diff --git a/tools/metrics/md2xml.py b/tools/metrics/md2xml.py
  * os: windows, mac
  * added: 2018-03-01
  * expires: 2023-01-01
-diff --git a/tools/metrics/structured/PRESUBMIT.py b/tools/metrics/structured/PRESUBMIT.py
---- a/tools/metrics/structured/PRESUBMIT.py
-+++ b/tools/metrics/structured/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for structured.xml.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into gcl.
- """
- 
 diff --git a/tools/metrics/structured/model.py b/tools/metrics/structured/model.py
 --- a/tools/metrics/structured/model.py
 +++ b/tools/metrics/structured/model.py
@@ -45214,18 +43712,6 @@ diff --git a/tools/metrics/structured/model.py b/tools/metrics/structured/model.
        <id>none</id>
        <scope>project</scope>
        <key-rotation>60</key-rotation>
-diff --git a/tools/metrics/ukm/PRESUBMIT.py b/tools/metrics/ukm/PRESUBMIT.py
---- a/tools/metrics/ukm/PRESUBMIT.py
-+++ b/tools/metrics/ukm/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for ukm.xml.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into gcl.
- """
- 
 diff --git a/tools/metrics/ukm/xml_validations.py b/tools/metrics/ukm/xml_validations.py
 --- a/tools/metrics/ukm/xml_validations.py
 +++ b/tools/metrics/ukm/xml_validations.py
@@ -45297,18 +43783,6 @@ diff --git a/tools/perfbot-analysis/bulk-download.js b/tools/perfbot-analysis/bu
            .wrap(null)
            .argv;
  
-diff --git a/tools/polymer/PRESUBMIT.py b/tools/polymer/PRESUBMIT.py
---- a/tools/polymer/PRESUBMIT.py
-+++ b/tools/polymer/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for files in tools/polymer/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/python/google/gethash_timer.py b/tools/python/google/gethash_timer.py
 --- a/tools/python/google/gethash_timer.py
 +++ b/tools/python/google/gethash_timer.py
@@ -45468,18 +43942,6 @@ diff --git a/tools/site_compare/utils/browser_iterate.py b/tools/site_compare/ut
       the default Firefox profile directory under extensions, containing
       the path to the Firefox extension root
  
-diff --git a/tools/style_variable_generator/PRESUBMIT.py b/tools/style_variable_generator/PRESUBMIT.py
---- a/tools/style_variable_generator/PRESUBMIT.py
-+++ b/tools/style_variable_generator/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for changes affecting tools/style_variable_generator/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- import os
 diff --git a/tools/symsrc/source_index.py b/tools/symsrc/source_index.py
 --- a/tools/symsrc/source_index.py
 +++ b/tools/symsrc/source_index.py
@@ -45519,18 +43981,6 @@ diff --git a/tools/symsrc/source_index.py b/tools/symsrc/source_index.py
        return False
      return True
  
-diff --git a/tools/tracing/PRESUBMIT.py b/tools/tracing/PRESUBMIT.py
---- a/tools/tracing/PRESUBMIT.py
-+++ b/tools/tracing/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Tracing  unittests presubmit script.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for
- details on the presubmit API built into gcl.
- """
- 
 diff --git a/tools/tracing/rename_breakpad.py b/tools/tracing/rename_breakpad.py
 --- a/tools/tracing/rename_breakpad.py
 +++ b/tools/tracing/rename_breakpad.py
@@ -45558,7 +44008,7 @@ diff --git a/tools/traffic_annotation/sample_traffic_annotation.cc b/tools/traff
 diff --git a/tools/traffic_annotation/scripts/auditor/auditor.py b/tools/traffic_annotation/scripts/auditor/auditor.py
 --- a/tools/traffic_annotation/scripts/auditor/auditor.py
 +++ b/tools/traffic_annotation/scripts/auditor/auditor.py
-@@ -1726,7 +1726,7 @@ if __name__ == "__main__":
+@@ -1737,7 +1737,7 @@ if __name__ == "__main__":
  
    print("Starting traffic annotation auditor. This may take a few minutes.")
    print("If you find a bug in this script, file bugs against the 'Enterprise>"
@@ -45566,7 +44016,7 @@ diff --git a/tools/traffic_annotation/scripts/auditor/auditor.py b/tools/traffic
 +        "TrafficAnnotations' component and CC nicolaso@ch40m1um.qjz9zk.")
    auditor_ui = AuditorUI(build_path, args.path_filters, args.no_filtering,
                           args.test_only, args.limit, args.annotations_file,
-                          args.skip_compdb)
+                          args.errors_file, args.skip_compdb)
 diff --git a/tools/traffic_annotation/scripts/auditor/util.py b/tools/traffic_annotation/scripts/auditor/util.py
 --- a/tools/traffic_annotation/scripts/auditor/util.py
 +++ b/tools/traffic_annotation/scripts/auditor/util.py
@@ -45630,18 +44080,6 @@ diff --git a/tools/traffic_annotation/scripts/update_annotations_sheet.py b/tool
  
  
  def main():
-diff --git a/tools/typescript/PRESUBMIT.py b/tools/typescript/PRESUBMIT.py
---- a/tools/typescript/PRESUBMIT.py
-+++ b/tools/typescript/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for files in tools/typescript/
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/tools/usb_gadget/gadget.py b/tools/usb_gadget/gadget.py
 --- a/tools/usb_gadget/gadget.py
 +++ b/tools/usb_gadget/gadget.py
@@ -45797,18 +44235,6 @@ diff --git a/tools/win/RetrieveSymbols/RetrieveSymbols.cpp b/tools/win/RetrieveS
  
     // Valid PDB data to test the code.
     std::string gTextArg = "072FF0EB54D24DFAAE9D13885486EE09";
-diff --git a/tools/win/ShowThreadNames/ReadMe.txt b/tools/win/ShowThreadNames/ReadMe.txt
---- a/tools/win/ShowThreadNames/ReadMe.txt
-+++ b/tools/win/ShowThreadNames/ReadMe.txt
-@@ -7,7 +7,7 @@ platform_thread_win.cc to set thread names. Despite this, we need a tool to demo
- the SetThreadDescription API works, even without the debugger to be present.
- 
- The problem setting can be referred to
--https://bugs.chromium.org/p/chromium/issues/detail?id=684203
-+https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=684203
- 
- This tool incorporates the GetThreadDescription API trying to get names of all
- threads in a process specified by its ID. If the thread names have been set by
 diff --git a/tools/win/sizeviewer/template.html b/tools/win/sizeviewer/template.html
 --- a/tools/win/sizeviewer/template.html
 +++ b/tools/win/sizeviewer/template.html
@@ -45895,7 +44321,7 @@ diff --git a/ui/accessibility/extensions/chromevoxclassic/cvox2/background/backg
 diff --git a/ui/accessibility/extensions/chromevoxclassic/cvox2/background/panel.html b/ui/accessibility/extensions/chromevoxclassic/cvox2/background/panel.html
 --- a/ui/accessibility/extensions/chromevoxclassic/cvox2/background/panel.html
 +++ b/ui/accessibility/extensions/chromevoxclassic/cvox2/background/panel.html
-@@ -6,7 +6,7 @@
+@@ -8,7 +8,7 @@ found in the LICENSE file.
  <meta charset="utf-8">
  <title class="i18n" msgid="panel_title"></title>
  
@@ -46036,18 +44462,6 @@ diff --git a/ui/base/cocoa/underlay_opengl_hosting_window.mm b/ui/base/cocoa/und
    // not do this. Use kWindowSizeDeterminedLater in
    // ui/base/cocoa/window_size_constants.h instead.
    //
-diff --git a/ui/base/ime/PRESUBMIT.py b/ui/base/ime/PRESUBMIT.py
---- a/ui/base/ime/PRESUBMIT.py
-+++ b/ui/base/ime/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for ui/base/ime
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ui/base/ime/character_composer_sequences.txt b/ui/base/ime/character_composer_sequences.txt
 --- a/ui/base/ime/character_composer_sequences.txt
 +++ b/ui/base/ime/character_composer_sequences.txt
@@ -46072,18 +44486,6 @@ diff --git a/ui/events/keycodes/keyboard_code_conversion_mac.mm b/ui/events/keyc
    if (!IsKeypadOrNumericKeyEvent(event) &&
        ([event type] == NSEventTypeKeyDown ||
         [event type] == NSEventTypeKeyUp)) {
-diff --git a/ui/file_manager/base/gn/PRESUBMIT.py b/ui/file_manager/base/gn/PRESUBMIT.py
---- a/ui/file_manager/base/gn/PRESUBMIT.py
-+++ b/ui/file_manager/base/gn/PRESUBMIT.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- """Presubmit script for //ui/file_manager/base/gn.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details on the presubmit API built into depot_tools.
- """
- 
 diff --git a/ui/file_manager/file_manager/common/js/mock_chrome.js b/ui/file_manager/file_manager/common/js/mock_chrome.js
 --- a/ui/file_manager/file_manager/common/js/mock_chrome.js
 +++ b/ui/file_manager/file_manager/common/js/mock_chrome.js
@@ -46105,7 +44507,7 @@ diff --git a/ui/file_manager/file_manager/common/js/mock_chrome.js b/ui/file_man
 diff --git a/ui/file_manager/file_manager/foreground/elements/icons.html b/ui/file_manager/file_manager/foreground/elements/icons.html
 --- a/ui/file_manager/file_manager/foreground/elements/icons.html
 +++ b/ui/file_manager/file_manager/foreground/elements/icons.html
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@ found in the LICENSE file.
      <defs>
        <!--
        These icons are copied from Polymer's iron-icons and kept in sorted order.
@@ -46117,7 +44519,7 @@ diff --git a/ui/file_manager/file_manager/foreground/elements/icons.html b/ui/fi
 diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_table.js b/ui/file_manager/file_manager/foreground/js/ui/file_table.js
 --- a/ui/file_manager/file_manager/foreground/js/ui/file_table.js
 +++ b/ui/file_manager/file_manager/foreground/js/ui/file_table.js
-@@ -1206,7 +1206,7 @@ export class FileTable extends Table {
+@@ -1090,7 +1090,7 @@ export class FileTable extends Table {
          'aria-label',
          strf(
              'DLP_MANAGED_ICON_TOOLTIP',
@@ -46126,32 +44528,6 @@ diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_table.js b/ui/fi
      icon.toggleAttribute('show-link-tooltip');
      icon.toggleAttribute('show-card-tooltip');
      return icon;
-diff --git a/ui/file_manager/file_manager/manifest.json b/ui/file_manager/file_manager/manifest.json
---- a/ui/file_manager/file_manager/manifest.json
-+++ b/ui/file_manager/file_manager/manifest.json
-@@ -30,10 +30,10 @@
-       "fileSystem": ["requestFileSystem", "write"]
-     },
-     "fullscreen",
--    "https://*.googleusercontent.com/",
--    "https://docs.google.com/",
--    "https://drive.google.com/",
--    "https://www.google-analytics.com/",
-+    "https://*.9oo91eusercontent.qjz9zk/",
-+    "https://docs.9oo91e.qjz9zk/",
-+    "https://drive.9oo91e.qjz9zk/",
-+    "https://www.9oo91e-analytics.qjz9zk/",
-     "metricsPrivate",
-     "notifications",
-     "power",
-@@ -256,6 +256,6 @@
-       "page": "background.html"
-     },
-     // chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp is the image loader extension.
--    "content_security_policy": "default-src 'none'; script-src 'self' blob: filesystem: chrome://resources chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp; style-src 'self' blob: filesystem: 'unsafe-inline' chrome://resources; frame-src 'self' blob: filesystem: about:; img-src 'self' blob: filesystem: chrome://resources chrome://theme data: https://docs.google.com https://*.googleusercontent.com chrome://extension-icon chrome://app-icon; media-src 'self' blob: filesystem: https://*.googleusercontent.com; connect-src https://drive.google.com https://www.google-analytics.com chrome://resources; object-src 'self' blob: filesystem:; font-src chrome://resources;"
-+    "content_security_policy": "default-src 'none'; script-src 'self' blob: filesystem: chrome://resources chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp; style-src 'self' blob: filesystem: 'unsafe-inline' chrome://resources; frame-src 'self' blob: filesystem: about:; img-src 'self' blob: filesystem: chrome://resources chrome://theme data: https://docs.9oo91e.qjz9zk https://*.9oo91eusercontent.qjz9zk chrome://extension-icon chrome://app-icon; media-src 'self' blob: filesystem: https://*.9oo91eusercontent.qjz9zk; connect-src https://drive.9oo91e.qjz9zk https://www.9oo91e-analytics.qjz9zk chrome://resources; object-src 'self' blob: filesystem:; font-src chrome://resources;"
-   }
- }
 diff --git a/ui/file_manager/image_loader/piex/Makefile b/ui/file_manager/image_loader/piex/Makefile
 --- a/ui/file_manager/image_loader/piex/Makefile
 +++ b/ui/file_manager/image_loader/piex/Makefile
@@ -46184,21 +44560,6 @@ diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni
  # referencing to this file.
 -# https://source.chromium.org/chromium/chromium/src/+/main:third_party/angle/gni/angle.gni;l=43;drc=2d74170f899b91793bd7967184b4d7d216a3e9ec
 +# https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/main:third_party/angle/gni/angle.gni;l=43;drc=2d74170f899b91793bd7967184b4d7d216a3e9ec
-diff --git a/ui/resources/PRESUBMIT.py b/ui/resources/PRESUBMIT.py
---- a/ui/resources/PRESUBMIT.py
-+++ b/ui/resources/PRESUBMIT.py
-@@ -4,9 +4,9 @@
- 
- """Presubmit script for Chromium UI resources.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools, and see
--https://chromium.googlesource.com/chromium/src/+/main/styleguide/web/web.md
-+https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/styleguide/web/web.md
- for the rules we're checking against here.
- """
- 
 diff --git a/ui/resources/README.txt b/ui/resources/README.txt
 --- a/ui/resources/README.txt
 +++ b/ui/resources/README.txt
@@ -46270,18 +44631,6 @@ diff --git a/ui/strings/ui_strings.grd b/ui/strings/ui_strings.grd
        </message>
  
        <!-- Sharing content types -->
-diff --git a/ui/views/PRESUBMIT.py b/ui/views/PRESUBMIT.py
---- a/ui/views/PRESUBMIT.py
-+++ b/ui/views/PRESUBMIT.py
-@@ -4,7 +4,7 @@
- 
- """Presubmit script for changes affecting //ui/views.
- 
--See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts
- for more details about the presubmit API built into depot_tools.
- """
- 
 diff --git a/ui/views/examples/webview_example.cc b/ui/views/examples/webview_example.cc
 --- a/ui/views/examples/webview_example.cc
 +++ b/ui/views/examples/webview_example.cc
@@ -46309,7 +44658,7 @@ diff --git a/ui/webui/resources/cr_components/app_management/icons.html b/ui/web
 diff --git a/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html b/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
 --- a/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
 +++ b/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html
-@@ -7,7 +7,7 @@
+@@ -3,7 +3,7 @@
      <defs>
        <!--
        Inlined from Polymer's iron-icons to avoid importing everything.
@@ -46318,19 +44667,31 @@ diff --git a/ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard
        -->
        <g id="arrow-forward">
          <path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z">
+diff --git a/ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html b/ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html
+--- a/ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html
++++ b/ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html
+@@ -3,7 +3,7 @@
+     <defs>
+       <!--
+       These icons are copied from Material UI and optimized through SVGOMG
+-      See http://goo.gl/Y1OdAq for instructions on adding additional icons.
++      See http://goo.gl.qjz9zk/Y1OdAq for instructions on adding additional icons.
+       -->
+       <g id="celebration">
+         <path fill="none" d="M0 0h20v20H0z"></path>
 diff --git a/ui/webui/resources/cr_elements/icons.html b/ui/webui/resources/cr_elements/icons.html
 --- a/ui/webui/resources/cr_elements/icons.html
 +++ b/ui/webui/resources/cr_elements/icons.html
-@@ -15,7 +15,7 @@ blurry at 20 px). Please use 20 px icons when available.
+@@ -11,7 +11,7 @@ blurry at 20 px). Please use 20 px icons when available.
    <svg>
      <defs>
        <!--
 -      Keep these in sorted order by id="". See also http://goo.gl/Y1OdAq
 +      Keep these in sorted order by id="". See also http://goo.gl.qjz9zk/Y1OdAq
        -->
-       <g id="domain">
-         <path
-@@ -52,7 +52,7 @@ blurry at 20 px). Please use 20 px icons when available.
+       <g id="block">
+         <path fill-rule="evenodd" clip-rule="evenodd"
+@@ -53,7 +53,7 @@ blurry at 20 px). Please use 20 px icons when available.
      <defs>
        <!--
        These icons are copied from Polymer's iron-icons and kept in sorted order.
@@ -46339,26 +44700,6 @@ diff --git a/ui/webui/resources/cr_elements/icons.html b/ui/webui/resources/cr_e
        -->
        <g id="account-child-invert" viewBox="0 0 48 48">
          <path d="M24 4c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6 2.69-6 6-6z"></path>
-diff --git a/url/third_party/mozilla/LICENSE.txt b/url/third_party/mozilla/LICENSE.txt
---- a/url/third_party/mozilla/LICENSE.txt
-+++ b/url/third_party/mozilla/LICENSE.txt
-@@ -35,14 +35,14 @@ licensed separately as follows:
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
--http://www.mozilla.org/MPL/
-+http://www.m0z111a.qjz9zk/MPL/
- 
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
- 
--The Original Code is mozilla.org code.
-+The Original Code is m0z111a.qjz9zk code.
- 
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
 diff --git a/weblayer/browser/weblayer_security_blocking_page_factory.cc b/weblayer/browser/weblayer_security_blocking_page_factory.cc
 --- a/weblayer/browser/weblayer_security_blocking_page_factory.cc
 +++ b/weblayer/browser/weblayer_security_blocking_page_factory.cc
diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch
index 9bca0f7e..8b812ff2 100644
--- a/build/patches/Block-gateway-attacks-via-websockets.patch
+++ b/build/patches/Block-gateway-attacks-via-websockets.patch
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -674,4 +674,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
+@@ -697,4 +697,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
    return require_safe_types_;
  }
  
@@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -392,6 +392,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -397,6 +397,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
-@@ -274,6 +274,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -275,6 +275,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
      return false;
    }
  
diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch
index 5fb5f0a3..60474da1 100644
--- a/build/patches/Block-qjz9zk-or-trk-requests.patch
+++ b/build/patches/Block-qjz9zk-or-trk-requests.patch
@@ -94,7 +94,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -563,6 +563,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
      }
    }
  
@@ -212,7 +212,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  using base::Time;
  using std::string;
-@@ -587,6 +589,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -597,6 +599,12 @@ URLRequest::URLRequest(const GURL& url,
    // Sanity check out environment.
    DCHECK(base::ThreadTaskRunnerHandle::IsSet());
  
@@ -228,15 +228,15 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
  #include "net/socket/network_binding_client_socket_factory.h"
  #include "net/ssl/ssl_config_service_defaults.h"
  #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
  #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_storage.h"
  #include "net/url_request/url_request_job_factory.h"
-@@ -631,6 +632,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+ #include "net/url_request/url_request_throttler_manager.h"
+@@ -571,6 +572,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }
@@ -244,7 +244,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 +                                  std::make_unique<TrkProtocolHandler>());
    protocol_handlers_.clear();
  
-   storage->set_job_factory(std::move(job_factory));
+   context->set_job_factory(std::move(job_factory));
 diff --git a/url/url_constants.cc b/url/url_constants.cc
 --- a/url/url_constants.cc
 +++ b/url/url_constants.cc
diff --git a/build/patches/Bookmarks-select-all-menu-entry.patch b/build/patches/Bookmarks-select-all-menu-entry.patch
index 879539e8..5c6a2db2 100644
--- a/build/patches/Bookmarks-select-all-menu-entry.patch
+++ b/build/patches/Bookmarks-select-all-menu-entry.patch
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 --- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 +++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
-@@ -21,6 +21,13 @@
+@@ -23,6 +23,13 @@ found in the LICENSE file.
              android:visible="false"
              app:showAsAction="ifRoom"
              app:iconTint="@color/default_icon_color_secondary_tint_list" />
diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch
index 5c712183..fd08f9f0 100644
--- a/build/patches/Bromite-AdBlockUpdaterService.patch
+++ b/build/patches/Bromite-AdBlockUpdaterService.patch
@@ -62,7 +62,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -371,6 +371,7 @@ android_library("chrome_java") {
+@@ -372,6 +372,7 @@ android_library("chrome_java") {
      "//chrome/browser/download/android:java",
      "//chrome/browser/download/android:java_resources",
      "//chrome/browser/enterprise/util:java",
@@ -73,7 +73,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -452,6 +452,7 @@ chrome_java_resources = [
+@@ -447,6 +447,7 @@ chrome_java_resources = [
    "java/res/layout/account_chooser_dialog_title.xml",
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
@@ -81,7 +81,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_unmask_prompt.xml",
-@@ -647,6 +648,7 @@ chrome_java_resources = [
+@@ -643,6 +644,7 @@ chrome_java_resources = [
    "java/res/values/values.xml",
    "java/res/xml/about_chrome_preferences.xml",
    "java/res/xml/account_management_preferences.xml",
@@ -92,15 +92,15 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -903,6 +903,8 @@ chrome_java_sources = [
+@@ -905,6 +905,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
 +  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
 +  "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
    "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
+   "java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java",
    "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java",
-   "java/src/org/chromium/chrome/browser/printing/TabPrinter.java",
 diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/java/res/layout/adblock_editor.xml
 new file mode 100644
 --- /dev/null
@@ -176,7 +176,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -178,6 +178,24 @@
+@@ -180,6 +180,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -204,7 +204,7 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -25,6 +25,8 @@
+@@ -27,6 +27,8 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
@@ -246,7 +246,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -42,6 +42,11 @@
+@@ -44,6 +44,11 @@ found in the LICENSE file.
          android:key="privacy"
          android:order="10"
          android:title="@string/prefs_privacy_security"/>
@@ -435,7 +435,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -12179,6 +12179,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12253,6 +12253,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -506,7 +506,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1078,6 +1078,26 @@ BrowserProcessImpl::component_updater() {
+@@ -1071,6 +1071,26 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -555,7 +555,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1728,6 +1728,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1736,6 +1736,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
    // will be initialized when the app enters foreground mode.
    variations_service->set_policy_pref_service(profile->GetPrefs());
  
@@ -593,7 +593,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -271,6 +271,14 @@ public class CachedFeatureFlags {
+@@ -273,6 +273,14 @@ public class CachedFeatureFlags {
                  ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL));
      }
  
@@ -608,7 +608,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      /**
       * Caches flags that must take effect on startup but are set via native code.
       */
-@@ -517,5 +525,7 @@ public class CachedFeatureFlags {
+@@ -519,5 +527,7 @@ public class CachedFeatureFlags {
      @NativeMethods
      interface Natives {
          boolean isNetworkServiceWarmUpEnabled();
@@ -619,7 +619,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -454,6 +454,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+@@ -421,6 +421,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
        ssl_config_service_manager_(local_state_),
        proxy_config_monitor_(local_state_),
        stub_resolver_config_reader_(local_state_) {
@@ -628,7 +628,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
  #if !BUILDFLAG(IS_ANDROID)
    // QuicAllowed was not part of Android policy.
    const base::Value* value =
-@@ -532,6 +534,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -499,6 +501,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
  void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
  
@@ -678,7 +678,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 --- a/chrome/common/pref_names.cc
 +++ b/chrome/common/pref_names.cc
-@@ -2338,6 +2338,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2350,6 +2350,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  // capture devices without prompt.
  const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
  
@@ -702,7 +702,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -271,8 +271,8 @@
+@@ -295,8 +295,8 @@
    <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
      This site shows intrusive or misleading ads
    </message>
@@ -1680,7 +1680,7 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,72 +55,7 @@ class CommaSeparatedStrings {
+@@ -54,72 +54,7 @@ class CommaSeparatedStrings {
    const std::vector<base::StringPiece> pieces_;
  };
  
@@ -1754,7 +1754,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
    // If ad tagging is enabled, turn on the dryrun automatically.
    bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
    const struct {
-@@ -128,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -127,23 +62,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
      bool enabled_by_default;
      Configuration (*factory_method)();
    } kAvailablePresetConfigurations[] = {
@@ -1780,7 +1780,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
        enabled_configurations.push_back(available_preset.factory_method());
      }
    }
-@@ -152,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -151,46 +79,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
    return enabled_configurations;
  }
  
diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch
index 355a7ed0..5b5bee9d 100644
--- a/build/patches/Bromite-auto-updater.patch
+++ b/build/patches/Bromite-auto-updater.patch
@@ -49,7 +49,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -2182,6 +2182,9 @@ if (enable_java_templates) {
+@@ -2183,6 +2183,9 @@ if (enable_java_templates) {
        if (defined(testonly) && testonly) {
          defines += [ "_IS_FOR_TEST" ]
        }
@@ -62,7 +62,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -809,6 +809,9 @@ chrome_java_sources = [
+@@ -811,6 +811,9 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
    "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
    "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
@@ -75,7 +75,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml
 --- a/chrome/android/java/res/xml/about_chrome_preferences.xml
 +++ b/chrome/android/java/res/xml/about_chrome_preferences.xml
-@@ -7,6 +7,11 @@
+@@ -9,6 +9,11 @@ found in the LICENSE file.
      <Preference
          android:key="application_version"
          android:title="@string/application_version_title" />
@@ -1250,7 +1250,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -254,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kNewWindowAppMenu,
      &kNotificationPermissionVariant,
      &kPageAnnotationsService,
@@ -1258,7 +1258,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kBookmarksImprovedSaveFlow,
      &kBookmarksRefresh,
      &kBackGestureRefactorAndroid,
-@@ -680,6 +681,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{
+@@ -692,6 +693,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{
  const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -1282,7 +1282,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -380,6 +380,7 @@ public abstract class ChromeFeatureList {
+@@ -383,6 +383,7 @@ public abstract class ChromeFeatureList {
              "IncognitoReauthenticationForAndroid";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
      public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization";
@@ -1293,7 +1293,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1887,6 +1887,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1893,6 +1893,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
          Chrome updates are no longer supported for this version of Android
        </message>
@@ -1306,7 +1306,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Account management UI strings. -->
        <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
-@@ -3519,7 +3525,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3528,7 +3534,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- Main menu items -->
        <message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1318,7 +1318,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
          Newer version is available
-@@ -3530,6 +3539,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3539,6 +3548,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
          Android version is unsupported
        </message>
diff --git a/build/patches/Bromite-package-name.patch b/build/patches/Bromite-package-name.patch
index 9f124f9b..f2fff898 100644
--- a/build/patches/Bromite-package-name.patch
+++ b/build/patches/Bromite-package-name.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -46,7 +46,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+@@ -42,7 +42,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
    assert(current_toolchain != android_secondary_abi_toolchain)
  }
  
diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch
index dc51fd86..9fe0030a 100644
--- a/build/patches/Client-hints-overrides.patch
+++ b/build/patches/Client-hints-overrides.patch
@@ -12,13 +12,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  content/browser/client_hints/client_hints.cc             | 3 ++-
  content/browser/loader/navigation_url_loader_impl.cc     | 5 +++++
  content/common/user_agent.cc                             | 9 +--------
- content/public/common/content_features.cc                | 2 +-
+ content/public/common/content_features.cc                | 4 ++--
  services/network/public/cpp/client_hints.cc              | 1 +
  services/network/public/cpp/features.cc                  | 4 ++--
  third_party/blink/common/client_hints/client_hints.cc    | 1 +
  .../blink/common/client_hints/enabled_client_hints.cc    | 4 +++-
- third_party/blink/common/features.cc                     | 4 ++--
- 10 files changed, 19 insertions(+), 18 deletions(-)
+ 9 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
 --- a/components/embedder_support/user_agent_utils.cc
@@ -37,7 +36,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -435,7 +435,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers,
+@@ -462,7 +462,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers,
                      is_dark_mode ? "dark" : "light");
  }
  
@@ -50,7 +49,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1030,6 +1030,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1025,6 +1025,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -84,12 +83,14 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -233,7 +233,7 @@ const base::Feature kCrashReporting{"CrashReporting",
+@@ -229,8 +229,8 @@ const base::Feature kCrashReporting{"CrashReporting",
+ 
  // Enables support for the `Critical-CH` response header.
  // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
- const base::Feature kCriticalClientHint{"CriticalClientHint",
+-const base::Feature kCriticalClientHint{"CriticalClientHint",
 -                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
++const base::Feature kCriticalClientHint{"CriticalClientHint",                 // disabled by default
++                                        base::FEATURE_DISABLED_BY_DEFAULT};   // on Bromite
  
  // Enable debugging the issue crbug.com/1201355
  const base::Feature kDebugHistoryInterventionNoUserActivation{
@@ -113,7 +114,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
  // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3
 -const base::Feature kAcceptCHFrame{"AcceptCHFrame",
 -                                   base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kAcceptCHFrame{"AcceptCHFrame",                    // disabled by default
++const base::Feature kAcceptCHFrame{"AcceptCHFrame",                     // disabled by default
 +                                   base::FEATURE_DISABLED_BY_DEFAULT};  // in Bromite
  
  const base::Feature kSCTAuditingRetryReports{"SCTAuditingRetryReports",
@@ -157,26 +158,5 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi
    for (const auto& elem : network::GetClientHintToNameMap()) {
      const auto& type = elem.first;
      if (IsEnabled(type))
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
---- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -222,7 +222,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent",
- 
- // Enables User-Agent Client Hints
- const base::Feature kUserAgentClientHint{"UserAgentClientHint",
--                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Handle prefers-color-scheme user preference media feature via client hints.
- const base::Feature kPrefersColorSchemeClientHintHeader{
-@@ -606,7 +606,7 @@ const base::Feature kAudioWorkletThreadRealtimePriority{
- const base::Feature kLightweightNoStatePrefetch {
-   "LightweightNoStatePrefetch",
- #if BUILDFLAG(IS_ANDROID)
--      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif
 --
 2.25.1
diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch
index 240bf30b..e82465b6 100644
--- a/build/patches/Content-settings-infrastructure.patch
+++ b/build/patches/Content-settings-infrastructure.patch
@@ -41,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -78,6 +78,10 @@ android_library("java") {
+@@ -85,6 +85,10 @@ android_library("java") {
      "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java",
      "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java"
    ]
@@ -655,7 +655,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      /**
-@@ -564,6 +567,8 @@ public class ContentSettingsResources {
+@@ -570,6 +573,8 @@ public class ContentSettingsResources {
       *         Blocked states, in that order.
       */
      public static int[] getTriStateSettingDescriptionIDs(int contentType) {
@@ -667,7 +667,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -236,6 +236,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -247,6 +247,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          @ContentSettingValues
          Integer contentSetting = website.site().getContentSetting(
                  browserContextHandle, mCategory.getContentSettingsType());
@@ -678,15 +678,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (contentSetting != null) {
              if (mCategory.getContentSettingsType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
                  return ContentSettingValues.ALLOW != contentSetting;
-@@ -391,6 +395,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -402,6 +406,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                  ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS))
                  : null;
  
 +        BromiteCustomContentSettingImpl.onActivityCreated(this);
          configureGlobalToggles();
- 
-         setHasOptionsMenu(true);
-@@ -490,6 +495,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+         if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
+             RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
+@@ -508,6 +513,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          BrowserContextHandle browserContextHandle =
                  getSiteSettingsDelegate().getBrowserContextHandle();
          PrefService prefService = UserPrefs.get(browserContextHandle);
@@ -698,7 +698,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (BINARY_TOGGLE_KEY.equals(preference.getKey())) {
              assert !mCategory.isManaged();
  
-@@ -645,6 +655,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -672,6 +682,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              resource = R.string.website_settings_category_timezone_override_allowed;
          }
@@ -707,7 +707,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          assert resource > 0;
          return getString(resource);
      }
-@@ -757,6 +769,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -790,6 +802,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              allowSpecifyingExceptions = true;
          } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              allowSpecifyingExceptions = true;
@@ -717,7 +717,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
          if (allowSpecifyingExceptions) {
              getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(),
-@@ -928,6 +943,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -961,6 +976,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              TriStateSiteSettingsPreference triStateToggle =
                      (TriStateSiteSettingsPreference) getPreferenceScreen().findPreference(
                              TRI_STATE_TOGGLE_KEY);
@@ -728,7 +728,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (triStateToggle != null)
                return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
  
-@@ -1006,6 +1025,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1039,6 +1058,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          if (mCategory.getType() != SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              screen.removePreference(screen.findPreference(TIMEOVERRIDE_INFO_TEXT));
          }
@@ -736,7 +736,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
          if (permissionBlockedByOs) {
              maybeShowOsWarning(screen);
-@@ -1132,7 +1152,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1170,7 +1190,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                  getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
          int[] descriptionIds =
                  ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@@ -745,7 +745,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private void configureTimeOverrideStateToggle(
-@@ -1243,6 +1263,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1281,6 +1301,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          @ContentSettingValues
          Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
  
@@ -758,12 +758,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +        }
 +
          CharSequence[] descriptions = new String[2];
-         descriptions[0] =
-                 getString(ContentSettingsResources.getSiteSummary(contentSettingsType,
+         descriptions[0] = getString(ContentSettingsResources.getSiteSummary(
+                 ContentSettingValues.ALLOW, contentSettingsType));
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -41,6 +41,7 @@ import org.chromium.content_public.browser.BrowserContextHandle;
+@@ -41,6 +41,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.Map;
@@ -790,7 +790,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              Preference preference = new ChromeSwitchPreference(getStyledContext());
              preference.setKey(getPreferenceKey(type));
  
-@@ -905,16 +907,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -908,16 +910,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
  
      private void setupContentSettingsPreference(Preference preference,
              @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) {
@@ -818,7 +818,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          switchPreference.setOnPreferenceChangeListener(this);
          @ContentSettingsType
          int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
-@@ -1163,7 +1171,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -1169,7 +1177,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
  
          mSite.setContentSetting(browserContextHandle, type, permission);
@@ -929,7 +929,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -265,6 +265,10 @@ public final class Website implements Serializable {
+@@ -260,6 +260,10 @@ public final class Website implements Serializable {
                          /*isEmbargoed=*/false);
                  setContentSettingException(type, exception);
              }
@@ -955,7 +955,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
-@@ -227,7 +227,7 @@ public class WebsitePreferenceBridge {
+@@ -225,7 +225,7 @@ public class WebsitePreferenceBridge {
              case ContentSettingsType.TIMEZONE_OVERRIDE:
                  return true;
              default:
@@ -1120,7 +1120,7 @@ diff --git a/components/content_settings/core/browser/website_settings_registry.
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
-@@ -109,6 +109,7 @@ public class PermissionParamsListBuilder {
+@@ -104,6 +104,7 @@ public class PermissionParamsListBuilder {
                  permissionParams.allowed = true;
                  break;
              case ContentSettingValues.BLOCK:
@@ -1153,8 +1153,8 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 +
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
-   std::map<ContentSettingsType, bool>
-@@ -242,6 +251,15 @@ absl::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
+ 
+@@ -236,6 +245,15 @@ absl::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
      // The images content setting should show up if it is blocked globally
      // to give users an easy way to create exceptions.
      return permission.default_setting;
@@ -1178,10 +1178,10 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
  #include "components/browsing_data/content/local_storage_helper.h"
  #include "components/content_settings/browser/page_specific_content_settings.h"
 +#include "components/content_settings/core/browser/website_settings_registry.h"
+ #include "components/content_settings/browser/ui/cookie_controls_controller.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/content_settings_utils.h"
- #include "components/content_settings/core/browser/host_content_settings_map.h"
-@@ -163,6 +164,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
+@@ -164,6 +165,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
      return true;
    }
  
@@ -1197,7 +1197,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
    const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord();
  #if BUILDFLAG(IS_ANDROID)
    // Special geolocation DSE settings apply only on Android, so make sure it
-@@ -1066,7 +1076,18 @@ void PageInfo::PresentSitePermissions() {
+@@ -1112,7 +1122,18 @@ void PageInfo::PresentSitePermissions() {
    PermissionInfo permission_info;
    HostContentSettingsMap* content_settings = GetContentSettings();
    DCHECK(web_contents_);
@@ -1228,7 +1228,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
  #include "components/omnibox/common/omnibox_features.h"
  #include "components/page_info/core/features.h"
  #include "components/page_info/page_info_ui_delegate.h"
-@@ -569,6 +570,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -572,6 +573,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id);
    }
@@ -1241,7 +1241,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    NOTREACHED();
    return std::u16string();
  }
-@@ -580,6 +587,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
+@@ -583,6 +590,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
    }
@@ -1254,7 +1254,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    NOTREACHED();
    return std::u16string();
  }
-@@ -967,6 +980,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -970,6 +983,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
      if (info.type == type)
        return true;
    }
diff --git a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
index dfdcdfcd..52a2ae3b 100644
--- a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
+++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
 --- a/chrome/android/java/res/layout/url_bar.xml
 +++ b/chrome/android/java/res/layout/url_bar.xml
-@@ -13,5 +13,6 @@
+@@ -15,5 +15,6 @@ found in the LICENSE file.
      android:singleLine="true"
      android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
      android:textSize="@dimen/location_bar_url_text_size"
@@ -964,10 +964,10 @@ new file mode 100644
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
-@@ -215,8 +215,7 @@ public abstract class UrlBar extends AutocompleteEditText {
-         // the first draw.
-         setFocusable(false);
-         setFocusableInTouchMode(false);
+@@ -222,8 +222,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+             setFocusableInTouchMode(mAllowFocus);
+         });
+ 
 -        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI
 -                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
 +        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch
index 19e6ff74..516d7efd 100644
--- a/build/patches/Disable-AGSA-by-default.patch
+++ b/build/patches/Disable-AGSA-by-default.patch
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -379,7 +379,6 @@ android_library("chrome_java") {
+@@ -380,7 +380,6 @@ android_library("chrome_java") {
      "//chrome/browser/first_run/android:java",
      "//chrome/browser/flags:java",
      "//chrome/browser/fullscreen/android:java",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/history_clusters:java",
      "//chrome/browser/history_clusters:java_resources",
      "//chrome/browser/image_descriptions:java",
-@@ -1010,7 +1009,6 @@ robolectric_binary("chrome_junit_tests") {
+@@ -1017,7 +1016,6 @@ robolectric_binary("chrome_junit_tests") {
      "//chrome/browser/flags:flags_junit_tests",
      "//chrome/browser/flags:java",
      "//chrome/browser/fullscreen/android:java",
@@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/history_clusters:java",
      "//chrome/browser/image_descriptions:java",
      "//chrome/browser/image_editor/public:java",
-@@ -1529,7 +1527,6 @@ android_library("chrome_test_java") {
+@@ -1542,7 +1540,6 @@ android_library("chrome_test_java") {
      "//chrome/browser/first_run/android:java",
      "//chrome/browser/flags:java",
      "//chrome/browser/fullscreen/android:java",
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -255,8 +254,6 @@ public class IntentHandler {
+@@ -261,8 +260,6 @@ public class IntentHandler {
      private static int sReferrerId;
      private static String sPendingIncognitoUrl;
  
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
      private static final String PACKAGE_GMAIL = "com.google.android.gm";
      private static final String PACKAGE_PLUS = "com.google.android.apps.plus";
      private static final String PACKAGE_HANGOUTS = "com.google.android.talk";
-@@ -486,8 +483,6 @@ public class IntentHandler {
+@@ -492,8 +489,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -111,10 +111,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
+@@ -112,10 +112,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
  import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;
  import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -100,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.history.HistoryManagerUtils;
  import org.chromium.chrome.browser.init.AsyncInitializationActivity;
  import org.chromium.chrome.browser.init.ProcessInitializationHandler;
-@@ -371,8 +367,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -373,8 +369,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
      private LaunchCauseMetrics mLaunchCauseMetrics;
  
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.
      private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =
              new ArrayList<>();
-@@ -1166,10 +1160,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1176,10 +1170,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
      @Override
      public void onStopWithNative() {
@@ -120,11 +120,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          super.onStopWithNative();
      }
  
-@@ -1260,23 +1250,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             FontSizePrefs.getInstance(Profile.getLastUsedRegularProfile())
+@@ -1271,23 +1261,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      .recordUserFontPrefOnStartup();
          });
--
+ 
 -        // GSA connection is not needed on low-end devices because Icing is disabled.
 -        if (!SysUtils.isLowEndDevice()) {
 -            if (isActivityFinishingOrDestroyed()) return;
@@ -141,9 +140,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 -                mGSAAccountChangeListener.connect();
 -            });
 -        }
+-
+         DeferredStartupHandler.getInstance().addDeferredTask(
+                 () -> { MemoryPurgeManager.getInstance().start(); });
      }
- 
-     /**
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -262,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -659,7 +659,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{
+@@ -671,7 +671,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{
      "DuetTabStripIntegrationAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa",
@@ -274,7 +274,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -71,7 +71,7 @@ public class CachedFeatureFlags {
+@@ -72,7 +72,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true)
                      .put(ChromeFeatureList.ELASTIC_OVERSCROLL, true)
                      .put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true)
@@ -294,7 +294,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
      "//chrome/browser/history_clusters:java",
      "//chrome/browser/language/android:java",
      "//chrome/browser/lens:java",
-@@ -428,7 +427,6 @@ robolectric_library("junit") {
+@@ -430,7 +429,6 @@ robolectric_library("junit") {
      "//chrome/browser/commerce/merchant_viewer/android:java",
      "//chrome/browser/device:java",
      "//chrome/browser/flags:java",
diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch
index 3695fd7c..d2371af4 100644
--- a/build/patches/Disable-Accessibility-service-by-default.patch
+++ b/build/patches/Disable-Accessibility-service-by-default.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1494,6 +1494,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1500,6 +1500,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_SAFETY_CHECK_BUTTON" desc="Text for the button to start Safety check.">
          Check now
        </message>
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -5,6 +5,11 @@
+@@ -7,6 +7,11 @@ found in the LICENSE file.
  
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
  
diff --git a/build/patches/Disable-AsyncDNS-by-default.patch b/build/patches/Disable-AsyncDNS-by-default.patch
index b8396913..552f3272 100644
--- a/build/patches/Disable-AsyncDNS-by-default.patch
+++ b/build/patches/Disable-AsyncDNS-by-default.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -81,12 +81,8 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
+@@ -86,12 +86,8 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
  
  // Enables the built-in DNS resolver.
  const base::Feature kAsyncDns {
diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
index b958e7a5..08c2b8ca 100644
--- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
+++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -746,7 +746,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -742,7 +742,7 @@ const base::Feature kMediaDrmPersistentLicense{
  // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
  // which will trigger provisioning process after MediaDrmBridge is created.
  const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
index 0faa50f5..5a2d6c5e 100644
--- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch
+++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -66,10 +66,6 @@
+@@ -68,10 +68,6 @@ found in the LICENSE file.
          android:title="@string/open_external_links_incognito_title"
          android:summary="@string/open_external_links_incognito_summary"
          android:defaultValue="false" />
@@ -82,9 +82,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2982,6 +2982,9 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed(
-     const url::Origin* impression_origin,
-     const url::Origin* conversion_origin,
+@@ -3060,6 +3060,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+     const url::Origin* source_origin,
+     const url::Origin* destination_origin,
      const url::Origin* reporting_origin) {
 +  // make sure that this is always disabled in Bromite even if privacy sandbox is already disabled in the prefs
 +  if ((true))
@@ -118,7 +118,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -66,7 +66,7 @@ namespace privacy_sandbox {
+@@ -63,7 +63,7 @@ namespace privacy_sandbox {
  
  void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
@@ -157,12 +157,12 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
 -bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) {
 +bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
 +  if ((true)) return false;
-   auto* blocked_topics =
+   const auto& blocked_topics =
        pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
  
 @@ -181,9 +182,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
  
- bool PrivacySandboxSettings::IsConversionMeasurementAllowed(
+ bool PrivacySandboxSettings::IsAttributionReportingAllowed(
      const url::Origin& top_frame_origin,
 -    const url::Origin& reporting_origin) const {
 -  return IsPrivacySandboxEnabledForContext(reporting_origin.GetURL(),
@@ -171,7 +171,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
 +  return false;
  }
  
- bool PrivacySandboxSettings::ShouldSendConversionReport(
+ bool PrivacySandboxSettings::MaySendAttributionReport(
 @@ -277,7 +277,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
  }
  
@@ -238,7 +238,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
 diff --git a/components/privacy_sandbox/privacy_sandbox_settings.h b/components/privacy_sandbox/privacy_sandbox_settings.h
 --- a/components/privacy_sandbox/privacy_sandbox_settings.h
 +++ b/components/privacy_sandbox/privacy_sandbox_settings.h
-@@ -221,7 +221,6 @@ class PrivacySandboxSettings : public KeyedService {
+@@ -220,7 +220,6 @@ class PrivacySandboxSettings : public KeyedService {
    scoped_refptr<content_settings::CookieSettings> cookie_settings_;
    raw_ptr<PrefService> pref_service_;
    PrefChangeRegistrar pref_change_registrar_;
diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch
index 7562cbc1..0f269007 100644
--- a/build/patches/Disable-PrivacyGuide.patch
+++ b/build/patches/Disable-PrivacyGuide.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -439,8 +439,8 @@ const base::Feature kHaTSDesktopDevToolsIssuesCSP{
+@@ -444,8 +444,8 @@ const base::Feature kHaTSDesktopDevToolsIssuesCSP{
  
  // Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
  const base::Feature kHappinessTrackingSurveysForDesktopPrivacyGuide{
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  const base::FeatureParam<base::TimeDelta>
      kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
          &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
-@@ -761,11 +761,11 @@ const base::Feature kPrefixWebAppWindowsWithAppName{
+@@ -777,11 +777,11 @@ const base::Feature kPredictivePrefetchingAllowedOnAllConnectionTypes{
  const base::Feature kPrerenderFallbackToPreconnect{
      "PrerenderFallbackToPreconnect", base::FEATURE_ENABLED_BY_DEFAULT};
  
diff --git a/build/patches/Disable-StartSurface-feature.patch b/build/patches/Disable-StartSurface-feature.patch
new file mode 100644
index 00000000..d328913b
--- /dev/null
+++ b/build/patches/Disable-StartSurface-feature.patch
@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 16 Nov 2022 11:18:07 +0100
+Subject: Disable StartSurface feature
+
+This feature would normally show a search box but leads to crashes.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
++++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -936,8 +936,8 @@ const base::Feature kTrustedWebActivityQualityEnforcementWarning{
+ const base::Feature kShowExtendedPreloadingSetting{
+     "ShowExtendedPreloadingSetting", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+-const base::Feature kStartSurfaceAndroid{"StartSurfaceAndroid",
+-                                         base::FEATURE_ENABLED_BY_DEFAULT};
++const base::Feature kStartSurfaceAndroid{"StartSurfaceAndroid",                // must be disabled
++                                         base::FEATURE_DISABLED_BY_DEFAULT};   // in Bromite
+ 
+ const base::Feature kFeedPositionAndroid{"FeedPositionAndroid",
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+--
+2.25.1
diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch
index 29ec2e09..8c76600e 100644
--- a/build/patches/Disable-TLS-resumption.patch
+++ b/build/patches/Disable-TLS-resumption.patch
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4806,6 +4806,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4896,6 +4896,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
       flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
       FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1035,6 +1035,14 @@ const char kEnableTLS13EarlyDataDescription[] =
+@@ -1015,6 +1015,14 @@ const char kEnableTLS13EarlyDataDescription[] =
      "during the handshake when resuming a connection to a compatible TLS 1.3 "
      "server.";
  
@@ -73,7 +73,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -596,6 +596,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
+@@ -580,6 +580,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
  extern const char kEnableTLS13EarlyDataName[];
  extern const char kEnableTLS13EarlyDataDescription[];
  
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -108,6 +108,12 @@ const base::Feature kUseDnsHttpsSvcbAlpn{"UseDnsHttpsSvcbAlpn",
+@@ -110,6 +110,12 @@ const base::Feature kUseDnsHttpsSvcbAlpn{"UseDnsHttpsSvcbAlpn",
  const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
                                            base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -132,7 +132,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
 --- a/net/quic/quic_stream_factory.cc
 +++ b/net/quic/quic_stream_factory.cc
-@@ -74,6 +74,7 @@
+@@ -73,6 +73,7 @@
  #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h"
  #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
  #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -140,7 +140,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -247,6 +248,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
+@@ -246,6 +247,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
  
  }  // namespace
  
@@ -179,10 +179,10 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
  // Refcounted class that owns quic::QuicCryptoClientConfig and tracks how many
  // consumers are using it currently. When the last reference is freed, the
  // QuicCryptoClientConfigHandle informs the owning QuicStreamFactory, moves it
-@@ -2242,7 +2275,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
+@@ -2254,7 +2287,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
                sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
-               actual_network_isolation_key),
+               actual_network_anonymization_key),
 -          std::make_unique<quic::QuicClientSessionCache>(), this);
 +          std::make_unique<BromiteSessionCache>(), this);
  
@@ -200,7 +200,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +    LOG(INFO) << "SSL Log: "
 +              << tag
 +              << " host: " << host_and_port_.ToString()
-+              << " NIK: " << ssl_config_.network_isolation_key.ToDebugString();
++              << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString();
 +    return;
 +  }
 +
@@ -214,7 +214,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +  LOG(INFO) << "SSL Log: "
 +            << tag
 +            << " host: " << host_and_port_.ToString()
-+            << " NIK: " << ssl_config_.network_isolation_key.ToDebugString()
++            << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString()
 +            << " sessionid: " << base::HexEncode(session_id, len)
 +            << (ticklen > 0 ? " ticket:" + base::HexEncode(ticket, ticklen) : "");
 +}
@@ -225,7 +225,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -787,6 +813,8 @@ int SSLClientSocketImpl::Init() {
+@@ -786,6 +812,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -234,7 +234,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    }
  
    transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -1075,6 +1103,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -1074,6 +1102,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -270,7 +270,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
  
    // Measure TLS connections that implement the renegotiation_info extension.
-@@ -1748,6 +1805,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1746,6 +1803,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {
diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch
index bf9f02af..fcd6bdc3 100644
--- a/build/patches/Disable-all-predictors-code.patch
+++ b/build/patches/Disable-all-predictors-code.patch
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -361,7 +361,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -324,7 +324,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  void OptimizationGuideKeyedService::RegisterOptimizationTypes(
      const std::vector<optimization_guide::proto::OptimizationType>&
          optimization_types) {
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -728,8 +728,8 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
+@@ -747,8 +747,8 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
  
  // Enables using the prediction service for permission prompts. We will keep
  // this feature in order to allow us to update the holdback chance via finch.
@@ -55,7 +55,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  
  // The holdback chance is 30% but it can also be configured/updated
  // through finch if needed.
-@@ -740,7 +740,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
+@@ -759,7 +759,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
  
  // Enables using the prediction service for geolocation permission prompts.
  const base::Feature kPermissionGeolocationPredictions{
@@ -78,7 +78,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -361,6 +361,7 @@ void HintsManager::Shutdown() {
+@@ -360,6 +360,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -86,7 +86,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1272,6 +1273,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1271,6 +1272,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      proto::OptimizationType optimization_type,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -238,7 +238,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -60,12 +60,12 @@ const base::Feature kPermissionChipRequestTypeSensitive{
+@@ -66,12 +66,12 @@ const base::Feature kPermissionChipRequestTypeSensitive{
  // When enabled, use the value of the `service_url` FeatureParam as the url
  // for the Web Permission Predictions Service.
  const base::Feature kPermissionPredictionServiceUseUrlOverride{
@@ -253,12 +253,12 @@ diff --git a/components/permissions/features.cc b/components/permissions/feature
 +    "PermissionOnDeviceNotificationPredictions",            // disabled by default
 +    base::FEATURE_DISABLED_BY_DEFAULT};                     // in Bromite
  
- #if BUILDFLAG(IS_ANDROID)
- 
+ const base::Feature kPermissionOnDeviceGeolocationPredictions{
+     "PermissionOnDeviceGeolocationPredictions",
 diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc
 --- a/components/segmentation_platform/public/features.cc
 +++ b/components/segmentation_platform/public/features.cc
-@@ -27,7 +27,7 @@ const base::Feature kSegmentationPlatformLowEngagementFeature{
+@@ -30,7 +30,7 @@ const base::Feature kShoppingUserSegmentFeature{
  const base::Feature kSegmentationPlatformFeedSegmentFeature{
    "SegmentationPlatformFeedSegmentFeature",
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
@@ -270,7 +270,7 @@ diff --git a/components/segmentation_platform/public/features.cc b/components/se
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -245,7 +245,7 @@ const base::Feature kViewportHeightClientHintHeader{
+@@ -206,7 +206,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent",
  const base::Feature kNavigationPredictor {
    "NavigationPredictor",
  #if BUILDFLAG(IS_ANDROID)
diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch
index b297c5d9..aff77eaa 100644
--- a/build/patches/Disable-all-promo-dialogs.patch
+++ b/build/patches/Disable-all-promo-dialogs.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -873,7 +873,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -850,7 +850,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
       * displayed.
       */
      private boolean triggerPromo(boolean intentWithEffect) {
@@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
                  return false;
              }
-@@ -908,8 +908,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -885,8 +885,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                  preferenceManager.writeBoolean(
                          ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
              }
@@ -29,6 +29,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 +            return false;
      }
  
-     private boolean maybeShowPromo() {
+     @VisibleForTesting
 --
 2.25.1
diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch
index 3115b9fa..5ddc4dde 100644
--- a/build/patches/Disable-conversion-measurement-api.patch
+++ b/build/patches/Disable-conversion-measurement-api.patch
@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -490,7 +490,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
+@@ -502,7 +502,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
                                               base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kAppToWebAttribution{"AppToWebAttribution",
@@ -139,19 +139,19 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
 --- a/content/browser/attribution_reporting/attribution_storage_sql.cc
 +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
-@@ -425,7 +425,7 @@ void AttributionStorageSql::RunInMemoryForTesting() {
+@@ -416,7 +416,7 @@ DestinationLimitResult GetDestinationLimitResult(
+   }
  }
  
- // static
--bool AttributionStorageSql::g_run_in_memory_ = false;
-+bool AttributionStorageSql::g_run_in_memory_ = true;
+-bool g_run_in_memory = false;
++bool g_run_in_memory = true;
+ 
+ }  // namespace
  
- // static
- bool AttributionStorageSql::DeleteStorageForTesting(
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1317,12 +1317,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1315,12 +1315,7 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -179,7 +179,7 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -109,7 +109,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries",
+@@ -107,7 +107,7 @@ const base::Feature kBlockingDownloadsInAdFrameWithoutUserActivation{
  
  // Controls whether the Conversion Measurement API infrastructure is enabled.
  const base::Feature kConversionMeasurement{"ConversionMeasurement",
@@ -191,7 +191,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -106,6 +106,13 @@
+@@ -176,6 +176,13 @@
    },
  
    data: [
diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch
index 5cd55788..c4e1a222 100644
--- a/build/patches/Disable-crash-reporting.patch
+++ b/build/patches/Disable-crash-reporting.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -227,8 +227,8 @@ const base::Feature kCooperativeScheduling{"CooperativeScheduling",
+@@ -224,8 +224,8 @@ const base::Feature kCooperativeScheduling{"CooperativeScheduling",
  
  // Enables crash reporting via Reporting API.
  // https://www.w3.org/TR/reporting/#crash-report
diff --git a/build/patches/Disable-feeds-support-by-default.patch b/build/patches/Disable-feeds-support-by-default.patch
index a44665be..ddf4008c 100644
--- a/build/patches/Disable-feeds-support-by-default.patch
+++ b/build/patches/Disable-feeds-support-by-default.patch
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -77,7 +77,7 @@ public class CachedFeatureFlags {
+@@ -78,7 +78,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false)
                      .put(ChromeFeatureList.INSTANCE_SWITCHER, true)
                      .put(ChromeFeatureList.INSTANT_START, false)
diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch
index a263275a..5c9d95a6 100644
--- a/build/patches/Disable-fetching-of-all-field-trials.patch
+++ b/build/patches/Disable-fetching-of-all-field-trials.patch
@@ -53,7 +53,7 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s
 diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 --- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 +++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-@@ -51,6 +51,8 @@ void CreateFallbackSamplingTrial(const std::string& trial_name,
+@@ -52,6 +52,8 @@ void CreateFallbackSamplingTrial(const std::string& trial_name,
                                   const std::string& feature_name,
                                   const int sampled_in_rate_per_mille,
                                   base::FeatureList* feature_list) {
@@ -183,7 +183,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -235,17 +235,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -220,17 +220,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
@@ -202,8 +202,8 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 +  return false;
  }
  
- std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
-@@ -599,7 +590,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+ // Returns the already downloaded first run seed, and clear the seed from the
+@@ -589,7 +580,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
    // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
    // had a chance to run yet from the previous request. In this case, don't
    // start a new request and just let the previous one finish.
@@ -215,7 +215,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -175,13 +175,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
+@@ -176,13 +176,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
  WebVector<int> CopyInitiatorOriginTrials(
      const Vector<OriginTrialFeature>& initiator_origin_trial_features) {
    WebVector<int> result;
diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch
index 27a7bf9b..057afc0b 100644
--- a/build/patches/Disable-idle-detection.patch
+++ b/build/patches/Disable-idle-detection.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -438,7 +438,7 @@ const base::Feature kIdentityInCanMakePaymentEventFeature{
+@@ -444,7 +444,7 @@ const base::Feature kIdentityInCanMakePaymentEventFeature{
  // this feature, the experimental web platform features flag should be set,
  // or the site should obtain an Origin Trial token.
  const base::Feature kIdleDetection{"IdleDetection",
diff --git a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch
index c52b7317..f4710eee 100644
--- a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch
+++ b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
 --- a/components/omnibox/common/omnibox_features.cc
 +++ b/components/omnibox/common/omnibox_features.cc
-@@ -353,7 +353,7 @@ const base::Feature kSiteSearchStarterPack{"OmniboxSiteSearchStarterPack",
+@@ -367,7 +367,7 @@ const base::Feature kSiteSearchStarterPack{"OmniboxSiteSearchStarterPack",
  // Experiment to introduce new security indicators for HTTPS.
  const base::Feature kUpdatedConnectionSecurityIndicators{
      "OmniboxUpdatedConnectionSecurityIndicators",
diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch
index a53992b9..7e91ba03 100644
--- a/build/patches/Disable-media-router-and-remoting-by-default.patch
+++ b/build/patches/Disable-media-router-and-remoting-by-default.patch
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -414,7 +414,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -419,7 +419,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
  
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch
index 92965958..0e422816 100644
--- a/build/patches/Disable-safe-browsing.patch
+++ b/build/patches/Disable-safe-browsing.patch
@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../res/xml/google_services_preferences.xml   |  5 --
  .../android/java/res/xml/main_preferences.xml |  5 --
- .../java/res/xml/privacy_preferences.xml      |  9 ---
- .../privacy/settings/PrivacySettings.java     | 40 ----------
+ .../java/res/xml/privacy_preferences.xml      |  9 --
+ .../privacy/settings/PrivacySettings.java     | 40 ---------
  .../SafeBrowsingSettingsLauncher.java         |  8 --
  .../usage_stats/UsageStatsConsentDialog.java  |  5 --
  .../android/chrome_main_delegate_android.cc   |  1 +
@@ -22,43 +22,47 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/browser_process_impl.cc        | 29 -------
  chrome/browser/browser_process_impl.h         |  4 -
  .../chrome_browsing_data_remover_delegate.cc  |  2 +
- .../browser/chrome_content_browser_client.cc  | 32 ++++----
+ .../browser/chrome_content_browser_client.cc  | 32 +++----
  .../browser/chrome_content_browser_client.h   |  2 +
  ...ontent_browser_client_receiver_bindings.cc |  2 +
  .../file_type_policies_component_installer.cc | 16 +---
  .../browser/component_updater/registration.cc |  7 --
- .../chrome_download_manager_delegate.cc       | 46 +++++------
+ .../chrome_download_manager_delegate.cc       | 46 +++++-----
  .../chrome_download_manager_delegate.h        |  8 +-
  .../browser/download/download_item_model.cc   | 15 +++-
  chrome/browser/download/download_item_model.h |  4 +
  chrome/browser/download/download_prefs.cc     | 17 ++--
  chrome/browser/download/download_stats.cc     |  6 ++
- .../download/download_target_determiner.cc    | 66 +++++-----------
+ .../download/download_target_determiner.cc    | 66 +++++----------
  .../download/download_target_determiner.h     |  6 ++
  .../browser/download/download_target_info.cc  |  4 +
  .../browser/download/download_target_info.h   |  4 +
  chrome/browser/download/download_ui_model.cc  |  4 +
  chrome/browser/download/download_ui_model.h   |  4 +
- .../extensions/api/downloads/downloads_api.cc | 41 +---------
+ .../extensions/api/downloads/downloads_api.cc | 41 +--------
  .../extensions/api/downloads/downloads_api.h  | 12 ---
- .../webstore_private/webstore_private_api.cc  | 18 +----
+ .../webstore_private/webstore_private_api.cc  | 18 +---
  ...e_file_system_access_permission_context.cc | 10 +++
  ...me_file_system_access_permission_context.h |  5 +-
  .../lookalike_url_controller_client.cc        |  4 -
  .../metrics/chrome_metrics_service_client.cc  |  3 -
  ...ial_comparison_cert_verifier_controller.cc |  3 -
- .../chrome_password_manager_client.cc         | 27 +------
+ .../chrome_password_manager_client.cc         | 28 +------
  .../permissions/chrome_permissions_client.cc  | 14 ----
  .../permissions/chrome_permissions_client.h   |  3 -
  .../permission_revocation_request.cc          |  6 ++
  ...quiet_notification_permission_ui_config.cc |  4 +-
  chrome/browser/prefs/browser_prefs.cc         |  3 +
+ chrome/browser/privacy_guide/android/BUILD.gn |  2 -
+ .../privacy_guide/PrivacyGuideFragment.java   |  3 -
+ .../PrivacyGuidePagerAdapter.java             |  2 -
+ .../privacy_guide/StepDisplayHandlerImpl.java |  2 +-
  ...hrome_browser_main_extra_parts_profiles.cc |  4 +-
  chrome/browser/profiles/profile_impl.cc       |  4 +-
  chrome/browser/safe_browsing/BUILD.gn         |  4 +-
  chrome/browser/safe_browsing/android/BUILD.gn |  4 -
- .../safe_browsing/SafeBrowsingBridge.java     | 79 -------------------
- .../android/safe_browsing_bridge.cc           | 59 --------------
+ .../safe_browsing/SafeBrowsingBridge.java     | 83 -------------------
+ .../android/safe_browsing_bridge.cc           | 59 -------------
  .../download_protection_service.cc            |  2 +
  .../download_protection_service.h             |  3 +-
  .../url_lookup_service_factory.cc             |  4 +
@@ -66,7 +70,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/ssl/security_state_tab_helper.cc  | 10 +--
  ...urce_filter_web_contents_helper_factory.cc |  4 +
  chrome/browser/ui/BUILD.gn                    |  2 -
- .../strings/android_chrome_strings.grd        |  9 ---
+ .../strings/android_chrome_strings.grd        |  9 --
  chrome/browser/ui/tab_helpers.cc              |  8 ++
  .../ui/webui/interstitials/interstitial_ui.cc | 12 +--
  chrome/common/safe_browsing/BUILD.gn          |  7 --
@@ -81,22 +85,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../safe_browsing/content/browser/BUILD.gn    |  1 -
  .../content/common/file_type_policies.cc      |  3 +-
  .../safe_browsing/core/common/features.cc     |  2 +-
- .../content/captive_portal_blocking_page.cc   |  9 ++-
+ .../content/captive_portal_blocking_page.cc   |  9 +-
  .../content/cert_report_helper.cc             |  2 -
  .../unified_consent_service.cc                |  2 +-
  .../file_system_access_file_writer_impl.cc    |  3 +-
  .../file_system_access_file_writer_impl.h     |  5 --
- .../file_system_access/safe_move_helper.cc    | 46 +----------
- .../file_system_access/safe_move_helper.h     |  8 +-
+ .../file_system_access_safe_move_helper.cc    | 14 +---
+ .../file_system_access_safe_move_helper.h     |  8 +-
  .../file_system_access_permission_context.h   |  6 --
  weblayer/BUILD.gn                             |  4 -
  weblayer/test/BUILD.gn                        |  1 -
- 82 files changed, 209 insertions(+), 695 deletions(-)
+ 86 files changed, 212 insertions(+), 674 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
 +++ b/chrome/android/java/res/xml/google_services_preferences.xml
-@@ -24,11 +24,6 @@
+@@ -26,11 +26,6 @@ found in the LICENSE file.
          android:title="@string/autocomplete_searches_and_urls_title"
          android:summary="@string/autocomplete_searches_and_urls_summary"
          android:persistent="false"/>
@@ -111,7 +115,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -60,11 +60,6 @@
+@@ -62,11 +62,6 @@ found in the LICENSE file.
          android:key="privacy"
          android:order="10"
          android:title="@string/prefs_privacy_security"/>
@@ -126,7 +130,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -16,11 +16,6 @@
+@@ -18,11 +18,6 @@ found in the LICENSE file.
          android:title="@string/prefs_privacy_guide_title"
          android:summary="@string/prefs_privacy_guide_summary"
          android:fragment="org.chromium.chrome.browser.privacy_guide.PrivacyGuideFragment"/>
@@ -138,7 +142,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
          android:key="https_first_mode"
          android:title="@string/settings_https_first_mode_title"
-@@ -39,10 +34,6 @@
+@@ -41,10 +36,6 @@ found in the LICENSE file.
          android:title="@string/preload_pages_title"
          android:summary="@string/preload_pages_summary"
          android:fragment="org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment"/>
@@ -282,7 +286,7 @@ diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/and
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -332,8 +332,6 @@ static_library("browser") {
+@@ -336,8 +336,6 @@ static_library("browser") {
      "complex_tasks/task_tab_helper.h",
      "component_updater/autofill_regex_remover.cc",
      "component_updater/autofill_regex_remover.h",
@@ -291,7 +295,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "component_updater/chrome_component_updater_configurator.cc",
      "component_updater/chrome_component_updater_configurator.h",
      "component_updater/chrome_origin_trials_component_installer.cc",
-@@ -346,8 +344,6 @@ static_library("browser") {
+@@ -350,8 +348,6 @@ static_library("browser") {
      "component_updater/component_updater_utils.h",
      "component_updater/crl_set_component_installer.cc",
      "component_updater/crl_set_component_installer.h",
@@ -300,7 +304,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "component_updater/first_party_sets_component_installer.cc",
      "component_updater/first_party_sets_component_installer.h",
      "component_updater/mei_preload_component_installer.cc",
-@@ -1108,8 +1104,6 @@ static_library("browser") {
+@@ -1117,8 +1113,6 @@ static_library("browser") {
      "permissions/adaptive_quiet_notification_permission_ui_enabler.h",
      "permissions/chrome_permissions_client.cc",
      "permissions/chrome_permissions_client.h",
@@ -309,7 +313,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "permissions/crowd_deny_preload_data.cc",
      "permissions/crowd_deny_preload_data.h",
      "permissions/crowd_deny_safe_browsing_request.cc",
-@@ -1492,15 +1486,6 @@ static_library("browser") {
+@@ -1505,15 +1499,6 @@ static_library("browser") {
      "renderer_host/chrome_navigation_ui_data.h",
      "renderer_preferences_util.cc",
      "renderer_preferences_util.h",
@@ -325,7 +329,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "resource_coordinator/resource_coordinator_parts.cc",
      "resource_coordinator/resource_coordinator_parts.h",
      "resource_coordinator/session_restore_policy.cc",
-@@ -2226,11 +2211,8 @@ static_library("browser") {
+@@ -2247,11 +2232,8 @@ static_library("browser") {
      "//components/reporting/util:status_macros",
      "//components/reporting/util:status_proto",
      "//components/reporting/util:task_runner_context",
@@ -337,7 +341,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//components/safe_browsing/content/browser:safe_browsing_service",
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
-@@ -3202,12 +3184,6 @@ static_library("browser") {
+@@ -3232,12 +3214,6 @@ static_library("browser") {
        "profiles/profile_manager_android.cc",
        "profiles/profile_manager_android.h",
        "query_tiles/android/tile_provider_factory.cc",
@@ -350,7 +354,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "safe_browsing/android/password_reuse_controller_android.cc",
        "safe_browsing/android/password_reuse_controller_android.h",
        "safe_browsing/android/safe_browsing_referring_app_bridge_android.cc",
-@@ -3687,8 +3663,6 @@ static_library("browser") {
+@@ -3720,8 +3696,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -359,7 +363,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "download/download_dir_policy_handler.cc",
        "download/download_dir_policy_handler.h",
        "download/download_dir_util.cc",
-@@ -8151,8 +8125,6 @@ static_library("test_support") {
+@@ -8198,8 +8172,6 @@ static_library("test_support") {
      "//components/reporting/util:status_macros",
      "//components/reporting/util:status_proto",
      "//components/reporting/util:task_runner_context",
@@ -371,7 +375,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc
 +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
-@@ -36,7 +36,9 @@
+@@ -35,7 +35,9 @@
  #include "chrome/browser/prefetch/prefetch_prefs.h"
  #include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h"
  #include "chrome/browser/profiles/profile.h"
@@ -381,7 +385,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
  #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
-@@ -61,7 +63,9 @@
+@@ -60,7 +62,9 @@
  #include "components/navigation_interception/intercept_navigation_delegate.h"
  #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
  #include "components/paint_preview/buildflags/buildflags.h"
@@ -391,7 +395,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
  #include "content/public/browser/file_select_listener.h"
  #include "content/public/browser/navigation_entry.h"
  #include "content/public/browser/render_frame_host.h"
-@@ -157,8 +161,10 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
+@@ -145,8 +149,10 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
      content::WebContents* portal_contents) {
    WebContentsDelegateAndroid::PortalWebContentsCreated(portal_contents);
  
@@ -402,7 +406,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
  
    // This is a subset of the tab helpers that would be attached by
    // TabAndroid::AttachTabHelpers.
-@@ -181,11 +187,13 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
+@@ -169,11 +175,13 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
    HistoryTabHelper::CreateForWebContents(portal_contents);
    infobars::ContentInfoBarManager::CreateForWebContents(portal_contents);
    PrefsTabHelper::CreateForWebContents(portal_contents);
@@ -459,7 +463,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
  #include "components/sessions/core/session_id_generator.h"
  #include "components/subresource_filter/content/browser/ruleset_service.h"
  #include "components/translate/core/browser/translate_download_manager.h"
-@@ -407,8 +405,6 @@ void BrowserProcessImpl::StartTearDown() {
+@@ -406,8 +404,6 @@ void BrowserProcessImpl::StartTearDown() {
  
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -468,7 +472,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
    network_time_tracker_.reset();
  
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1039,14 +1035,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
+@@ -1032,14 +1028,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
    return status_tray_.get();
  }
  
@@ -483,7 +487,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
  subresource_filter::RulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1285,23 +1273,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
+@@ -1275,23 +1263,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
  }
  
  void BrowserProcessImpl::CreateSafeBrowsingService() {
@@ -531,7 +535,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -636,10 +636,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -638,10 +638,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
  
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -542,12 +546,12 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
        safe_browsing_context = sb_service->GetNetworkContext(profile_);
 +#endif
  
+     // Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS.
      browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
-                                                    host_content_settings_map_);
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -109,6 +109,7 @@
+@@ -111,6 +111,7 @@
  #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h"
  #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
  #include "chrome/browser/renderer_preferences_util.h"
@@ -555,7 +559,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
  #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
  #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
-@@ -116,6 +117,7 @@
+@@ -118,6 +119,7 @@
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
  #include "chrome/browser/safe_browsing/url_lookup_service_factory.h"
@@ -563,7 +567,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/search/search.h"
  #include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h"
  #include "chrome/browser/sharing/sms/sms_remote_fetcher.h"
-@@ -1004,9 +1006,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+@@ -1015,9 +1017,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
  class CertificateReportingServiceCertReporter : public SSLCertReporter {
   public:
    explicit CertificateReportingServiceCertReporter(
@@ -574,7 +578,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  
    CertificateReportingServiceCertReporter(
        const CertificateReportingServiceCertReporter&) = delete;
-@@ -1018,11 +1018,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter {
+@@ -1029,11 +1029,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter {
    // SSLCertReporter implementation
    void ReportInvalidCertificateChain(
        const std::string& serialized_report) override {
@@ -586,7 +590,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  };
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -1274,14 +1272,6 @@ void MaybeAddThrottle(
+@@ -1285,14 +1283,6 @@ void MaybeAddThrottle(
      throttles->push_back(std::move(maybe_throttle));
  }
  
@@ -601,7 +605,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  void MaybeAddThrottles(
      std::vector<std::unique_ptr<content::NavigationThrottle>> additional,
      std::vector<std::unique_ptr<content::NavigationThrottle>>* combined) {
-@@ -2303,7 +2293,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2376,7 +2366,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
    }
  #elif BUILDFLAG(IS_POSIX)
  #if BUILDFLAG(IS_ANDROID)
@@ -610,15 +614,15 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #else
    bool enable_crash_reporter = false;
    if (crash_reporter::IsCrashpadEnabled()) {
-@@ -4562,6 +4552,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-                    &throttles);
+@@ -4651,6 +4641,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+       &throttles);
  #endif
  
 +#if defined(FULL_SAFE_BROWSING)
    // g_browser_process->safe_browsing_service() may be null in unittests.
    safe_browsing::SafeBrowsingUIManager* ui_manager =
        g_browser_process->safe_browsing_service()
-@@ -4577,6 +4568,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4666,6 +4657,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
          std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
              handle));
    }
@@ -626,7 +630,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
-@@ -4800,7 +4792,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
+@@ -4900,7 +4892,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
  void ChromeContentBrowserClient::InitOnUIThread() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  
@@ -636,7 +640,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  
    // Initialize `network_contexts_parent_directory_`.
    base::FilePath user_data_dir;
-@@ -5978,6 +5972,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+@@ -6099,6 +6093,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
      const std::vector<std::string>& allowlist_domains) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
  
@@ -644,7 +648,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
    // Should not bypass safe browsing check if the check is for enterprise
    // lookup.
    if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled)
-@@ -5998,6 +5993,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+@@ -6119,6 +6114,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
    }
  
    return safe_browsing_url_checker_delegate_;
@@ -654,7 +658,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  }
  
  safe_browsing::RealTimeUrlLookupServiceBase*
-@@ -6005,24 +6003,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
+@@ -6126,24 +6124,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
      content::BrowserContext* browser_context,
      bool is_enterprise_lookup_enabled,
      bool is_consumer_lookup_enabled) {
@@ -687,7 +691,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -907,9 +907,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -918,9 +918,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    // Parts are deleted in the reverse order they are added.
    std::vector<ChromeContentBrowserClientParts*> extra_parts_;
  
@@ -793,10 +797,10 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
 diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -43,15 +43,19 @@
+@@ -42,15 +42,19 @@
+ #include "chrome/browser/download/mixed_content_download_blocking.h"
  #include "chrome/browser/download/save_package_file_picker.h"
  #include "chrome/browser/enterprise/connectors/common.h"
- #include "chrome/browser/enterprise/connectors/file_system/rename_handler.h"
 +#if defined(FULL_SAFE_BROWSING)
  #include "chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h"
  #include "chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_factory.h"
@@ -813,7 +817,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  #include "chrome/browser/ui/chrome_pages.h"
  #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
  #include "chrome/common/buildflags.h"
-@@ -72,9 +76,11 @@
+@@ -71,9 +75,11 @@
  #include "components/prefs/pref_member.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/buildflags.h"
@@ -825,7 +829,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  #include "components/services/quarantine/public/mojom/quarantine.mojom.h"
  #include "components/services/quarantine/quarantine_impl.h"
  #include "content/public/browser/browser_task_traits.h"
-@@ -133,8 +139,10 @@ using content::DownloadManager;
+@@ -132,8 +138,10 @@ using content::DownloadManager;
  using download::DownloadItem;
  using download::DownloadPathReservationTracker;
  using download::PathValidationResult;
@@ -836,7 +840,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
  
  namespace {
-@@ -349,12 +357,12 @@ void HandleMixedDownloadInfoBarResult(
+@@ -348,12 +356,12 @@ void HandleMixedDownloadInfoBarResult(
  }
  #endif
  
@@ -850,7 +854,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    if (download_restriction !=
            DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES &&
        download_restriction !=
-@@ -391,8 +399,8 @@ void MaybeReportDangerousDownloadBlocked(
+@@ -390,8 +398,8 @@ void MaybeReportDangerousDownloadBlocked(
          danger_type, download->GetMimeType(), /*scan_id*/ "",
          download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED);
    }
@@ -860,7 +864,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  
  #if BUILDFLAG(FULL_SAFE_BROWSING)
  download::DownloadDangerType SavePackageDangerType(
-@@ -450,13 +458,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
+@@ -449,13 +457,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
  
    download_manager_ = dm;
  
@@ -874,7 +878,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    if (download_manager_) {
      download_manager_->AddObserver(this);
    }
-@@ -809,17 +810,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
+@@ -808,17 +809,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename,
      const GURL& source_url) {
@@ -892,7 +896,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  }
  
  void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
-@@ -891,9 +881,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
+@@ -890,9 +880,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
      chrome::ShowSettingsSubPage(browser, "certificates");
    else
      browser->OpenURL(params);
@@ -902,7 +906,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  #endif  // BUILDFLAG(IS_ANDROID)
  }
  
-@@ -949,18 +936,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
+@@ -948,18 +935,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
    return std::string(chrome::kApplicationClientIDStringForAVScanning);
  }
  
@@ -923,7 +927,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  
  void ChromeDownloadManagerDelegate::GetMixedContentStatus(
      download::DownloadItem* download,
-@@ -1505,8 +1492,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+@@ -1504,8 +1491,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
      DownloadItemModel model(item);
      model.DetermineAndSetShouldPreferOpeningInBrowser(
          target_info->target_path, target_info->is_filetype_handled_safely);
@@ -935,7 +939,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    if (ShouldBlockFile(item, target_info->danger_type)) {
      MaybeReportDangerousDownloadBlocked(
          download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE",
-@@ -1515,6 +1505,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+@@ -1514,6 +1504,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
      // A dangerous type would take precedence over the blocking of the file.
      target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
    }
@@ -943,7 +947,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
  
    base::FilePath target_path = target_info->target_path;
  
-@@ -1584,6 +1575,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
+@@ -1583,6 +1574,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
  bool ChromeDownloadManagerDelegate::ShouldBlockFile(
      download::DownloadItem* item,
      download::DownloadDangerType danger_type) const {
@@ -951,7 +955,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    DownloadPrefs::DownloadRestriction download_restriction =
        download_prefs_->download_restriction();
  
-@@ -1634,7 +1626,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
+@@ -1633,7 +1625,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
        LOG(ERROR) << "Invalid download restruction value: "
                   << static_cast<int>(download_restriction);
    }
@@ -960,7 +964,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    return false;
  }
  
-@@ -1648,7 +1640,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
+@@ -1647,7 +1639,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
      service->MaybeSendDangerousDownloadOpenedReport(download,
                                                      show_download_in_folder);
    }
@@ -968,7 +972,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
    if (!download->GetAutoOpened()) {
      download::DownloadContent download_content =
          download::DownloadContentFromMimeType(download->GetMimeType(), false);
-@@ -1656,6 +1647,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
+@@ -1655,6 +1646,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
          download->GetDangerType(), download_content, base::Time::Now(),
          download->GetEndTime(), show_download_in_folder);
    }
@@ -990,7 +994,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
  #include "components/download/public/common/download_danger_type.h"
  #include "components/download/public/common/download_item.h"
  #include "components/download/public/common/download_path_reservation_tracker.h"
-@@ -152,7 +154,7 @@ class ChromeDownloadManagerDelegate
+@@ -150,7 +152,7 @@ class ChromeDownloadManagerDelegate
  
    DownloadPrefs* download_prefs() { return download_prefs_.get(); }
  
@@ -999,7 +1003,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
    // The state of a safebrowsing check.
    class SafeBrowsingState : public DownloadCompletionBlocker {
     public:
-@@ -167,7 +169,6 @@ class ChromeDownloadManagerDelegate
+@@ -165,7 +167,6 @@ class ChromeDownloadManagerDelegate
      // a download item.
      static const char kSafeBrowsingUserDataKey[];
    };
@@ -1007,7 +1011,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
  
    // Callback function after the DownloadProtectionService completes.
    void CheckClientDownloadDone(uint32_t download_id,
-@@ -176,6 +177,7 @@ class ChromeDownloadManagerDelegate
+@@ -174,6 +175,7 @@ class ChromeDownloadManagerDelegate
    // Callback function after scanning completes for a save package.
    void CheckSavePackageScanningDone(uint32_t download_id,
                                      safe_browsing::DownloadCheckResult result);
@@ -1015,7 +1019,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
  
    base::WeakPtr<ChromeDownloadManagerDelegate> GetWeakPtr();
  
-@@ -198,8 +200,10 @@ class ChromeDownloadManagerDelegate
+@@ -196,8 +198,10 @@ class ChromeDownloadManagerDelegate
    virtual bool IsOpenInBrowserPreferreredForFile(const base::FilePath& path);
  
   protected:
@@ -1029,7 +1033,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
 diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -35,7 +35,9 @@
+@@ -34,7 +34,9 @@
  #include "chrome/browser/enterprise/connectors/connectors_manager.h"
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h"
@@ -1039,7 +1043,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
  #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/grit/chromium_strings.h"
-@@ -45,8 +47,10 @@
+@@ -44,8 +46,10 @@
  #include "components/download/public/common/download_item.h"
  #include "components/safe_browsing/buildflags.h"
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -1047,10 +1051,10 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
  #include "components/safe_browsing/content/common/file_type_policies.h"
  #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
 +#endif
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/vector_icons/vector_icons.h"
  #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/download_item_utils.h"
-@@ -60,7 +64,9 @@
+@@ -62,7 +66,9 @@
  
  using download::DownloadItem;
  using MixedContentStatus = download::DownloadItem::MixedContentStatus;
@@ -1059,8 +1063,8 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
 +#endif
  using ReportThreatDetailsResult =
      safe_browsing::PingManager::ReportThreatDetailsResult;
- 
-@@ -97,9 +103,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
+ using TailoredVerdict = safe_browsing::ClientDownloadResponse::TailoredVerdict;
+@@ -100,9 +106,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
    // for the file type.
    absl::optional<bool> should_prefer_opening_in_browser_;
  
@@ -1072,7 +1076,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
  
    // Whether the download is currently being revived.
    bool is_being_revived_;
-@@ -144,7 +152,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate(
+@@ -150,7 +158,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate(
  DownloadItemModelData::DownloadItemModelData()
      : should_show_in_shelf_(true),
        was_ui_notified_(false),
@@ -1082,7 +1086,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
        is_being_revived_(false) {}
  
  #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -465,6 +475,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
+@@ -472,6 +482,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
    data->should_prefer_opening_in_browser_ = preference;
  }
  
@@ -1090,7 +1094,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
  DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
    const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
    return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
-@@ -475,6 +486,7 @@ void DownloadItemModel::SetDangerLevel(
+@@ -482,6 +493,7 @@ void DownloadItemModel::SetDangerLevel(
    DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
    data->danger_level_ = danger_level;
  }
@@ -1098,7 +1102,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
  
  download::DownloadItem::MixedContentStatus
  DownloadItemModel::GetMixedContentStatus() const {
-@@ -694,9 +706,6 @@ bool DownloadItemModel::IsCommandEnabled(
+@@ -701,9 +713,6 @@ bool DownloadItemModel::IsCommandEnabled(
        // filename. Don't base an "Always open" decision based on it. Also
        // exclude extensions.
        return download_->CanOpenDownload() &&
@@ -1121,7 +1125,7 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/down
  
  namespace content {
  class WebContents;
-@@ -71,9 +73,11 @@ class DownloadItemModel : public DownloadUIModel,
+@@ -73,9 +75,11 @@ class DownloadItemModel : public DownloadUIModel,
    void SetEphemeralWarningUiShownTime(absl::optional<base::Time> time) override;
    bool ShouldPreferOpeningInBrowser() override;
    void SetShouldPreferOpeningInBrowser(bool preference) override;
@@ -1287,7 +1291,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
  
    // If no mime type or explicitly specified a name, don't replace file
    // extension.
-@@ -876,6 +886,7 @@ DownloadTargetDeterminer::Result
+@@ -917,6 +927,7 @@ DownloadTargetDeterminer::Result
      return CONTINUE;
    }
  
@@ -1295,7 +1299,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
    // First determine the danger level assuming that the user doesn't have any
    // prior visits to the referrer recoreded in history. The resulting danger
    // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit
-@@ -912,6 +923,7 @@ DownloadTargetDeterminer::Result
+@@ -953,6 +964,7 @@ DownloadTargetDeterminer::Result
    // invalid, then assume the referrer has not been visited before.
    if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
      danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
@@ -1303,7 +1307,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
    return CONTINUE;
  }
  
-@@ -919,6 +931,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
+@@ -960,6 +972,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
      bool visited_referrer_before) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@@ -1311,7 +1315,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
    safe_browsing::RecordDownloadFileTypeAttributes(
        safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
            virtual_path_.BaseName(), download_->GetURL(),
-@@ -930,6 +943,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
+@@ -971,6 +984,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
    if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
        danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
      danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
@@ -1319,7 +1323,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
    DoLoop();
  }
  
-@@ -1028,7 +1042,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+@@ -1069,7 +1083,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
              << " Intermediate:" << intermediate_path_.AsUTF8Unsafe()
              << " Confirmation reason:" << static_cast<int>(confirmation_reason_)
              << " Danger type:" << danger_type_
@@ -1329,7 +1333,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
              << " Result:" << static_cast<int>(result);
    std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo);
  
-@@ -1040,7 +1056,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+@@ -1081,7 +1097,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
             ? DownloadItem::TARGET_DISPOSITION_PROMPT
             : DownloadItem::TARGET_DISPOSITION_OVERWRITE);
    target_info->danger_type = danger_type_;
@@ -1339,7 +1343,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
    target_info->intermediate_path = intermediate_path_;
    target_info->mime_type = mime_type_;
    target_info->is_filetype_handled_safely = is_filetype_handled_safely_;
-@@ -1134,54 +1152,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
+@@ -1175,54 +1193,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
                                  DownloadItem::TARGET_DISPOSITION_PROMPT);
  }
  
@@ -1395,7 +1399,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
  }
  
  absl::optional<base::Time>
-@@ -1195,6 +1170,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
+@@ -1236,6 +1211,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
                                       EventType::DANGEROUS_DOWNLOAD_BYPASS)
                             : absl::nullopt;
  }
@@ -1416,7 +1420,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
  #include "content/public/browser/download_manager_delegate.h"
  #include "ppapi/buildflags/buildflags.h"
  
-@@ -334,6 +336,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+@@ -341,6 +343,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
    // operation.
    bool HasPromptedForPath() const;
  
@@ -1424,7 +1428,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
    // Returns true if this download should show the "dangerous file" warning.
    // Various factors are considered, such as the type of the file, whether a
    // user action initiated the download, and whether the user has explicitly
-@@ -343,6 +346,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+@@ -350,6 +353,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
    // to true if the download requires explicit user consent.
    safe_browsing::DownloadFileType::DangerLevel GetDangerLevel(
        PriorVisitsToReferrer visits) const;
@@ -1432,7 +1436,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
  
    // Returns the timestamp of the last download bypass.
    absl::optional<base::Time> GetLastDownloadBypassTimestamp() const;
-@@ -362,7 +366,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+@@ -369,7 +373,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
    download::DownloadPathReservationTracker::FilenameConflictAction
        conflict_action_;
    download::DownloadDangerType danger_type_;
@@ -1504,7 +1508,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
  
  namespace {
  
-@@ -457,12 +459,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() {
+@@ -463,12 +465,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() {
  
  void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
  
@@ -1532,7 +1536,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
  #include "ui/base/models/image_model.h"
  #include "ui/color/color_id.h"
  #include "ui/gfx/vector_icon_types.h"
-@@ -342,6 +344,7 @@ class DownloadUIModel {
+@@ -349,6 +351,7 @@ class DownloadUIModel {
    // Change what's returned by ShouldPreferOpeningInBrowser to |preference|.
    virtual void SetShouldPreferOpeningInBrowser(bool preference);
  
@@ -1540,7 +1544,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
    // Return the danger level determined during download target determination.
    // The value returned here is independent of the danger level as determined by
    // the Safe Browsing.
-@@ -350,6 +353,7 @@ class DownloadUIModel {
+@@ -357,6 +360,7 @@ class DownloadUIModel {
    // Change what's returned by GetDangerLevel().
    virtual void SetDangerLevel(
        safe_browsing::DownloadFileType::DangerLevel danger_level);
@@ -1564,7 +1568,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
  DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
  
 -DownloadsAcceptDangerFunction::OnPromptCreatedCallback*
--    DownloadsAcceptDangerFunction::on_prompt_created_ = NULL;
+-    DownloadsAcceptDangerFunction::on_prompt_created_ = nullptr;
 -
  ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
    std::unique_ptr<downloads::AcceptDanger::Params> params(
@@ -1683,7 +1687,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -36,8 +36,10 @@
+@@ -37,8 +37,10 @@
  #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
  #include "chrome/browser/installable/installable_utils.h"
  #include "chrome/browser/profiles/profile.h"
@@ -1693,8 +1697,8 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
 +#endif
  #include "chrome/browser/ui/file_system_access_dialogs.h"
  #include "chrome/common/chrome_paths.h"
- #include "chrome/grit/generated_resources.h"
-@@ -144,6 +146,7 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
+ #include "chrome/common/pdf_util.h"
+@@ -146,6 +148,7 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
        origin, path, handle_type, std::move(callback), web_contents);
  }
  
@@ -1702,7 +1706,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  void ShowFileSystemAccessDangerousFileDialogOnUIThread(
      content::GlobalRenderFrameHostId frame_id,
      const url::Origin& origin,
-@@ -172,6 +175,7 @@ void ShowFileSystemAccessDangerousFileDialogOnUIThread(
+@@ -174,6 +177,7 @@ void ShowFileSystemAccessDangerousFileDialogOnUIThread(
    ShowFileSystemAccessDangerousFileDialog(origin, path, std::move(callback),
                                            web_contents);
  }
@@ -1710,7 +1714,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  
  // Sentinel used to indicate that no PathService key is specified for a path in
  // the struct below.
-@@ -342,6 +346,7 @@ BindResultCallbackToCurrentSequence(
+@@ -344,6 +348,7 @@ BindResultCallbackToCurrentSequence(
        base::SequencedTaskRunnerHandle::Get(), std::move(callback));
  }
  
@@ -1718,7 +1722,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  void DoSafeBrowsingCheckOnUIThread(
      content::GlobalRenderFrameHostId frame_id,
      std::unique_ptr<content::FileSystemAccessWriteItem> item,
-@@ -418,6 +423,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
+@@ -420,6 +425,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
    NOTREACHED();
    return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock;
  }
@@ -1726,7 +1730,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  
  std::string GenerateLastPickedDirectoryKey(const std::string& id) {
    return id.empty() ? kDefaultLastPickedDirectoryKey
-@@ -1200,6 +1206,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess(
+@@ -1202,6 +1208,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess(
                       frame_id, std::move(callback)));
  }
  
@@ -1734,7 +1738,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
      std::unique_ptr<content::FileSystemAccessWriteItem> item,
      content::GlobalRenderFrameHostId frame_id,
-@@ -1221,6 +1228,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
+@@ -1223,6 +1230,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
                },
                base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
  }
@@ -1742,7 +1746,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
  
  void ChromeFileSystemAccessPermissionContext::
      DidConfirmSensitiveDirectoryAccess(
-@@ -1232,6 +1240,7 @@ void ChromeFileSystemAccessPermissionContext::
+@@ -1234,6 +1242,7 @@ void ChromeFileSystemAccessPermissionContext::
          base::OnceCallback<void(SensitiveEntryResult)> callback,
          bool should_block) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1750,7 +1754,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
    if (!should_block) {
      // If attempting to save a file with a dangerous extension, prompt the user
      // to make them confirm they actually want to save the file.
-@@ -1257,6 +1266,7 @@ void ChromeFileSystemAccessPermissionContext::
+@@ -1259,6 +1268,7 @@ void ChromeFileSystemAccessPermissionContext::
      std::move(callback).Run(SensitiveEntryResult::kAllowed);
      return;
    }
@@ -1803,7 +1807,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chro
 diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -877,9 +877,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
+@@ -881,9 +881,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<HttpsEngagementMetricsProvider>());
  
@@ -1829,7 +1833,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/c
 diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -117,10 +117,10 @@
+@@ -121,10 +121,10 @@
  #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
  #include "url/url_constants.h"
  
@@ -1841,7 +1845,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
  #endif
  
  #if BUILDFLAG(IS_ANDROID)
-@@ -887,21 +887,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const {
+@@ -922,21 +922,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const {
  
  safe_browsing::PasswordProtectionService*
  ChromePasswordManagerClient::GetPasswordProtectionService() const {
@@ -1864,10 +1868,10 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
  }
  #endif  // defined(ON_FOCUS_PING_ENABLED)
  
-@@ -911,22 +903,9 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
-     const std::vector<password_manager::MatchingReusedCredential>&
-         matching_reused_credentials,
-     bool password_field_exists) {
+@@ -948,26 +940,12 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
+     bool password_field_exists,
+     uint64_t reused_password_hash,
+     const std::string& domain) {
 -  safe_browsing::PasswordProtectionService* pps =
 -      GetPasswordProtectionService();
 -  if (!pps)
@@ -1876,6 +1880,10 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
 -  pps->MaybeStartProtectedPasswordEntryRequest(
 -      web_contents(), web_contents()->GetLastCommittedURL(), username,
 -      password_type, matching_reused_credentials, password_field_exists);
+-
+ #if !BUILDFLAG(IS_ANDROID)
+   // TODO(crbug.com/1351484): Hook this to the extension service in the next CL.
+ #endif  // !BUILDFLAG(IS_ANDROID)
  }
  
  void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
@@ -1887,7 +1895,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
  }
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1547,6 +1526,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
+@@ -1592,6 +1570,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
      is_enabled = false;
    }
  
@@ -1895,7 +1903,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Disable password
-@@ -1557,6 +1537,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
+@@ -1602,6 +1581,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
      observer->OnPasswordSaveOrAutofillDenied();
      is_enabled = false;
    }
@@ -2009,7 +2017,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "build/chromecast_buildflags.h"
  #include "build/chromeos_buildflags.h"
  #include "chrome/browser/about_flags.h"
-@@ -1294,7 +1295,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1321,7 +1322,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
    QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
    RegisterBrowserUserPrefs(registry);
@@ -2019,6 +2027,62 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
    safe_browsing::RegisterProfilePrefs(registry);
    SearchPrefetchService::RegisterProfilePrefs(registry);
    blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
+diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn
+--- a/chrome/browser/privacy_guide/android/BUILD.gn
++++ b/chrome/browser/privacy_guide/android/BUILD.gn
+@@ -13,7 +13,6 @@ android_library("java") {
+     "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideExplanationItem.java",
+     "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java",
+     "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java",
+-    "java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java",
+     "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandler.java",
+     "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java",
+     "java/src/org/chromium/chrome/browser/privacy_guide/SyncFragment.java",
+@@ -44,7 +43,6 @@ robolectric_library("junit") {
+     "junit/src/org/chromium/chrome/browser/privacy_guide/CookiesFragmentTest.java",
+     "junit/src/org/chromium/chrome/browser/privacy_guide/MSBBFragmentTest.java",
+     "junit/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapterTest.java",
+-    "junit/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragmentTest.java",
+     "junit/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImplTest.java",
+   ]
+   deps = [
+diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
+--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
++++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
+@@ -122,9 +122,6 @@ public class PrivacyGuideFragment extends Fragment {
+ 
+     @Override
+     public void onAttachFragment(@NonNull Fragment childFragment) {
+-        if (childFragment instanceof SafeBrowsingFragment) {
+-            ((SafeBrowsingFragment) childFragment).setBottomSheetController(mBottomSheetController);
+-        }
+     }
+ 
+     @Override
+diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
+--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
++++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
+@@ -56,8 +56,6 @@ public class PrivacyGuidePagerAdapter extends FragmentStateAdapter {
+                 return new MSBBFragment();
+             case FragmentType.SYNC:
+                 return new SyncFragment();
+-            case FragmentType.SAFE_BROWSING:
+-                return new SafeBrowsingFragment();
+             case FragmentType.COOKIES:
+                 return new CookiesFragment();
+         }
+diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
+--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
++++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
+@@ -19,7 +19,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler {
+ 
+     @Override
+     public boolean shouldDisplaySafeBrowsing() {
+-        return SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING;
++        return false;
+     }
+ 
+     @Override
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -2030,7 +2094,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
  #include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h"
  #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
  #include "chrome/browser/search_engines/template_url_service_factory.h"
-@@ -354,7 +353,6 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -357,7 +356,6 @@ void ChromeBrowserMainExtraPartsProfiles::
    CertDbInitializerFactory::GetInstance();
  #endif
  #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
@@ -2038,7 +2102,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
  #endif
  #if !BUILDFLAG(IS_ANDROID)
    ChromeBrowsingDataLifetimeManagerFactory::GetInstance();
-@@ -582,7 +580,9 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -587,7 +585,9 @@ void ChromeBrowserMainExtraPartsProfiles::
    }
  #endif
    TabRestoreServiceFactory::GetInstance();
@@ -2051,7 +2115,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -90,7 +90,6 @@
+@@ -91,7 +91,6 @@
  #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
  #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
  #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@@ -2059,7 +2123,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
  #include "chrome/browser/sessions/exit_type_service.h"
  #include "chrome/browser/sharing/sharing_service_factory.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
-@@ -628,6 +627,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
+@@ -633,6 +632,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
  
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -2067,7 +2131,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
    scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
        g_browser_process->safe_browsing_service());
    if (safe_browsing_service.get()) {
-@@ -639,7 +639,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
+@@ -644,7 +644,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
            pref_validation_delegate.InitWithNewPipeAndPassReceiver());
      }
    }
@@ -2087,7 +2151,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
    sources = [
      "chrome_controller_client.cc",
      "chrome_controller_client.h",
-@@ -40,7 +41,6 @@ static_library("safe_browsing") {
+@@ -41,7 +42,6 @@ static_library("safe_browsing") {
      "//components/resources:components_resources_grit",
      "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
@@ -2095,7 +2159,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
      "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/core/browser",
-@@ -93,6 +93,7 @@ static_library("safe_browsing") {
+@@ -94,6 +94,7 @@ static_library("safe_browsing") {
        "//extensions/browser",
      ]
    }
@@ -2103,7 +2167,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
  
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -177,7 +178,6 @@ static_library("safe_browsing") {
+@@ -178,7 +179,6 @@ static_library("safe_browsing") {
        "//components/safe_browsing/content/browser/triggers:ad_sampler_trigger",
        "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger",
        "//components/safe_browsing/content/browser/triggers:trigger_throttler",
@@ -2130,7 +2194,7 @@ diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe
 diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
 --- a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
 +++ b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
-@@ -12,86 +12,7 @@ import org.chromium.base.annotations.NativeMethods;
+@@ -14,87 +14,4 @@ import org.chromium.base.annotations.NativeMethods;
   */
  @JNINamespace("safe_browsing")
  public final class SafeBrowsingBridge {
@@ -2203,8 +2267,9 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b
 -        return SafeBrowsingBridgeJni.get().isLeakDetectionUnauthenticatedEnabled();
 -    }
 -
-     @NativeMethods
-     interface Natives {
+-    @NativeMethods
+-    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+-    public interface Natives {
 -        int umaValueForFile(String path);
 -        boolean getSafeBrowsingExtendedReportingEnabled();
 -        void setSafeBrowsingExtendedReportingEnabled(boolean enabled);
@@ -2215,7 +2280,7 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b
 -        boolean isSafeBrowsingManaged();
 -        boolean hasAccountForLeakCheckRequest();
 -        boolean isLeakDetectionUnauthenticatedEnabled();
-     }
+-    }
  }
 diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc
 --- a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc
@@ -2287,7 +2352,7 @@ diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chro
 diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
 +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
-@@ -779,11 +779,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) {
+@@ -799,11 +799,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) {
    deep_scanning_requests_.erase(it);
  }
  
@@ -2312,7 +2377,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio
  #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h"
  #include "chrome/browser/safe_browsing/download_protection/download_protection_observer.h"
  #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
-@@ -313,11 +312,13 @@ class DownloadProtectionService {
+@@ -334,11 +333,13 @@ class DownloadProtectionService {
    void OnDangerousDownloadOpened(const download::DownloadItem* item,
                                   Profile* profile);
  
@@ -2356,9 +2421,9 @@ diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browse
  #include "chrome/browser/profiles/profile.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/ssl/sct_reporting_service.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
  
-@@ -32,15 +31,7 @@ SCTReportingServiceFactory::~SCTReportingServiceFactory() = default;
+ // static
+@@ -31,15 +30,7 @@ SCTReportingServiceFactory::~SCTReportingServiceFactory() = default;
  
  KeyedService* SCTReportingServiceFactory::BuildServiceInstanceFor(
      content::BrowserContext* profile) const {
@@ -2374,7 +2439,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browse
 +  return nullptr;
  }
  
- content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse(
+ // Force this to be created during BrowserContext creation, since we can't
 diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -2438,7 +2503,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -545,7 +545,6 @@ static_library("ui") {
+@@ -546,7 +546,6 @@ static_library("ui") {
      "//components/renderer_context_menu",
      "//components/resources",
      "//components/safe_browsing/content/browser",
@@ -2446,7 +2511,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/core/browser/db:database_manager",
-@@ -4350,7 +4349,6 @@ static_library("ui") {
+@@ -4403,7 +4402,6 @@ static_library("ui") {
        "views/download/bubble/download_dialog_view.h",
        "views/download/bubble/download_toolbar_button_view.cc",
        "views/download/bubble/download_toolbar_button_view.h",
@@ -2470,7 +2535,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Metrics settings -->
        <message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
-@@ -4846,9 +4840,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4867,9 +4861,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          To use this setting <ph name="BEGIN_LINK">&lt;link&gt;</ph>Make searches and browsing better<ph name="END_LINK">&lt;/link&gt;</ph> must be turned on
        </message>
        <!-- Usage Stats strings -->
@@ -2483,7 +2548,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -62,14 +62,18 @@
+@@ -63,14 +63,18 @@
  #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.h"
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/profiles/profile_key.h"
@@ -2502,10 +2567,10 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
  #include "chrome/browser/search_engines/template_url_service_factory.h"
  #include "chrome/browser/segmentation_platform/segmentation_platform_service_factory.h"
  #include "chrome/browser/sessions/session_tab_helper_factory.h"
-@@ -130,9 +134,11 @@
- #include "components/performance_manager/embedder/performance_manager_registry.h"
+@@ -135,9 +139,11 @@
  #include "components/permissions/features.h"
  #include "components/permissions/permission_request_manager.h"
+ #include "components/permissions/unused_site_permissions_service.h"
 +#if defined(FULL_SAFE_BROWSING)
  #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer.h"
  #include "components/safe_browsing/content/browser/safe_browsing_tab_observer.h"
@@ -2514,7 +2579,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
  #include "components/search/ntp_features.h"
  #include "components/segmentation_platform/content/segmentation_platform_tab_helper.h"
  #include "components/site_engagement/content/site_engagement_helper.h"
-@@ -403,6 +409,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -418,6 +424,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -2522,7 +2587,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
    safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
        web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
        safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
-@@ -420,6 +427,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -435,6 +442,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
        profile, web_contents);
    ReputationWebContentsObserver::CreateForWebContents(web_contents);
@@ -2623,7 +2688,7 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -287,11 +287,6 @@ static_library("renderer") {
+@@ -289,11 +289,6 @@ static_library("renderer") {
      deps += [ "//third_party/widevine/cdm:headers" ]
    }
  
@@ -2672,7 +2737,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/
  #include "components/spellcheck/spellcheck_buildflags.h"
  #include "content/public/renderer/content_renderer_client.h"
  #include "content/public/renderer/render_thread.h"
-@@ -277,8 +276,6 @@ class ChromeContentRendererClient
+@@ -278,8 +277,6 @@ class ChromeContentRendererClient
  #if BUILDFLAG(ENABLE_PLUGINS)
    std::set<std::string> allowed_camera_device_origins_;
  #endif
@@ -2684,7 +2749,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -925,7 +925,6 @@ if (is_android) {
+@@ -920,7 +920,6 @@ if (is_android) {
        "//components/password_manager/content/browser:browser",
        "//components/policy:chrome_settings_proto_generated_compile",
        "//components/policy/core/browser:test_support",
@@ -2692,7 +2757,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
        "//components/safe_browsing/content/common:interfaces",
        "//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier",
        "//components/safe_browsing/core/common/fbs:client_model",
-@@ -1382,7 +1381,6 @@ if (!is_android) {
+@@ -1379,7 +1378,6 @@ if (!is_android) {
        "//components/resources",
        "//components/safe_browsing:buildflags",
        "//components/safe_browsing/content/browser",
@@ -2700,7 +2765,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
        "//components/safe_browsing/content/browser:safe_browsing_service",
        "//components/safe_browsing/content/browser/password_protection",
        "//components/safe_browsing/content/browser/password_protection:test_support",
-@@ -5836,7 +5834,6 @@ test("unit_tests") {
+@@ -5891,7 +5889,6 @@ test("unit_tests") {
      "//components/resources",
      "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
@@ -2711,7 +2776,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
 diff --git a/components/BUILD.gn b/components/BUILD.gn
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -637,7 +637,6 @@ test("components_unittests") {
+@@ -643,7 +643,6 @@ test("components_unittests") {
    if (safe_browsing_mode == 1) {
      deps += [
        "//components/safe_browsing/content/browser:unit_tests",
@@ -2761,7 +2826,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -606,10 +606,7 @@ PermissionRequestManager::PermissionRequestManager(
+@@ -608,10 +608,7 @@ PermissionRequestManager::PermissionRequestManager(
        view_(nullptr),
        tab_is_hidden_(web_contents->GetVisibility() ==
                       content::Visibility::HIDDEN),
@@ -2800,8 +2865,8 @@ diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/com
 diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
 --- a/components/safe_browsing/core/common/features.cc
 +++ b/components/safe_browsing/core/common/features.cc
-@@ -160,7 +160,7 @@ const base::Feature kSendSampledPingsForProtegoAllowlistDomains{
-     base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -161,7 +161,7 @@ const base::Feature kSevenZipEvaluationEnabled{
+     "SafeBrowsingSevenZipEvaluationEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kSuspiciousSiteTriggerQuotaFeature{
 -    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -2876,7 +2941,7 @@ diff --git a/components/unified_consent/unified_consent_service.cc b/components/
 diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.cc b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc
 +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
-@@ -49,7 +49,6 @@ FileSystemAccessFileWriterImpl::FileSystemAccessFileWriterImpl(
+@@ -44,7 +44,6 @@ FileSystemAccessFileWriterImpl::FileSystemAccessFileWriterImpl(
        lock_(std::move(lock)),
        quarantine_connection_callback_(
            std::move(quarantine_connection_callback)),
@@ -2884,19 +2949,19 @@ diff --git a/content/browser/file_system_access/file_system_access_file_writer_i
        auto_close_(auto_close) {
    DCHECK_EQ(swap_url.type(), url.type());
    DCHECK_EQ(lock_->type(),
-@@ -257,7 +256,7 @@ void FileSystemAccessFileWriterImpl::CloseImpl(CloseCallback callback) {
-           FileSystemOperation::CopyOrMoveOption::
-               kPreserveDestinationPermissions),
-       std::move(quarantine_connection_callback_),
--      has_transient_user_activation_);
-+      false);
+@@ -253,7 +252,7 @@ void FileSystemAccessFileWriterImpl::CloseImpl(CloseCallback callback) {
+               FileSystemOperation::CopyOrMoveOption::
+                   kPreserveDestinationPermissions),
+           std::move(quarantine_connection_callback_),
+-          has_transient_user_activation_);
++          false);
    // Allows the unique pointer to be bound to the callback so the helper stays
    // alive until the operation completes.
-   SafeMoveHelper* raw_helper = safe_move_helper.get();
+   FileSystemAccessSafeMoveHelper* raw_helper =
 diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.h b/content/browser/file_system_access/file_system_access_file_writer_impl.h
 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.h
 +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h
-@@ -122,11 +122,6 @@ class CONTENT_EXPORT FileSystemAccessFileWriterImpl
+@@ -123,11 +123,6 @@ class CONTENT_EXPORT FileSystemAccessFileWriterImpl
    download::QuarantineConnectionCallback quarantine_connection_callback_
        GUARDED_BY_CONTEXT(sequence_checker_);
  
@@ -2908,10 +2973,10 @@ diff --git a/content/browser/file_system_access/file_system_access_file_writer_i
    // Changes will be written to the target file even if the stream isn't
    // explicitly closed.
    bool auto_close_ GUARDED_BY_CONTEXT(sequence_checker_) = false;
-diff --git a/content/browser/file_system_access/safe_move_helper.cc b/content/browser/file_system_access/safe_move_helper.cc
---- a/content/browser/file_system_access/safe_move_helper.cc
-+++ b/content/browser/file_system_access/safe_move_helper.cc
-@@ -148,8 +148,7 @@ SafeMoveHelper::SafeMoveHelper(
+diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.cc b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
++++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+@@ -150,8 +150,7 @@ FileSystemAccessSafeMoveHelper::FileSystemAccessSafeMoveHelper(
        dest_url_(dest_url),
        options_(options),
        quarantine_connection_callback_(
@@ -2919,72 +2984,46 @@ diff --git a/content/browser/file_system_access/safe_move_helper.cc b/content/br
 -      has_transient_user_activation_(has_transient_user_activation) {}
 +          std::move(quarantine_connection_callback)) {}
  
- SafeMoveHelper::~SafeMoveHelper() = default;
+ FileSystemAccessSafeMoveHelper::~FileSystemAccessSafeMoveHelper() = default;
  
-@@ -163,14 +162,9 @@ void SafeMoveHelper::Start(SafeMoveHelperCallback callback) {
+@@ -166,15 +165,8 @@ void FileSystemAccessSafeMoveHelper::Start(
      return;
    }
  
 -  if (!RequireSecurityChecks() || !manager_->permission_context()) {
      DidAfterWriteCheck(
          FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);
-     return;
+-    return;
 -  }
 -
--  ComputeHashForSourceFile(base::BindOnce(&SafeMoveHelper::DoAfterWriteCheck,
--                                          weak_factory_.GetWeakPtr()));
+-  ComputeHashForSourceFile(
+-      base::BindOnce(&FileSystemAccessSafeMoveHelper::DoAfterWriteCheck,
+-                     weak_factory_.GetWeakPtr()));
  }
  
- void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
-@@ -190,44 +184,6 @@ void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
+ void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile(
+@@ -195,7 +187,7 @@ void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile(
                       std::move(wrapped_callback), source_url()));
  }
  
--void SafeMoveHelper::DoAfterWriteCheck(base::File::Error hash_result,
--                                       const std::string& hash,
--                                       int64_t size) {
--  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--
--  if (hash_result != base::File::FILE_OK) {
--    // Calculating the hash failed.
--    std::move(callback_).Run(file_system_access_error::FromStatus(
--        blink::mojom::FileSystemAccessStatus::kOperationAborted,
--        "Failed to perform Safe Browsing check."));
--    return;
--  }
--
--  if (!manager_) {
--    std::move(callback_).Run(file_system_access_error::FromStatus(
--        blink::mojom::FileSystemAccessStatus::kOperationAborted));
--    return;
--  }
--
--  content::GlobalRenderFrameHostId outermost_main_frame_id;
--  auto* rfh = content::RenderFrameHost::FromID(context_.frame_id);
--  if (rfh)
--    outermost_main_frame_id = rfh->GetOutermostMainFrame()->GetGlobalId();
--
--  auto item = std::make_unique<FileSystemAccessWriteItem>();
--  item->target_file_path = dest_url().path();
--  item->full_path = source_url().path();
--  item->sha256_hash = hash;
--  item->size = size;
--  item->frame_url = context_.url;
--  item->outermost_main_frame_id = outermost_main_frame_id;
--  item->has_user_gesture = has_transient_user_activation_;
--  manager_->permission_context()->PerformAfterWriteChecks(
--      std::move(item), context_.frame_id,
--      base::BindOnce(&SafeMoveHelper::DidAfterWriteCheck,
--                     weak_factory_.GetWeakPtr()));
+-void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck(
++/*void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck(
+     base::File::Error hash_result,
+     const std::string& hash,
+     int64_t size) {
+@@ -232,7 +224,7 @@ void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck(
+       std::move(item), context_.frame_id,
+       base::BindOnce(&FileSystemAccessSafeMoveHelper::DidAfterWriteCheck,
+                      weak_factory_.GetWeakPtr()));
 -}
--
- void SafeMoveHelper::DidAfterWriteCheck(
++}*/
+ 
+ void FileSystemAccessSafeMoveHelper::DidAfterWriteCheck(
      FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-diff --git a/content/browser/file_system_access/safe_move_helper.h b/content/browser/file_system_access/safe_move_helper.h
---- a/content/browser/file_system_access/safe_move_helper.h
-+++ b/content/browser/file_system_access/safe_move_helper.h
-@@ -53,9 +53,6 @@ class CONTENT_EXPORT SafeMoveHelper {
+diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.h b/content/browser/file_system_access/file_system_access_safe_move_helper.h
+--- a/content/browser/file_system_access/file_system_access_safe_move_helper.h
++++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h
+@@ -55,9 +55,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper {
   private:
    SEQUENCE_CHECKER(sequence_checker_);
  
@@ -2994,7 +3033,7 @@ diff --git a/content/browser/file_system_access/safe_move_helper.h b/content/bro
    void DidAfterWriteCheck(
        FileSystemAccessPermissionContext::AfterWriteCheckResult result);
    void DidFileSkipQuarantine(base::File::Error result);
-@@ -74,7 +71,7 @@ class CONTENT_EXPORT SafeMoveHelper {
+@@ -76,7 +73,7 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper {
    // except temporary file systems.
    // TOOD(crbug.com/1103076): Extend this check to non-native paths.
    bool RequireSecurityChecks() const {
@@ -3003,16 +3042,16 @@ diff --git a/content/browser/file_system_access/safe_move_helper.h b/content/bro
    }
  
    base::WeakPtr<FileSystemAccessManagerImpl> manager_
-@@ -90,9 +87,6 @@ class CONTENT_EXPORT SafeMoveHelper {
+@@ -92,9 +89,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper {
    download::QuarantineConnectionCallback quarantine_connection_callback_
        GUARDED_BY_CONTEXT(sequence_checker_);
  
 -  bool has_transient_user_activation_ GUARDED_BY_CONTEXT(sequence_checker_) =
 -      false;
 -
-   SafeMoveHelperCallback callback_ GUARDED_BY_CONTEXT(sequence_checker_);
+   FileSystemAccessSafeMoveHelperCallback callback_
+       GUARDED_BY_CONTEXT(sequence_checker_);
  
-   base::WeakPtrFactory<SafeMoveHelper> weak_factory_
 diff --git a/content/public/browser/file_system_access_permission_context.h b/content/public/browser/file_system_access_permission_context.h
 --- a/content/public/browser/file_system_access_permission_context.h
 +++ b/content/public/browser/file_system_access_permission_context.h
diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch
index e9a626fc..7fa38d3a 100644
--- a/build/patches/Disable-safety-check.patch
+++ b/build/patches/Disable-safety-check.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -415,7 +415,6 @@ android_library("chrome_java") {
+@@ -416,7 +416,6 @@ android_library("chrome_java") {
      "//chrome/browser/privacy_sandbox/android:java",
      "//chrome/browser/profiles/android:java",
      "//chrome/browser/safe_browsing/android:java",
@@ -21,16 +21,16 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/search_engines/android:java",
      "//chrome/browser/search_resumption:java",
      "//chrome/browser/segmentation_platform:factory_java",
-@@ -1041,8 +1040,6 @@ robolectric_binary("chrome_junit_tests") {
-     "//chrome/browser/preferences:preferences_junit_tests",
+@@ -1049,8 +1048,6 @@ robolectric_binary("chrome_junit_tests") {
      "//chrome/browser/privacy_guide/android:java",
+     "//chrome/browser/privacy_guide/android:junit",
      "//chrome/browser/profiles/android:java",
 -    "//chrome/browser/safety_check/android:java",
 -    "//chrome/browser/safety_check/android:junit",
      "//chrome/browser/search_engines/android:java",
      "//chrome/browser/search_resumption:junit",
      "//chrome/browser/segmentation_platform:factory_java",
-@@ -1570,8 +1567,6 @@ android_library("chrome_test_java") {
+@@ -1583,8 +1580,6 @@ android_library("chrome_test_java") {
      "//chrome/browser/profiles/android:java",
      "//chrome/browser/safe_browsing/android:java",
      "//chrome/browser/safe_browsing/android:javatests",
@@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -941,7 +941,6 @@ chrome_java_sources = [
+@@ -944,7 +944,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3306,7 +3306,6 @@ static_library("browser") {
+@@ -3333,7 +3333,6 @@ static_library("browser") {
        "//chrome/browser/privacy_sandbox/android:jni_headers",
        "//chrome/browser/reading_list/android",
        "//chrome/browser/safe_browsing/android:safe_browsing_enums",
diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch
index 4f169016..cd56d946 100644
--- a/build/patches/Disable-smart-selection-by-default.patch
+++ b/build/patches/Disable-smart-selection-by-default.patch
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -189,6 +189,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -190,6 +190,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCCTBrandTransparency,
      &kCCTClientDataHeader,
      &kCCTIncognito,
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCCTIncognitoAvailableToThirdParty,
      &kCCTNewDownloadTab,
      &kCCTPackageNameRecording,
-@@ -590,6 +591,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{
+@@ -605,6 +606,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{
  const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid",
                                               base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -61,6 +61,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting;
+@@ -62,6 +62,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting;
  extern const base::Feature kChromeNewDownloadTab;
  extern const base::Feature kChromeShareLongScreenshot;
  extern const base::Feature kChromeShareScreenshot;
@@ -97,7 +97,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
 --- a/testing/variations/fieldtrial_testing_config.json
 +++ b/testing/variations/fieldtrial_testing_config.json
-@@ -2705,6 +2705,21 @@
+@@ -2834,6 +2834,21 @@
              ]
          }
      ],
@@ -116,7 +116,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
 +            ]
 +        }
 +    ],
-     "ChromeStart": [
+     "CommerceHintAndroid": [
          {
              "platforms": [
 --
diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch
index b226b734..6c910149 100644
--- a/build/patches/Disable-some-signed-exchange-features.patch
+++ b/build/patches/Disable-some-signed-exchange-features.patch
@@ -10,23 +10,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -883,7 +883,7 @@ const base::Feature kSharedArrayBufferOnDesktop{
+@@ -896,12 +896,12 @@ const base::Feature kSharedArrayBufferOnDesktop{
  // Signed Exchange Reporting for distributors
  // https://www.chromestatus.com/feature/5687904902840320
  const base::Feature kSignedExchangeReportingForDistributors{
 -    "SignedExchangeReportingForDistributors", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "SignedExchangeReportingForDistributors", base::FEATURE_DISABLED_BY_DEFAULT};
  
- // Subresource prefetching+loading via Signed HTTP Exchange
- // https://www.chromestatus.com/feature/5126805474246656
-@@ -893,7 +893,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
  // Origin-Signed HTTP Exchanges (for WebPackage Loading)
  // https://www.chromestatus.com/feature/5745285984681984
  const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
 -                                        base::FEATURE_ENABLED_BY_DEFAULT};
 +                                        base::FEATURE_DISABLED_BY_DEFAULT};
  
- // Whether to send a ping to the inner URL upon navigation or not.
- const base::Feature kSignedHTTPExchangePingValidity{
+ // Delays RenderProcessHost shutdown by a few seconds to allow the subframe's
+ // process to be potentially reused. This aims to reduce process churn in
 --
 2.25.1
diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch
index d9868f7d..2695174a 100644
--- a/build/patches/Disable-text-fragments-by-default.patch
+++ b/build/patches/Disable-text-fragments-by-default.patch
@@ -12,16 +12,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/flag_descriptions.cc                          | 4 ++++
  chrome/browser/flag_descriptions.h                           | 3 +++
  chrome/browser/ui/prefs/prefs_tab_helper.cc                  | 2 +-
- content/child/runtime_features.cc                            | 2 +-
- third_party/blink/common/features.cc                         | 2 +-
+ content/child/runtime_features.cc                            | 1 +
+ third_party/blink/common/features.cc                         | 4 ++++
+ third_party/blink/public/common/features.h                   | 1 +
  third_party/blink/renderer/core/dom/document.cc              | 5 +++++
- .../blink/renderer/platform/runtime_enabled_features.json5   | 3 +--
- 9 files changed, 26 insertions(+), 5 deletions(-)
+ .../blink/renderer/platform/runtime_enabled_features.json5   | 5 ++---
+ 10 files changed, 31 insertions(+), 4 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5959,6 +5959,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6080,6 +6080,11 @@ const FeatureEntry kFeatureEntries[] = {
           "")},
  #endif
  
@@ -36,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2646,6 +2646,11 @@
+@@ -2699,6 +2699,11 @@
      "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"],
      "expiry_milestone": 105
    },
@@ -51,7 +52,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1373,6 +1373,10 @@ const char kEnableRestrictedWebApisDescription[] =
+@@ -1387,6 +1387,10 @@ const char kEnableRestrictedWebApisDescription[] =
      "Enable the restricted web APIs for dev trial. This will be replaced with "
      "permission policies to control the capabilities afterwards.";
  
@@ -65,7 +66,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -764,6 +764,9 @@ extern const char
+@@ -767,6 +767,9 @@ extern const char
  extern const char kEnableRestrictedWebApisName[];
  extern const char kEnableRestrictedWebApisDescription[];
  
@@ -90,31 +91,43 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -283,7 +283,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
-     {wf::EnableSpeculationRulesPrefetchProxy,
-      blink::features::kSpeculationRulesPrefetchProxy, kSetOnlyIfOverridden},
+@@ -270,6 +270,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+      features::kSharedArrayBufferOnDesktop},
+     {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill},
      {wf::EnableSubresourceWebBundles, features::kSubresourceWebBundles},
--    {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor},
-+    {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor}, // will set the TextFragmentIdentifiers runtime feature
++    {wf::EnableTextFragmentIdentifiers, blink::features::kTextFragmentAnchor},
      {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
-     {wf::EnableCSSSelectorFragmentAnchor,
-      blink::features::kCssSelectorFragmentAnchor},
+     {wf::EnableUserActivationSameOriginVisibility,
+      features::kUserActivationSameOriginVisibility},
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -521,7 +521,7 @@ const base::Feature kStopInBackground {
+@@ -449,6 +449,10 @@ const base::Feature kStopInBackground {
+ const base::Feature kDropInputEventsBeforeFirstPaint{
+     "DropInputEventsBeforeFirstPaint", base::FEATURE_DISABLED_BY_DEFAULT};
  
- // Enable text snippets in URL fragments. https://crbug.com/919204.
- const base::Feature kTextFragmentAnchor{"TextFragmentAnchor",
--                                        base::FEATURE_ENABLED_BY_DEFAULT};
++// Enable text snippets in URL fragments. https://crbug.com/919204.
++const base::Feature kTextFragmentAnchor{"TextFragmentAnchor",
 +                                        base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Enables CSS selector fragment anchors. https://crbug.com/1252460
- const base::Feature kCssSelectorFragmentAnchor{
++
+ // File handling icons. https://crbug.com/1218213
+ const base::Feature kFileHandlingIcons{"FileHandlingIcons",
+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
+--- a/third_party/blink/public/common/features.h
++++ b/third_party/blink/public/common/features.h
+@@ -224,6 +224,7 @@ BLINK_COMMON_EXPORT extern const base::Feature kResourceLoadViaDataPipe;
+ BLINK_COMMON_EXPORT extern const base::Feature kServiceWorkerUpdateDelay;
+ BLINK_COMMON_EXPORT extern const base::Feature kStopInBackground;
+ BLINK_COMMON_EXPORT extern const base::Feature kDropInputEventsBeforeFirstPaint;
++BLINK_COMMON_EXPORT extern const base::Feature kTextFragmentAnchor;
+ BLINK_COMMON_EXPORT extern const base::Feature kFileHandlingIcons;
+ BLINK_COMMON_EXPORT extern const base::Feature kAllowSyncXHRInPageDismissal;
+ BLINK_COMMON_EXPORT extern const base::Feature kPrefetchPrivacyChanges;
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4241,9 +4241,14 @@ void Document::SetURL(const KURL& url) {
+@@ -4257,9 +4257,14 @@ void Document::SetURL(const KURL& url) {
    TRACE_EVENT1("navigation", "Document::SetURL", "url",
                 new_url.GetString().Utf8());
  
@@ -132,12 +145,15 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2243,8 +2243,7 @@
+@@ -2545,10 +2545,9 @@
      },
      {
        name: "TextFragmentIdentifiers",
 -      origin_trial_feature_name: "TextFragmentIdentifiers",
+       public: true,
 -      status: "stable",
+-      base_feature: "TextFragmentAnchor",
++      status: "test",
 +      origin_trial_feature_name: "TextFragmentIdentifiers"
      },
      {
diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch
index 1ac06880..230ad8bc 100644
--- a/build/patches/Disable-third-party-origin-trials.patch
+++ b/build/patches/Disable-third-party-origin-trials.patch
@@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -7289,7 +7289,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
+@@ -7323,7 +7323,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
  void NavigationRequest::ForceEnableOriginTrials(
      const std::vector<std::string>& trials) {
    DCHECK(!HasCommitted());
@@ -71,7 +71,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -476,10 +476,6 @@ void FillNavigationParamsRequest(
+@@ -474,10 +474,6 @@ void FillNavigationParamsRequest(
          common_params.initiator_origin.value();
    }
  
@@ -82,7 +82,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    navigation_params->was_discarded = commit_params.was_discarded;
    navigation_params->document_ukm_source_id =
        commit_params.document_ukm_source_id;
-@@ -512,12 +508,6 @@ void FillNavigationParamsRequest(
+@@ -510,12 +506,6 @@ void FillNavigationParamsRequest(
    navigation_params->web_bundle_claimed_url =
        commit_params.web_bundle_claimed_url;
  
@@ -95,7 +95,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    if (!commit_params.early_hints_preloaded_resources.empty()) {
      navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
      for (const auto& resource : commit_params.early_hints_preloaded_resources) {
-@@ -564,11 +554,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -562,11 +552,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
            info->url_request.GetURLRequestExtraData().get());
    DCHECK(url_request_extra_data);
  
@@ -107,7 +107,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    blink::NavigationDownloadPolicy download_policy;
    download_policy.ApplyDownloadFramePolicy(
        info->is_opener_navigation, info->url_request.HasUserGesture(),
-@@ -586,7 +571,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -584,7 +569,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
        info->url_request.HasUserGesture(),
        info->url_request.HasTextFragmentToken(),
        info->should_check_main_world_content_security_policy,
@@ -159,7 +159,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -162,13 +162,6 @@ constexpr base::FeatureParam<bool> kCacheInlineScriptCodeFixConfiguring{
+@@ -163,13 +163,6 @@ constexpr base::FeatureParam<bool> kCacheInlineScriptCodeFixConfiguring{
  Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
      const WebVector<int>& initiator_origin_trial_features) {
    Vector<OriginTrialFeature> result;
@@ -173,7 +173,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -181,18 +174,12 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -182,18 +175,12 @@ WebVector<int> CopyInitiatorOriginTrials(
  Vector<String> CopyForceEnabledOriginTrials(
      const WebVector<WebString>& force_enabled_origin_trials) {
    Vector<String> result;
@@ -192,7 +192,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -2577,10 +2564,6 @@ void DocumentLoader::CreateParserPostCommit() {
+@@ -2580,10 +2567,6 @@ void DocumentLoader::CreateParserPostCommit() {
            OriginTrialFeature::kTouchEventFeatureDetection);
      }
  
diff --git a/build/patches/Disable-update-scheduler.patch b/build/patches/Disable-update-scheduler.patch
index b03400fc..a4672872 100644
--- a/build/patches/Disable-update-scheduler.patch
+++ b/build/patches/Disable-update-scheduler.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
 --- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
 +++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
-@@ -34,9 +34,7 @@ public class UpdateScheduler {
+@@ -33,9 +33,7 @@ public class UpdateScheduler {
  
      @CalledByNative
      /* package */ static boolean isAvailable() {
diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch
index 5379b0f5..7e02cd7a 100644
--- a/build/patches/Disable-various-metrics.patch
+++ b/build/patches/Disable-various-metrics.patch
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -998,7 +998,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -991,7 +991,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -63,7 +63,6 @@
+@@ -64,7 +64,6 @@
  #include "chrome/browser/hid/chrome_hid_delegate.h"
  #include "chrome/browser/interstitials/enterprise_util.h"
  #include "chrome/browser/lifetime/browser_shutdown.h"
@@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/media/audio_service_util.h"
  #include "chrome/browser/media/router/media_router_feature.h"
  #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
-@@ -4394,16 +4393,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4479,16 +4478,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      content::NavigationHandle* handle) {
    std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
  
@@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
    MaybeAddThrottle(
        SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle),
-@@ -4488,10 +4477,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4573,10 +4562,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
    }
  
diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch
index 98ba1fc8..63d835a1 100644
--- a/build/patches/Do-not-build-API-keys-infobar.patch
+++ b/build/patches/Do-not-build-API-keys-infobar.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1286,8 +1286,6 @@ static_library("ui") {
+@@ -1295,8 +1295,6 @@ static_library("ui") {
        "singleton_tabs.h",
        "startup/automation_infobar_delegate.cc",
        "startup/automation_infobar_delegate.h",
diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch
index 4e394ce4..4e9db405 100644
--- a/build/patches/Do-not-compile-QR-code-sharing.patch
+++ b/build/patches/Do-not-compile-QR-code-sharing.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -96,7 +96,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
+@@ -97,7 +97,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
  import org.chromium.chrome.browser.share.ShareDelegate;
  import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  import org.chromium.chrome.browser.share.ShareUtils;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -493,10 +492,6 @@ public class RootUiCoordinator
+@@ -496,10 +495,6 @@ public class RootUiCoordinator
      }
  
      public void onAttachFragment(Fragment fragment) {
diff --git a/build/patches/Do-not-hide-component-extensions.patch b/build/patches/Do-not-hide-component-extensions.patch
index ecaa8597..0f7295ed 100644
--- a/build/patches/Do-not-hide-component-extensions.patch
+++ b/build/patches/Do-not-hide-component-extensions.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -459,9 +459,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
+@@ -465,9 +465,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
  }
  
  bool Extension::ShouldExposeViaManagementAPI() const {
diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch
index 682d7f25..fa84031f 100644
--- a/build/patches/Do-not-link-with-libatomic.patch
+++ b/build/patches/Do-not-link-with-libatomic.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1543,7 +1543,7 @@ mixed_component("base") {
+@@ -1559,7 +1559,7 @@ mixed_component("base") {
    # more robust check for this.
    if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
        host_toolchain != "//build/toolchain/cros:host") {
diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch
index 43f8fa1f..8b289ee5 100644
--- a/build/patches/DoH-improvements.patch
+++ b/build/patches/DoH-improvements.patch
@@ -82,7 +82,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -3283,6 +3283,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) {
+@@ -3293,6 +3293,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) {
    bool changed = dns_client_->SetConfigOverrides(std::move(overrides));
  
    if (changed) {
diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch
index ee8696a1..b762bfe1 100644
--- a/build/patches/Enable-Certificate-Transparency.patch
+++ b/build/patches/Enable-Certificate-Transparency.patch
@@ -3,6 +3,8 @@ Date: Fri, 10 Jun 2022 14:20:02 +0200
 Subject: Enable Certificate Transparency
 
 Reporting/auditing functionalities are disabled; a flag is exposed.
+Add guard to make sure that certificate transparency stays enabled
+by default.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
@@ -13,16 +15,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/net/system_network_context_manager.cc  | 4 ----
  chrome/browser/ssl/sct_reporting_service.cc           | 5 +++++
  chrome/common/chrome_features.cc                      | 6 +++---
- net/http/transport_security_state.cc                  | 5 +++--
+ net/http/transport_security_state.cc                  | 9 +++++----
  net/url_request/report_sender.cc                      | 3 ++-
  services/network/network_context.cc                   | 2 +-
  services/network/sct_auditing/sct_auditing_handler.cc | 2 ++
- 11 files changed, 29 insertions(+), 12 deletions(-)
+ 11 files changed, 31 insertions(+), 14 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8658,6 +8658,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8848,6 +8848,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebMidiDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWebMidi)},
  #if BUILDFLAG(IS_ANDROID)
@@ -49,7 +51,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6504,6 +6504,10 @@ const char kAutofillCreditCardUploadDescription[] =
+@@ -6652,6 +6652,10 @@ const char kAutofillCreditCardUploadDescription[] =
  #endif  // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@@ -63,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3767,6 +3767,9 @@ extern const char kAutofillCreditCardUploadDescription[];
+@@ -3848,6 +3848,9 @@ extern const char kAutofillCreditCardUploadDescription[];
  #endif  // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@@ -76,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -914,7 +914,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
+@@ -851,7 +851,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
  bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
    if (certificate_transparency_enabled_for_testing_.has_value())
      return certificate_transparency_enabled_for_testing_.value();
@@ -84,7 +86,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
  // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and
  // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build
  // dates, and allow embedders to enforce.
-@@ -928,9 +927,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
+@@ -865,9 +864,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
  #else
    return true;
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -112,7 +114,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -822,9 +822,9 @@ const base::Feature kSchedulerConfiguration{"SchedulerConfiguration",
+@@ -838,9 +838,9 @@ const base::Feature kSchedulerConfiguration{"SchedulerConfiguration",
  
  // Controls whether SCT audit reports are queued and the rate at which they
  // should be sampled. Default sampling rate is 1/10,000 certificates.
@@ -136,24 +138,27 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_
    if (g_hsts_source == nullptr)
      return false;
  #endif
-@@ -383,11 +384,11 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
+@@ -382,12 +383,12 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
+ }  // namespace
  
  // static
- const base::Feature TransportSecurityState::kDynamicExpectCTFeature{
--    "DynamicExpectCT", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};                         // disabled in Bromite
+-const base::Feature TransportSecurityState::kDynamicExpectCTFeature{
+-    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};
++const base::Feature TransportSecurityState::kDynamicExpectCTFeature{   // must stay disabled
++    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};             // in Bromite
  
  // static
- const base::Feature TransportSecurityState::kCertificateTransparencyEnforcement{
+-const base::Feature TransportSecurityState::kCertificateTransparencyEnforcement{
 -    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};       // always enabled in Bromite
++const base::Feature TransportSecurityState::kCertificateTransparencyEnforcement{   // must stay enabled
++    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};       // in Bromite
  
  void SetTransportSecurityStateSourceForTesting(
      const TransportSecurityStateSource* source) {
 diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
 --- a/net/url_request/report_sender.cc
 +++ b/net/url_request/report_sender.cc
-@@ -86,7 +86,8 @@ void ReportSender::Send(const GURL& report_uri,
+@@ -87,7 +87,8 @@ void ReportSender::Send(
  
    URLRequest* raw_url_request = url_request.get();
    inflight_requests_[raw_url_request] = std::move(url_request);
@@ -166,7 +171,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -2658,7 +2658,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2662,7 +2662,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
    // TransportSecurityState.  Since no requests have been made yet, safe to do
    // this even after the call to Build().
  
@@ -178,7 +183,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
 diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/network/sct_auditing/sct_auditing_handler.cc
 --- a/services/network/sct_auditing/sct_auditing_handler.cc
 +++ b/services/network/sct_auditing/sct_auditing_handler.cc
-@@ -115,6 +115,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
+@@ -114,6 +114,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }
@@ -186,7 +191,7 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne
  
    // Only audit valid SCTs. This ensures that they come from a known log, have
    // a valid signature, and thus are expected to be public certificates. If
-@@ -330,6 +331,7 @@ void SCTAuditingHandler::AddReporter(
+@@ -329,6 +330,7 @@ void SCTAuditingHandler::AddReporter(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }
diff --git a/build/patches/Enable-ECH-by-default.patch b/build/patches/Enable-ECH-by-default.patch
index 4d193584..65f03812 100644
--- a/build/patches/Enable-ECH-by-default.patch
+++ b/build/patches/Enable-ECH-by-default.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -114,8 +114,8 @@ const base::Feature kDisableTLSResumption{"DisableTLSResumption",
+@@ -116,8 +116,8 @@ const base::Feature kDisableTLSResumption{"DisableTLSResumption",
  const base::Feature kLogTLSResumption{"LogTLSResumption",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
  
diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch
index 79911b7d..072f1f94 100644
--- a/build/patches/Enable-HEVC-by-default.patch
+++ b/build/patches/Enable-HEVC-by-default.patch
@@ -2,20 +2,24 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 27 Sep 2022 23:39:54 +0200
 Subject: Enable HEVC by default
 
+Add a guard to avoid setting to be disabled upstream.
+
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/base/media_switches.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ media/base/media_switches.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -275,7 +275,7 @@ const base::Feature kPictureInPicture{"PictureInPicture",
+@@ -270,8 +270,8 @@ const base::Feature kPictureInPicture{"PictureInPicture",
+ 
  #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
  // Enables HEVC hardware accelerated decoding.
- const base::Feature kPlatformHEVCDecoderSupport{
--    "PlatformHEVCDecoderSupport", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};
+-const base::Feature kPlatformHEVCDecoderSupport{
+-    "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};
++const base::Feature kPlatformHEVCDecoderSupport{                       // must be enabled
++    "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};   // in Bromite
  #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
  
  // Only decode preload=metadata elements upon visibility.
diff --git a/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch b/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch
index f26a44f0..72625e27 100644
--- a/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch
+++ b/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
 --- a/components/external_intents/android/external_intents_features.cc
 +++ b/components/external_intents/android/external_intents_features.cc
-@@ -34,7 +34,7 @@ const base::Feature kAutofillAssistantGoogleInitiatorOriginCheck{
+@@ -36,7 +36,7 @@ const base::Feature kExternalNavigationDebugLogs{
  
  const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
      "IntentBlockExternalFormRedirectsNoGesture",
diff --git a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch
index 3c11c7ca..edf4570f 100644
--- a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch
+++ b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -873,11 +873,7 @@ const base::Feature kSecurityKeyAttestationPrompt{
+@@ -889,11 +889,7 @@ const base::Feature kSecurityKeyAttestationPrompt{
  // browser_features, as they are only used on the browser side.
  const base::Feature kSitePerProcess {
    "SitePerProcess",
diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch
index db3f4e67..30056624 100644
--- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch
+++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4348,9 +4348,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4445,9 +4445,6 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(
           site_isolation::features::kSiteIsolationForPasswordSites)},
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1364,7 +1364,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1415,7 +1415,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
    registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
    registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
    registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
    registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true);
    registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0);
  }
-@@ -1378,7 +1378,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1429,7 +1429,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
    // user policy in addition to the same named ones in Local State (which are
    // used for mapping the command-line flags).
    registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -71,7 +71,7 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -988,7 +988,7 @@ const base::Feature kStopVideoCaptureOnScreenLock{
+@@ -1000,7 +1000,7 @@ const base::Feature kStopVideoCaptureOnScreenLock{
  // Controls whether site isolation should use origins instead of scheme and
  // eTLD+1.
  const base::Feature kStrictOriginIsolation{"StrictOriginIsolation",
diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch
index 97636049..fe0ba6a3 100644
--- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch
+++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -1175,9 +1175,9 @@
+@@ -1225,9 +1225,9 @@
      "expiry_milestone": 110
    },
    {
diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch
index cff66feb..83dc6394 100644
--- a/build/patches/Enable-native-Android-autofill.patch
+++ b/build/patches/Enable-native-Android-autofill.patch
@@ -55,7 +55,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -477,6 +477,7 @@ android_library("chrome_java") {
+@@ -461,6 +461,7 @@ android_library("chrome_java") {
      "//components/autofill_assistant/android:public_dependencies_java",
      "//components/autofill_assistant/android:public_java",
      "//components/autofill_assistant/browser:proto_java",
@@ -99,24 +99,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      private static final String PREF_KEY_CATEGORY_SAVED_PASSWORDS = "saved_passwords";
      private static final String PREF_KEY_CATEGORY_EXCEPTIONS = "exceptions";
      private static final String PREF_KEY_SAVED_PASSWORDS_NO_TEXT = "saved_passwords_no_text";
-@@ -119,6 +130,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
-     private String mSearchQuery;
+@@ -120,6 +131,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
      private Preference mLinkPref;
      private Menu mMenu;
+ 
 +    private ChromeSwitchPreference mEnableAndroidAutofillSwitch;
 +    private ChromeSwitchPreference mEnableAndroidAutofillIncognitoSwitch;
- 
-     private @Nullable PasswordCheck mPasswordCheck;
      private @ManagePasswordsReferrer int mManagePasswordsReferrer;
-@@ -286,6 +299,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
+ 
+     /**
+@@ -284,6 +297,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
          }
  
          createSavePasswordsSwitch();
 +        createEnableAndroidAutofillSwitch();
          createAutoSignInCheckbox();
-         if (mPasswordCheck != null) {
-             createCheckPasswords();
-@@ -525,6 +539,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
+ 
+         if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
+@@ -518,6 +532,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
                  getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE));
      }
  
@@ -191,7 +191,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
-@@ -75,6 +75,17 @@ import org.chromium.ui.base.WindowAndroid;
+@@ -74,6 +74,17 @@ import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.util.ColorUtils;
  import org.chromium.url.GURL;
  
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
  /**
   * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}.
   * This class is not intended to be extended.
-@@ -212,6 +223,8 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -211,6 +222,8 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
      private int mThemeColor;
      private boolean mUsedCriticalPersistedTabData;
  
@@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
      /**
       * Creates an instance of a {@link TabImpl}.
       *
-@@ -759,6 +772,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -775,6 +788,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
          for (TabObserver observer : mObservers) observer.onDestroyed(this);
          mObservers.clear();
  
@@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
          mUserDataHost.destroy();
          mTabViewManager.destroy();
          hideNativePage(false, null);
-@@ -1340,6 +1358,16 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1356,6 +1374,16 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
          return tabsPtrArray;
      }
  
@@ -247,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
      /**
       * Initializes the {@link WebContents}. Completes the browser content components initialization
       * around a native WebContents pointer.
-@@ -1389,6 +1417,27 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1405,6 +1433,27 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
                              mDelegateFactory.createContextMenuPopulatorFactory(this), this));
  
              mWebContents.notifyRendererPreferenceUpdate();
@@ -275,11 +275,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
              TabHelpers.initWebContentsHelpers(this);
              notifyContentChanged();
          } finally {
-@@ -1721,5 +1770,6 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1742,6 +1791,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
          void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title);
          void loadOriginalImage(long nativeTabAndroid);
          boolean handleNonNavigationAboutURL(GURL url);
 +        void initializeAutofillIfNecessary(long nativeTabAndroid);
+         void onShow(long nativeTabAndroid);
      }
  }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
@@ -314,7 +315,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2456,6 +2456,13 @@ static_library("browser") {
+@@ -2478,6 +2478,13 @@ static_library("browser") {
      deps += [ "//chrome/browser/error_reporting" ]
    }
  
@@ -331,7 +332,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
 --- a/chrome/browser/android/tab_android.cc
 +++ b/chrome/browser/android/tab_android.cc
-@@ -69,6 +69,13 @@
+@@ -70,6 +70,13 @@
  #include "url/android/gurl_android.h"
  #include "url/gurl.h"
  
@@ -345,7 +346,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
  using base::android::AttachCurrentThread;
  using base::android::ConvertUTF8ToJavaString;
  using base::android::JavaParamRef;
-@@ -470,3 +477,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
+@@ -505,3 +512,19 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
    // This will automatically bind to the Java object and pass ownership there.
    new TabAndroid(env, obj);
  }
@@ -368,7 +369,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
 diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
 --- a/chrome/browser/android/tab_android.h
 +++ b/chrome/browser/android/tab_android.h
-@@ -160,6 +160,8 @@ class TabAndroid : public base::SupportsUserData {
+@@ -162,6 +162,8 @@ class TabAndroid : public base::SupportsUserData {
  
    void SetDevToolsAgentHost(scoped_refptr<content::DevToolsAgentHost> host);
  
@@ -380,7 +381,7 @@ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_a
 diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc
 +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
-@@ -180,7 +180,8 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
+@@ -168,7 +168,8 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
        base::BindRepeating(
            &autofill::BrowserDriverInitHook,
            autofill::ChromeAutofillClient::FromWebContents(portal_contents),
@@ -409,7 +410,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -164,6 +164,9 @@
+@@ -172,6 +172,9 @@
  #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h"
  #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h"
  #include "content/public/common/content_features.h"
@@ -419,7 +420,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
  #else
  #include "chrome/browser/accuracy_tips/accuracy_service_factory.h"
  #include "chrome/browser/banners/app_banner_manager_desktop.h"
-@@ -321,7 +324,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -334,7 +337,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
        base::BindRepeating(
            &autofill::BrowserDriverInitHook,
            autofill::ChromeAutofillClient::FromWebContents(web_contents),
@@ -470,112 +471,125 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co
 diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
 --- a/components/autofill/content/browser/content_autofill_driver.cc
 +++ b/components/autofill/content/browser/content_autofill_driver.cc
-@@ -272,6 +272,8 @@ void ContentAutofillDriver::FormsSeenImpl(
-     const std::vector<FormData>& updated_forms,
-     const std::vector<FormGlobalId>& removed_forms) {
-   autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
+@@ -317,6 +317,8 @@ void ContentAutofillDriver::FormsSeen(
+          const std::vector<FormData>& updated_forms,
+          const std::vector<FormGlobalId>& removed_forms) {
+         target->autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
+       });
  }
  
- void ContentAutofillDriver::SetFormToBeProbablySubmittedImpl(
-@@ -294,6 +296,8 @@ void ContentAutofillDriver::FormSubmittedImpl(const FormData& form,
-   }
- 
-   autofill_manager_->OnFormSubmitted(form, known_success, source);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnFormSubmitted(form, known_success, source);
+@@ -343,6 +345,8 @@ void ContentAutofillDriver::FormSubmitted(
+         }
+         target->autofill_manager_->OnFormSubmitted(form, known_success,
+                                                    submission_source);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnFormSubmitted(form, known_success, submission_source);
+       });
  }
  
- void ContentAutofillDriver::TextFieldDidChangeImpl(
-@@ -302,6 +306,8 @@ void ContentAutofillDriver::TextFieldDidChangeImpl(
-     const gfx::RectF& bounding_box,
-     base::TimeTicks timestamp) {
-   autofill_manager_->OnTextFieldDidChange(form, field, bounding_box, timestamp);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnTextFieldDidChange(form, field, bounding_box, timestamp);
+@@ -363,6 +367,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
+          base::TimeTicks timestamp) {
+         target->autofill_manager_->OnTextFieldDidChange(
+             form, field, bounding_box, timestamp);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnTextFieldDidChange(form, field, bounding_box, timestamp);
+       });
  }
  
- void ContentAutofillDriver::TextFieldDidScrollImpl(
-@@ -309,6 +315,8 @@ void ContentAutofillDriver::TextFieldDidScrollImpl(
-     const FormFieldData& field,
-     const gfx::RectF& bounding_box) {
-   autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box);
+@@ -381,6 +387,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
+          const FormFieldData& field, const gfx::RectF& bounding_box) {
+         target->autofill_manager_->OnTextFieldDidScroll(form, field,
+                                                         bounding_box);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box);
+       });
  }
  
- void ContentAutofillDriver::SelectControlDidChangeImpl(
-@@ -316,6 +324,8 @@ void ContentAutofillDriver::SelectControlDidChangeImpl(
-     const FormFieldData& field,
-     const gfx::RectF& bounding_box) {
-   autofill_manager_->OnSelectControlDidChange(form, field, bounding_box);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnSelectControlDidChange(form, field, bounding_box);
+@@ -400,6 +408,8 @@ void ContentAutofillDriver::SelectControlDidChange(
+          const FormFieldData& field, const gfx::RectF& bounding_box) {
+         target->autofill_manager_->OnSelectControlDidChange(form, field,
+                                                             bounding_box);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnSelectControlDidChange(form, field, bounding_box);
+       });
  }
  
- void ContentAutofillDriver::AskForValuesToFillImpl(
-@@ -328,15 +338,23 @@ void ContentAutofillDriver::AskForValuesToFillImpl(
-   autofill_manager_->OnAskForValuesToFill(form, field, bounding_box, query_id,
-                                           autoselect_first_suggestion,
-                                           touch_to_fill_eligible);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnAskForValuesToFill(form, field, bounding_box, query_id,
-+                                          autoselect_first_suggestion,
-+                                          touch_to_fill_eligible);
+@@ -426,6 +436,10 @@ void ContentAutofillDriver::AskForValuesToFill(
+         target->autofill_manager_->OnAskForValuesToFill(
+             form, field, bounding_box, query_id, autoselect_first_suggestion,
+             form_element_was_clicked);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnAskForValuesToFill(form, field, bounding_box, query_id,
++                                                autoselect_first_suggestion,
++                                                form_element_was_clicked);
+       });
  }
  
- void ContentAutofillDriver::HidePopupImpl() {
-   DCHECK(!IsPrerendering()) << "We should never affect UI while prerendering";
-   autofill_manager_->OnHidePopup();
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnHidePopup();
+@@ -436,12 +450,16 @@ void ContentAutofillDriver::HidePopup() {
+     DCHECK(!target->IsPrerendering())
+         << "We should never affect UI while prerendering";
+     target->autofill_manager_->OnHidePopup();
++    if (target->secondary_autofill_manager_)
++      target->secondary_autofill_manager_->OnHidePopup();
+   });
  }
  
- void ContentAutofillDriver::FocusNoLongerOnFormImpl(bool had_interacted_form) {
+ void ContentAutofillDriver::FocusNoLongerOnFormCallback(
+     bool had_interacted_form) {
    autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
 +  if (secondary_autofill_manager_)
 +    secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
  }
  
- void ContentAutofillDriver::FocusOnFormFieldImpl(
-@@ -344,25 +362,35 @@ void ContentAutofillDriver::FocusOnFormFieldImpl(
-     const FormFieldData& field,
-     const gfx::RectF& bounding_box) {
-   autofill_manager_->OnFocusOnFormField(form, field, bounding_box);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnFocusOnFormField(form, field, bounding_box);
+ void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
+@@ -469,6 +487,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
+          const FormFieldData& field, const gfx::RectF& bounding_box) {
+         target->autofill_manager_->OnFocusOnFormField(form, field,
+                                                       bounding_box);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnFocusOnFormField(form, field, bounding_box);
+       });
  }
  
- void ContentAutofillDriver::DidFillAutofillFormDataImpl(
-     const FormData& form,
-     base::TimeTicks timestamp) {
-   autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
+@@ -481,6 +501,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
+       [](ContentAutofillDriver* target, const FormData& form,
+          base::TimeTicks timestamp) {
+         target->autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
+       });
  }
  
- void ContentAutofillDriver::DidPreviewAutofillFormDataImpl() {
-   autofill_manager_->OnDidPreviewAutofillFormData();
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnDidPreviewAutofillFormData();
+@@ -490,6 +512,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
+   autofill_router().DidPreviewAutofillFormData(
+       this, [](ContentAutofillDriver* target) {
+         target->autofill_manager_->OnDidPreviewAutofillFormData();
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnDidPreviewAutofillFormData();
+       });
  }
  
- void ContentAutofillDriver::DidEndTextFieldEditingImpl() {
-   autofill_manager_->OnDidEndTextFieldEditing();
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnDidEndTextFieldEditing();
+@@ -499,6 +523,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
+   autofill_router().DidEndTextFieldEditing(
+       this, [](ContentAutofillDriver* target) {
+         target->autofill_manager_->OnDidEndTextFieldEditing();
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnDidEndTextFieldEditing();
+       });
  }
  
- void ContentAutofillDriver::SelectFieldOptionsDidChangeImpl(
-     const FormData& form) {
-   autofill_manager_->OnSelectFieldOptionsDidChange(form);
-+  if (secondary_autofill_manager_)
-+    secondary_autofill_manager_->OnSelectFieldOptionsDidChange(form);
+@@ -510,6 +536,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange(
+       this, GetFormWithFrameAndFormMetaData(raw_form),
+       [](ContentAutofillDriver* target, const FormData& form) {
+         target->autofill_manager_->OnSelectFieldOptionsDidChange(form);
++        if (target->secondary_autofill_manager_)
++          target->secondary_autofill_manager_->OnSelectFieldOptionsDidChange(form);
+       });
  }
  
- void ContentAutofillDriver::JavaScriptChangedAutofilledValueImpl(
-@@ -608,6 +636,8 @@ void ContentAutofillDriver::DidNavigateFrame(
+@@ -597,6 +625,8 @@ void ContentAutofillDriver::DidNavigateFrame(
    if (autofill_router_)  // Can be nullptr only in tests.
      autofill_router_->UnregisterDriver(this);
    autofill_manager_->Reset();
@@ -587,7 +601,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
 diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
 --- a/components/autofill/content/browser/content_autofill_driver.h
 +++ b/components/autofill/content/browser/content_autofill_driver.h
-@@ -122,11 +122,14 @@ class ContentAutofillDriver : public AutofillDriver,
+@@ -132,10 +132,13 @@ class ContentAutofillDriver : public AutofillDriver,
    ContentAutofillDriver& operator=(const ContentAutofillDriver&) = delete;
    ~ContentAutofillDriver() override;
  
@@ -597,23 +611,22 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
      autofill_manager_ = std::move(autofill_manager);
 +    secondary_autofill_manager_ = std::move(secondary_autofill_manager);
    }
- 
    AutofillManager* autofill_manager() { return autofill_manager_.get(); }
 +  AutofillManager* secondary_autofill_manager() { return secondary_autofill_manager_.get(); }
  
-   void BindPendingReceiver(
-       mojo::PendingAssociatedReceiver<mojom::AutofillDriver> pending_receiver);
-@@ -387,6 +390,10 @@ class ContentAutofillDriver : public AutofillDriver,
+   content::RenderFrameHost* render_frame_host() { return render_frame_host_; }
  
-   content::RenderWidgetHost::KeyPressEventCallback key_press_handler_;
+@@ -364,6 +367,10 @@ class ContentAutofillDriver : public AutofillDriver,
+   // code.
+   std::unique_ptr<AutofillManager> autofill_manager_ = nullptr;
  
 +  // adds a reference for AndroidAutofillManager, since native autofill works in
 +  // conjunction with browser autofill in Bromite
 +  std::unique_ptr<AutofillManager> secondary_autofill_manager_ = nullptr;
 +
-   mojo::AssociatedReceiver<mojom::AutofillDriver> receiver_{this};
+   content::RenderWidgetHost::KeyPressEventCallback key_press_handler_;
  
-   mojo::AssociatedRemote<mojom::AutofillAgent> autofill_agent_;
+   mojo::AssociatedReceiver<mojom::AutofillDriver> receiver_{this};
 diff --git a/components/autofill/content/browser/content_autofill_driver_factory.cc b/components/autofill/content/browser/content_autofill_driver_factory.cc
 --- a/components/autofill/content/browser/content_autofill_driver_factory.cc
 +++ b/components/autofill/content/browser/content_autofill_driver_factory.cc
@@ -655,7 +668,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
 diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
 --- a/components/autofill/content/renderer/password_autofill_agent.cc
 +++ b/components/autofill/content/renderer/password_autofill_agent.cc
-@@ -783,7 +783,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
+@@ -793,7 +793,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
  
  void PasswordAutofillAgent::TrackAutofilledElement(
      const blink::WebFormControlElement& element) {
@@ -670,7 +683,7 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -114,6 +114,10 @@ const char kAutofillWalletImportStorageCheckboxState[] =
+@@ -109,6 +109,10 @@ const char kAutofillWalletImportStorageCheckboxState[] =
  const char kAutocompleteLastVersionRetentionPolicy[] =
      "autocomplete.retention_policy_last_version";
  
@@ -681,7 +694,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
    registry->RegisterBooleanPref(
-@@ -143,6 +147,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -135,6 +139,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kAutofillCreditCardFidoAuthOfferCheckboxState, true);
  #endif
@@ -695,7 +708,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
 diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autofill/core/common/autofill_prefs.h
 --- a/components/autofill/core/common/autofill_prefs.h
 +++ b/components/autofill/core/common/autofill_prefs.h
-@@ -47,6 +47,8 @@ extern const char kAutofillUploadEventsLastResetTimestamp[];
+@@ -46,6 +46,8 @@ extern const char kAutofillUploadEventsLastResetTimestamp[];
  extern const char kAutofillWalletImportEnabled[];
  extern const char kAutofillWalletImportStorageCheckboxState[];
  extern const char kAutocompleteLastVersionRetentionPolicy[];
diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch
index 98321f67..cf9eb970 100644
--- a/build/patches/Enable-network-isolation-features.patch
+++ b/build/patches/Enable-network-isolation-features.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -118,14 +118,14 @@ const base::Feature kSplitCacheByIncludeCredentials{
+@@ -120,14 +120,14 @@ const base::Feature kSplitCacheByIncludeCredentials{
      "SplitCacheByIncludeCredentials", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kSplitCacheByNetworkIsolationKey{
@@ -33,7 +33,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc
  
  const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{
      "ForceIsolationInfoFrameOriginToTopLevelFrame",
-@@ -133,19 +133,19 @@ const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{
+@@ -135,19 +135,19 @@ const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{
  
  const base::Feature kPartitionHttpServerPropertiesByNetworkIsolationKey{
      "PartitionHttpServerPropertiesByNetworkIsolationKey",
diff --git a/build/patches/Enable-prefetch-privacy-changes-by-default.patch b/build/patches/Enable-prefetch-privacy-changes-by-default.patch
index 9f01fd16..5d203590 100644
--- a/build/patches/Enable-prefetch-privacy-changes-by-default.patch
+++ b/build/patches/Enable-prefetch-privacy-changes-by-default.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -566,7 +566,7 @@ const base::Feature kComputePressure{"ComputePressure",
+@@ -460,7 +460,7 @@ const base::Feature kAllowSyncXHRInPageDismissal{
  // Prefetch request properties are updated to be privacy-preserving. See
  // crbug.com/988956.
  const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch
index 2f2e3544..729b4dda 100644
--- a/build/patches/Enable-share-intent.patch
+++ b/build/patches/Enable-share-intent.patch
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -596,6 +596,7 @@ chrome_java_resources = [
+@@ -592,6 +592,7 @@ chrome_java_resources = [
    "java/res/layout/signin_activity.xml",
    "java/res/layout/status_indicator_container.xml",
    "java/res/layout/suggestions_tile_view_condensed.xml",
@@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -963,6 +963,7 @@ chrome_java_sources = [
+@@ -966,6 +966,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
    "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
    "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -739,6 +739,24 @@ by a child template that "extends" this file.
+@@ -741,6 +741,24 @@ by a child template that "extends" this file.
              android:process=":browser_restart_process">
          </activity>
  
@@ -311,8 +311,8 @@ new file mode 100644
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -6438,6 +6438,10 @@ const FeatureEntry kFeatureEntries[] = {
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -6572,6 +6572,10 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_ANDROID)
 +    {"shared-intent-ui", flag_descriptions::kSharedIntentUIName,
@@ -325,7 +325,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2626,6 +2626,11 @@ const char kIsolateOriginsDescription[] =
+@@ -2661,6 +2661,11 @@ const char kIsolateOriginsDescription[] =
      "Requires dedicated processes for an additional set of origins, "
      "specified as a comma-separated list.";
  
@@ -340,7 +340,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1487,6 +1487,9 @@ extern const char kIsolateOriginsDescription[];
+@@ -1504,6 +1504,9 @@ extern const char kIsolateOriginsDescription[];
  
  extern const char kIsolationByDefaultName[];
  extern const char kIsolationByDefaultDescription[];
@@ -353,15 +353,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -272,6 +272,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -273,6 +273,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kRelatedSearchesAlternateUx,
      &kRelatedSearchesInBar,
      &kRelatedSearchesSimplifiedUx,
 +    &kSharedIntentUI,
      &kRelatedSearchesUi,
      &kRequestDesktopSiteDefaults,
-     &kSafeModeForCachedFlags,
-@@ -712,6 +713,9 @@ const base::Feature kNewInstanceFromDraggedLink{
+     &kRequestDesktopSiteDefaultsControl,
+@@ -724,6 +725,9 @@ const base::Feature kNewInstanceFromDraggedLink{
  const base::Feature kNewTabPageTilesTitleWrapAround{
      "NewTabPageTilesTitleWrapAround", base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -374,7 +374,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -133,6 +133,7 @@ extern const base::Feature kRequestDesktopSiteDefaults;
+@@ -139,6 +139,7 @@ extern const base::Feature kRequestDesktopSiteDefaultsDowngrade;
  extern const base::Feature kSearchEnginePromoExistingDevice;
  extern const base::Feature kSearchEnginePromoExistingDeviceV2;
  extern const base::Feature kSearchEnginePromoNewDevice;
@@ -385,7 +385,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -502,6 +502,7 @@ public abstract class ChromeFeatureList {
+@@ -506,6 +506,7 @@ public abstract class ChromeFeatureList {
      public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
      public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
      public static final String READ_LATER = "ReadLater";
@@ -396,7 +396,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4846,6 +4846,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4864,6 +4864,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Copied to your clipboard
        </message>
  
diff --git a/build/patches/Enable-user-agent-freeze-by-default.patch b/build/patches/Enable-user-agent-freeze-by-default.patch
deleted file mode 100644
index ed9895e2..00000000
--- a/build/patches/Enable-user-agent-freeze-by-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 10 Feb 2020 23:13:13 +0100
-Subject: Enable user-agent freeze by default
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- third_party/blink/common/features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
---- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -167,7 +167,7 @@ const base::Feature kFreezePurgeMemoryAllPagesFrozen{
- 
- // Freezes the user-agent as part of https://github.com/WICG/ua-client-hints.
- const base::Feature kReduceUserAgent{"ReduceUserAgent",
--                                     base::FEATURE_DISABLED_BY_DEFAULT};
-+                                     base::FEATURE_ENABLED_BY_DEFAULT};
- 
- // Enables the `sec-ch-ua-full` client hint to be sent along with the full user
- // agent string in the HTTP request headers, as well as surfacing the full user
---
-2.25.1
diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch
index e897c8ff..17d62804 100644
--- a/build/patches/Experimental-user-scripts-support.patch
+++ b/build/patches/Experimental-user-scripts-support.patch
@@ -81,7 +81,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../user_scripts/browser/user_script_loader.h | 169 ++++
  .../browser/user_script_pref_info.cc          |  34 +
  .../browser/user_script_pref_info.h           |  72 ++
- .../user_scripts/browser/user_script_prefs.cc | 278 ++++++
+ .../user_scripts/browser/user_script_prefs.cc | 270 ++++++
  .../user_scripts/browser/user_script_prefs.h  |  62 ++
  .../browser/userscripts_browser_client.cc     |  78 ++
  .../browser/userscripts_browser_client.h      |  62 ++
@@ -113,10 +113,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../user_scripts/renderer/injection_host.h    |  41 +
  .../renderer/resources/greasemonkey_api.js    |  82 ++
  .../user_scripts_renderer_resources.grd       |  14 +
- .../user_scripts/renderer/script_context.cc   | 215 +++++
+ .../user_scripts/renderer/script_context.cc   | 191 +++++
  .../user_scripts/renderer/script_context.h    |  68 ++
- .../user_scripts/renderer/script_injection.cc | 309 +++++++
- .../user_scripts/renderer/script_injection.h  | 155 ++++
+ .../user_scripts/renderer/script_injection.cc | 294 +++++++
+ .../user_scripts/renderer/script_injection.h  | 156 ++++
  .../renderer/script_injection_manager.cc      | 417 +++++++++
  .../renderer/script_injection_manager.h       | 101 +++
  .../user_scripts/renderer/script_injector.h   |  96 +++
@@ -124,19 +124,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../user_scripts/renderer/scripts_run_info.h  |  69 ++
  .../renderer/user_script_injector.cc          | 227 +++++
  .../renderer/user_script_injector.h           |  86 ++
- .../user_scripts/renderer/user_script_set.cc  | 262 ++++++
+ .../user_scripts/renderer/user_script_set.cc  | 266 ++++++
  .../user_scripts/renderer/user_script_set.h   | 101 +++
  .../renderer/user_script_set_manager.cc       |  77 ++
  .../renderer/user_script_set_manager.h        |  61 ++
  .../renderer/user_scripts_dispatcher.cc       |  36 +
  .../renderer/user_scripts_dispatcher.h        |  49 ++
  .../renderer/user_scripts_renderer_client.cc  | 105 +++
- .../renderer/user_scripts_renderer_client.h   |  37 +
+ .../renderer/user_scripts_renderer_client.h   |  36 +
  .../renderer/web_ui_injection_host.cc         |  40 +
  .../renderer/web_ui_injection_host.h          |  27 +
  .../strings/userscripts_strings.grdp          |  54 ++
  tools/gritsettings/resource_ids.spec          |   6 +
- 109 files changed, 9493 insertions(+), 2 deletions(-)
+ 109 files changed, 9450 insertions(+), 2 deletions(-)
  create mode 100644 components/user_scripts/README.md
  create mode 100755 components/user_scripts/android/BUILD.gn
  create mode 100644 components/user_scripts/android/java/res/layout/accept_script_item.xml
@@ -237,7 +237,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  }
  
  if (enable_vr) {
-@@ -578,6 +582,7 @@ android_library("chrome_java") {
+@@ -581,6 +585,7 @@ android_library("chrome_java") {
      "//components/ukm/android:java",
      "//components/url_formatter/android:url_formatter_java",
      "//components/user_prefs/android:java",
@@ -248,7 +248,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -86,6 +86,11 @@
+@@ -88,6 +88,11 @@ found in the LICENSE file.
          android:key="useragent_settings"
          android:order="20"
          android:title="@string/prefs_useragent_settings"/>
@@ -263,15 +263,15 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
-@@ -71,6 +71,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.content_public.browser.WebContents;
+@@ -72,6 +72,7 @@ import org.chromium.content_public.browser.WebContents;
  import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.widget.Toast;
+ import org.chromium.url.GURL;
 +import org.chromium.chrome.browser.user_scripts.UserScriptsUtils;
  
  import java.io.File;
  
-@@ -422,6 +423,11 @@ public class DownloadUtils {
+@@ -423,6 +424,11 @@ public class DownloadUtils {
      public static boolean openFile(String filePath, String mimeType, String downloadGuid,
              OTRProfileID otrProfileID, String originalUrl, String referrer,
              @DownloadOpenSource int source, Context context) {
@@ -323,7 +323,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3461,6 +3461,11 @@ static_library("browser") {
+@@ -3490,6 +3490,11 @@ static_library("browser") {
        ]
        deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
      }
@@ -338,7 +338,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -153,6 +153,7 @@
+@@ -155,6 +155,7 @@
  #include "components/translate/core/browser/translate_ranker_impl.h"
  #include "components/translate/core/common/translate_util.h"
  #include "components/ui_devtools/switches.h"
@@ -346,7 +346,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/version_info/version_info.h"
  #include "components/viz/common/features.h"
  #include "components/viz/common/switches.h"
-@@ -7379,6 +7380,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7534,6 +7535,10 @@ const FeatureEntry kFeatureEntries[] = {
           chromeos::features::kClipboardHistoryNudgeSessionReset)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -360,7 +360,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4949,7 +4949,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
+@@ -5049,7 +5049,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
    chrome::mojom::DynamicParams dynamic_params = {
        profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
        profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
@@ -373,7 +373,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6318,6 +6318,11 @@ const char kFollowingFeedSidepanelDescription[] =
+@@ -6475,6 +6475,11 @@ const char kFollowingFeedSidepanelDescription[] =
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
  
@@ -388,7 +388,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3630,6 +3630,9 @@ extern const char kQuickCommandsDescription[];
+@@ -3717,6 +3717,9 @@ extern const char kQuickCommandsDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // defined (OS_FUCHSIA)
  
@@ -407,9 +407,9 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "components/query_tiles/tile_service_prefs.h"
 +#include "components/user_scripts/browser/user_script_prefs.h"
  #else  // BUILDFLAG(IS_ANDROID)
- #include "chrome/browser/autofill_assistant/password_change/apc_client.h"
  #include "chrome/browser/cart/cart_service.h"
-@@ -1323,6 +1324,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+ #include "chrome/browser/device_api/device_service_impl.h"
+@@ -1350,6 +1351,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    translate::TranslatePrefs::RegisterProfilePrefs(registry);
    omnibox::RegisterProfilePrefs(registry);
    ZeroSuggestProvider::RegisterProfilePrefs(registry);
@@ -420,7 +420,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -44,6 +44,7 @@ source_set("profile") {
+@@ -50,6 +50,7 @@ source_set("profile") {
      "//components/profile_metrics",
      "//components/sync/driver",
      "//components/variations",
@@ -431,7 +431,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -258,6 +258,8 @@
+@@ -260,6 +260,8 @@
  #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
@@ -440,7 +440,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
  namespace chrome {
  
  void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
-@@ -612,6 +614,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -618,6 +620,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
    WebDataServiceFactory::GetInstance();
    webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
@@ -460,7 +460,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
  #include "chrome/browser/sessions/app_session_service_factory.h"
  #include "chrome/browser/sessions/session_service_factory.h"
-@@ -1712,6 +1714,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
+@@ -1696,6 +1698,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
  #endif
  
  #endif
@@ -535,7 +535,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "content/public/browser/web_contents.h"
  #include "content/public/browser/web_ui.h"
  #include "content/public/common/content_client.h"
-@@ -817,6 +818,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -821,6 +822,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<UserActionsUI>;
    if (url.host_piece() == chrome::kChromeUIVersionHost)
      return &NewWebUI<VersionUI>;
@@ -547,7 +547,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
 --- a/chrome/chrome_paks.gni
 +++ b/chrome/chrome_paks.gni
-@@ -106,6 +106,7 @@ template("chrome_extra_paks") {
+@@ -107,6 +107,7 @@ template("chrome_extra_paks") {
        "$root_gen_dir/skia/skia_resources.pak",
        "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
        "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
@@ -555,7 +555,7 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
        "$root_gen_dir/ui/resources/webui_generated_resources.pak",
      ]
      deps = [
-@@ -126,6 +127,7 @@ template("chrome_extra_paks") {
+@@ -128,6 +129,7 @@ template("chrome_extra_paks") {
        "//third_party/blink/public:devtools_inspector_resources",
        "//third_party/blink/public:resources",
        "//ui/resources",
@@ -611,7 +611,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  #if BUILDFLAG(ENABLE_SPELLCHECK)
    if (!spellcheck_)
      InitSpellCheck();
-@@ -575,6 +584,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -576,6 +585,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
        render_frame, registry);
  #endif
  
@@ -625,7 +625,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  #if BUILDFLAG(ENABLE_PPAPI)
    new PepperHelper(render_frame);
  #endif
-@@ -1576,7 +1592,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
+@@ -1545,7 +1561,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart(
        render_frame);
    // |render_frame| might be dead by now.
@@ -640,7 +640,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  }
  
  void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
-@@ -1585,7 +1608,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
+@@ -1554,7 +1577,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd(
        render_frame);
    // |render_frame| might be dead by now.
@@ -655,7 +655,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  }
  
  void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
-@@ -1594,7 +1624,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
+@@ -1563,7 +1593,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle(
        render_frame);
    // |render_frame| might be dead by now.
@@ -699,8 +699,8 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
        <part file="webapps_strings.grdp" />
 +      <part file="user_scripts/strings/userscripts_strings.grdp" />
  
-       <if expr="not is_ios">
-         <part file="history_clusters_strings.grdp" />
+       <part file="browser_ui/strings/android/webgl.grdp" />
+       <part file="browser_ui/strings/android/webrtc.grdp" />
 diff --git a/components/user_scripts/README.md b/components/user_scripts/README.md
 new file mode 100644
 --- /dev/null
@@ -2948,7 +2948,7 @@ new file mode 100755
 +  std::string temp(line.data() + index + prefix.length(),
 +                   line.length() - index - prefix.length());
 +
-+  if (temp.empty() || !base::IsUnicodeWhitespace(temp[0]))
++  if (temp.empty() || !base::IsAsciiWhitespace(temp[0]))
 +    return false;
 +
 +  base::TrimWhitespaceASCII(temp, base::TRIM_ALL, value);
@@ -3856,7 +3856,7 @@ diff --git a/components/user_scripts/browser/user_script_prefs.cc b/components/u
 new file mode 100644
 --- /dev/null
 +++ b/components/user_scripts/browser/user_script_prefs.cc
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,270 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -3938,7 +3938,7 @@ new file mode 100644
 +  const std::string id_;
 +};
 +
-+bool GetInt64FromPref(const base::DictionaryValue* dict,
++bool GetInt64FromPref(const base::Value* dict,
 +                      const std::string& key,
 +                      int64_t* value) {
 +  DCHECK(dict);
@@ -4044,12 +4044,9 @@ new file mode 100644
 +
 +  // remove script from prefs if no more present
 +  std::vector<std::string> all_scripts_to_remove;
-+  const base::DictionaryValue* dict =
-+      &base::Value::AsDictionaryValue(*prefs_->GetDictionary(
-+          kUserScriptsList));
-+  for (base::DictionaryValue::Iterator script_it(*dict); !script_it.IsAtEnd();
-+       script_it.Advance()) {
-+    const std::string& key = script_it.key();
++  const base::Value::Dict& dict = prefs_->GetDict(kUserScriptsList).Clone();
++  for (const auto script_it : dict) {
++    const std::string& key = script_it.first;
 +
 +    if (std::find(all_scripts.begin(), all_scripts.end(), key) == all_scripts.end()) {
 +      all_scripts_to_remove.push_back(key);
@@ -4068,14 +4065,11 @@ new file mode 100644
 +std::string UserScriptsPrefs::GetScriptsInfo() {
 +  std::string json_string;
 +
-+  const base::Value* dict =
-+    prefs_->GetDictionary(kUserScriptsList);
++  const base::Value::Dict& dict = prefs_->GetDict(kUserScriptsList);
 +
-+  if (dict) {
-+    base::JSONWriter::WriteWithOptions(
-+        *dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
-+    base::TrimWhitespaceASCII(json_string, base::TRIM_ALL, &json_string);
-+  }
++  base::JSONWriter::WriteWithOptions(
++      dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
++  base::TrimWhitespaceASCII(json_string, base::TRIM_ALL, &json_string);
 +
 +  return json_string;
 +}
@@ -4086,13 +4080,11 @@ new file mode 100644
 +  auto scriptInfo = std::make_unique<UserScriptsListPrefs::ScriptInfo>(
 +      script_id, "", base::Time::Now(), false);
 +
-+  const base::Value* scripts =
-+      prefs_->GetDictionary(kUserScriptsList);
-+  if (!scripts)
++  const base::Value::Dict& scripts = prefs_->GetDict(kUserScriptsList);
++  if (scripts.empty())
 +    return scriptInfo;
 +
-+  const base::DictionaryValue* script = static_cast<const base::DictionaryValue*>(
-+    scripts->FindDictKey(script_id));
++  const base::Value* script = scripts.Find(script_id);
 +  if (!script)
 +    return scriptInfo;
 +
@@ -7780,7 +7772,7 @@ diff --git a/components/user_scripts/renderer/script_context.cc b/components/use
 new file mode 100755
 --- /dev/null
 +++ b/components/user_scripts/renderer/script_context.cc
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,191 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -7950,36 +7942,12 @@ new file mode 100755
 +  return parent_url;
 +}
 +
-+using FrameToDocumentLoader =
-+    base::flat_map<blink::WebLocalFrame*, blink::WebDocumentLoader*>;
-+
-+FrameToDocumentLoader& FrameDocumentLoaderMap() {
-+  static base::NoDestructor<FrameToDocumentLoader> map;
-+  return *map;
-+}
-+
-+blink::WebDocumentLoader* CurrentDocumentLoader(
-+    const blink::WebLocalFrame* frame) {
-+  auto& map = FrameDocumentLoaderMap();
-+  auto it = map.find(frame);
-+  return it == map.end() ? frame->GetDocumentLoader() : it->second;
-+}
-+
 +}  // namespace
 +
 +// static
 +GURL ScriptContext::GetDocumentLoaderURLForFrame(
 +    const blink::WebLocalFrame* frame) {
-+  // Normally we would use frame->document().url() to determine the document's
-+  // URL, but to decide whether to inject a content script, we use the URL from
-+  // the data source. This "quirk" helps prevents content scripts from
-+  // inadvertently adding DOM elements to the compose iframe in Gmail because
-+  // the compose iframe's dataSource URL is about:blank, but the document URL
-+  // changes to match the parent document after Gmail document.writes into
-+  // it to create the editor.
-+  // http://code.google.com/p/chromium/issues/detail?id=86742
-+  blink::WebDocumentLoader* document_loader = CurrentDocumentLoader(frame);
-+  return document_loader ? GURL(document_loader->GetUrl()) : GURL();
++  return GURL(frame->GetDocument().Url());
 +}
 +
 +// static
@@ -8073,7 +8041,7 @@ diff --git a/components/user_scripts/renderer/script_injection.cc b/components/u
 new file mode 100755
 --- /dev/null
 +++ b/components/user_scripts/renderer/script_injection.cc
-@@ -0,0 +1,309 @@
+@@ -0,0 +1,294 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -8325,30 +8293,15 @@ new file mode 100755
 +      base::BindOnce(&ScriptInjection::OnJsInjectionCompleted,
 +                     weak_ptr_factory_.GetWeakPtr()),
 +      blink::BackForwardCacheAware::kPossiblyDisallow,
-+      blink::mojom::PromiseResultOption::kDoNotWait);
++      blink::mojom::WantResultOption::kNoResult, blink::mojom::PromiseResultOption::kDoNotWait);
 +  }
 +
 +void ScriptInjection::OnJsInjectionCompleted(
-+    const blink::WebVector<v8::Local<v8::Value>>& results,
++    absl::optional<base::Value> results,
 +    base::TimeTicks start_time) {
 +  DCHECK(!did_inject_js_);
 +
-+  bool expects_results = injector_->ExpectsResults();
-+  if (expects_results) {
-+    if (!results.empty() && !results[0].IsEmpty()) {
-+      // Right now, we only support returning single results (per frame).
-+      // It's safe to always use the main world context when converting
-+      // here. V8ValueConverterImpl shouldn't actually care about the
-+      // context scope, and it switches to v8::Object's creation context
-+      // when encountered.
-+      v8::Local<v8::Context> context =
-+          render_frame_->GetWebFrame()->MainWorldScriptContext();
-+      execution_result_ =
-+          content::V8ValueConverter::Create()->FromV8Value(results[0], context);
-+    }
-+    if (!execution_result_.get())
-+      execution_result_ = std::make_unique<base::Value>();
-+  }
++  execution_result_ = std::move(results);
 +  did_inject_js_ = true;
 +
 +  // If |async_completion_callback_| is set, it means the script finished
@@ -8387,7 +8340,7 @@ diff --git a/components/user_scripts/renderer/script_injection.h b/components/us
 new file mode 100755
 --- /dev/null
 +++ b/components/user_scripts/renderer/script_injection.h
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,156 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -8402,6 +8355,7 @@ new file mode 100755
 +
 +#include "base/callback.h"
 +#include "base/memory/weak_ptr.h"
++#include "base/values.h"
 +#include "../common/user_script.h"
 +#include "injection_host.h"
 +#include "script_injector.h"
@@ -8478,7 +8432,7 @@ new file mode 100755
 +
 +  // Called when JS injection for the given frame has been completed or
 +  // cancelled.
-+  void OnJsInjectionCompleted(const blink::WebVector<v8::Local<v8::Value>>& results,
++  void OnJsInjectionCompleted(absl::optional<base::Value> results,
 +                              base::TimeTicks start_time);
 +
 + private:
@@ -8529,7 +8483,7 @@ new file mode 100755
 +  bool log_activity_;
 +
 +  // Results storage.
-+  std::unique_ptr<base::Value> execution_result_;
++  absl::optional<base::Value> execution_result_;
 +
 +  // The callback to run upon completing asynchronously.
 +  CompletionCallback async_completion_callback_;
@@ -9158,7 +9112,7 @@ new file mode 100755
 +  // |render_frame| contains the render frame, or null if the frame was
 +  // invalidated.
 +  virtual void OnInjectionComplete(
-+      std::unique_ptr<base::Value> execution_result,
++      absl::optional<base::Value> execution_result,
 +      UserScript::RunLocation run_location,
 +      content::RenderFrame* render_frame) = 0;
 +
@@ -9505,7 +9459,7 @@ new file mode 100755
 +}
 +
 +void UserScriptInjector::OnInjectionComplete(
-+    std::unique_ptr<base::Value> execution_result,
++    absl::optional<base::Value> execution_result,
 +    UserScript::RunLocation run_location,
 +    content::RenderFrame* render_frame) {}
 +
@@ -9578,7 +9532,7 @@ new file mode 100755
 +      UserScript::RunLocation run_location,
 +      std::set<std::string>* injected_stylesheets,
 +      size_t* num_injected_stylesheets) const override;
-+  void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
++  void OnInjectionComplete(absl::optional<base::Value> execution_result,
 +                           UserScript::RunLocation run_location,
 +                           content::RenderFrame* render_frame) override;
 +  void OnWillNotInject(InjectFailureReason reason,
@@ -9609,7 +9563,7 @@ diff --git a/components/user_scripts/renderer/user_script_set.cc b/components/us
 new file mode 100755
 --- /dev/null
 +++ b/components/user_scripts/renderer/user_script_set.cc
-@@ -0,0 +1,262 @@
+@@ -0,0 +1,266 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -9830,6 +9784,14 @@ new file mode 100755
 +
 +blink::WebString UserScriptSet::GetJsSource(const UserScript::File& file,
 +                                            bool emulate_greasemonkey) {
++  if (base::FeatureList::IsEnabled(features::kEnableLoggingUserScripts)) {
++    if (emulate_greasemonkey) {
++      LOG(INFO) << "UserScripts: Injecting w/greasemonkey " << file.url();
++    } else {
++      LOG(INFO) << "UserScripts: Injecting " << file.url();
++    }
++  }
++
 +  const GURL& url = file.url();
 +  auto iter = script_sources_.find(url);
 +  if (iter != script_sources_.end()) {
@@ -9845,13 +9807,9 @@ new file mode 100755
 +    std::string content =
 +        base::StrCat({kUserScriptHead, script_content, kUserScriptTail});
 +    source = blink::WebString::FromUTF8(content);
-+    if (base::FeatureList::IsEnabled(features::kEnableLoggingUserScripts))
-+      LOG(INFO) << "UserScripts: Injecting w/greasemonkey " << file.url();
 +  } else {
 +    source = blink::WebString::FromUTF8(script_content.data(),
 +                                        script_content.length());
-+    if (base::FeatureList::IsEnabled(features::kEnableLoggingUserScripts))
-+      LOG(INFO) << "UserScripts: Injecting " << file.url();
 +  }
 +  script_sources_[url] = source;
 +  return source;
@@ -10292,15 +10250,15 @@ new file mode 100755
 +  enabled_ = params.allow_userscript;
 +  if (!enabled_) return;
 +
-+  if (loaded_ == false) {
-+    loaded_ = true;
++  ExtensionFrameHelper* frame_helper = ExtensionFrameHelper::Get(render_frame);
++  if (!frame_helper) {
 +    new user_scripts::ExtensionFrameHelper(render_frame);
 +    dispatcher_->OnRenderFrameCreated(render_frame);
 +  }
 +}
 +
 +void UserScriptsRendererClient::RunScriptsAtDocumentStart(content::RenderFrame* render_frame) {
-+  if (!enabled_ || !loaded_) return;
++  if (!enabled_) return;
 +
 +  ExtensionFrameHelper* frame_helper = ExtensionFrameHelper::Get(render_frame);
 +  if (!frame_helper)
@@ -10311,7 +10269,7 @@ new file mode 100755
 +}
 +
 +void UserScriptsRendererClient::RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) {
-+  if (!enabled_ || !loaded_) return;
++  if (!enabled_) return;
 +
 +  ExtensionFrameHelper* frame_helper = ExtensionFrameHelper::Get(render_frame);
 +  if (!frame_helper)
@@ -10322,7 +10280,7 @@ new file mode 100755
 +}
 +
 +void UserScriptsRendererClient::RunScriptsAtDocumentIdle(content::RenderFrame* render_frame) {
-+  if (!enabled_ || !loaded_) return;
++  if (!enabled_) return;
 +
 +  ExtensionFrameHelper* frame_helper = ExtensionFrameHelper::Get(render_frame);
 +  if (!frame_helper)
@@ -10333,12 +10291,11 @@ new file mode 100755
 +}
 +
 +}
-\ No newline at end of file
 diff --git a/components/user_scripts/renderer/user_scripts_renderer_client.h b/components/user_scripts/renderer/user_scripts_renderer_client.h
 new file mode 100755
 --- /dev/null
 +++ b/components/user_scripts/renderer/user_scripts_renderer_client.h
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +#ifndef USERSCRIPTS_RENDER_CLIENT_H_
 +#define USERSCRIPTS_RENDER_CLIENT_H_
 +
@@ -10370,7 +10327,6 @@ new file mode 100755
 + private:
 +  std::unique_ptr<UserScriptsDispatcher> dispatcher_;
 +  bool enabled_ = false;
-+  bool loaded_ = false;
 +};
 +
 +}
@@ -10515,7 +10471,7 @@ new file mode 100755
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -693,6 +693,12 @@
+@@ -732,6 +732,12 @@
    "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
      "includes": [3720]
    },
diff --git a/build/patches/Fix-segmentation-platform-build-error.patch b/build/patches/Fix-segmentation-platform-build-error.patch
deleted file mode 100644
index ac07c6e0..00000000
--- a/build/patches/Fix-segmentation-platform-build-error.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 16 Oct 2022 08:42:55 +0200
-Subject: Fix segmentation platform build error
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- components/segmentation_platform/embedder/BUILD.gn | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/components/segmentation_platform/embedder/BUILD.gn b/components/segmentation_platform/embedder/BUILD.gn
---- a/components/segmentation_platform/embedder/BUILD.gn
-+++ b/components/segmentation_platform/embedder/BUILD.gn
-@@ -21,7 +21,6 @@ source_set("embedder") {
-     "//components/optimization_guide/core",
-     "//components/optimization_guide/core:features",
-     "//components/segmentation_platform/internal",
--    "//components/segmentation_platform/internal:optimization_guide_segmentation_handler",
-     "//components/segmentation_platform/internal/proto",
-     "//components/segmentation_platform/public",
-     "//url",
---
-2.25.1
diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch
new file mode 100644
index 00000000..0f600ca6
--- /dev/null
+++ b/build/patches/Guard-for-user-agent-reduction.patch
@@ -0,0 +1,25 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 10 Feb 2020 23:13:13 +0100
+Subject: Guard for user-agent reduction
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ third_party/blink/common/features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
+--- a/third_party/blink/common/features.cc
++++ b/third_party/blink/common/features.cc
+@@ -1205,8 +1205,8 @@ const base::Feature kWindowPlacementFullscreenCompanionWindow{
+ const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
+     &kReduceUserAgentMinorVersion, "build_version", "0"};
+ 
+-const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = {
+-    &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true};
++const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = {                 // must be enabled
++    &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true};   // in Bromite
+ const base::FeatureParam<bool> kLegacyWindowsPlatform = {
+     &kReduceUserAgentPlatformOsCpu, "legacy_windows_platform", true};
+ 
+--
+2.25.1
diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch
index 407bc7a7..7bf618de 100644
--- a/build/patches/History-number-of-days-privacy-setting.patch
+++ b/build/patches/History-number-of-days-privacy-setting.patch
@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -29,6 +29,12 @@
+@@ -31,6 +31,12 @@ found in the LICENSE file.
          android:title="@string/settings_incognito_tab_lock_title"
          android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
          android:persistent="false"/>
@@ -162,7 +162,7 @@ diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/
 diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
-@@ -44,6 +44,7 @@ java_cpp_strings("java_pref_names_srcjar") {
+@@ -45,6 +45,7 @@ java_cpp_strings("java_pref_names_srcjar") {
      "//components/safe_browsing/core/common/safe_browsing_prefs.cc",
      "//components/signin/public/base/signin_pref_names.cc",
      "//components/translate/core/browser/translate_pref_names.cc",
@@ -173,7 +173,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -368,6 +368,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
+@@ -373,6 +373,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
  void ProfileImpl::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
@@ -184,7 +184,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1130,6 +1130,18 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1136,6 +1136,18 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_HISTORY_TITLE" desc="Title for Clear History in Clear Browsing Data dialog">
          Browsing history
        </message>
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/settings/android/java/res/layout-sw360dp/preference_spinner_single_line.xml b/components/browser_ui/settings/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
 --- a/components/browser_ui/settings/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
 +++ b/components/browser_ui/settings/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
-@@ -11,19 +11,33 @@
+@@ -13,19 +13,33 @@ found in the LICENSE file.
      android:layout_height="wrap_content"
      android:orientation="horizontal"
      android:paddingEnd="@dimen/pref_spinner_padding_end"
@@ -249,7 +249,7 @@ diff --git a/components/browser_ui/settings/android/java/res/layout-sw360dp/pref
 diff --git a/components/browser_ui/settings/android/java/res/layout/preference_spinner.xml b/components/browser_ui/settings/android/java/res/layout/preference_spinner.xml
 --- a/components/browser_ui/settings/android/java/res/layout/preference_spinner.xml
 +++ b/components/browser_ui/settings/android/java/res/layout/preference_spinner.xml
-@@ -18,6 +18,13 @@
+@@ -20,6 +20,13 @@ found in the LICENSE file.
          android:layout_width="match_parent"
          style="@style/PreferenceTitle" />
  
@@ -266,7 +266,7 @@ diff --git a/components/browser_ui/settings/android/java/res/layout/preference_s
 diff --git a/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_line.xml b/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_line.xml
 --- a/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_line.xml
 +++ b/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_line.xml
-@@ -20,6 +20,13 @@
+@@ -22,6 +22,13 @@ found in the LICENSE file.
          android:layout_height="wrap_content"
          android:layout_width="match_parent" />
  
@@ -365,7 +365,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
  
  // The maximum number of days for which domain visit metrics are computed
  // each time HistoryBackend::GetDomainDiversity() is called.
-@@ -1015,6 +1015,19 @@ void HistoryBackend::InitImpl(
+@@ -1088,6 +1088,19 @@ void HistoryBackend::InitImpl(
    LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time);
  }
  
@@ -410,7 +410,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
  #include "components/history/core/browser/download_row.h"
  #include "components/history/core/browser/history_backend.h"
  #include "components/history/core/browser/history_backend_client.h"
-@@ -1078,6 +1081,9 @@ void HistoryService::Cleanup() {
+@@ -1105,6 +1108,9 @@ void HistoryService::Cleanup() {
      return;
    }
  
@@ -420,7 +420,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
    NotifyHistoryServiceBeingDeleted();
  
    weak_ptr_factory_.InvalidateWeakPtrs();
-@@ -1142,6 +1148,33 @@ bool HistoryService::Init(
+@@ -1169,6 +1175,33 @@ bool HistoryService::Init(
    return true;
  }
  
@@ -465,8 +465,8 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist
 +#include "components/prefs/pref_change_registrar.h"
  #include "components/history/core/browser/history_types.h"
  #include "components/history/core/browser/keyword_id.h"
- #include "components/keyed_service/core/keyed_service.h"
-@@ -105,6 +107,8 @@ class HistoryService : public KeyedService {
+ #include "components/history/core/browser/url_row.h"
+@@ -106,6 +108,8 @@ class HistoryService : public KeyedService {
      return Init(false, history_database_params);
    }
  
@@ -475,7 +475,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist
    // Triggers the backend to load if it hasn't already, and then returns whether
    // it's finished loading.
    // Note: Virtual needed for mocking.
-@@ -993,6 +997,10 @@ class HistoryService : public KeyedService {
+@@ -1013,6 +1017,10 @@ class HistoryService : public KeyedService {
  
    base::OnceClosure origin_queried_closure_for_testing_;
  
diff --git a/build/patches/Improve-plain-text-rendering-on-mobile.patch b/build/patches/Improve-plain-text-rendering-on-mobile.patch
index 7c285208..c55fbcf5 100644
--- a/build/patches/Improve-plain-text-rendering-on-mobile.patch
+++ b/build/patches/Improve-plain-text-rendering-on-mobile.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/html/parser/text_document_parser.cc b/third_party/blink/renderer/core/html/parser/text_document_parser.cc
 --- a/third_party/blink/renderer/core/html/parser/text_document_parser.cc
 +++ b/third_party/blink/renderer/core/html/parser/text_document_parser.cc
-@@ -63,9 +63,18 @@ void TextDocumentParser::InsertFakePreElement() {
+@@ -66,9 +66,18 @@ void TextDocumentParser::InsertFakePreElement() {
    TreeBuilder()->ConstructTree(&fake_meta);
    attributes.clear();
  
@@ -19,7 +19,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/text_document_parser.cc
 +  attributes.push_back(Attribute(html_names::kContentAttr,
 +    "width=device-width, initial-scale=1.0, maximum-scale=1.0"));
 +  AtomicHTMLToken viewport_meta(HTMLToken::kStartTag,
-+                            html_names::kMetaTag.LocalName(), attributes);
++                            html_names::HTMLTag::kMeta, attributes);
 +  TreeBuilder()->ConstructTree(&viewport_meta);
 +  attributes.clear();
 +
@@ -27,8 +27,8 @@ diff --git a/third_party/blink/renderer/core/html/parser/text_document_parser.cc
    attributes.push_back(Attribute(
 -      html_names::kStyleAttr, "word-wrap: break-word; white-space: pre-wrap;"));
 +      html_names::kStyleAttr, "word-wrap: break-word; white-space: pre-wrap; font-family: system-ui;"));
-   AtomicHTMLToken fake_pre(HTMLToken::kStartTag,
-                            html_names::kPreTag.LocalName(), attributes);
+   AtomicHTMLToken fake_pre(HTMLToken::kStartTag, html_names::HTMLTag::kPre,
+                            attributes);
    TreeBuilder()->ConstructTree(&fake_pre);
 --
 2.25.1
diff --git a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch
index 407b511e..0350f6a3 100644
--- a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch
+++ b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch
@@ -6,23 +6,21 @@ Patch adapted from https://github.com/Eloston/ungoogled-chromium/issues/814#issu
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/omnibox/browser/autocomplete_result.cc | 3 ++-
+ components/omnibox/browser/autocomplete_result.cc | 1 +
  components/omnibox/browser/omnibox_field_trial.cc | 6 +++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ 2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
 --- a/components/omnibox/browser/autocomplete_result.cc
 +++ b/components/omnibox/browser/autocomplete_result.cc
-@@ -100,7 +100,8 @@ size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
-   // and 10 on iPad.
-   constexpr size_t kMaxZeroSuggestMatchesOnIPad = 10;
- #else
--  constexpr size_t kDefaultMaxAutocompleteMatches = 8;
-+  // changed from 8, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
-+  constexpr size_t kDefaultMaxAutocompleteMatches = 10;
-   constexpr size_t kDefaultMaxZeroSuggestMatches = 8;
- #endif
-   static_assert(kMaxAutocompletePositionValue > kDefaultMaxAutocompleteMatches,
+@@ -85,6 +85,7 @@ struct MatchGURLHash {
+ // static
+ size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
+ #if BUILDFLAG(IS_ANDROID)
++  // this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
+   constexpr size_t kDefaultMaxAutocompleteMatches = 10;
+   constexpr size_t kDefaultMaxZeroSuggestMatches = 15;
+ #elif BUILDFLAG(IS_IOS)
 diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
 --- a/components/omnibox/browser/omnibox_field_trial.cc
 +++ b/components/omnibox/browser/omnibox_field_trial.cc
diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch
index 4a7e8684..535cd330 100644
--- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch
+++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni
 --- a/third_party/blink/renderer/core/dom/build.gni
 +++ b/third_party/blink/renderer/core/dom/build.gni
-@@ -157,6 +157,8 @@ blink_core_sources_dom = [
+@@ -159,6 +159,8 @@ blink_core_sources_dom = [
    "has_invalidation_flags.h",
    "icon_url.cc",
    "icon_url.h",
@@ -35,7 +35,7 @@ diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/r
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -282,6 +282,7 @@
+@@ -283,6 +283,7 @@
  #include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
  #include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
  #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
@@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
  #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
  #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
-@@ -352,6 +353,8 @@
+@@ -355,6 +356,8 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
  #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
  
@@ -52,8 +52,8 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #ifndef NDEBUG
  using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
  static WeakDocumentSet& LiveDocumentSet();
-@@ -6790,6 +6793,64 @@ void Document::MarkFirstPaint() {
-   MaybeExecuteDelayedAsyncScripts(MilestoneForDelayedAsyncScript::kFirstPaint);
+@@ -7065,6 +7068,64 @@ void Document::OnPrepareToStopParsing() {
+       MilestoneForDelayedAsyncScript::kFinishedParsing);
  }
  
 +void Document::injectScripts() {
@@ -117,9 +117,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  void Document::FinishedParsing() {
    DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing());
    DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading);
-@@ -6855,6 +6916,10 @@ void Document::FinishedParsing() {
-     if (frame->GetFrameScheduler())
-       frame->GetFrameScheduler()->OnDomContentLoaded();
+@@ -7124,6 +7185,10 @@ void Document::FinishedParsing() {
+       }
+     }
  
 +    if (!IsPrefetchOnly()) {
 +       injectScripts();
@@ -131,9 +131,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -1953,6 +1953,9 @@ class CORE_EXPORT Document : public ContainerNode,
-   void AddAXContext(AXContext*);
-   void RemoveAXContext(AXContext*);
+@@ -1975,6 +1975,9 @@ class CORE_EXPORT Document : public ContainerNode,
+   // Called when the AXMode of an existing AXContext changes.
+   void AXContextModeChanged();
  
 +  void injectScripts();
 +  const AtomicString& findFirstScriptNonce();
diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch
index b88cfe0c..da5b147d 100644
--- a/build/patches/JIT-site-settings.patch
+++ b/build/patches/JIT-site-settings.patch
@@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -136,6 +136,7 @@ android_resources("java_resources") {
+@@ -161,6 +161,7 @@ android_resources("java_resources") {
      "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-hdpi/permission_background_sync.png",
      "java/res/drawable-hdpi/permission_javascript.png",
@@ -50,15 +50,15 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-hdpi/permission_popups.png",
      "java/res/drawable-hdpi/permission_protected_media.png",
      "java/res/drawable-hdpi/settings_sensors.png",
-@@ -143,6 +144,7 @@ android_resources("java_resources") {
+@@ -168,6 +169,7 @@ android_resources("java_resources") {
      "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-mdpi/permission_background_sync.png",
      "java/res/drawable-mdpi/permission_javascript.png",
 +    "java/res/drawable-mdpi/permission_javascript_jit.png",
-     "java/res/drawable-mdpi/permission_popups.png",
-     "java/res/drawable-mdpi/permission_protected_media.png",
-     "java/res/drawable-mdpi/settings_sensors.png",
-@@ -150,6 +152,7 @@ android_resources("java_resources") {
+     "java/res/drawable-hdpi/settings_autoplay.png",
+     "java/res/drawable-xhdpi/settings_autoplay.png",
+     "java/res/drawable-xxhdpi/settings_autoplay.png",
+@@ -180,6 +182,7 @@ android_resources("java_resources") {
      "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xhdpi/permission_background_sync.png",
      "java/res/drawable-xhdpi/permission_javascript.png",
@@ -66,7 +66,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-xhdpi/permission_popups.png",
      "java/res/drawable-xhdpi/permission_protected_media.png",
      "java/res/drawable-xhdpi/settings_sensors.png",
-@@ -157,6 +160,7 @@ android_resources("java_resources") {
+@@ -187,6 +190,7 @@ android_resources("java_resources") {
      "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xxhdpi/permission_background_sync.png",
      "java/res/drawable-xxhdpi/permission_javascript.png",
@@ -74,7 +74,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-xxhdpi/permission_popups.png",
      "java/res/drawable-xxhdpi/permission_protected_media.png",
      "java/res/drawable-xxhdpi/settings_sensors.png",
-@@ -164,6 +168,7 @@ android_resources("java_resources") {
+@@ -194,6 +198,7 @@ android_resources("java_resources") {
      "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xxxhdpi/permission_background_sync.png",
      "java/res/drawable-xxxhdpi/permission_javascript.png",
@@ -183,7 +183,7 @@ HcmV?d00001
 diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 --- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 +++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
-@@ -37,6 +37,10 @@
+@@ -39,6 +39,10 @@ found in the LICENSE file.
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
          android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
          android:key="notifications" />
@@ -214,7 +214,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -610,6 +610,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -632,6 +632,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                                 browserContextHandle, ContentSettingsType.JAVASCRIPT)
                      ? R.string.website_settings_add_site_description_javascript_block
                      : R.string.website_settings_add_site_description_javascript_allow;
@@ -226,7 +226,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else if (mCategory.getType() == SiteSettingsCategory.Type.SOUND) {
              resource = WebsitePreferenceBridge.isCategoryEnabled(
                                 browserContextHandle, ContentSettingsType.SOUND)
-@@ -732,6 +737,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -761,6 +766,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              allowSpecifyingExceptions = true;
          } else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT) {
              allowSpecifyingExceptions = true;
@@ -238,7 +238,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -132,6 +132,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -133,6 +133,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  return "idle_detection_permission_list";
              case ContentSettingsType.JAVASCRIPT:
                  return "javascript_permission_list";
@@ -247,18 +247,18 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              case ContentSettingsType.POPUPS:
                  return "popup_permission_list";
              case ContentSettingsType.SOUND:
-@@ -504,6 +506,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
-                 setUpCookiesPreference(preference);
+@@ -503,6 +505,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+                 setUpJavascriptPreference(preference);
              } else if (type == ContentSettingsType.GEOLOCATION) {
                  setUpLocationPreference(preference);
 +            } else if (type == ContentSettingsType.JAVASCRIPT_JIT) {
 +                setUpJavascriptJitPreference(preference);
              } else if (type == ContentSettingsType.NOTIFICATIONS) {
                  setUpNotificationsPreference(preference, mSite.isEmbargoed(type));
-             } else {
-@@ -1032,6 +1036,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+             } else if (type == ContentSettingsType.REQUEST_DESKTOP_SITE) {
+@@ -1023,6 +1027,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
-      }
+     }
  
 +    private void setUpJavascriptJitPreference(Preference preference) {
 +        BrowserContextHandle browserContextHandle =
@@ -337,7 +337,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -218,6 +218,13 @@ public final class Website implements Serializable {
+@@ -213,6 +213,13 @@ public final class Website implements Serializable {
              } else {
                  RecordUserAction.record("JavascriptContentSetting.DisableBy.SiteSettings");
              }
@@ -375,7 +375,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
    <message name="IDS_WEBSITE_SETTINGS_DEVICE_LOCATION" desc="Title for Location settings, which control which websites can access your location." meaning="Geolocation">
      Location
    </message>
-@@ -437,6 +440,20 @@
+@@ -473,6 +476,20 @@
      Block JavaScript for a specific site.
    </message>
  
@@ -431,7 +431,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -121,6 +121,7 @@ ContentSettingsType kPermissionType[] = {
+@@ -122,6 +122,7 @@ ContentSettingsType kPermissionType[] = {
      ContentSettingsType::AR,
      ContentSettingsType::IDLE_DETECTION,
      ContentSettingsType::FEDERATED_IDENTITY_API,
@@ -439,7 +439,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
  };
  
  // Determines whether to show permission |type| in the Page Info UI. Only
-@@ -154,6 +155,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
+@@ -155,6 +156,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
        return true;
    }
  
diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
index 7c742728..24d037bf 100644
--- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
+++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3877,9 +3877,9 @@
+@@ -3986,9 +3986,9 @@
      "expiry_milestone": 110
    },
    {
diff --git a/build/patches/Logcat-crash-reports-UI.patch b/build/patches/Logcat-crash-reports-UI.patch
index e270261a..a38cae48 100644
--- a/build/patches/Logcat-crash-reports-UI.patch
+++ b/build/patches/Logcat-crash-reports-UI.patch
@@ -157,7 +157,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -632,6 +632,7 @@ static_library("ui") {
+@@ -633,6 +633,7 @@ static_library("ui") {
      "//third_party/re2",
      "//third_party/webrtc_overrides:webrtc_component",
      "//third_party/zlib",
diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch
index b60bf7b0..24174a57 100644
--- a/build/patches/Modify-default-preferences.patch
+++ b/build/patches/Modify-default-preferences.patch
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -77,6 +77,7 @@
+@@ -78,6 +78,7 @@
  #include "components/autofill/core/common/autofill_switches.h"
  #include "components/autofill/core/common/autofill_util.h"
  #include "components/autofill_assistant/browser/features.h"
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/browser_sync/browser_sync_switches.h"
  #include "components/browser_ui/site_settings/android/features.h"
  #include "components/browsing_data/core/features.h"
-@@ -5668,6 +5669,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5756,6 +5757,11 @@ const FeatureEntry kFeatureEntries[] = {
           reading_list::switches::kReadLaterReminderNotification)},
  #endif
  
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1384,7 +1384,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1425,7 +1425,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2753,6 +2753,10 @@ const char kTabToGTSAnimationAndroidDescription[] =
+@@ -2793,6 +2793,10 @@ const char kTabToGTSAnimationAndroidDescription[] =
      "Allows users to see an animation when entering or leaving the "
      "Grid Tab Switcher on phones.";
  
@@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1549,6 +1549,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[];
+@@ -1569,6 +1569,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[];
  extern const char kTabToGTSAnimationAndroidName[];
  extern const char kTabToGTSAnimationAndroidDescription[];
  
@@ -116,7 +116,7 @@ diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -278,7 +278,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -282,7 +282,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -177,15 +177,15 @@ diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browse
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  #include "build/build_config.h"
  #include "components/bookmarks/browser/bookmark_client.h"
  #include "components/bookmarks/browser/bookmark_model.h"
 +#include "components/bookmarks/browser/features.h"
  #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
+ #include "components/bookmarks/common/bookmark_metrics.h"
  #include "components/bookmarks/common/bookmark_pref_names.h"
- #include "components/pref_registry/pref_registry_syncable.h"
-@@ -436,11 +437,14 @@ bool DoesBookmarkContainWords(const std::u16string& title,
+@@ -440,11 +441,14 @@ bool DoesBookmarkContainWords(const std::u16string& title,
  
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -249,7 +249,7 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -321,7 +321,7 @@ void ContentSettingsRegistry::Init() {
+@@ -324,7 +324,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
    Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",
@@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
             AllowlistedSchemes(),
             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
             WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
-@@ -421,7 +421,7 @@ void ContentSettingsRegistry::Init() {
+@@ -424,7 +424,7 @@ void ContentSettingsRegistry::Init() {
    // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
    // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
    // contexts.
@@ -324,7 +324,7 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -486,7 +486,7 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList";
+@@ -499,7 +499,7 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList";
  // the attribute. Note: At present, only iframes with origin-restricted
  // sandboxes are isolated.
  const base::Feature kIsolateSandboxedIframes{"IsolateSandboxedIframes",
diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch
index ea7f3631..30868d82 100644
--- a/build/patches/Move-navigation-bar-to-bottom.patch
+++ b/build/patches/Move-navigation-bar-to-bottom.patch
@@ -16,11 +16,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  cc/base/features.h                            |  1 +
  cc/input/browser_controls_offset_manager.cc   |  6 +++
  cc/trees/layer_tree_host_impl.cc              |  3 ++
+ .../start_surface/StartSurfaceMediator.java   |  5 ++
  .../tab_management/TabGroupUiCoordinator.java |  7 ++-
  .../tab_management/TabGroupUiMediator.java    | 50 +++++++++++++++++-
  .../tab_management/TabGroupUiProperties.java  |  6 ++-
  .../tab_management/TabGroupUiToolbarView.java | 18 +++++++
  .../tab_management/TabGroupUiViewBinder.java  |  3 ++
+ .../TabListContainerViewBinder.java           |  4 ++
+ .../tab_management/TabListCoordinator.java    |  6 +++
  .../tab_management/TabListRecyclerView.java   | 19 ++++++-
  .../tab_management/TabSwitcherMediator.java   | 16 ++++++
  .../ChromeAccessibilitySettingsDelegate.java  | 52 +++++++++++++++++++
@@ -82,7 +85,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../accessibility/AccessibilitySettings.java  | 16 ++++++
  .../AccessibilitySettingsDelegate.java        |  6 +++
  .../render_widget_host_view_android.cc        |  3 ++
- 70 files changed, 753 insertions(+), 56 deletions(-)
+ 73 files changed, 768 insertions(+), 56 deletions(-)
 
 diff --git a/cc/base/features.cc b/cc/base/features.cc
 --- a/cc/base/features.cc
@@ -134,7 +137,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -4222,6 +4222,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
+@@ -4229,6 +4229,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
    if (scroll_delta.IsZero())
      return false;
  
@@ -144,6 +147,28 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
    // This counter-scrolls the page to keep the appearance of the page content
    // being fixed while the browser controls animate.
    viewport().ScrollBy(scroll_delta,
+diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
++++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+@@ -78,6 +78,9 @@ import org.chromium.components.prefs.PrefService;
+ import org.chromium.ui.modelutil.PropertyModel;
+ import org.chromium.ui.util.ColorUtils;
+ 
++import org.chromium.chrome.browser.flags.ChromeFeatureList;
++import org.chromium.chrome.browser.flags.CachedFeatureFlags;
++
+ /** The mediator implements the logic to interact with the surfaces and caller. */
+ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
+                                       StartSurface.OnTabSelectingListener, BackPressHandler {
+@@ -1028,6 +1031,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+     }
+ 
+     private void setTopMargin(int topMargin) {
++        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
++            topMargin = 0;
+         mPropertyModel.set(TOP_MARGIN, topMargin);
+     }
+ 
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java
@@ -363,6 +388,50 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          }
      }
  }
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
++++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
+@@ -22,6 +22,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
+ import org.chromium.components.browser_ui.styles.ChromeColors;
+ import org.chromium.ui.modelutil.PropertyKey;
+ import org.chromium.ui.modelutil.PropertyModel;
++import org.chromium.chrome.browser.flags.CachedFeatureFlags;
++import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ 
+ /**
+  * ViewBinder for TabListRecyclerView.
+@@ -58,6 +60,8 @@ class TabListContainerViewBinder {
+             params.topMargin = newTopMargin;
+             view.requestLayout();
+         } else if (BOTTOM_CONTROLS_HEIGHT == propertyKey) {
++            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
++                return;
+             FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) view.getLayoutParams();
+             params.bottomMargin = model.get(BOTTOM_CONTROLS_HEIGHT);
+             view.requestLayout();
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
++++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+@@ -47,6 +47,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
+ import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
+ import org.chromium.ui.widget.ViewLookupCachingFrameLayout;
+ 
++import org.chromium.chrome.browser.flags.ChromeFeatureList;
++import org.chromium.chrome.browser.flags.CachedFeatureFlags;
++
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ import java.util.List;
+@@ -255,6 +258,9 @@ public class TabListCoordinator
+             if (mMode == TabListMode.GRID) {
+                 GridLayoutManager gridLayoutManager =
+                         new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
++                // invert the order if the toolbar is at bottom
++                if (titleProvider != null && CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
++                    gridLayoutManager.setReverseLayout(true);
+                 mRecyclerView.setLayoutManager(gridLayoutManager);
+                 mMediator.registerOrientationListener(gridLayoutManager);
+                 mMediator.updateSpanCount(gridLayoutManager,
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
@@ -442,9 +511,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
 +import org.chromium.chrome.browser.flags.CachedFeatureFlags;
- import org.chromium.chrome.browser.init.FirstDrawDetector;
  import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 @@ -414,11 +415,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
              updateTopControlsProperties();
              mContainerViewModel.set(
@@ -558,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -241,6 +241,9 @@ import java.util.ArrayList;
+@@ -243,6 +243,9 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Consumer;
  
@@ -568,34 +637,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  /**
   * A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
   * and associated classes.
-@@ -745,6 +748,15 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -747,6 +750,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                  int toolbarLayoutId = getToolbarLayoutId();
                  if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
                      controlContainer.initWithToolbar(toolbarLayoutId);
 +                    ImageView shadowImage = findViewById(R.id.toolbar_hairline);
 +                    if (shadowImage != null) {
++                        // Invert the shadown if the top toolbar is at the bottom
 +                        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
 +                            ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams)shadowImage.getLayoutParams();
 +                            marginParams.setMargins(marginParams.leftMargin, 0,
-+                            marginParams.rightMargin, marginParams.bottomMargin);
++                                marginParams.rightMargin, marginParams.bottomMargin);
 +                            shadowImage.setLayoutParams(marginParams);
 +                        }
 +                    }
                  }
              }
              onInitialLayoutInflationComplete();
-@@ -768,6 +780,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-         mCompositorViewHolderSupplier.get().setRootView(rootView);
- 
-         // Setting fitsSystemWindows to false ensures that the root view doesn't consume the
-+        // Invert the shadown if the top toolbar is at the bottom
-         // insets.
-         rootView.setFitsSystemWindows(false);
- 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
-@@ -105,6 +105,7 @@ public class ChromeCachedFlags {
+@@ -107,6 +107,7 @@ public class ChromeCachedFlags {
                  add(ChromeFeatureList.sInstanceSwitcher);
                  add(ChromeFeatureList.sInstantStart);
                  add(ChromeFeatureList.sInterestFeedV2);
@@ -754,7 +816,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -374,7 +374,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
+@@ -376,7 +376,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
          // position 0 is on the left. Account for that in the offset calculation.
          boolean isRtl = LocalizationUtils.isLayoutRtl();
          boolean useUnadjustedScrollOffset = isRtl != isLeft;
@@ -1081,7 +1143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/messages/Messag
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
-@@ -275,7 +275,7 @@ public class ChromeTabModalPresenter
+@@ -274,7 +274,7 @@ public class ChromeTabModalPresenter
              Resources resources, BrowserControlsStateProvider provider) {
          int scrimVerticalMargin =
                  resources.getDimensionPixelSize(R.dimen.tab_modal_scrim_vertical_margin);
@@ -1200,7 +1262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
-@@ -70,6 +70,11 @@ import org.chromium.ui.base.WindowDelegate;
+@@ -71,6 +71,11 @@ import org.chromium.ui.base.WindowDelegate;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.url.GURL;
  
@@ -1212,7 +1274,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
  import java.lang.ref.WeakReference;
  
  /** Queries the user's default search engine and shows autocomplete suggestions. */
-@@ -181,6 +186,11 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -182,6 +187,11 @@ public class SearchActivity extends AsyncInitializationActivity
          mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                  R.id.search_location_bar);
          View anchorView = mContentView.findViewById(R.id.toolbar);
@@ -1224,7 +1286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
          OverrideUrlLoadingDelegate overrideUrlLoadingDelegate =
                  (String url, @PageTransition int transition, String postDataType, byte[] postData,
                          boolean incognito) -> {
-@@ -194,7 +204,7 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -195,7 +205,7 @@ public class SearchActivity extends AsyncInitializationActivity
              getOnBackPressedDispatcher().addCallback(this, backPressManager.getCallback());
          }
          // clang-format off
@@ -1251,7 +1313,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
-@@ -23,6 +23,11 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
+@@ -24,6 +24,11 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  import org.chromium.ui.resources.ResourceManager;
  import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
  
@@ -1263,7 +1325,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
  /**
   * The coordinator for a status indicator that is positioned below the status bar and is persistent.
   * Typically used to relay status, e.g. indicate user is offline.
-@@ -169,6 +174,11 @@ public class StatusIndicatorCoordinator {
+@@ -173,6 +178,11 @@ public class StatusIndicatorCoordinator {
      private void initialize() {
          final ViewStub stub = mActivity.findViewById(R.id.status_indicator_stub);
          final ViewResourceFrameLayout root = (ViewResourceFrameLayout) stub.inflate();
@@ -1302,7 +1364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -178,6 +178,9 @@ import org.chromium.url.GURL;
+@@ -176,6 +176,9 @@ import org.chromium.url.GURL;
  
  import java.util.List;
  
@@ -1312,7 +1374,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  /**
   * Contains logic for managing the toolbar visual component.  This class manages the interactions
   * with the rest of the application to ensure the toolbar is always visually up to date.
-@@ -661,7 +664,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -665,7 +668,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                      mEphemeralTabCoordinatorSupplier);
              // clang-format off
              LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1321,7 +1383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                      PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
                      mActionModeController.getActionModeCallback(),
                      new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
-@@ -914,11 +917,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -915,11 +918,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                  // the height won't be measured by the background image.
                  if (mControlContainer.getBackground() == null) {
                      setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1335,7 +1397,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                              mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
                              mLayoutChangeListener = null;
                          }
-@@ -1299,13 +1304,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1286,13 +1291,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
          return mLocationBar.getOmniboxStub().isUrlBarFocused();
      }
  
@@ -1363,19 +1425,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                  mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
                  mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
                  mTabContentManager, mCompositorViewHolder,
-@@ -1314,8 +1331,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
-         mBottomControlsCoordinatorSupplier.set(
-                 new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager,
-                         mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
--                        mFullscreenManager, (ScrollingBottomViewResourceFrameLayout) root,
--                        mTabGroupUi, mOverlayPanelVisibilitySupplier, mConstraintsProxy));
-+                        mFullscreenManager, (ScrollingBottomViewResourceFrameLayout) bottomRoot,
-+                        mTabGroupUi, mOverlayPanelVisibilitySupplier, mConstraintsProxy,
+@@ -1301,8 +1318,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+         mBottomControlsCoordinatorSupplier.set(new BottomControlsCoordinator(mActivity,
+                 mWindowAndroid, mLayoutManager, mCompositorViewHolder.getResourceManager(),
+                 mBrowserControlsSizer, mFullscreenManager,
+-                (ScrollingBottomViewResourceFrameLayout) root, mTabGroupUi, mTabObscuringHandler,
+-                mOverlayPanelVisibilitySupplier, mConstraintsProxy));
++                (ScrollingBottomViewResourceFrameLayout) bottomRoot, mTabGroupUi, mTabObscuringHandler,
++                mOverlayPanelVisibilitySupplier, mConstraintsProxy,
 +                        mTopUiThemeColorProvider, mActivityTabProvider));
      }
  
      /**
-@@ -2083,6 +2101,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -2073,6 +2091,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
      private void setControlContainerTopMargin(int margin) {
          final ViewGroup.MarginLayoutParams layoutParams =
                  ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1434,7 +1496,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7055,6 +7055,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7202,6 +7202,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
  
@@ -1532,7 +1594,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1689,6 +1689,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
+@@ -1703,6 +1703,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
      "Ensure keyboard shortcuts work consistently with international keyboard "
      "layouts and deprecate legacy shortcuts.";
  
@@ -1546,7 +1608,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -952,6 +952,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
+@@ -954,6 +954,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
  extern const char kCompositorThreadedScrollbarScrollingName[];
  extern const char kCompositorThreadedScrollbarScrollingDescription[];
  
@@ -1599,7 +1661,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "base/metrics/field_trial_params.h"
  #include "base/no_destructor.h"
  #include "base/strings/string_piece_forward.h"
-@@ -248,6 +249,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -249,6 +250,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kKitKatSupported,
      &kLensCameraAssistedSearch,
      &kLensOnQuickActionSearchWidget,
@@ -1610,7 +1672,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -101,6 +101,7 @@ public class CachedFeatureFlags {
+@@ -103,6 +103,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false)
                      .put(ChromeFeatureList.TAB_GROUPS_FOR_TABLETS, false)
                      .put(ChromeFeatureList.TAB_STRIP_IMPROVEMENTS, false)
@@ -1618,7 +1680,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
                      .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true)
                      .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false)
                      .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true)
-@@ -206,6 +207,23 @@ public class CachedFeatureFlags {
+@@ -208,6 +209,23 @@ public class CachedFeatureFlags {
          SharedPreferencesManager.getInstance().writeBoolean(preferenceName, isEnabledInNative);
      }
  
@@ -1642,7 +1704,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      /**
       * Forces a feature to be enabled or disabled for testing.
       *
-@@ -525,6 +543,7 @@ public class CachedFeatureFlags {
+@@ -527,6 +545,7 @@ public class CachedFeatureFlags {
  
      @NativeMethods
      interface Natives {
@@ -1653,7 +1715,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -421,6 +421,8 @@ public abstract class ChromeFeatureList {
+@@ -424,6 +424,8 @@ public abstract class ChromeFeatureList {
      public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError";
      public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
      public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView";
@@ -1662,7 +1724,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
      public static final String MOST_RECENT_TAB_ON_BACKGROUND_CLOSE_TAB =
              "MostRecentTabOnBackgroundCloseTab";
-@@ -674,6 +676,8 @@ public abstract class ChromeFeatureList {
+@@ -700,6 +702,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
      public static final CachedFlag sLensCameraAssistedSearch =
              new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, false);
@@ -1766,7 +1828,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private LocationBarMediator mLocationBarMediator;
      private View mUrlBar;
      private View mDeleteButton;
-@@ -137,7 +138,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -141,7 +142,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
       * @param reportExceptionCallback A {@link Callback} to report exceptions.
       * @param backPressManager The {@link BackPressManager} for intercepting back press.
       */
@@ -1775,7 +1837,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              ObservableSupplier<Profile> profileObservableSupplier,
              PrivacyPreferencesManager privacyPreferencesManager,
              LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback,
-@@ -167,6 +168,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -171,6 +172,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
          mActivityLifecycleDispatcher = activityLifecycleDispatcher;
          mActivityLifecycleDispatcher.register(this);
          mAutocompleteAnchorView = autocompleteAnchorView;
@@ -1783,7 +1845,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  
          mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar);
          // TODO(crbug.com/1151513): Inject LocaleManager instance to LocationBarCoordinator instead
-@@ -368,6 +370,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -381,6 +383,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
          return mAutocompleteAnchorView;
      }
  
@@ -1855,8 +1917,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              public void inflate() {
                  OmniboxSuggestionsDropdown dropdown;
                  try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) {
--                    dropdown = new OmniboxSuggestionsDropdown(context);
-+                    dropdown = new OmniboxSuggestionsDropdown(context, mDropdownEmbedder);
+-                    dropdown = new OmniboxSuggestionsDropdown(context, locationBarDataProvider);
++                    dropdown = new OmniboxSuggestionsDropdown(context, locationBarDataProvider, mDropdownEmbedder);
                  }
  
                  // Start with visibility GONE to ensure that show() is called.
@@ -1904,7 +1966,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
-@@ -41,6 +41,9 @@ import org.chromium.ui.base.ViewUtils;
+@@ -43,6 +43,9 @@ import org.chromium.ui.base.ViewUtils;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -1914,17 +1976,17 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  /** A widget for showing a list of omnibox suggestions. */
  public class OmniboxSuggestionsDropdown extends RecyclerView {
      private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300;
-@@ -170,7 +173,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
-      * Constructs a new list designed for containing omnibox suggestions.
+@@ -173,7 +176,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
       * @param context Context used for contained views.
       */
--    public OmniboxSuggestionsDropdown(@NonNull Context context) {
-+    public OmniboxSuggestionsDropdown(@NonNull Context context,
-+                                      @NonNull OmniboxSuggestionsDropdownEmbedder embedder) {
+     public OmniboxSuggestionsDropdown(
+-            @NonNull Context context, @NonNull LocationBarDataProvider locationBarDataProvider) {
++            @NonNull Context context, @NonNull LocationBarDataProvider locationBarDataProvider,
++            @NonNull OmniboxSuggestionsDropdownEmbedder embedder) {
          super(context, null, android.R.attr.dropDownListViewStyle);
          setFocusable(true);
          setFocusableInTouchMode(true);
-@@ -181,7 +185,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -184,7 +188,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
  
          mScrollListener = new SuggestionScrollListener();
          setOnScrollListener(mScrollListener);
@@ -1933,7 +1995,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              @Override
              public int scrollVerticallyBy(
                      int deltaY, RecyclerView.Recycler recycler, RecyclerView.State state) {
-@@ -199,6 +203,19 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -204,6 +208,19 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
                  : 0;
          int paddingBottom =
                  resources.getDimensionPixelOffset(R.dimen.omnibox_suggestion_list_padding_bottom);
@@ -1952,8 +2014,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +        setLayoutManager(linearLayoutManager);
          ViewCompat.setPaddingRelative(this, paddingSide, 0, paddingSide, paddingBottom);
  
-         mStandardBgColor = ChromeColors.getDefaultThemeColor(context, false);
-@@ -370,6 +387,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+         mStandardBgColor = shouldShowModernizeVisualUpdate
+@@ -379,6 +396,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
      }
  
      private int calculateAnchorBottomRelativeToContent() {
@@ -1979,7 +2041,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1474,6 +1474,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1480,6 +1480,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
          Force Tablet Mode
        </message>
@@ -2059,7 +2121,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-@@ -25,6 +25,8 @@ import org.chromium.ui.modelutil.PropertyModel;
+@@ -26,6 +26,8 @@ import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  import org.chromium.ui.resources.ResourceManager;
  import org.chromium.ui.widget.Toast;
@@ -2068,8 +2130,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
  /**
   * The root coordinator for the bottom controls component. This component is intended for use with
-@@ -60,6 +62,8 @@ public class BottomControlsCoordinator implements BackPressHandler {
-      * @param contentDelegate Delegate for bottom controls UI operations.
+@@ -62,6 +64,8 @@ public class BottomControlsCoordinator implements BackPressHandler {
+      * @param tabObscuringHandler Delegate object handling obscuring views.
       * @param overlayPanelVisibilitySupplier Notifies overlay panel visibility event.
       * @param constraintsSupplier Used to access current constraints of the browser controls.
 +     * @param topUiThemeColorProvider {@link ThemeColorProvider} for top UI.
@@ -2077,9 +2139,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
       */
      @SuppressLint("CutPasteId") // Not actually cut and paste since it's View vs ViewGroup.
      public BottomControlsCoordinator(Activity activity, WindowAndroid windowAndroid,
-@@ -68,7 +72,9 @@ public class BottomControlsCoordinator implements BackPressHandler {
+@@ -70,7 +74,9 @@ public class BottomControlsCoordinator implements BackPressHandler {
              ScrollingBottomViewResourceFrameLayout root,
-             BottomControlsContentDelegate contentDelegate,
+             BottomControlsContentDelegate contentDelegate, TabObscuringHandler tabObscuringHandler,
              ObservableSupplier<Boolean> overlayPanelVisibilitySupplier,
 -            ObservableSupplier<Integer> constraintsSupplier) {
 +            ObservableSupplier<Integer> constraintsSupplier,
@@ -2088,7 +2150,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
          root.setConstraintsSupplier(constraintsSupplier);
          PropertyModel model = new PropertyModel(BottomControlsProperties.ALL_KEYS);
  
-@@ -104,7 +110,8 @@ public class BottomControlsCoordinator implements BackPressHandler {
+@@ -106,7 +112,8 @@ public class BottomControlsCoordinator implements BackPressHandler {
  
          if (mContentDelegate != null) {
              mContentDelegate.initializeWithNative(
@@ -2101,7 +2163,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
-@@ -15,6 +15,8 @@ import org.chromium.chrome.browser.layouts.LayoutType;
+@@ -16,6 +16,8 @@ import org.chromium.chrome.browser.tab.TabObscuringHandler;
  import org.chromium.ui.KeyboardVisibilityDelegate;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.modelutil.PropertyModel;
@@ -2110,7 +2172,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
  /**
   * This class is responsible for reacting to events from the outside world, interacting with other
-@@ -95,6 +97,12 @@ class BottomControlsMediator implements BrowserControlsStateProvider.Observer,
+@@ -101,6 +103,12 @@ class BottomControlsMediator implements BrowserControlsStateProvider.Observer,
      }
  
      void setBottomControlsVisible(boolean visible) {
@@ -2123,7 +2185,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
          mIsBottomControlsVisible = visible;
          updateCompositedViewVisibility();
          updateAndroidViewVisibility();
-@@ -116,6 +124,7 @@ class BottomControlsMediator implements BrowserControlsStateProvider.Observer,
+@@ -123,6 +131,7 @@ class BottomControlsMediator implements BrowserControlsStateProvider.Observer,
      @Override
      public void onControlsOffsetChanged(int topOffset, int topControlsMinHeightOffset,
              int bottomOffset, int bottomControlsMinHeightOffset, boolean needsAnimate) {
@@ -2134,7 +2196,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java
-@@ -16,6 +16,9 @@ class BottomControlsProperties {
+@@ -17,6 +17,9 @@ class BottomControlsProperties {
      /** The Y offset of the view in px. */
      static final WritableIntPropertyKey Y_OFFSET = new WritableIntPropertyKey();
  
@@ -2144,12 +2206,12 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
      /** Whether the Android view version of the bottom controls component is visible. */
      static final WritableBooleanPropertyKey ANDROID_VIEW_VISIBLE = new WritableBooleanPropertyKey();
  
-@@ -24,5 +27,5 @@ class BottomControlsProperties {
-             new WritableBooleanPropertyKey();
+@@ -29,5 +32,5 @@ class BottomControlsProperties {
+             new PropertyModel.WritableBooleanPropertyKey();
  
      static final PropertyKey[] ALL_KEYS = new PropertyKey[] {BOTTOM_CONTROLS_CONTAINER_HEIGHT_PX,
--            Y_OFFSET, ANDROID_VIEW_VISIBLE, COMPOSITED_VIEW_VISIBLE};
-+            Y_OFFSET, ANDROID_VIEW_VISIBLE, COMPOSITED_VIEW_VISIBLE, TOPCONTROLSMINHEIGHT_OFFSET};
+-            Y_OFFSET, ANDROID_VIEW_VISIBLE, COMPOSITED_VIEW_VISIBLE, IS_OBSCURED};
++            Y_OFFSET, ANDROID_VIEW_VISIBLE, COMPOSITED_VIEW_VISIBLE, IS_OBSCURED, TOPCONTROLSMINHEIGHT_OFFSET};
  }
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java
@@ -2331,7 +2393,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -48,4 +48,8 @@
+@@ -50,4 +50,8 @@ found in the LICENSE file.
          android:key="captions"
          android:title="@string/accessibility_captions_title"/>
  
@@ -2421,7 +2483,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
 --- a/content/browser/renderer_host/render_widget_host_view_android.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
  #include "base/task/thread_pool.h"
  #include "base/threading/scoped_blocking_call.h"
  #include "base/threading/thread_task_runner_handle.h"
@@ -2429,7 +2491,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
  #include "cc/base/math_util.h"
  #include "cc/layers/layer.h"
  #include "cc/layers/surface_layer.h"
-@@ -461,6 +462,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
+@@ -474,6 +475,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
    // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs.
    float top_content_offset =
        metadata.top_controls_height * metadata.top_controls_shown_ratio;
diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
index 04043609..84e6ee95 100644
--- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
+++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -60,6 +60,19 @@
+@@ -48,6 +48,19 @@ found in the LICENSE file.
          android:key="privacy_sandbox"
          android:title="@string/prefs_privacy_sandbox"
          android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/>
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -42,6 +42,12 @@ import org.chromium.components.user_prefs.UserPrefs;
+@@ -39,6 +39,12 @@ import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.ui.text.NoUnderlineClickableSpan;
  import org.chromium.ui.text.SpanApplier;
  
@@ -50,9 +50,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  /**
   * Fragment to keep track of the all the privacy related preferences.
   */
-@@ -60,6 +66,16 @@ public class PrivacySettings
-     private static final String PREF_PROXY_OPTIONS = "proxy";
-     private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+@@ -54,6 +60,16 @@ public class PrivacySettings
+     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
+     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
  
 +    // moved from SyncAndServicesSettings.java
 +    private static final String PREF_SERVICES_CATEGORY = "services_category";
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private IncognitoLockSettings mIncognitoLockSettings;
  
-@@ -99,6 +115,16 @@ public class PrivacySettings
+@@ -93,6 +109,16 @@ public class PrivacySettings
  
          mManagedPreferenceDelegate = createManagedPreferenceDelegate();
  
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          ChromeSwitchPreference canMakePaymentPref =
                  (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
          canMakePaymentPref.setOnPreferenceChangeListener(this);
-@@ -131,6 +157,9 @@ public class PrivacySettings
+@@ -121,6 +147,9 @@ public class PrivacySettings
          } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
              UserPrefs.get(Profile.getLastUsedRegularProfile())
                      .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -145,7 +174,7 @@ public class PrivacySettings
+@@ -135,7 +164,7 @@ public class PrivacySettings
       * Updates the preferences.
       */
      public void updatePreferences() {
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -444,6 +444,10 @@ CHAR_LIMIT guidelines:
+@@ -423,6 +423,10 @@ CHAR_LIMIT guidelines:
          No statistics or crash reports are sent to Google
        </message>
  
diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch
index 28372f55..2ea07a4b 100644
--- a/build/patches/Multiple-fingerprinting-mitigations.patch
+++ b/build/patches/Multiple-fingerprinting-mitigations.patch
@@ -61,7 +61,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2361,6 +2361,7 @@ static_library("browser") {
+@@ -2379,6 +2379,7 @@ static_library("browser") {
      "//services/device/public/cpp:device_features",
      "//services/device/public/cpp/serial:switches",
      "//services/device/public/cpp/usb",
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -213,6 +213,8 @@
+@@ -215,6 +215,8 @@
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/ui_features.h"
  
@@ -81,7 +81,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "base/allocator/buildflags.h"
  #endif
-@@ -3419,6 +3421,20 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3550,6 +3552,20 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsName,
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)},
@@ -122,9 +122,9 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  
 +#include "third_party/ungoogled/ungoogled_switches.h"
  #if BUILDFLAG(IS_ANDROID)
+ #include "base/android/child_process_binding_types.h"
  #include "content/browser/android/java_interfaces_impl.h"
- #include "content/browser/font_unique_name_lookup/font_unique_name_lookup_service.h"
-@@ -3224,6 +3225,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3239,6 +3240,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kDisableBreakpad,
      switches::kDisableDatabases,
      switches::kDisableFileSystem,
@@ -157,7 +157,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/build_info.h"
  #endif
-@@ -551,6 +553,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -455,6 +457,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
    if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) &&
        base::FeatureList::IsEnabled(
            blink::features::kDecodeLossyWebPImagesToYUV)) {
@@ -174,16 +174,16 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -216,6 +216,9 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableAutomationControlled(bool);
-   BLINK_PLATFORM_EXPORT static void EnableAutoplayIgnoresWebAudio(bool);
-   BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
-   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
-   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
-   BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
+@@ -66,6 +66,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+   static void UpdateStatusFromBaseFeatures();
+ 
+   static void EnableOverlayScrollbars(bool);
++  static void EnableFingerprintingClientRectsNoise(bool);
++  static void EnableFingerprintingCanvasMeasureTextNoise(bool);
++  static void EnableFingerprintingCanvasImageDataNoise(bool);
+   static void EnableFluentScrollbars(bool);
+ 
+   WebRuntimeFeatures() = delete;
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "base/notreached.h"
  #include "base/time/time.h"
  #include "cc/animation/animation_host.h"
-@@ -806,6 +807,15 @@ Document::Document(const DocumentInit& initializer,
+@@ -809,6 +810,15 @@ Document::Document(const DocumentInit& initializer,
                ? MakeGarbageCollected<RenderBlockingResourceManager>(*this)
                : nullptr),
        data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) {
@@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
    if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution))
      script_runner_delayer_->Activate();
  
-@@ -2233,6 +2243,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
+@@ -2236,6 +2246,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
  #endif
  }
  
@@ -240,7 +240,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2274,6 +2278,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -2301,6 +2305,9 @@ class CORE_EXPORT Document : public ContainerNode,
  
    base::ElapsedTimer start_time_;
  
@@ -253,7 +253,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2111,6 +2111,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2123,6 +2123,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
        quads.push_back(element_layout_object->LocalToAbsoluteQuad(
            gfx::QuadF(element_layout_object->ObjectBoundingBox())));
      }
@@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
      return;
    }
  
-@@ -2118,6 +2119,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2130,6 +2131,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
    if (element_layout_object->IsBoxModelObject() ||
        element_layout_object->IsBR())
      element_layout_object->AbsoluteQuads(quads);
@@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
  }
  
  DOMRectList* Element::getClientRects() {
-@@ -2149,6 +2155,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
+@@ -2168,6 +2174,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
    DCHECK(element_layout_object);
    GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                     *element_layout_object);
@@ -286,7 +286,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1601,6 +1601,12 @@ DOMRectList* Range::getClientRects() const {
+@@ -1604,6 +1604,12 @@ DOMRectList* Range::getClientRects() const {
    Vector<gfx::QuadF> quads;
    GetBorderAndTextQuads(quads);
  
@@ -299,7 +299,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
    return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -1738,7 +1744,11 @@ gfx::RectF Range::BoundingRect() const {
+@@ -1743,7 +1749,11 @@ gfx::RectF Range::BoundingRect() const {
  
    // If all rects are empty, return the first rect.
    if (result.IsEmpty() && !quads.IsEmpty())
@@ -472,7 +472,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
  #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
  #include "third_party/blink/renderer/platform/graphics/stroke_data.h"
  #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
-@@ -2072,6 +2073,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
+@@ -2070,6 +2071,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
            snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
        DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
      }
@@ -502,11 +502,11 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 +  return text_metrics;
  }
  
- void CanvasRenderingContext2D::fillFormattedText(
+ void CanvasRenderingContext2D::drawFormattedText(
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1609,7 +1609,9 @@ component("platform") {
+@@ -1613,7 +1613,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -517,7 +517,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
  
    allow_circular_includes_from = [
      "//third_party/blink/renderer/platform/blob",
-@@ -1678,6 +1680,7 @@ component("platform") {
+@@ -1682,6 +1684,7 @@ component("platform") {
      "//third_party/blink/public/strings",
      "//third_party/blink/renderer/platform/wtf",
      "//third_party/ced",
@@ -528,8 +528,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -703,4 +703,16 @@ void WebRuntimeFeatures::EnablePrefixedStorageInfo(bool enable) {
-   RuntimeEnabledFeatures::SetPrefixedStorageInfoEnabled(enable);
+@@ -64,4 +64,16 @@ void WebRuntimeFeatures::EnableFluentScrollbars(bool enable) {
+   ScrollbarThemeSettings::SetFluentScrollbarsEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -591,7 +591,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
  namespace blink {
  
  scoped_refptr<StaticBitmapImage> StaticBitmapImage::Create(
-@@ -113,4 +118,154 @@ void StaticBitmapImage::DrawHelper(cc::PaintCanvas* canvas,
+@@ -115,4 +120,154 @@ void StaticBitmapImage::DrawHelper(cc::PaintCanvas* canvas,
        WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode));
  }
  
@@ -761,8 +761,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1029,6 +1029,15 @@
-       name: "FileSystemAccess",
+@@ -1418,6 +1418,15 @@
+       // No plan to support complex UI for date/time INPUT types on Android.
        status: {"Android": "test", "default": "stable"},
      },
 +    {
@@ -775,8 +775,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      name: "FingerprintingCanvasImageDataNoise",
 +    },
      {
-       name: "FileSystemAccessAccessHandle",
-       status: "stable",
+       name: "InstalledApp",
+       public: true,
 diff --git a/third_party/ungoogled/BUILD.gn b/third_party/ungoogled/BUILD.gn
 new file mode 100644
 --- /dev/null
diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
index 2d90b400..d78a1c73 100644
--- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
+++ b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -269,6 +269,8 @@ std::vector<std::u16string> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
+@@ -267,6 +267,8 @@ std::vector<std::u16string> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
  std::vector<std::u16string>
  ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    std::vector<std::u16string> builtins_to_provide;
diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch
index 136a6e5b..c42f2ec1 100644
--- a/build/patches/OpenSearch-miscellaneous.patch
+++ b/build/patches/OpenSearch-miscellaneous.patch
@@ -185,7 +185,7 @@ diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/c
  #include "base/metrics/histogram_macros.h"
  #include "base/no_destructor.h"
  #include "base/strings/string_number_conversions.h"
-@@ -249,6 +250,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() {
+@@ -251,6 +252,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() {
  
    GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
    if (!osdd_url.is_empty()) {
@@ -196,7 +196,7 @@ diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/c
 diff --git a/components/search_engines/template_url_fetcher.cc b/components/search_engines/template_url_fetcher.cc
 --- a/components/search_engines/template_url_fetcher.cc
 +++ b/components/search_engines/template_url_fetcher.cc
-@@ -258,16 +258,29 @@ void TemplateURLFetcher::ScheduleDownload(
+@@ -259,16 +259,29 @@ void TemplateURLFetcher::ScheduleDownload(
      return;
    }
  
@@ -246,7 +246,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc
    // regardless of |url| if the default search provider is managed by policy or
    // controlled by an extension.
    bool CanMakeDefault(const TemplateURL* url) const;
-@@ -622,9 +625,6 @@ class TemplateURLService : public WebDataServiceConsumer,
+@@ -636,9 +639,6 @@ class TemplateURLService : public WebDataServiceConsumer,
    // SetKeywordSearchTermsForURL is invoked.
    void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details);
  
diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch
index 24b11362..108edea0 100644
--- a/build/patches/Override-Navigator-Language.patch
+++ b/build/patches/Override-Navigator-Language.patch
@@ -79,7 +79,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #include "components/metrics/single_sample_metrics.h"
  #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h"
  #include "components/services/storage/public/cpp/buckets/bucket_id.h"
-@@ -3158,8 +3159,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3173,8 +3174,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
    PropagateBrowserCommandLineToRenderer(browser_command_line, command_line);
  
    // Pass on the browser locale.
diff --git a/build/patches/Partition-Blink-memory-cache.patch b/build/patches/Partition-Blink-memory-cache.patch
index 6a504ca6..134d8d0f 100644
--- a/build/patches/Partition-Blink-memory-cache.patch
+++ b/build/patches/Partition-Blink-memory-cache.patch
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b
 diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
-@@ -2214,7 +2214,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
+@@ -2216,7 +2216,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
    Resource* cached_resource = document->Fetcher()->CachedResource(url);
    if (!cached_resource) {
      cached_resource = GetMemoryCache()->ResourceForURL(
@@ -80,7 +80,7 @@ diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_part
 diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
 --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
-@@ -196,7 +196,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map,
+@@ -197,7 +197,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map,
  }
  
  bool MemoryCache::Contains(const Resource* resource) const {
@@ -89,7 +89,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/
      return false;
  
    const auto resource_maps_it =
-@@ -212,12 +212,9 @@ bool MemoryCache::Contains(const Resource* resource) const {
+@@ -213,12 +213,9 @@ bool MemoryCache::Contains(const Resource* resource) const {
    return resource == resources_it->value->GetResource();
  }
  
@@ -128,7 +128,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t
 diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
 --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
-@@ -657,7 +657,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
+@@ -652,7 +652,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
    if (!archive_ && factory.GetType() == ResourceType::kRaw)
      return nullptr;
  
@@ -138,7 +138,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
    // Most off-main-thread resource fetches use Resource::kRaw and don't reach
    // this point, but off-main-thread module fetches might.
    if (IsMainThread()) {
-@@ -1116,7 +1117,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
+@@ -1111,7 +1112,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
          resource = nullptr;
        } else {
          resource = GetMemoryCache()->ResourceForURL(
@@ -149,7 +149,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
        }
        if (resource) {
          policy = DetermineRevalidationPolicy(resource_type, params, *resource,
-@@ -1324,7 +1327,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
+@@ -1319,7 +1322,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
      const FetchParameters& params,
      const ResourceFactory& factory) {
    const String cache_identifier =
@@ -159,7 +159,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
    if (!base::FeatureList::IsEnabled(
            blink::features::kScopeMemoryCachePerContext)) {
      DCHECK(!IsMainThread() || params.IsStaleRevalidation() ||
-@@ -2211,13 +2215,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
+@@ -2207,13 +2211,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
    to_be_removed.clear();
  }
  
@@ -179,7 +179,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
  
    // Requests that can be satisfied via `archive_` (i.e. MHTML) or
    // `subresource_web_bundles_` should not participate in the global caching,
-@@ -2229,7 +2236,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
+@@ -2225,7 +2232,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
    if (bundle)
      return bundle->GetCacheIdentifier();
  
diff --git a/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch b/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch
deleted file mode 100644
index 8fae881b..00000000
--- a/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch
+++ /dev/null
@@ -1,489 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Wed, 23 Mar 2022 08:37:47 +0000
-Subject: Partition DNS requests by top-frame NIK
-
-Chromium does not provide isolation of DOH requests (see related issue).
-This would easily allow DoH servers to reconstruct user navigation by device,
-especially if TLS Resumption is enabled.
-The patch fixes the problem by associating the DoH request to the top frame NIK,
-but in any case separating it with an additional layer because it is marked as a DNS
-request (IsDns in the NetworkIsolationKey).
-The patch adds two new flags:
-* kSplitDnsByNetworkIsolationKey, active by default
-* kLogSplitDnsByNetworkIsolationKey which allows check functionality (via a "DNS:" filter in logcat)
-
-Once the split is active the number of open connections to the DoH server will increase
-(which can be detected with apps like PCAPdroid) but the overhead seems manageable for
-any type of upstream DoH server.
-
-See also:
-* https://bugs.chromium.org/p/chromium/issues/detail?id=1082311
-* https://github.com/bromite/bromite/pull/1974
-
-Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- chrome/browser/about_flags.cc        | 12 ++++++++++++
- chrome/browser/flag_descriptions.cc  |  9 +++++++++
- chrome/browser/flag_descriptions.h   |  6 ++++++
- net/base/features.cc                 |  6 ++++++
- net/base/features.h                  |  6 ++++++
- net/base/isolation_info.cc           | 24 +++++++++++++++++++++++-
- net/base/isolation_info.h            |  7 +++++++
- net/base/isolation_info.proto        |  4 +++-
- net/base/network_isolation_key.cc    | 16 ++++++++++++++++
- net/base/network_isolation_key.h     | 19 +++++++++++++++----
- net/dns/dns_transaction.cc           | 23 +++++++++++++++++++----
- net/dns/dns_transaction.h            |  4 +++-
- net/dns/host_resolver_manager.cc     | 20 ++++++++++++++++----
- net/socket/ssl_client_socket_impl.cc |  6 ++++++
- 14 files changed, 147 insertions(+), 15 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -8073,6 +8073,18 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsWin | kOsLinux | kOsLacros | kOsMac | kOsFuchsia,
-      FEATURE_VALUE_TYPE(kSigninInterceptBubbleV2)},
- #endif
-+    {"dns-request-partitioning",
-+     flag_descriptions::kSplitDnsByNetworkIsolationKeyName,
-+     flag_descriptions::kSplitDnsByNetworkIsolationKeyDescription,
-+     kOsWin | kOsLinux | kOsMac | kOsCrOS | kOsAndroid | kOsFuchsia,
-+     FEATURE_VALUE_TYPE(net::features::kSplitDnsByNetworkIsolationKey)},
-+
-+    {"dns-request-partitioning-log",
-+     flag_descriptions::kLogSplitDnsByNetworkIsolationKeyName,
-+     flag_descriptions::kLogSplitDnsByNetworkIsolationKeyDescription,
-+     kOsWin | kOsLinux | kOsMac | kOsCrOS | kOsAndroid | kOsFuchsia,
-+     FEATURE_VALUE_TYPE(net::features::kLogSplitDnsByNetworkIsolationKey)},
-+
-     {"http-cache-partitioning",
-      flag_descriptions::kSplitCacheByNetworkIsolationKeyName,
-      flag_descriptions::kSplitCacheByNetworkIsolationKeyDescription,
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -2672,6 +2672,15 @@ const char kSmoothScrollingName[] = "Smooth Scrolling";
- const char kSmoothScrollingDescription[] =
-     "Animate smoothly when scrolling page content.";
- 
-+const char kSplitDnsByNetworkIsolationKeyName[] = "DNS Requests Partitioning";
-+const char kSplitDnsByNetworkIsolationKeyDescription[] =
-+    "Partition DNS requests by (top-level site) to "
-+    "disallow DoH cross-site tracking.";
-+
-+const char kLogSplitDnsByNetworkIsolationKeyName[] = "DNS Requests Partitioning logging";
-+const char kLogSplitDnsByNetworkIsolationKeyDescription[] =
-+    "Log DNS requests and their effective partitioning";
-+
- const char kSplitCacheByNetworkIsolationKeyName[] = "HTTP Cache Partitioning";
- const char kSplitCacheByNetworkIsolationKeyDescription[] =
-     "Partitions the HTTP Cache by (top-level site, current-frame site) to "
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1511,6 +1511,12 @@ extern const char kSiteIsolationOptOutChoiceOptOut[];
- extern const char kSmoothScrollingName[];
- extern const char kSmoothScrollingDescription[];
- 
-+extern const char kSplitDnsByNetworkIsolationKeyName[];
-+extern const char kSplitDnsByNetworkIsolationKeyDescription[];
-+
-+extern const char kLogSplitDnsByNetworkIsolationKeyName[];
-+extern const char kLogSplitDnsByNetworkIsolationKeyDescription[];
-+
- extern const char kSplitCacheByNetworkIsolationKeyName[];
- extern const char kSplitCacheByNetworkIsolationKeyDescription[];
- 
-diff --git a/net/base/features.cc b/net/base/features.cc
---- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -123,6 +123,12 @@ const base::Feature kIsCleartextPermitted{"IsCleartextPermitted",
- const base::Feature kNetworkQualityEstimator{"NetworkQualityEstimator",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
- 
-+const base::Feature kSplitDnsByNetworkIsolationKey{"SplitDnsByNetworkIsolationKey",
-+                                 base::FEATURE_ENABLED_BY_DEFAULT};
-+
-+const base::Feature kLogSplitDnsByNetworkIsolationKey{"LogSplitDnsByNetworkIsolationKey",
-+                                 base::FEATURE_DISABLED_BY_DEFAULT};
-+
- const base::Feature kSplitCacheByIncludeCredentials{
-     "SplitCacheByIncludeCredentials", base::FEATURE_DISABLED_BY_DEFAULT};
- 
-diff --git a/net/base/features.h b/net/base/features.h
---- a/net/base/features.h
-+++ b/net/base/features.h
-@@ -184,6 +184,12 @@ NET_EXPORT extern const base::Feature kEncryptedClientHello;
- // quality estimator (NQE).
- NET_EXPORT extern const base::Feature kNetworkQualityEstimator;
- 
-+// Splits dns requests by the request's NetworkIsolationKey.
-+NET_EXPORT extern const base::Feature kSplitDnsByNetworkIsolationKey;
-+
-+// Log dns requests by request
-+NET_EXPORT extern const base::Feature kLogSplitDnsByNetworkIsolationKey;
-+
- // Splits cache entries by the request's includeCredentials.
- NET_EXPORT extern const base::Feature kSplitCacheByIncludeCredentials;
- 
-diff --git a/net/base/isolation_info.cc b/net/base/isolation_info.cc
---- a/net/base/isolation_info.cc
-+++ b/net/base/isolation_info.cc
-@@ -124,6 +124,23 @@ IsolationInfo IsolationInfo::CreateTransient() {
-                        absl::nullopt /* party_context */);
- }
- 
-+IsolationInfo IsolationInfo::CreateTransientForDNS() {
-+  IsolationInfo info = CreateTransient();
-+  info.network_isolation_key_ =
-+    NetworkIsolationKey::CreateForDNS(info.network_isolation_key_);
-+  info.is_dns_ = true;
-+  return info;
-+}
-+
-+IsolationInfo IsolationInfo::CreateTransientForDNS(
-+                const net::NetworkIsolationKey network_isolation_key) {
-+  IsolationInfo info = CreateTransient();
-+  info.network_isolation_key_ =
-+    NetworkIsolationKey::CreateForDNS(network_isolation_key);
-+  info.is_dns_ = true;
-+  return info;
-+}
-+
- absl::optional<IsolationInfo> IsolationInfo::Deserialize(
-     const std::string& serialized) {
-   proto::IsolationInfo proto;
-@@ -146,11 +163,14 @@ absl::optional<IsolationInfo> IsolationInfo::Deserialize(
-     }
-   }
- 
--  return IsolationInfo::CreateIfConsistent(
-+  absl::optional<IsolationInfo> info = IsolationInfo::CreateIfConsistent(
-       static_cast<RequestType>(proto.request_type()),
-       std::move(top_frame_origin), std::move(frame_origin),
-       SiteForCookies::FromUrl(GURL(proto.site_for_cookies())),
-       std::move(party_context), nullptr);
-+  if (info && proto.has_is_for_dns())
-+    info->is_dns_ = proto.is_for_dns();
-+  return info;
- }
- 
- IsolationInfo IsolationInfo::CreateDoubleKey(
-@@ -287,6 +307,8 @@ std::string IsolationInfo::Serialize() const {
-     }
-   }
- 
-+  info.set_is_for_dns(is_dns_);
-+
-   return info.SerializeAsString();
- }
- 
-diff --git a/net/base/isolation_info.h b/net/base/isolation_info.h
---- a/net/base/isolation_info.h
-+++ b/net/base/isolation_info.h
-@@ -216,6 +216,10 @@ class NET_EXPORT IsolationInfo {
-   // means both `frame_site_` and `top_frame_site_` are populated.
-   static bool IsFrameSiteEnabled();
- 
-+  static IsolationInfo CreateTransientForDNS();
-+  static IsolationInfo CreateTransientForDNS(net::NetworkIsolationKey network_isolation_key);
-+  bool IsDns() { return is_dns_; }
-+
-  private:
-   IsolationInfo(RequestType request_type,
-                 const absl::optional<url::Origin>& top_frame_origin,
-@@ -258,6 +262,9 @@ class NET_EXPORT IsolationInfo {
-   // excluded to make it easier to update on subframe redirects.
-   absl::optional<std::set<SchemefulSite>> party_context_;
- 
-+  // Mark isolation info for use in dns requests
-+  bool is_dns_ = false;
-+
-   // Mojo serialization code needs to access internal party_context_ field.
-   friend struct mojo::StructTraits<network::mojom::IsolationInfoDataView,
-                                    IsolationInfo>;
-diff --git a/net/base/isolation_info.proto b/net/base/isolation_info.proto
---- a/net/base/isolation_info.proto
-+++ b/net/base/isolation_info.proto
-@@ -16,4 +16,6 @@ message IsolationInfo {
- 
-   message PartyContext { repeated string site = 1; }
-   optional PartyContext party_context = 5;
--}
-\ No newline at end of file
-+
-+  optional bool is_for_dns = 6;
-+}
-diff --git a/net/base/network_isolation_key.cc b/net/base/network_isolation_key.cc
---- a/net/base/network_isolation_key.cc
-+++ b/net/base/network_isolation_key.cc
-@@ -65,6 +65,18 @@ NetworkIsolationKey& NetworkIsolationKey::operator=(
- NetworkIsolationKey& NetworkIsolationKey::operator=(
-     NetworkIsolationKey&& network_isolation_key) = default;
- 
-+/* static */
-+NetworkIsolationKey NetworkIsolationKey::CreateForDNS(
-+    const NetworkIsolationKey& network_isolation_key) {
-+  SchemefulSite top_frame_site;
-+  if(network_isolation_key.top_frame_site_.has_value())
-+      top_frame_site = SchemefulSite(network_isolation_key.top_frame_site_.value());
-+  NetworkIsolationKey key(top_frame_site, top_frame_site);
-+  key.nonce_ = network_isolation_key.nonce_;
-+  key.is_dns_ = true;
-+  return key;
-+}
-+
- NetworkIsolationKey NetworkIsolationKey::CreateTransient() {
-   SchemefulSite site_with_opaque_origin;
-   return NetworkIsolationKey(site_with_opaque_origin, site_with_opaque_origin);
-@@ -99,6 +111,10 @@ std::string NetworkIsolationKey::ToDebugString() const {
-     return_string += " (with nonce " + nonce_->ToString() + ")";
-   }
- 
-+  if (is_dns_) {
-+    return_string += " (dns)";
-+  }
-+
-   return return_string;
- }
- 
-diff --git a/net/base/network_isolation_key.h b/net/base/network_isolation_key.h
---- a/net/base/network_isolation_key.h
-+++ b/net/base/network_isolation_key.h
-@@ -79,8 +79,8 @@ class NET_EXPORT NetworkIsolationKey {
- 
-   // Compare keys for equality, true if all enabled fields are equal.
-   bool operator==(const NetworkIsolationKey& other) const {
--    return std::tie(top_frame_site_, frame_site_, nonce_) ==
--           std::tie(other.top_frame_site_, other.frame_site_, other.nonce_);
-+    return std::tie(top_frame_site_, frame_site_, nonce_, is_dns_) ==
-+           std::tie(other.top_frame_site_, other.frame_site_, other.nonce_, other.is_dns_);
-   }
- 
-   // Compare keys for inequality, true if any enabled field varies.
-@@ -90,8 +90,8 @@ class NET_EXPORT NetworkIsolationKey {
- 
-   // Provide an ordering for keys based on all enabled fields.
-   bool operator<(const NetworkIsolationKey& other) const {
--    return std::tie(top_frame_site_, frame_site_, nonce_) <
--           std::tie(other.top_frame_site_, other.frame_site_, other.nonce_);
-+    return std::tie(top_frame_site_, frame_site_, nonce_, is_dns_) <
-+           std::tie(other.top_frame_site_, other.frame_site_, other.nonce_, other.is_dns_);
-   }
- 
-   // Returns the string representation of the key for use in string-keyed disk
-@@ -145,6 +145,15 @@ class NET_EXPORT NetworkIsolationKey {
-       const base::Value& value,
-       NetworkIsolationKey* out_network_isolation_key);
- 
-+  // Create a network isolation key for the dns subsystem
-+  // only with top_frame_site of source, so subframes
-+  // will use the same dns connection of the top frame
-+  // different top frames will use different nik
-+  static NetworkIsolationKey CreateForDNS(const NetworkIsolationKey& network_isolation_key);
-+
-+  // Returns true if the nik is created for dns requests
-+  bool IsDns() const { return is_dns_; }
-+
-  private:
-   // Whether this key has opaque origins or a nonce.
-   bool IsOpaque() const;
-@@ -154,6 +163,8 @@ class NET_EXPORT NetworkIsolationKey {
-   static absl::optional<std::string> SerializeSiteWithNonce(
-       const SchemefulSite& site);
- 
-+  bool is_dns_ = false;
-+
-   // The origin/etld+1 of the top frame of the page making the request.
-   absl::optional<SchemefulSite> top_frame_site_;
- 
-diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
---- a/net/dns/dns_transaction.cc
-+++ b/net/dns/dns_transaction.cc
-@@ -38,6 +38,7 @@
- #include "net/base/backoff_entry.h"
- #include "net/base/completion_once_callback.h"
- #include "net/base/elements_upload_data_stream.h"
-+#include "net/base/features.h"
- #include "net/base/idempotency.h"
- #include "net/base/io_buffer.h"
- #include "net/base/ip_address.h"
-@@ -448,6 +449,12 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
-                            LOAD_MINIMAL_HEADERS | LOAD_BYPASS_PROXY);
-     request_->set_allow_credentials(false);
-     request_->set_isolation_info(isolation_info);
-+    if (base::FeatureList::IsEnabled(net::features::kLogSplitDnsByNetworkIsolationKey)) {
-+      LOG(INFO) << "DNS: Request "
-+                << DnsDomainToString(query_->qname()).value_or("")
-+                << " nik: "
-+                << isolation_info.network_isolation_key().ToDebugString();
-+    }
-   }
- 
-   DnsHTTPAttempt(const DnsHTTPAttempt&) = delete;
-@@ -1014,6 +1021,8 @@ class DnsOverHttpsProbeRunner : public DnsProbeRunner {
-         session_.get(), doh_server_index, formatted_probe_hostname_,
-         dns_protocol::kTypeA, nullptr /* opt_rdata */,
-         &probe_stats->probe_attempts, context_->url_request_context(),
-+        base::FeatureList::IsEnabled(net::features::kSplitDnsByNetworkIsolationKey) ?
-+          IsolationInfo::CreateTransientForDNS() :
-         context_->isolation_info(), RequestPriority::DEFAULT_PRIORITY);
- 
-     DnsAttempt* probe_attempt = probe_stats->probe_attempts.back().get();
-@@ -1106,7 +1115,8 @@ class DnsTransactionImpl : public DnsTransaction,
-                      bool secure,
-                      SecureDnsMode secure_dns_mode,
-                      ResolveContext* resolve_context,
--                     bool fast_timeout)
-+                     bool fast_timeout,
-+                     const NetworkIsolationKey& network_isolation_key)
-       : session_(session),
-         hostname_(std::move(hostname)),
-         qtype_(qtype),
-@@ -1115,7 +1125,8 @@ class DnsTransactionImpl : public DnsTransaction,
-         secure_dns_mode_(secure_dns_mode),
-         fast_timeout_(fast_timeout),
-         net_log_(net_log),
--        resolve_context_(resolve_context->AsSafeRef()) {
-+        resolve_context_(resolve_context->AsSafeRef()),
-+        network_isolation_key_(network_isolation_key) {
-     DCHECK(session_.get());
-     DCHECK(!hostname_.empty());
-     DCHECK(!IsIPLiteral(hostname_));
-@@ -1355,6 +1366,8 @@ class DnsTransactionImpl : public DnsTransaction,
-     ConstructDnsHTTPAttempt(
-         session_.get(), doh_server_index, qnames_.front(), qtype_, opt_rdata_,
-         &attempts_, resolve_context_->url_request_context(),
-+        base::FeatureList::IsEnabled(net::features::kSplitDnsByNetworkIsolationKey) ?
-+          IsolationInfo::CreateTransientForDNS(network_isolation_key_) :
-         resolve_context_->isolation_info(), request_priority_);
-     ++attempts_count_;
-     int rv = attempts_.back()->Start(base::BindOnce(
-@@ -1688,6 +1701,8 @@ class DnsTransactionImpl : public DnsTransaction,
-   base::SafeRef<ResolveContext> resolve_context_;
-   RequestPriority request_priority_ = DEFAULT_PRIORITY;
- 
-+  const NetworkIsolationKey& network_isolation_key_;
-+
-   THREAD_CHECKER(thread_checker_);
- };
- 
-@@ -1708,10 +1723,10 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory {
-       bool secure,
-       SecureDnsMode secure_dns_mode,
-       ResolveContext* resolve_context,
--      bool fast_timeout) override {
-+      bool fast_timeout, const NetworkIsolationKey& network_isolation_key) override {
-     return std::make_unique<DnsTransactionImpl>(
-         session_.get(), std::move(hostname), qtype, net_log, opt_rdata_.get(),
--        secure, secure_dns_mode, resolve_context, fast_timeout);
-+        secure, secure_dns_mode, resolve_context, fast_timeout, network_isolation_key);
-   }
- 
-   std::unique_ptr<DnsProbeRunner> CreateDohProbeRunner(
-diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h
---- a/net/dns/dns_transaction.h
-+++ b/net/dns/dns_transaction.h
-@@ -16,6 +16,7 @@
- #include "base/time/time.h"
- #include "net/base/request_priority.h"
- #include "net/dns/opt_record_rdata.h"
-+#include "net/base/network_isolation_key.h"
- #include "net/dns/public/secure_dns_mode.h"
- #include "net/dns/record_rdata.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
-@@ -116,7 +117,8 @@ class NET_EXPORT_PRIVATE DnsTransactionFactory {
-       bool secure,
-       SecureDnsMode secure_dns_mode,
-       ResolveContext* resolve_context,
--      bool fast_timeout) = 0;
-+      bool fast_timeout,
-+      const NetworkIsolationKey& network_isolation_key) = 0;
- 
-   // Creates a runner to run the DoH probe sequence for all configured DoH
-   // resolvers.
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -1243,7 +1243,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr<DnsTask> {
-           const NetLogWithSource& job_net_log,
-           const base::TickClock* tick_clock,
-           bool fallback_available,
--          const HostResolver::HttpsSvcbOptions& https_svcb_options)
-+          const HostResolver::HttpsSvcbOptions& https_svcb_options,
-+          const NetworkIsolationKey& network_isolation_key)
-       : client_(client),
-         host_(std::move(host)),
-         resolve_context_(resolve_context->AsSafeRef()),
-@@ -1254,7 +1255,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr<DnsTask> {
-         tick_clock_(tick_clock),
-         task_start_time_(tick_clock_->NowTicks()),
-         fallback_available_(fallback_available),
--        https_svcb_options_(https_svcb_options) {
-+        https_svcb_options_(https_svcb_options),
-+        network_isolation_key_(network_isolation_key) {
-     DCHECK(client_);
-     DCHECK(delegate_);
- 
-@@ -1473,7 +1475,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr<DnsTask> {
-             std::move(transaction_hostname),
-             DnsQueryTypeToQtype(transaction_info.type), net_log_, secure_,
-             secure_dns_mode_, &*resolve_context_,
--            fallback_available_ /* fast_timeout */);
-+            fallback_available_ /* fast_timeout */,
-+            network_isolation_key_);
-     transaction_info.transaction->SetRequestPriority(delegate_->priority());
- 
-     auto transaction_info_it =
-@@ -2076,6 +2079,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr<DnsTask> {
-   bool fallback_available_;
- 
-   const HostResolver::HttpsSvcbOptions https_svcb_options_;
-+
-+  const NetworkIsolationKey network_isolation_key_;
- };
- 
- //-----------------------------------------------------------------------------
-@@ -2652,7 +2657,7 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job,
-         resolver_->dns_client_.get(), key_.host, key_.query_types,
-         &*key_.resolve_context, secure, key_.secure_dns_mode, this, net_log_,
-         tick_clock_, !tasks_.empty() /* fallback_available */,
--        https_svcb_options_);
-+        https_svcb_options_, key_.network_isolation_key);
-     dns_task_->StartNextTransaction();
-     // Schedule a second transaction, if needed. DoH queries can bypass the
-     // dispatcher and start all of their transactions immediately.
-@@ -2939,6 +2944,13 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job,
-     net_log_.EndEventWithNetErrorCode(
-         NetLogEventType::HOST_RESOLVER_MANAGER_JOB, results.error());
- 
-+    if (base::FeatureList::IsEnabled(net::features::kLogSplitDnsByNetworkIsolationKey)) {
-+      LOG(INFO) << "DNS: CompleteRequests "
-+                << GetHostname(key_.host)
-+                << " key="
-+                << key_.network_isolation_key.ToDebugString();
-+    }
-+
-     // Handle all caching before completing requests as completing requests may
-     // start new requests that rely on cached results.
-     if (allow_cache)
-diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
---- a/net/socket/ssl_client_socket_impl.cc
-+++ b/net/socket/ssl_client_socket_impl.cc
-@@ -393,6 +393,12 @@ SSLClientSocketImpl::SSLClientSocketImpl(
- }
- 
- void SSLClientSocketImpl::Log_ssl_session_data(const std::string& tag, SSL_SESSION* session) {
-+  if (base::FeatureList::IsEnabled(net::features::kLogSplitDnsByNetworkIsolationKey) &&
-+      ssl_config_.network_isolation_key.IsDns()) {
-+    LOG(INFO) << "DNS: Disconnected "
-+              << host_and_port_.ToString() << " "
-+              << ssl_config_.network_isolation_key.ToDebugString();
-+  }
-   if (session == NULL) {
-     LOG(INFO) << "SSL Log: "
-               << tag
---
-2.25.1
diff --git a/build/patches/Re-introduce-kWebAuthCable.patch b/build/patches/Re-introduce-kWebAuthCable.patch
index e1e73d72..eaa61f43 100644
--- a/build/patches/Re-introduce-kWebAuthCable.patch
+++ b/build/patches/Re-introduce-kWebAuthCable.patch
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsert
 diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc
 --- a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc
 +++ b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc
-@@ -35,6 +35,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest {
+@@ -49,6 +49,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest,
    AuthenticatorDialogTest(const AuthenticatorDialogTest&) = delete;
    AuthenticatorDialogTest& operator=(const AuthenticatorDialogTest&) = delete;
  
@@ -54,20 +54,20 @@ diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/ch
 +  }
 +
    // DialogBrowserTest:
-   void ShowUi(const std::string& name) override {
-     // Web modal dialogs' bounds may exceed the display's work area.
-@@ -296,6 +302,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest {
+   void ShowUi(const std::string& test_name) override {
+     // Strip trailing feature param state.
+@@ -349,6 +355,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest,
    std::unique_ptr<AuthenticatorRequestDialogModel> model_;
    base::RepeatingTimer timer_;
    int bio_samples_remaining_ = 5;
 +  base::test::ScopedFeatureList scoped_feature_list_;
  };
  
- // Run with:
+ INSTANTIATE_FEATURE_OVERRIDE_TEST_SUITE(AuthenticatorDialogTest);
 diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
 --- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
 +++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
-@@ -453,6 +453,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) {
+@@ -478,6 +478,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) {
  class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
   public:
    WebAuthnCableSecondFactor() {
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro
      // This makes it a little easier to compare against.
      trace_ << std::endl;
    }
-@@ -695,6 +696,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
+@@ -739,6 +740,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
    };
  
   protected:
@@ -86,7 +86,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro
 diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc
 --- a/content/browser/webauth/authenticator_impl_unittest.cc
 +++ b/content/browser/webauth/authenticator_impl_unittest.cc
-@@ -1448,7 +1448,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) {
+@@ -1423,7 +1423,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) {
    }
  }
  
@@ -100,7 +100,7 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br
    // https://crbug.com/954355
    NavigateAndCommit(GURL(kTestOrigin1));
  
-@@ -3404,7 +3409,13 @@ TEST_F(AuthenticatorContentBrowserClientTest,
+@@ -3410,7 +3415,13 @@ TEST_F(AuthenticatorContentBrowserClientTest,
              AuthenticatorStatus::SUCCESS);
  }
  
@@ -118,7 +118,7 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1135,6 +1135,12 @@ const base::Feature kWebAssemblyTrapHandler {
+@@ -1151,6 +1151,12 @@ const base::Feature kWebAssemblyTrapHandler {
  #endif
  };
  
@@ -134,7 +134,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -295,6 +295,7 @@ CONTENT_EXPORT extern const base::Feature kWebAssemblyLazyCompilation;
+@@ -297,6 +297,7 @@ CONTENT_EXPORT extern const base::Feature kWebAssemblyLazyCompilation;
  CONTENT_EXPORT extern const base::Feature kWebAssemblySimd;
  CONTENT_EXPORT extern const base::Feature kWebAssemblyTiering;
  CONTENT_EXPORT extern const base::Feature kWebAssemblyTrapHandler;
diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
index 5fe4e776..276b1d90 100644
--- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
+++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
@@ -132,7 +132,7 @@ diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8830,6 +8830,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9028,6 +9028,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWaylandScreenCoordinatesEnabled)},
  #endif
  
@@ -149,7 +149,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3458,6 +3458,11 @@ const char kEnableCbdSignOutDescription[] =
+@@ -3520,6 +3520,11 @@ const char kEnableCbdSignOutDescription[] =
      "Enable additional affordance to sign out when clearing browsing data and "
      "ensure consistent behavior for all signed-in users.";
  
@@ -164,7 +164,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -386,6 +386,9 @@ extern const char kContextMenuSearchWithGoogleLensDescription[];
+@@ -379,6 +379,9 @@ extern const char kContextMenuSearchWithGoogleLensDescription[];
  extern const char kClientStorageAccessContextAuditingName[];
  extern const char kClientStorageAccessContextAuditingDescription[];
  
@@ -177,7 +177,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -178,6 +178,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -179,6 +179,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kAssistantNonPersonalizedVoiceSearch,
      &kAppLaunchpad,
      &kAppMenuMobileSiteOption,
@@ -185,7 +185,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kAppToWebAttribution,
      &kBackgroundThreadPool,
      &kBulkTabRestore,
-@@ -504,6 +505,9 @@ const base::Feature kBulkTabRestore{"BulkTabRestore",
+@@ -516,6 +517,9 @@ const base::Feature kBulkTabRestore{"BulkTabRestore",
  const base::Feature kConditionalTabStripAndroid{
      "ConditionalTabStripAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -216,6 +216,6 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +    public static final String CLOSE_ALL_TABS_MODAL_DIALOG = "CloseAllTabsModalDialog";
      public static final String CCT_RESIZABLE_FOR_FIRST_PARTIES = "CCTResizableForFirstParties";
      public static final String CCT_RESIZABLE_FOR_THIRD_PARTIES = "CCTResizableForThirdParties";
-     public static final String CCT_RESOURCE_PREFETCH = "CCTResourcePrefetch";
+     public static final String CCT_RESIZABLE_WINDOW_ABOVE_NAVBAR = "CCTResizableWindowAboveNavbar";
 --
 2.25.1
diff --git a/build/patches/Re-introduce-override_build_timestamp.patch b/build/patches/Re-introduce-override_build_timestamp.patch
index bf02eefd..06773e36 100644
--- a/build/patches/Re-introduce-override_build_timestamp.patch
+++ b/build/patches/Re-introduce-override_build_timestamp.patch
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3978,8 +3978,13 @@ action("build_date") {
+@@ -4000,8 +4000,13 @@ action("build_date") {
  
    args = [
      rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir),
diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
index a4e49a7d..fd7e09ad 100644
--- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
+++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
@@ -37,7 +37,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -314,6 +314,7 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata(
+@@ -317,6 +317,7 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata(
    // fields in the referrer.
    GURL referrer(request_->referrer());
  
@@ -45,7 +45,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
    // Our consumer should have made sure that this is a safe referrer (e.g. via
    // URLRequestJob::ComputeReferrerForPolicy).
    if (referrer.is_valid()) {
-@@ -321,11 +322,14 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata(
+@@ -324,11 +325,14 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata(
      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
                                            referer_value);
    }
@@ -60,7 +60,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
  
    AddExtraHeaders();
  
-@@ -581,9 +585,9 @@ void URLRequestHttpJob::StartTransactionInternal() {
+@@ -584,9 +588,9 @@ void URLRequestHttpJob::StartTransactionInternal() {
  void URLRequestHttpJob::AddExtraHeaders() {
    request_info_.extra_headers.SetAcceptEncodingIfMissing(
        request()->url(), request()->accepted_stream_types(),
diff --git a/build/patches/Reintroduce-override_build_timestamp.patch b/build/patches/Reintroduce-override_build_timestamp.patch
index e62db2bf..c02bbc33 100644
--- a/build/patches/Reintroduce-override_build_timestamp.patch
+++ b/build/patches/Reintroduce-override_build_timestamp.patch
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3978,8 +3978,13 @@ action("build_date") {
+@@ -4000,8 +4000,13 @@ action("build_date") {
  
    args = [
      rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir),
diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
index d5afcd61..35ad4976 100644
--- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
+++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -58,6 +58,10 @@
+@@ -60,6 +60,10 @@ found in the LICENSE file.
          android:title="@string/close_tabs_on_exit_title"
          android:summary="@string/close_tabs_on_exit_summary"
          android:defaultValue="false" />
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -873,6 +873,9 @@ CHAR_LIMIT guidelines:
+@@ -879,6 +879,9 @@ CHAR_LIMIT guidelines:
  
  For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics.
        </message>
@@ -80,7 +80,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -430,6 +430,13 @@ void AddAdditionalRequestHeaders(
+@@ -446,6 +446,13 @@ void AddAdditionalRequestHeaders(
          blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever);
    }
  
diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch
index fa99c2db..26ac24f7 100644
--- a/build/patches/Remove-binary-blob-integrations.patch
+++ b/build/patches/Remove-binary-blob-integrations.patch
@@ -96,7 +96,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/signin/public/android/BUILD.gn     |   3 -
  .../signin/AccountRenameChecker.java          |  16 -
  components/webauthn/android/BUILD.gn          |   9 -
- .../webauthn/AuthenticatorImpl.java           |  65 +--
+ .../webauthn/AuthenticatorImpl.java           |  73 +--
  .../webauthn/Fido2ApiCallHelper.java          |  23 +-
  .../push_messaging/push_messaging_manager.cc  |   2 +-
  content/public/android/BUILD.gn               |   4 -
@@ -110,7 +110,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/android_deps/BUILD.gn             | 539 +-----------------
  .../preconditions/javatests/BUILD.gn          |   1 -
  .../gms/ChromiumPlayServicesAvailability.java |  10 +-
- 86 files changed, 91 insertions(+), 2034 deletions(-)
+ 86 files changed, 93 insertions(+), 2040 deletions(-)
 
 diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
 --- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -152,7 +152,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:jni_java",
      "//cc:cc_java",
      "//chrome/android/features/keyboard_accessory:public_java",
-@@ -630,8 +622,19 @@ android_library("chrome_java") {
+@@ -632,8 +624,19 @@ android_library("chrome_java") {
      "//services/shape_detection:shape_detection_java",
      "//services/shape_detection/public/mojom:mojom_java",
      "//skia/public/mojom:mojom_java",
@@ -173,7 +173,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
      "//third_party/android_deps:com_google_guava_listenablefuture_java",
      "//third_party/android_deps:dagger_java",
-@@ -969,11 +972,6 @@ robolectric_binary("chrome_junit_tests") {
+@@ -975,11 +978,6 @@ robolectric_binary("chrome_junit_tests") {
      ":chrome_jni_headers",
      ":chrome_public_android_manifest",
      ":delegate_public_impl_java",
@@ -185,7 +185,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java_test_support",
      "//base:base_junit_test_support",
      "//base/test:test_support_java",
-@@ -1504,13 +1502,6 @@ android_library("chrome_test_java") {
+@@ -1516,13 +1514,6 @@ android_library("chrome_test_java") {
      ":chrome_test_util_java",
      ":chrome_test_util_jni",
      ":delegate_public_impl_java",
@@ -199,7 +199,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java_test_support",
      "//base/test:test_support_java",
      "//cc:cc_java",
-@@ -2566,7 +2557,6 @@ android_library("browser_java_test_support") {
+@@ -2583,7 +2574,6 @@ android_library("browser_java_test_support") {
    ]
    deps = [
      ":chrome_java",
@@ -207,7 +207,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:base_java_test_support",
      "//base:jni_java",
-@@ -2720,9 +2710,7 @@ android_library("base_monochrome_module_java") {
+@@ -2737,9 +2727,7 @@ android_library("base_monochrome_module_java") {
  # is in a DFM.
  android_library("base_module_java") {
    sources = [
@@ -217,7 +217,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
      "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
      "java/src/org/chromium/chrome/browser/app/bluetooth/BluetoothNotificationService.java",
-@@ -2735,8 +2723,6 @@ android_library("base_module_java") {
+@@ -2752,8 +2740,6 @@ android_library("base_module_java") {
      "java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
      "java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
      "java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
@@ -226,7 +226,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
      "java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
      "java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
-@@ -2761,17 +2747,11 @@ android_library("base_module_java") {
+@@ -2778,17 +2764,11 @@ android_library("base_module_java") {
      "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
      "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
      "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
@@ -244,7 +244,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:jni_java",
      "//chrome/browser/download/android:file_provider_java",
-@@ -2785,7 +2765,6 @@ android_library("base_module_java") {
+@@ -2802,7 +2782,6 @@ android_library("base_module_java") {
      "//components/media_router/browser/android:cast_options_provider_java",
      "//components/minidump_uploader:minidump_uploader_java",
      "//components/module_installer/android:module_installer_java",
@@ -252,7 +252,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//third_party/androidx:androidx_annotation_annotation_java",
      "//third_party/androidx:androidx_collection_collection_java",
      "//ui/android:ui_no_recycler_view_java",
-@@ -2805,7 +2784,6 @@ android_library("base_module_java") {
+@@ -2822,7 +2801,6 @@ android_library("base_module_java") {
      # Deps to pull services into base module.
      # TODO(crbug.com/1126301): Consider moving these to the chrome module to
      # reduce base dex size.
@@ -263,7 +263,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -16,7 +16,6 @@ chrome_java_sources = [
+@@ -15,7 +15,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java",
    "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
    "java/src/org/chromium/chrome/browser/ChromeApplicationImpl.java",
@@ -271,7 +271,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
    "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
    "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
-@@ -946,10 +945,6 @@ chrome_java_sources = [
+@@ -947,10 +946,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/searchwidget/SearchType.java",
    "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
    "java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java",
@@ -297,7 +297,7 @@ diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/and
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -103,21 +103,16 @@ by a child template that "extends" this file.
+@@ -106,21 +106,16 @@ by a child template that "extends" this file.
      <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
      <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
      <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -319,7 +319,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  
      {% block extra_uses_permissions %}
-@@ -735,16 +730,6 @@ by a child template that "extends" this file.
+@@ -738,16 +733,6 @@ by a child template that "extends" this file.
              </intent-filter>
          </activity>
  
@@ -336,7 +336,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- This activity is used to restart the main Chrome process.  Should never be exported. -->
          <activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
              android:launchMode="singleInstance"
-@@ -754,15 +739,6 @@ by a child template that "extends" this file.
+@@ -757,15 +742,6 @@ by a child template that "extends" this file.
              android:process=":browser_restart_process">
          </activity>
  
@@ -352,7 +352,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <activity
              android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
              android:exported="false"
-@@ -941,26 +917,6 @@ by a child template that "extends" this file.
+@@ -944,26 +920,6 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
              android:hardwareAccelerated="false" />
  
@@ -379,7 +379,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- Android Notification service listener -->
          <service android:name="org.chromium.chrome.browser.notifications.NotificationService"
              android:exported="false"/>
-@@ -992,28 +948,10 @@ by a child template that "extends" this file.
+@@ -995,28 +951,10 @@ by a child template that "extends" this file.
              android:exported="false"
              android:permission="android.permission.BIND_JOB_SERVICE"/>
  
@@ -408,7 +408,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
              android:exported="true"
              tools:ignore="ExportedService" />
-@@ -1248,12 +1186,6 @@ by a child template that "extends" this file.
+@@ -1251,12 +1189,6 @@ by a child template that "extends" this file.
        <meta-data android:name="com.google.ar.core" android:value="optional" />
        {% endif %}
  
@@ -424,7 +424,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -81,9 +81,4 @@
+@@ -57,9 +57,4 @@ found in the LICENSE file.
            android:summary="@string/autocomplete_searches_and_urls_summary"
            android:persistent="false"/>
      </PreferenceCategory>
@@ -447,7 +447,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
  import org.chromium.base.ContextUtils;
  import org.chromium.base.annotations.CalledByNative;
  import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
-@@ -221,16 +218,7 @@ public abstract class AppHooks {
+@@ -220,16 +217,7 @@ public abstract class AppHooks {
       * same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
       */
      public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
@@ -865,15 +865,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -133,7 +133,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
-     private ChromeSwitchPreference mEnableAndroidAutofillSwitch;
-     private ChromeSwitchPreference mEnableAndroidAutofillIncognitoSwitch;
+@@ -120,7 +120,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+     private Preference mLinkPref;
+     private Menu mMenu;
  
 -    private @Nullable PasswordCheck mPasswordCheck;
      private @ManagePasswordsReferrer int mManagePasswordsReferrer;
  
      /**
-@@ -195,7 +194,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -182,7 +181,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
      @Override
      public void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
@@ -881,9 +881,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
          computeTrustedVaultBannerState();
      }
  
-@@ -301,9 +299,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -287,9 +285,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+ 
          createSavePasswordsSwitch();
-         createEnableAndroidAutofillSwitch();
          createAutoSignInCheckbox();
 -        if (mPasswordCheck != null) {
 -            createCheckPasswords();
@@ -891,7 +891,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
  
          if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
              createTrustedVaultBanner(R.string.android_trusted_vault_banner_sub_label_opted_in,
-@@ -478,10 +473,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -464,10 +459,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
          // by the system.
          if (getActivity().isFinishing()) {
              PasswordManagerHandlerProvider.getInstance().removeObserver(this);
@@ -925,7 +925,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7212,8 +7212,6 @@ static_library("browser") {
+@@ -7267,8 +7267,6 @@ static_library("browser") {
        "offline_pages/offliner_helper.h",
        "offline_pages/offliner_user_data.cc",
        "offline_pages/offliner_user_data.h",
@@ -1021,7 +1021,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
  import org.chromium.chrome.browser.language.R;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
-@@ -101,11 +100,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -128,11 +127,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
       * translate target language, and detailed translate preferences.
       */
      private void createDetailedPreferences(Bundle savedInstanceState, String rootKey) {
@@ -1078,7 +1078,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p
      "//base:base_java",
      "//base:jni_java",
      "//build/android:build_java",
-@@ -194,8 +192,6 @@ robolectric_binary("password_manager_junit_tests") {
+@@ -197,8 +195,6 @@ robolectric_binary("password_manager_junit_tests") {
      ":public_impl_java",
      ":settings_interface_java",
      ":test_support_java",
@@ -1271,7 +1271,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
      "webui/internals/internals_ui.cc",
      "webui/internals/internals_ui.h",
      "webui/interstitials/interstitial_ui.cc",
-@@ -485,7 +483,6 @@ static_library("ui") {
+@@ -484,7 +482,6 @@ static_library("ui") {
      "//components/feedback/content",
      "//components/find_in_page",
      "//components/flags_ui",
@@ -1295,13 +1295,13 @@ diff --git a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc b/c
 diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc
 --- a/chrome/browser/ui/webauthn/sheet_models.cc
 +++ b/chrome/browser/ui/webauthn/sheet_models.cc
-@@ -160,12 +160,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
+@@ -159,12 +159,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
      const {
    // If any phones are shown then also show a button that goes to the settings
    // page to manage them.
--  return std::any_of(
--      dialog_model()->mechanisms().begin(), dialog_model()->mechanisms().end(),
--      [](const AuthenticatorRequestDialogModel::Mechanism& mechanism) -> bool {
+-  return base::ranges::any_of(
+-      dialog_model()->mechanisms(),
+-      [](const AuthenticatorRequestDialogModel::Mechanism& mechanism) {
 -        return absl::holds_alternative<
 -            AuthenticatorRequestDialogModel::Mechanism::Phone>(mechanism.type);
 -      });
@@ -1312,7 +1312,7 @@ diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/weba
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -42,7 +42,6 @@
+@@ -43,7 +43,6 @@
  #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h"
  #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
  #include "chrome/browser/ui/webui/flags/flags_ui.h"
@@ -1320,7 +1320,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "chrome/browser/ui/webui/internals/internals_ui.h"
  #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
  #include "chrome/browser/ui/webui/intro/intro_ui.h"
-@@ -764,8 +763,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -767,8 +766,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<FlagsDeprecatedUI>;
    if (url.host_piece() == chrome::kChromeUIFlagsHost)
      return &NewWebUI<FlagsUI>;
@@ -1332,7 +1332,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
 +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
-@@ -1058,10 +1058,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
+@@ -1099,10 +1099,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
    if (cable_ui_type_) {
      switch (*cable_ui_type_) {
        case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR:
@@ -1346,7 +1346,7 @@ diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chr
 diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauthn/cablev2_devices.cc
 --- a/chrome/browser/webauthn/cablev2_devices.cc
 +++ b/chrome/browser/webauthn/cablev2_devices.cc
-@@ -353,6 +353,9 @@ void AddPairing(Profile* profile, std::unique_ptr<Pairing> pairing) {
+@@ -351,6 +351,9 @@ void AddPairing(Profile* profile, std::unique_ptr<Pairing> pairing) {
    // This is called when doing a QR-code pairing with a phone and the phone
    // sends long-term pairing information during the handshake. The pairing
    // information is saved in preferences for future operations.
@@ -1440,7 +1440,7 @@ diff --git a/components/component_updater/android/java/src/org/chromium/componen
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -2515,14 +2515,6 @@ public class ExternalNavigationHandler {
+@@ -2632,14 +2632,6 @@ public class ExternalNavigationHandler {
       * @return Whether the given intent is going to open an Instant App.
       */
      private static boolean isIntentToInstantApp(Intent intent) {
@@ -3361,16 +3361,17 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
      private MakeCredential_Response mMakeCredentialCallback;
      private GetAssertion_Response mGetAssertionCallback;
      // A queue is used to store pending IsUserVerifyingPlatformAuthenticatorAvailable request
-@@ -67,8 +63,6 @@ public final class AuthenticatorImpl implements Authenticator {
+@@ -66,9 +62,6 @@ public final class AuthenticatorImpl implements Authenticator {
+     // situation does not matter because all pending requests will return the same value.
      private Queue<org.chromium.mojo.bindings.Callbacks.Callback1<Boolean>>
              mIsUserVerifyingPlatformAuthenticatorAvailableCallbackQueue = new LinkedList<>();
- 
--    private static Fido2CredentialRequest sFido2CredentialRequestOverrideForTesting;
+-    private Fido2CredentialRequest mPendingFido2CredentialRequest;
 -
+-    private static Fido2CredentialRequest sFido2CredentialRequestOverrideForTesting;
+ 
      /**
       * Builds the Authenticator service implementation.
-      *
-@@ -92,21 +86,6 @@ public final class AuthenticatorImpl implements Authenticator {
+@@ -93,21 +86,6 @@ public final class AuthenticatorImpl implements Authenticator {
          mRenderFrameHost = renderFrameHost;
          mSupportLevel = supportLevel;
          mOrigin = mRenderFrameHost.getLastCommittedOrigin();
@@ -3392,7 +3393,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
      }
  
      /**
-@@ -136,15 +115,7 @@ public final class AuthenticatorImpl implements Authenticator {
+@@ -137,17 +115,9 @@ public final class AuthenticatorImpl implements Authenticator {
  
          mMakeCredentialCallback = callback;
          mIsOperationPending = true;
@@ -3400,16 +3401,19 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 -            onError(AuthenticatorStatus.NOT_IMPLEMENTED);
 -            return;
 -        }
--
--        getFido2CredentialRequest().handleMakeCredentialRequest(options, mRenderFrameHost, mOrigin,
+ 
+-        mPendingFido2CredentialRequest = getFido2CredentialRequest();
+-        mPendingFido2CredentialRequest.handleMakeCredentialRequest(options, mRenderFrameHost,
+-                mOrigin,
 -                (status, response)
 -                        -> onRegisterResponse(status, response),
 -                status -> onError(status));
++        // Fido2 not supported on Bromite
 +        onError(AuthenticatorStatus.NOT_IMPLEMENTED);
      }
  
      @Override
-@@ -158,14 +129,7 @@ public final class AuthenticatorImpl implements Authenticator {
+@@ -161,15 +131,8 @@ public final class AuthenticatorImpl implements Authenticator {
          mGetAssertionCallback = callback;
          mIsOperationPending = true;
  
@@ -3418,14 +3422,16 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 -            return;
 -        }
 -
--        getFido2CredentialRequest().handleGetAssertionRequest(options, mRenderFrameHost, mOrigin,
+-        mPendingFido2CredentialRequest = getFido2CredentialRequest();
+-        mPendingFido2CredentialRequest.handleGetAssertionRequest(options, mRenderFrameHost, mOrigin,
 -                mPayment,
 -                (status, response) -> onSignResponse(status, response), status -> onError(status));
++        // Fido2 not supported on Bromite
 +        onError(AuthenticatorStatus.NOT_IMPLEMENTED);
      }
  
      @Override
-@@ -178,34 +142,13 @@ public final class AuthenticatorImpl implements Authenticator {
+@@ -182,34 +145,13 @@ public final class AuthenticatorImpl implements Authenticator {
              callback.call(isUvpaa);
          };
  
@@ -3461,6 +3467,23 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 +        callback.call(false);
      }
  
+     @Override
+@@ -219,8 +161,6 @@ public final class AuthenticatorImpl implements Authenticator {
+         if (!mIsOperationPending || mGetAssertionCallback == null) {
+             return;
+         }
+-
+-        mPendingFido2CredentialRequest.cancelConditionalGetAssertion(mRenderFrameHost);
+     }
+ 
+     /**
+@@ -270,7 +210,6 @@ public final class AuthenticatorImpl implements Authenticator {
+         mIsOperationPending = false;
+         mMakeCredentialCallback = null;
+         mGetAssertionCallback = null;
+-        mPendingFido2CredentialRequest = null;
+     }
+ 
      @Override
 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java
 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java
@@ -3529,7 +3552,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -3088,10 +3088,6 @@ if (is_android) {
+@@ -3116,10 +3116,6 @@ if (is_android) {
      testonly = true
      sources = content_java_sources_needing_jni
      deps = [
@@ -3543,7 +3566,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 diff --git a/device/BUILD.gn b/device/BUILD.gn
 --- a/device/BUILD.gn
 +++ b/device/BUILD.gn
-@@ -466,9 +466,6 @@ if (is_android) {
+@@ -469,9 +469,6 @@ if (is_android) {
        "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
      ]
      deps = [
@@ -3565,8 +3588,8 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
 +extern const base::Feature kWebAuthPasskeysUI{                           // must be disabled
 +    "WebAuthenticationPasskeysUI", base::FEATURE_DISABLED_BY_DEFAULT};   // in Bromite
  
+ // TODO(1358719): Resolve all i18n TODOs before default enabling.
  extern const base::Feature kWebAuthnNewDiscoverableCredentialsUi{
-     "WebAuthenticationNewDiscoverableCredentialsUi",
 diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
 --- a/remoting/android/client_java_tmpl.gni
 +++ b/remoting/android/client_java_tmpl.gni
@@ -3583,7 +3606,7 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav
 diff --git a/services/BUILD.gn b/services/BUILD.gn
 --- a/services/BUILD.gn
 +++ b/services/BUILD.gn
-@@ -114,11 +114,6 @@ if (is_android) {
+@@ -116,11 +116,6 @@ if (is_android) {
        "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
      ]
      deps = [
@@ -3595,7 +3618,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
        "//base:base_java",
        "//base:base_java_test_support",
        "//base:base_junit_test_support",
-@@ -146,10 +141,6 @@ if (is_android) {
+@@ -148,10 +143,6 @@ if (is_android) {
        "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
      ]
      deps = [
@@ -3637,7 +3660,7 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -55,7 +55,7 @@ if (!limit_android_deps) {
+@@ -54,7 +54,7 @@ if (!limit_android_deps) {
  
    android_library("chromium_play_services_availability_java") {
      sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
@@ -3646,7 +3669,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
    }
  
    robolectric_library("chromium_play_services_availability_shadows_java") {
-@@ -967,210 +967,6 @@ if (!limit_android_deps) {
+@@ -968,210 +968,6 @@ if (!limit_android_deps) {
      ]
    }
  
@@ -3857,7 +3880,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
    # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
    android_aar_prebuilt("com_google_android_material_material_java") {
      aar_path =
-@@ -1219,60 +1015,6 @@ if (!limit_android_deps) {
+@@ -1220,60 +1016,6 @@ if (!limit_android_deps) {
      ]
    }
  
@@ -3918,8 +3941,8 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
    # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
    java_prebuilt("com_google_flatbuffers_flatbuffers_java_java") {
      jar_path = "libs/com_google_flatbuffers_flatbuffers_java/flatbuffers-java-2.0.3.jar"
-@@ -1472,19 +1214,6 @@ if (!limit_android_deps) {
-     deps += [ ":com_android_support_multidex_java" ]
+@@ -1473,19 +1215,6 @@ if (!limit_android_deps) {
+     is_robolectric = true
    }
  
 -  # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -3938,7 +3961,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
    # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
    java_prebuilt("org_robolectric_utils_java") {
      jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar"
-@@ -1831,272 +1560,6 @@ if (!limit_android_deps) {
+@@ -1832,272 +1561,6 @@ if (!limit_android_deps) {
      deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
    }
  
@@ -4209,8 +4232,8 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -  }
 -
    # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-   java_prebuilt("com_google_protobuf_protobuf_lite_java") {
-     jar_path = "libs/com_google_protobuf_protobuf_lite/protobuf-lite-3.0.1.jar"
+   java_prebuilt("com_squareup_javawriter_java") {
+     jar_path = "libs/com_squareup_javawriter/javawriter-2.1.1.jar"
 diff --git a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
 --- a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
 +++ b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
index 9705c31f..a1a9389f 100644
--- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
+++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -290,7 +290,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -292,7 +292,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private TabContentManager mTabContentManager;
  
      private UmaSessionStats mUmaSessionStats;
diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch
index 965f6510..80daafb7 100644
--- a/build/patches/Remove-contextual-search-manager.patch
+++ b/build/patches/Remove-contextual-search-manager.patch
@@ -8,15 +8,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/chrome_java_resources.gni      |  9 --
  chrome/android/chrome_java_sources.gni        | 44 ----------
  .../ManualFillingMediator.java                |  9 --
- .../layout/contextual_search_caption_view.xml | 14 ---
- .../contextual_search_card_icon_view.xml      | 12 ---
- .../layout/contextual_search_context_view.xml | 25 ------
- .../layout/contextual_search_promo_view.xml   | 86 -------------------
- ...ntextual_search_quick_action_icon_view.xml | 12 ---
- ...earch_related_searches_in_content_view.xml | 16 ----
- ...ontextual_search_related_searches_view.xml | 21 -----
- .../layout/contextual_search_term_view.xml    | 19 ----
- .../res/xml/contextual_search_preferences.xml | 25 ------
+ .../layout/contextual_search_caption_view.xml | 16 ----
+ .../contextual_search_card_icon_view.xml      | 14 ---
+ .../layout/contextual_search_context_view.xml | 27 ------
+ .../layout/contextual_search_promo_view.xml   | 88 -------------------
+ ...ntextual_search_quick_action_icon_view.xml | 14 ---
+ ...earch_related_searches_in_content_view.xml | 18 ----
+ ...ontextual_search_related_searches_view.xml | 23 -----
+ .../layout/contextual_search_term_view.xml    | 21 -----
+ .../res/xml/contextual_search_preferences.xml | 27 ------
  .../res/xml/google_services_preferences.xml   |  4 -
  .../java/res/xml/privacy_preferences.xml      |  4 -
  .../chrome/browser/ChromeTabbedActivity.java  |  4 +-
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bottombar/OverlayPanelContent.java        |  1 -
  .../compositor/layouts/LayoutManagerImpl.java |  4 +-
  .../customtabs/BaseCustomTabActivity.java     |  2 +-
- .../BaseCustomTabRootUiCoordinator.java       |  5 +-
+ .../BaseCustomTabRootUiCoordinator.java       | 16 +---
  .../browser/customtabs/CustomTabActivity.java |  6 --
  .../modaldialog/ChromeTabModalPresenter.java  | 12 +--
  .../modaldialog/TabModalLifetimeHandler.java  |  7 +-
@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../tabbed_mode/TabbedRootUiCoordinator.java  |  5 +-
  .../chrome/browser/ui/RootUiCoordinator.java  | 37 +-------
  chrome/browser/BUILD.gn                       | 17 ----
- chrome/browser/about_flags.cc                 | 25 ------
+ chrome/browser/about_flags.cc                 | 49 -----------
  .../flags/android/chrome_feature_list.cc      | 36 --------
  .../flags/android/chrome_feature_list.h       |  8 --
  ...nfiguration_policy_handler_list_factory.cc |  6 +-
@@ -41,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  content/browser/browser_interface_binders.cc  |  1 -
  third_party/blink/public/mojom/BUILD.gn       |  2 +-
  third_party/blink/public/public_features.gni  |  2 +-
- 37 files changed, 17 insertions(+), 588 deletions(-)
+ 37 files changed, 17 insertions(+), 641 deletions(-)
  delete mode 100644 chrome/android/java/res/layout/contextual_search_caption_view.xml
  delete mode 100644 chrome/android/java/res/layout/contextual_search_card_icon_view.xml
  delete mode 100644 chrome/android/java/res/layout/contextual_search_context_view.xml
@@ -55,7 +55,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -692,7 +692,6 @@ android_library("chrome_java") {
+@@ -695,7 +695,6 @@ android_library("chrome_java") {
      "//chrome/browser/ui:duplicate_download_enums_java",
      "//components/browsing_data/core:browsing_data_utils_java",
      "//components/browsing_data/core:clear_browsing_data_tab_java",
@@ -63,7 +63,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//components/dom_distiller/core:distiller_type_java",
      "//components/ntp_tiles:ntp_tiles_enums_java",
      "//components/offline_pages/core:offline_page_model_enums_java",
-@@ -4079,16 +4078,12 @@ generate_jni("chrome_jni_headers") {
+@@ -4097,16 +4096,12 @@ generate_jni("chrome_jni_headers") {
      "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
      "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
      "java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
@@ -83,7 +83,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -491,14 +491,6 @@ chrome_java_resources = [
+@@ -487,14 +487,6 @@ chrome_java_resources = [
    "java/res/layout/context_menu_header.xml",
    "java/res/layout/context_menu_row.xml",
    "java/res/layout/context_menu_share_row.xml",
@@ -98,7 +98,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/custom_tabs_bottombar.xml",
    "java/res/layout/custom_tabs_bottombar_item.xml",
    "java/res/layout/custom_tabs_control_container.xml",
-@@ -658,7 +650,6 @@ chrome_java_resources = [
+@@ -654,7 +646,6 @@ chrome_java_resources = [
    "java/res/xml/autofill_assistant_preferences.xml",
    "java/res/xml/bookmark_widget_info.xml",
    "java/res/xml/clear_browsing_data_preferences_tab.xml",
@@ -109,7 +109,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -302,21 +302,6 @@ chrome_java_sources = [
+@@ -301,21 +301,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
@@ -131,7 +131,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
    "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
-@@ -356,7 +341,6 @@ chrome_java_sources = [
+@@ -355,7 +340,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripStacker.java",
    "java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
    "java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
@@ -139,7 +139,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
    "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
-@@ -382,34 +366,6 @@ chrome_java_sources = [
+@@ -381,34 +365,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
    "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
    "java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
@@ -185,7 +185,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
  import org.chromium.chrome.browser.fullscreen.FullscreenOptions;
-@@ -511,14 +510,6 @@ class ManualFillingMediator
+@@ -513,14 +512,6 @@ class ManualFillingMediator
          // When in VR mode, don't extend the keyboard
          if (VrModuleProvider.getDelegate().isInVr()) return false;
  
@@ -204,11 +204,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_caption_view.xml b
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_caption_view.xml
 +++ /dev/null
-@@ -1,14 +0,0 @@
+@@ -1,16 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2016 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2016 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Contextual Search caption view. -->
 -<FrameLayout
@@ -224,11 +226,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
 +++ /dev/null
-@@ -1,12 +0,0 @@
+@@ -1,14 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2019 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2019 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Contextual Search image view to display a Contextual Card icon. -->
 -<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -241,11 +245,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_context_view.xml b
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_context_view.xml
 +++ /dev/null
-@@ -1,25 +0,0 @@
+@@ -1,27 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2015 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2015 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Contextual Search search context view. -->
 -<LinearLayout
@@ -271,11 +277,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_promo_view.xml b/c
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_promo_view.xml
 +++ /dev/null
-@@ -1,86 +0,0 @@
+@@ -1,88 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2021 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2021 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -<FrameLayout
 -    xmlns:android="http://schemas.android.com/apk/res/android"
 -    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -363,11 +371,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_quick_action_icon_
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
 +++ /dev/null
-@@ -1,12 +0,0 @@
+@@ -1,14 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2016 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2016 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Contextual Search image view. -->
 -<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -381,11 +391,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_i
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
 +++ /dev/null
-@@ -1,16 +0,0 @@
+@@ -1,18 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2021 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2021 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Displays Related Searches suggestions in a section of the Contextual
 -     Search bottom sheet. -->
@@ -402,11 +414,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_v
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml
 +++ /dev/null
-@@ -1,21 +0,0 @@
+@@ -1,23 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2021 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2021 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Displays Related Searches suggestions in the Bar of the Overlay Panel. -->
 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -428,11 +442,13 @@ diff --git a/chrome/android/java/res/layout/contextual_search_term_view.xml b/ch
 deleted file mode 100644
 --- a/chrome/android/java/res/layout/contextual_search_term_view.xml
 +++ /dev/null
-@@ -1,19 +0,0 @@
+@@ -1,21 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2015 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2015 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<!-- Contextual Search search term view. -->
 -<FrameLayout
@@ -452,11 +468,13 @@ diff --git a/chrome/android/java/res/xml/contextual_search_preferences.xml b/chr
 deleted file mode 100644
 --- a/chrome/android/java/res/xml/contextual_search_preferences.xml
 +++ /dev/null
-@@ -1,25 +0,0 @@
+@@ -1,27 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
--<!-- Copyright 2015 The Chromium Authors. All rights reserved.
--     Use of this source code is governed by a BSD-style license that can be
--     found in the LICENSE file. -->
+-<!--
+-Copyright 2015 The Chromium Authors
+-Use of this source code is governed by a BSD-style license that can be
+-found in the LICENSE file.
+--->
 -
 -<PreferenceScreen
 -    xmlns:android="http://schemas.android.com/apk/res/android"
@@ -481,7 +499,7 @@ deleted file mode 100644
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
 +++ b/chrome/android/java/res/xml/google_services_preferences.xml
-@@ -40,8 +40,4 @@
+@@ -48,8 +48,4 @@ found in the LICENSE file.
          android:summary="@string/prefs_autofill_assistant_summary"
          android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment"
          app:isPreferenceVisible="false"/>
@@ -493,7 +511,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -68,10 +68,6 @@
+@@ -56,10 +56,6 @@ found in the LICENSE file.
            android:title="@string/autocomplete_searches_and_urls_title"
            android:summary="@string/autocomplete_searches_and_urls_summary"
            android:persistent="false"/>
@@ -507,7 +525,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1725,7 +1725,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1723,7 +1723,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged,
                  getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
                  mBookmarkBridgeSupplier, mTabBookmarkerSupplier,
@@ -516,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
                  mStartSurfaceSupplier, mTabSwitcherSupplier, mIntentMetadataOneshotSupplier,
                  mLayoutStateProviderSupplier, mStartSurfaceParentTabSupplier,
                  getBrowserControlsManager(), getWindowAndroid(), mJankTracker,
-@@ -2780,7 +2780,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2788,7 +2788,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          // TODO(crbug.com/1157310): Transition this::method refs to dedicated suppliers.
          mTabModalHandler = new TabModalLifetimeHandler(this, getLifecycleDispatcher(), manager,
                  this::getAppBrowserControlsVisibilityDelegate, this::getTabObscuringHandler,
@@ -536,8 +554,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 -import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 -import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
- import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
+ import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
 @@ -258,7 +255,7 @@ import java.util.function.Consumer;
   */
  public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -565,7 +583,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
                  getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(),
-@@ -945,14 +940,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -953,14 +948,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          mCompositorViewHolderSupplier.get().onNativeLibraryReady(
                  getWindowAndroid(), getTabContentManager());
  
@@ -580,7 +598,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          TraceEvent.end("ChromeActivity:CompositorInitialization");
      }
  
-@@ -1436,11 +1423,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1447,11 +1434,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      @SuppressLint("NewApi")
      @Override
      protected final void onDestroy() {
@@ -592,7 +610,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          if (mSnackbarManager != null) {
              SnackbarManagerProvider.detach(mSnackbarManager);
          }
-@@ -1936,13 +1918,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1948,13 +1930,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          return mCompositorViewHolderSupplier.get();
      }
  
@@ -606,7 +624,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      /**
       * Exits the fullscreen mode, if any. Does nothing if no fullscreen is present.
       * @return Whether the fullscreen mode is currently showing.
-@@ -1991,15 +1966,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2003,15 +1978,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          }
  
          mActivityTabProvider.setLayoutStateProvider(layoutManager);
@@ -622,7 +640,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      }
  
      /**
-@@ -2258,18 +2224,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2271,18 +2237,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
      }
  
@@ -676,7 +694,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
-@@ -152,7 +152,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
+@@ -154,7 +154,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
          mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this,
                  getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
                  mBookmarkBridgeSupplier, mTabBookmarkerSupplier,
@@ -696,7 +714,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
  import org.chromium.chrome.browser.customtabs.features.branding.BrandingController;
-@@ -119,7 +118,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -87,7 +86,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+      * @param profileSupplier Supplier of the currently applicable profile.
+      * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile.
+      * @param tabBookmarkerSupplier Supplier of {@link TabBookmarker} for bookmarking a given tab.
+-     * @param contextualSearchManagerSupplier Supplier of the {@link ContextualSearchManager}.
+      * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}.
+      * @param browserControlsManager Manages the browser controls.
+      * @param windowAndroid The current {@link WindowAndroid}.
+@@ -121,7 +119,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
              @NonNull ObservableSupplier<Profile> profileSupplier,
              @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -705,7 +731,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
              @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
              @NonNull BrowserControlsManager browserControlsManager,
              @NonNull ActivityWindowAndroid windowAndroid,
-@@ -150,7 +149,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+@@ -152,7 +150,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
          // clang-format off
          super(activity, null, shareDelegateSupplier, tabProvider,
                  profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier,
@@ -714,6 +740,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
                  new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null,
                  browserControlsManager, windowAndroid, new DummyJankTracker(),
+@@ -202,16 +200,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+                     ((PartialCustomTabHeightStrategy) mCustomTabHeightStrategy)::onShowSoftInput;
+             mTabController.get().registerTabObserver(
+                     new PartialCustomTabTabObserver(softInputCallback));
+-            mTabController.get().registerTabObserver(new EmptyTabObserver() {
+-                @Override
+-                public void didFirstVisuallyNonEmptyPaint(Tab tab) {
+-                    BaseCustomTabActivity baseActivity = (BaseCustomTabActivity) mActivity;
+-                    assert baseActivity != null;
+-                    baseActivity.getContextualSearchManagerSupplier()
+-                            .get()
+-                            .setCanHideAndroidBrowserControls(false);
+-                }
+-            });
+         }
+     }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -741,7 +784,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
  import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
  import org.chromium.chrome.browser.tab.Tab;
-@@ -49,7 +48,6 @@ public class ChromeTabModalPresenter
+@@ -48,7 +47,6 @@ public class ChromeTabModalPresenter
      private final Activity mActivity;
      private final Supplier<TabObscuringHandler> mTabObscuringHandlerSupplier;
      private final Supplier<ToolbarManager> mToolbarManagerSupplier;
@@ -749,7 +792,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
      private final FullscreenManager mFullscreenManager;
      private final BrowserControlsVisibilityManager mBrowserControlsVisibilityManager;
      private final TabModalBrowserControlsVisibilityDelegate mVisibilityDelegate;
-@@ -96,7 +94,7 @@ public class ChromeTabModalPresenter
+@@ -95,7 +93,7 @@ public class ChromeTabModalPresenter
      public ChromeTabModalPresenter(Activity activity,
              Supplier<TabObscuringHandler> tabObscuringHandlerSupplier,
              Supplier<ToolbarManager> toolbarManagerSupplier,
@@ -758,15 +801,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
              FullscreenManager fullscreenManager,
              BrowserControlsVisibilityManager browserControlsVisibilityManager,
              TabModelSelector tabModelSelector) {
-@@ -109,7 +107,6 @@ public class ChromeTabModalPresenter
+@@ -107,7 +105,6 @@ public class ChromeTabModalPresenter
+         mBrowserControlsVisibilityManager = browserControlsVisibilityManager;
          mBrowserControlsVisibilityManager.addObserver(this);
          mVisibilityDelegate = new TabModalBrowserControlsVisibilityDelegate();
-         mTabObscuringToken = TokenHolder.INVALID_TOKEN;
 -        mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
          mTabModelSelector = tabModelSelector;
      }
  
-@@ -196,13 +193,6 @@ public class ChromeTabModalPresenter
+@@ -195,13 +192,6 @@ public class ChromeTabModalPresenter
              assert mActiveTab
                      != null : "Tab modal dialogs should be shown on top of an active tab.";
  
@@ -828,7 +871,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -44,7 +44,6 @@ import org.chromium.ui.text.SpanApplier;
+@@ -41,7 +41,6 @@ import org.chromium.ui.text.SpanApplier;
  
  import androidx.annotation.Nullable;
  import androidx.preference.PreferenceCategory;
@@ -836,7 +879,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  
-@@ -69,9 +68,7 @@ public class PrivacySettings
+@@ -63,9 +62,7 @@ public class PrivacySettings
      // moved from SyncAndServicesSettings.java
      private static final String PREF_SERVICES_CATEGORY = "services_category";
      private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
@@ -846,7 +889,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private final SharedPreferencesManager mSharedPreferencesManager =
              SharedPreferencesManager.getInstance();
      private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
-@@ -119,12 +116,6 @@ public class PrivacySettings
+@@ -113,12 +110,6 @@ public class PrivacySettings
          mSearchSuggestions.setOnPreferenceChangeListener(this);
          mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
  
@@ -889,7 +932,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
  import org.chromium.chrome.browser.feature_guide.notifications.FeatureType;
  import org.chromium.chrome.browser.feed.webfeed.WebFeedFollowIntroController;
-@@ -257,7 +256,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -255,7 +254,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              @NonNull ObservableSupplier<Profile> profileSupplier,
              @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -898,7 +941,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
              @NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
              @NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
-@@ -292,7 +291,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -290,7 +289,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) {
          super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
                  profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier,
@@ -918,7 +961,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
  import org.chromium.chrome.browser.directactions.DirectActionInitializer;
  import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
-@@ -96,7 +95,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+@@ -97,7 +96,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -926,7 +969,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  import org.chromium.chrome.browser.share.ShareButtonController;
  import org.chromium.chrome.browser.share.ShareDelegate;
-@@ -241,7 +239,6 @@ public class RootUiCoordinator
+@@ -244,7 +242,6 @@ public class RootUiCoordinator
      private List<ButtonDataProvider> mButtonDataProviders;
      @Nullable
      private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController;
@@ -934,7 +977,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      private IdentityDiscController mIdentityDiscController;
      private ChromeActionModeHandler mChromeActionModeHandler;
      private final ToolbarActionModeCallback mActionModeControllerCallback;
-@@ -254,7 +251,6 @@ public class RootUiCoordinator
+@@ -257,7 +254,6 @@ public class RootUiCoordinator
      private final ObservableSupplier<TabBookmarker> mTabBookmarkerSupplier;
      private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
      private BottomSheetObserver mBottomSheetObserver;
@@ -942,7 +985,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      protected final CallbackController mCallbackController;
      protected final BrowserControlsManager mBrowserControlsManager;
      private BrowserControlsStateProvider.Observer mBrowserControlsObserver;
-@@ -359,7 +355,7 @@ public class RootUiCoordinator
+@@ -362,7 +358,7 @@ public class RootUiCoordinator
              @NonNull ObservableSupplier<Profile> profileSupplier,
              @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
              @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -951,7 +994,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
              @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
              @NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
              @NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
-@@ -452,7 +448,6 @@ public class RootUiCoordinator
+@@ -455,7 +451,6 @@ public class RootUiCoordinator
          mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
          mTabBookmarkerSupplier = tabBookmarkerSupplier;
          mAppMenuSupplier = new OneshotSupplierImpl<>();
@@ -959,7 +1002,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
          mActionModeControllerCallback = new ToolbarActionModeCallback();
  
          mTabModelSelectorSupplier = tabModelSelectorSupplier;
-@@ -556,11 +551,6 @@ public class RootUiCoordinator
+@@ -559,11 +554,6 @@ public class RootUiCoordinator
              mToolbarManager = null;
          }
  
@@ -971,7 +1014,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
          if (mAdaptiveToolbarButtonController != null) {
              mAdaptiveToolbarButtonController.destroy();
              mAdaptiveToolbarButtonController = null;
-@@ -997,15 +987,6 @@ public class RootUiCoordinator
+@@ -1004,15 +994,6 @@ public class RootUiCoordinator
  
      @Override
      public boolean canShowAppMenu() {
@@ -987,7 +1030,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
          // Do not show the menu if we are in find in page view.
          if (mFindToolbarManager != null && mFindToolbarManager.isShowing()
                  && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
-@@ -1150,9 +1131,6 @@ public class RootUiCoordinator
+@@ -1157,9 +1138,6 @@ public class RootUiCoordinator
                      AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController);
              adaptiveToolbarButtonController.addButtonVariant(
                      AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController);
@@ -997,7 +1040,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
              mButtonDataProviders =
                      Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController);
  
-@@ -1222,10 +1200,6 @@ public class RootUiCoordinator
+@@ -1229,10 +1207,6 @@ public class RootUiCoordinator
              public void onStartedShowing(int layoutType, boolean showToolbar) {
                  if (layoutType != LayoutType.BROWSING
                          && layoutType != LayoutType.SIMPLE_ANIMATION) {
@@ -1008,7 +1051,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                  }
  
                  if (layoutType == LayoutType.TAB_SWITCHER) {
-@@ -1351,10 +1325,6 @@ public class RootUiCoordinator
+@@ -1370,10 +1344,6 @@ public class RootUiCoordinator
       * cross-feature interaction, e.g. hide other features when this feature is shown.
       */
      protected void onFindToolbarShown() {
@@ -1019,7 +1062,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      }
  
      /**
-@@ -1499,9 +1469,6 @@ public class RootUiCoordinator
+@@ -1517,9 +1487,6 @@ public class RootUiCoordinator
                      case SheetState.FULL:
                          if (!mOpened) {
                              mOpened = true;
@@ -1029,7 +1072,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                          }
  
                          // On visible bottom sheet, hide page zoom dialog
-@@ -1509,8 +1476,6 @@ public class RootUiCoordinator
+@@ -1527,8 +1494,6 @@ public class RootUiCoordinator
                          break;
                      case SheetState.HIDDEN:
                          mOpened = false;
@@ -1041,7 +1084,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2064,7 +2064,6 @@ static_library("browser") {
+@@ -2078,7 +2078,6 @@ static_library("browser") {
      "//components/content_settings/common:mojom",
      "//components/content_settings/core/browser",
      "//components/content_settings/core/common",
@@ -1049,7 +1092,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//components/cookie_config",
      "//components/country_codes",
      "//components/crash/core/browser",
-@@ -2534,8 +2533,6 @@ static_library("browser") {
+@@ -2549,8 +2548,6 @@ static_library("browser") {
        "android/compositor/decoration_title.h",
        "android/compositor/layer/content_layer.cc",
        "android/compositor/layer/content_layer.h",
@@ -1058,7 +1101,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/compositor/layer/layer.h",
        "android/compositor/layer/overlay_panel_layer.cc",
        "android/compositor/layer/overlay_panel_layer.h",
-@@ -2556,8 +2553,6 @@ static_library("browser") {
+@@ -2571,8 +2568,6 @@ static_library("browser") {
        "android/compositor/resources/resource_factory.cc",
        "android/compositor/resources/toolbar_resource.cc",
        "android/compositor/resources/toolbar_resource.h",
@@ -1067,7 +1110,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/compositor/scene_layer/overscroll_scene_layer.cc",
        "android/compositor/scene_layer/overscroll_scene_layer.h",
        "android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc",
-@@ -2580,16 +2575,6 @@ static_library("browser") {
+@@ -2595,16 +2590,6 @@ static_library("browser") {
        "android/content/content_utils.cc",
        "android/context_menu/context_menu_native_delegate_impl.cc",
        "android/context_menu/context_menu_native_delegate_impl.h",
@@ -1082,9 +1125,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 -      "android/contextualsearch/unhandled_tap_web_contents_observer.cc",
 -      "android/contextualsearch/unhandled_tap_web_contents_observer.h",
        "android/cookies/cookies_fetcher_util.cc",
-       "android/customtabs/client_data_header_web_contents_observer.cc",
-       "android/customtabs/client_data_header_web_contents_observer.h",
-@@ -3197,8 +3182,6 @@ static_library("browser") {
+       "android/customtabs/chrome_origin_verifier.cc",
+       "android/customtabs/chrome_origin_verifier.h",
+@@ -3217,8 +3202,6 @@ static_library("browser") {
        "safe_browsing/android/safe_browsing_referring_app_bridge_android.h",
        "safe_browsing/android/safe_browsing_settings_launcher_android.cc",
        "safe_browsing/android/safe_browsing_settings_launcher_android.h",
@@ -1096,7 +1139,35 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3462,31 +3462,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1893,27 +1893,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesAlternateUxVariations[] = {
+      std::size(kRelatedSearchesAlternateUxShowDefaultChipWith120SpEllipsis),
+      nullptr},
+ };
+-
+-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith300Dp[] =
+-    {{"contextual_search_minimum_page_height_dp", "300"}};
+-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith400Dp[] =
+-    {{"contextual_search_minimum_page_height_dp", "400"}};
+-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith500Dp[] =
+-    {{"contextual_search_minimum_page_height_dp", "500"}};
+-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith600Dp[] =
+-    {{"contextual_search_minimum_page_height_dp", "600"}};
+-const FeatureEntry::FeatureVariation
+-    kContextualSearchSuppressShortViewVariations[] = {
+-        {"(300 dp)", kContextualSearchSuppressShortViewWith300Dp,
+-         std::size(kContextualSearchSuppressShortViewWith300Dp), nullptr},
+-        {"(400 dp)", kContextualSearchSuppressShortViewWith400Dp,
+-         std::size(kContextualSearchSuppressShortViewWith400Dp), nullptr},
+-        {"(500 dp)", kContextualSearchSuppressShortViewWith500Dp,
+-         std::size(kContextualSearchSuppressShortViewWith500Dp), nullptr},
+-        {"(600 dp)", kContextualSearchSuppressShortViewWith600Dp,
+-         std::size(kContextualSearchSuppressShortViewWith600Dp), nullptr},
+-};
+-
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = {
+@@ -3585,34 +3564,6 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableOskResizesVisualViewportName,
       flag_descriptions::kEnableOskResizesVisualViewportDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kOSKResizesVisualViewport)},
@@ -1111,7 +1182,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 -     flag_descriptions::kContextualSearchSuppressShortViewName,
 -     flag_descriptions::kContextualSearchSuppressShortViewDescription,
 -     kOsAndroid,
--     FEATURE_VALUE_TYPE(chrome::android::kContextualSearchSuppressShortView)},
+-     FEATURE_WITH_PARAMS_VALUE_TYPE(
+-         chrome::android::kContextualSearchSuppressShortView,
+-         kContextualSearchSuppressShortViewVariations,
+-         "ContextualSearchSuppressShortView")},
 -    {"contextual-triggers-selection-handles",
 -     flag_descriptions::kContextualTriggersSelectionHandlesName,
 -     flag_descriptions::kContextualTriggersSelectionHandlesDescription,
@@ -1139,7 +1213,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "components/download/public/common/download_features.h"
  #include "components/embedder_support/android/util/cdn_utils.h"
  #include "components/feature_engagement/public/feature_list.h"
-@@ -222,15 +221,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -223,15 +222,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kContextMenuSearchAndShopWithGoogleLens,
      &kContextMenuTranslateWithGoogleLens,
      &kContextMenuPopupStyle,
@@ -1152,10 +1226,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 -    &kContextualTriggersSelectionHandles,
 -    &kContextualTriggersSelectionMenu,
 -    &kContextualTriggersSelectionSize,
-     &kDelayToolbarUpdateOnLoadStarted,
      &kDirectActions,
      &kDisableCompositedProgressBar,
-@@ -631,32 +621,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch",
+     &kDownloadFileProvider,
+@@ -645,32 +635,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch",
  const base::Feature kLensOnQuickActionSearchWidget{
      "LensOnQuickActionSearchWidget", base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -1185,13 +1259,13 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 -const base::Feature kContextualTriggersSelectionSize{
 -    "ContextualTriggersSelectionSize", base::FEATURE_DISABLED_BY_DEFAULT};
 -
- const base::Feature kDelayToolbarUpdateOnLoadStarted{
-     "DelayToolbarUpdateOnLoadStarted", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kDirectActions{"DirectActions",
+                                    base::FEATURE_ENABLED_BY_DEFAULT};
  
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -74,14 +74,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens;
+@@ -75,14 +75,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens;
  extern const base::Feature kContextMenuShopWithGoogleLens;
  extern const base::Feature kContextMenuSearchAndShopWithGoogleLens;
  extern const base::Feature kContextMenuTranslateWithGoogleLens;
@@ -1203,13 +1277,13 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 -extern const base::Feature kContextualTriggersSelectionHandles;
 -extern const base::Feature kContextualTriggersSelectionMenu;
 -extern const base::Feature kContextualTriggersSelectionSize;
- extern const base::Feature kDelayToolbarUpdateOnLoadStarted;
  extern const base::Feature kDirectActions;
  extern const base::Feature kDisableCompositedProgressBar;
+ extern const base::Feature kDontPrefetchLibraries;
 diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -116,7 +116,6 @@
+@@ -120,7 +120,6 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/first_run/android/first_run_prefs.h"
  #include "chrome/browser/lens/android/lens_prefs.h"
@@ -1217,7 +1291,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
  #else  // BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/download/default_download_dir_policy_handler.h"
  #include "chrome/browser/download/download_auto_open_policy_handler.h"
-@@ -1803,10 +1802,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
+@@ -1828,10 +1827,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
        std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
    // Policies for all platforms - End
  
@@ -1232,7 +1306,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -806,33 +806,6 @@ CHAR_LIMIT guidelines:
+@@ -791,33 +791,6 @@ CHAR_LIMIT guidelines:
        <message name="IDS_PREFS_PRIVACY_SECURITY" desc="Title for the Privacy and Security preferences. [CHAR_LIMIT=32]">
          Privacy and security
        </message>
@@ -1266,7 +1340,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_DO_NOT_TRACK_TITLE" desc="Title for 'Do Not Track' preference">
          “Do Not Track”
        </message>
-@@ -4032,38 +4005,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3995,38 +3968,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Tabs
        </message>
  
@@ -1319,7 +1393,7 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow
 diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
 --- a/third_party/blink/public/mojom/BUILD.gn
 +++ b/third_party/blink/public/mojom/BUILD.gn
-@@ -890,8 +890,8 @@ mojom("android_mojo_bindings") {
+@@ -891,8 +891,8 @@ mojom("android_mojo_bindings") {
    # This Android unhandled-tap feature uses another mojo source, add it in.
    if (enable_unhandled_tap) {
      sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch
index b88a6cc8..9ba33d65 100644
--- a/build/patches/Remove-help-menu-item.patch
+++ b/build/patches/Remove-help-menu-item.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -148,9 +148,6 @@
+@@ -150,9 +150,6 @@ found in the LICENSE file.
          <item android:id="@+id/preferences_id"
              android:title="@string/menu_settings"
              android:icon="@drawable/settings_cog" />
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2335,16 +2335,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2303,16 +2303,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
-@@ -542,7 +542,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
+@@ -552,7 +552,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
      public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
          // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
          if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
diff --git a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch
index df7cff3c..6a4e7e9a 100644
--- a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch
+++ b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res_base/font/chrome_google_sans.xml b/chrome/android/java/res_base/font/chrome_google_sans.xml
 --- a/chrome/android/java/res_base/font/chrome_google_sans.xml
 +++ b/chrome/android/java/res_base/font/chrome_google_sans.xml
-@@ -6,10 +6,4 @@
+@@ -8,10 +8,4 @@ found in the LICENSE file.
  <font-family
      xmlns:app="http://schemas.android.com/apk/res-auto"
      xmlns:tools="http://schemas.android.com/tools"
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res_base/font/chrome_google_sans.xml b/chrome/a
 diff --git a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
 --- a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
 +++ b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
-@@ -6,10 +6,4 @@
+@@ -8,10 +8,4 @@ found in the LICENSE file.
  <font-family
      xmlns:app="http://schemas.android.com/apk/res-auto"
      xmlns:tools="http://schemas.android.com/tools"
@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml b/chr
 diff --git a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
 --- a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
 +++ b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
-@@ -6,10 +6,4 @@
+@@ -8,10 +8,4 @@ found in the LICENSE file.
  <font-family
      xmlns:app="http://schemas.android.com/apk/res-auto"
      xmlns:tools="http://schemas.android.com/tools"
diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch
index 02491c84..8de43895 100644
--- a/build/patches/Remove-price-shopping-commerce-integrations.patch
+++ b/build/patches/Remove-price-shopping-commerce-integrations.patch
@@ -23,12 +23,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../TabSwitcherCoordinator.java               | 102 +---------
  .../tab_management/TabSwitcherMediator.java   |  57 ------
  .../chrome/browser/app/ChromeActivity.java    |  17 --
- .../AppMenuPropertiesDelegateImpl.java        |  48 +----
+ .../AppMenuPropertiesDelegateImpl.java        |  16 +-
  .../browser/bookmarks/BookmarkBridge.java     |  84 ---------
  .../bookmarks/BookmarkItemsAdapter.java       |  23 ---
  .../browser/bookmarks/BookmarkManager.java    |  11 --
  .../BookmarkSaveFlowCoordinator.java          |  37 +---
- .../bookmarks/BookmarkSaveFlowMediator.java   |  54 +-----
+ .../bookmarks/BookmarkSaveFlowMediator.java   |  69 +------
  .../browser/bookmarks/BookmarkUtils.java      |  12 +-
  .../init/ProcessInitializationHandler.java    |   5 -
  .../chrome/browser/tab/TabHelpers.java        |   9 -
@@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../CommerceSubscriptionsService.java         |  36 +---
  .../SubscriptionsManagerImpl.java             |  26 +--
  chrome/browser/persisted_state_db/BUILD.gn    |   1 -
- 38 files changed, 24 insertions(+), 936 deletions(-)
+ 38 files changed, 29 insertions(+), 914 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
@@ -58,7 +58,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  import("//chrome/browser/password_manager/buildflags.gni")
  import("//chrome/browser/share/android/java_sources.gni")
  import("//chrome/chrome_paks.gni")
-@@ -366,9 +362,6 @@ android_library("chrome_java") {
+@@ -367,9 +363,6 @@ android_library("chrome_java") {
      "//chrome/browser/browser_controls/android:java",
      "//chrome/browser/commerce/android:java",
      "//chrome/browser/commerce/merchant_viewer/android:java",
@@ -68,7 +68,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/consent_auditor/android:java",
      "//chrome/browser/contextmenu:java",
      "//chrome/browser/dependency_injection:java",
-@@ -754,16 +747,6 @@ android_library("chrome_java") {
+@@ -756,16 +749,6 @@ android_library("chrome_java") {
    sources += share_java_sources
    deps += share_java_deps
  
@@ -85,16 +85,16 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
    if (enable_basic_printing) {
      deps += [ "//printing:printing_java" ]
    }
-@@ -850,8 +833,6 @@ group("jni_headers") {
-     "//chrome/browser/android/browserservices/metrics:jni_headers",
+@@ -854,8 +837,6 @@ group("jni_headers") {
      "//chrome/browser/android/browserservices/verification:jni_headers",
+     "//chrome/browser/battery/android:jni_headers",
      "//chrome/browser/commerce/merchant_viewer/android:jni_headers",
 -    "//chrome/browser/commerce/price_tracking/android:jni_headers",
 -    "//chrome/browser/commerce/subscriptions/android:jni_headers",
      "//chrome/browser/contextmenu:jni_headers",
      "//chrome/browser/download/android:jni_headers",
      "//chrome/browser/enterprise/util:jni_headers",
-@@ -1008,8 +989,6 @@ robolectric_binary("chrome_junit_tests") {
+@@ -1014,8 +995,6 @@ robolectric_binary("chrome_junit_tests") {
      "//chrome/browser/browser_controls/android:junit",
      "//chrome/browser/commerce/android:java",
      "//chrome/browser/commerce/merchant_viewer/android:junit",
@@ -103,7 +103,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/commerce/subscriptions/android:subscriptions_java",
      "//chrome/browser/contextmenu:java",
      "//chrome/browser/dependency_injection:java",
-@@ -1532,7 +1511,6 @@ android_library("chrome_test_java") {
+@@ -1544,7 +1523,6 @@ android_library("chrome_test_java") {
      "//chrome/browser/commerce/android:javatests",
      "//chrome/browser/commerce/merchant_viewer/android:java",
      "//chrome/browser/commerce/merchant_viewer/android:javatests",
@@ -111,7 +111,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/commerce/subscriptions/android:subscriptions_java",
      "//chrome/browser/content_creation/notes/internal/android:java",
      "//chrome/browser/contextmenu:java",
-@@ -1805,8 +1783,6 @@ android_library("chrome_test_java") {
+@@ -1820,8 +1798,6 @@ android_library("chrome_test_java") {
  
    deps += feed_test_deps
  
@@ -123,7 +123,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -195,10 +195,6 @@ chrome_java_sources = [
+@@ -194,10 +194,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
    "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
    "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java",
@@ -157,7 +157,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t
      "//chrome/browser/endpoint_fetcher:java",
      "//chrome/browser/feature_engagement:java",
      "//chrome/browser/feed/android:java",
-@@ -271,7 +265,6 @@ android_library("unit_device_javatests") {
+@@ -272,7 +266,6 @@ android_library("unit_device_javatests") {
      "//base/test:test_support_java",
      "//chrome/android/features/tab_ui:java",
      "//chrome/android/features/tab_ui:tab_suggestions_java",
@@ -168,7 +168,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t
 diff --git a/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml b/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml
 --- a/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml
 +++ b/chrome/android/features/tab_ui/java/res/layout/large_message_card_item.xml
-@@ -20,15 +20,6 @@
+@@ -22,15 +22,6 @@ found in the LICENSE file.
              android:layout_height="match_parent"
              android:layout_marginBottom="16dp"
              android:orientation="vertical">
@@ -187,7 +187,7 @@ diff --git a/chrome/android/features/tab_ui/java/res/layout/large_message_card_i
 diff --git a/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml b/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml
 --- a/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml
 +++ b/chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml
-@@ -52,14 +52,6 @@
+@@ -54,14 +54,6 @@ found in the LICENSE file.
                  android:src="@color/thumbnail_placeholder_on_primary_bg"
                  style="?attr/tabGridThumbnailStyle"/>
  
@@ -406,7 +406,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
-@@ -52,7 +52,7 @@ import java.util.List;
+@@ -55,7 +55,7 @@ import java.util.List;
   * Coordinator for showing UI for a list of tabs. Can be used in GRID or STRIP modes.
   */
  public class TabListCoordinator
@@ -415,7 +415,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /**
       * Modes of showing the list of tabs.
       *
-@@ -108,7 +108,6 @@ public class TabListCoordinator
+@@ -111,7 +111,6 @@ public class TabListCoordinator
       * @param itemType The item type to put in the list of tabs.
       * @param selectionDelegateProvider Provider to provide selected Tabs for a selectable tab list.
       *                                  It's NULL when selection is not possible.
@@ -423,7 +423,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
       * @param parentView {@link ViewGroup} The root view of the UI.
       * @param attachToParent Whether the UI should attach to root view.
       * @param componentName A unique string uses to identify different components for UMA recording.
-@@ -125,8 +124,6 @@ public class TabListCoordinator
+@@ -128,8 +127,6 @@ public class TabListCoordinator
                      .GridCardOnClickListenerProvider gridCardOnClickListenerProvider,
              @Nullable TabListMediator.TabGridDialogHandler dialogHandler, @UiType int itemType,
              @Nullable TabListMediator.SelectionDelegateProvider selectionDelegateProvider,
@@ -432,7 +432,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
              @NonNull ViewGroup parentView, boolean attachToParent, String componentName,
              @NonNull ViewGroup rootView, @Nullable Callback<Object> onModelTokenChange) {
          mMode = mode;
-@@ -230,7 +227,7 @@ public class TabListCoordinator
+@@ -233,7 +230,7 @@ public class TabListCoordinator
          mMediator = new TabListMediator(context, mModel, mMode, tabModelSelector, thumbnailProvider,
                  titleProvider, tabListFaviconProvider, actionOnRelatedTabs,
                  selectionDelegateProvider, gridCardOnClickListenerProvider, dialogHandler,
@@ -441,7 +441,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  
          try (TraceEvent e = TraceEvent.scoped("TabListCoordinator.setupRecyclerView")) {
              if (!attachToParent) {
-@@ -368,13 +365,6 @@ public class TabListCoordinator
+@@ -377,13 +374,6 @@ public class TabListCoordinator
          return tabListRect.top;
      }
  
@@ -455,7 +455,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /**
       * @return The container {@link androidx.recyclerview.widget.RecyclerView} that is showing the
       *         tab list UI.
-@@ -516,15 +506,4 @@ public class TabListCoordinator
+@@ -533,15 +523,4 @@ public class TabListCoordinator
      void removeSpecialListItem(@UiType int uiType, int itemIdentifier) {
          mMediator.removeSpecialItemFromModel(uiType, itemIdentifier);
      }
@@ -615,7 +615,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      }
  
      public void initWithNative(Profile profile) {
-@@ -1217,9 +1135,6 @@ class TabListMediator {
+@@ -1226,9 +1144,6 @@ class TabListMediator {
              Collections.sort(tabsList, LAST_SHOWN_COMPARATOR);
          }
          mVisible = tabsList != null;
@@ -625,7 +625,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          if (areTabsUnchanged(tabsList)) {
              if (tabsList == null) return true;
              for (int i = 0; i < tabsList.size(); i++) {
-@@ -1284,11 +1199,6 @@ class TabListMediator {
+@@ -1293,11 +1208,6 @@ class TabListMediator {
  
      void hardCleanup() {
          assert !mVisible;
@@ -637,7 +637,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          sViewedTabIds.clear();
      }
  
-@@ -1443,25 +1353,6 @@ class TabListMediator {
+@@ -1453,25 +1363,6 @@ class TabListMediator {
       * @param recyclerView the {@link TabListRecyclerView} to add the listener too.
       */
      void registerOnScrolledListener(RecyclerView recyclerView) {
@@ -663,7 +663,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      }
  
      private void unregisterOnScrolledListener() {
-@@ -1839,34 +1730,6 @@ class TabListMediator {
+@@ -1849,34 +1740,6 @@ class TabListMediator {
      }
  
      private void setupPersistedTabDataFetcherForTab(PseudoTab pseudoTab, int index) {
@@ -698,7 +698,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      }
  
      @VisibleForTesting
-@@ -1974,23 +1837,6 @@ class TabListMediator {
+@@ -1984,23 +1847,6 @@ class TabListMediator {
          return false;
      }
  
@@ -722,7 +722,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /**
       * Update the layout of tab switcher to make it compact. Because now we have messages within the
       * tabs like PriceMessage and these messages take up the entire row, some operations like
-@@ -2001,7 +1847,7 @@ class TabListMediator {
+@@ -2011,7 +1857,7 @@ class TabListMediator {
      void updateLayout() {
          // Right now we need to update layout only if there is a price welcome message card in tab
          // switcher.
@@ -731,7 +731,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          assert mGridLayoutManager != null;
          int spanCount = mGridLayoutManager.getSpanCount();
          GridLayoutManager.SpanSizeLookup spanSizeLookup = mGridLayoutManager.getSpanSizeLookup();
-@@ -2093,25 +1939,4 @@ class TabListMediator {
+@@ -2103,25 +1949,4 @@ class TabListMediator {
      private boolean isShowingTabsInMRUOrder() {
          return TabSwitcherCoordinator.isShowingTabsInMRUOrder(mMode);
      }
@@ -782,10 +782,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java
-@@ -153,7 +153,7 @@ class TabSelectionEditorCoordinator {
-             // if requested.
+@@ -164,7 +164,7 @@ class TabSelectionEditorCoordinator {
+             // its TabListCoordinator to work with the editor as an optimization.
              mTabListCoordinator = new TabListCoordinator(mode, context, mTabModelSelector,
-                     tabContentManager::getTabThumbnailWithCallback, null, false, null, null,
+                     thumbnailProvider, titleProvider, displayGroups, null, null,
 -                    TabProperties.UiType.SELECTABLE, this::getSelectionDelegate, null,
 +                    TabProperties.UiType.SELECTABLE, this::getSelectionDelegate,
                      mTabSelectionEditorLayout, false, COMPONENT_NAME, rootView, null);
@@ -898,7 +898,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
              mIsInitialized = true;
          }
 @@ -487,21 +459,6 @@ public class TabSwitcherCoordinator
-                         tabContentManager, selectionEditorMode, mRootView);
+                         tabContentManager, selectionEditorMode, mRootView, /*displayGroups=*/false);
      }
  
 -    private void setUpPriceTracking(Context context, ModalDialogManager modalDialogManager) {
@@ -1014,7 +1014,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
-@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.init.FirstDrawDetector;
+@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -1161,7 +1161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
-@@ -150,8 +148,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
+@@ -149,8 +147,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
  import org.chromium.chrome.browser.share.ShareDelegateImpl;
  import org.chromium.chrome.browser.share.ShareDelegateSupplier;
  import org.chromium.chrome.browser.stylus_handwriting.StylusWritingCoordinator;
@@ -1170,7 +1170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.RequestDesktopUtils;
  import org.chromium.chrome.browser.tab.Tab;
-@@ -2354,19 +2350,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2372,19 +2368,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          }
  
          if (id == R.id.disable_price_tracking_menu_id) {
@@ -1193,7 +1193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.banners.AppMenuVerbiage;
  import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
  import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
@@ -1201,7 +1201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.bookmarks.ReadingListFeatures;
  import org.chromium.chrome.browser.commerce.ShoppingFeatures;
  import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
-@@ -57,7 +56,6 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -56,7 +55,6 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
  import org.chromium.chrome.browser.night_mode.WebContentsDarkModeController;
  import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
@@ -1209,16 +1209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.read_later.ReadingListUtils;
  import org.chromium.chrome.browser.share.ShareHelper;
-@@ -83,8 +81,6 @@ import org.chromium.components.commerce.core.ShoppingService;
- import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
- import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.components.embedder_support.util.UrlUtilities;
--import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
--import org.chromium.components.power_bookmarks.PowerBookmarkType;
- import org.chromium.components.webapk.lib.client.WebApkValidator;
- import org.chromium.components.webapps.AppBannerManager;
- import org.chromium.components.webapps.WebappsUtils;
-@@ -585,9 +581,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -572,9 +570,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                                  .getTabsWithNoOtherRelatedTabs()
                                  .size()
                          > 1;
@@ -1229,48 +1220,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
          boolean isPriceTrackingEnabled = isPriceTrackingVisible;
          boolean hasItemBetweenDividers = false;
  
-@@ -1172,44 +1166,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1147,9 +1143,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+      * @param stopPriceTrackingMenuItem The menu item to stop price tracking.
+      * @param currentTab Current tab being displayed.
       */
-     protected void updatePriceTrackingMenuItemRow(@NonNull MenuItem startPriceTrackingMenuItem,
-             @NonNull MenuItem stopPriceTrackingMenuItem, @Nullable Tab currentTab) {
+-    protected void updatePriceTrackingMenuItemRow(@NonNull MenuItem startPriceTrackingMenuItem,
+-            @NonNull MenuItem stopPriceTrackingMenuItem, @Nullable Tab currentTab) {
 -        ShoppingService service =
--                ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile());
--        ShoppingService.ProductInfo info = null;
--        if (service != null && currentTab != null) {
--            info = service.getAvailableProductInfoForUrl(currentTab.getUrl());
--        }
--
--        // If price tracking isn't enabled or the page isn't eligible, then hide both items.
--        if (!ShoppingFeatures.isShoppingListEnabled()
--                || !PowerBookmarkUtils.isPriceTrackingEligible(currentTab)
--                || mIsTypeSpecificBookmarkItemRowPresent) {
--            startPriceTrackingMenuItem.setVisible(false);
--            stopPriceTrackingMenuItem.setVisible(false);
--            return;
--        }
--
--        PowerBookmarkMeta existingBookmarkMeta = PowerBookmarkUtils.getBookmarkBookmarkMetaForTab(
--                mBookmarkBridgeSupplier.get(), currentTab);
--        if (existingBookmarkMeta != null
--                && existingBookmarkMeta.getType() != PowerBookmarkType.SHOPPING) {
--            startPriceTrackingMenuItem.setVisible(false);
--            stopPriceTrackingMenuItem.setVisible(false);
--            return;
--        }
--
--        mIsTypeSpecificBookmarkItemRowPresent = true;
--
--        boolean editEnabled = mBookmarkBridgeSupplier.get().isEditBookmarksEnabled();
--        startPriceTrackingMenuItem.setEnabled(editEnabled);
--        stopPriceTrackingMenuItem.setEnabled(editEnabled);
--
--        boolean priceTrackingEnabled = false;
--        if (info != null) {
--            priceTrackingEnabled = PowerBookmarkUtils.isPriceTrackingEnabledForClusterId(
--                    info.productClusterId, mBookmarkBridgeSupplier.get());
--        }
--        startPriceTrackingMenuItem.setVisible(!priceTrackingEnabled);
++    protected void updatePriceTrackingMenuItemRow(@NonNull MenuItem startPriceTrackingMenuItem,  // disabled
++            @NonNull MenuItem stopPriceTrackingMenuItem, @Nullable Tab currentTab) {             // in Bromite
++        /*ShoppingService service =
+                 ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile());
+         ShoppingService.ProductInfo info = null;
+         if (service != null && currentTab != null) {
+@@ -1185,7 +1181,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                     info.productClusterId, mBookmarkBridgeSupplier.get());
+         }
+         startPriceTrackingMenuItem.setVisible(!priceTrackingEnabled);
 -        stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled);
++        stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled); */
 +        startPriceTrackingMenuItem.setVisible(false);
 +        stopPriceTrackingMenuItem.setVisible(false);
      }
@@ -1279,7 +1247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -39,9 +39,6 @@ import org.chromium.chrome.browser.commerce.ShoppingFeatures;
+@@ -26,9 +26,6 @@ import org.chromium.chrome.browser.commerce.ShoppingFeatures;
  import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.read_later.ReadingListUtils;
@@ -1289,7 +1257,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.components.bookmarks.BookmarkId;
  import org.chromium.components.bookmarks.BookmarkType;
-@@ -99,8 +96,6 @@ public class BookmarkBridge {
+@@ -60,8 +57,6 @@ public class BookmarkBridge {
              new ArrayList<DelayedBookmarkCallback>();
      private final ObserverList<BookmarkModelObserver> mObservers =
              new ObserverList<BookmarkModelObserver>();
@@ -1298,7 +1266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  
      /**
       * Interface for callback object for fetching bookmarks and folder hierarchy.
-@@ -354,26 +349,6 @@ public class BookmarkBridge {
+@@ -315,26 +310,6 @@ public class BookmarkBridge {
          mNativeBookmarkBridge = BookmarkBridgeJni.get().init(BookmarkBridge.this, profile);
          mIsDoingExtensiveChanges = BookmarkBridgeJni.get().isDoingExtensiveChanges(
                  mNativeBookmarkBridge, BookmarkBridge.this);
@@ -1325,7 +1293,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      /**
-@@ -388,10 +363,6 @@ public class BookmarkBridge {
+@@ -349,10 +324,6 @@ public class BookmarkBridge {
              mDelayedBookmarkCallbacks.clear();
          }
          mObservers.clear();
@@ -1336,7 +1304,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      /** Returns whether the bridge has been destroyed. */
-@@ -695,61 +666,6 @@ public class BookmarkBridge {
+@@ -656,61 +627,6 @@ public class BookmarkBridge {
          return result;
      }
  
@@ -1377,7 +1345,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -        // IDs.
 -        for (BookmarkId product : products) {
 -            PowerBookmarkMeta meta = getPowerBookmarkMeta(product);
--            if (meta.getType() != PowerBookmarkType.SHOPPING) continue;
+-            if (!meta.hasShoppingSpecifics()) continue;
 -
 -            ShoppingSpecifics specifics = meta.getShoppingSpecifics();
 -            if (offerIdMap.contains(specifics.getOfferId())
@@ -1414,7 +1382,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.components.bookmarks.BookmarkId;
  import org.chromium.components.bookmarks.BookmarkType;
-@@ -67,13 +64,10 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -66,13 +63,10 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
      private BookmarkDelegate mDelegate;
      private String mSearchText;
      private BookmarkId mCurrentFolder;
@@ -1428,7 +1396,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private BookmarkModelObserver mBookmarkModelObserver = new BookmarkModelObserver() {
          @Override
          public void bookmarkNodeChanged(BookmarkItem node) {
-@@ -127,13 +121,7 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -126,13 +120,7 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
                  ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
                          Profile.getLastUsedRegularProfile().getProfileKey(),
                          GlobalDiscardableReferencePool.getReferencePool());
@@ -1442,7 +1410,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      /**
-@@ -239,17 +227,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -238,17 +226,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
                  return createViewHolderHelper(parent, R.layout.bookmark_folder_row);
              case ViewType.BOOKMARK:
                  return createViewHolderHelper(parent, R.layout.bookmark_item_row);
@@ -1474,7 +1442,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
  import org.chromium.components.bookmarks.BookmarkId;
-@@ -208,15 +206,6 @@ public class BookmarkManager
+@@ -204,15 +202,6 @@ public class BookmarkManager
          mBookmarkModel = new BookmarkModel();
          mMainView = (ViewGroup) LayoutInflater.from(mContext).inflate(R.layout.bookmark_main, null);
  
@@ -1577,7 +1545,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.components.bookmarks.BookmarkId;
  import org.chromium.components.feature_engagement.EventConstants;
  import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
-@@ -38,9 +35,6 @@ public class BookmarkSaveFlowMediator extends BookmarkModelObserver {
+@@ -30,7 +27,7 @@ import java.util.List;
+ 
+ /** Controls the bookmarks save-flow. */
+ public class BookmarkSaveFlowMediator
+-        extends BookmarkModelObserver implements SubscriptionsManager.SubscriptionObserver {
++        extends BookmarkModelObserver {
+     private final Context mContext;
+     private final Runnable mCloseRunnable;
+ 
+@@ -40,9 +37,6 @@ public class BookmarkSaveFlowMediator
      private BookmarkId mBookmarkId;
      private PowerBookmarkMeta mPowerBookmarkMeta;
      private boolean mWasBookmarkMoved;
@@ -1587,7 +1564,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private String mFolderName;
  
      /**
-@@ -49,19 +43,15 @@ public class BookmarkSaveFlowMediator extends BookmarkModelObserver {
+@@ -51,22 +45,15 @@ public class BookmarkSaveFlowMediator
       *         model.
       * @param context The {@link Context} associated with this mediator.
       * @param closeRunnable A {@link Runnable} which closes the bookmark save flow.
@@ -1605,10 +1582,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          mCloseRunnable = closeRunnable;
 -
 -        mSubscriptionsManager = subscriptionsManager;
+-        if (mSubscriptionsManager != null) {
+-            mSubscriptionsManager.addObserver(this);
+-        }
      }
  
      /**
-@@ -96,9 +86,6 @@ public class BookmarkSaveFlowMediator extends BookmarkModelObserver {
+@@ -101,9 +88,6 @@ public class BookmarkSaveFlowMediator
              mCloseRunnable.run();
          });
  
@@ -1618,12 +1598,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          bindBookmarkProperties(mBookmarkId, mPowerBookmarkMeta, mWasBookmarkMoved);
          bindPowerBookmarkProperties(mBookmarkId, mPowerBookmarkMeta, fromExplicitTrackUi);
      }
-@@ -124,48 +111,9 @@ public class BookmarkSaveFlowMediator extends BookmarkModelObserver {
+@@ -128,40 +112,9 @@ public class BookmarkSaveFlowMediator
+ 
      private void bindPowerBookmarkProperties(
              BookmarkId bookmarkId, @Nullable PowerBookmarkMeta meta, boolean fromExplicitTrackUi) {
-         if (meta == null) return;
+-        if (meta == null) return;
 -
--        if (meta.getType() == PowerBookmarkType.SHOPPING) {
+-        if (meta.hasShoppingSpecifics()) {
 -            setPriceTrackingNotificationUiEnabled(true);
 -            setPriceTrackingIconForEnabledState(false);
 -            mPropertyModel.set(BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_VISIBLE, true);
@@ -1643,18 +1624,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      void handleNotificationSwitchToggle(CompoundButton view, boolean toggled) {
 -        if (mSubscriptionsManagerCallback == null) {
 -            mSubscriptionsManagerCallback = mCallbackController.makeCancelable((Integer status) -> {
--                boolean statusOk = (status == SubscriptionsManager.StatusCode.OK);
--                if (!statusOk) {
--                    // Set it back to the previous state if the request.
--                    mPropertyModel.set(
--                            BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_TOGGLE_LISTENER, null);
--                    view.setChecked(!toggled);
--                    mPropertyModel.set(
--                            BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_TOGGLE_LISTENER,
--                            this::handleNotificationSwitchToggle);
--                    setPriceTrackingIconForEnabledState(!toggled);
--                }
--                setPriceTrackingNotificationUiEnabled(statusOk);
+-                setPriceTrackingToggleVisualsOnly(
+-                        status == SubscriptionsManager.StatusCode.OK && view.isChecked());
+-                setPriceTrackingNotificationUiEnabled(status == SubscriptionsManager.StatusCode.OK);
 -            });
 -        }
 -
@@ -1667,6 +1639,43 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      void setPriceTrackingNotificationUiEnabled(boolean enabled) {
+@@ -180,9 +133,6 @@ public class BookmarkSaveFlowMediator
+ 
+     void destroy() {
+         mBookmarkModel.removeObserver(this);
+-        if (mSubscriptionsManager != null) {
+-            mSubscriptionsManager.removeObserver(this);
+-        }
+ 
+         mBookmarkModel = null;
+         mPropertyModel = null;
+@@ -203,10 +153,6 @@ public class BookmarkSaveFlowMediator
+                 this::handleNotificationSwitchToggle);
+     }
+ 
+-    void setSubscriptionForTesting(CommerceSubscription subscription) {
+-        mSubscription = subscription;
+-    }
+-
+     // BookmarkModelObserver implementation
+ 
+     @Override
+@@ -218,15 +164,4 @@ public class BookmarkSaveFlowMediator
+         }
+         bindBookmarkProperties(mBookmarkId, mPowerBookmarkMeta, mWasBookmarkMoved);
+     }
+-
+-    // SubscriptionsManager.SubscriptionObserver implementation
+-    @Override
+-    public void onSubscribe(List<CommerceSubscription> subscriptions) {
+-        setPriceTrackingToggleVisualsOnly(subscriptions.contains(mSubscription));
+-    }
+-
+-    @Override
+-    public void onUnsubscribe(List<CommerceSubscription> subscriptions) {
+-        setPriceTrackingToggleVisualsOnly(!subscriptions.contains(mSubscription));
+-    }
+ }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -1773,7 +1782,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.chrome.browser.tab.RequestDesktopUtils;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabAssociatedApp;
-@@ -157,7 +154,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -155,7 +152,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      private NavigationSheet mNavigationSheet;
      private ComposedBrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
      private LayoutManagerImpl mLayoutManager;
@@ -1781,7 +1790,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
      private UndoGroupSnackbarController mUndoGroupSnackbarController;
      private final int mControlContainerHeightResource;
      private final Supplier<InsetObserverView> mInsetObserverViewSupplier;
-@@ -380,11 +376,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -378,11 +374,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              mUndoGroupSnackbarController.destroy();
          }
  
@@ -1793,7 +1802,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
          super.onDestroy();
      }
  
-@@ -522,7 +513,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -520,7 +511,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
          mPwaBottomSheetController =
                  PwaBottomSheetControllerFactory.createPwaBottomSheetController(mActivity);
          PwaBottomSheetControllerFactory.attach(mWindowAndroid, mPwaBottomSheetController);
@@ -1801,7 +1810,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
          initUndoGroupSnackbarController();
      }
  
-@@ -765,18 +755,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -764,18 +754,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
          if (animate) browserControlsSizer.setAnimateBrowserControlsHeightChanges(false);
      }
  
@@ -1873,7 +1882,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -92,8 +92,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
+@@ -91,8 +91,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
  import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
  import org.chromium.chrome.browser.page_info.ChromePageInfo;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
@@ -1882,7 +1891,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-@@ -1991,21 +1989,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1981,21 +1979,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
       * viewed in the tab switcher grid.
       */
      private void maybeShowPriceDropIPH() {
@@ -1915,7 +1924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.bookmarks.TabBookmarker;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
  import org.chromium.chrome.browser.commerce.ShoppingFeatures;
-@@ -92,7 +91,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
+@@ -93,7 +92,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
  import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource;
  import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -1923,7 +1932,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
  import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-@@ -102,7 +100,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
+@@ -103,7 +101,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  import org.chromium.chrome.browser.share.ShareUtils;
  import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
  import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
@@ -1931,7 +1940,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
  import org.chromium.chrome.browser.tab.RequestDesktopUtils;
-@@ -770,17 +767,6 @@ public class RootUiCoordinator
+@@ -773,17 +770,6 @@ public class RootUiCoordinator
          initMerchantTrustSignals();
          initScrollCapture();
  
@@ -1948,8 +1957,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 -
          new OneShotCallback<>(mProfileSupplier, this::initHistoryClustersCoordinator);
  
-         if (RequestDesktopUtils.maybeDefaultEnableGlobalSetting(
-@@ -1081,9 +1067,6 @@ public class RootUiCoordinator
+         if (DeviceFormFactor.isWindowOnTablet(mWindowAndroid)
+@@ -1088,9 +1074,6 @@ public class RootUiCoordinator
  
              mIdentityDiscController = new IdentityDiscController(
                      mActivity, mActivityLifecycleDispatcher, mProfileSupplier);
@@ -1959,7 +1968,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
              ShareButtonController shareButtonController = new ShareButtonController(mActivity,
                      AppCompatResources.getDrawable(
                              mActivity, R.drawable.ic_toolbar_share_offset_24dp),
-@@ -1129,8 +1112,6 @@ public class RootUiCoordinator
+@@ -1136,8 +1119,6 @@ public class RootUiCoordinator
                      AdaptiveToolbarButtonVariant.SHARE, shareButtonController);
              adaptiveToolbarButtonController.addButtonVariant(
                      AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController);
diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch
index dba829c1..42aa43ad 100644
--- a/build/patches/Remove-signin-and-sync-integrations.patch
+++ b/build/patches/Remove-signin-and-sync-integrations.patch
@@ -41,10 +41,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../chrome/browser/app/ChromeActivity.java    |  76 ------
  .../AutofillAssistantPreferenceFragment.java  |  17 +-
  .../bookmarks/BookmarkItemsAdapter.java       |  56 +----
- .../bookmarks/BookmarkPromoHeader.java        | 229 +-----------------
+ .../bookmarks/BookmarkPromoHeader.java        | 227 +-----------------
  .../ClearBrowsingDataFragment.java            |  77 +-----
  .../ClearBrowsingDataFragmentBasic.java       |  27 +--
- .../contacts_picker/ChromePickerAdapter.java  |  67 +----
+ .../contacts_picker/ChromePickerAdapter.java  |  67 +-----
  .../browser/customtabs/CustomTabActivity.java |   3 -
  .../firstrun/FirstRunActivityBase.java        |   1 -
  .../firstrun/LightweightFirstRunActivity.java |   4 +-
@@ -71,8 +71,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/tasks/ReturnToChromeUtil.java     |   9 +-
  chrome/browser/BUILD.gn                       |  11 -
  ...mobile_identity_consistency_field_trial.cc |  15 +-
- .../common_dependencies_chrome.cc             |  44 +---
  chrome/browser/commerce/android/BUILD.gn      |   2 -
+ .../PriceNotificationPreferenceFragment.java  |   8 +-
  .../browser/commerce/ShoppingFeatures.java    |  27 +--
  .../price_tracking/PriceTrackingFeatures.java |   9 +-
  .../commerce/subscriptions/android/BUILD.gn   |   1 -
@@ -87,12 +87,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/firstrun/MobileFreProgress.java   |   4 +-
  .../router/discovery/access_code/BUILD.gn     |   1 -
  .../browser/password_manager/android/BUILD.gn |   4 -
- .../PasswordManagerHelper.java                | 121 +--------
+ ...sswordManagerErrorMessageHelperBridge.java |  16 --
+ .../PasswordManagerHelper.java                | 121 +---------
  ...swordSyncControllerDelegateBridgeImpl.java |   7 -
  chrome/browser/privacy/BUILD.gn               |   1 -
- chrome/browser/privacy_guide/android/BUILD.gn |   1 -
+ chrome/browser/privacy_guide/android/BUILD.gn |   2 -
  .../res/layout/privacy_guide_msbb_step.xml    |   8 -
- .../browser/privacy_guide/MSBBViewHolder.java |  11 -
+ .../browser/privacy_guide/MSBBFragment.java   |   9 -
  chrome/browser/search_resumption/BUILD.gn     |   4 -
  .../SearchResumptionModuleMediator.java       |  37 +--
  .../SearchResumptionModuleUtils.java          |  12 -
@@ -126,7 +127,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ProfileOAuth2TokenServiceDelegate.java    |  52 ----
  .../net/HttpNegotiateAuthenticator.java       |  88 +------
  .../chromoting/base/OAuthTokenFetcher.java    |   2 -
- 107 files changed, 104 insertions(+), 2665 deletions(-)
+ 108 files changed, 101 insertions(+), 2645 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
@@ -146,7 +147,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/ui/android/strings:ui_strings_grd",
      "//chrome/browser/ui/android/theme:java_resources",
      "//chrome/browser/ui/android/toolbar:java_resources",
-@@ -438,8 +436,6 @@ android_library("chrome_java") {
+@@ -439,8 +437,6 @@ android_library("chrome_java") {
      "//chrome/browser/settings:java",
      "//chrome/browser/share:java",
      "//chrome/browser/share/android:java_resources",
@@ -155,7 +156,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/tab:java",
      "//chrome/browser/tab_group:java",
      "//chrome/browser/tabmodel:factory_java",
-@@ -463,7 +459,6 @@ android_library("chrome_java") {
+@@ -464,7 +460,6 @@ android_library("chrome_java") {
      "//chrome/browser/ui/android/page_info:java",
      "//chrome/browser/ui/android/quickactionsearchwidget:java",
      "//chrome/browser/ui/android/searchactivityutils:java",
@@ -163,7 +164,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/ui/android/theme:java",
      "//chrome/browser/ui/android/toolbar:java",
      "//chrome/browser/ui/messages/android:java",
-@@ -1073,9 +1068,6 @@ robolectric_binary("chrome_junit_tests") {
+@@ -1081,9 +1076,6 @@ robolectric_binary("chrome_junit_tests") {
      "//chrome/browser/search_resumption:junit",
      "//chrome/browser/segmentation_platform:factory_java",
      "//chrome/browser/share:java",
@@ -173,7 +174,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/tab:java",
      "//chrome/browser/tab:junit",
      "//chrome/browser/tab_group:java",
-@@ -1106,8 +1098,6 @@ robolectric_binary("chrome_junit_tests") {
+@@ -1115,8 +1107,6 @@ robolectric_binary("chrome_junit_tests") {
      "//chrome/browser/ui/android/omnibox:junit",
      "//chrome/browser/ui/android/quickactionsearchwidget:java",
      "//chrome/browser/ui/android/searchactivityutils:java",
@@ -182,7 +183,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/ui/android/theme:java",
      "//chrome/browser/ui/android/toolbar:java",
      "//chrome/browser/ui/android/toolbar:junit",
-@@ -1618,9 +1608,6 @@ android_library("chrome_test_java") {
+@@ -1631,9 +1621,6 @@ android_library("chrome_test_java") {
      "//chrome/browser/settings:test_support_java",
      "//chrome/browser/share:java",
      "//chrome/browser/share/android:java_resources",
@@ -192,7 +193,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java",
      "//chrome/browser/tab:critical_persisted_tab_data_proto_java",
      "//chrome/browser/tab:java",
-@@ -1645,8 +1632,6 @@ android_library("chrome_test_java") {
+@@ -1659,8 +1646,6 @@ android_library("chrome_test_java") {
      "//chrome/browser/ui/android/quickactionsearchwidget:java",
      "//chrome/browser/ui/android/quickactionsearchwidget:javatests",
      "//chrome/browser/ui/android/searchactivityutils:java",
@@ -201,7 +202,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/ui/android/theme:java",
      "//chrome/browser/ui/android/toolbar:java",
      "//chrome/browser/ui/messages/android:java",
-@@ -2591,7 +2576,6 @@ android_library("browser_java_test_support") {
+@@ -2609,7 +2594,6 @@ android_library("browser_java_test_support") {
      "//chrome/browser/download/android:java",
      "//chrome/browser/prefetch/android:java",
      "//chrome/browser/profiles/android:java",
@@ -209,7 +210,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/tab:java",
      "//components/offline_items_collection/core:core_java",
      "//components/sync/protocol:protocol_java",
-@@ -3278,13 +3262,11 @@ chrome_test_apk_tmpl("chrome_public_unit_test_apk") {
+@@ -3296,13 +3280,11 @@ chrome_test_apk_tmpl("chrome_public_unit_test_apk") {
      "//chrome/browser/optimization_guide/android:unit_device_javatests",
      "//chrome/browser/partnercustomizations:unit_device_javatests",
      "//chrome/browser/password_edit_dialog/android:unit_device_javatests",
@@ -223,7 +224,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//chrome/browser/ui/messages/android:unit_device_javatests",
      "//chrome/browser/user_education:unit_device_javatests",
      "//chrome/browser/video_tutorials/internal:unit_device_javatests",
-@@ -4161,7 +4143,6 @@ generate_jni("chrome_jni_headers") {
+@@ -4179,7 +4161,6 @@ generate_jni("chrome_jni_headers") {
      "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
      "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
      "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
@@ -231,7 +232,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
      "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
      "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java",
-@@ -4238,7 +4219,6 @@ generate_jni("chrome_jni_headers") {
+@@ -4257,7 +4238,6 @@ generate_jni("chrome_jni_headers") {
      "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
      "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
      "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
@@ -242,7 +243,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -600,14 +600,11 @@ chrome_java_sources = [
+@@ -602,14 +602,11 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java",
    "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java",
    "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java",
@@ -257,7 +258,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
    "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
    "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
-@@ -697,7 +694,6 @@ chrome_java_sources = [
+@@ -700,7 +697,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java",
    "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
    "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java",
@@ -265,7 +266,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java",
    "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
    "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
-@@ -812,7 +808,6 @@ chrome_java_sources = [
+@@ -814,7 +810,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java",
    "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java",
    "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
@@ -273,7 +274,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
    "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
    "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
-@@ -1015,14 +1010,6 @@ chrome_java_sources = [
+@@ -1018,14 +1013,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
    "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
    "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
@@ -288,7 +289,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
    "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
    "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
-@@ -1063,23 +1050,6 @@ chrome_java_sources = [
+@@ -1066,23 +1053,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
    "java/src/org/chromium/chrome/browser/survey/SurveyController.java",
    "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
@@ -413,8 +414,8 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro
  import org.chromium.base.annotations.NativeMethods;
  import org.chromium.chrome.browser.profiles.Profile;
 -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.ui.TabObscuringHandler;
- import org.chromium.chrome.browser.ui.TabObscuringHandlerSupplier;
+ import org.chromium.chrome.browser.tab.TabObscuringHandler;
+ import org.chromium.chrome.browser.tab.TabObscuringHandlerSupplier;
  import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
 @@ -129,10 +128,7 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende
  
@@ -696,7 +697,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -66,9 +66,7 @@ by a child template that "extends" this file.
+@@ -68,9 +68,7 @@ by a child template that "extends" this file.
      <uses-permission android:name="android.permission.CAMERA" />
      <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
      <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -706,7 +707,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
      <uses-permission android:name="android.permission.NFC"/>
      <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-@@ -79,7 +77,6 @@ by a child template that "extends" this file.
+@@ -81,7 +79,6 @@ by a child template that "extends" this file.
      <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
      <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
      <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -714,7 +715,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
      <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
      <uses-permission android:name="android.permission.VIBRATE"/>
-@@ -124,8 +121,6 @@ by a child template that "extends" this file.
+@@ -126,8 +123,6 @@ by a child template that "extends" this file.
      <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
      <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  
@@ -723,7 +724,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      {% block extra_uses_permissions %}
      {% endblock %}
  
-@@ -530,15 +525,6 @@ by a child template that "extends" this file.
+@@ -532,15 +527,6 @@ by a child template that "extends" this file.
              TODO(crbug.com/1093292): investigate why
              @android:style/Theme.NoDisplay can't be used here.
          -->
@@ -739,7 +740,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <activity android:name="org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity"
              android:theme="@style/Theme.BrowserUI.AlertDialog.NoActionBar"
              android:launchMode="singleInstance"
-@@ -571,11 +557,6 @@ by a child template that "extends" this file.
+@@ -573,11 +559,6 @@ by a child template that "extends" this file.
              {{ self.supports_vr() }}
          </activity>
          {% endif %}
@@ -754,7 +755,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
 +++ b/chrome/android/java/res/xml/google_services_preferences.xml
-@@ -24,11 +24,6 @@
+@@ -26,11 +26,6 @@ found in the LICENSE file.
          android:title="@string/autocomplete_searches_and_urls_title"
          android:summary="@string/autocomplete_searches_and_urls_summary"
          android:persistent="false"/>
@@ -769,7 +770,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -7,29 +7,11 @@
+@@ -9,29 +9,11 @@ found in the LICENSE file.
      xmlns:app="http://schemas.android.com/apk/res-auto"
      android:orderingFromXml="false">
  
@@ -804,7 +805,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/xml/manage_sync_preferences.xml b/chrome/android/java/res/xml/manage_sync_preferences.xml
 --- a/chrome/android/java/res/xml/manage_sync_preferences.xml
 +++ b/chrome/android/java/res/xml/manage_sync_preferences.xml
-@@ -85,16 +85,4 @@
+@@ -87,16 +87,4 @@ found in the LICENSE file.
          android:key="sync_review_data"
          android:title="@string/sync_review_data"/>
  
@@ -824,7 +825,7 @@ diff --git a/chrome/android/java/res/xml/manage_sync_preferences.xml b/chrome/an
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -51,8 +51,4 @@
+@@ -53,8 +53,4 @@ found in the LICENSE file.
          android:title="@string/cablev2_paask_title"
          android:summary="@string/cablev2_paask_body"
          android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/>
@@ -891,7 +892,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
      /**
       * Returns a new instance of HelpAndFeedbackLauncher.
       */
-@@ -260,13 +233,6 @@ public abstract class AppHooks {
+@@ -259,13 +232,6 @@ public abstract class AppHooks {
          return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
      }
  
@@ -975,7 +976,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWat
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -88,7 +88,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
+@@ -89,7 +89,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
  import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
  import org.chromium.chrome.browser.feed.FeedSurfaceTracker;
@@ -983,15 +984,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.flags.ChromeSwitches;
-@@ -102,7 +101,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup;
+@@ -103,7 +102,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup;
  import org.chromium.chrome.browser.incognito.IncognitoTabLauncher;
- import org.chromium.chrome.browser.incognito.IncognitoTabSnapshotController;
+ import org.chromium.chrome.browser.incognito.IncognitoTabbedSnapshotController;
  import org.chromium.chrome.browser.incognito.IncognitoUtils;
 -import org.chromium.chrome.browser.infobar.SyncErrorInfoBar;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  import org.chromium.chrome.browser.layouts.LayoutType;
  import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
-@@ -140,8 +138,6 @@ import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl;
+@@ -141,8 +139,6 @@ import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl;
  import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
  import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
  import org.chromium.chrome.browser.survey.ChromeSurveyController;
@@ -1000,7 +1001,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabAssociatedApp;
-@@ -690,9 +686,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -691,9 +687,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
      }
  
      private void refreshSignIn() {
@@ -1010,10 +1011,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
      }
  
      private void setupCompositorContentPreNativeForPhone() {
-@@ -1936,14 +1929,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
-                 if (!navigation.hasCommitted() || !navigation.isInPrimaryMainFrame()) {
-                     return;
-                 }
+@@ -1940,14 +1933,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+                     Tab tab, NavigationHandle navigation) {
+                 if (!navigation.hasCommitted()) return;
+ 
 -                try (TraceEvent e = TraceEvent.scoped("CheckSyncErrorOnDidFinishNavigation")) {
 -                    if (SyncErrorPromptUtils.isMessageUiEnabled()) {
 -                        SyncErrorMessage.maybeShowMessageUi(
@@ -1028,7 +1029,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -105,7 +105,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
+@@ -106,7 +106,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
  import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
  import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
@@ -1036,7 +1037,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -154,7 +153,6 @@ import org.chromium.chrome.browser.share.ShareDelegateSupplier;
+@@ -155,7 +154,6 @@ import org.chromium.chrome.browser.share.ShareDelegateSupplier;
  import org.chromium.chrome.browser.stylus_handwriting.StylusWritingCoordinator;
  import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
  import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
@@ -1044,7 +1045,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.RequestDesktopUtils;
  import org.chromium.chrome.browser.tab.Tab;
-@@ -217,8 +215,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
+@@ -219,8 +217,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
  import org.chromium.components.policy.CombinedPolicyProvider;
  import org.chromium.components.policy.CombinedPolicyProvider.PolicyChangeListener;
  import org.chromium.components.profile_metrics.BrowserProfileType;
@@ -1053,7 +1054,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.components.webapk.lib.client.WebApkValidator;
  import org.chromium.components.webapps.AddToHomescreenCoordinator;
-@@ -315,9 +311,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -317,9 +313,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private boolean mRemoveWindowBackgroundDone;
      protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler;
  
@@ -1063,7 +1064,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      // The FullscreenVideoPictureInPictureController is initialized lazily https://crbug.com/729738.
      private FullscreenVideoPictureInPictureController mFullscreenVideoPictureInPictureController;
  
-@@ -1055,61 +1048,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1065,61 +1058,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR;
      }
  
@@ -1125,7 +1126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      @Override
      public void onResumeWithNative() {
          // TODO(b/182286787): Clean-up once fixed session resume order is verified.
-@@ -1244,14 +1182,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1254,14 +1192,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
              if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();
          }
@@ -1140,7 +1141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  
          super.onStopWithNative();
      }
-@@ -1344,11 +1274,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1354,11 +1284,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      .recordUserFontPrefOnStartup();
          });
  
@@ -1152,14 +1153,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          // GSA connection is not needed on low-end devices because Icing is disabled.
          if (!SysUtils.isLowEndDevice()) {
              if (isActivityFinishingOrDestroyed()) return;
-@@ -1363,7 +1288,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1373,7 +1298,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                              GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());
                  }
                  mGSAAccountChangeListener.connect();
 -                createContextReporterIfNeeded();
              });
          }
-     }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
@@ -1229,7 +1230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.components.bookmarks.BookmarkId;
  import org.chromium.components.bookmarks.BookmarkType;
  import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool;
-@@ -55,7 +52,7 @@ import java.util.List;
+@@ -54,7 +51,7 @@ import java.util.List;
   * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
   */
  public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -1238,7 +1239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
      private static final String EMPTY_QUERY = null;
  
-@@ -68,10 +65,8 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -67,10 +64,8 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
      @ViewType
      private int mPromoHeaderType = ViewType.INVALID;
      private BookmarkDelegate mDelegate;
@@ -1249,7 +1250,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory;
  
      // Keep track of the currently highlighted bookmark - used for "show in folder" action.
-@@ -127,8 +122,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -126,8 +121,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
  
      BookmarkItemsAdapter(Context context, SnackbarManager snackbarManager) {
          super(context);
@@ -1258,7 +1259,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  
          mImageFetcher =
                  ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
-@@ -173,11 +166,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -172,11 +165,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
          clearHighlight();
          mElements.clear();
  
@@ -1270,7 +1271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          updateHeader(false);
          if (BookmarkId.SHOPPING_FOLDER.equals(mCurrentFolder)) {
              filterForPriceTrackingCategory(bookmarks);
-@@ -242,9 +230,9 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -241,9 +229,9 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
              case ViewType.PERSONALIZED_SIGNIN_PROMO:
                  // fall through
              case ViewType.PERSONALIZED_SYNC_PROMO:
@@ -1282,7 +1283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
              case ViewType.SECTION_HEADER:
                  return createSectionHeaderViewHolder(parent, viewType);
              case ViewType.FOLDER:
-@@ -280,10 +268,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -279,10 +267,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
      public void onBindViewHolder(ViewHolder holder, int position) {
          if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
                  || holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
@@ -1293,7 +1294,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
              bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
          } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
-@@ -340,7 +324,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -339,7 +323,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
              case ViewType.PERSONALIZED_SIGNIN_PROMO:
                  // fall through
              case ViewType.PERSONALIZED_SYNC_PROMO:
@@ -1301,7 +1302,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
                  break;
              default:
                  // Other view holders don't have special recycling code.
-@@ -363,7 +346,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -362,7 +345,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
              updateHeader(true);
          };
  
@@ -1309,7 +1310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          populateTopLevelFoldersList();
  
          mElements = new ArrayList<>();
-@@ -378,8 +360,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -377,8 +359,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
          mDelegate.getModel().removeObserver(mBookmarkModelObserver);
          mDelegate.getSelectionDelegate().removeObserver(this);
          mDelegate = null;
@@ -1318,7 +1319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      @Override
-@@ -474,18 +454,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -473,18 +453,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
          setOrder(mElements);
      }
  
@@ -1337,7 +1338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
       * promo header. This 0th index is null iff there is a promo header.
-@@ -506,29 +474,12 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -505,29 +473,12 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
          } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
              mPromoHeaderType = ViewType.INVALID;
          } else {
@@ -1367,7 +1368,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
              if (shouldNotify) notifyItemInserted(0);
          } else if (wasShowingPromo && willShowPromo) {
              if (shouldNotify) notifyItemChanged(0);
-@@ -643,7 +594,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+@@ -642,7 +593,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
  
      @VisibleForTesting
      public void simulateSignInForTests() {
@@ -1378,7 +1379,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
-@@ -14,249 +14,22 @@ import androidx.annotation.VisibleForTesting;
+@@ -14,249 +14,24 @@ import androidx.annotation.VisibleForTesting;
  import androidx.recyclerview.widget.RecyclerView;
  import androidx.recyclerview.widget.RecyclerView.ViewHolder;
  
@@ -1409,9 +1410,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -public class BookmarkPromoHeader implements SyncService.SyncStateChangedListener,
 -                                            SignInStateObserver, ProfileDataCache.Observer,
 -                                            AccountsChangeObserver {
--    // TODO(kkimlabs): Figure out the optimal number based on UMA data.
--    private static final int MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT = 10;
--
++public class BookmarkPromoHeader {
+     // TODO(kkimlabs): Figure out the optimal number based on UMA data.
+     private static final int MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT = 10;
+ 
 -    private static @Nullable @SyncPromoState Integer sPromoStateForTests;
 -
 -    private final Context mContext;
@@ -1423,8 +1425,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -    private final @Nullable SyncPromoController mSyncPromoController;
 -    private @SyncPromoState int mPromoState = SyncPromoState.NO_PROMO;
 -    private final @Nullable SyncService mSyncService;
-+public class BookmarkPromoHeader {
- 
+-
      /**
       * Initializes the class. Note that this will start listening to signin related events and
       * update itself if needed.
@@ -1556,7 +1557,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -                SharedPreferencesManager.getInstance().readInt(
 -                        ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
 -                < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
--        if ((!mSyncService.isSyncRequested() || mSyncService.getChosenDataTypes().isEmpty())
+-        if ((!mSyncService.isSyncRequested() || mSyncService.getSelectedTypes().isEmpty())
 -                && impressionLimitNotReached) {
 -            return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
 -        }
@@ -2020,7 +2021,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
      /**
       * Interface for a class that wants to receive updates from this Manager.
       */
-@@ -223,11 +221,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -229,11 +227,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.generateHeaderItems();
          mHistoryAdapter.generateFooterItems();
  
@@ -2032,7 +2033,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
          // Create PrefChangeRegistrar to receive notifications on preference changes.
          mPrefChangeRegistrar = new PrefChangeRegistrar();
          mPrefChangeRegistrar.addObserver(Pref.ALLOW_DELETING_BROWSER_HISTORY, this);
-@@ -261,9 +254,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -267,9 +260,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.onDestroyed();
          mLargeIconBridge.destroy();
          mLargeIconBridge = null;
@@ -2042,7 +2043,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
          mPrefChangeRegistrar.destroy();
      }
  
-@@ -489,22 +479,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -499,22 +489,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.removeHeader();
      }
  
@@ -2065,7 +2066,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
      }
  
      /**
-@@ -545,4 +522,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -555,4 +532,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
      public static void setScrollToLoadDisabledForTesting(boolean isScrollToLoadDisabled) {
          sIsScrollToLoadDisabledForTests = isScrollToLoadDisabled;
      }
@@ -2719,7 +2720,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
          // The component should only be destroyed when the activity has been closed by the user
          // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
          // by the system.
-@@ -583,34 +574,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -585,34 +576,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
      }
  
      private void displayManageAccountLink() {
@@ -2754,7 +2755,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      }
  
      private Context getStyledContext() {
-@@ -621,43 +584,11 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -623,43 +586,11 @@ public class PasswordSettings extends PreferenceFragmentCompat
          return UserPrefs.get(Profile.getLastUsedRegularProfile());
      }
  
@@ -2896,7 +2897,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
  import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.usesUnifiedPasswordManagerUI;
  
  import android.content.Context;
-@@ -38,27 +37,14 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
+@@ -39,27 +38,14 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -2924,7 +2925,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.text.SpanApplier;
-@@ -71,14 +57,10 @@ import java.util.Map;
+@@ -72,14 +58,10 @@ import java.util.Map;
   * The main settings screen, shown when the user first opens Settings.
   */
  public class MainSettings extends PreferenceFragmentCompat
@@ -2940,7 +2941,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      public static final String PREF_SEARCH_ENGINE = "search_engine";
      public static final String PREF_PASSWORDS = "passwords";
      public static final String PREF_HOMEPAGE = "homepage";
-@@ -96,9 +78,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -97,9 +79,6 @@ public class MainSettings extends PreferenceFragmentCompat
  
      private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private final Map<String, Preference> mAllPreferences = new HashMap<>();
@@ -2950,7 +2951,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      private @Nullable PasswordCheck mPasswordCheck;
      private ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
  
-@@ -136,34 +115,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -137,34 +116,6 @@ public class MainSettings extends PreferenceFragmentCompat
          if (getActivity().isFinishing() && mPasswordCheck != null) PasswordCheckFactory.destroy();
      }
  
@@ -2985,7 +2986,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      @Override
      public void onResume() {
          super.onResume();
-@@ -175,8 +126,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -176,8 +127,6 @@ public class MainSettings extends PreferenceFragmentCompat
  
          cachePreferences();
  
@@ -2994,7 +2995,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
          updatePasswordsPreference();
  
          if (usesUnifiedPasswordManagerUI()) {
-@@ -226,9 +175,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -232,9 +181,6 @@ public class MainSettings extends PreferenceFragmentCompat
              Preference preference = getPreferenceScreen().getPreference(index);
              mAllPreferences.put(preference.getKey(), preference);
          }
@@ -3004,7 +3005,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      }
  
      private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -237,15 +183,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -243,15 +189,6 @@ public class MainSettings extends PreferenceFragmentCompat
      }
  
      private void updatePreferences() {
@@ -3020,7 +3021,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
          updateSearchEnginePreference();
          updatePasswordsPreference();
  
-@@ -279,41 +216,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -285,41 +222,6 @@ public class MainSettings extends PreferenceFragmentCompat
          if (preference != null) getPreferenceScreen().removePreference(preference);
      }
  
@@ -3062,7 +3063,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      private void updateSearchEnginePreference() {
          if (!TemplateUrlServiceFactory.get().isLoaded()) {
              ChromeBasePreference searchEnginePref =
-@@ -350,9 +252,7 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -356,9 +258,7 @@ public class MainSettings extends PreferenceFragmentCompat
      }
  
      private boolean shouldShowNewLabelForPasswordsPreference() {
@@ -3073,7 +3074,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      }
  
      // TODO(crbug.com/1217070): remove this method once UPM feature is rolled out.
-@@ -383,37 +283,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -389,37 +289,6 @@ public class MainSettings extends PreferenceFragmentCompat
          pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
      }
  
@@ -3111,7 +3112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
      // TemplateUrlService.LoadListener implementation.
      @Override
      public void onTemplateUrlServiceLoaded() {
-@@ -421,12 +290,6 @@ public class MainSettings extends PreferenceFragmentCompat
+@@ -427,12 +296,6 @@ public class MainSettings extends PreferenceFragmentCompat
          updateSearchEnginePreference();
      }
  
@@ -3154,15 +3155,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java
-@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.language.AppLocaleUtils;
  import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory;
  import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
  import org.chromium.chrome.browser.profiles.Profile;
 -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.components.optimization_guide.OptimizationGuideDecision;
- import org.chromium.components.optimization_guide.proto.HintsProto;
-@@ -182,9 +181,7 @@ public class CrowButtonDelegateImpl implements CrowButtonDelegate {
+ import org.chromium.chrome.browser.tab.TabLaunchType;
+ import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
+@@ -216,9 +215,7 @@ public class CrowButtonDelegateImpl implements CrowButtonDelegate {
  
      private boolean areMetricsEnabled() {
          // Require UMA and "Make searches and browsing better" to be enabled.
@@ -3172,11 +3173,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/Crow
 +        return false;
      }
  
-     @VisibleForTesting
+     @Override
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java
-@@ -274,7 +274,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
+@@ -283,7 +283,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
                              .with(MessageBannerProperties.TITLE,
                                      resources.getString(R.string.chrome_survey_message_title))
                              .with(MessageBannerProperties.ICON_RESOURCE_ID,
@@ -3185,7 +3186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSu
                              .with(MessageBannerProperties.ICON_TINT_COLOR,
                                      MessageBannerProperties.TINT_NONE)
                              .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
-@@ -348,7 +348,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
+@@ -360,7 +360,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
              InfoBarContainer.get(tab).addAnimationListener(this);
  
              SurveyInfoBar.showSurveyInfoBar(
@@ -3194,7 +3195,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSu
  
              RecordUserAction.record("Android.Survey.ShowSurveyInfoBar");
          }
-@@ -361,7 +361,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
+@@ -373,7 +373,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener {
       */
      private void showSurvey(String siteId) {
          SurveyController.getInstance().showSurveyIfAvailable(
@@ -3222,8 +3223,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
  import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper;
  import org.chromium.chrome.browser.vr.VrModuleProvider;
-@@ -912,23 +910,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
-             return false;
+@@ -914,23 +912,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+         }
      }
  
 -    private boolean maybeShowPromo() {
@@ -3249,23 +3250,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
-@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
+@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.segmentation_platform.SegmentationPlatformServiceFactory;
 -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.TabModelObserver;
-@@ -56,7 +55,6 @@ import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.components.embedder_support.util.UrlUtilities;
+ import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+@@ -55,7 +54,6 @@ import org.chromium.components.embedder_support.util.UrlUtilities;
+ import org.chromium.components.segmentation_platform.SegmentSelectionResult;
  import org.chromium.components.segmentation_platform.SegmentationPlatformService;
  import org.chromium.components.segmentation_platform.proto.SegmentationProto.SegmentId;
 -import org.chromium.components.signin.identitymanager.ConsentLevel;
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.content_public.common.ResourceRequestBody;
-@@ -527,13 +525,8 @@ public final class ReturnToChromeUtil {
+@@ -549,13 +547,8 @@ public final class ReturnToChromeUtil {
       * Caches the status of whether the primary account is synced.
       */
      public static void cachePrimaryAccountSyncStatus() {
@@ -3283,7 +3284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1986,7 +1986,6 @@ static_library("browser") {
+@@ -2006,7 +2006,6 @@ static_library("browser") {
      "//chrome/browser/share",
      "//chrome/browser/sharing:buildflags",
      "//chrome/browser/sharing/proto",
@@ -3291,7 +3292,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//chrome/browser/storage_access_api:permissions",
      "//chrome/browser/thumbnail",
      "//chrome/browser/touch_to_fill",
-@@ -2804,8 +2803,6 @@ static_library("browser") {
+@@ -2827,8 +2826,6 @@ static_library("browser") {
        "android/signin/fre_mobile_identity_consistency_field_trial.h",
        "android/signin/signin_bridge.cc",
        "android/signin/signin_bridge.h",
@@ -3300,7 +3301,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "android/signin/signin_metrics_utils.cc",
        "android/signin/unified_consent_service_bridge.cc",
        "android/signin/web_signin_bridge.cc",
-@@ -3214,8 +3211,6 @@ static_library("browser") {
+@@ -3244,8 +3241,6 @@ static_library("browser") {
        "sharing/sms/sms_fetch_request_handler.h",
        "shell_integration_android.cc",
        "signin/identity_services_provider_android.cc",
@@ -3309,7 +3310,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "ssl/chrome_security_state_client.cc",
        "ssl/chrome_security_state_client.h",
        "ssl/chrome_security_state_model_delegate.cc",
-@@ -3230,8 +3225,6 @@ static_library("browser") {
+@@ -3262,8 +3257,6 @@ static_library("browser") {
        "sync/glue/synced_window_delegate_android.h",
        "sync/glue/synced_window_delegates_getter_android.cc",
        "sync/glue/synced_window_delegates_getter_android.h",
@@ -3318,7 +3319,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "sync/trusted_vault_client_android.cc",
        "sync/trusted_vault_client_android.h",
        "tab/web_contents_state.cc",
-@@ -4560,10 +4553,6 @@ static_library("browser") {
+@@ -4598,10 +4591,6 @@ static_library("browser") {
          "profiles/profile_statistics_factory.h",
          "signin/force_signin_verifier.cc",
          "signin/force_signin_verifier.h",
@@ -3364,93 +3365,50 @@ diff --git a/chrome/browser/android/signin/fre_mobile_identity_consistency_field
  }
  
  }  // namespace fre_mobile_identity_consistency_field_trial
-diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
---- a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
-+++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
-@@ -67,48 +67,19 @@ PasswordManagerClient* CommonDependenciesChrome::GetPasswordManagerClient(
- std::string CommonDependenciesChrome::GetSignedInEmail(
-     content::BrowserContext* browser_context) const {
-   DCHECK(browser_context);
--  signin::IdentityManager* identity_manager =
--      IdentityManagerFactory::GetForProfile(
--          Profile::FromBrowserContext(browser_context));
--  if (!identity_manager) {
--    return std::string();
--  }
--  return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
--      .email;
-+  return std::string();
- }
- 
- bool CommonDependenciesChrome::IsSupervisedUser(
-     content::BrowserContext* browser_context) const {
-   DCHECK(browser_context);
--  signin::IdentityManager* identity_manager =
--      IdentityManagerFactory::GetForProfile(
--          Profile::FromBrowserContext(browser_context));
--  if (!identity_manager) {
--    return false;
--  }
--
--  std::string gaia_id =
--      identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync).gaia;
--  return identity_manager->FindExtendedAccountInfoByGaiaId(gaia_id)
--             .capabilities.is_subject_to_parental_controls() ==
--         signin::Tribool::kTrue;
-+  return false;
- }
- 
- bool CommonDependenciesChrome::IsAllowedForMachineLearning(
-     content::BrowserContext* browser_context) const {
-   DCHECK(browser_context);
--  signin::IdentityManager* identity_manager =
--      IdentityManagerFactory::GetForProfile(
--          Profile::FromBrowserContext(browser_context));
--  if (!identity_manager) {
--    return true;
--  }
--
--  std::string gaia_id =
--      identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync).gaia;
--  return identity_manager->FindExtendedAccountInfoByGaiaId(gaia_id)
--             .capabilities.is_allowed_for_machine_learning() !=
--         signin::Tribool::kFalse;
-+  return false;
- }
- 
- AnnotateDomModelService*
-@@ -133,17 +104,12 @@ version_info::Channel CommonDependenciesChrome::GetChannel() const {
- 
- bool CommonDependenciesChrome::GetMakeSearchesAndBrowsingBetterEnabled(
-     content::BrowserContext* browser_context) const {
--  return Profile::FromBrowserContext(browser_context)
--      ->GetPrefs()
--      ->GetBoolean(
--          unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
-+  return false;
- }
- 
- bool CommonDependenciesChrome::GetMetricsReportingEnabled(
-     content::BrowserContext* browser_context) const {
--  return Profile::FromBrowserContext(browser_context)
--      ->GetPrefs()
--      ->GetBoolean(metrics::prefs::kMetricsReportingEnabled);
-+  return false;
- }
- 
- }  // namespace autofill_assistant
 diff --git a/chrome/browser/commerce/android/BUILD.gn b/chrome/browser/commerce/android/BUILD.gn
 --- a/chrome/browser/commerce/android/BUILD.gn
 +++ b/chrome/browser/commerce/android/BUILD.gn
-@@ -19,8 +19,6 @@ android_library("java") {
-     "//chrome/browser/flags:java",
+@@ -22,8 +22,6 @@ android_library("java") {
+     "//chrome/browser/notifications:java",
      "//chrome/browser/preferences:java",
      "//chrome/browser/profiles/android:java",
 -    "//chrome/browser/signin/services/android:java",
 -    "//chrome/browser/sync/android:java",
+     "//components/browser_ui/notifications/android:java",
+     "//components/browser_ui/settings/android:java",
      "//components/commerce/core/android:core_java",
-     "//components/payments/content/android:java",
-     "//components/prefs/android:java",
+diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java
+--- a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java
++++ b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java
+@@ -20,14 +20,12 @@ import org.chromium.chrome.browser.notifications.channels.ChromeChannelDefinitio
+ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
+ import org.chromium.chrome.browser.profiles.Profile;
+-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
+ import org.chromium.components.browser_ui.notifications.NotificationManagerProxy;
+ import org.chromium.components.browser_ui.notifications.NotificationManagerProxyImpl;
+ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+ import org.chromium.components.browser_ui.settings.SettingsUtils;
+ import org.chromium.components.browser_ui.settings.TextMessagePreference;
+ import org.chromium.components.prefs.PrefService;
+-import org.chromium.components.signin.identitymanager.ConsentLevel;
+ import org.chromium.components.user_prefs.UserPrefs;
+ import org.chromium.ui.text.NoUnderlineClickableSpan;
+ import org.chromium.ui.text.SpanApplier;
+@@ -64,12 +62,8 @@ public class PriceNotificationPreferenceFragment extends PreferenceFragmentCompa
+         mEmailNotificationsSwitch =
+                 (ChromeSwitchPreference) findPreference(PREF_EMAIL_NOTIFICATIONS);
+         mEmailNotificationsSwitch.setOnPreferenceChangeListener(this::onPreferenceChange);
+-        String email = IdentityServicesProvider.get()
+-                               .getIdentityManager(Profile.getLastUsedRegularProfile())
+-                               .getPrimaryAccountInfo(ConsentLevel.SYNC)
+-                               .getEmail();
+         mEmailNotificationsSwitch.setSummary(
+-                getString(R.string.price_notifications_settings_email_description, email));
++                getString(R.string.price_notifications_settings_email_description, "nobody@example.com"));
+         mPrefChangeRegistrar.addObserver(
+                 Pref.PRICE_EMAIL_NOTIFICATIONS_ENABLED, this::updateEmailNotificationSwitch);
+         updateEmailNotificationSwitch();
 diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
 --- a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
 +++ b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
@@ -3737,7 +3695,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p
      "//components/browser_ui/notifications/android:java",
      "//components/browser_ui/settings/android:java",
      "//components/browser_ui/widget/android:java_resources",
-@@ -206,8 +204,6 @@ robolectric_binary("password_manager_junit_tests") {
+@@ -209,8 +207,6 @@ robolectric_binary("password_manager_junit_tests") {
      "//chrome/browser/loading_modal/android:java",
      "//chrome/browser/preferences:java",
      "//chrome/browser/profiles/android:java",
@@ -3746,6 +3704,39 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p
      "//chrome/test/android:chrome_java_unit_test_support",
      "//components/browser_ui/settings/android:java",
      "//components/password_manager/core/browser:password_manager_java_enums",
+diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java
+--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java
++++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java
+@@ -16,11 +16,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+ import org.chromium.chrome.browser.profiles.Profile;
+-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
+ import org.chromium.components.prefs.PrefService;
+-import org.chromium.components.signin.AccountManagerFacadeProvider;
+-import org.chromium.components.signin.base.CoreAccountInfo;
+-import org.chromium.components.signin.identitymanager.ConsentLevel;
+ import org.chromium.components.user_prefs.UserPrefs;
+ import org.chromium.ui.base.WindowAndroid;
+ 
+@@ -81,17 +77,5 @@ public class PasswordManagerErrorMessageHelperBridge {
+      */
+     @CalledByNative
+     static void startUpdateAccountCredentialsFlow(WindowAndroid windowAndroid) {
+-        Profile profile = Profile.getLastUsedRegularProfile();
+-        final CoreAccountInfo primaryAccountInfo =
+-                IdentityServicesProvider.get().getIdentityManager(profile).getPrimaryAccountInfo(
+-                        ConsentLevel.SIGNIN);
+-        // It's not possible to call updateCredentials without an account.
+-        assert primaryAccountInfo != null;
+-        final Activity activity = windowAndroid.getActivity().get();
+-        AccountManagerFacadeProvider.getInstance().updateCredentials(
+-                CoreAccountInfo.getAndroidAccountFrom(primaryAccountInfo), activity, (success) -> {
+-                    RecordHistogram.recordBooleanHistogram(
+-                            "PasswordManager.UPMUpdateSignInCredentialsSucces", success);
+-                });
+     }
+ }
 diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
 +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
@@ -3765,7 +3756,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
  import org.chromium.components.browser_ui.settings.SettingsLauncher;
  import org.chromium.components.prefs.PrefService;
  import org.chromium.components.signin.base.CoreAccountInfo;
-@@ -137,19 +135,8 @@ public class PasswordManagerHelper {
+@@ -138,19 +136,8 @@ public class PasswordManagerHelper {
       * @param context used to show the UI to manage passwords.
       */
      public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer,
@@ -3786,7 +3777,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
          Bundle fragmentArgs = new Bundle();
          fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer);
          context.startActivity(settingsLauncher.createSettingsActivityIntent(
-@@ -170,13 +157,7 @@ public class PasswordManagerHelper {
+@@ -171,13 +158,7 @@ public class PasswordManagerHelper {
       * @return True if Unified Password Manager can be used, false otherwise.
       */
      public static boolean canUseUpm() {
@@ -3801,7 +3792,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
      }
  
      /**
-@@ -189,19 +170,7 @@ public class PasswordManagerHelper {
+@@ -190,19 +171,7 @@ public class PasswordManagerHelper {
       *         loading dialog.
       */
      public static void showPasswordCheckup(Context context, @PasswordCheckReferrer int referrer,
@@ -3821,7 +3812,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
      }
  
      /**
-@@ -281,49 +250,6 @@ public class PasswordManagerHelper {
+@@ -282,49 +251,6 @@ public class PasswordManagerHelper {
                  });
      }
  
@@ -3834,7 +3825,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
 -     */
 -    public static boolean hasChosenToSyncPasswords(SyncService syncService) {
 -        return syncService != null && syncService.isSyncFeatureEnabled()
--                && syncService.getChosenDataTypes().contains(ModelType.PASSWORDS);
+-                && syncService.getSelectedTypes().contains(UserSelectableType.PASSWORDS);
 -    }
 -
 -    /**
@@ -3871,7 +3862,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
      public static boolean usesUnifiedPasswordManagerUI() {
          if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false;
          @UpmExperimentVariation
-@@ -356,53 +282,12 @@ public class PasswordManagerHelper {
+@@ -359,53 +285,12 @@ public class PasswordManagerHelper {
      }
  
      public static void launchGmsUpdate(Context context) {
@@ -3964,18 +3955,26 @@ diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
 diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn
 --- a/chrome/browser/privacy_guide/android/BUILD.gn
 +++ b/chrome/browser/privacy_guide/android/BUILD.gn
-@@ -16,7 +16,6 @@ android_library("java") {
-   deps = [
+@@ -21,7 +21,6 @@ android_library("java") {
      ":java_resources",
      "//chrome/browser/profiles/android:java",
+     "//chrome/browser/safe_browsing/android:java",
 -    "//chrome/browser/signin/services/android:java",
      "//components/browser_ui/bottomsheet/android:java",
+     "//components/browser_ui/site_settings/android:java",
+     "//components/browser_ui/widget/android:java",
+@@ -51,7 +50,6 @@ robolectric_library("junit") {
+     "//base:base_junit_test_support",
+     "//chrome/browser/profiles/android:java",
+     "//chrome/browser/safe_browsing/android:java",
+-    "//chrome/browser/signin/services/android:java",
+     "//components/browser_ui/bottomsheet/android:java",
+     "//components/browser_ui/site_settings/android:java",
      "//components/browser_ui/widget/android:java",
-     "//third_party/androidx:androidx_annotation_annotation_java",
 diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml
 --- a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml
 +++ b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml
-@@ -26,14 +26,6 @@
+@@ -28,14 +28,6 @@ found in the LICENSE file.
              android:src="@drawable/privacy_guide_msbb_image"
              android:importantForAccessibility="no" />
  
@@ -3990,27 +3989,22 @@ diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_
          <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationHeading
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBViewHolder.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBViewHolder.java
---- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBViewHolder.java
-+++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBViewHolder.java
-@@ -6,11 +6,9 @@ package org.chromium.chrome.browser.privacy_guide;
- 
- import android.view.View;
- 
--import androidx.appcompat.widget.SwitchCompat;
- import androidx.recyclerview.widget.RecyclerView;
+diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java
+--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java
++++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java
+@@ -13,7 +13,6 @@ import androidx.appcompat.widget.SwitchCompat;
+ import androidx.fragment.app.Fragment;
  
  import org.chromium.chrome.browser.profiles.Profile;
 -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
  
  /**
-  * Controls the behavior of the MSBB privacy guide page.
-@@ -21,14 +19,5 @@ public class MSBBViewHolder extends RecyclerView.ViewHolder {
-     public MSBBViewHolder(View view) {
-         super(view);
-         mView = view;
--
--        SwitchCompat msbbSwitch = mView.findViewById(R.id.msbb_switch);
+  * Controls the behaviour of the MSBB privacy guide page.
+@@ -27,13 +26,5 @@ public class MSBBFragment extends Fragment {
+ 
+     @Override
+     public void onViewCreated(View view, Bundle savedInstanceState) {
+-        SwitchCompat msbbSwitch = view.findViewById(R.id.msbb_switch);
 -        msbbSwitch.setChecked(UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
 -                Profile.getLastUsedRegularProfile()));
 -
@@ -4490,7 +4484,7 @@ diff --git a/chrome/browser/supervised_user/BUILD.gn b/chrome/browser/supervised
 -      "//chrome/browser/signin/services/android:java",
        "//chrome/browser/ui/android/strings:ui_strings_grd",
        "//components/browser_ui/bottomsheet/android:java",
-       "//components/signin/public/android:java",
+       "//components/browser_ui/widget/android:java",
 diff --git a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
 --- a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
 +++ b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
@@ -4535,7 +4529,7 @@ diff --git a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome
 diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
 --- a/chrome/browser/sync/sync_service_factory.cc
 +++ b/chrome/browser/sync/sync_service_factory.cc
-@@ -79,7 +79,7 @@
+@@ -78,7 +78,7 @@
  #include "chrome/browser/sync/wifi_configuration_sync_service_factory.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -4544,7 +4538,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s
  
  std::unique_ptr<KeyedService> BuildSyncService(
      content::BrowserContext* context) {
-@@ -175,7 +175,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -174,7 +174,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
    return sync_service;
  }
  
@@ -4553,7 +4547,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s
  
  // static
  SyncServiceFactory* SyncServiceFactory::GetInstance() {
-@@ -255,7 +255,7 @@ SyncServiceFactory::~SyncServiceFactory() = default;
+@@ -252,7 +252,7 @@ SyncServiceFactory::~SyncServiceFactory() = default;
  
  KeyedService* SyncServiceFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
@@ -4562,7 +4556,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s
  }
  
  bool SyncServiceFactory::ServiceIsNULLWhileTesting() const {
-@@ -297,9 +297,3 @@ SyncServiceFactory::GetAllSyncServices() {
+@@ -294,9 +294,3 @@ SyncServiceFactory::GetAllSyncServices() {
    }
    return sync_services;
  }
@@ -4583,7 +4577,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
      "//chrome/browser/tab:java",
      "//chrome/browser/tabmodel:java",
      "//chrome/browser/ui/android/favicon:java",
-@@ -444,7 +443,6 @@ robolectric_library("junit") {
+@@ -446,7 +445,6 @@ robolectric_library("junit") {
      "//chrome/browser/profiles/android:java",
      "//chrome/browser/search_engines/android:java",
      "//chrome/browser/share:java",
@@ -4732,7 +4726,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java
 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java
 +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java
-@@ -227,35 +227,8 @@ public abstract class SyncConsentFragmentBase
+@@ -241,35 +241,8 @@ public abstract class SyncConsentFragmentBase
      // this method replaces onSyncAccepted(), the field can be set directly.
      protected void signinAndEnableSync(
              String accountName, boolean settingsClicked, Runnable callback) {
@@ -4770,7 +4764,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
      }
  
      @Override
-@@ -306,10 +279,6 @@ public abstract class SyncConsentFragmentBase
+@@ -320,10 +293,6 @@ public abstract class SyncConsentFragmentBase
                  : ProfileDataCache.createWithDefaultImageSizeAndNoBadge(requireContext());
          mProfileDataCache.addObserver(mProfileDataCacheObserver);
  
@@ -4781,7 +4775,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
          // By default this is set to true so that when system back button is pressed user action
          // is recorded in onDestroy().
          mRecordUndoSignin = true;
-@@ -320,9 +289,6 @@ public abstract class SyncConsentFragmentBase
+@@ -334,9 +303,6 @@ public abstract class SyncConsentFragmentBase
      @Override
      public void onDestroy() {
          super.onDestroy();
@@ -4791,7 +4785,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
          mProfileDataCache.removeObserver(mProfileDataCacheObserver);
          if (mConfirmSyncDataStateMachine != null) {
              mConfirmSyncDataStateMachine.cancel(/* isBeingDestroyed = */ true);
-@@ -671,21 +637,6 @@ public abstract class SyncConsentFragmentBase
+@@ -710,21 +676,6 @@ public abstract class SyncConsentFragmentBase
  
                          // Don't start sign-in if this fragment has been destroyed.
                          if (getActivity().isDestroyed()) return;
@@ -4816,7 +4810,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java
 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java
 +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java
-@@ -120,20 +120,7 @@ public class SyncPromoController {
+@@ -123,20 +123,7 @@ public class SyncPromoController {
       * @param accessPoint The access point for which the impression limit is being checked.
       */
      public static boolean canShowSyncPromo(@AccessPoint int accessPoint) {
@@ -4896,13 +4890,13 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
 -        mModel.set(SigninFirstRunProperties.IS_SIGNIN_SUPPORTED,
 -                ExternalAuthUtils.getInstance().canUseGooglePlayServices()
 -                        && !isSigninDisabledByPolicy);
--        mAllowCrashUpload = !isMetricsReportingDisabledByPolicy;
+-        mAllowMetricsAndCrashUploading = !isMetricsReportingDisabledByPolicy;
 +        mModel.set(SigninFirstRunProperties.IS_SIGNIN_SUPPORTED, false);
-+        mAllowCrashUpload = false;
++        mAllowMetricsAndCrashUploading = false;
  
          mModel.set(SigninFirstRunProperties.FOOTER_STRING,
                  getFooterString(isMetricsReportingDisabledByPolicy));
-@@ -306,41 +304,6 @@ public class SigninFirstRunMediator
+@@ -307,41 +305,6 @@ public class SigninFirstRunMediator
                  TextUtils.equals(mDefaultAccountName, mSelectedAccountName)
                          ? MobileFreProgress.WELCOME_SIGNIN_WITH_DEFAULT_ACCOUNT
                          : MobileFreProgress.WELCOME_SIGNIN_WITH_NON_DEFAULT_ACCOUNT);
@@ -4944,10 +4938,10 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
      }
  
      /**
-@@ -369,26 +332,7 @@ public class SigninFirstRunMediator
+@@ -370,26 +333,9 @@ public class SigninFirstRunMediator
  
          mDelegate.recordFreProgressHistogram(MobileFreProgress.WELCOME_DISMISS);
-         mDelegate.acceptTermsOfService(mAllowCrashUpload);
+         mDelegate.acceptTermsOfService(mAllowMetricsAndCrashUploading);
 -        SigninPreferencesManager.getInstance().temporarilySuppressNewTabPagePromos();
 -        if (IdentityServicesProvider.get()
 -                        .getIdentityManager(Profile.getLastUsedRegularProfile())
@@ -4958,7 +4952,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
 -                    // FirstRunActivity was destroyed while we were waiting for the sign-out.
 -                    return;
 -                }
--
+ 
 -                mDelegate.advanceToNextPage();
 -            };
 -            IdentityServicesProvider.get()
@@ -4968,6 +4962,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
 -        } else {
 -            mDelegate.advanceToNextPage();
 -        }
++        // Bromite: there is no identity provider, always advance to next page
 +        mDelegate.advanceToNextPage();
      }
  
@@ -5022,15 +5017,15 @@ diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc
 diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
 --- a/components/password_manager/core/browser/password_form_manager.cc
 +++ b/components/password_manager/core/browser/password_form_manager.cc
-@@ -39,7 +39,6 @@
- #include "components/password_manager/core/browser/psl_matching_helper.h"
- #include "components/password_manager/core/browser/statistics_table.h"
+@@ -41,7 +41,6 @@
  #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
 -#include "components/signin/public/identity_manager/identity_manager.h"
  #include "google_apis/gaia/core_account_id.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "third_party/abseil-cpp/absl/types/variant.h"
- 
-@@ -261,27 +260,7 @@ bool PasswordFormManager::WasUnblocklisted() const {
+@@ -285,27 +284,7 @@ bool PasswordFormManager::WasUnblocklisted() const {
  }
  
  bool PasswordFormManager::IsMovableToAccountStore() const {
@@ -5059,7 +5054,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b
  }
  
  void PasswordFormManager::Save() {
-@@ -446,17 +425,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() {
+@@ -470,17 +449,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() {
  void PasswordFormManager::BlockMovingCredentialsToAccountStore() {
    // Nothing to do if there is no signed in user or the credentials are already
    // blocked for moving.
diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch
index fea46577..4f1cffe0 100644
--- a/build/patches/Remove-voice-recognition-integration.patch
+++ b/build/patches/Remove-voice-recognition-integration.patch
@@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -376,8 +376,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+@@ -374,8 +374,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
  
              // Initialize
              // Note that isVoiceSearchEnabled will return false in incognito mode.
@@ -38,7 +38,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
              boolean shouldShowLensButton = mOmniboxStub.isLensEnabled(LensEntryPoint.TASKS_SURFACE);
              LensMetrics.recordShown(LensEntryPoint.TASKS_SURFACE, shouldShowLensButton);
              mPropertyModel.set(IS_LENS_BUTTON_VISIBLE, shouldShowLensButton);
-@@ -1003,10 +1002,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+@@ -1073,10 +1072,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
          // incorrect state if check synchronously.
          ThreadUtils.postOnUiThread(() -> {
              if (mOmniboxStub != null) {
@@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
          }
  
          @Override
-@@ -743,12 +724,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -742,12 +723,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
                  mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger);
              }
          }
@@ -202,7 +202,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
      }
  
      @Override
-@@ -759,11 +734,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -758,11 +733,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
          }
      }
  
@@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
      /** Adds an observer to be notified on most visited tile clicks. */
      public void addMostVisitedTileClickObserver(MostVisitedTileClickObserver observer) {
          mMostVisitedTileClickObservers.addObserver(observer);
-@@ -793,9 +763,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -792,9 +762,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
                      /*isIncognito=*/false, // NTP is not displayed in incognito.
                      mBottomSheetController);
          }
@@ -224,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
      }
  
      /** Records UMA for the NTP being hidden and the time spent on it. */
-@@ -804,7 +771,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -803,7 +770,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
          RecordHistogram.recordMediumTimesHistogram("NewTabPage.TimeSpent",
                  (System.nanoTime() - mLastShownTimeNs) / TimeUtils.NANOSECONDS_PER_MILLISECOND);
          SuggestionsMetrics.recordSurfaceHidden();
@@ -232,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
      }
  
      /**
-@@ -903,9 +869,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+@@ -902,9 +868,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
          }
          mFeedSurfaceProvider.destroy();
          mTab.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager);
@@ -331,7 +331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
-@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxFeatures;
+@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxFeatures;
  import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
  import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
  import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
@@ -339,7 +339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
  import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.tab.Tab;
-@@ -332,14 +331,12 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -333,14 +332,12 @@ public class SearchActivity extends AsyncInitializationActivity
          //                will navigate to Tabbed mode.  Investigate whether this can inflate
          //                the tabbed mode layout in the background instead of CCTs.
          CustomTabsConnection.getInstance().warmup(0);
@@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
          RecordUserAction.record("SearchWidget.WidgetSelected");
  
          getActivityDelegate().onFinishDeferredInitialization();
-@@ -410,8 +407,7 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -411,8 +408,7 @@ public class SearchActivity extends AsyncInitializationActivity
          if (isFromQuickActionSearchWidget()) {
              recordQuickActionSearchType(searchType);
          }
@@ -368,7 +368,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
-@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState;
+@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState;
  import org.chromium.chrome.browser.omnibox.UrlBarData;
  import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
@@ -376,7 +376,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
  import org.chromium.chrome.browser.toolbar.top.ToolbarPhone;
  import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager;
  import org.chromium.ui.base.DeviceFormFactor;
-@@ -68,7 +67,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -82,7 +81,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
  
      /** Called when the SearchActivity has finished initialization. */
      void onDeferredStartup(@SearchType int searchType,
@@ -384,7 +384,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
              @NonNull WindowAndroid windowAndroid) {
          mAutocompleteCoordinator.prefetchZeroSuggestResults();
  
-@@ -83,7 +81,7 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -97,7 +95,7 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
          }
  
          if (mPendingBeginQuery) {
@@ -393,7 +393,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
              mPendingBeginQuery = false;
          }
      }
-@@ -92,12 +90,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -106,12 +104,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
       * Begins a new query.
       * @param searchType The type of search to invoke.
       * @param optionalText Prepopulate with a query, this may be null.
@@ -406,7 +406,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
              @NonNull WindowAndroid windowAndroid) {
          // Clear the text regardless of the promo decision.  This allows the user to enter text
          // before native has been initialized and have it not be cleared one the delayed beginQuery
-@@ -111,11 +107,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -125,11 +121,10 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
              return;
          }
  
@@ -419,7 +419,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
              @NonNull WindowAndroid windowAndroid) {
          assert !mPendingSearchPromoDecision;
  
-@@ -125,7 +120,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -139,7 +134,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
          }
  
          if (searchType == SearchType.VOICE) {
@@ -427,7 +427,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
          } else if (searchType == SearchType.LENS) {
              runGoogleLens(windowAndroid);
          } else {
-@@ -133,33 +127,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -147,33 +141,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
          }
      }
  
@@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
      /**
       * Begins a new Lens query.
       *
-@@ -213,9 +180,4 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
+@@ -227,9 +194,4 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
              mAutocompleteCoordinator.startCachedZeroSuggest();
          });
      }
@@ -474,7 +474,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -89,7 +89,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
+@@ -88,7 +88,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
  import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
  import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
  import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
@@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.page_info.ChromePageInfo;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
-@@ -2051,11 +2050,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -2041,11 +2040,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
          return mLocationBar.getOmniboxStub();
      }
  
@@ -497,7 +497,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -87,8 +87,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
+@@ -88,8 +88,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
  import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
  import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
  import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
@@ -506,7 +506,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -266,7 +264,6 @@ public class RootUiCoordinator
+@@ -269,7 +267,6 @@ public class RootUiCoordinator
      protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
      protected Supplier<Tab> mStartSurfaceParentTabSupplier;
      @Nullable
@@ -514,7 +514,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
      private MediaCaptureOverlayController mCaptureController;
      private @Nullable ScrollCaptureManager mScrollCaptureManager;
      protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
-@@ -541,9 +538,6 @@ public class RootUiCoordinator
+@@ -544,9 +541,6 @@ public class RootUiCoordinator
          }
  
          if (mToolbarManager != null) {
@@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
              mToolbarManager.destroy();
              mToolbarManager = null;
          }
-@@ -1077,19 +1071,11 @@ public class RootUiCoordinator
+@@ -1084,19 +1078,11 @@ public class RootUiCoordinator
                      new VoiceToolbarButtonController.VoiceSearchDelegate() {
                          @Override
                          public boolean isVoiceSearchEnabled() {
@@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
                          }
                      };
              VoiceToolbarButtonController voiceToolbarButtonController =
-@@ -1137,13 +1123,6 @@ public class RootUiCoordinator
+@@ -1144,13 +1130,6 @@ public class RootUiCoordinator
              if (!mSupportsAppMenuSupplier.getAsBoolean()) {
                  mToolbarManager.getToolbar().disableMenuButton();
              }
@@ -609,7 +609,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-@@ -347,13 +346,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -360,13 +359,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
          return mLocationBarLayout.getSecurityIconView();
      }
  
@@ -623,7 +623,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      @Nullable
      @Override
      public OmniboxStub getOmniboxStub() {
-@@ -619,11 +611,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -632,11 +624,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
  
      // End tablet-specific methods.
  
@@ -751,7 +751,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      }
  
      /** package */ void lensButtonClicked(View view) {
-@@ -939,28 +899,6 @@ class LocationBarMediator
+@@ -936,28 +896,6 @@ class LocationBarMediator
          }
      }
  
@@ -780,7 +780,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      /**
       * Update visuals to use a correct color scheme depending on the primary color.
       */
-@@ -1047,8 +985,7 @@ class LocationBarMediator
+@@ -1044,8 +982,7 @@ class LocationBarMediator
  
      private boolean shouldShowMicButton() {
          if (shouldShowDeleteButton()) return false;
@@ -790,7 +790,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              return false;
          }
          boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
-@@ -1211,9 +1148,6 @@ class LocationBarMediator
+@@ -1203,9 +1140,6 @@ class LocationBarMediator
      public void onPrimaryColorChanged() {
          // This method needs to be called first as it computes |mBrandedColorScheme|.
          updateBrandedColorScheme();
@@ -800,7 +800,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      }
  
      @Override
-@@ -1285,16 +1219,6 @@ class LocationBarMediator
+@@ -1277,16 +1211,6 @@ class LocationBarMediator
          }
      }
  
@@ -817,7 +817,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      @Override
      public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
          mUrlFocusChangeListeners.addObserver(listener);
-@@ -1310,37 +1234,10 @@ class LocationBarMediator
+@@ -1302,37 +1226,10 @@ class LocationBarMediator
          return mUrlHasFocus;
      }
  
@@ -855,7 +855,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      public void setSearchQuery(String query) {
          if (TextUtils.isEmpty(query)) return;
  
-@@ -1359,17 +1256,14 @@ class LocationBarMediator
+@@ -1351,17 +1248,14 @@ class LocationBarMediator
          mUrlCoordinator.setKeyboardVisibility(true, false);
      }
  
diff --git a/build/patches/Remove-window-name-on-cross-origin-navigation.patch b/build/patches/Remove-window-name-on-cross-origin-navigation.patch
index 4cc560ce..9b7569fb 100644
--- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch
+++ b/build/patches/Remove-window-name-on-cross-origin-navigation.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -2395,7 +2395,7 @@ void DocumentLoader::CommitNavigation() {
+@@ -2398,7 +2398,7 @@ void DocumentLoader::CommitNavigation() {
      // that the name would be nulled and if the name is accessed after we will
      // fire a UseCounter. If we decide to move forward with this change, we'd
      // actually clean the name here.
@@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
      frame_->Tree().ExperimentalSetNulledName();
    }
  
-@@ -2406,6 +2406,7 @@ void DocumentLoader::CommitNavigation() {
+@@ -2409,6 +2409,7 @@ void DocumentLoader::CommitNavigation() {
      // TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just
      // record the fact that the name would be nulled and if the name is accessed
      // after we will fire a UseCounter.
diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
index 50be5a4a..9a959d39 100644
--- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch
+++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8660,6 +8660,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8870,6 +8870,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kPervasiveSystemAccentColorDescription, kOsWin,
       SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)},
  #endif
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2624,6 +2624,11 @@
+@@ -2673,6 +2673,11 @@
      //  with neural net palm detection.
      "expiry_milestone": 90
    },
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3881,6 +3881,11 @@ const char kSendTabToSelfV2Description[] =
+@@ -3978,6 +3978,11 @@ const char kSendTabToSelfV2Description[] =
      "Enables new received tab "
      "UI shown next to the profile icon instead of using system notifications.";
  
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2210,6 +2210,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[];
+@@ -2267,6 +2267,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[];
  extern const char kSendTabToSelfV2Name[];
  extern const char kSendTabToSelfV2Description[];
  
@@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -265,6 +265,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kReachedCodeProfiler,
      &kReaderModeInCCT,
      &kReengagementNotification,
@@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kRelatedSearches,
      &kRelatedSearchesAlternateUx,
      &kRelatedSearchesInBar,
-@@ -774,6 +775,9 @@ const base::Feature kRequestDesktopSiteDefaults{
+@@ -806,6 +807,9 @@ const base::Feature kRequestDesktopSiteDefaultsDowngrade{
  const base::Feature kSafeModeForCachedFlags{"SafeModeForCachedFlags",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -130,6 +130,7 @@ extern const base::Feature kRequestDesktopSiteDefaults;
+@@ -136,6 +136,7 @@ extern const base::Feature kRequestDesktopSiteDefaultsDowngrade;
  extern const base::Feature kSearchEnginePromoExistingDevice;
  extern const base::Feature kSearchEnginePromoExistingDeviceV2;
  extern const base::Feature kSearchEnginePromoNewDevice;
@@ -110,7 +110,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -415,6 +415,7 @@ public abstract class ChromeFeatureList {
+@@ -418,6 +418,7 @@ public abstract class ChromeFeatureList {
      public static final String MESSAGES_FOR_ANDROID_STACKING_ANIMATION =
              "MessagesForAndroidStackingAnimation";
      public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError";
diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch
index 88e005c3..0d302497 100644
--- a/build/patches/Restore-Simplified-NTP-launch.patch
+++ b/build/patches/Restore-Simplified-NTP-launch.patch
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -558,6 +558,7 @@ chrome_java_resources = [
+@@ -554,6 +554,7 @@ chrome_java_resources = [
    "java/res/layout/new_tab_page_incognito.xml",
    "java/res/layout/new_tab_page_layout.xml",
    "java/res/layout/new_tab_page_tile_grid_placeholder.xml",
@@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -536,6 +536,7 @@ chrome_java_sources = [
+@@ -538,6 +538,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java",
    "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java",
    "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/res/layout/new_tab_page_layout.xml b/chrome/android/java/res/layout/new_tab_page_layout.xml
 --- a/chrome/android/java/res/layout/new_tab_page_layout.xml
 +++ b/chrome/android/java/res/layout/new_tab_page_layout.xml
-@@ -51,6 +51,13 @@
+@@ -53,6 +53,13 @@ found in the LICENSE file.
          android:layout_marginTop="16dp"
          android:visibility="gone"/>
  
@@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
  import org.chromium.chrome.browser.lens.LensMetrics;
  import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
  import org.chromium.chrome.browser.logo.LogoBridge.Logo;
-@@ -113,6 +114,8 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -110,6 +111,8 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
      private UiConfig mUiConfig;
      private CallbackController mCallbackController = new CallbackController();
  
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
      /**
       * Whether the tiles shown in the layout have finished loading.
       * With {@link #mHasShownView}, it's one of the 2 flags used to track initialisation progress.
-@@ -228,6 +231,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -219,6 +222,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
          initializeMostVisitedTilesCoordinator(profile, lifecycleDispatcher, tileGroupDelegate,
                  touchEnabledDelegate, isScrollableMvtEnabled(), searchProviderIsGoogle);
          initializeSearchBoxBackground();
@@ -233,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
          initializeSearchBoxTextView();
          initializeVoiceSearchButton();
          initializeLensButton();
-@@ -556,15 +560,21 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -529,15 +533,21 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
                      R.dimen.ntp_header_lateral_paddings_v2);
              marginLayoutParams.leftMargin = -lateralPaddingsForNTP;
              marginLayoutParams.rightMargin = -lateralPaddingsForNTP;
@@ -257,7 +257,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
              marginLayoutParams.bottomMargin = getGridMvtBottomMargin();
          }
      }
-@@ -905,6 +915,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -874,6 +884,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
          return iphCommandBuilder;
      }
  
@@ -317,7 +317,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4737,6 +4737,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4827,6 +4827,9 @@ const FeatureEntry kFeatureEntries[] = {
       SINGLE_VALUE_TYPE_AND_VALUE(
           switches::kForceShowUpdateMenuItemCustomSummary,
           "Custom Summary")},
@@ -330,7 +330,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3927,6 +3927,9 @@ const char kStartSurfaceRefactorName[] = "Start Surface Refactor";
+@@ -4024,6 +4024,9 @@ const char kStartSurfaceRefactorName[] = "Start Surface Refactor";
  const char kStartSurfaceRefactorDescription[] =
      "Enable splitting Tab switcher from Start surface";
  
@@ -343,7 +343,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2225,6 +2225,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[];
+@@ -2282,6 +2282,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[];
  extern const char kSmartSuggestionForLargeDownloadsName[];
  extern const char kSmartSuggestionForLargeDownloadsDescription[];
  
@@ -356,7 +356,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -237,6 +237,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -238,6 +238,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kGridTabSwitcherForTablets,
      &kHandleMediaIntents,
      &kImmersiveUiMode,
@@ -364,7 +364,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kIncognitoReauthenticationForAndroid,
      &kIncognitoScreenshot,
      &kInfobarScrollOptimization,
-@@ -716,6 +717,9 @@ const base::Feature kNotificationPermissionVariant{
+@@ -728,6 +729,9 @@ const base::Feature kNotificationPermissionVariant{
  const base::Feature kInstanceSwitcher{"InstanceSwitcher",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -388,7 +388,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -404,6 +404,7 @@ public abstract class ChromeFeatureList {
+@@ -407,6 +407,7 @@ public abstract class ChromeFeatureList {
      public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked";
      public static final String MESSAGES_FOR_ANDROID_CHROME_SURVEY =
              "MessagesForAndroidChromeSurvey";
@@ -421,7 +421,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
 --- a/testing/variations/fieldtrial_testing_config.json
 +++ b/testing/variations/fieldtrial_testing_config.json
-@@ -5069,6 +5069,24 @@
+@@ -5091,6 +5091,24 @@
              ]
          }
      ],
diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch
index 845eb011..a1f75600 100644
--- a/build/patches/Restore-offline-indicator-v2-flag.patch
+++ b/build/patches/Restore-offline-indicator-v2-flag.patch
@@ -103,7 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -767,7 +767,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -768,7 +768,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) {
          // TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra
          // things for tablets.
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              return;
          }
  
-@@ -788,6 +789,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -790,6 +791,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
          mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver);
          mStatusIndicatorCoordinator.addObserver(mStatusBarColorController);
  
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4668,6 +4668,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4755,6 +4755,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOfflinePagesLivePageSharingName,
       flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -141,7 +141,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -4688,6 +4688,11 @@
+@@ -4800,6 +4800,11 @@
      "owners": [ "adamta", "sczs" ],
      "expiry_milestone": 98
    },
@@ -156,7 +156,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3706,6 +3706,10 @@ const char kNotificationPermissionRationaleDescription[] =
+@@ -3788,6 +3788,10 @@ const char kNotificationPermissionRationaleDescription[] =
      "Configure the dialog shown before requesting notification permission. "
      "Only works with builds targeting Android T.";
  
@@ -170,7 +170,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2114,6 +2114,9 @@ extern const char kNewWindowAppMenuDescription[];
+@@ -2163,6 +2163,9 @@ extern const char kNewWindowAppMenuDescription[];
  extern const char kNotificationPermissionRationaleName[];
  extern const char kNotificationPermissionRationaleDescription[];
  
@@ -183,7 +183,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -254,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kNewTabPageTilesTitleWrapAround,
      &kNewWindowAppMenu,
      &kNotificationPermissionVariant,
@@ -191,7 +191,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kPageAnnotationsService,
      &kInlineUpdateFlow,
      &kBookmarksImprovedSaveFlow,
-@@ -732,6 +733,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher",
+@@ -744,6 +745,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher",
  const base::Feature kSimplifiedNTP{"SimplifiedNTP",
                                     base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -215,7 +215,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -430,6 +430,7 @@ public abstract class ChromeFeatureList {
+@@ -433,6 +433,7 @@ public abstract class ChromeFeatureList {
      public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu";
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String OFFLINE_INDICATOR = "OfflineIndicator";
diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch
index df889742..00c629cf 100644
--- a/build/patches/Revert-Delete-block-external-form-redirects.patch
+++ b/build/patches/Revert-Delete-block-external-form-redirects.patch
@@ -6,21 +6,21 @@ This reverts commit b710cefb53b558a8bcd884f6baf0229ba4225721.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                 |  7 +++++++
- chrome/browser/flag-metadata.json             |  5 +++++
- chrome/browser/flag_descriptions.cc           |  6 ++++++
- chrome/browser/flag_descriptions.h            |  3 +++
- .../android/external_intents_features.cc      |  7 ++++++-
- .../android/external_intents_features.h       |  1 +
- .../ExternalIntentsFeatures.java              |  6 ++++++
- .../ExternalNavigationHandler.java            | 19 +++++++++++++++++++
- .../ExternalNavigationHandlerTest.java        | 11 +++++++----
- 9 files changed, 60 insertions(+), 5 deletions(-)
+ chrome/browser/about_flags.cc                   |  7 +++++++
+ chrome/browser/flag-metadata.json               |  4 ++++
+ chrome/browser/flag_descriptions.cc             |  6 ++++++
+ chrome/browser/flag_descriptions.h              |  3 +++
+ .../android/external_intents_features.cc        |  6 +++++-
+ .../android/external_intents_features.h         |  1 +
+ .../ExternalIntentsFeatures.java                |  6 ++++++
+ .../ExternalNavigationHandler.java              | 17 +++++++++++++++++
+ .../ExternalNavigationHandlerTest.java          | 11 +++++++----
+ 9 files changed, 56 insertions(+), 5 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -233,6 +233,7 @@
+@@ -235,6 +235,7 @@
  #include "components/browser_ui/photo_picker/android/features.h"
  #include "components/content_creation/notes/core/note_features.h"
  #include "components/content_creation/reactions/core/reactions_features.h"
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/translate/content/android/translate_message.h"
  #else  // BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h"
-@@ -7233,6 +7234,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7373,6 +7374,12 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_ANDROID)
@@ -44,13 +44,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -653,6 +653,11 @@
+@@ -683,6 +683,10 @@
      "owners": [ "ioanap", "vsemeniuk@google.com" ],
      "expiry_milestone": 108
    },
 +  {
 +    "name": "block-external-form-redirects-no-gesture",
-+    "owners": [ "jochen", "tedchoc" ],
 +    "expiry_milestone": -1
 +  },
    {
@@ -59,7 +58,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3565,6 +3565,12 @@ const char kInstantStartName[] = "Instant start";
+@@ -3647,6 +3647,12 @@ const char kInstantStartName[] = "Instant start";
  const char kInstantStartDescription[] =
      "Show start surface before native library is loaded.";
  
@@ -75,7 +74,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2022,6 +2022,9 @@ extern const char kInstanceSwitcherDescription[];
+@@ -2071,6 +2071,9 @@ extern const char kInstanceSwitcherDescription[];
  extern const char kInstantStartName[];
  extern const char kInstantStartDescription[];
  
@@ -88,19 +87,18 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
 --- a/components/external_intents/android/external_intents_features.cc
 +++ b/components/external_intents/android/external_intents_features.cc
-@@ -19,7 +19,8 @@ namespace {
+@@ -19,7 +19,7 @@ namespace {
  // Array of features exposed through the Java ExternalIntentsFeatures API.
  const base::Feature* kFeaturesExposedToJava[] = {
      &kAutofillAssistantGoogleInitiatorOriginCheck,
--    &kScaryExternalNavigationRefactoring};
-+    &kScaryExternalNavigationRefactoring,
-+    &kIntentBlockExternalFormRedirectsNoGesture};
+-    &kExternalNavigationDebugLogs, &kScaryExternalNavigationRefactoring};
++    &kExternalNavigationDebugLogs, &kScaryExternalNavigationRefactoring, &kIntentBlockExternalFormRedirectsNoGesture};
  
  }  // namespace
  
-@@ -31,6 +32,10 @@ const base::Feature kAutofillAssistantGoogleInitiatorOriginCheck{
-     "AutofillAssistantGoogleInitiatorOriginCheck",
-     base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -34,6 +34,10 @@ const base::Feature kAutofillAssistantGoogleInitiatorOriginCheck{
+ const base::Feature kExternalNavigationDebugLogs{
+     "ExternalNavigationDebugLogs", base::FEATURE_DISABLED_BY_DEFAULT};
  
 +const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
 +    "IntentBlockExternalFormRedirectsNoGesture",
@@ -117,9 +115,9 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c
  // Alphabetical:
  extern const base::Feature kAutofillAssistantGoogleInitiatorOriginCheck;
 +extern const base::Feature kIntentBlockExternalFormRedirectsNoGesture;
+ extern const base::Feature kExternalNavigationDebugLogs;
  extern const base::Feature kScaryExternalNavigationRefactoring;
  
- }  // namespace external_intents
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
@@ -135,11 +133,11 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 +
      public static final String AUTOFILL_ASSISTANT_GOOGLE_INITIATOR_ORIGIN_CHECK_NAME =
              "AutofillAssistantGoogleInitiatorOriginCheck";
-     public static final String SCARY_EXTERNAL_NAVIGATION_REFACTORING_NAME =
+     public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -764,6 +764,12 @@ public class ExternalNavigationHandler {
+@@ -881,6 +881,12 @@ public class ExternalNavigationHandler {
          return false;
      }
  
@@ -152,7 +150,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
      /**
       * http://crbug.com/149218: We want to show the intent picker for ordinary links, providing
       * the link is not an incoming intent from another application, unless it's a redirect.
-@@ -805,6 +811,19 @@ public class ExternalNavigationHandler {
+@@ -922,6 +928,17 @@ public class ExternalNavigationHandler {
              return false;
          }
  
@@ -162,10 +160,8 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 +        //                not break the world.
 +        if (isRedirectFromFormSubmit && !incomingIntentRedirect && !params.hasUserGesture()
 +                && blockExternalFormRedirectsWithoutGesture()) {
-+            if (DEBUG) {
-+                Log.i(TAG,
-+                        "Incoming form intent attempting to redirect without "
-+                                + "user gesture");
++            if (debug()) {
++                Log.i(TAG, "Incoming form intent attempting to redirect without user gesture");
 +            }
 +            return false;
 +        }
@@ -175,7 +171,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 diff --git a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
 --- a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
 +++ b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
-@@ -332,14 +332,12 @@ public class ExternalNavigationHandlerTest {
+@@ -338,14 +338,12 @@ public class ExternalNavigationHandlerTest {
                  .withPageTransition(PageTransition.FORM_SUBMIT)
                  .withIsRedirect(true)
                  .withHasUserGesture(false)
@@ -192,7 +188,7 @@ diff --git a/components/external_intents/android/javatests/src/org/chromium/comp
      }
  
      @Test
-@@ -2902,6 +2900,11 @@ public class ExternalNavigationHandlerTest {
+@@ -2908,6 +2906,11 @@ public class ExternalNavigationHandlerTest {
                      && !packageName.equals(INVALID_WEBAPK_PACKAGE_NAME);
          }
  
diff --git a/build/patches/Revert-clipboard-user-gesture-requirement-removal.patch b/build/patches/Revert-clipboard-user-gesture-requirement-removal.patch
deleted file mode 100644
index b64231f1..00000000
--- a/build/patches/Revert-clipboard-user-gesture-requirement-removal.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 4 Sep 2022 19:26:02 +0200
-Subject: Revert clipboard user gesture requirement removal
-
-This reverts commit 4d7b74b051abfe5945f418601fdc2ffc8ce3072c.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../blink/renderer/modules/clipboard/clipboard_promise.cc | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
---- a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
-+++ b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
-@@ -542,13 +542,7 @@ void ClipboardPromise::RequestPermission(
-       LocalFrame::HasTransientUserActivation(GetLocalFrame());
-   base::UmaHistogramBoolean("Blink.Clipboard.HasTransientUserActivation",
-                             has_transient_user_activation);
--  // `allow_without_sanitization` is true only when we are trying to read/write
--  // web custom formats.
--  // TODO(crbug.com/1334203): Remove the `allow_without_sanitization` check.
--  // Currently NTP relies on readText & writeText to be called without any user
--  // gesture.
--  if (allow_without_sanitization &&
--      RuntimeEnabledFeatures::ClipboardCustomFormatsEnabled() &&
-+  if (RuntimeEnabledFeatures::ClipboardCustomFormatsEnabled() &&
-       !has_transient_user_activation) {
-     script_promise_resolver_->Reject(MakeGarbageCollected<DOMException>(
-         DOMExceptionCode::kSecurityError,
---
-2.25.1
diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
index 0797a18d..3950ee78 100644
--- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
+++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
@@ -8,17 +8,17 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/browser/about_flags.cc       | 4 ++++
- chrome/browser/flag-metadata.json   | 5 +++++
+ chrome/browser/flag-metadata.json   | 4 ++++
  chrome/browser/flag_descriptions.cc | 4 ++++
  chrome/browser/flag_descriptions.h  | 3 +++
- 4 files changed, 16 insertions(+)
+ 4 files changed, 15 insertions(+)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4100,6 +4100,10 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsWin | kOsLinux | kOsLacros | kOsAndroid,
-      FEATURE_VALUE_TYPE(features::kVulkan)},
+@@ -4224,6 +4224,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableVulkanDescription,
+      kOsWin | kOsLinux | kOsAndroid, FEATURE_VALUE_TYPE(features::kVulkan)},
  #if BUILDFLAG(IS_ANDROID)
 +    {switches::kDisablePullToRefreshEffect,
 +     flag_descriptions::kDisablePullToRefreshEffectName,
@@ -30,13 +30,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -1375,6 +1375,11 @@
+@@ -1415,6 +1415,10 @@
        "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
      "expiry_milestone": 110
    },
 +  {
 +    "name": "disable-pull-to-refresh-effect",
-+    // "owners": [ "your-team" ],
 +    "expiry_milestone": -1
 +  },
    {
@@ -45,7 +44,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3759,6 +3759,10 @@ const char kReadLaterDescription[] =
+@@ -3844,6 +3844,10 @@ const char kReadLaterDescription[] =
      "Allow users to save tabs for later. Enables a new button and menu for "
      "accessing tabs saved for later.";
  
@@ -59,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2141,6 +2141,9 @@ extern const char kQueryTilesSegmentationDescription[];
+@@ -2192,6 +2192,9 @@ extern const char kQueryTilesSegmentationDescription[];
  extern const char kQueryTilesSwapTrendingName[];
  extern const char kQueryTilesSwapTrendingDescription[];
  
diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch
index c056e53a..e2f96ee2 100644
--- a/build/patches/Revert-flags-remove-num-raster-threads.patch
+++ b/build/patches/Revert-flags-remove-num-raster-threads.patch
@@ -7,15 +7,15 @@ This reverts commit 2a51528a1737e9038f7f96f29403032a6a845a25.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/browser/about_flags.cc       | 12 ++++++++++++
- chrome/browser/flag-metadata.json   |  5 +++++
+ chrome/browser/flag-metadata.json   |  4 ++++
  chrome/browser/flag_descriptions.cc |  8 ++++++++
  chrome/browser/flag_descriptions.h  |  7 +++++++
- 4 files changed, 32 insertions(+)
+ 4 files changed, 31 insertions(+)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -352,6 +352,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
+@@ -354,6 +354,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
       "single-fullscreen,single-on-top,underlay"},
  };
  
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
      {flag_descriptions::kTouchSelectionStrategyCharacter,
-@@ -4347,6 +4356,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4444,6 +4453,9 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)},
  #endif
  #if BUILDFLAG(IS_ANDROID)
@@ -44,22 +44,21 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -4493,6 +4493,11 @@
-     "owners": [ "aaronhk", "fserb", "juanmihd", "yiyix" ],
-     "expiry_milestone": 100
+@@ -4493,6 +4493,10 @@
+     "owners": [ "pavely", "lazzzis" ],
+     "expiry_milestone": 105
    },
 +  {
 +    "name": "num-raster-threads",
-+    // "owners": [ "your-team" ],
 +    "expiry_milestone": -1
 +  },
    {
-     "name": "new-content-suggestions-feed",
-     "owners": [ "adamta@google.com", "sczs", "gogerald", "bling-flags@google.com" ],
+     "name": "messages-preinstall",
+     "owners": [ "jonmann", "jshikaram" ],
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1884,6 +1884,14 @@ const char kOmitCorsClientCertDescription[] =
+@@ -1905,6 +1905,14 @@ const char kOmitCorsClientCertDescription[] =
      "credential mode disallows. Without this flag enabled, Chrome will always "
      "try sending client certificates regardless of the credential mode.";
  
@@ -77,7 +76,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1076,6 +1076,13 @@ extern const char kOriginAgentClusterDefaultDescription[];
+@@ -1081,6 +1081,13 @@ extern const char kOriginAgentClusterDefaultDescription[];
  extern const char kOmitCorsClientCertName[];
  extern const char kOmitCorsClientCertDescription[];
  
diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch
index eab43da7..2b8f2ac8 100644
--- a/build/patches/Revert-removal-of-execution-context-address-space.patch
+++ b/build/patches/Revert-removal-of-execution-context-address-space.patch
@@ -17,7 +17,7 @@ This reverts commit 11f6a3e29bee9a6590a4fd56b28e8048200c18d0.
 Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../renderer_host/policy_container_host.cc    |  2 +-
+ .../renderer_host/policy_container_host.cc    |  3 +-
  content/renderer/policy_container_util.cc     |  1 +
  .../public/mojom/frame/policy_container.mojom |  3 ++
  .../public/platform/web_policy_container.h    |  2 ++
@@ -57,20 +57,28 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../audio_worklet_global_scope_test.cc        |  1 +
  .../webaudio/audio_worklet_thread_test.cc     |  1 +
  .../worklet/worklet_thread_test_common.cc     |  2 +-
- 40 files changed, 197 insertions(+), 25 deletions(-)
+ 40 files changed, 198 insertions(+), 25 deletions(-)
 
 diff --git a/content/browser/renderer_host/policy_container_host.cc b/content/browser/renderer_host/policy_container_host.cc
 --- a/content/browser/renderer_host/policy_container_host.cc
 +++ b/content/browser/renderer_host/policy_container_host.cc
-@@ -221,7 +221,7 @@ PolicyContainerHost::CreatePolicyContainerForBlink() {
-   return blink::mojom::PolicyContainer::New(
-       blink::mojom::PolicyContainerPolicies::New(
-           policies_.cross_origin_embedder_policy.value,
--          policies_.referrer_policy,
-+          policies_.referrer_policy, policies_.ip_address_space,
-           mojo::Clone(policies_.content_security_policies),
-           policies_.is_anonymous, policies_.sandbox_flags),
-       std::move(remote));
+@@ -134,6 +134,7 @@ PolicyContainerPolicies::PolicyContainerPolicies(
+     const blink::mojom::PolicyContainerPolicies& policies) {
+   cross_origin_embedder_policy.value = policies.cross_origin_embedder_policy;
+   referrer_policy = policies.referrer_policy;
++  ip_address_space = policies.ip_address_space;
+   content_security_policies = mojo::Clone(policies.content_security_policies);
+   is_anonymous = policies.is_anonymous;
+   sandbox_flags = policies.sandbox_flags;
+@@ -188,7 +189,7 @@ void PolicyContainerPolicies::AddContentSecurityPolicies(
+ blink::mojom::PolicyContainerPoliciesPtr
+ PolicyContainerPolicies::ToMojoPolicyContainerPolicies() const {
+   return blink::mojom::PolicyContainerPolicies::New(
+-      cross_origin_embedder_policy.value, referrer_policy,
++      cross_origin_embedder_policy.value, referrer_policy, ip_address_space,
+       mojo::Clone(content_security_policies), is_anonymous, sandbox_flags);
+ }
+ 
 diff --git a/content/renderer/policy_container_util.cc b/content/renderer/policy_container_util.cc
 --- a/content/renderer/policy_container_util.cc
 +++ b/content/renderer/policy_container_util.cc
@@ -124,7 +132,7 @@ diff --git a/third_party/blink/public/platform/web_policy_container.h b/third_pa
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -530,6 +530,15 @@ void ExecutionContext::SetReferrerPolicy(
+@@ -553,6 +553,15 @@ void ExecutionContext::SetReferrerPolicy(
    policy_container_->UpdateReferrerPolicy(referrer_policy);
  }
  
@@ -151,7 +159,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
  #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "third_party/blink/public/common/tokens/tokens.h"
-@@ -387,6 +388,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -392,6 +393,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
        const String& message = g_empty_string,
        const String& source_file = g_empty_string) const {}
  
@@ -237,7 +245,7 @@ diff --git a/third_party/blink/renderer/core/frame/policy_container.h b/third_pa
 diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
 --- a/third_party/blink/renderer/core/frame/web_frame_test.cc
 +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -7948,6 +7948,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) {
+@@ -8002,6 +8002,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) {
    EXPECT_EQ(client.StopLoadingCount(), 2);
  }
  
@@ -304,7 +312,7 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/installed_servi
 diff --git a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
 --- a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
 +++ b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
-@@ -210,6 +210,7 @@ void ModuleScriptLoaderTest::InitializeForWorklet() {
+@@ -208,6 +208,7 @@ void ModuleScriptLoaderTest::InitializeForWorklet() {
        network::mojom::ReferrerPolicy::kDefault, security_origin_.get(),
        true /* is_secure_context */, HttpsState::kModern,
        nullptr /* worker_clients */, nullptr /* content_settings_client */,
@@ -805,7 +813,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h
 +#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
  #include "testing/gmock/include/gmock/gmock.h"
  #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
- #include "third_party/blink/renderer/bindings/core/v8/source_location.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_gc_controller.h"
 @@ -65,11 +66,15 @@ class FakeWorkerGlobalScope : public WorkerGlobalScope {
    void Initialize(
        const KURL& response_url,
@@ -859,7 +867,7 @@ diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_imp
 diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
 --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
 +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
-@@ -449,6 +449,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
+@@ -453,6 +453,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
    // is set, and with the following callback steps given evaluationStatus:"
    RunClassicScript(
        classic_script_loader->ResponseURL(), referrer_policy,
@@ -867,7 +875,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl
        classic_script_loader->GetContentSecurityPolicy()
            ? mojo::Clone(classic_script_loader->GetContentSecurityPolicy()
                              ->GetParsedPolicies())
-@@ -462,6 +463,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
+@@ -466,6 +467,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
  void ServiceWorkerGlobalScope::Initialize(
      const KURL& response_url,
      network::mojom::ReferrerPolicy response_referrer_policy,
@@ -875,7 +883,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl
      Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
      const Vector<String>* response_origin_trial_tokens) {
    // Step 4.5. "Set workerGlobalScope's url to serviceWorker's script url."
-@@ -475,6 +477,9 @@ void ServiceWorkerGlobalScope::Initialize(
+@@ -479,6 +481,9 @@ void ServiceWorkerGlobalScope::Initialize(
    // script resource's referrer policy."
    SetReferrerPolicy(response_referrer_policy);
  
@@ -885,7 +893,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl
    // This is quoted from the "Content Security Policy" algorithm in the service
    // workers spec:
    // "Whenever a user agent invokes Run Service Worker algorithm with a service
-@@ -485,6 +490,9 @@ void ServiceWorkerGlobalScope::Initialize(
+@@ -489,6 +494,9 @@ void ServiceWorkerGlobalScope::Initialize(
    // - If serviceWorker's script resource was delivered with a
    //   Content-Security-Policy-Report-Only HTTP header containing the value
    //   policy, the user agent must monitor policy for serviceWorker."
@@ -895,7 +903,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl
    InitContentSecurityPolicyFromVector(std::move(response_csp));
    BindContentSecurityPolicyToExecutionContext();
  
-@@ -525,26 +533,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript(
+@@ -529,26 +537,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript(
          kDoNotSupportReferrerPolicyLegacyKeywords, &referrer_policy);
    }
  
diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
index d609bd41..60353324 100644
--- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
+++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
@@ -47,17 +47,17 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
 @@ -168,6 +168,11 @@ android_resources("java_resources") {
-     "java/res/drawable-xxxhdpi/permission_protected_media.png",
-     "java/res/drawable-xxxhdpi/settings_sensors.png",
-     "java/res/drawable-xxxhdpi/web_asset.png",
+     "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png",
+     "java/res/drawable-mdpi/permission_background_sync.png",
+     "java/res/drawable-mdpi/permission_javascript.png",
 +    "java/res/drawable-hdpi/settings_autoplay.png",
 +    "java/res/drawable-xhdpi/settings_autoplay.png",
 +    "java/res/drawable-xxhdpi/settings_autoplay.png",
 +    "java/res/drawable-mdpi/settings_autoplay.png",
 +    "java/res/drawable-xxxhdpi/settings_autoplay.png",
-     "java/res/drawable/ic_person_24dp.xml",
-     "java/res/drawable/settings_bluetooth.xml",
-     "java/res/layout/add_site_dialog.xml",
+     "java/res/drawable-mdpi/permission_popups.png",
+     "java/res/drawable-mdpi/permission_protected_media.png",
+     "java/res/drawable-mdpi/settings_sensors.png",
 diff --git a/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png b/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png
 new file mode 100644
 index 0000000000000000000000000000000000000000..a8a9265f14cd8445ad1f55845099e60dc3c4edf1
@@ -169,7 +169,7 @@ HcmV?d00001
 diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 --- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 +++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
-@@ -65,6 +65,10 @@
+@@ -67,6 +67,10 @@ found in the LICENSE file.
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
          android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
          android:key="protected_content" />
@@ -198,7 +198,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -601,6 +601,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -623,6 +623,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          int resource = 0;
          if (mCategory.getType() == SiteSettingsCategory.Type.AUTOMATIC_DOWNLOADS) {
              resource = R.string.website_settings_add_site_description_automatic_downloads;
@@ -207,7 +207,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else if (mCategory.getType() == SiteSettingsCategory.Type.BACKGROUND_SYNC) {
              resource = R.string.website_settings_add_site_description_background_sync;
          } else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT) {
-@@ -726,6 +728,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -755,6 +757,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          boolean allowSpecifyingExceptions = false;
          if (mCategory.getType() == SiteSettingsCategory.Type.SOUND) {
              allowSpecifyingExceptions = true;
@@ -219,7 +219,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -126,6 +126,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -127,6 +127,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  return "cookies_permission_list";
              case ContentSettingsType.FEDERATED_IDENTITY_API:
                  return "federated_identity_api_list";
@@ -228,7 +228,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              case ContentSettingsType.IDLE_DETECTION:
                  return "idle_detection_permission_list";
              case ContentSettingsType.JAVASCRIPT:
-@@ -492,6 +494,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -493,6 +495,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
  
              if (type == ContentSettingsType.ADS) {
                  setUpAdsPreference(preference);
@@ -237,7 +237,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              } else if (type == ContentSettingsType.SOUND) {
                  setUpSoundPreference(preference);
              } else if (type == ContentSettingsType.JAVASCRIPT) {
-@@ -974,6 +978,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -983,6 +987,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
      }
  
@@ -308,7 +308,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -218,6 +218,15 @@ public final class Website implements Serializable {
+@@ -213,6 +213,15 @@ public final class Website implements Serializable {
              } else {
                  RecordUserAction.record("JavascriptContentSetting.DisableBy.SiteSettings");
              }
@@ -380,7 +380,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -148,6 +148,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -149,6 +149,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
  #endif
    map->GetSettingsForOneType(ContentSettingsType::JAVASCRIPT,
                               &(rules->script_rules));
@@ -392,7 +392,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
-@@ -200,6 +200,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+@@ -202,6 +202,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
    return content_type == ContentSettingsType::IMAGES ||
           content_type == ContentSettingsType::JAVASCRIPT ||
           content_type == ContentSettingsType::POPUPS ||
@@ -400,7 +400,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
           content_type == ContentSettingsType::MIXEDSCRIPT ||
           content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
           content_type == ContentSettingsType::TIMEZONE_OVERRIDE;
-@@ -213,6 +214,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -215,6 +216,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
    FilterRulesForType(mixed_content_rules, outermost_main_frame_url);
    FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);
    FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
@@ -411,7 +411,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
-@@ -89,6 +89,7 @@ struct RendererContentSettingRules {
+@@ -90,6 +90,7 @@ struct RendererContentSettingRules {
  
    ContentSettingsForOneType image_rules;
    ContentSettingsForOneType script_rules;
@@ -433,7 +433,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
 --- a/components/content_settings/core/common/content_settings_mojom_traits.cc
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
-@@ -99,6 +99,7 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+@@ -100,6 +100,7 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           RendererContentSettingRules* out) {
    return data.ReadImageRules(&out->image_rules) &&
           data.ReadScriptRules(&out->script_rules) &&
@@ -502,7 +502,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -98,6 +98,7 @@ ContentSettingsType kPermissionType[] = {
+@@ -99,6 +99,7 @@ ContentSettingsType kPermissionType[] = {
      ContentSettingsType::ADS,
      ContentSettingsType::BACKGROUND_SYNC,
      ContentSettingsType::SOUND,
@@ -510,7 +510,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
      ContentSettingsType::AUTOMATIC_DOWNLOADS,
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
      ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER,
-@@ -141,6 +142,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
+@@ -142,6 +143,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
      return is_subresource_filter_activated;
    }
  
diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch
index 06cdd5b6..4421c79d 100644
--- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch
+++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -494,6 +494,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -507,6 +507,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  setUpSoundPreference(preference);
              } else if (type == ContentSettingsType.JAVASCRIPT) {
                  setUpJavascriptPreference(preference);
@@ -21,8 +21,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +                setUpCookiesPreference(preference);
              } else if (type == ContentSettingsType.GEOLOCATION) {
                  setUpLocationPreference(preference);
-             } else if (type == ContentSettingsType.NOTIFICATIONS) {
-@@ -815,16 +817,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+             } else if (type == ContentSettingsType.IMAGES) {
+@@ -834,16 +836,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
      private void setUpAdsInformationalBanner() {
          // Add the informational banner which shows at the top of the UI if ad blocking is
          // activated on this site.
@@ -39,7 +39,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private SiteSettingsCategory getWarningCategory() {
-@@ -983,17 +977,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -1028,17 +1022,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          @Nullable
          Integer currentValue =
                  mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT);
@@ -78,10 +78,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +        setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
 +     }
 +
-     /**
-      * Updates the ads list preference based on whether the site is a candidate for blocking. This
-      * has some custom behavior.
-@@ -1009,22 +1021,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+     private void setUpJavascriptJitPreference(Preference preference) {
+         BrowserContextHandle browserContextHandle =
+                 getSiteSettingsDelegate().getBrowserContextHandle();
+@@ -1071,22 +1083,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
              setupContentSettingsPreference(preference, null, false);
              return;
          }
diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch
index ce782dfa..83802c1f 100644
--- a/build/patches/Site-setting-for-images.patch
+++ b/build/patches/Site-setting-for-images.patch
@@ -37,7 +37,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -135,6 +135,7 @@ android_resources("java_resources") {
+@@ -160,6 +160,7 @@ android_resources("java_resources") {
    sources = [
      "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-hdpi/permission_background_sync.png",
@@ -45,15 +45,15 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-hdpi/permission_javascript.png",
      "java/res/drawable-hdpi/permission_javascript_jit.png",
      "java/res/drawable-hdpi/permission_popups.png",
-@@ -143,6 +144,7 @@ android_resources("java_resources") {
+@@ -168,6 +169,7 @@ android_resources("java_resources") {
      "java/res/drawable-hdpi/web_asset.png",
      "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-mdpi/permission_background_sync.png",
 +    "java/res/drawable-mdpi/permission_images.png",
      "java/res/drawable-mdpi/permission_javascript.png",
      "java/res/drawable-mdpi/permission_javascript_jit.png",
-     "java/res/drawable-mdpi/permission_popups.png",
-@@ -151,6 +153,7 @@ android_resources("java_resources") {
+     "java/res/drawable-hdpi/settings_autoplay.png",
+@@ -181,6 +183,7 @@ android_resources("java_resources") {
      "java/res/drawable-mdpi/web_asset.png",
      "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xhdpi/permission_background_sync.png",
@@ -61,7 +61,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-xhdpi/permission_javascript.png",
      "java/res/drawable-xhdpi/permission_javascript_jit.png",
      "java/res/drawable-xhdpi/permission_popups.png",
-@@ -159,6 +162,7 @@ android_resources("java_resources") {
+@@ -189,6 +192,7 @@ android_resources("java_resources") {
      "java/res/drawable-xhdpi/web_asset.png",
      "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xxhdpi/permission_background_sync.png",
@@ -69,7 +69,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
      "java/res/drawable-xxhdpi/permission_javascript.png",
      "java/res/drawable-xxhdpi/permission_javascript_jit.png",
      "java/res/drawable-xxhdpi/permission_popups.png",
-@@ -167,6 +171,7 @@ android_resources("java_resources") {
+@@ -197,6 +201,7 @@ android_resources("java_resources") {
      "java/res/drawable-xxhdpi/web_asset.png",
      "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png",
      "java/res/drawable-xxxhdpi/permission_background_sync.png",
@@ -162,7 +162,7 @@ HcmV?d00001
 diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 --- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 +++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
-@@ -45,6 +45,10 @@
+@@ -47,6 +47,10 @@ found in the LICENSE file.
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
          android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
          android:key="javascript" />
@@ -190,7 +190,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -620,6 +620,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -642,6 +642,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                                 browserContextHandle, ContentSettingsType.SOUND)
                      ? R.string.website_settings_add_site_description_sound_block
                      : R.string.website_settings_add_site_description_sound_allow;
@@ -199,7 +199,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) {
              if (mRequiresFourStateSetting) {
                  resource = cookieSettingsExceptionShouldBlock()
-@@ -739,6 +741,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -768,6 +770,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              allowSpecifyingExceptions = true;
          } else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT_JIT) {
              allowSpecifyingExceptions = true;
@@ -211,7 +211,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -130,6 +130,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -131,6 +131,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  return "autoplay_permission_list";
              case ContentSettingsType.IDLE_DETECTION:
                  return "idle_detection_permission_list";
@@ -220,17 +220,17 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              case ContentSettingsType.JAVASCRIPT:
                  return "javascript_permission_list";
              case ContentSettingsType.JAVASCRIPT_JIT:
-@@ -504,6 +506,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -505,6 +507,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  setUpJavascriptPreference(preference);
-             } else if (type == ContentSettingsType.COOKIES) {
-                 setUpCookiesPreference(preference);
-+            } else if (type == ContentSettingsType.IMAGES) {
-+                setUpImagesPreference(preference);
              } else if (type == ContentSettingsType.GEOLOCATION) {
                  setUpLocationPreference(preference);
++            } else if (type == ContentSettingsType.IMAGES) {
++                setUpImagesPreference(preference);
              } else if (type == ContentSettingsType.JAVASCRIPT_JIT) {
-@@ -1084,6 +1088,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
-         setupContentSettingsPreference(preference, permission, false /* isEmbargoed */);
+                 setUpJavascriptJitPreference(preference);
+             } else if (type == ContentSettingsType.NOTIFICATIONS) {
+@@ -1100,6 +1104,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+                 mSite.isEmbargoed(ContentSettingsType.REQUEST_DESKTOP_SITE));
      }
  
 +    private void setUpImagesPreference(Preference preference) {
@@ -312,7 +312,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -202,6 +202,13 @@ public final class Website implements Serializable {
+@@ -197,6 +197,13 @@ public final class Website implements Serializable {
                          /*isEmbargoed=*/false);
                  setContentSettingException(type, exception);
              }
@@ -361,7 +361,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
    <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR_LIMIT=32]">
      JavaScript
    </message>
-@@ -221,6 +224,9 @@
+@@ -224,6 +227,9 @@
    <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_TOAST" desc="The toast shown when a new site has been added to the exception list.">
      Site <ph name="SITE_NAME">%1$s<ex>google.com</ex></ph> added
    </message>
@@ -387,7 +387,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -131,12 +131,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -132,12 +132,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
        ContentSettingToValue(CONTENT_SETTING_ALLOW), std::string(),
        map->IsOffTheRecord()));
  #else
@@ -419,7 +419,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -90,9 +90,7 @@ ContentSettingsType kPermissionType[] = {
+@@ -91,9 +91,7 @@ ContentSettingsType kPermissionType[] = {
      ContentSettingsType::SENSORS,
      ContentSettingsType::NOTIFICATIONS,
      ContentSettingsType::JAVASCRIPT,
@@ -429,7 +429,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
      ContentSettingsType::POPUPS,
      ContentSettingsType::WINDOW_PLACEMENT,
      ContentSettingsType::ADS,
-@@ -148,6 +146,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
+@@ -149,6 +147,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
       return true;
    }
  
diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch
index 485cce0c..d1dffca0 100644
--- a/build/patches/Timezone-customization.patch
+++ b/build/patches/Timezone-customization.patch
@@ -15,8 +15,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ...ezoneoverride_site_settings_preference.xml |  68 ++++++
  .../res/xml/site_settings_preferences.xml     |   4 +
  .../java/res/xml/website_preferences.xml      |   9 +
- .../ContentSettingsResources.java             |  35 +++-
- .../site_settings/SingleCategorySettings.java |  78 ++++++-
+ .../ContentSettingsResources.java             |  33 +++
+ .../site_settings/SingleCategorySettings.java |  72 ++++++-
  .../site_settings/SingleWebsiteSettings.java  |   8 +-
  .../site_settings/SiteSettings.java           |   2 +-
  .../site_settings/SiteSettingsCategory.java   |   9 +-
@@ -44,7 +44,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../renderer/content_settings_agent_impl.cc   |  83 ++++++++
  .../renderer/content_settings_agent_impl.h    |  11 +
  .../WebLayerSiteSettingsDelegate.java         |   3 +
- 35 files changed, 702 insertions(+), 15 deletions(-)
+ 35 files changed, 697 insertions(+), 12 deletions(-)
  create mode 100755 components/browser_ui/site_settings/android/java/res/layout/time_zone_select_dialog.xml
  create mode 100755 components/browser_ui/site_settings/android/java/res/layout/timezoneoverride_site_settings_preference.xml
  create mode 100755 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java
@@ -63,8 +63,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
  /**
   * A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic.
   */
-@@ -212,6 +216,18 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
-         }
+@@ -232,6 +236,18 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+         PrivacySandboxBridge.setFirstPartySetsDataAccessEnabled(enabled);
      }
  
 +    // open wiki page for documentation about the timezone override feature
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -76,6 +76,7 @@ android_library("java") {
+@@ -83,6 +83,7 @@ android_library("java") {
      "java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java",
      "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreference.java",
      "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java",
@@ -93,7 +93,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
    ]
    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
    resources_package = "org.chromium.components.browser_ui.site_settings"
-@@ -184,6 +185,8 @@ android_resources("java_resources") {
+@@ -211,6 +212,8 @@ android_resources("java_resources") {
      "java/res/xml/single_website_preferences.xml",
      "java/res/xml/site_settings_preferences.xml",
      "java/res/xml/website_preferences.xml",
@@ -220,7 +220,7 @@ new file mode 100755
 diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 --- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
 +++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
-@@ -41,6 +41,10 @@
+@@ -43,6 +43,10 @@ found in the LICENSE file.
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
          android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
          android:key="javascript" />
@@ -234,7 +234,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_setti
 diff --git a/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml
 --- a/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml
 +++ b/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml
-@@ -13,6 +13,12 @@
+@@ -15,6 +15,12 @@ found in the LICENSE file.
          android:key="cookie_info_text"
          android:summary="@string/website_settings_cookie_info"/>
  
@@ -247,7 +247,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/website_pr
      <!-- A common binary toggle, only shown for specific categories that allow
           turning default values for that category on/off.-->
      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-@@ -26,6 +32,9 @@
+@@ -28,6 +34,9 @@ found in the LICENSE file.
      <!-- A four state toggle for cookie preferences, only shown for the Cookies category. -->
      <org.chromium.components.browser_ui.site_settings.FourStateCookieSettingsPreference
          android:key="four_state_cookie_toggle" />
@@ -297,19 +297,17 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      /**
       * Returns the string resource id for a content type to show with a permission category.
       * @param enabled Whether the content type is enabled.
-@@ -435,7 +458,10 @@ public class ContentSettingsResources {
-      * with a particular website.
-      * @param value The ContentSetting for which we want the resource.
+@@ -438,6 +461,9 @@ public class ContentSettingsResources {
       */
--    public static int getSiteSummary(@ContentSettingValues @Nullable Integer value) {
-+    public static int getSiteSummary(int contentType, @ContentSettingValues @Nullable Integer value) {
-+        if (contentType == ContentSettingsType.TIMEZONE_OVERRIDE)
-+            return getCategorySummary(contentType, value);
+     public static int getSiteSummary(@ContentSettingValues @Nullable Integer value,
+             @ContentSettingsType int contentSettingsType) {
++        if (contentSettingsType == ContentSettingsType.TIMEZONE_OVERRIDE)
++            return getCategorySummary(contentSettingsType, value);
 +
          switch (value) {
              case ContentSettingValues.ALLOW:
-                 return R.string.website_settings_permissions_allow;
-@@ -541,6 +567,13 @@ public class ContentSettingsResources {
+                 return contentSettingsType == ContentSettingsType.REQUEST_DESKTOP_SITE
+@@ -547,6 +573,13 @@ public class ContentSettingsResources {
                  return descriptionIDs;
              }
          }
@@ -326,7 +324,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -67,6 +67,10 @@ import org.chromium.ui.widget.Toast;
+@@ -68,6 +68,10 @@ import org.chromium.ui.widget.Toast;
  
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
@@ -337,7 +335,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;
-@@ -156,6 +160,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -167,6 +171,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
      public static final String BINARY_TOGGLE_KEY = "binary_toggle";
      public static final String TRI_STATE_TOGGLE_KEY = "tri_state_toggle";
      public static final String FOUR_STATE_COOKIE_TOGGLE_KEY = "four_state_cookie_toggle";
@@ -345,7 +343,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
      // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
      public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
-@@ -165,6 +170,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -176,6 +181,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
      public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
      public static final String ADD_EXCEPTION_KEY = "add_exception";
      public static final String COOKIE_INFO_TEXT_KEY = "cookie_info_text";
@@ -353,7 +351,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
      // Keys for Allowed/Blocked preference groups/headers.
      private static final String ALLOWED_GROUP = "allowed_group";
-@@ -231,7 +237,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -242,7 +248,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          Integer contentSetting = website.site().getContentSetting(
                  browserContextHandle, mCategory.getContentSettingsType());
          if (contentSetting != null) {
@@ -366,7 +364,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
          return false;
      }
-@@ -401,7 +411,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -415,7 +425,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
          });
  
@@ -376,7 +374,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              MenuItem help = menu.add(
                      Menu.NONE, R.id.menu_id_site_settings_help, Menu.NONE, R.string.menu_help);
              help.setIcon(VectorDrawableCompat.create(
-@@ -412,7 +423,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -426,7 +437,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
      @Override
      public boolean onOptionsItemSelected(MenuItem item) {
          if (item.getItemId() == R.id.menu_id_site_settings_help) {
@@ -388,7 +386,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                  getSiteSettingsDelegate().launchProtectedContentHelpAndFeedbackActivity(
                          getActivity());
              } else {
-@@ -507,6 +521,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -525,6 +539,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              WebsitePreferenceBridge.setDefaultContentSetting(
                      browserContextHandle, mCategory.getContentSettingsType(), setting);
              getInfoForOrigins();
@@ -401,16 +399,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else if (FOUR_STATE_COOKIE_TOGGLE_KEY.equals(preference.getKey())) {
              setCookieSettingsPreference((CookieSettingsState) newValue);
              getInfoForOrigins();
-@@ -613,6 +633,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
-                                browserContextHandle, ContentSettingsType.FEDERATED_IDENTITY_API)
-                     ? R.string.website_settings_add_site_description_federated_identity_block
-                     : R.string.website_settings_add_site_description_federated_identity_allow;
+@@ -640,6 +660,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+                                browserContextHandle, ContentSettingsType.REQUEST_DESKTOP_SITE)
+                     ? R.string.website_settings_blocked_group_heading_request_desktop_site
+                     : R.string.website_settings_allowed_group_heading_request_desktop_site;
 +        } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
 +            resource = R.string.website_settings_category_timezone_override_allowed;
          }
          assert resource > 0;
          return getString(resource);
-@@ -653,6 +675,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -680,6 +702,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES && mRequiresFourStateSetting) {
              setting = cookieSettingsExceptionShouldBlock() ? ContentSettingValues.BLOCK
                                                             : ContentSettingValues.ALLOW;
@@ -424,16 +422,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else {
              setting = (WebsitePreferenceBridge.isCategoryEnabled(
                                browserContextHandle, mCategory.getContentSettingsType()))
-@@ -711,6 +740,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
-             allowSpecifyingExceptions = true;
-         } else if (mCategory.getType() == SiteSettingsCategory.Type.FEDERATED_IDENTITY_API) {
+@@ -744,6 +773,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+                 && ContentFeatureList.isEnabled(
+                         ContentFeatureList.REQUEST_DESKTOP_SITE_EXCEPTIONS)) {
              allowSpecifyingExceptions = true;
 +        } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
 +            allowSpecifyingExceptions = true;
          }
          if (allowSpecifyingExceptions) {
              getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(),
-@@ -882,7 +913,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -915,7 +946,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              TriStateSiteSettingsPreference triStateToggle =
                      (TriStateSiteSettingsPreference) getPreferenceScreen().findPreference(
                              TRI_STATE_TOGGLE_KEY);
@@ -449,7 +447,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          } else if (mRequiresFourStateSetting) {
              FourStateCookieSettingsPreference fourStateCookieToggle =
                      (FourStateCookieSettingsPreference) getPreferenceScreen().findPreference(
-@@ -911,6 +949,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -944,6 +982,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                  (FourStateCookieSettingsPreference) screen.findPreference(
                          FOUR_STATE_COOKIE_TOGGLE_KEY);
          // TODO(crbug.com/1104836): Remove the old third-party cookie blocking UI
@@ -459,7 +457,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
          mNotificationsQuietUiPref = screen.findPreference(NOTIFICATIONS_QUIET_UI_TOGGLE_KEY);
          mDesktopSitePeripheralPref = screen.findPreference(DESKTOP_SITE_PERIPHERAL_TOGGLE_KEY);
-@@ -924,20 +965,32 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -957,20 +998,32 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          if (mRequiresTriStateSetting) {
              screen.removePreference(binaryToggle);
              screen.removePreference(fourStateCookieToggle);
@@ -493,7 +491,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
          if (permissionBlockedByOs) {
              maybeShowOsWarning(screen);
-@@ -1067,6 +1120,15 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1105,6 +1158,15 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          triStateToggle.initialize(setting, descriptionIds);
      }
  
@@ -509,24 +507,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      private void configureBinaryToggle(ChromeSwitchPreference binaryToggle, int contentType) {
          binaryToggle.setOnPreferenceChangeListener(this);
          binaryToggle.setTitle(ContentSettingsResources.getTitle(contentType));
-@@ -1168,9 +1230,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
- 
-         CharSequence[] descriptions = new String[2];
-         descriptions[0] =
--                getString(ContentSettingsResources.getSiteSummary(ContentSettingValues.ALLOW));
-+                getString(ContentSettingsResources.getSiteSummary(contentSettingsType,
-+                                                                  ContentSettingValues.ALLOW));
-         descriptions[1] =
--                getString(ContentSettingsResources.getSiteSummary(ContentSettingValues.BLOCK));
-+                getString(ContentSettingsResources.getSiteSummary(contentSettingsType,
-+                                                                  ContentSettingValues.BLOCK));
- 
-         return new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog)
-                 .setPositiveButton(R.string.cancel, null)
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -134,6 +134,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -135,6 +135,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
                  return "popup_permission_list";
              case ContentSettingsType.SOUND:
                  return "sound_permission_list";
@@ -535,7 +519,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              case ContentSettingsType.AR:
                  return "ar_permission_list";
              case ContentSettingsType.MEDIASTREAM_CAMERA:
-@@ -888,11 +890,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -897,11 +899,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          if (value == null) return;
          setUpPreferenceCommon(preference, value);
  
@@ -550,7 +534,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          switchPreference.setOnPreferenceChangeListener(this);
          @ContentSettingsType
          int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
-@@ -1084,7 +1088,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -1100,7 +1104,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
  
          mSite.setContentSetting(browserContextHandle, type, permission);
@@ -617,9 +601,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
-@@ -125,6 +125,8 @@ public interface SiteSettingsDelegate {
+@@ -145,6 +145,8 @@ public interface SiteSettingsDelegate {
       */
-     void dismissPrivacySandboxSnackbar();
+     void setFirstPartySetsDataAccessEnabled(boolean enabled);
  
 +    void launchTimeZoneOverrideHelpAndFeedbackActivity(Activity currentActivity);
 +
@@ -827,7 +811,7 @@ new file mode 100755
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -231,6 +231,17 @@ public final class Website implements Serializable {
+@@ -226,6 +226,17 @@ public final class Website implements Serializable {
              } else {
                  RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings");
              }
@@ -877,8 +861,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              default:
                  return false;
          }
-@@ -352,6 +354,14 @@ public class WebsitePreferenceBridge {
-                 contentSettingType, primaryPattern, secondaryPattern, setting);
+@@ -371,6 +373,14 @@ public class WebsitePreferenceBridge {
+         return WebsitePreferenceBridgeJni.get().toHostOnlyPattern(pattern);
      }
  
 +    public static String getCustomTimezone(BrowserContextHandle browserContextHandle) {
@@ -892,10 +876,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      @NativeMethods
      public interface Natives {
          boolean isNotificationEmbargoedForOrigin(
-@@ -413,5 +423,7 @@ public class WebsitePreferenceBridge {
-         boolean isContentSettingManagedByCustodian(
-                 BrowserContextHandle browserContextHandle, int contentSettingType);
+@@ -434,5 +444,7 @@ public class WebsitePreferenceBridge {
          boolean getLocationAllowedByPolicy(BrowserContextHandle browserContextHandle);
+         String toDomainWildcardPattern(String pattern);
+         String toHostOnlyPattern(String pattern);
 +        String getCustomTimezone(BrowserContextHandle browserContextHandle);
 +        void setCustomTimezone(BrowserContextHandle browserContextHandle, String timezone);
      }
@@ -903,9 +887,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
 --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
 +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
-@@ -957,3 +957,19 @@ static jboolean JNI_WebsitePreferenceBridge_GetLocationAllowedByPolicy(
-              ->GetDefaultContentSetting(ContentSettingsType::GEOLOCATION,
-                                         nullptr) == CONTENT_SETTING_ALLOW;
+@@ -985,3 +985,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern(
+           ContentSettingsPattern::FromString(pattern_string));
+   return ConvertUTF8ToJavaString(env, host_only_pattern.ToString());
  }
 +
 +static void JNI_WebsitePreferenceBridge_SetCustomTimezone(
@@ -936,7 +920,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
    <message name="IDS_DESKTOP_SITE_TITLE" desc="Title of the permission to request the desktop view of a site by default [CHAR_LIMIT=32]">
      Desktop site
    </message>
-@@ -527,6 +530,38 @@
+@@ -563,6 +566,38 @@
      Block sites from playing protected content
    </message>
  
@@ -978,7 +962,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
-@@ -92,6 +92,8 @@ void PrefProvider::RegisterProfilePrefs(
+@@ -88,6 +88,8 @@ void PrefProvider::RegisterProfilePrefs(
                                       info->GetPrefRegistrationFlags());
    }
  
@@ -987,7 +971,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
    // Obsolete prefs ----------------------------------------------------------
  
    // These prefs have been removed, but need to be registered so they can
-@@ -181,6 +183,10 @@ PrefProvider::PrefProvider(PrefService* prefs,
+@@ -175,6 +177,10 @@ PrefProvider::PrefProvider(PrefService* prefs,
      event_args->set_number_of_exceptions(
          num_exceptions);  // PrefProvider::PrefProvider.
    });
@@ -998,7 +982,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
  }
  
  PrefProvider::~PrefProvider() {
-@@ -315,4 +321,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) {
+@@ -338,4 +344,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) {
    clock_ = clock;
  }
  
@@ -1016,7 +1000,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h
 --- a/components/content_settings/core/browser/content_settings_pref_provider.h
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.h
-@@ -67,6 +67,9 @@ class PrefProvider : public UserModifiableProvider {
+@@ -65,6 +65,9 @@ class PrefProvider : public UserModifiableProvider {
  
    ContentSettingsPref* GetPref(ContentSettingsType type) const;
  
@@ -1026,7 +1010,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
   private:
    friend class DeadlockCheckerObserver;  // For testing.
  
-@@ -99,6 +102,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -96,6 +99,7 @@ class PrefProvider : public UserModifiableProvider {
    base::ThreadChecker thread_checker_;
  
    raw_ptr<base::Clock> clock_;
@@ -1059,7 +1043,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -150,6 +150,13 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -151,6 +151,13 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                               &(rules->script_rules));
    map->GetSettingsForOneType(ContentSettingsType::POPUPS,
                               &(rules->popup_redirect_rules));
@@ -1076,7 +1060,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
 --- a/components/content_settings/core/browser/host_content_settings_map.cc
 +++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -603,6 +603,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) {
+@@ -602,6 +602,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) {
      provider->SetClockForTesting(clock);
  }
  
@@ -1094,9 +1078,9 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
 --- a/components/content_settings/core/browser/host_content_settings_map.h
 +++ b/components/content_settings/core/browser/host_content_settings_map.h
-@@ -341,6 +341,9 @@ class HostContentSettingsMap : public content_settings::Observer,
-                                      GURL& secondary_url,
-                                      ContentSettingsType content_type);
+@@ -329,6 +329,9 @@ class HostContentSettingsMap : public content_settings::Observer,
+     allow_invalid_secondary_pattern_for_testing_ = allow;
+   }
  
 +  void GetTimezoneOverrideValue(std::string& timezone) const;
 +  void SetTimezoneOverrideValue(const std::string& timezone);
@@ -1107,7 +1091,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
-@@ -201,7 +201,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+@@ -203,7 +203,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
           content_type == ContentSettingsType::JAVASCRIPT ||
           content_type == ContentSettingsType::POPUPS ||
           content_type == ContentSettingsType::MIXEDSCRIPT ||
@@ -1117,7 +1101,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
  }
  
  void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
-@@ -211,6 +212,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -213,6 +214,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
    FilterRulesForType(popup_redirect_rules, outermost_main_frame_url);
    FilterRulesForType(mixed_content_rules, outermost_main_frame_url);
    FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);
@@ -1128,7 +1112,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
-@@ -92,6 +92,8 @@ struct RendererContentSettingRules {
+@@ -93,6 +93,8 @@ struct RendererContentSettingRules {
    ContentSettingsForOneType popup_redirect_rules;
    ContentSettingsForOneType mixed_content_rules;
    ContentSettingsForOneType auto_dark_content_rules;
@@ -1150,7 +1134,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
 --- a/components/content_settings/core/common/content_settings_mojom_traits.cc
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
-@@ -101,7 +101,9 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+@@ -102,7 +102,9 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           data.ReadScriptRules(&out->script_rules) &&
           data.ReadPopupRedirectRules(&out->popup_redirect_rules) &&
           data.ReadMixedContentRules(&out->mixed_content_rules) &&
@@ -1184,7 +1168,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
 --- a/components/content_settings/core/common/content_settings_types.h
 +++ b/components/content_settings/core/common/content_settings_types.h
-@@ -229,6 +229,9 @@ enum class ContentSettingsType : int32_t {
+@@ -225,6 +225,9 @@ enum class ContentSettingsType : int32_t {
    // by the File System Access API.
    FILE_SYSTEM_LAST_PICKED_DIRECTORY,
  
@@ -1355,7 +1339,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h
 diff --git a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
 --- a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
 +++ b/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLayerSiteSettingsDelegate.java
-@@ -138,6 +138,9 @@ public class WebLayerSiteSettingsDelegate
+@@ -143,6 +143,9 @@ public class WebLayerSiteSettingsDelegate
      @Override
      public void dismissPrivacySandboxSnackbar() {}
  
@@ -1363,7 +1347,7 @@ diff --git a/weblayer/browser/java/org/chromium/weblayer_private/settings/WebLay
 +    public void launchTimeZoneOverrideHelpAndFeedbackActivity(Activity currentActivity) {}
 +
      @Override
-     public boolean canLaunchClearBrowsingDataDialog() {
+     public boolean isFirstPartySetsDataAccessEnabled() {
          return false;
 --
 2.25.1
diff --git a/build/patches/Unexpire-tab-groups-flags.patch b/build/patches/Unexpire-tab-groups-flags.patch
index 4210a29d..528374a0 100644
--- a/build/patches/Unexpire-tab-groups-flags.patch
+++ b/build/patches/Unexpire-tab-groups-flags.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2918,7 +2918,7 @@
+@@ -2981,7 +2981,7 @@
    {
      "name": "enable-tab-groups",
      "owners": [ "memex-team@google.com" ],
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
    },
    {
      "name": "enable-tab-groups-continuation",
-@@ -2933,7 +2933,7 @@
+@@ -2996,7 +2996,7 @@
    {
      "name": "enable-tab-groups-ui-improvements",
      "owners": [ "memex-team@google.com" ],
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -822,13 +822,13 @@ const base::Feature kTabEngagementReportingAndroid{
+@@ -854,13 +854,13 @@ const base::Feature kTabEngagementReportingAndroid{
      "TabEngagementReportingAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kTabGroupsAndroid{"TabGroupsAndroid",
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -97,7 +97,7 @@ public class CachedFeatureFlags {
+@@ -99,7 +99,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.STORE_HOURS, false)
                      .put(ChromeFeatureList.SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, true)
                      .put(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, true)
diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch
index 9bb7b4d6..00880edd 100644
--- a/build/patches/Update-i18n-zh_CN-support.patch
+++ b/build/patches/Update-i18n-zh_CN-support.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
 --- a/chrome/app/resources/generated_resources_zh-CN.xtb
 +++ b/chrome/app/resources/generated_resources_zh-CN.xtb
-@@ -8634,4 +8634,6 @@
+@@ -8728,4 +8728,6 @@
  <translation id="996803490569799917">查看与亲朋好友相聚时刻的回忆集锦</translation>
  <translation id="99731366405731005">您需要开启 <ph name="LINK1_BEGIN" />Chrome 同步<ph name="LINK1_END" />才能使用 Wi-Fi 同步功能。<ph name="LINK2_BEGIN" />了解详情<ph name="LINK2_END" /></translation>
  <translation id="998747458861718449">检查(&amp;N)</translation>
@@ -27,7 +27,7 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res
 diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
 --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb
 +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
-@@ -399,4 +399,5 @@
+@@ -403,4 +403,5 @@
  <translation id="940313311831216333">如需在您的所有设备上访问自己的 Chrome 信息，请登录您的帐号，然后开启同步功能。</translation>
  <translation id="989369509083708165">Google Chrome 是您的默认浏览器</translation>
  <translation id="989816563149873169"><ph name="SHORTCUT" /> 可用于切换 Chrome 个人资料</translation>
@@ -38,7 +38,7 @@ diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/r
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
-@@ -1560,4 +1560,74 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部
+@@ -1566,4 +1566,74 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部
  <translation id="987264212798334818">常规</translation>
  <translation id="992745192656291733"><ph name="TAB_COUNT" /> 个标签页</translation>
  <translation id="996149300115483134">动态卡片上的菜单已关闭</translation>
@@ -118,7 +118,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
 +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
-@@ -377,4 +377,28 @@
+@@ -388,4 +388,28 @@
  <translation id="9162462602695099906">这是一个危险网页</translation>
  <translation id="930525582205581608">移除此网站？</translation>
  <translation id="967624055006145463">已存储的数据</translation>
@@ -152,7 +152,7 @@ diff --git a/components/browser_ui/strings/android/translations/browser_ui_strin
 diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
 --- a/components/strings/components_strings_zh-CN.xtb
 +++ b/components/strings/components_strings_zh-CN.xtb
-@@ -3037,4 +3037,33 @@
+@@ -3087,4 +3087,33 @@
      &lt;/ul&gt;</translation>
  <translation id="994346157028146140">JIS B1</translation>
  <translation id="997986563973421916">来自 Google Pay</translation>
diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch
index 645399ed..b678e1a4 100644
--- a/build/patches/Use-4-tile-rows-never-show-logo.patch
+++ b/build/patches/Use-4-tile-rows-never-show-logo.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -125,7 +125,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -122,7 +122,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
       */
      private boolean mHasShownView;
  
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
      private boolean mSearchProviderIsGoogle;
      private boolean mShowingNonStandardLogo;
  
-@@ -337,7 +337,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -349,7 +349,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
              boolean isScrollableMvtEnabled, boolean searchProviderIsGoogle) {
          assert mMvTilesContainerLayout != null;
  
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
          if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) {
              maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext());
          }
-@@ -526,7 +526,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
+@@ -500,7 +500,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver {
                  && mInitialized) {
              return;
          }
diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch
index 16251683..93d2dabb 100644
--- a/build/patches/User-agent-customization.patch
+++ b/build/patches/User-agent-customization.patch
@@ -73,7 +73,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -665,4 +665,6 @@ chrome_java_resources = [
+@@ -661,4 +661,6 @@ chrome_java_resources = [
    "java/res/xml/privacy_preferences.xml",
    "java/res/xml/search_widget_info.xml",
    "java/res/xml/tracing_preferences.xml",
@@ -83,7 +83,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -891,6 +891,7 @@ chrome_java_sources = [
+@@ -893,6 +893,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
    "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java",
    "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java",
@@ -205,7 +205,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -81,6 +81,11 @@
+@@ -83,6 +83,11 @@ found in the LICENSE file.
          android:key="content_settings"
          android:order="18"
          android:title="@string/prefs_site_settings"/>
@@ -542,7 +542,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityUtils;
-@@ -531,6 +535,32 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -530,6 +534,32 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
                  params.setOverrideUserAgent(calculateUserAgentOverrideOption(null));
              }
  
@@ -575,7 +575,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
              @TabLoadStatus
              int result = loadUrlInternal(params, fixedUrl);
  
-@@ -1402,8 +1432,15 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1418,8 +1448,15 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
  
              mWebContents.setImportance(mImportance);
  
@@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
  
              mContentView.addOnAttachStateChangeListener(mAttachStateChangeListener);
              updateInteractableState();
-@@ -1561,6 +1598,10 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1577,6 +1614,10 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
              if (mWebContents != null) mWebContents.getNavigationController().loadIfNecessary();
              mIsBeingRestored = true;
              for (TabObserver observer : mObservers) observer.onRestoreStarted(this);
@@ -604,7 +604,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
          } finally {
              TraceEvent.end("Tab.restoreIfNeeded");
          }
-@@ -1697,6 +1738,13 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1713,6 +1754,13 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
      }
  
      private @UserAgentOverrideOption int calculateUserAgentOverrideOption(@Nullable GURL url) {
@@ -618,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
          WebContents webContents = getWebContents();
          boolean currentRequestDesktopSite = TabUtils.isUsingDesktopUserAgent(webContents);
          @TabUserAgent
-@@ -1753,6 +1801,43 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
+@@ -1773,6 +1821,43 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
                  /* forcedByUser */ false, caller);
      }
  
@@ -660,8 +660,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
 +    }
 +
      @NativeMethods
-     interface Natives {
-         TabImpl fromWebContents(WebContents webContents);
+     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+     public interface Natives {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java
@@ -909,7 +909,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -988,6 +988,9 @@ public final class ChromePreferenceKeys {
+@@ -1014,6 +1014,9 @@ public final class ChromePreferenceKeys {
      public static final String BLUETOOTH_NOTIFICATION_IDS = "Chrome.Bluetooth.NotificationIds";
      public static final String USB_NOTIFICATION_IDS = "Chrome.USB.NotificationIds";
  
@@ -919,7 +919,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
      /**
       * These values are currently used as SharedPreferences keys, along with the keys in
       * {@link LegacyChromePreferenceKeys#getKeysInUse()}. Add new SharedPreferences keys
-@@ -1124,6 +1127,8 @@ public final class ChromePreferenceKeys {
+@@ -1155,6 +1158,8 @@ public final class ChromePreferenceKeys {
                  SYNC_PROMO_TOTAL_SHOW_COUNT,
                  START_NEXT_SHOW_ON_STARTUP_DECISION_MS,
                  SEARCH_RESUMPTION_MODULE_COLLAPSE_ON_NTP,
@@ -1069,7 +1069,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1246,6 +1246,14 @@ extern const char kDesktopSharingHubEnabled[];
+@@ -1245,6 +1245,14 @@ extern const char kDesktopSharingHubEnabled[];
  #if !BUILDFLAG(IS_ANDROID)
  extern const char kLastWhatsNewVersion[];
  #endif
@@ -1147,7 +1147,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc
 --- a/content/browser/renderer_host/navigation_controller_android.cc
 +++ b/content/browser/renderer_host/navigation_controller_android.cc
-@@ -251,6 +251,7 @@ void NavigationControllerAndroid::LoadUrl(
+@@ -253,6 +253,7 @@ void NavigationControllerAndroid::LoadUrl(
      jboolean can_load_local_resources,
      jboolean is_renderer_initiated,
      jboolean should_replace_current_entry,
@@ -1155,7 +1155,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/co
      const JavaParamRef<jobject>& j_initiator_origin,
      jboolean has_user_gesture,
      jboolean should_clear_history_list,
-@@ -322,6 +323,9 @@ void NavigationControllerAndroid::LoadUrl(
+@@ -324,6 +325,9 @@ void NavigationControllerAndroid::LoadUrl(
  
    params.navigation_ui_data = std::move(navigation_ui_data);
  
@@ -1179,7 +1179,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.h b/con
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3410,6 +3410,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3425,6 +3425,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kLacrosUseChromeosProtectedMedia,
      switches::kLacrosUseChromeosProtectedAv1,
  #endif
@@ -1190,7 +1190,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -15,6 +15,7 @@
+@@ -14,6 +14,7 @@
  
  #include "base/allocator/partition_alloc_features.h"
  #include "base/allocator/partition_allocator/starscan/pcscan.h"
@@ -1198,7 +1198,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
  #include "base/bind.h"
  #include "base/check_op.h"
  #include "base/command_line.h"
-@@ -2804,6 +2805,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
+@@ -2797,6 +2798,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
          !renderer_preferences_.user_agent_override.ua_metadata_override->mobile)
  #endif
        prefs.viewport_meta_enabled = false;
@@ -1231,7 +1231,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -920,7 +920,6 @@ void RenderThreadImpl::InitializeRenderer(
+@@ -904,7 +904,6 @@ void RenderThreadImpl::InitializeRenderer(
      const std::string& reduced_user_agent,
      const blink::UserAgentMetadata& user_agent_metadata,
      const std::vector<std::string>& cors_exempt_header_list) {
diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch
index 1943921e..0a699c93 100644
--- a/build/patches/Welcome-screen.patch
+++ b/build/patches/Welcome-screen.patch
@@ -8,18 +8,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../android/java/res/layout/fre_tosanduma.xml |   4 +-
  .../firstrun/ChildAccountStatusSupplier.java  |  14 +-
- .../browser/firstrun/FirstRunActivity.java    |  40 +----
+ .../browser/firstrun/FirstRunActivity.java    |  42 +----
  .../firstrun/FirstRunActivityBase.java        |  11 +-
  .../firstrun/FirstRunFlowSequencer.java       |  60 ++-----
  .../browser/firstrun/FirstRunUtils.java       |  16 +-
- .../firstrun/ToSAndUMAFirstRunFragment.java   | 168 +++++-------------
+ .../firstrun/ToSAndUMAFirstRunFragment.java   | 166 +++++-------------
  .../strings/android_chrome_strings.grd        |  27 ++-
- 8 files changed, 89 insertions(+), 251 deletions(-)
+ 8 files changed, 87 insertions(+), 253 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -86,11 +86,11 @@
+@@ -86,11 +86,11 @@ found in the LICENSE file.
                          android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
  
                      <CheckBox
@@ -68,16 +68,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -32,8 +32,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity;
+@@ -33,9 +33,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.fonts.FontPreloader;
  import org.chromium.chrome.browser.metrics.UmaUtils;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
+-import org.chromium.chrome.browser.signin.SigninCheckerProvider;
 -import org.chromium.chrome.browser.signin.SigninFirstRunFragment;
 -import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -144,18 +142,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -146,18 +143,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
      /** Creates first page and sets up adapter. Should result UI being shown on the screen. */
      private void createFirstPage() {
          BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage();
@@ -97,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
          mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN);
          mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages);
          mPager.setAdapter(mPagerAdapter);
-@@ -163,15 +150,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -165,15 +151,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
          // native and policy service have been initialized.
      }
  
@@ -113,7 +114,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
      /**
       * Create the page sequence which requires native initialized, and policies loaded if any
       * on-device policies may exists.
-@@ -185,7 +163,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -192,14 +169,12 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+             // TODO(b/245912657): explicitly sign in supervised users in {@link
+             // SigninFirstRunMediator#handleContinueWithNative} rather than relying on
+             // SigninChecker.
+-            SigninCheckerProvider.get();
+         }
+ 
+         mFirstRunFlowSequencer.updateFirstRunProperties(mFreProperties);
  
          BooleanSupplier showSearchEnginePromo =
                  () -> mFreProperties.getBoolean(SHOW_SEARCH_ENGINE_PAGE);
@@ -121,7 +129,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
  
          // An optional page to select a default search engine.
          if (showSearchEnginePromo.getAsBoolean()) {
-@@ -194,11 +171,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -208,11 +183,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
              mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN);
          }
  
@@ -133,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
          if (mPagerAdapter != null) {
              mPagerAdapter.notifyDataSetChanged();
          }
-@@ -243,10 +215,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -257,10 +227,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
  
      @Override
      public void triggerLayoutInflation() {
@@ -144,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
          super.triggerLayoutInflation();
  
          initializeStateFromLaunchData();
-@@ -256,7 +224,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -270,7 +236,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
          setFinishOnTouchOutside(true);
  
          setContentView(createContentView());
@@ -153,15 +161,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
              // SigninFirstRunFragment doesn't use getProperties() and can be shown right away,
              // without waiting for FirstRunFlowSequencer.
              createFirstPage();
-@@ -528,10 +496,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
-     public void acceptTermsOfService(boolean allowCrashUpload) {
+@@ -542,10 +508,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+     public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) {
          assert mNativeInitializationPromise.isFulfilled();
  
 -        // If default is true then it corresponds to opt-out and false corresponds to opt-in.
 -        UmaUtils.recordMetricsReportingDefaultOptIn(!DEFAULT_METRICS_AND_CRASH_REPORTING);
 -        RecordHistogram.recordMediumTimesHistogram("MobileFre.FromLaunch.TosAccepted",
 -                SystemClock.elapsedRealtime() - mIntentCreationElapsedRealtimeMs);
-         FirstRunUtils.acceptTermsOfService(allowCrashUpload);
+         FirstRunUtils.acceptTermsOfService(allowMetricsAndCrashUploading);
          FirstRunStatus.setSkipWelcomePage(true);
          flushPersistentData();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
@@ -339,7 +347,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
  
  /** Provides first run related utility functions. */
  public class FirstRunUtils {
-@@ -80,16 +77,12 @@ public class FirstRunUtils {
+@@ -81,16 +78,12 @@ public class FirstRunUtils {
       * @return Whether or not sync is allowed on this device.
       */
      static boolean canAllowSync() {
@@ -358,7 +366,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
      }
  
      @VisibleForTesting
-@@ -99,10 +92,7 @@ public class FirstRunUtils {
+@@ -100,10 +93,7 @@ public class FirstRunUtils {
  
      @VisibleForTesting
      static boolean hasGoogleAccounts() {
@@ -413,7 +421,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
      private TextView mTosAndPrivacy;
      private View mTitle;
      private View mProgressSpinner;
-@@ -89,15 +92,15 @@ public class ToSAndUMAFirstRunFragment
+@@ -89,14 +92,14 @@ public class ToSAndUMAFirstRunFragment
          mProgressSpinner = view.findViewById(R.id.progress_spinner);
          mProgressSpinner.setVisibility(View.GONE);
          mAcceptButton = (Button) view.findViewById(R.id.terms_accept);
@@ -424,16 +432,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
          // Register event listeners.
          mAcceptButton.setOnClickListener((v) -> onTosButtonClicked());
 -        mSendReportCheckBox.setOnCheckedChangeListener(((compoundButton, isChecked) -> {
--            mAllowCrashUpload = isChecked;
+-            mAllowMetricsAndCrashUploading = isChecked;
 -            mUserInteractedWithUmaCheckbox = true;
--        }));
 +        mAutoUpdaterCheckBox.setOnCheckedChangeListener(
 +                ((compoundButton, isChecked) -> {
-+                   mAutoUpdaterChecked = isChecked;
-+                }));
++            mAutoUpdaterChecked = isChecked;
+         }));
  
          // Make TextView links clickable.
-         mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
 @@ -113,7 +116,9 @@ public class ToSAndUMAFirstRunFragment
          // initialized at which point the activity will skip the page.
          // We distinguish case 1 from case 2 by the value of |mNativeInitialized|, as that is set
@@ -454,23 +460,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
          }
      }
  
-@@ -166,13 +171,8 @@ public class ToSAndUMAFirstRunFragment
+@@ -166,13 +171,7 @@ public class ToSAndUMAFirstRunFragment
          assert !isWaitingForNativeAndPolicyInit();
  
          setSpinnerVisible(false);
--        mSendReportCheckBox.setChecked(mAllowCrashUpload);
+-        mSendReportCheckBox.setChecked(mAllowMetricsAndCrashUploading);
 -    }
 -
 -    /** Implements {@link FreUMADialogCoordinator.Listener} */
 -    @Override
--    public void onAllowCrashUploadChecked(boolean allowCrashUpload) {
--        mAllowCrashUpload = allowCrashUpload;
-+        // always checked, regardless of current preference state
+-    public void onAllowMetricsAndCrashUploadingChecked(boolean allowMetricsAndCrashUploading) {
+-        mAllowMetricsAndCrashUploading = allowMetricsAndCrashUploading;
 +        mAutoUpdaterCheckBox.setChecked(true);
      }
  
      private void updateView() {
-@@ -181,115 +181,39 @@ public class ToSAndUMAFirstRunFragment
+@@ -181,116 +180,39 @@ public class ToSAndUMAFirstRunFragment
              return;
          }
  
@@ -578,13 +583,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 -        // which case a previous call to this method has already checked the checkbox expected
 -        // initial state.
 -        if (!mUserInteractedWithUmaCheckbox) {
--            mAllowCrashUpload = getUmaCheckBoxInitialState();
--            mSendReportCheckBox.setChecked(mAllowCrashUpload);
+-            mAllowMetricsAndCrashUploading = getUmaCheckBoxInitialState();
+-            mSendReportCheckBox.setChecked(mAllowMetricsAndCrashUploading);
 -        }
 -
 -        if (!canShowUmaCheckBox()) {
 -            if (!umaDialogMayBeShown) {
--                mAllowCrashUpload = (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
+-                mAllowMetricsAndCrashUploading =
+-                        (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
 -                        && !isMetricsReportingDisabledByPolicy;
 -            }
 -            mSendReportCheckBox.setVisibility(View.GONE);
@@ -594,13 +600,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 -    private void openUmaDialog() {
 -        new FreUMADialogCoordinator(requireContext(),
 -                ((ModalDialogManagerHolder) getActivity()).getModalDialogManager(), this,
--                mAllowCrashUpload);
+-                mAllowMetricsAndCrashUploading);
 +    private void updateReportCheckbox() {
 +        mAutoUpdaterCheckBox.setChecked(true);
      }
  
      private void onPolicyServiceInitialized(boolean onDevicePolicyFound) {
-@@ -316,6 +240,12 @@ public class ToSAndUMAFirstRunFragment
+@@ -317,6 +239,12 @@ public class ToSAndUMAFirstRunFragment
      private void onTosButtonClicked() {
          mTosButtonClicked = true;
          mTosAcceptedTime = SystemClock.elapsedRealtime();
@@ -613,7 +619,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
          tryMarkTermsAccepted(true);
      }
  
-@@ -326,7 +256,8 @@ public class ToSAndUMAFirstRunFragment
+@@ -327,7 +255,8 @@ public class ToSAndUMAFirstRunFragment
       * @param fromButtonClicked Whether called from {@link #onTosButtonClicked()}.
       */
      private void tryMarkTermsAccepted(boolean fromButtonClicked) {
@@ -623,16 +629,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
              if (fromButtonClicked) setSpinnerVisible(true);
              return;
          }
-@@ -337,7 +268,7 @@ public class ToSAndUMAFirstRunFragment
+@@ -338,7 +267,7 @@ public class ToSAndUMAFirstRunFragment
              RecordHistogram.recordTimesHistogram("MobileFre.TosFragment.SpinnerVisibleDuration",
                      SystemClock.elapsedRealtime() - mTosAcceptedTime);
          }
--        getPageDelegate().acceptTermsOfService(mAllowCrashUpload);
+-        getPageDelegate().acceptTermsOfService(mAllowMetricsAndCrashUploading);
 +        getPageDelegate().acceptTermsOfService(false);
          getPageDelegate().advanceToNextPage();
      }
  
-@@ -380,10 +311,7 @@ public class ToSAndUMAFirstRunFragment
+@@ -381,10 +310,7 @@ public class ToSAndUMAFirstRunFragment
  
          mAcceptButton.setVisibility(visibility);
          mTosAndPrivacy.setVisibility(visibility);
@@ -644,7 +650,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
      }
  
      protected View getToSAndPrivacyText() {
-@@ -396,18 +324,6 @@ public class ToSAndUMAFirstRunFragment
+@@ -397,18 +323,6 @@ public class ToSAndUMAFirstRunFragment
          }
      }
  
@@ -666,7 +672,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -2926,11 +2926,30 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2935,11 +2935,30 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Chrome is governed by Chrome's terms of service, and the Google Privacy Policy.">
          <ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Chrome. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Google Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Google Chrome and ChromeOS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Policy<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
        </message>
diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch
index 2bda80b4..2a53b17b 100644
--- a/build/patches/autofill-miscellaneous.patch
+++ b/build/patches/autofill-miscellaneous.patch
@@ -131,7 +131,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
 diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/components/autofill/core/browser/browser_autofill_manager.h
 --- a/components/autofill/core/browser/browser_autofill_manager.h
 +++ b/components/autofill/core/browser/browser_autofill_manager.h
-@@ -699,9 +699,9 @@ class BrowserAutofillManager : public AutofillManager,
+@@ -722,9 +722,9 @@ class BrowserAutofillManager : public AutofillManager,
    std::unique_ptr<CreditCardFormEventLogger> credit_card_form_event_logger_;
  
    // Have we logged whether Autofill is enabled for this page load?
@@ -146,7 +146,7 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo
 diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
 --- a/components/autofill/core/common/autofill_features.cc
 +++ b/components/autofill/core/common/autofill_features.cc
-@@ -509,7 +509,7 @@ const base::FeatureParam<int> kAutofillServerBehaviorsParam{
+@@ -499,7 +499,7 @@ const base::FeatureParam<int> kAutofillServerBehaviorsParam{
  // "upload" resources.
  // i.e., https://other.autofill.server:port/tbproxy/af/
  const base::Feature kAutofillServerCommunication{
@@ -158,16 +158,16 @@ diff --git a/components/autofill/core/common/autofill_features.cc b/components/a
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -120,7 +120,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-       prefs::kAutofillEnabledDeprecated, true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+@@ -112,7 +112,7 @@ const char kAutocompleteLastVersionRetentionPolicy[] =
+ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+   // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
    registry->RegisterBooleanPref(
 -      prefs::kAutofillProfileEnabled, true,
 +      prefs::kAutofillProfileEnabled, false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterIntegerPref(
        prefs::kAutofillLastVersionDeduped, 0,
-@@ -130,7 +130,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -122,7 +122,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
        prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch
index cabac5f0..022e031e 100644
--- a/build/patches/build-remove-calling-untrusted-hooks.patch
+++ b/build/patches/build-remove-calling-untrusted-hooks.patch
@@ -7,8 +7,8 @@ sysroot.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- DEPS | 124 ++---------------------------------------------------------
- 1 file changed, 3 insertions(+), 121 deletions(-)
+ DEPS | 125 ++---------------------------------------------------------
+ 1 file changed, 3 insertions(+), 122 deletions(-)
 
 diff --git a/DEPS b/DEPS
 --- a/DEPS
@@ -22,7 +22,7 @@ diff --git a/DEPS b/DEPS
  
    # By default, do not check out src-internal. This can be overridden e.g. with
    # custom_vars.
-@@ -162,8 +162,8 @@ vars = {
+@@ -165,8 +165,8 @@ vars = {
    # support for other platforms may be added in the future.
    'checkout_openxr' : 'checkout_win',
  
@@ -33,7 +33,7 @@ diff --git a/DEPS b/DEPS
  
    # By default bot checkouts the WPR archive files only when this
    # flag is set True.
-@@ -3763,49 +3763,6 @@ hooks = [
+@@ -3834,49 +3834,6 @@ hooks = [
          'sync', '--extract',
      ],
    },
@@ -83,7 +83,7 @@ diff --git a/DEPS b/DEPS
    {
      # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
      'name': 'ciopfs_linux',
-@@ -3967,57 +3924,6 @@ hooks = [
+@@ -4047,57 +4004,6 @@ hooks = [
      ],
    },
  
@@ -141,7 +141,7 @@ diff --git a/DEPS b/DEPS
    # Pull rc binaries using checked-in hashes.
    {
      'name': 'rc_win',
-@@ -4043,30 +3949,6 @@ hooks = [
+@@ -4123,31 +4029,6 @@ hooks = [
                  '-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
      ],
    },
@@ -160,6 +160,7 @@ diff --git a/DEPS b/DEPS
 - {
 -    'name': 'test_fonts',
 -    'pattern': '.',
+-    'condition': 'checkout_testdata',
 -    'action': [ 'python3',
 -                'src/third_party/depot_tools/download_from_google_storage.py',
 -                '--no_resume',
diff --git a/build/patches/disable-WebView-variations-support.patch b/build/patches/disable-WebView-variations-support.patch
index 8d74f707..1d6eefb1 100644
--- a/build/patches/disable-WebView-variations-support.patch
+++ b/build/patches/disable-WebView-variations-support.patch
@@ -26,7 +26,7 @@ diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewC
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
-@@ -493,8 +493,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
+@@ -500,8 +500,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
                  }
              }
  
diff --git a/build/patches/exit-on-failure-of-inclusion.patch b/build/patches/exit-on-failure-of-inclusion.patch
index 0c51cfe6..dac72280 100644
--- a/build/patches/exit-on-failure-of-inclusion.patch
+++ b/build/patches/exit-on-failure-of-inclusion.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
 --- a/chrome/installer/linux/debian/build.sh
 +++ b/chrome/installer/linux/debian/build.sh
-@@ -235,15 +235,15 @@ DEB_CHANGELOG="${TMPFILEDIR}/changelog"
+@@ -240,15 +240,15 @@ DEB_CHANGELOG="${TMPFILEDIR}/changelog"
  DEB_FILES="${TMPFILEDIR}/files"
  DEB_CONTROL="${TMPFILEDIR}/control"
  
diff --git a/build/patches/first_run-deactivate-autoupdate-globally.patch b/build/patches/first_run-deactivate-autoupdate-globally.patch
index 1fbb3c7c..092e4e4b 100644
--- a/build/patches/first_run-deactivate-autoupdate-globally.patch
+++ b/build/patches/first_run-deactivate-autoupdate-globally.patch
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
-@@ -203,8 +203,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
+@@ -204,8 +204,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
  
    user_script_manager_ = std::make_unique<UserScriptManager>(profile_);
  
diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
index 67cee7d4..23594f63 100644
--- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
+++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
 --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
 +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
-@@ -219,11 +219,11 @@ bool H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+@@ -222,11 +222,11 @@ bool H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
      init_params.iRCMode = RC_OFF_MODE;
    }
  
diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch
index d05cd1f3..ec24710d 100644
--- a/build/patches/ungoogled-chromium-Disable-Gaia.patch
+++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch
@@ -24,7 +24,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
  
  constexpr char kBadAuthenticationError[] = "BadAuthentication";
  constexpr char kBadAuthenticationShortError[] = "badauth";
-@@ -289,6 +289,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+@@ -286,6 +286,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
      const net::NetworkTrafficAnnotationTag& traffic_annotation) {
    DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
  
@@ -32,7 +32,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = gaia_gurl;
    original_url_ = gaia_gurl;
-@@ -346,6 +347,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+@@ -343,6 +344,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
        base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
                       base::Unretained(this)),
        kMaxMessageSize);
diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
index 9dafe633..2316c1b4 100644
--- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
+++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1427,8 +1427,6 @@ static_library("browser") {
+@@ -1436,8 +1436,6 @@ static_library("browser") {
      "profiles/profile_attributes_storage.cc",
      "profiles/profile_attributes_storage.h",
      "profiles/profile_attributes_storage_observer.h",
diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
index 87006f81..bc895672 100644
--- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch
+++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml b/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
 --- a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
 +++ b/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
-@@ -29,47 +29,4 @@
+@@ -31,47 +31,4 @@ found in the LICENSE file.
  
      </PreferenceCategory>
  
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/language/android/java/res/xml/languages_detailed_pre
 diff --git a/chrome/browser/language/android/java/res/xml/languages_preferences.xml b/chrome/browser/language/android/java/res/xml/languages_preferences.xml
 --- a/chrome/browser/language/android/java/res/xml/languages_preferences.xml
 +++ b/chrome/browser/language/android/java/res/xml/languages_preferences.xml
-@@ -11,9 +11,4 @@
+@@ -13,9 +13,4 @@ found in the LICENSE file.
          android:layout="@layout/languages_preference"
          android:widgetLayout="@layout/accept_languages_list" />
  
@@ -81,7 +81,7 @@ diff --git a/chrome/browser/language/android/java/res/xml/languages_preferences.
 diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
 +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
-@@ -49,12 +49,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -48,12 +48,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
      static final String APP_LANGUAGE_PREFERENCE_KEY = "app_language_preference";
      static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
      static final String CONTENT_LANGUAGES_KEY = "content_languages_preference";
@@ -94,7 +94,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
  
      private static final String TAG = "LanguageSettings";
  
-@@ -100,27 +94,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -99,27 +93,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
          ContentLanguagesPreference mLanguageListPref =
                  (ContentLanguagesPreference) findPreference(PREFERRED_LANGUAGES_KEY);
          mLanguageListPref.registerActivityLauncher(this);
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
      }
  
      /**
-@@ -140,8 +113,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -134,8 +107,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
          ContentLanguagesPreference mLanguageListPref =
                  (ContentLanguagesPreference) findPreference(CONTENT_LANGUAGES_KEY);
          mLanguageListPref.registerActivityLauncher(this);
@@ -131,7 +131,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
      }
  
      /**
-@@ -171,7 +142,7 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -165,7 +136,7 @@ public class LanguageSettings extends PreferenceFragmentCompat
       * @param contentLanguagesPreference ContentLanguagesPreference reference to update about state
       *         changes.
       */
@@ -140,7 +140,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
          // Setup expandable advanced settings section.
          PreferenceCategory translationAdvancedSection =
                  (PreferenceCategory) findPreference(TRANSLATION_ADVANCED_SECTION);
-@@ -233,9 +204,7 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -227,9 +198,7 @@ public class LanguageSettings extends PreferenceFragmentCompat
                  return true;
              }
          });
@@ -151,7 +151,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
  
      @Override
      public void onStart() {
-@@ -273,12 +242,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
+@@ -267,12 +236,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
              // Set the default target language to match the new app language.
              TranslateBridge.setDefaultTargetLanguage(code);
          } else if (requestCode == REQUEST_CODE_CHANGE_TARGET_LANGUAGE) {
@@ -167,7 +167,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1598,9 +1598,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1557,9 +1557,6 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_LANGUAGES_LIST_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
          Websites will show text in your preferred language, when possible.
        </message>
@@ -180,7 +180,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
 --- a/components/translate/core/browser/translate_manager.cc
 +++ b/components/translate/core/browser/translate_manager.cc
-@@ -879,8 +879,9 @@ void TranslateManager::FilterIsTranslatePossible(
+@@ -872,8 +872,9 @@ void TranslateManager::FilterIsTranslatePossible(
          ->LogAutofillAssistantDeferredTriggerDecision();
    }
  
diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
index 0058f4ae..83fcee26 100644
--- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
@@ -7,20 +7,20 @@ Disable domain reliability detection
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../domain_reliability/service_factory.cc     |  24 +--
+ .../domain_reliability/service_factory.cc     |  24 +-
  components/domain_reliability/BUILD.gn        |  42 ++--
  .../domain_reliability/bake_in_configs.py     |   2 +-
  .../domain_reliability/context_manager.cc     |  22 +-
  .../domain_reliability/google_configs.cc      |  10 +-
  .../domain_reliability/google_configs.h       |   8 +-
  components/domain_reliability/uploader.cc     |   2 +-
- components/google/core/common/google_util.cc  | 199 ++----------------
+ components/google/core/common/google_util.cc  | 205 +-----------------
  .../browser/page_load_metrics_util.cc         |   4 +-
  .../common/page_load_metrics_util.cc          |  33 +--
  components/search_engines/template_url.cc     |   6 +-
  net/base/url_util.cc                          |  21 --
  services/network/network_context.cc           |   2 +-
- 13 files changed, 45 insertions(+), 330 deletions(-)
+ 13 files changed, 40 insertions(+), 341 deletions(-)
 
 diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc
 --- a/chrome/browser/domain_reliability/service_factory.cc
@@ -241,7 +241,7 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia
 diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -27,132 +27,10 @@
+@@ -27,63 +27,7 @@
  
  namespace google_util {
  
@@ -302,21 +302,14 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
 -  std::string www_domain = base::StrCat({"www.", domain_in_lower_case});
 -  return base::EqualsCaseInsensitiveASCII(host_minus_tld, www_domain);
 -}
--
--// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
--// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
--// port for its scheme (80 for HTTP, 443 for HTTPS).
--bool IsValidURL(const GURL& url, PortPermission port_permission) {
--  static bool g_ignore_port_numbers =
--      base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kIgnoreGooglePortNumbers);
--  return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
--         (url.port().empty() || g_ignore_port_numbers ||
--          (port_permission == ALLOW_NON_STANDARD_PORTS));
--}
--
--bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
--                                   SubdomainPermission subdomain_permission) {
++// Global functions -----------------------------------------------------------
+ 
+ // True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
+ // is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
+@@ -99,60 +43,11 @@ bool IsValidURL(const GURL& url, PortPermission port_permission) {
+ 
+ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+                                    SubdomainPermission subdomain_permission) {
 -  const GURL& base_url(CommandLineGoogleBaseURL());
 -  if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
 -    return true;
@@ -353,12 +346,13 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
 -          {"ipv4.google.com", "ipv6.google.com"});
 -
 -  return google_subdomains.contains(host);
--}
--
++  return false;
+ }
+ 
 -}  // namespace
 -
- // Global functions -----------------------------------------------------------
- 
+-// Global functions -----------------------------------------------------------
+-
  const char kGoogleHomepageURL[] = "https://www.google.com/";
  
 -bool HasGoogleSearchQueryParam(base::StringPiece str) {
@@ -374,7 +368,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
  std::string GetGoogleLocale(const std::string& application_locale) {
    // Google does not recognize "nb" for Norwegian Bokmal; it uses "no".
    return (application_locale == "nb") ? "no" : application_locale;
-@@ -165,25 +43,7 @@ GURL AppendGoogleLocaleParam(const GURL& url,
+@@ -165,25 +60,7 @@ GURL AppendGoogleLocaleParam(const GURL& url,
  }
  
  std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
@@ -401,7 +395,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
  }
  
  GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
-@@ -222,65 +82,30 @@ bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
+@@ -229,92 +106,24 @@ bool IsGoogleDomainUrl(const GURL& url,
  
  bool IsGoogleHostname(base::StringPiece host,
                        SubdomainPermission subdomain_permission) {
@@ -411,15 +405,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
 +  return false;
  }
  
- bool IsGoogleDomainUrl(const GURL& url,
-                        SubdomainPermission subdomain_permission,
-                        PortPermission port_permission) {
--  return IsValidURL(url, port_permission) &&
--         IsCanonicalHostGoogleHostname(url.host_piece(), subdomain_permission);
-+  return false;
- }
- 
--bool IsGoogleHomePageUrl(const GURL& url) {
+ bool IsGoogleHomePageUrl(const GURL& url) {
 -  // First check to see if this has a Google domain.
 -  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
 -                         DISALLOW_NON_STANDARD_PORTS) &&
@@ -431,11 +417,10 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
 -  base::StringPiece path(url.path_piece());
 -  return IsPathHomePageBase(path) ||
 -         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
-+bool IsGoogleHomePageUrl(const GURL& url) { // disabled in Bromite
 +  return false;
  }
  
--bool IsGoogleSearchUrl(const GURL& url) {
+ bool IsGoogleSearchUrl(const GURL& url) {
 -  // First check to see if this has a Google domain.
 -  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
 -                         DISALLOW_NON_STANDARD_PORTS) &&
@@ -453,35 +438,64 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
 -  // the path type.
 -  return HasGoogleSearchQueryParam(url.ref_piece()) ||
 -         (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
-+bool IsGoogleSearchUrl(const GURL& url) { // disabled in Bromite
 +  return false;
  }
  
--bool IsYoutubeDomainUrl(const GURL& url,
--                        SubdomainPermission subdomain_permission,
--                        PortPermission port_permission) {
+ bool IsYoutubeDomainUrl(const GURL& url,
+                         SubdomainPermission subdomain_permission,
+                         PortPermission port_permission) {
 -  return IsValidURL(url, port_permission) &&
 -         IsCanonicalHostYoutubeHostname(url.host_piece(), subdomain_permission);
-+bool IsYoutubeDomainUrl(const GURL& url, SubdomainPermission subdomain_permission, PortPermission port_permission) { // disabled in Bromite
 +  return false;
  }
  
--bool IsGoogleAssociatedDomainUrl(const GURL& url) {
+ bool IsGoogleAssociatedDomainUrl(const GURL& url) {
 -  if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
 -    return true;
 -
 -  if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
 -    return true;
-+bool IsGoogleAssociatedDomainUrl(const GURL& url) { // disabled on Bromite
-+  if ((true))
-+    return false;
+-
+-  // Some domains don't have international TLD extensions, so testing for them
+-  // is very straightforward.
+-  static const char* kSuffixesToSetHeadersFor[] = {
+-      ".android.com",
+-      ".doubleclick.com",
+-      ".doubleclick.net",
+-      ".ggpht.com",
+-      ".googleadservices.com",
+-      ".googleapis.com",
+-      ".googlesyndication.com",
+-      ".googleusercontent.com",
+-      ".googlevideo.com",
+-      ".gstatic.com",
+-      ".litepages.googlezip.net",
+-      ".ytimg.com",
+-  };
+-  const std::string host = url.host();
+-  for (size_t i = 0; i < std::size(kSuffixesToSetHeadersFor); ++i) {
+-    if (base::EndsWith(host, kSuffixesToSetHeadersFor[i],
+-                       base::CompareCase::INSENSITIVE_ASCII)) {
+-      return true;
+-    }
+-  }
+-
+-  // Exact hostnames in lowercase to set headers for.
+-  static const char* kHostsToSetHeadersFor[] = {
+-      "googleweblight.com",
+-  };
+-  for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) {
+-    if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i]))
+-      return true;
+-  }
+-
+   return false;
+ }
  
-   // Some domains don't have international TLD extensions, so testing for them
-   // is very straightforward.
 diff --git a/components/page_load_metrics/browser/page_load_metrics_util.cc b/components/page_load_metrics/browser/page_load_metrics_util.cc
 --- a/components/page_load_metrics/browser/page_load_metrics_util.cc
 +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
-@@ -266,9 +266,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+@@ -280,9 +280,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
  }
  
  bool IsGoogleSearchHostname(const GURL& url) {
@@ -538,15 +552,15 @@ diff --git a/components/page_load_metrics/common/page_load_metrics_util.cc b/com
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -534,11 +534,7 @@ std::u16string TemplateURLRef::SearchTermToString16(
+@@ -535,11 +535,7 @@ std::u16string TemplateURLRef::SearchTermToString16(
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
--  return std::any_of(replacements_.begin(), replacements_.end(),
--                     [](const Replacement& replacement) {
--                       return replacement.type == GOOGLE_BASE_URL ||
--                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
--                     });
+-  return base::ranges::any_of(
+-      replacements_, [](const Replacement& replacement) {
+-        return replacement.type == GOOGLE_BASE_URL ||
+-               replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-      });
 +  return false;
  }
  
@@ -585,7 +599,7 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -2714,7 +2714,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2718,7 +2718,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
    }
  #endif  // BUILDFLAG(IS_CT_SUPPORTED)
  
diff --git a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch
index 87cf8bd5..4971e76e 100644
--- a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch
+++ b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -104,7 +104,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) {
+@@ -105,7 +105,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) {
      return kDefaultPublicInterfaceOnly;
    if (preference == kWebRTCIPHandlingDisableNonProxiedUdp)
      return kDisableNonProxiedUdp;
@@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  }
  
  bool IsValidPortRange(uint16_t min_port, uint16_t max_port) {
-@@ -785,7 +787,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -791,7 +793,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
            break;
        }
  
diff --git a/build/ruleset_converter.gn_args b/build/ruleset_converter.gn_args
index 050db13e..184b4f00 100644
--- a/build/ruleset_converter.gn_args
+++ b/build/ruleset_converter.gn_args
@@ -41,6 +41,7 @@ use_debug_fission=true
 use_errorprone_java_compiler=false
 use_gnome_keyring=false
 use_official_google_api_keys=false
+use_qt=false
 use_rtti=false
 use_sysroot=false
 webview_includes_weblayer=false