From bec354837cf6244a69ae33a78bbff5d30477c733 Mon Sep 17 00:00:00 2001 From: Carl <32685696+csagan5@users.noreply.github.com> Date: Thu, 20 Oct 2022 18:59:30 +0200 Subject: [PATCH] Patches for v106 (#2400) --- build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/bromite_patches_list.txt | 3 +- build/chromium_patches_list.txt | 1 + .../AImageReader-CFI-crash-mitigations.patch | 8 +- .../Add-AllowUserCertificates-flag.patch | 32 +- .../Add-IsCleartextPermitted-flag.patch | 10 +- .../Add-a-proxy-configuration-page.patch | 32 +- .../Add-an-always-incognito-mode.patch | 113 +- .../Add-bookmark-import-export-actions.patch | 64 +- ...dd-custom-tab-intents-privacy-option.patch | 18 +- build/patches/Add-exit-menu-item.patch | 8 +- ...g-for-omnibox-autocomplete-filtering.patch | 12 +- .../Add-flag-for-save-data-header.patch | 6 +- ...nfigure-maximum-connections-per-host.patch | 8 +- ...ontrol-video-playback-resume-feature.patch | 6 +- .../Add-flag-to-disable-IPv6-probes.patch | 10 +- ...-to-disable-external-intent-requests.patch | 6 +- .../Add-flag-to-disable-vibration.patch | 16 +- ...Add-lifetime-options-for-permissions.patch | 65 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 60 +- .../Add-menu-item-to-view-source.patch | 10 +- .../Add-new-cache-check-function.patch | 191 - .../Add-option-to-force-tablet-UI.patch | 16 +- ...-to-not-persist-tabs-across-sessions.patch | 18 +- .../Add-option-to-use-home-page-as-NTP.patch | 4 +- build/patches/Add-site-engagement-flag.patch | 14 +- build/patches/Add-webGL-site-setting.patch | 12 +- build/patches/Add-webRTC-site-settings.patch | 24 +- ...ow-building-without-enable_reporting.patch | 16 +- .../Ask-user-before-closing-all-tabs.patch | 6 +- .../Automated-domain-substitution.patch | 5517 +++++++---------- ...Block-gateway-attacks-via-websockets.patch | 10 +- .../Block-qjz9zk-or-trk-requests.patch | 4 +- .../Bookmarks-select-all-menu-entry.patch | 10 +- .../Bromite-AdBlockUpdaterService.patch | 32 +- build/patches/Bromite-auto-updater.patch | 66 +- build/patches/Client-hints-overrides.patch | 25 +- .../Content-settings-infrastructure.patch | 80 +- ...ctionary-suggestions-for-the-Omnibox.patch | 2 +- build/patches/Disable-AGSA-by-default.patch | 28 +- ...ble-Accessibility-service-by-default.patch | 2 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-FLoC-and-privacy-sandbox.patch | 53 +- build/patches/Disable-PrivacyGuide.patch | 4 +- build/patches/Disable-TLS-resumption.patch | 18 +- .../patches/Disable-all-predictors-code.patch | 36 +- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 14 +- .../Disable-feeds-support-by-default.patch | 4 +- ...Disable-fetching-of-all-field-trials.patch | 10 +- build/patches/Disable-idle-detection.patch | 2 +- ...-lock-icon-in-address-bar-by-default.patch | 2 +- ...media-router-and-remoting-by-default.patch | 8 +- .../Disable-minidump-upload-scheduling.patch | 6 +- .../patches/Disable-plugins-enumeration.patch | 2 +- ...e-references-to-fonts.googleapis.com.patch | 2 +- build/patches/Disable-safe-browsing.patch | 345 +- build/patches/Disable-safety-check.patch | 12 +- .../Disable-smart-selection-by-default.patch | 10 +- ...isable-some-signed-exchange-features.patch | 4 +- .../Disable-text-fragments-by-default.patch | 16 +- .../Disable-third-party-origin-trials.patch | 16 +- build/patches/Disable-various-metrics.patch | 20 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 4 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- build/patches/DoH-improvements.patch | 6 +- .../Enable-Certificate-Transparency.patch | 18 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 8 +- ...e-darken-websites-checkbox-in-themes.patch | 2 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-native-Android-autofill.patch | 76 +- .../Enable-network-isolation-features.patch | 8 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 28 +- .../Enable-user-agent-freeze-by-default.patch | 2 +- .../Experimental-user-scripts-support.patch | 240 +- ...ix-segmentation-platform-build-error.patch | 22 + ...story-number-of-days-privacy-setting.patch | 32 +- ...number-of-autocomplete-matches-to-10.patch | 14 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 14 +- build/patches/JIT-site-settings.patch | 40 +- .../Keep-empty-tabs-between-sessions.patch | 2 +- ...-allow-screenshots-in-Incognito-mode.patch | 4 +- build/patches/Logcat-crash-reports-UI.patch | 10 +- .../Make-all-favicon-requests-on-demand.patch | 8 +- .../patches/Modify-default-preferences.patch | 22 +- .../Move-navigation-bar-to-bottom.patch | 186 +- ...nt-settings-back-to-privacy-settings.patch | 16 +- .../Multiple-fingerprinting-mitigations.patch | 44 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../patches/Override-Navigator-Language.patch | 2 +- .../Partition-Blink-memory-cache.patch | 8 +- ...tition-DNS-requests-by-top-frame-NIK.patch | 79 +- .../patches/Re-introduce-kWebAuthCable.patch | 29 +- ...-modal-dialog-flag-to-close-all-tabs.patch | 24 +- ...e-introduce-override_build_timestamp.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 2 +- ...Reintroduce-override_build_timestamp.patch | 2 +- ...referrals-in-cross-origin-navigation.patch | 14 +- .../Remove-binary-blob-integrations.patch | 232 +- ...cklisted-URLs-upon-bookmark-creation.patch | 2 +- .../Remove-contextual-search-manager.patch | 294 +- build/patches/Remove-help-menu-item.patch | 4 +- ...-offline-measurement-background-task.patch | 4 +- ...price-shopping-commerce-integrations.patch | 375 +- .../Remove-signin-and-sync-integrations.patch | 711 ++- ...Remove-voice-recognition-integration.patch | 54 +- ...ndow-name-on-cross-origin-navigation.patch | 4 +- ...ce-DoH-probe-domain-with-RIPE-domain.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 16 +- .../Restore-Simplified-NTP-launch.patch | 32 +- .../Restore-offline-indicator-v2-flag.patch | 20 +- ...Delete-block-external-form-redirects.patch | 20 +- ...evert-Permit-blocking-of-view-source.patch | 10 +- ...ard-user-gesture-requirement-removal.patch | 2 +- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...vert-flags-remove-num-raster-threads.patch | 10 +- ...l-of-execution-context-address-space.patch | 28 +- ...moval-of-an-option-to-block-autoplay.patch | 38 +- ...tings-for-cookies-javascript-and-ads.patch | 6 +- build/patches/Site-setting-for-images.patch | 40 +- .../Stop-cross-origin-cache-hits.patch | 128 - .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Timezone-customization.patch | 103 +- build/patches/Unexpire-tab-groups-flags.patch | 8 +- build/patches/Update-i18n-zh_CN-support.patch | 10 +- build/patches/User-agent-customization.patch | 70 +- build/patches/Welcome-screen.patch | 131 +- build/patches/autofill-miscellaneous.patch | 20 +- ...build-remove-calling-untrusted-hooks.patch | 6 +- .../disable-WebView-variations-support.patch | 4 +- .../enable-ftrivial-auto-var-init-zero.patch | 2 +- build/patches/kill-Vision.patch | 4 +- ...net-cert-increase-default-key-length.patch | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 53 +- .../ungoogled-chromium-Disable-Gaia.patch | 4 +- ...gled-chromium-Disable-profile-avatar.patch | 2 +- ...ed-chromium-no-special-hosts-domains.patch | 10 +- ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- 143 files changed, 4653 insertions(+), 5961 deletions(-) delete mode 100644 build/patches/Add-new-cache-check-function.patch create mode 100644 build/patches/Fix-segmentation-platform-build-error.patch delete mode 100644 build/patches/Stop-cross-origin-cache-hits.patch diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 6671ffcf..4a8eacc3 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -f62e5bffd9c2c0b8c221851fa8a032f02f105141- \ No newline at end of file +25d529f97d15fcc222fcc6ebf047045fdc3c844c- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index c71bbbee..f7482ba4 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -105.0.5195.147 \ No newline at end of file +106.0.5249.72 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index bbbc1b4c..cf91097f 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -5c842aa7b24e6252ccabc8bcac8dafa4fe8ad9cd \ No newline at end of file +49e8f8fad2cf71c2fde1d1a9ecf68d04e4a6263b \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 5f4c2414..7e126764 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -3,6 +3,7 @@ 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 AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -197,8 +198,6 @@ Disable-PrivacyGuide.patch Re-introduce-modal-dialog-flag-to-close-all-tabs.patch sharing-hub-always-use-visible-URL.patch Re-introduce-kWebAuthCable.patch -Add-new-cache-check-function.patch -Stop-cross-origin-cache-hits.patch Revert-clipboard-user-gesture-requirement-removal.patch Enable-HEVC-by-default.patch Partition-blobs-by-top-frame-URL.patch diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 188a4659..a24b41ab 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -9,3 +9,4 @@ 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 a540ad0c..46140bc9 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ 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 -@@ -2392,9 +2392,9 @@ +@@ -2367,9 +2367,9 @@ "expiry_milestone": 106 }, { @@ -177,7 +177,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt --- a/gpu/config/gpu_workaround_list.txt +++ b/gpu/config/gpu_workaround_list.txt -@@ -15,6 +15,7 @@ decode_encode_srgb_for_generatemipmap +@@ -16,6 +16,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush disable_accelerated_av1_decode @@ -188,7 +188,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list 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 -@@ -589,6 +589,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -624,6 +624,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 -@@ -756,6 +756,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -754,6 +754,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}; diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index aae7c5dd..8c6b6d23 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -20,7 +20,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 -@@ -222,6 +222,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -223,6 +223,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; -@@ -939,6 +940,8 @@ public abstract class ChromeActivity +@@ -945,6 +946,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -40,18 +40,18 @@ 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/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 -@@ -74,6 +74,7 @@ public class ChromeCachedFlags { +@@ -77,6 +77,7 @@ public class ChromeCachedFlags { add(ChromeFeatureList.sAndroidAuxiliarySearch); add(ChromeFeatureList.sAnonymousUpdateChecks); add(ChromeFeatureList.sAppMenuMobileSiteOption); + add(ChromeFeatureList.sAllowUserCertificates); add(ChromeFeatureList.sBackGestureRefactorAndroid); + add(ChromeFeatureList.sCctBrandTransparency); add(ChromeFeatureList.sCctIncognito); - add(ChromeFeatureList.sCctIncognitoAvailableToThirdParty); 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 -@@ -3419,7 +3419,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3466,7 +3466,11 @@ const FeatureEntry kFeatureEntries[] = { {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName, flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, @@ -61,9 +61,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + flag_descriptions::kAllowUserCertificatesName, + flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)}, - {"explore-sites", flag_descriptions::kExploreSitesName, - flag_descriptions::kExploreSitesDescription, kOsAndroid, - FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites, + {"osk-resizes-visual-viewport", + flag_descriptions::kEnableOskResizesVisualViewportName, + flag_descriptions::kEnableOskResizesVisualViewportDescription, kOsAndroid, 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 @@ -82,7 +82,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 -@@ -39,6 +39,9 @@ namespace flag_descriptions { +@@ -40,6 +40,9 @@ namespace flag_descriptions { // Cross-platform ------------------------------------------------------------- @@ -95,15 +95,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 -@@ -145,6 +145,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &feed::kFeedInteractiveRefresh, - &feed::kFeedLoadingPlaceholder, +@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &feed::kFeedNoViewCache, + &feed::kFeedReplaceAll, &feed::kInterestFeedContentSuggestions, + &kAllowUserCertificates, &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -438,6 +439,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -440,6 +441,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -133,8 +133,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false) + .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false) .put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false) + .put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false) .put(ChromeFeatureList.CCT_INCOGNITO, true) - .put(ChromeFeatureList.CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY, false) 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 @@ -146,8 +146,8 @@ 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 = -@@ -600,6 +601,8 @@ public abstract class ChromeFeatureList { - public static final String FEED_ABLATION = "FeedAblation"; +@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList { + public static final String FEED_REPLACE_ALL = "FeedReplaceAll"; /* Alphabetical: */ + public static final CachedFlag sAllowUserCertificates = diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index c8f79478..00eec8bb 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 -@@ -8561,6 +8561,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8660,6 +8660,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 -@@ -1629,6 +1629,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1647,6 +1647,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 -@@ -915,6 +915,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -925,6 +925,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 -@@ -114,6 +114,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", +@@ -111,6 +111,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", const base::Feature kEncryptedClientHello{"EncryptedClientHello", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -70,7 +70,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -33,6 +33,8 @@ NET_EXPORT extern const base::Feature kAvoidH2Reprioritization; +@@ -29,6 +29,8 @@ NET_EXPORT extern const base::Feature kAvoidH2Reprioritization; // origin requests are restricted to contain at most the source origin. NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 891c3435..2353fdfe 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -73,17 +73,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting --- 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_DO_NOT_TRACK = "do_not_track"; - private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; - private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; -+ private static final String PREF_PROXY_OPTIONS = "proxy"; - private static final String PREF_PRIVACY_REVIEW = "privacy_review"; + private static final String PREF_PRIVACY_GUIDE = "privacy_guide"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; ++ private static final String PREF_PROXY_OPTIONS = "proxy"; + private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; + + private ManagedPreferenceDelegate mManagedPreferenceDelegate; 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 -@@ -271,6 +271,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -275,6 +275,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -95,7 +95,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -80,6 +80,12 @@ +@@ -76,6 +76,12 @@ @@ -130,7 +130,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h" @@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( - return std::make_unique( + return std::make_unique( profile_prefs, local_state_prefs, nullptr); #else - return std::make_unique(profile_prefs, nullptr); @@ -183,7 +183,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -163,6 +163,8 @@ +@@ -162,6 +162,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -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 -@@ -1045,6 +1047,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1014,6 +1016,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 -@@ -283,6 +283,8 @@ static_library("ui") { +@@ -282,6 +282,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -649,7 +649,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 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 -@@ -57,6 +57,7 @@ +@@ -58,6 +58,7 @@ #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h" #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy/policy_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" -@@ -779,6 +780,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -781,6 +782,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -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"; -@@ -432,6 +434,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -437,6 +439,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, -@@ -692,6 +695,7 @@ const char* const kChromeHostURLs[] = { +@@ -701,6 +704,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1168,7 +1168,7 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc -@@ -381,6 +381,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig( +@@ -380,6 +380,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig( if (proxy_dict.GetBypassList(&proxy_bypass)) { proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass); } diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 8a5449f4..51ac74ba 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -58,11 +58,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/history/history_tab_helper.h | 10 +- .../android/offline_page_bridge.cc | 13 +- .../android/offline_page_model_factory.cc | 21 ++- - .../android/request_coordinator_factory.cc | 17 ++ + .../android/request_coordinator_factory.cc | 21 ++- .../offline_page_model_factory.h | 1 + .../offline_pages/recent_tab_helper.cc | 19 ++- .../browser/offline_pages/recent_tab_helper.h | 3 + - .../request_coordinator_factory.h | 2 + + .../request_coordinator_factory.h | 4 +- chrome/browser/prefs/browser_prefs.cc | 5 + .../browser/ui/android/native_page/BUILD.gn | 2 + .../browser/ui/native_page/NativePage.java | 12 +- @@ -82,7 +82,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../omnibox/browser/base_search_provider.cc | 2 +- components/omnibox/browser/search_provider.cc | 4 +- .../host_content_settings_map_factory.cc | 1 + - 63 files changed, 676 insertions(+), 72 deletions(-) + 63 files changed, 680 insertions(+), 74 deletions(-) create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java @@ -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 -@@ -665,6 +665,7 @@ chrome_java_resources = [ +@@ -667,6 +667,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", -@@ -954,6 +955,7 @@ chrome_java_sources = [ +@@ -958,6 +959,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 -@@ -37,6 +37,11 @@ +@@ -38,6 +38,11 @@ android:key="secure_dns" android:title="@string/settings_secure_dns_title" android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings"/> @@ -244,7 +244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1900,8 +1901,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1817,6 +1818,9 @@ public abstract class ChromeActivity 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; -@@ -98,6 +99,10 @@ import java.util.ArrayList; +@@ -101,6 +102,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. -@@ -549,6 +554,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -561,6 +566,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; -@@ -609,7 +621,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -621,7 +633,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. -@@ -851,7 +871,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -863,7 +883,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; -@@ -776,7 +779,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -793,7 +796,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -500,7 +500,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java -@@ -31,6 +31,7 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener; +@@ -33,6 +33,7 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.ObservableSupplier; @@ -508,7 +508,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; -@@ -69,6 +70,12 @@ import org.chromium.url.GURL; +@@ -73,6 +74,12 @@ import org.chromium.url.GURL; import java.io.Serializable; import java.util.List; @@ -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. */ -@@ -481,7 +488,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve +@@ -493,7 +500,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve return mRootView; } @@ -603,7 +603,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -82,7 +82,8 @@ public class RecentTabsManager implements AccountsChangeObserver { +@@ -79,7 +79,8 @@ public class RecentTabsManager { */ public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile, Context context, Runnable showHistoryManager) { @@ -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 -@@ -125,6 +125,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto +@@ -126,6 +126,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; -@@ -491,7 +493,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -492,7 +494,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), @@ -963,7 +963,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.ntp.RecentlyClosedBridge; -@@ -108,6 +109,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod +@@ -109,6 +110,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod public void onNativeLibraryReady(TabContentManager tabContentProvider) { assert mTabContentManager == null : "onNativeLibraryReady called twice!"; @@ -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 -@@ -4603,6 +4603,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4651,6 +4651,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 -@@ -297,6 +297,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +@@ -301,6 +301,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() return IdentityManagerFactory::GetForProfile(profile_); } @@ -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 -@@ -3614,6 +3614,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3676,6 +3676,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 -@@ -2055,6 +2055,9 @@ extern const char kNotificationPermissionRationaleDescription[]; +@@ -2092,6 +2092,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 -@@ -517,8 +517,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab", +@@ -532,8 +532,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab", const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1230,8 +1230,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -29,6 +29,9 @@ - #include "chrome/browser/feed/feed_service_factory.h" +@@ -36,6 +36,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" +#include "chrome/common/pref_names.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" -@@ -341,6 +344,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -410,6 +413,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1254,7 +1254,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return NULL; -@@ -348,6 +358,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -417,6 +427,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1413,7 +1413,15 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc b/chrome/browser/offline_pages/android/request_coordinator_factory.cc --- a/chrome/browser/offline_pages/android/request_coordinator_factory.cc +++ b/chrome/browser/offline_pages/android/request_coordinator_factory.cc -@@ -29,6 +29,11 @@ +@@ -19,6 +19,7 @@ + #include "chrome/browser/ui/android/tab_model/tab_model.h" + #include "chrome/browser/ui/android/tab_model/tab_model_list.h" + #include "chrome/common/chrome_constants.h" ++#include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/offline_pages/core/background/offliner.h" + #include "components/offline_pages/core/background/offliner_policy.h" + #include "components/offline_pages/core/background/request_coordinator.h" +@@ -28,6 +29,11 @@ #include "components/offline_pages/core/offline_page_feature.h" #include "content/public/browser/web_contents.h" @@ -1425,7 +1433,17 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc namespace network { class NetworkQualityTracker; } -@@ -114,4 +119,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor( +@@ -61,7 +67,8 @@ class ActiveTabInfo : public RequestCoordinator::ActiveTabInfo { + }; + + RequestCoordinatorFactory::RequestCoordinatorFactory() +- : ProfileKeyedServiceFactory("OfflineRequestCoordinator") { ++ : BrowserContextKeyedServiceFactory("OfflineRequestCoordinator", ++ BrowserContextDependencyManager::GetInstance()) { + // Depends on OfflinePageModelFactory in SimpleDependencyManager. + } + +@@ -111,4 +118,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor( return request_coordinator; } @@ -1512,7 +1530,16 @@ diff --git a/chrome/browser/offline_pages/recent_tab_helper.h b/chrome/browser/o diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome/browser/offline_pages/request_coordinator_factory.h --- a/chrome/browser/offline_pages/request_coordinator_factory.h +++ b/chrome/browser/offline_pages/request_coordinator_factory.h -@@ -36,6 +36,8 @@ class RequestCoordinatorFactory : public BrowserContextKeyedServiceFactory { +@@ -18,7 +18,7 @@ namespace offline_pages { + class RequestCoordinator; + + // A factory to create one unique RequestCoordinator. +-class RequestCoordinatorFactory : public ProfileKeyedServiceFactory { ++class RequestCoordinatorFactory : public BrowserContextKeyedServiceFactory { + public: + static RequestCoordinatorFactory* GetInstance(); + static RequestCoordinator* GetForBrowserContext( +@@ -36,6 +36,8 @@ class RequestCoordinatorFactory : public ProfileKeyedServiceFactory { KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const override; @@ -1524,7 +1551,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -227,6 +227,7 @@ +@@ -226,6 +226,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1532,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" -@@ -1423,6 +1424,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1389,6 +1390,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1690,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 -@@ -3408,6 +3408,12 @@ const char kShowCaretBrowsingDialog[] = +@@ -3435,6 +3435,12 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1706,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 -@@ -1210,6 +1210,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1215,6 +1215,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1715,7 +1742,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1247,6 +1249,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1252,6 +1254,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1775,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 -@@ -239,6 +239,7 @@ const char* ContentSettingToString(ContentSetting setting) { +@@ -242,6 +242,7 @@ const char* ContentSettingToString(ContentSetting setting) { HostContentSettingsMap::HostContentSettingsMap( PrefService* prefs, bool is_off_the_record, @@ -1783,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()), -@@ -247,6 +248,7 @@ HostContentSettingsMap::HostContentSettingsMap( +@@ -250,6 +251,7 @@ HostContentSettingsMap::HostContentSettingsMap( #endif prefs_(prefs), is_off_the_record_(is_off_the_record), @@ -1791,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"); -@@ -258,7 +260,7 @@ HostContentSettingsMap::HostContentSettingsMap( +@@ -261,7 +263,7 @@ HostContentSettingsMap::HostContentSettingsMap( policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -1811,7 +1838,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session); -@@ -443,6 +444,8 @@ class HostContentSettingsMap : public content_settings::Observer, +@@ -450,6 +451,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; @@ -1869,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 -@@ -264,7 +264,7 @@ bool BaseSearchProvider::CanSendRequest( +@@ -271,7 +271,7 @@ bool BaseSearchProvider::CanSendRequest( } // Don't run if in incognito mode. @@ -1881,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 -@@ -807,7 +807,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { +@@ -835,7 +835,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 ca3d6aa7..997ce02f 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java -@@ -88,6 +88,12 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -89,6 +89,12 @@ public class BookmarkActionBar extends SelectableListToolbar } else if (menuItem.getItemId() == R.id.search_menu_id) { mDelegate.openSearchUI(); return true; @@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } SelectionDelegate selectionDelegate = mDelegate.getSelectionDelegate(); -@@ -139,6 +145,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -140,6 +146,8 @@ public class BookmarkActionBar extends SelectableListToolbar void showLoadingUi() { setTitle(null); setNavigationButton(NAVIGATION_BUTTON_NONE); @@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -148,6 +156,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -149,6 +157,8 @@ public class BookmarkActionBar extends SelectableListToolbar super.showNormalView(); if (mDelegate == null) { @@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -177,6 +187,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -178,6 +188,8 @@ public class BookmarkActionBar extends SelectableListToolbar @Override public void onFolderStateSet(BookmarkId folder) { mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); @@ -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. -@@ -1303,6 +1545,39 @@ public class BookmarkBridge { +@@ -1285,6 +1527,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> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -1374,6 +1649,9 @@ public class BookmarkBridge { +@@ -1356,6 +1631,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 bookmarksList); @@ -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 -@@ -1862,6 +1862,13 @@ static_library("browser") { +@@ -1863,6 +1863,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", -@@ -2877,6 +2884,8 @@ static_library("browser") { +@@ -2885,6 +2892,8 @@ static_library("browser") { "autofill/manual_filling_controller.h", "autofill/manual_filling_controller_impl.cc", "autofill/manual_filling_controller_impl.h", @@ -727,19 +727,19 @@ 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", -@@ -3544,8 +3553,6 @@ static_library("browser") { +@@ -3558,8 +3567,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", - "bookmarks/bookmark_html_writer.cc", - "bookmarks/bookmark_html_writer.h", + "bookmarks/url_and_id.h", "cart/cart_db.cc", "cart/cart_db.h", - "cart/cart_discount_fetcher.cc", 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 -@@ -8559,6 +8559,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8654,6 +8654,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 -@@ -58,6 +58,25 @@ +@@ -59,6 +59,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; -@@ -75,8 +94,92 @@ using bookmarks::android::JavaBookmarkIdGetType; +@@ -76,8 +95,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, -@@ -162,6 +265,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -163,6 +266,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&) { -@@ -572,6 +679,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -573,6 +680,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& obj, jlong id, -@@ -372,12 +392,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -371,12 +391,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, void DestroyJavaObject(); raw_ptr 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. -@@ -389,6 +413,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -388,6 +412,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, // Observes the profile destruction and creation. base::ScopedObservation 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 -@@ -6279,6 +6279,11 @@ const char kDisableLacrosTtsSupportDescription[] = +@@ -6458,6 +6458,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 -@@ -3625,6 +3625,9 @@ extern const char kDisableLacrosTtsSupportName[]; +@@ -3734,6 +3734,9 @@ extern const char kDisableLacrosTtsSupportName[]; extern const char kDisableLacrosTtsSupportDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1279,15 +1279,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 -@@ -178,6 +178,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kBulkTabRestore, +@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCastDeviceFilter, + &kClearOmniboxFocusAfterNavigation, &kCloseTabSuggestions, + &kBookmarksExportUseSaf, &kCriticalPersistedTabData, &kCommerceCoupons, &kCCTBackgroundTab, -@@ -933,6 +934,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", +@@ -948,6 +949,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1301,18 +1301,18 @@ 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 -@@ -161,6 +161,7 @@ extern const base::Feature kTabSwitcherOnReturn; +@@ -161,6 +161,7 @@ extern const base::Feature kTabReparenting; + extern const base::Feature kTabSelectionEditorV2; + extern const base::Feature kTabStripImprovements; + extern const base::Feature kTabSwitcherOnReturn; ++extern const base::Feature kBookmarksExportUseSaf; extern const base::Feature kTabToGTSAnimation; extern const base::Feature kTestDefaultDisabled; extern const base::Feature kTestDefaultEnabled; -+extern const base::Feature kBookmarksExportUseSaf; - extern const base::Feature kToolbarIphAndroid; - extern const base::Feature kToolbarMicIphAndroid; - extern const base::Feature kToolbarPhoneOptimizations; 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 -@@ -577,6 +577,7 @@ public abstract class ChromeFeatureList { +@@ -587,6 +587,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"; @@ -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. -@@ -983,6 +985,7 @@ public final class ChromePreferenceKeys { +@@ -1001,6 +1003,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 -@@ -403,6 +403,9 @@ static_library("common_lib") { +@@ -404,6 +404,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1442,7 +1442,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -85,8 +85,6 @@ static_library("utility") { +@@ -89,8 +89,6 @@ static_library("utility") { if (!is_android) { sources += [ @@ -1451,7 +1451,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -208,6 +206,11 @@ static_library("utility") { +@@ -215,6 +213,11 @@ static_library("utility") { ] } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 8d4ac360..72bcfd73 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 -@@ -55,6 +55,16 @@ +@@ -56,6 +56,16 @@ android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" android:key="do_not_track" android:title="@string/do_not_track_title"/> @@ -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()); -@@ -413,6 +423,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -421,6 +431,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -125,9 +125,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco 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 -@@ -81,6 +81,9 @@ public class PrivacySettings - private ViewGroup mDialogContainer; - private BottomSheetController mBottomSheetController; +@@ -76,6 +76,9 @@ public class PrivacySettings + private ManagedPreferenceDelegate mManagedPreferenceDelegate; + private IncognitoLockSettings mIncognitoLockSettings; + private ChromeSwitchPreference allowCustomTabIntentsPref; + private ChromeSwitchPreference openExternalLinksPref; @@ -135,7 +135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -148,6 +151,9 @@ public class PrivacySettings +@@ -135,6 +138,9 @@ public class PrivacySettings updatePreferences(); } @@ -145,7 +145,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -164,6 +170,14 @@ public class PrivacySettings +@@ -151,6 +157,14 @@ public class PrivacySettings } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -186,6 +200,16 @@ public class PrivacySettings +@@ -173,6 +187,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -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 -@@ -4756,6 +4756,21 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 40e6d5ce..8b6e563b 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -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 -@@ -223,6 +223,8 @@ import java.util.HashSet; +@@ -222,6 +222,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. -@@ -2179,6 +2181,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2322,6 +2323,11 @@ public abstract class ChromeActivity 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 -@@ -3484,6 +3484,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Dark theme diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 66915dbe..c7646535 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 -@@ -494,6 +494,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -519,6 +519,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -40,7 +40,7 @@ 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[] = { -@@ -4118,7 +4134,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4174,7 +4190,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsLacros | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -65,8 +65,8 @@ 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" -@@ -295,6 +297,15 @@ AutocompleteController::AutocompleteController( - in_start_(false), +@@ -318,6 +320,15 @@ AutocompleteController::AutocompleteController( + is_cros_launcher_(is_cros_launcher), search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) { @@ -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 -@@ -483,6 +483,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -474,6 +474,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" -@@ -652,6 +653,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -680,6 +681,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 005a1204..fdd0b5c8 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 -@@ -4718,7 +4718,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4771,7 +4771,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 -@@ -1214,6 +1214,10 @@ const char kDeprecateAltBasedSixPackDescription[] = +@@ -1227,6 +1227,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 -@@ -634,6 +634,9 @@ extern const char kDeprecateAltClickDescription[]; +@@ -647,6 +647,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 5b03b192..f6fc167e 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 -@@ -979,6 +979,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1018,6 +1018,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, -@@ -4647,6 +4652,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4695,6 +4700,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 -@@ -1777,6 +1777,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1794,6 +1794,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 -@@ -996,6 +996,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -1009,6 +1009,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 99d54935..962bb223 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 -@@ -3349,6 +3349,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3396,6 +3396,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 -@@ -1305,6 +1305,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1318,6 +1318,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 -@@ -713,6 +713,9 @@ extern const char kEnablePortalsDescription[]; +@@ -726,6 +726,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index e18200d0..6f240fd6 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 -@@ -5586,6 +5586,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5729,6 +5729,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -27,11 +27,11 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + FEATURE_VALUE_TYPE(network::features::kIPv6Probing)}, #endif // BUILDFLAG(IS_ANDROID) - #if !BUILDFLAG(IS_ANDROID) + {"shopping-list", commerce::flag_descriptions::kShoppingListName, 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 -@@ -3305,6 +3305,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = +@@ -3373,6 +3373,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 -@@ -785,6 +785,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -792,6 +792,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" -@@ -4092,8 +4093,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -4074,8 +4075,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 ebbda2f6..403f0d00 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 -@@ -3348,6 +3348,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3389,6 +3389,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 -@@ -3673,6 +3673,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3735,6 +3735,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -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 -@@ -2100,6 +2100,9 @@ extern const char kQueryTilesDescription[]; +@@ -2137,6 +2137,9 @@ extern const char kQueryTilesDescription[]; extern const char kQueryTilesNTPName[]; extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 93f78cae..1ecb95b7 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 -@@ -6983,6 +6983,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7096,6 +7096,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 -@@ -5952,6 +5952,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; +@@ -6104,6 +6104,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 -@@ -3627,6 +3627,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3727,6 +3727,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -100,6 +100,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -101,6 +101,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if BUILDFLAG(IS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -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 -@@ -321,6 +321,8 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -332,6 +332,8 @@ CONTENT_EXPORT extern const base::FeatureParam kCompositorLockTimeout; #endif // BUILDFLAG(IS_ANDROID) @@ -95,7 +95,7 @@ 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 -@@ -87,6 +87,7 @@ class WebRuntimeFeatures { +@@ -88,6 +88,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation( bool); BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable); @@ -126,7 +126,7 @@ 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 -@@ -156,6 +156,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -160,6 +160,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); } @@ -140,7 +140,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c 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 -@@ -1611,6 +1611,10 @@ +@@ -1569,6 +1569,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 0938f578..037a7395 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -83,14 +83,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/permissions_android_strings.grd | 17 ++++ .../geolocation_permission_context_android.cc | 35 ++++++-- .../geolocation_permission_context_android.h | 13 ++- - .../permissions/permission_context_base.cc | 50 ++++++++++-- + .../permissions/permission_context_base.cc | 49 ++++++++++- .../permissions/permission_context_base.h | 24 +++++- components/permissions/permission_prompt.h | 3 +- components/permissions/permission_request.cc | 34 +++++++- components/permissions/permission_request.h | 17 +++- .../permissions/permission_request_manager.cc | 37 ++++++--- .../permissions/permission_request_manager.h | 11 ++- - 38 files changed, 480 insertions(+), 62 deletions(-) + 38 files changed, 481 insertions(+), 60 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 @@ -174,19 +174,17 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.h b/chrome/bro diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/chrome/browser/permissions/last_tab_standing_tracker_factory.cc --- a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc +++ b/chrome/browser/permissions/last_tab_standing_tracker_factory.cc -@@ -33,7 +33,7 @@ bool LastTabStandingTrackerFactory::ServiceIsCreatedWithBrowserContext() const { +@@ -31,5 +31,5 @@ bool LastTabStandingTrackerFactory::ServiceIsCreatedWithBrowserContext() const { KeyedService* LastTabStandingTrackerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { - return new LastTabStandingTracker(); + return new LastTabStandingTracker(context); } - - content::BrowserContext* LastTabStandingTrackerFactory::GetBrowserContextToUse( 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 -@@ -400,10 +400,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -407,10 +407,7 @@ void ChromeBrowserMainExtraPartsProfiles:: LacrosFirstRunServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); @@ -201,7 +199,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 -@@ -488,6 +488,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -484,6 +484,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents); } video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); @@ -275,7 +273,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(); -@@ -909,6 +915,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -915,6 +921,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (contentType == mHighlightedPermission) { switchPreference.setBackgroundColor(mHighlightColor); } @@ -319,7 +317,7 @@ 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 -@@ -119,7 +119,8 @@ typedef void (*InfoListInsertionFunction)( +@@ -120,7 +120,8 @@ typedef void (*InfoListInsertionFunction)( const base::android::JavaRef&, const base::android::JavaRef&, const base::android::JavaRef&, @@ -329,7 +327,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid void GetOrigins(JNIEnv* env, const JavaParamRef& jbrowser_context_handle, -@@ -161,7 +162,7 @@ void GetOrigins(JNIEnv* env, +@@ -162,7 +163,7 @@ void GetOrigins(JNIEnv* env, seen_origins.push_back(origin); insertionFunc(env, static_cast(content_type), list, ConvertOriginToJavaString(env, origin), jembedder, @@ -338,7 +336,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid } // Add any origins which have a default content setting value (thus skipped -@@ -183,7 +184,7 @@ void GetOrigins(JNIEnv* env, +@@ -184,7 +185,7 @@ void GetOrigins(JNIEnv* env, seen_origins.push_back(origin); insertionFunc(env, static_cast(content_type), list, ConvertOriginToJavaString(env, origin), jembedder, @@ -350,7 +348,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 -@@ -594,6 +594,11 @@ +@@ -600,6 +600,11 @@ URL truncated @@ -429,7 +427,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b 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 -@@ -824,7 +824,7 @@ void HostContentSettingsMap::AddSettingsForOneType( +@@ -847,7 +847,7 @@ void HostContentSettingsMap::AddSettingsForOneType( settings->emplace_back(rule.primary_pattern, rule.secondary_pattern, std::move(value), kProviderNamesSourceMap[provider_type].provider_name, @@ -441,7 +439,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 -@@ -157,13 +157,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( +@@ -158,13 +158,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( base::Value setting_value, const std::string& source, bool incognito, @@ -459,7 +457,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo ContentSettingPatternSource::ContentSettingPatternSource() : incognito(false) {} -@@ -180,6 +182,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( +@@ -181,6 +183,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( expiration = other.expiration; source = other.source; incognito = other.incognito; @@ -618,7 +616,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 -@@ -1055,6 +1055,8 @@ void PageInfo::PresentSitePermissions() { +@@ -1084,6 +1084,8 @@ void PageInfo::PresentSitePermissions() { permission_info.source = info.source; permission_info.is_one_time = (info.session_model == content_settings::SessionModel::OneTime); @@ -630,7 +628,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. 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 -@@ -175,6 +175,7 @@ class PageInfo { +@@ -178,6 +178,7 @@ class PageInfo { content_settings::SettingSource source = content_settings::SETTING_SOURCE_NONE; bool is_one_time = false; @@ -873,7 +871,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co + + -+ Remember my decision ++ Remeber my decision + + + Only this time @@ -894,7 +892,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc -@@ -158,6 +158,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -153,6 +153,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( ContentSetting content_setting, bool is_one_time) { DCHECK(!is_one_time); @@ -914,7 +912,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -170,7 +183,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -165,7 +178,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -924,7 +922,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LogLocationSettingsMetric( kLocationSettingsSuppressMetricBase, is_default_search, LocationSettingsBackOffLevel(is_default_search)); -@@ -195,7 +209,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -190,7 +204,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -934,7 +932,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr // This case should be very rare, so just pretend it was a denied prompt // for metrics purposes. LogLocationSettingsMetric( -@@ -212,12 +227,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -207,12 +222,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -950,7 +948,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } PermissionResult -@@ -384,6 +400,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -379,6 +395,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -958,7 +956,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (prompt_outcome == GRANTED) { -@@ -411,7 +428,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -402,7 +419,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet( location_settings_dialog_request_id_, requesting_origin, embedding_origin, @@ -968,7 +966,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(0, 0, PermissionRequestID::RequestLocalId()); -@@ -423,10 +441,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -414,10 +432,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -1110,16 +1108,15 @@ 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 || -@@ -537,8 +576,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, - ->SetContentSettingDefaultScope( - requesting_origin, embedding_origin, content_settings_type_, - content_setting, -- is_one_time ? Constraints{base::Time(), -- content_settings::SessionModel::OneTime} -+ is_one_time ? content_settings::GetConstraintSessionExpiration(lifetime_option) - : Constraints()); - } +@@ -534,6 +573,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}; ++ if (is_one_time) ++ constraints = content_settings::GetConstraintSessionExpiration(lifetime_option); + #if !BUILDFLAG(IS_ANDROID) + if (base::FeatureList::IsEnabled( diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h 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 6d778558..c82b317c 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -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; -@@ -2193,6 +2195,8 @@ public class ChromeTabbedActivity extends ChromeActivity 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(), -@@ -2245,6 +2249,28 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -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 -@@ -614,6 +614,7 @@ public class BookmarkUtils { +@@ -616,6 +616,7 @@ public class BookmarkUtils { List 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 specialFoldersIds = -@@ -639,6 +640,9 @@ public class BookmarkUtils { +@@ -641,6 +642,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 -@@ -435,6 +435,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( +@@ -436,6 +436,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()); -@@ -482,6 +487,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -483,6 +488,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector 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(), }; -@@ -534,6 +540,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -535,6 +541,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -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 -@@ -3573,6 +3573,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -394,7 +394,7 @@ 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"; -@@ -75,7 +76,8 @@ BookmarkCodec::~BookmarkCodec() = default; +@@ -76,7 +77,8 @@ BookmarkCodec::~BookmarkCodec() = default; base::Value BookmarkCodec::Encode(BookmarkModel* model, std::string sync_metadata_str) { return Encode(model->bookmark_bar_node(), model->other_node(), @@ -404,7 +404,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar std::move(sync_metadata_str)); } -@@ -83,6 +85,7 @@ base::Value BookmarkCodec::Encode( +@@ -84,6 +86,7 @@ base::Value BookmarkCodec::Encode( const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, @@ -412,7 +412,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const BookmarkNode::MetaInfoMap* model_meta_info_map, std::string sync_metadata_str) { ids_reassigned_ = false; -@@ -104,6 +107,7 @@ base::Value BookmarkCodec::Encode( +@@ -105,6 +108,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)); @@ -420,7 +420,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar if (model_meta_info_map) roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map)); FinalizeChecksum(); -@@ -120,6 +124,7 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -121,6 +125,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(); -@@ -127,7 +132,8 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -128,7 +133,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; -@@ -135,12 +141,13 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -136,12 +142,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; } -@@ -190,6 +197,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( +@@ -194,6 +201,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()) -@@ -221,6 +229,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, +@@ -225,6 +233,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); -@@ -456,11 +470,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( +@@ -470,11 +484,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -513,10 +513,10 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark // file. That string captures the bookmarks sync metadata. static const char kSyncMetadata[]; + static const char kTabsBookmarkFolderNameKey[]; + static const char kDateLastUsed[]; // Possible values for kTypeKey. - static const char kTypeURL[]; -@@ -121,6 +124,7 @@ class BookmarkCodec { +@@ -122,6 +125,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); -@@ -132,7 +136,8 @@ class BookmarkCodec { +@@ -133,7 +137,8 @@ class BookmarkCodec { // Reassigns bookmark IDs for all nodes. void ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -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 -@@ -571,7 +571,7 @@ bool BookmarkModel::HasBookmarks() { +@@ -618,7 +618,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) { -@@ -825,6 +825,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -871,6 +871,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { bookmark_bar_node_ = details->bb_node(); other_node_ = details->other_folder_node(); mobile_node_ = details->mobile_folder_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_; -@@ -411,6 +417,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -426,6 +432,7 @@ class BookmarkModel : public BookmarkUndoProvider, raw_ptr bookmark_bar_node_ = nullptr; raw_ptr other_node_ = nullptr; raw_ptr mobile_node_ = nullptr; @@ -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. -@@ -250,6 +252,9 @@ class BookmarkPermanentNode : public BookmarkNode { +@@ -256,6 +258,9 @@ class BookmarkPermanentNode : public BookmarkNode { static std::unique_ptr 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 -@@ -419,6 +419,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode( +@@ -441,6 +441,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 632ff4c9..1352ae57 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -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 -@@ -2219,6 +2219,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2428,6 +2428,11 @@ public abstract class ChromeActivity 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 -@@ -527,6 +527,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -540,6 +540,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); @@ -77,8 +77,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); -@@ -1157,6 +1158,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate - stopPriceTrackingMenuItem.setVisible(false); +@@ -1170,6 +1171,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate + stopPriceTrackingMenuItem.setVisible(false); } + /** diff --git a/build/patches/Add-new-cache-check-function.patch b/build/patches/Add-new-cache-check-function.patch deleted file mode 100644 index ceedf780..00000000 --- a/build/patches/Add-new-cache-check-function.patch +++ /dev/null @@ -1,191 +0,0 @@ -From: Ari Chivukula -Date: Wed, 10 Aug 2022 23:41:51 +0000 -Subject: Add new cache check function - -Currently, if a.com is loaded and has a favicon at a.com/icon.png and -then b.com is loaded and has the exact same favicon, the cache entry is -shared which permits b.com to notice that a.com was visited. The end -goal of this task is to prevent cross-origin cache leaks. - -This CL adds a new variant of GetFaviconIDForFaviconURL that filters -results by page origin. This will be used in UpdateFaviconMappingsAndFetch -in the next CL, but is just tested here. - -This CL is part of a series: -(1) Cache browser test -(2) Add new cache check function -(3) Stop cross-origin cache hits - -Bug: 1300214 -Change-Id: Ic1513c63f0a09a32e3316d3569f0719990be833b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3822854 -Reviewed-by: Scott Violet -Auto-Submit: Ari Chivukula -Commit-Queue: Ari Chivukula -Cr-Commit-Position: refs/heads/main@{#1033779} - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - components/favicon/core/favicon_database.cc | 27 +++++++++ - components/favicon/core/favicon_database.h | 20 ++++++- - .../favicon/core/favicon_database_unittest.cc | 60 +++++++++++++++++++ - 3 files changed, 104 insertions(+), 3 deletions(-) - -diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc ---- a/components/favicon/core/favicon_database.cc -+++ b/components/favicon/core/favicon_database.cc -@@ -29,6 +29,7 @@ - #include "sql/statement.h" - #include "sql/transaction.h" - #include "third_party/sqlite/sqlite3.h" -+#include "url/origin.h" - - #if BUILDFLAG(IS_APPLE) - #include "base/mac/backup_util.h" -@@ -666,6 +667,32 @@ bool FaviconDatabase::GetFaviconLastUpdatedTime(favicon_base::FaviconID icon_id, - return true; - } - -+favicon_base::FaviconID FaviconDatabase::GetFaviconIDForFaviconURL( -+ const GURL& icon_url, -+ favicon_base::IconType icon_type, -+ const url::Origin& page_origin) { -+ // Look to see if there even is any relevant cached entry. -+ auto const icon_id = GetFaviconIDForFaviconURL(icon_url, icon_type); -+ if (!icon_id) { -+ return icon_id; -+ } -+ -+ // Check existing mappings to see if any are for the same origin. -+ sql::Statement statement(db_.GetCachedStatement( -+ SQL_FROM_HERE, "SELECT page_url FROM icon_mapping WHERE icon_id=?")); -+ statement.BindInt64(0, icon_id); -+ while (statement.Step()) { -+ const auto candidate_origin = -+ url::Origin::Create(GURL(statement.ColumnString(0))); -+ if (candidate_origin == page_origin) { -+ return icon_id; -+ } -+ } -+ -+ // Act as if there is no entry in the cache if no mapping exists. -+ return 0; -+} -+ - favicon_base::FaviconID FaviconDatabase::GetFaviconIDForFaviconURL( - const GURL& icon_url, - favicon_base::IconType icon_type) { -diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h ---- a/components/favicon/core/favicon_database.h -+++ b/components/favicon/core/favicon_database.h -@@ -22,6 +22,10 @@ class RefCountedMemory; - class Time; - } // namespace base - -+namespace url { -+class Origin; -+} // namespace url -+ - namespace favicon { - - // The minimum number of days after which last_requested field gets updated. -@@ -146,9 +150,19 @@ class FaviconDatabase { - // Returns true if successful. - bool TouchOnDemandFavicon(const GURL& icon_url, base::Time time); - -- // Returns the id of the entry in the favicon database with the specified url -- // and icon type. -- // Returns 0 if no entry exists for the specified url. -+ // Returns the id of the entry in the favicon database with the specified -+ // `icon_url` and `icon_type` that has an existing mapping to `page_origin` -+ // (and 0 if no entry exists). See crbug.com/1300214 for more context. -+ favicon_base::FaviconID GetFaviconIDForFaviconURL( -+ const GURL& icon_url, -+ favicon_base::IconType icon_type, -+ const url::Origin& page_origin); -+ -+ // Returns the id of the entry in the favicon database with the specified -+ // `icon_url` and `icon_type` (and 0 if no entry exists). This function does -+ // not respect cross-origin partitioning and returns an entry from the cache -+ // without verifying it was stored for the origin requesting it. This can leak -+ // navigation history, see crbug.com/1300214 for more context. - favicon_base::FaviconID GetFaviconIDForFaviconURL( - const GURL& icon_url, - favicon_base::IconType icon_type); -diff --git a/components/favicon/core/favicon_database_unittest.cc b/components/favicon/core/favicon_database_unittest.cc ---- a/components/favicon/core/favicon_database_unittest.cc -+++ b/components/favicon/core/favicon_database_unittest.cc -@@ -25,6 +25,7 @@ - #include "testing/gtest/include/gtest/gtest.h" - #include "third_party/sqlite/sqlite3.h" - #include "url/gurl.h" -+#include "url/origin.h" - - using testing::AllOf; - using testing::ElementsAre; -@@ -1447,4 +1448,63 @@ TEST_F(FaviconDatabaseTest, SetFaviconsOutOfDateBetween) { - EXPECT_EQ(base::Time(), GetLastUpdated(&db, icon3)); - } - -+// Test that GetFaviconIDForFaviconURL can filter by origin. -+TEST_F(FaviconDatabaseTest, GetFaviconIDForFaviconURLOriginFilter) { -+ // Setup DB with `kPageUrl1` mapped to `kIconUrl1`. -+ FaviconDatabase db; -+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_)); -+ db.BeginTransaction(); -+ scoped_refptr favicon1( -+ new base::RefCountedStaticMemory(kBlob1, sizeof(kBlob1))); -+ const auto icon_id = db.AddFavicon( -+ kIconUrl1, favicon_base::IconType::kFavicon, favicon1, -+ FaviconBitmapType::ON_VISIT, base::Time::Now(), gfx::Size()); -+ db.AddIconMapping(kPageUrl1, icon_id); -+ ASSERT_NE(0, icon_id); -+ -+ // We should be able to find the `icon_id` via the non-filtered function. -+ auto icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon); -+ ASSERT_EQ(icon_id, icon_id_found); -+ -+ // We should be able to find the `icon_id` via a the origin of `kPageUrl1`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl1)); -+ ASSERT_EQ(icon_id, icon_id_found); -+ -+ // We shouldn't be able to find the `icon_id` via a the origin of `kPageUrl2`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl2)); -+ ASSERT_EQ(0, icon_id_found); -+ -+ // We shouldn't be able to find the `icon_id` via a the origin of `kPageUrl3`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl3)); -+ ASSERT_EQ(0, icon_id_found); -+ -+ // If we map `kPageUrl2` then the situation changes. -+ db.AddIconMapping(kPageUrl2, icon_id); -+ -+ // We should be able to find the `icon_id` via a the origin of `kPageUrl1`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl1)); -+ ASSERT_EQ(icon_id, icon_id_found); -+ -+ // We should be able to find the `icon_id` via a the origin of `kPageUrl2`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl2)); -+ ASSERT_EQ(icon_id, icon_id_found); -+ -+ // We shouldn't be able to find the `icon_id` via a the origin of `kPageUrl3`. -+ icon_id_found = -+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::IconType::kFavicon, -+ url::Origin::Create(kPageUrl3)); -+ ASSERT_EQ(0, icon_id_found); -+} -+ - } // namespace favicon --- -2.25.1 diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index db191684..53927a01 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 -@@ -372,6 +372,7 @@ public final class ChromePreferenceKeys { +@@ -390,6 +390,7 @@ public final class ChromePreferenceKeys { AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -85,7 +85,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro --- 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 - + Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps + @@ -100,10 +100,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -109,22 +109,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con - public void setToolbar(Toolbar toolbar, boolean isIncognito) { +@@ -119,22 +119,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con mToolbar = toolbar; - mToolbarContainer.setToolbar(mToolbar); + mToolbarContainer.setPostInitializationDependencies( + mToolbar, constraintsSupplier, tabSupplier); - - View toolbarView = findViewById(R.id.toolbar); - assert toolbarView != null; @@ -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 -@@ -663,7 +663,7 @@ test("components_unittests") { +@@ -667,7 +667,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_ } -@@ -950,7 +950,7 @@ if (!is_ios) { +@@ -955,7 +955,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. @@ -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 -@@ -369,6 +369,8 @@ android_library("ui_no_recycler_view_java") { +@@ -370,6 +370,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 16dd2d9c..f321ee8f 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 -@@ -42,6 +42,11 @@ +@@ -43,6 +43,11 @@ android:title="@string/incognito_settings_title" android:summary="@string/incognito_settings_summary" android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/> @@ -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; -@@ -1317,8 +1318,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE 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 13577ce7..37c6db7f 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 @@ -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 -@@ -383,6 +383,7 @@ public final class ChromePreferenceKeys { +@@ -401,6 +401,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = "Chrome.Homepage.PartnerCustomizedDefaultGurl"; @@ -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 -@@ -373,6 +373,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -380,6 +380,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 137549a7..4cf37c22 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -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" -@@ -8669,6 +8670,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8768,6 +8769,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)}, @@ -44,9 +44,9 @@ 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 -@@ -3221,6 +3221,11 @@ const char kReduceUserAgentPlatformOsCpuDescription[] = - "The platform and oscpu in the User-Agent string will be reported as " - ""; +@@ -3283,6 +3283,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = + "Skips starting the service worker and run the fetch handler if the fetch " + "handler is recognized as skippable."; +const char kSiteEngagementName[] = + "Enable site engagement feature"; @@ -59,9 +59,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 -@@ -1825,6 +1825,9 @@ extern const char kReduceUserAgentMinorVersionDescription[]; - extern const char kReduceUserAgentPlatformOsCpuName[]; - extern const char kReduceUserAgentPlatformOsCpuDescription[]; +@@ -1862,6 +1862,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; + extern const char kSkipServiceWorkerFetchHandlerName[]; + extern const char kSkipServiceWorkerFetchHandlerDescription[]; +extern const char kSiteEngagementName[]; +extern const char kSiteEngagementDescription[]; diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 542c2bda..3926c7ab 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 -@@ -79,6 +79,9 @@ android_library("java") { +@@ -82,6 +82,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", ] @@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g 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 -@@ -679,6 +679,20 @@ void ContentSettingsRegistry::Init() { +@@ -682,6 +682,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -232,7 +232,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. + AllowlistedSchemes(), + ValidSettings(CONTENT_SETTING_ALLOW, + CONTENT_SETTING_BLOCK), -+ WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE, ++ WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, + WebsiteSettingsRegistry::PLATFORM_ANDROID, + ContentSettingsInfo::INHERIT_IN_INCOGNITO, + ContentSettingsInfo::PERSISTENT, @@ -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 -@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -206,7 +206,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( -@@ -217,6 +218,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -218,6 +219,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); @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h -@@ -1808,6 +1808,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1920,6 +1920,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 5652ff05..00c967a8 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -25,15 +25,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/content_settings_agent_impl.cc | 9 ++ .../renderer/content_settings_agent_impl.h | 1 + .../platform/web_content_settings_client.h | 2 + - .../peer_connection_dependency_factory.cc | 5 ++ - 19 files changed, 160 insertions(+), 4 deletions(-) + .../peer_connection_dependency_factory.cc | 6 ++ + 19 files changed, 161 insertions(+), 4 deletions(-) create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java create mode 100644 components/browser_ui/strings/android/webrtc.grdp 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") { +@@ -85,6 +85,9 @@ android_library("java") { sources += [ "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java", ] @@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g 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 -@@ -693,6 +693,20 @@ void ContentSettingsRegistry::Init() { +@@ -696,6 +696,20 @@ void ContentSettingsRegistry::Init() { /*show_into_info_page*/ true, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); @@ -228,7 +228,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. + AllowlistedSchemes(), + ValidSettings(CONTENT_SETTING_ALLOW, + CONTENT_SETTING_BLOCK), -+ WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE, ++ WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, + WebsiteSettingsRegistry::PLATFORM_ANDROID, + ContentSettingsInfo::INHERIT_IN_INCOGNITO, + ContentSettingsInfo::PERSISTENT, @@ -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 -@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -207,7 +207,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( -@@ -219,6 +220,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -220,6 +221,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); @@ -377,7 +377,15 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t 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 -@@ -758,6 +758,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -33,6 +33,7 @@ + #include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h" + #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" + #include "third_party/blink/public/platform/platform.h" ++#include "third_party/blink/public/platform/web_content_settings_client.h" + #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( // 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 45ff9b33..a6108adf 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -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 -@@ -12081,12 +12081,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -12143,12 +12143,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( base::Value::Dict body; if (!reason.empty()) body.Set("reason", reason); @@ -236,7 +236,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic 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 -@@ -454,10 +454,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkIsolationKey& network_isolation_key, const absl::optional& user_agent, @@ -247,12 +247,12 @@ diff --git a/services/network/network_context.h b/services/network/network_conte - const net::NetworkIsolationKey& network_isolation_key) override; + const net::NetworkIsolationKey& network_isolation_key); void AddDomainReliabilityContextForTesting( - const GURL& origin, + 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 -@@ -965,7 +965,6 @@ mojom("mojom") { +@@ -1011,7 +1011,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 -@@ -1059,6 +1059,7 @@ interface NetworkContext { +@@ -1062,6 +1062,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -271,7 +271,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1072,6 +1073,7 @@ interface NetworkContext { +@@ -1075,6 +1076,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|. @@ -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" -@@ -2382,9 +2383,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2359,9 +2360,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" -@@ -576,9 +576,9 @@ class CORE_EXPORT LocalFrame final +@@ -585,9 +585,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch index 4519bc25..0b3bf025 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -10,9 +10,9 @@ 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 -@@ -496,8 +496,8 @@ const base::Feature kConditionalTabStripAndroid{ - const base::Feature kCastDeviceFilter{"CastDeviceFilter", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -501,8 +501,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter", + const base::Feature kClearOmniboxFocusAfterNavigation{ + "ClearOmniboxFocusAfterNavigation", base::FEATURE_DISABLED_BY_DEFAULT}; -const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", - base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 020fa80f..5a5805f9 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -4,7 +4,7 @@ Subject: Automated domain substitution License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - PRESUBMIT.py | 70 +- + PRESUBMIT.py | 72 +- .../cts_config/webview_cts_gcs_path.json | 28 +- android_webview/tools/generate_flag_labels.py | 2 +- android_webview/tools/record_netlog.py | 6 +- @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html android_webview/tools/update_cts.py | 6 +- ash/accelerators/accelerator_notifications.cc | 2 +- ash/app_list/PRESUBMIT.py | 2 +- - ash/ash_strings.grd | 26 +- + 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 +- @@ -55,7 +55,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../personalization_app_ui.cc | 2 +- .../resources/PRESUBMIT.py | 2 +- .../print_management/resources/PRESUBMIT.py | 2 +- - .../projector_app/projector_xhr_sender.cc | 10 +- + .../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 +- @@ -91,11 +91,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html build/android/pylib/utils/maven_downloader.py | 2 +- build/android/pylib/utils/simpleperf.py | 2 +- build/android/resource_sizes.py | 2 +- - build/android/test_runner.py | 2 +- build/android/test_wrapper/logdog_wrapper.py | 2 +- build/apple/tweak_info_plist.py | 6 +- build/chromeos/PRESUBMIT.py | 2 +- - build/chromeos/test_runner.py | 2 +- build/config/android/rules.gni | 2 +- build/config/chromeos/args.gni | 4 +- build/config/chromeos/rules.gni | 6 +- @@ -129,7 +127,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 24 +- - chrome/app/generated_resources.grd | 284 +- + chrome/app/generated_resources.grd | 288 +- chrome/app/google_chrome_strings.grd | 24 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -151,11 +149,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ash/attestation/attestation_ca_client.cc | 8 +- chrome/browser/ash/borealis/borealis_util.cc | 2 +- .../ash/child_accounts/child_user_service.cc | 2 +- - .../resources/web_time_limit_error_page.html | 2 +- chrome/browser/ash/crostini/crostini_util.cc | 2 +- .../customization/customization_document.cc | 2 +- .../enhanced_network_tts_constants.cc | 2 +- - .../file_manager/file_manager_string_util.cc | 12 +- + .../file_manager/file_manager_string_util.cc | 14 +- .../office_task_selection_helper.cc | 4 +- chrome/browser/ash/hats/hats_dialog.cc | 2 +- .../assistive_suggester_client_filter.cc | 20 +- @@ -191,12 +188,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../resources/cart_domain_name_mapping.json | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../browser/chrome_content_browser_client.cc | 4 +- + .../browser/chrome_for_testing/buildflags.gni | 2 +- .../file_manager/private_api_misc.cc | 2 +- .../dlp/dlp_clipboard_bubble_constants.h | 2 +- chrome/browser/devtools/url_constants.cc | 4 +- .../mixed_content_download_blocking.cc | 2 +- + .../commands/mac_key_rotation_command.cc | 2 +- .../management_service/rotate_util.cc | 2 +- - .../file_system/browsertest_helper.cc | 6 +- .../file_system/signin_dialog_delegate.cc | 2 +- .../connectors/service_provider_config.cc | 4 +- .../extension_request_notification.cc | 4 +- @@ -212,16 +210,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 | 18 +- - .../importer/edge_importer_browsertest_win.cc | 8 +- - .../importer/ie_importer_browsertest_win.cc | 30 +- + chrome/browser/flag_descriptions.cc | 20 +- .../lacros/lacros_startup_infobar_delegate.cc | 4 +- .../service_discovery_client_mac.mm | 4 +- .../long_screenshots_tab_service.cc | 2 +- .../access_code/access_code_cast_constants.cc | 4 +- .../cast/cast_media_route_provider.cc | 6 +- .../dial/dial_media_route_provider.cc | 18 +- - .../media/webrtc/webrtc_browsertest_common.cc | 2 +- .../media/webrtc/webrtc_event_log_uploader.cc | 2 +- .../media/webrtc/webrtc_log_uploader.cc | 2 +- .../nacl_host/nacl_infobar_delegate.cc | 2 +- @@ -237,12 +232,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../quiet_permission_prompt_model_android.cc | 2 +- .../extension_key_permissions_service.cc | 2 +- .../extension_platform_keys_service.cc | 2 +- - .../policy/extension_force_install_mixin.cc | 2 +- .../browser/policy/safe_search_policy_test.h | 2 +- - .../chrome_prefetch_service_delegate.cc | 2 +- + .../chrome_prefetch_service_delegate.cc | 6 +- .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- + .../privacy_sandbox_service.cc | 14 +- .../profiles/profile_avatar_downloader.cc | 2 +- - ...rofile_shortcut_manager_browsertest_win.cc | 2 +- .../push_messaging_constants.cc | 2 +- .../push_messaging_service_impl.cc | 2 +- chrome/browser/resources/PRESUBMIT.py | 2 +- @@ -316,6 +310,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../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 +- .../channel_switcher_dialog.html | 2 +- .../chromeos/os_about_page/os_about_page.html | 2 +- .../borealis_page/borealis_detail_view.html | 2 +- @@ -323,6 +318,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../os_people_page/users_add_user_dialog.js | 2 +- chrome/browser/resources/settings/icons.html | 2 +- .../resources/settings/settings_shared.css | 2 +- + .../browser/resources/tools/build_webui.gni | 2 +- .../resources/webstore_app/manifest.json | 4 +- .../cr_input/cr_input_demo_component.html | 2 +- .../certificate_reporting_service.cc | 2 +- @@ -336,7 +332,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 +- - ...ings_reset_prompt_model_browsertest_win.cc | 2 +- .../tailored_security_url_observer.cc | 2 +- .../background/ntp_background_service.cc | 2 +- .../search/background/ntp_backgrounds.cc | 10 +- @@ -350,11 +345,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- - .../strings/android_chrome_strings.grd | 46 +- + .../strings/android_chrome_strings.grd | 54 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../ui/app_list/search/common/string_util.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- - .../ui/app_list/search/omnibox_provider.cc | 2 +- + .../ui/app_list/search/omnibox_util.cc | 2 +- .../ui/ash/ambient/ambient_client_impl.cc | 8 +- .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- @@ -363,22 +358,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/ui/ash/system_tray_client_impl.cc | 4 +- .../tab_under_navigation_throttle.h | 2 +- ...r_content_setting_bubble_model_delegate.cc | 4 +- - .../browser_navigator_browsertest_chromeos.cc | 2 +- - .../browser_tabstrip_browsertest_chromeos.cc | 2 +- chrome/browser/ui/chrome_pages.cc | 2 +- .../browser/ui/cocoa/share_menu_controller.mm | 2 +- .../ui/commander/open_url_command_source.cc | 2 +- .../ui/dialogs/outdated_upgrade_bubble.cc | 2 +- .../installation_error_infobar_delegate.cc | 2 +- chrome/browser/ui/managed_ui.cc | 2 +- - .../quick_answers_ui_controller.cc | 2 +- + .../quick_answers_ui_controller.cc | 4 +- chrome/browser/ui/signin_view_controller.cc | 2 +- .../toolbar/media_router_contextual_menu.cc | 6 +- .../app_dialog/app_uninstall_dialog_view.cc | 2 +- .../ui/views/hats/hats_next_web_dialog.cc | 2 +- - ...picker_bubble_view_browsertest_chromeos.cc | 2 +- .../ui/views/lens/lens_side_panel_view.cc | 2 +- .../ui/views/network_profile_bubble_view.cc | 2 +- + .../about_this_site_side_panel_view.cc | 2 +- .../plugin_vm/plugin_vm_installer_view.cc | 2 +- .../ui/views/session_crashed_bubble_view.cc | 2 +- .../lens/lens_unified_side_panel_view.cc | 2 +- @@ -407,6 +400,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../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 +- .../preinstalled_web_apps/google_calendar.cc | 6 +- @@ -515,11 +509,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chromecast/browser/webui/cast_webui.cc | 4 +- .../runtime/browser/grpc_webui_controller.cc | 2 +- chromecast/chromecast.gni | 2 +- - chromecast/common/extensions_api/tabs.json | 4 +- - chromecast/common/extensions_api/windows.json | 2 +- 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 +- .../assistant_manager_service_impl.cc | 2 +- chromeos/ash/services/assistant/service.cc | 2 +- chromeos/chromeos_strings.grd | 6 +- @@ -567,6 +560,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../core/captive_portal_detector.cc | 2 +- .../data/log_list.json | 22 +- .../resources/cart_domain_cart_url_regex.json | 2 +- + .../subscriptions_server_proxy.cc | 4 +- .../components_google_chrome_strings.grd | 2 +- .../notes/core/server/notes_repository.cc | 2 +- .../notes/core/server/notes_server_base.cc | 4 +- @@ -584,7 +578,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../error_page/common/localized_error.cc | 2 +- .../favicon/core/large_icon_service_impl.cc | 2 +- components/feed/core/v2/feed_network_impl.cc | 8 +- - components/feed/feed_feature_list.cc | 2 +- + components/feed/feed_feature_list.cc | 4 +- components/feedback/feedback_uploader.cc | 2 +- components/flags_ui/resources/flags.html | 4 +- components/gcm_driver/gcm_account_mapper.cc | 2 +- @@ -612,7 +606,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/omnibox/PRESUBMIT.py | 2 +- .../omnibox/browser/document_provider.cc | 18 +- .../browser/document_suggestions_service.cc | 4 +- - .../omnibox/browser/zero_suggest_provider.cc | 2 +- .../resources/omnibox_pedal_concepts.json | 28 +- .../omnibox_pedal_concepts_desktop_am.json | 4 +- .../omnibox_pedal_concepts_desktop_ar.json | 24 +- @@ -697,9 +690,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../prediction_service/prediction_common.h | 2 +- .../core/browser/browser_policy_connector.cc | 10 +- ...cloud_signin_restriction_policy_fetcher.cc | 2 +- + .../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 | 2350 ++++++++--------- + .../policy/resources/policy_templates.json | 2366 ++++++++--------- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- .../syntax_check_policy_template_json.py | 2 +- @@ -772,6 +766,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../safe_search_url_checker_client.cc | 2 +- .../safe_search_api/stub_url_checker.cc | 2 +- components/safety_check/url_constants.cc | 2 +- + .../template_url_starter_pack_data.cc | 2 +- .../content/https_only_mode_blocking_page.cc | 2 +- .../content/ssl_blocking_page.h | 2 +- .../core/controller_client.cc | 2 +- @@ -848,7 +843,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../common/api/extensions_manifest_types.json | 6 +- extensions/common/api/i18n.json | 2 +- extensions/common/csp_validator.cc | 2 +- - extensions/common/extension_urls.cc | 10 +- + extensions/common/extension_urls.cc | 12 +- extensions/common/manifest_constants.cc | 6 +- extensions/common/permissions/PRESUBMIT.py | 2 +- .../resources/automation/PRESUBMIT.py | 2 +- @@ -875,73 +870,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html gpu/vulkan/PRESUBMIT.py | 2 +- .../lib/browser/protocol/headless_handler.cc | 2 +- infra/config/PRESUBMIT.py | 4 +- - .../android-cronet-arm-dbg/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../try/android-official/properties.json | 2 +- - .../android-oreo-arm64-dbg/properties.json | 2 +- - .../try/android-pie-arm64-dbg/properties.json | 2 +- - .../properties.json | 2 +- - .../try/android_compile_dbg/properties.json | 2 +- - .../android_compile_x64_dbg/properties.json | 2 +- - .../android_compile_x86_dbg/properties.json | 2 +- - .../try/android_cronet/properties.json | 2 +- - .../properties.json | 2 +- - .../try/cast_shell_android/properties.json | 2 +- - .../try/cast_shell_linux/properties.json | 2 +- - .../try/cast_shell_linux_dbg/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../chromeos-arm-generic-rel/properties.json | 2 +- - .../properties.json | 2 +- - .../try/chromeos-jacuzzi-rel/properties.json | 2 +- - .../try/chromeos-kevin-rel/properties.json | 2 +- - .../try/chromeos-octopus-rel/properties.json | 2 +- - .../dawn-linux-x64-deps-rel/properties.json | 2 +- - .../try/dawn-mac-x64-deps-rel/properties.json | 2 +- - .../dawn-win10-x64-deps-rel/properties.json | 2 +- - .../dawn-win10-x86-deps-rel/properties.json | 2 +- - .../try/fuchsia-arm64-cast/properties.json | 2 +- - .../try/fuchsia-official/properties.json | 2 +- - .../try/fuchsia-x64-cast/properties.json | 2 +- - .../try/fuchsia_arm64/properties.json | 2 +- - .../builders/try/fuchsia_x64/properties.json | 2 +- - .../try/ios-simulator-cronet/properties.json | 2 +- - .../properties.json | 2 +- - .../try/ios-simulator/properties.json | 2 +- - .../lacros-amd64-generic-rel/properties.json | 2 +- - .../lacros-arm-generic-rel/properties.json | 2 +- - .../lacros-arm64-generic-rel/properties.json | 2 +- - .../try/linux-blink-rel/properties.json | 2 +- - .../properties.json | 2 +- - .../try/linux-chromeos-dbg/properties.json | 2 +- - .../properties.json | 2 +- - .../try/linux-lacros-rel/properties.json | 2 +- - .../try/linux-official/properties.json | 2 +- - .../try/linux-rel-compilator/properties.json | 2 +- - .../try/linux-wayland-rel/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../try/linux_chromium_dbg_ng/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../builders/try/linux_vr/properties.json | 2 +- - .../builders/try/mac-official/properties.json | 2 +- - .../try/mac-rel-compilator/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- - .../try-nougat-phone-tester/properties.json | 2 +- - .../builders/try/win-official/properties.json | 2 +- - .../properties.json | 2 +- - .../try/win32-official/properties.json | 2 +- - .../builders/try/win7-rel/properties.json | 2 +- - .../properties.json | 2 +- - .../properties.json | 2 +- infra/config/scripts/PRESUBMIT.py | 2 +- - ios/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 +- @@ -985,9 +915,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ios/showcase/alert/sc_alert_coordinator.mm | 8 +- .../sc_infobar_modal_save_card_coordinator.mm | 2 +- .../fake_autocomplete_suggestion.mm | 4 +- - .../http_server_files/simple_login_form.html | 2 +- - .../http_server_files/simple_signup_form.html | 2 +- - .../data/http_server_files/window_open.html | 2 +- ios/web/navigation/navigation_manager_impl.mm | 6 +- .../web_state/ui/wk_content_rule_list_util.mm | 2 +- ios/web_view/PRESUBMIT.py | 2 +- @@ -998,7 +925,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../native_pixmap_handle_mojom_traits.cc | 12 +- ...stable_video_decoder_types_mojom_traits.cc | 178 +- mojo/PRESUBMIT.py | 2 +- - native_client_sdk/PRESUBMIT.py | 2 +- .../src/build_tools/build_paths.py | 2 +- .../src/build_tools/buildbot_common.py | 2 +- .../build_tools/json/naclsdk_manifest.json | 32 +- @@ -1057,16 +983,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 +- - .../breakpad_crash_test/crash_in_syscall.html | 4 +- - .../trusted_crash_in_startup.html | 4 +- - .../breakpad_crash_test/untrusted_crash.html | 4 +- - ppapi/tests/test_network_proxy.cc | 2 +- - .../test_tcp_socket_private_disallowed.cc | 2 +- - ppapi/tests/test_url_loader.cc | 2 +- - ppapi/tests/test_url_request.cc | 4 +- - ppapi/tests/test_url_util.cc | 18 +- - ppapi/tests/test_websocket.cc | 6 +- - ppapi/tests/test_x509_certificate_private.cc | 2 +- printing/backend/PRESUBMIT.py | 2 +- printing/backend/win_helper.cc | 4 +- printing/print_settings_initializer_win.cc | 2 +- @@ -1098,25 +1014,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html sandbox/policy/win/sandbox_win.cc | 2 +- .../geolocation/network_location_request.cc | 2 +- .../image_annotation_service.h | 4 +- - testing/PRESUBMIT.py | 2 +- - .../java/AndroidManifest.xml.jinja2 | 4 +- - .../browser_test_commands_linux.txt | 2 +- - .../chromoting_test_driver_commands_linux.txt | 4 +- - testing/generate_location_tags.py | 2 +- - testing/merge_scripts/PRESUBMIT.py | 2 +- - .../merge_scripts/code_coverage/PRESUBMIT.py | 2 +- - .../code_coverage/merge_results.py | 2 +- - testing/merge_scripts/results_merger.py | 2 +- - testing/scripts/PRESUBMIT.py | 2 +- - testing/scripts/common.py | 2 +- - testing/test.gni | 2 +- - testing/test_env.py | 8 +- - testing/trigger_scripts/PRESUBMIT.py | 2 +- - .../trigger_scripts/base_test_triggerer.py | 8 +- - .../unexpected_passes_common/data_types.py | 2 +- - testing/unexpected_passes_common/queries.py | 2 +- - testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 18 +- .../markdown/extensions/smarty.py | 2 +- .../Python-Markdown/markdown/pep562.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- @@ -1268,8 +1165,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../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 | 6 +- - .../blinkpy/common/net/results_fetcher.py | 8 +- + .../blink/tools/blinkpy/common/net/git_cl.py | 4 +- + .../blinkpy/common/net/results_fetcher.py | 10 +- + .../blink/tools/blinkpy/common/net/rpc.py | 6 +- .../blink/tools/blinkpy/common/pretty_diff.py | 2 +- .../tools/blinkpy/common/system/filesystem.py | 2 +- .../tools/blinkpy/common/system/profiler.py | 2 +- @@ -1287,7 +1185,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- .../blinkpy/w3c/wpt_results_processor.py | 2 +- - .../blink/tools/blinkpy/w3c/wpt_uploader.py | 8 +- + .../blink/tools/blinkpy/w3c/wpt_uploader.py | 2 +- .../blink/tools/commit_stats/org-list.txt | 10 +- .../print_stale_test_expectations_entries.py | 2 +- third_party/boringssl/roll_boringssl.py | 2 +- @@ -1493,7 +1391,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/rust/atty/v0_2/BUILD.gn | 2 +- third_party/rust/autocfg/v1/BUILD.gn | 2 +- third_party/rust/autocxx/v0_22/BUILD.gn | 2 +- - .../rust/autocxx_bindgen/v0_59/BUILD.gn | 2 +- + .../rust/autocxx_bindgen/v0_59/BUILD.gn | 4 +- .../rust/autocxx_engine/v0_22/BUILD.gn | 2 +- third_party/rust/autocxx_gen/v0_22/BUILD.gn | 2 +- third_party/rust/autocxx_macro/v0_22/BUILD.gn | 2 +- @@ -1609,6 +1507,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html tools/bisect_repackage/bisect_repackage.py | 4 +- .../bisect_repackage_utils.py | 4 +- tools/boilerplate.py | 2 +- + tools/browserbench-webdriver/browserbench.py | 2 +- tools/captured_sites/refresh.py | 2 +- tools/check_git_config.py | 24 +- tools/checklicenses/checklicenses.py | 2 +- @@ -1619,7 +1518,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../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 | 6 +- + tools/clang/scripts/build.py | 10 +- tools/clang/scripts/include-analysis.html | 12 +- tools/clang/scripts/package.py | 2 +- tools/clang/scripts/update.py | 2 +- @@ -1640,6 +1539,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html tools/find_runtime_symbols/PRESUBMIT.py | 2 +- tools/flags/list_flags.py | 4 +- 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 +- @@ -1711,7 +1611,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html tools/usb_gadget/gadget.py | 2 +- tools/usb_gadget/msos20_descriptors.py | 2 +- tools/variations/bisect_variations.py | 2 +- - tools/visual_debugger/app.html | 2 +- + tools/visual_debugger/app.html | 4 +- tools/web_dev_style/css_checker.py | 6 +- tools/web_dev_style/html_checker.py | 2 +- tools/web_dev_style/js_checker.py | 8 +- @@ -1727,6 +1627,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../cvox2/background/panel.html | 2 +- .../extensions/searchvox/loader.js | 2 +- .../chromevoxclassic/manifest.json.jinja2 | 2 +- + .../color_contrast_companion/help.html | 2 +- .../accessibility_extensions_strings.grd | 2 +- ui/base/clipboard/clipboard_test_template.h | 10 +- .../constrained_window_animation.mm | 2 +- @@ -1735,10 +1636,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ui/base/ime/PRESUBMIT.py | 2 +- ui/base/ime/character_composer_sequences.txt | 2 +- .../keycodes/keyboard_code_conversion_mac.mm | 2 +- - ui/file_manager/audio_player/manifest.json | 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 +- @@ -1756,7 +1657,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1752 files changed, 5346 insertions(+), 5346 deletions(-) + 1653 files changed, 5236 insertions(+), 5236 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1851,7 +1752,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1066,7 +1066,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( +@@ -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' @@ -1860,7 +1761,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1216,9 +1216,9 @@ _KNOWN_ROBOTS = set( +@@ -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') @@ -1872,7 +1773,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1628,7 +1628,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -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' @@ -1881,7 +1782,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information') ] -@@ -1820,7 +1820,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1838,7 +1838,7 @@ def CheckNoPragmaOnce(input_api, output_api): return [ output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1890,7 +1791,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files) ] return [] -@@ -2060,7 +2060,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -2078,7 +2078,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1899,7 +1800,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2183,7 +2183,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -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' @@ -1907,8 +1808,8 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py + 'Contact oshima@ch40m1um.qjz9zk if you have questions.', errors)) return results - -@@ -3089,7 +3089,7 @@ def CheckSecurityOwners(input_api, output_api): + 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: @@ -1917,7 +1818,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results = [] -@@ -3391,7 +3391,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -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' @@ -1926,7 +1827,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3530,7 +3530,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -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' @@ -1935,7 +1836,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3562,7 +3562,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -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' @@ -1944,7 +1845,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3587,7 +3587,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -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.' @@ -1953,7 +1854,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3610,7 +3610,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -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' @@ -1962,8 +1863,8 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4212,7 +4212,7 @@ def CheckGnGlobForward(input_api, output_api): - 'The variables "visibilty" and "test_only" should be ' +@@ -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/' @@ -1971,7 +1872,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from')) ] -@@ -4380,7 +4380,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -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 ' @@ -1980,7 +1881,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)) -@@ -4418,7 +4418,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -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 ' @@ -1989,7 +1890,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '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 -@@ -4634,7 +4634,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4683,7 +4683,7 @@ _NON_INCLUSIVE_TERMS = ( '"# nocheck" or ""', 'at the end of the offending line will bypass this PRESUBMIT error', 'but avoid using this whenever possible. Reach out to', @@ -1998,7 +1899,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4909,7 +4909,7 @@ def CheckForInvalidIfDefinedMacros(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 @@ -2007,7 +1908,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """ base_pattern = r'IPC_ENUM_TRAITS\(' inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -5196,9 +5196,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -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' @@ -2019,7 +1920,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems)) ] -@@ -5252,7 +5252,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -5309,7 +5309,7 @@ def CheckChangeOnCommit(input_api, output_api): input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -2028,7 +1929,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5598,7 +5598,7 @@ def CheckStrings(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 ' @@ -2037,8 +1938,13 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py items=icu_syntax_errors)) return results -@@ -5918,7 +5918,7 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -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') @@ -2046,8 +1952,8 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py message = ('This change uses API(s) that are ambiguous in the presence of ' 'MPArch features such as bfcache, prerendering, and fenced ' 'frames.') -@@ -5929,8 +5929,8 @@ def CheckMPArchApiUsage(input_api, output_api): - 'navigation. See this doc [1] and the comments on the individual APIs ' +@@ -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' @@ -2168,7 +2074,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi 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 -@@ -331,7 +331,7 @@ double-check this picked the correct labels for your new features (labels are +@@ -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: @@ -2240,7 +2146,7 @@ diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_ versions. Performs the following tasks to simplify the CTS test update process: -@@ -411,7 +411,7 @@ class UpdateCTS: +@@ -410,7 +410,7 @@ class UpdateCTS: DESC = """Updates the WebView CTS tests to a new version. @@ -2276,7 +2182,7 @@ diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -708,7 +708,7 @@ This file contains the strings for ash. +@@ -715,7 +715,7 @@ This file contains the strings for ash. other {Update device within # seconds}} @@ -2285,7 +2191,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -733,7 +733,7 @@ This file contains the strings for ash. +@@ -740,7 +740,7 @@ This file contains the strings for ash. other {Change device to previous version within # seconds}} @@ -2294,7 +2200,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -743,10 +743,10 @@ This file contains the strings for ash. +@@ -750,10 +750,10 @@ This file contains the strings for ash. Update overdue @@ -2307,7 +2213,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -780,10 +780,10 @@ This file contains the strings for ash. +@@ -796,10 +796,10 @@ This file contains the strings for ash. This update requires powerwashing your $1Chromebook. All data will be deleted. Learn more about the latest $2ChromiumOS update. @@ -2320,7 +2226,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd $1Learn more about the latest ChromiumOS update. This Chromebook needs to restart to apply an update. This can take up to 1 minute. -@@ -877,7 +877,7 @@ This file contains the strings for ash. +@@ -893,7 +893,7 @@ This file contains the strings for ash. @@ -2329,7 +2235,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1278,7 +1278,7 @@ This file contains the strings for ash. +@@ -1294,7 +1294,7 @@ This file contains the strings for ash. Supervised user @@ -2338,7 +2244,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1577,7 +1577,7 @@ This file contains the strings for ash. +@@ -1593,7 +1593,7 @@ This file contains the strings for ash. Tap to configure @@ -2347,7 +2253,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -3249,7 +3249,7 @@ Connect your device to power. +@@ -3277,7 +3277,7 @@ Connect your device to power. Save your $1Pixel Buds @@ -2356,16 +2262,20 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Settings -@@ -3282,7 +3282,7 @@ Connect your device to power. +@@ -3310,10 +3310,10 @@ Connect your device to power. Connect $1Pixel Buds to this Chromebook - Your $1Pixel Buds will appear on devices linked with $2alisha123@gmail.com + Your $1Pixel Buds will appear on devices linked with $2alisha123@9ma1l.qjz9zk + + +- Connect $1Pixel Buds previously saved to $2alisha123@gmail.com ++ Connect $1Pixel Buds previously saved to $2alisha123@9ma1l.qjz9zk Cancel -@@ -3408,7 +3408,7 @@ Connect your device to power. +@@ -3439,7 +3439,7 @@ Connect your device to power. Multiple sign-in has been disabled @@ -2374,7 +2284,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3909,7 +3909,7 @@ Here are some things you can try to get started. +@@ -3963,7 +3963,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2410,7 +2320,7 @@ diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assista diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link_util.cc --- a/ash/assistant/util/deep_link_util.cc +++ b/ash/assistant/util/deep_link_util.cc -@@ -389,21 +389,21 @@ absl::optional GetAssistantUrl( +@@ -388,21 +388,21 @@ absl::optional GetAssistantUrl( case DeepLinkType::kLists: { const auto& type = GetDeepLinkParam(params, DeepLinkParam::kType); top_level_url = @@ -2439,7 +2349,7 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link break; default: NOTREACHED(); -@@ -454,7 +454,7 @@ absl::optional GetWebUrl( +@@ -453,7 +453,7 @@ absl::optional GetWebUrl( DeepLinkType type, const std::map& params) { static constexpr char kAssistantSettingsWebUrl[] = @@ -2595,7 +2505,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 -@@ -36,9 +36,9 @@ +@@ -37,9 +37,9 @@ namespace { const char kDiscoveryLearnMoreLink[] = @@ -2886,7 +2796,7 @@ diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/ diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ui/media_app_guest_ui.cc --- a/ash/webui/media_app_ui/media_app_guest_ui.cc +++ b/ash/webui/media_app_ui/media_app_guest_ui.cc -@@ -109,7 +109,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( +@@ -166,7 +166,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( // Allow calls to Maps reverse geocoding API for loading metadata. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -2913,7 +2823,7 @@ diff --git a/ash/webui/os_feedback_ui/backend/help_content_provider.cc b/ash/web diff --git a/ash/webui/os_feedback_ui/resources/confirmation_page.js b/ash/webui/os_feedback_ui/resources/confirmation_page.js --- a/ash/webui/os_feedback_ui/resources/confirmation_page.js +++ b/ash/webui/os_feedback_ui/resources/confirmation_page.js -@@ -128,7 +128,7 @@ export class ConfirmationPageElement extends ConfirmationPageElementBase { +@@ -147,7 +147,7 @@ export class ConfirmationPageElement extends ConfirmationPageElementBase { case 'chromebookCommunity': // If app locale is not available, default to en. window.open( @@ -2921,7 +2831,7 @@ diff --git a/ash/webui/os_feedback_ui/resources/confirmation_page.js b/ash/webui + `https://support.9oo91e.qjz9zk/chromebook/?hl=${ this.i18n('language') || 'en'}#topic=3399709`, '_blank'); - break; + this.handleEmitMetrics_( diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feedback_ui/resources/fake_data.js --- a/ash/webui/os_feedback_ui/resources/fake_data.js +++ b/ash/webui/os_feedback_ui/resources/fake_data.js @@ -3041,7 +2951,14 @@ diff --git a/ash/webui/print_management/resources/PRESUBMIT.py b/ash/webui/print 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 -@@ -38,13 +38,13 @@ constexpr char kAuthorizationHeaderPrefix[] = "Bearer "; +@@ -38,19 +38,19 @@ constexpr net::NetworkTrafficAnnotationTag kNetworkTrafficAnnotationTag = + + constexpr char kAuthorizationHeaderPrefix[] = "Bearer "; + +-constexpr char kTranslationApiDomain[] = "translation.googleapis.com"; ++constexpr char kTranslationApiDomain[] = "translation.9oo91eapis.qjz9zk"; + + constexpr char kApiKeyParam[] = "key"; // List of URL prefix supported by `ProjectorXhrSender`. const char* kUrlAllowlist[] = { @@ -3089,7 +3006,7 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje std::string mediaCSP = - std::string("media-src 'self' https://*.drive.google.com ") + + std::string("media-src 'self' https://*.drive.9oo91e.qjz9zk ") + - kChromeUIUntrustedProjectorPwaUrl + ";"; + kChromeUIUntrustedProjectorPwaUrl + " blob:;"; source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::MediaSrc, @@ -60,11 +60,11 @@ content::WebUIDataSource* CreateProjectorHTMLSource( @@ -3105,8 +3022,8 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje + "connect-src 'self' https://www.9oo91eapis.qjz9zk " + "https://drive.9oo91e.qjz9zk;"); - // TODO(b/197120695): re-enable trusted type after fixing the issue that - // icon template is setting innerHTML. + 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 @@ -3146,7 +3063,7 @@ diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/r diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js --- a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js +++ b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js -@@ -255,7 +255,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends +@@ -251,7 +251,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends */ computeRsuChallengeLinkText_() { const unlockPageUrl = @@ -3218,7 +3135,7 @@ diff --git a/base/callback.h b/base/callback.h @@ -184,7 +184,7 @@ class OnceCallback : public internal::CallbackBase { static_assert( AlwaysFalse, - "need to convert a base::OnceCallback to absl::FunctionRef? " + "need to convert a base::OnceCallback to base::FunctionRef? " - "Please bring up this use case on #cxx (Slack) or cxx@chromium.org."); + "Please bring up this use case on #cxx (Slack) or cxx@ch40m1um.qjz9zk."); } @@ -3226,7 +3143,7 @@ diff --git a/base/callback.h b/base/callback.h template @@ -194,7 +194,7 @@ class OnceCallback : public internal::CallbackBase { AlwaysFalse, - "using base::BindOnce() is not necessary with absl::FunctionRef; is it " + "using base::BindOnce() is not necessary with base::FunctionRef; is it " "possible to use a capturing lambda directly? If not, please bring up " - "this use case on #cxx (Slack) or cxx@chromium.org."); + "this use case on #cxx (Slack) or cxx@ch40m1um.qjz9zk."); @@ -3236,7 +3153,7 @@ diff --git a/base/callback.h b/base/callback.h @@ -314,7 +314,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { static_assert( AlwaysFalse, - "need to convert a base::RepeatingCallback to absl::FunctionRef? " + "need to convert a base::RepeatingCallback to base::FunctionRef? " - "Please bring up this use case on #cxx (Slack) or cxx@chromium.org."); + "Please bring up this use case on #cxx (Slack) or cxx@ch40m1um.qjz9zk."); } @@ -3244,7 +3161,7 @@ diff --git a/base/callback.h b/base/callback.h template @@ -324,7 +324,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { AlwaysFalse, - "using base::BindRepeating() is not necessary with absl::FunctionRef; " + "using base::BindRepeating() is not necessary with base::FunctionRef; " "is it possible to use a capturing lambda directly? If not, please " - "bring up this use case on #cxx (Slack) or cxx@chromium.org."); + "bring up this use case on #cxx (Slack) or cxx@ch40m1um.qjz9zk."); @@ -3371,7 +3288,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 -@@ -362,7 +362,7 @@ def _OptimizeWithR8(options, +@@ -361,7 +361,7 @@ def _OptimizeWithR8(options, # Python will print the original exception as well. raise Exception( 'R8 failed. Please see ' @@ -3380,7 +3297,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 -@@ -496,7 +496,7 @@ out/Release/apks/YourApk.apk > dex.txt +@@ -495,7 +495,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -3505,7 +3422,7 @@ diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/ 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 -@@ -775,7 +775,7 @@ class _AvdInstance: +@@ -834,7 +834,7 @@ class _AvdInstance: """Return the snapshot name to load/save. Emulator has a different snapshot process when '-writable-system' flag is @@ -3615,18 +3532,6 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py """ # Seek to "end of central directory" struct. eocd_offset_from_end = -22 - len(zip_file.comment) -diff --git a/build/android/test_runner.py b/build/android/test_runner.py ---- a/build/android/test_runner.py -+++ b/build/android/test_runner.py -@@ -1127,7 +1127,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): - result_html_string, _, _ = test_results_presentation.result_details( - json_path=json_file.name, - test_name=args.command, -- cs_base_url='http://cs.chromium.org', -+ cs_base_url='http://cs.ch40m1um.qjz9zk', - local_output=True) - results_detail_file.write(result_html_string) - results_detail_file.flush() diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py --- a/build/android/test_wrapper/logdog_wrapper.py +++ b/build/android/test_wrapper/logdog_wrapper.py @@ -3675,22 +3580,10 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py details on the presubmit API built into depot_tools. """ -diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py ---- a/build/chromeos/test_runner.py -+++ b/build/chromeos/test_runner.py -@@ -894,7 +894,7 @@ def main(): - tast_test_parser = subparsers.add_parser( - 'tast', - help='Runs a device-side set of Tast tests. For more details, see: ' -- 'https://chromium.googlesource.com/chromiumos/platform/tast/+/main/docs/running_tests.md' -+ 'https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/main/docs/running_tests.md' - ) - tast_test_parser.set_defaults(func=device_test) - tast_test_parser.add_argument( 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 -@@ -1805,7 +1805,7 @@ if (enable_java_templates) { +@@ -1834,7 +1834,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -3725,7 +3618,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni template("generate_runner_script") { forward_variables_from(invoker, [ -@@ -507,7 +507,7 @@ template("tast_test") { +@@ -508,7 +508,7 @@ template("tast_test") { if (!defined(tast_attr_expr) && !defined(tast_tests)) { # The following expression filters out all non-critical tests. See the link # below for more details: @@ -3734,7 +3627,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni tast_attr_expr = "\"group:mainline\" && \"dep:chrome\"" if (defined(enable_tast_informational_tests) && -@@ -621,7 +621,7 @@ template("lacros_tast_tests") { +@@ -622,7 +622,7 @@ template("lacros_tast_tests") { # use it for testing. To support running lacros tast tests from Chromium CI, # a Var is added to support pointing the tast tests to use a specified # pre-deployed lacros-chrome. The location is decided by: @@ -3803,7 +3696,7 @@ diff --git a/build/config/ozone.gni b/build/config/ozone.gni diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni --- a/build/config/sanitizers/sanitizers.gni +++ b/build/config/sanitizers/sanitizers.gni -@@ -68,7 +68,7 @@ declare_args() { +@@ -65,7 +65,7 @@ declare_args() { use_cfi_recover = false # Compile for fuzzing with LLVM LibFuzzer. @@ -3839,10 +3732,10 @@ diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py 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 -@@ -27,7 +27,7 @@ from binary_sizes import ReadPackageSizesJson - from binary_sizes import PACKAGES_SIZES_FILE - - _MAX_DELTA_BYTES = 12 * 1024 # 12 KiB +@@ -33,7 +33,7 @@ from binary_sizes import PACKAGES_SIZES_FILE + # (solely based on compressed growth). + _FIRST_WARNING_DELTA_BYTES = 12 * 1024 # 12 KiB + _ALWAYS_FAIL_DELTA_BYTES = 100 * 1024 # 100 KiB -_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' @@ -4271,7 +4164,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd 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 -@@ -402,16 +402,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -403,16 +403,16 @@ are declared in tools/grit/grit_rule.gni. Permission request expired @@ -4292,7 +4185,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -616,7 +616,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -617,7 +617,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -4301,7 +4194,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -793,7 +793,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -794,7 +794,7 @@ are declared in tools/grit/grit_rule.gni. Search images with $1Google Lens @@ -4310,7 +4203,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -874,7 +874,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -875,7 +875,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -4319,7 +4212,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1063,7 +1063,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1064,7 +1064,7 @@ are declared in tools/grit/grit_rule.gni. Search Images with $1Google Lens @@ -4328,7 +4221,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1295,7 +1295,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1296,7 +1296,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4337,7 +4230,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1432,7 +1432,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1433,7 +1433,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -4346,7 +4239,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -3148,10 +3148,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3146,10 +3146,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -4359,7 +4252,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -3160,7 +3160,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3158,7 +3158,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -4368,7 +4261,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -3172,28 +3172,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -3170,28 +3170,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -4404,7 +4297,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -3214,19 +3214,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -3212,19 +3212,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -4429,7 +4322,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -3238,7 +3238,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3236,7 +3236,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -4438,7 +4331,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -3247,7 +3247,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3245,7 +3245,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -4447,7 +4340,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3374,7 +3374,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3372,7 +3372,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4456,7 +4349,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3892,13 +3892,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3893,13 +3893,13 @@ are declared in tools/grit/grit_rule.gni. @@ -4473,7 +4366,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3907,7 +3907,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3908,7 +3908,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -4482,7 +4375,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -4113,16 +4113,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4114,16 +4114,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -4503,7 +4396,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -4132,10 +4132,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4133,10 +4133,10 @@ are declared in tools/grit/grit_rule.gni. @@ -4516,7 +4409,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -4171,28 +4171,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -4172,28 +4172,28 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -4553,7 +4446,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4423,7 +4423,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4424,7 +4424,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -4562,7 +4455,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4435,10 +4435,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4436,10 +4436,10 @@ are declared in tools/grit/grit_rule.gni. @@ -4575,7 +4468,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4577,22 +4577,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4578,22 +4578,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -4604,7 +4497,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4601,10 +4601,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4602,10 +4602,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -4617,7 +4510,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4998,16 +4998,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4999,16 +4999,16 @@ are declared in tools/grit/grit_rule.gni. Allow $13? @@ -4638,7 +4531,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always allow -@@ -5024,16 +5024,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -5025,16 +5025,16 @@ are declared in tools/grit/grit_rule.gni. This can read and change site data @@ -4649,7 +4542,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - You previously chose to not allow any extensions on $1google.com + You previously chose to not allow any extensions on $19oo91e.qjz9zk - + + When I click the extension + + +- Always on $1google.com ++ Always on $19oo91e.qjz9zk + + + Always on all sites +@@ -5046,7 +5046,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -4658,7 +4560,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -5086,16 +5086,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -5099,16 +5099,16 @@ are declared in tools/grit/grit_rule.gni. This Can Read and Change Site Data @@ -4669,7 +4571,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - You Previously Chose To Not Allow Any Extensions On $1google.com + You Previously Chose To Not Allow Any Extensions On $19oo91e.qjz9zk - + + When I Click the Extension + + +- Always on $1google.com ++ Always on $19oo91e.qjz9zk + + + Always on All Sites +@@ -5120,7 +5120,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -4678,7 +4589,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5400,7 +5400,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5425,7 +5425,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -4687,7 +4598,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5492,28 +5492,28 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5551,28 +5551,28 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -4695,8 +4606,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources + Allowed to read and change $19oo91e.qjz9zk -- Requested to read and change $1google.com -+ Requested to read and change $19oo91e.qjz9zk +- Requesting to read and change $1google.com ++ Requesting to read and change $19oo91e.qjz9zk To allow an extension, change your default setting below. @@ -4722,7 +4633,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Customize permissions for each extension -@@ -5800,10 +5800,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5859,10 +5859,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -4735,7 +4646,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved in your Google Account so you can use them on any device -@@ -5812,7 +5812,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5871,7 +5871,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Google Password Manager @@ -4744,7 +4655,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager on this device. -@@ -5821,7 +5821,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5880,7 +5880,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 $1Google Password Manager. @@ -4753,7 +4664,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager. -@@ -5830,10 +5830,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5889,10 +5889,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 @@ -4766,7 +4677,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6281,7 +6281,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6340,7 +6340,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4775,7 +4686,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -6292,7 +6292,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6351,7 +6351,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4784,7 +4695,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -6302,7 +6302,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6361,7 +6361,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4793,7 +4704,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -6311,16 +6311,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6370,16 +6370,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -4813,7 +4724,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6762,7 +6762,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6827,7 +6827,7 @@ Keep your key file in a safe place. You will need it to create new versions of y memories from Google Photos @@ -4822,7 +4733,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources <br> <br> You can manage settings for this card from the card menu or see more options in Customize Chrome. -@@ -6817,10 +6817,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6882,10 +6882,10 @@ Keep your key file in a safe place. You will need it to create new versions of y About this card @@ -4835,7 +4746,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7187,7 +7187,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7261,7 +7261,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -4844,16 +4755,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open in app -@@ -7195,7 +7195,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7269,7 +7269,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + - + Always use the $1YouTube app to open supported web links? -@@ -7349,7 +7349,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7423,7 +7423,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 @@ -4862,7 +4773,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -7478,7 +7478,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -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. @@ -4871,7 +4782,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7515,7 +7515,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7599,7 +7599,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. @@ -4880,7 +4791,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7773,10 +7773,10 @@ Check your passwords anytime in $1Google +@@ -7857,10 +7857,10 @@ Check your passwords anytime in $1Google Suggest strong password @@ -4893,7 +4804,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Confirm your username -@@ -7969,7 +7969,7 @@ Check your passwords anytime in $1Google +@@ -8053,7 +8053,7 @@ Check your passwords anytime in $1Google Clear browsing data @@ -4902,7 +4813,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -7979,7 +7979,7 @@ Check your passwords anytime in $1Google +@@ -8063,7 +8063,7 @@ Check your passwords anytime in $1Google @@ -4911,7 +4822,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -8200,7 +8200,7 @@ Check your passwords anytime in $1Google +@@ -8284,7 +8284,7 @@ Check your passwords anytime in $1Google Uploading ($127%)... @@ -4920,7 +4831,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8621,7 +8621,7 @@ Check your passwords anytime in $1Google +@@ -8705,7 +8705,7 @@ Check your passwords anytime in $1Google @@ -4929,7 +4840,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8629,10 +8629,10 @@ Check your passwords anytime in $1Google +@@ -8713,10 +8713,10 @@ Check your passwords anytime in $1Google Sign in to Security Device @@ -4942,7 +4853,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8941,7 +8941,7 @@ Check your passwords anytime in $1Google +@@ -9025,7 +9025,7 @@ Check your passwords anytime in $1Google Sending link to $1Ted's Pixel2 @@ -4951,7 +4862,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources To send this tab to another device, sign in to Chrome on both devices -@@ -9794,16 +9794,16 @@ Check your passwords anytime in $1Google +@@ -9896,16 +9896,16 @@ Check your passwords anytime in $1Google This will separate your browsing from $1bob@example.com @@ -4971,7 +4882,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9818,10 +9818,10 @@ Check your passwords anytime in $1Google +@@ -9920,10 +9920,10 @@ Check your passwords anytime in $1Google Can't sign in @@ -4984,7 +4895,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -9846,13 +9846,13 @@ Check your passwords anytime in $1Google +@@ -9948,13 +9948,13 @@ Check your passwords anytime in $1Google This wasn't me. @@ -5000,7 +4911,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -9907,7 +9907,7 @@ Check your passwords anytime in $1Google +@@ -10009,7 +10009,7 @@ Check your passwords anytime in $1Google Open $1Adobe Acrobat? @@ -5009,7 +4920,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -9918,8 +9918,8 @@ Check your passwords anytime in $1Google +@@ -10020,8 +10020,8 @@ Check your passwords anytime in $1Google Cancel @@ -5020,7 +4931,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10505,7 +10505,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10607,7 +10607,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -5029,7 +4940,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10932,7 +10932,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11034,7 +11034,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -5038,7 +4949,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -10975,7 +10975,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11077,7 +11077,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. @@ -5047,7 +4958,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from having full control of MIDI devices -@@ -11063,7 +11063,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11165,7 +11165,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -5056,7 +4967,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11095,10 +11095,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11197,10 +11197,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -5069,7 +4980,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11209,19 +11209,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11311,19 +11311,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -5092,7 +5003,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -11244,7 +11244,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11346,7 +11346,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -5101,7 +5012,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -11271,7 +11271,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11373,7 +11373,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -5110,7 +5021,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11472,7 +11472,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11574,7 +11574,7 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Hangouts wants to share the contents of your screen. @@ -5119,7 +5030,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -11592,8 +11592,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11694,8 +11694,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -5130,7 +5041,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -11807,7 +11807,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11912,7 +11912,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5139,7 +5050,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -11919,7 +11919,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12024,7 +12024,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5148,7 +5059,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -11959,7 +11959,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12064,7 +12064,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5157,7 +5068,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -12044,7 +12044,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12149,7 +12149,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5166,7 +5077,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -12172,7 +12172,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12280,7 +12280,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5175,7 +5086,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -12367,13 +12367,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12489,13 +12489,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5191,7 +5102,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -12477,7 +12477,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12599,7 +12599,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5200,16 +5111,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -12495,7 +12495,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12617,7 +12617,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request - accounts.google.com$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. + accounts.9oo91e.qjz9zk$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. - - Add a new Android phone -@@ -12591,7 +12591,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + + Use phone with a QR code +@@ -12713,7 +12713,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5218,7 +5129,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -12607,7 +12607,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12729,7 +12729,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 @@ -5227,7 +5138,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Your security key does not have enough space for any more accounts. -@@ -12616,13 +12616,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12738,13 +12738,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -5243,7 +5154,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -13001,7 +13001,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13123,7 +13123,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5252,7 +5163,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -13343,7 +13343,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13471,7 +13471,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Help us build a more private web @@ -5408,7 +5319,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py 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 -@@ -4458,7 +4458,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4510,7 +4510,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -5417,15 +5328,15 @@ 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, -@@ -4742,7 +4742,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4795,7 +4795,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, - "https://play.google.com/store/apps/" + "https://play.9oo91e.qjz9zk/store/apps/" "details?id=com.android.chrome")}, - #endif // BUILDFLAG(IS_ANDROID) - {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, + {"omaha-min-sdk-version-android", + flag_descriptions::kOmahaMinSdkVersionAndroidName, diff --git a/chrome/browser/android/explore_sites/url_util.cc b/chrome/browser/android/explore_sites/url_util.cc --- a/chrome/browser/android/explore_sites/url_util.cc +++ b/chrome/browser/android/explore_sites/url_util.cc @@ -5681,22 +5592,10 @@ diff --git a/chrome/browser/ash/child_accounts/child_user_service.cc b/chrome/br "details?id=com.google.android.apps.kids.familylinkhelper"; ChildUserService::TestApi::TestApi(ChildUserService* service) -diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html ---- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -+++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -@@ -5,7 +5,7 @@ - - $i18n{blockPageTitle} -- -+ - - - diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc -@@ -58,7 +58,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -60,7 +60,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -5708,7 +5607,7 @@ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/c diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc -@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { +@@ -199,7 +199,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -5732,13 +5631,18 @@ 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,25 +34,25 @@ namespace { +@@ -34,29 +34,29 @@ namespace { // Location of the page to buy more storage for Google Drive. const char kGoogleDriveBuyStorageUrl[] = - "https://www.google.com/settings/storage"; + "https://www.9oo91e.qjz9zk/settings/storage"; + // Location of the page to manage Google Drive storage. + const char kGoogleDriveManageStorageUrl[] = +- "https://drive.google.com/drive/u/0/quota"; ++ "https://drive.9oo91e.qjz9zk/drive/u/0/quota"; + // Location of the overview page about Google Drive. const char kGoogleDriveOverviewUrl[] = - "https://support.google.com/chromebook/?p=filemanager_drive"; @@ -5793,8 +5697,8 @@ diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/ha - "https://storage.googleapis.com/chromeos-hats-web-stable/index.html"; + "https://storage.9oo91eapis.qjz9zk/chromeos-hats-web-stable/index.html"; - // Delimiters used to join the separate device info elements into a single - // string to be used as site context. + } // namespace + diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc --- a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc @@ -5921,7 +5825,7 @@ diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chro diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc -@@ -39,10 +39,10 @@ namespace ash { +@@ -38,10 +38,10 @@ namespace ash { namespace { constexpr const char kGetAppListUrl[] = @@ -6315,7 +6219,7 @@ diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc --- a/chrome/browser/cart/cart_service.cc +++ b/chrome/browser/cart/cart_service.cc -@@ -625,17 +625,17 @@ void CartService::AddCartsWithFakeData() { +@@ -628,17 +628,17 @@ void CartService::AddCartsWithFakeData() { u"15%")); dummy_proto1.mutable_discount_info()->set_has_coupons(true); dummy_proto1.add_product_image_urls( @@ -6336,7 +6240,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -673,12 +673,12 @@ void CartService::AddCartsWithFakeData() { +@@ -676,12 +676,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -6351,7 +6255,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); -@@ -696,7 +696,7 @@ void CartService::AddCartsWithFakeData() { +@@ -699,7 +699,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -6360,7 +6264,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -711,12 +711,12 @@ void CartService::AddCartsWithFakeData() { +@@ -714,12 +714,12 @@ void CartService::AddCartsWithFakeData() { dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); dummy_proto4.set_timestamp(time_now + 5); dummy_proto4.add_product_image_urls( @@ -6375,7 +6279,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -731,7 +731,7 @@ void CartService::AddCartsWithFakeData() { +@@ -734,7 +734,7 @@ void CartService::AddCartsWithFakeData() { dummy_proto5.set_merchant_cart_url(dummy_url5.spec()); dummy_proto5.set_timestamp(time_now + 2); dummy_proto5.add_product_image_urls( @@ -6384,7 +6288,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -746,17 +746,17 @@ void CartService::AddCartsWithFakeData() { +@@ -749,17 +749,17 @@ void CartService::AddCartsWithFakeData() { dummy_proto6.set_merchant_cart_url(dummy_url6.spec()); dummy_proto6.set_timestamp(time_now + 1); dummy_proto6.add_product_image_urls( @@ -6456,7 +6360,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 -@@ -1180,7 +1180,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1174,7 +1174,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6465,7 +6369,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); return; -@@ -1196,7 +1196,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1190,7 +1190,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6474,6 +6378,17 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); } +diff --git a/chrome/browser/chrome_for_testing/buildflags.gni b/chrome/browser/chrome_for_testing/buildflags.gni +--- a/chrome/browser/chrome_for_testing/buildflags.gni ++++ b/chrome/browser/chrome_for_testing/buildflags.gni +@@ -9,6 +9,6 @@ declare_args() { + # + # Note: CfT is not intended to be used 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/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc @@ -6523,6 +6438,18 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome "protecting-users-from-insecure.html" " for more details.", data.initiator_->GetURL().spec().c_str(), +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 { + + namespace { + +-constexpr char kStableChannelHostName[] = "m.google.com"; ++constexpr char kStableChannelHostName[] = "m.9oo91e.qjz9zk"; + + bool ValidRotationCommand(const std::string& host_name) { + return chrome::GetChannel() != version_info::Channel::STABLE || diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc @@ -6535,36 +6462,6 @@ diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/in // Returns decoded value from the base-64 `encoded_value`, or null // in case of a decoding error. The returned value is an opaque binary -diff --git a/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc b/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc ---- a/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc -+++ b/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc -@@ -20,7 +20,7 @@ namespace enterprise_connectors { - std::string GetAllAllowedTestPolicy(const char* enterprise_id) { - const char kConnectorPolicyString[] = R"PREFIX( - [ { -- "domain": "google.com", -+ "domain": "9oo91e.qjz9zk", - "enable": [ { - "mime_types": [ "*" ], - "url_list": [ "*" ] -@@ -36,7 +36,7 @@ std::string GetTestPolicyWithEnabledFilter(const char* enterprise_id, - const char* include_mime) { - const char kConnectorPolicyString[] = R"PREFIX( - [ { -- "domain": "google.com", -+ "domain": "9oo91e.qjz9zk", - "enable": [ { - "mime_types": [ "%s" ], - "url_list": [ "%s" ] -@@ -53,7 +53,7 @@ std::string GetTestPolicyWithDisabledFilter(const char* enterprise_id, - const char* exclude_mime) { - const char kConnectorPolicyString[] = R"PREFIX( - [ { -- "domain": "google.com", -+ "domain": "9oo91e.qjz9zk", - "enable": [ { - "mime_types": [ "*" ], - "url_list": [ "*" ] diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc --- a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +++ b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc @@ -6580,7 +6477,7 @@ diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_dele diff --git a/chrome/browser/enterprise/connectors/service_provider_config.cc b/chrome/browser/enterprise/connectors/service_provider_config.cc --- a/chrome/browser/enterprise/connectors/service_provider_config.cc +++ b/chrome/browser/enterprise/connectors/service_provider_config.cc -@@ -153,7 +153,7 @@ constexpr std::array kGoogleDlpSupportedTags = {{ +@@ -41,7 +41,7 @@ constexpr std::array kGoogleDlpSupportedTags = {{ }}; constexpr AnalysisConfig kGoogleAnalysisConfig = { @@ -6589,7 +6486,7 @@ diff --git a/chrome/browser/enterprise/connectors/service_provider_config.cc b/c .supported_tags = base::span(kGoogleDlpSupportedTags), }; -@@ -173,7 +173,7 @@ constexpr AnalysisConfig kLocalTestAnalysisConfig = { +@@ -66,7 +66,7 @@ constexpr AnalysisConfig kLocalTestSystemAnalysisConfig = { }; constexpr ReportingConfig kGoogleReportingConfig = { @@ -6701,7 +6598,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 -@@ -86,7 +86,7 @@ namespace { +@@ -85,7 +85,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kPlayIntentPrefix[] = @@ -6725,14 +6622,15 @@ diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/ diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/chrome/browser/extensions/chrome_extension_browser_constants.cc --- a/chrome/browser/extensions/chrome_extension_browser_constants.cc +++ b/chrome/browser/extensions/chrome_extension_browser_constants.cc -@@ -8,6 +8,6 @@ namespace chrome_extension_constants { +@@ -8,7 +8,7 @@ namespace chrome_extension_constants { // The link to the help article for runtime host permissions. const char kRuntimeHostPermissionsHelpURL[] = - "https://support.google.com/chrome?p=enable_extensions"; + "https://support.9oo91e.qjz9zk/chrome?p=enable_extensions"; - } // namespace chrome_extension_constants + // The link to the site permissions settings page. + const char kExtensionsSitePermissionsURL[] = 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 @@ -6784,7 +6682,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 -@@ -214,7 +214,7 @@ const char kU2FPermissionPromptDescription[] = +@@ -223,7 +223,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 " @@ -6793,16 +6691,16 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti #if BUILDFLAG(ENABLE_SUPERVISED_USERS) const char kWebFilterInterstitialRefreshName[] = -@@ -229,7 +229,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -238,7 +238,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 " - "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; + "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; - const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; - const char kUpcomingSharingFeaturesDescription[] = -@@ -1192,7 +1192,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = + const char kLoadCryptoTokenExtensionName[] = + "Load the CryptoToken component extension "; +@@ -1197,7 +1197,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = const char kBlockInsecurePrivateNetworkRequestsDescription[] = "Prevents non-secure contexts from making subresource requests to " "more-private IP addresses. See also: " @@ -6811,7 +6709,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessSendPreflightsName[] = "Send Private Network Access preflights"; -@@ -1200,7 +1200,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = +@@ -1205,7 +1205,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: " @@ -6820,16 +6718,25 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessRespectPreflightResultsName[] = "Respect the result of Private Network Access preflights"; -@@ -1208,7 +1208,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = +@@ -1213,7 +1213,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: " - "https://developer.chrome.com/blog/private-network-access-preflight/"; ++ "https://developer.ch40me.qjz9zk/blog/private-network-access-preflight/"; + + const char kPrivateNetworkAccessPreflightShortTimeoutName[] = + "Reduce waiting time for Private Network Access preflights response"; +@@ -1221,7 +1221,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: " +- "https://developer.chrome.com/blog/private-network-access-preflight/"; + "https://developer.ch40me.qjz9zk/blog/private-network-access-preflight/"; const char kDeprecateAltClickName[] = "Enable Alt+Click deprecation notifications"; -@@ -2394,7 +2394,7 @@ const char kQuickIntensiveWakeUpThrottlingAfterLoadingDescription[] = +@@ -2442,7 +2442,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 " @@ -6838,7 +6745,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti "info."; const char kSettingsAppNotificationSettingsName[] = -@@ -2414,7 +2414,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2468,7 +2468,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. " @@ -6847,16 +6754,16 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2435,7 +2435,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -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 kSamePartyCookiesConsideredFirstPartyName[] = - "Consider SameParty cookies to be first-party."; -@@ -2465,7 +2465,7 @@ const char kThirdPartyStoragePartitioningName[] = + const char kSafetyCheckPermissionsName[] = "Permission Modules on Safety Check"; + const char kSafetyCheckPermissionsDescription[] = +@@ -2524,7 +2524,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 " @@ -6865,123 +6772,6 @@ 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/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc ---- a/chrome/browser/importer/edge_importer_browsertest_win.cc -+++ b/chrome/browser/importer/edge_importer_browsertest_win.cc -@@ -170,7 +170,7 @@ IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, EdgeImporter) { - L"SubLink", - "http://www.links-sublink.com/"}, - {true, 1, {"Links"}, L"TheLink", "http://www.links-thelink.com/"}, -- {false, 0, {}, L"Google Home Page", "http://www.google.com/"}, -+ {false, 0, {}, L"Google Home Page", "http://www.9oo91e.qjz9zk/"}, - {false, 0, {}, L"TheLink", "http://www.links-thelink.com/"}, - {false, 1, {"SubFolder"}, L"Title", "http://www.link.com/"}, - {false, 0, {}, L"WithPortAndQuery", "http://host:8080/cgi?q=query"}, -@@ -186,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, EdgeImporter) { - L"http://www.links-sublink.com"}, - {L"http://www.links-thelink.com/favicon.ico", - L"http://www.links-thelink.com"}, -- {L"http://www.google.com/favicon.ico", L"http://www.google.com"}, -+ {L"http://www.9oo91e.qjz9zk/favicon.ico", L"http://www.9oo91e.qjz9zk"}, - {L"http://www.links-thelink.com/favicon.ico", - L"http://www.links-thelink.com"}, - {L"http://www.link.com/favicon.ico", L"http://www.link.com"}, -@@ -239,11 +239,11 @@ IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, EdgeImporterLegacyFallback) { - return; - - const BookmarkInfo kEdgeBookmarks[] = { -- {false, 0, {}, L"Google", "http://www.google.com/"}}; -+ {false, 0, {}, L"Google", "http://www.9oo91e.qjz9zk/"}}; - std::vector bookmark_entries( - kEdgeBookmarks, kEdgeBookmarks + std::size(kEdgeBookmarks)); - const FaviconGroup kEdgeFaviconGroup[] = { -- {L"http://www.google.com/favicon.ico", L"http://www.google.com/"}}; -+ {L"http://www.9oo91e.qjz9zk/favicon.ico", L"http://www.9oo91e.qjz9zk/"}}; - std::vector favicon_groups( - kEdgeFaviconGroup, kEdgeFaviconGroup + std::size(kEdgeFaviconGroup)); - -diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc ---- a/chrome/browser/importer/ie_importer_browsertest_win.cc -+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc -@@ -59,7 +59,7 @@ const BookmarkInfo kIEBookmarks[] = { - "http://www.links-thelink.com/"}, - {false, 0, {}, - L"Google Home Page", -- "http://www.google.com/"}, -+ "http://www.9oo91e.qjz9zk/"}, - {false, 0, {}, - L"TheLink", - "http://www.links-thelink.com/"}, -@@ -78,10 +78,10 @@ const BookmarkInfo kIEBookmarks[] = { - }; - - const BookmarkInfo kIESortedBookmarks[] = { -- {false, 0, {}, L"a", "http://www.google.com/0"}, -- {false, 1, {"b"}, L"a", "http://www.google.com/1"}, -- {false, 1, {"b"}, L"b", "http://www.google.com/2"}, -- {false, 0, {}, L"c", "http://www.google.com/3"}, -+ {false, 0, {}, L"a", "http://www.9oo91e.qjz9zk/0"}, -+ {false, 1, {"b"}, L"a", "http://www.9oo91e.qjz9zk/1"}, -+ {false, 1, {"b"}, L"b", "http://www.9oo91e.qjz9zk/2"}, -+ {false, 0, {}, L"c", "http://www.9oo91e.qjz9zk/3"}, - }; - - const char16_t kIEIdentifyUrl[] = -@@ -109,8 +109,8 @@ struct FaviconGroup { - }; - - const FaviconGroup kIEFaviconGroup[2] = { -- {u"http://www.google.com/favicon.ico", -- {u"http://www.google.com/", u"http://www.subfolder.com/"}}, -+ {u"http://www.9oo91e.qjz9zk/favicon.ico", -+ {u"http://www.9oo91e.qjz9zk/", u"http://www.subfolder.com/"}}, - {u"http://example.com/favicon.ico", - {u"http://host:8080/cgi?q=query", u"http://chinese-title-favorite/"}}, - }; -@@ -402,13 +402,13 @@ IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) { - NULL); - CreateDirectory(path.AppendASCII("\x0061").value().c_str(), NULL); - ASSERT_TRUE(CreateUrlFileWithFavicon(path.AppendASCII("Google Home Page.url"), -- L"http://www.google.com/", -- L"http://www.google.com/favicon.ico")); -+ L"http://www.9oo91e.qjz9zk/", -+ L"http://www.9oo91e.qjz9zk/favicon.ico")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("SubFolder\\Title.url"), - L"http://www.link.com/")); - ASSERT_TRUE(CreateUrlFileWithFavicon(path.AppendASCII("SubFolder.url"), - L"http://www.subfolder.com/", -- L"http://www.google.com/favicon.ico")); -+ L"http://www.9oo91e.qjz9zk/favicon.ico")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("TheLink.url"), - L"http://www.links-thelink.com/")); - ASSERT_TRUE(CreateUrlFileWithFavicon(path.AppendASCII("WithPortAndQuery.url"), -@@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) { - links_path.AppendASCII("SubFolderOfLinks").AppendASCII("SubLink.url"), - L"http://www.links-sublink.com/")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("IEDefaultLink.url"), -- L"http://go.microsoft.com/fwlink/?linkid=140813")); -+ L"http://go.m1cr050ft.qjz9zk/fwlink/?linkid=140813")); - base::WriteFile(path.AppendASCII("InvalidUrlFile.url"), "x", 1); - base::WriteFile(path.AppendASCII("PlainTextFile.txt"), "x", 1); - -@@ -481,13 +481,13 @@ IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, - CreateDirectory(path.value().c_str(), NULL); - CreateDirectory(path.AppendASCII("b").value().c_str(), NULL); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("a.url"), -- L"http://www.google.com/0")); -+ L"http://www.9oo91e.qjz9zk/0")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("b").AppendASCII("a.url"), -- L"http://www.google.com/1")); -+ L"http://www.9oo91e.qjz9zk/1")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("b").AppendASCII("b.url"), -- L"http://www.google.com/2")); -+ L"http://www.9oo91e.qjz9zk/2")); - ASSERT_TRUE(CreateUrlFile(path.AppendASCII("c.url"), -- L"http://www.google.com/3")); -+ L"http://www.9oo91e.qjz9zk/3")); - - struct BadBinaryData { - const char* data; 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 @@ -7065,7 +6855,7 @@ diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provide diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc -@@ -664,15 +664,15 @@ std::vector DialMediaRouteProvider::GetOrigins( +@@ -655,15 +655,15 @@ std::vector DialMediaRouteProvider::GetOrigins( base::flat_map>> origin_allowlist( {{"YouTube", @@ -7090,18 +6880,6 @@ diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provide {"Netflix", {CreateOrigin("https://www.netflix.com")}}, {"Pandora", {CreateOrigin("https://www.pandora.com")}}, {"Radio", {CreateOrigin("https://www.pandora.com")}}, -diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc ---- a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc -+++ b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc -@@ -37,7 +37,7 @@ const char kAdviseOnGclientSolution[] = - "You also need to add this solution to your .gclient:\n" - "{\n" - " \"name\" : \"webrtc.DEPS\",\n" -- " \"url\" : \"https://chromium.googlesource.com/chromium/deps/" -+ " \"url\" : \"https://chromium.9oo91esource.qjz9zk/chromium/deps/" - "webrtc/webrtc.DEPS\",\n" - "}\n" - "and run gclient sync. This will download the required ref files."; diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -7321,7 +7099,7 @@ diff --git a/chrome/browser/obsolete_system/obsolete_system_linux.cc b/chrome/br diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc --- a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc -@@ -95,7 +95,7 @@ const char kHistogramNoServiceWorkerFirstContentfulPaintDocs[] = +@@ -110,7 +110,7 @@ const char kHistogramNoServiceWorkerFirstContentfulPaintDocs[] = namespace { bool IsDocsSite(const GURL& url) { @@ -7376,18 +7154,6 @@ diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/c chromeos::LacrosService* service = chromeos::LacrosService::Get(); if (!service || !service->IsAvailable()) { -diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/browser/policy/extension_force_install_mixin.cc ---- a/chrome/browser/policy/extension_force_install_mixin.cc -+++ b/chrome/browser/policy/extension_force_install_mixin.cc -@@ -79,7 +79,7 @@ constexpr char kUpdateManifestFileNameTemplate[] = "%s.xml"; - // Template for the update manifest contents. - constexpr char kUpdateManifestTemplate[] = - R"( -- -+ - - - diff --git a/chrome/browser/policy/safe_search_policy_test.h b/chrome/browser/policy/safe_search_policy_test.h --- a/chrome/browser/policy/safe_search_policy_test.h +++ b/chrome/browser/policy/safe_search_policy_test.h @@ -7400,9 +7166,9 @@ diff --git a/chrome/browser/policy/safe_search_policy_test.h b/chrome/browser/po }; } // namespace policy -diff --git a/chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc b/chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc ---- a/chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc -+++ b/chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc +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() { } @@ -7412,9 +7178,23 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_dele } std::string ChromePrefetchServiceDelegate::GetAPIKey() { -diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc ---- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc -+++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc +@@ -43,11 +43,11 @@ std::string ChromePrefetchServiceDelegate::GetAPIKey() { + } + + GURL ChromePrefetchServiceDelegate::GetDefaultDNSCanaryCheckURL() { +- return GURL("http://dns-tunnel-check.googlezip.net/connect"); ++ return GURL("http://dns-tunnel-check.9oo91e21p.qjz9zk/connect"); + } + + GURL ChromePrefetchServiceDelegate::GetDefaultTLSCanaryCheckURL() { +- return GURL("http://tls-tunnel-check.googlezip.net/connect"); ++ return GURL("http://tls-tunnel-check.9oo91e21p.qjz9zk/connect"); + } + + void ChromePrefetchServiceDelegate::ReportOriginRetryAfter( +diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.cc +--- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.cc ++++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.cc @@ -47,7 +47,7 @@ GURL PrefetchProxyProxyHost() { if (url.is_valid() && url.SchemeIs(url::kHttpsScheme)) { return url; @@ -7442,6 +7222,31 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } base::TimeDelta PrefetchProxyCanaryCheckCacheLifetime() { +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 + PrivacySandboxService::GetFirstPartySets() { + if (privacy_sandbox::kPrivacySandboxFirstPartySetsUISampleSets.Get()) { +- return {{net::SchemefulSite(GURL("https://youtube.com")), +- net::SchemefulSite(GURL("https://google.com"))}, +- {net::SchemefulSite(GURL("https://google.com")), +- net::SchemefulSite(GURL("https://google.com"))}, +- {net::SchemefulSite(GURL("https://google.com.au")), +- net::SchemefulSite(GURL("https://google.com"))}, ++ return {{net::SchemefulSite(GURL("https://y0u1ub3.qjz9zk")), ++ net::SchemefulSite(GURL("https://9oo91e.qjz9zk"))}, ++ {net::SchemefulSite(GURL("https://9oo91e.qjz9zk")), ++ net::SchemefulSite(GURL("https://9oo91e.qjz9zk"))}, ++ {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"))}}; + } + + // TODO(crbug.com/1332513): Retrieve set information from FPS delegate. 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 @@ -7454,18 +7259,6 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows } ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, -diff --git a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc ---- a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc -+++ b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc -@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ProfileShortcutManagerBrowserTest, - auto* identity_manager = - IdentityManagerFactory::GetForProfile(browser()->profile()); - ASSERT_TRUE(identity_manager); -- signin::MakePrimaryAccountAvailable(identity_manager, "foo@gmail.com", -+ signin::MakePrimaryAccountAvailable(identity_manager, "foo@9ma1l.qjz9zk", - signin::ConsentLevel::kSync); - // Standard size of a Gaia account picture. - const int kGaiaPictureSize = 256; diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/browser/push_messaging/push_messaging_constants.cc --- a/chrome/browser/push_messaging/push_messaging_constants.cc +++ b/chrome/browser/push_messaging/push_messaging_constants.cc @@ -7481,7 +7274,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 -@@ -99,7 +99,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -100,7 +100,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 " @@ -7553,7 +7346,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo @@ -25,7 +25,7 @@ export class ListCommandsMacro extends Macro { // Note that this will open a new tab, ending the current Dictation session // by changing the input focus. - window.open( + globalThis.open( - 'https://support.google.com/chromebook?p=text_dictation_m100', + 'https://support.9oo91e.qjz9zk/chromebook?p=text_dictation_m100', '_blank'); @@ -7574,7 +7367,7 @@ 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 -@@ -212,7 +212,7 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -222,7 +222,7 @@ export class CommandHandler extends CommandHandlerInterface { QueueMode.FLUSH); return false; case 'reportIssue': @@ -7583,7 +7376,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -310,7 +310,7 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -320,7 +320,7 @@ export class CommandHandler extends CommandHandlerInterface { case 'showTalkBackKeyboardShortcuts': chrome.tabs.create({ url: @@ -7592,7 +7385,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun }); return false; case 'showTtsSettings': -@@ -1571,13 +1571,13 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -1581,13 +1581,13 @@ export class CommandHandler extends CommandHandlerInterface { init() { ChromeVoxKbHandler.commandHandler = command => this.onCommand(command); @@ -7681,7 +7474,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js --- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js -@@ -232,7 +232,7 @@ E2ETestBase = class extends AccessibilityTestBase { +@@ -234,7 +234,7 @@ E2ETestBase = class extends AccessibilityTestBase { const url = opt_params.url || DocUtils.createUrlForDoc(doc); const hasLacrosChromePath = await new Promise( @@ -7693,7 +7486,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_ diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js --- a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +++ b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js -@@ -707,15 +707,15 @@ Polymer({ +@@ -710,15 +710,15 @@ Polymer({ { msgId: 'next_command_reference', link: @@ -7739,7 +7532,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js -@@ -23,7 +23,7 @@ const SelectToSpeakState = chrome.accessibilityPrivate.SelectToSpeakState; +@@ -27,7 +27,7 @@ const SelectToSpeakState = chrome.accessibilityPrivate.SelectToSpeakState; // Matches one of the known GSuite apps which need the clipboard to find and // read selected text. Includes sandbox and non-sandbox versions. const GSUITE_APP_REGEXP = @@ -7748,7 +7541,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/sel // Settings key for system speech rate setting. const SPEECH_RATE_KEY = 'settings.tts.speech_rate'; -@@ -178,7 +178,7 @@ export class SelectToSpeak { +@@ -182,7 +182,7 @@ export class SelectToSpeak { this.enableLanguageDetectionIntegration_ = false; // TODO(chrishall): do we want to (also?) expose this in preferences? @@ -7757,7 +7550,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/sel 'enable-experimental-accessibility-language-detection', result => { this.enableLanguageDetectionIntegration_ = result; }); -@@ -689,8 +689,8 @@ export class SelectToSpeak { +@@ -693,8 +693,8 @@ export class SelectToSpeak { chrome.tabs.query( { url: [ @@ -8325,7 +8118,7 @@ diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/bro } } else { console.error('### Uknown zippy type ' + type); -@@ -707,7 +707,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -693,7 +693,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -8337,7 +8130,7 @@ diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/bro diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js --- a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js -@@ -210,7 +210,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { +@@ -235,7 +235,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { * 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. */ @@ -8346,7 +8139,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of this.termsError = false; this.usingOfflineTermsForTesting_ = false; -@@ -738,7 +738,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { +@@ -763,7 +763,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { if (results && results.length == 1 && typeof results[0] == 'string') { self.showUrlOverlay(results[0]); } else { @@ -8507,7 +8300,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py b/chrome/brows 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 -@@ -712,7 +712,7 @@ cr.define('cr.login', function() { +@@ -709,7 +709,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -8683,7 +8476,7 @@ diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/

-@@ -63,8 +63,8 @@ found in the LICENSE file. +@@ -74,8 +74,8 @@ found in the LICENSE file.
HSTS is HTTP Strict Transport Security: a way for sites to elect to always use HTTPS. See @@ -8853,7 +8646,7 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chro $i18n{learnMore}
-@@ -118,7 +118,7 @@ +@@ -113,7 +113,7 @@ on-click="onPromoteUpdaterTap_">
[[promoteUpdaterStatus_.text]] @@ -8889,19 +8682,19 @@ diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/ 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 -@@ -406,7 +406,7 @@ - if="[[shouldShowAdditionalFeaturesLink_(isGuest_, isKioskModeActive_)]]"> +@@ -417,7 +417,7 @@ + if="[[shouldShowAdditionalFeaturesLink_(isKioskModeActive_, isGuest_)]]"> + href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions">
$i18n{additionalFeaturesTitle} -
+
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 -@@ -337,7 +337,7 @@ class SettingsManageA11YPageElement extends SettingsManageA11YPageElementBase { +@@ -322,7 +322,7 @@ class SettingsManageA11YPageElement extends SettingsManageA11YPageElementBase { /** @protected */ dictationLearnMoreUrl_: { type: String, @@ -8910,6 +8703,18 @@ 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_)]]"> + ++ href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions"> +
+ $i18n{additionalFeaturesTitle} +
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 @@ -8925,7 +8730,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/channel_sw diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html b/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html --- a/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html +++ b/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html -@@ -104,7 +104,7 @@ +@@ -110,7 +110,7 @@ currentUpdateStatusEvent_, targetChannel_)]]">
percent_encoded_email; url::RawCanonOutputT percent_encoded_account_url; -@@ -922,7 +922,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { +@@ -920,7 +920,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( @@ -9082,7 +8899,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 -@@ -33,10 +33,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10); +@@ -32,10 +32,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10); constexpr base::TimeDelta kScanningTimeout = base::Minutes(5); const char kSbEnterpriseUploadUrl[] = @@ -9199,18 +9016,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/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc ---- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc -+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc -@@ -42,7 +42,7 @@ using testing::IsEmpty; - using testing::UnorderedElementsAre; - - const char kDefaultHomepage[] = "http://myhomepage.com"; --const char kDefaultSearchUrl[] = "http://mygoogle.com/s?q={searchTerms}"; -+const char kDefaultSearchUrl[] = "http://my9oo91e.qjz9zk/s?q={searchTerms}"; - const char kDefaultStartupUrl1[] = "http://mystart1.com"; - const char kDefaultStartupUrl2[] = "http://mystart2.com"; - 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 @@ -9351,7 +9156,7 @@ diff --git a/chrome/browser/sharing/web_push/web_push_sender.cc b/chrome/browser diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc -@@ -192,7 +192,7 @@ void InitializePrefsForProfile(Profile* profile) { +@@ -184,7 +184,7 @@ std::u16string GetAuthenticatedUsername(Profile* profile) { void ShowSigninErrorLearnMorePage(Profile* profile) { static const char kSigninErrorLearnMoreUrl[] = @@ -9375,7 +9180,7 @@ diff --git a/chrome/browser/ssl/connection_help_tab_helper.cc b/chrome/browser/s diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sct_reporting_service.cc --- a/chrome/browser/ssl/sct_reporting_service.cc +++ b/chrome/browser/ssl/sct_reporting_service.cc -@@ -94,11 +94,11 @@ constexpr net::NetworkTrafficAnnotationTag kSCTHashdanceTrafficAnnotation = +@@ -95,11 +95,11 @@ constexpr net::NetworkTrafficAnnotationTag kSCTHashdanceTrafficAnnotation = })"); constexpr char kSBSCTAuditingReportURL[] = @@ -9416,7 +9221,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources 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 -@@ -88,7 +88,7 @@ namespace { +@@ -87,7 +87,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = @@ -9583,7 +9388,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This field cannot be blank -@@ -2962,7 +2962,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Use without an account @@ -9592,7 +9397,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro By continuing, you agree to the <TOS_LINK>Terms of Service</TOS_LINK>.\nTo help improve the app, Chrome sends usage and crash data to Google. <UMA_LINK>Manage</UMA_LINK> -@@ -2971,7 +2971,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

By continuing, you agree to the <TOS_LINK>Terms of Service</TOS_LINK> and <PRIVACY_LINK>Privacy\u00A0Policy</PRIVACY_LINK>. @@ -9601,7 +9406,28 @@ 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. <UMA_LINK>Manage</UMA_LINK> -@@ -4071,7 +4071,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

+ You can always choose what to sync in <LINK1>settings</LINK1>. + +- ++ + You can always choose what to sync in <LINK1>settings</LINK1>. Google may personalize Search and other services based on your history. + +- ++ + Bookmarks + +- ++ + Autofill + +- ++ + History and more + + +@@ -4109,7 +4109,7 @@ To change this setting, <resetlink>reset sync

Showing suggestions for %1$sCrater Lake National Park (U.S. National Park Service) @@ -9610,7 +9436,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Chrome action button: %sclear browsing data -@@ -4322,7 +4322,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9619,7 +9445,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro No compatible devices found -@@ -4359,7 +4359,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sChromium @@ -9628,7 +9454,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro %1$sYouTube also has data in Chrome -@@ -4712,7 +4712,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sTanya's Pixel 2... @@ -9637,7 +9463,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro List of devices to share a tab with. -@@ -4751,7 +4751,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sphone @@ -9646,7 +9472,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro You can send tabs between devices that are signed in with the same Google Account -@@ -5766,7 +5766,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9655,7 +9481,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Your browser is not managed -@@ -5781,7 +5781,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9691,7 +9517,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 -@@ -106,7 +106,7 @@ class ItemSuggestCache { +@@ -112,7 +112,7 @@ class ItemSuggestCache { // The url of the service that fetches descriptions given image pixels. static constexpr base::FeatureParam kServerUrl{ &kExperiment, "server_url", @@ -9700,10 +9526,10 @@ diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chro // Specifies the ItemSuggest backend that should be used to serve our // requests. -diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc ---- a/chrome/browser/ui/app_list/search/omnibox_provider.cc -+++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc -@@ -45,7 +45,7 @@ constexpr size_t kMinQueryLengthForCommonAnswers = 4u; +diff --git a/chrome/browser/ui/app_list/search/omnibox_util.cc b/chrome/browser/ui/app_list/search/omnibox_util.cc +--- a/chrome/browser/ui/app_list/search/omnibox_util.cc ++++ b/chrome/browser/ui/app_list/search/omnibox_util.cc +@@ -16,7 +16,7 @@ namespace app_list { bool IsDriveUrl(const GURL& url) { // Returns true if the |url| points to a Drive Web host. const std::string& host = url.host(); @@ -9711,7 +9537,7 @@ diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/brow + return host == "drive.9oo91e.qjz9zk" || host == "docs.9oo91e.qjz9zk"; } - // Returns true if the match is an answer, including calculator answers. + void RemoveDuplicateResults( diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc --- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc +++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc @@ -9753,7 +9579,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 -@@ -69,7 +69,7 @@ +@@ -75,7 +75,7 @@ namespace { const char kKeyboardShortcutHelpPageUrl[] = @@ -9777,10 +9603,10 @@ diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/bro diff --git a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc --- a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc +++ b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc -@@ -37,7 +37,7 @@ namespace { +@@ -31,7 +31,7 @@ + + namespace { - constexpr base::FilePath::CharType kMediaExtension[] = - FILE_PATH_LITERAL(".webm"); -constexpr char kOpenUrlBase[] = "https://drive.google.com/open"; +constexpr char kOpenUrlBase[] = "https://drive.9oo91e.qjz9zk/open"; constexpr char kDriveRequestContentHintsKey[] = "contentHints"; @@ -9789,7 +9615,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 -@@ -86,7 +86,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr; +@@ -88,7 +88,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 = @@ -9798,7 +9624,7 @@ diff --git a/chrome/browser/ui/ash/system_tray_client_impl.cc b/chrome/browser/u void ShowSettingsSubPageForActiveUser(const std::string& sub_page) { chrome::SettingsWindowManager::GetInstance()->ShowOSSettings( -@@ -717,7 +717,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( +@@ -729,7 +729,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( // app scope" guards in WebAppLaunchProcess::Run(). See http://b/214428922 GURL::Replacements replacements; replacements.SetSchemeStr("https"); @@ -9837,30 +9663,6 @@ diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc BrowserContentSettingBubbleModelDelegate:: BrowserContentSettingBubbleModelDelegate(Browser* browser) -diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc ---- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc -+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc -@@ -39,7 +39,7 @@ using BrowserNavigatorTestChromeOS = BrowserNavigatorTest; - #if BUILDFLAG(IS_CHROMEOS_ASH) - - GURL GetGoogleURL() { -- return GURL("http://www.google.com/"); -+ return GURL("http://www.9oo91e.qjz9zk/"); - } - - // Verifies that new browser is not opened for Signin profile. -diff --git a/chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc b/chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc ---- a/chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc -+++ b/chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc -@@ -22,7 +22,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTabstripBrowserTest, - - // Set locked fullscreen state. - PinWindow(browser()->window()->GetNativeWindow(), /*trusted=*/true); -- AddTabAt(browser(), GURL("https://google.com"), -+ AddTabAt(browser(), GURL("https://9oo91e.qjz9zk"), - /*index=*/0, - /*foreground=*/true); - diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -9924,7 +9726,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 -@@ -53,7 +53,7 @@ absl::optional GetEnterpriseAccountDomain(Profile* profile) { +@@ -55,7 +55,7 @@ absl::optional GetEnterpriseAccountDomain(Profile* profile) { const std::string domain = enterprise_util::GetDomainFromEmail(profile->GetProfileUserName()); // Heuristic for most common consumer Google domains -- these are not managed. @@ -9936,15 +9738,18 @@ diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc 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 -@@ -37,7 +37,7 @@ namespace { +@@ -38,9 +38,9 @@ namespace { using quick_answers::QuickAnswer; using quick_answers::QuickAnswersExitPoint; -constexpr char kGoogleSearchUrlPrefix[] = "https://www.google.com/search?q="; +constexpr char kGoogleSearchUrlPrefix[] = "https://www.9oo91e.qjz9zk/search?q="; + constexpr char kGoogleTranslateUrlTemplate[] = +- "https://translate.google.com/?sl=auto&tl=%s&text=%s&op=translate"; ++ "https://translate.9oo91e.qjz9zk/?sl=auto&tl=%s&text=%s&op=translate"; constexpr char kFeedbackDescriptionTemplate[] = "#QuickAnswers\nQuery:%s\n"; - + constexpr char kTranslationQueryPrefix[] = "Translate:"; 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 @@ -9960,7 +9765,7 @@ diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/sig diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc --- a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc +++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc -@@ -124,11 +124,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { +@@ -123,11 +123,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { void MediaRouterContextualMenu::ExecuteCommand(int command_id, int event_flags) { const char kAboutPageUrl[] = @@ -9999,22 +9804,10 @@ diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/brows base::Seconds(10), std::move(success_callback), std::move(failure_callback), -diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc ---- a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc -+++ b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc -@@ -465,7 +465,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - DoNotShowIconOnErrorPages) { - GURL test_url(InScopeAppUrl()); -- GURL google_url("https://www.google.com/"); -+ GURL google_url("https://www.9oo91e.qjz9zk/"); - InstallWebApp("Test app", test_url); - InstallWebApp("Google", google_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); diff --git a/chrome/browser/ui/views/lens/lens_side_panel_view.cc b/chrome/browser/ui/views/lens/lens_side_panel_view.cc --- a/chrome/browser/ui/views/lens/lens_side_panel_view.cc +++ b/chrome/browser/ui/views/lens/lens_side_panel_view.cc -@@ -85,7 +85,7 @@ const char kStaticGhostCardDataURL[] = +@@ -86,7 +86,7 @@ const char kStaticGhostCardDataURL[] = "" "" - "" - "" - ""; +@@ -55,7 +55,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 @@ -10086,7 +9891,7 @@ diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRES 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 -@@ -71,7 +71,7 @@ const char* kAppIdsWithHiddenPinToShelf[] = { +@@ -73,7 +73,7 @@ const char* kAppIdsWithHiddenPinToShelf[] = { }; const char kFileHandlingLearnMore[] = @@ -10095,21 +9900,24 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler. #if BUILDFLAG(IS_CHROMEOS_ASH) constexpr char const* kAppIdsWithHiddenStoragePermission[] = { -@@ -540,12 +540,12 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) { +@@ -557,7 +557,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) { - GURL url("https://play.google.com/store/apps/details?id=" + + GURL url("https://play.9oo91e.qjz9zk/store/apps/details?id=" + update.PublisherId()); - proxy->LaunchAppWithUrl(arc::kPlayStoreAppId, ui::EF_NONE, url, - apps::mojom::LaunchSource::kFromChromeInternal); + 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) { + apps::mojom::LaunchSource::kFromChromeInternal); + } } else if (update.InstallSource() == apps::InstallSource::kChromeWebStore) { - GURL url("https://chrome.google.com/webstore/detail/" + update.AppId()); + GURL url("https://chrome.9oo91e.qjz9zk/webstore/detail/" + update.AppId()); - proxy->LaunchAppWithUrl(extensions::kWebStoreAppId, ui::EF_NONE, url, - apps::mojom::LaunchSource::kFromChromeInternal); - } + 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 @@ -10206,15 +10014,15 @@ diff --git a/chrome/browser/ui/webui/chromeos/parent_access/parent_access_ui.cc diff --git a/chrome/browser/ui/webui/feed/feed_ui.cc b/chrome/browser/ui/webui/feed/feed_ui.cc --- a/chrome/browser/ui/webui/feed/feed_ui.cc +++ b/chrome/browser/ui/webui/feed/feed_ui.cc -@@ -42,7 +42,7 @@ FeedUI::FeedUI(content::WebUI* web_ui) +@@ -37,7 +37,7 @@ FeedUI::FeedUI(content::WebUI* web_ui) } else { - std::string default_script_policy = - " 'self' chrome-untrusted://resources http://localhost:8000 " -- "https://*.google.com https://google.com;"; -+ "https://*.9oo91e.qjz9zk https://9oo91e.qjz9zk;"; source->OverrideContentSecurityPolicy( - network::mojom::CSPDirectiveName::ScriptSrc, - base::StrCat({"script-src 'unsafe-eval' 'unsafe-inline'", + network::mojom::CSPDirectiveName::FrameSrc, +- "frame-src https://www.google.com;"); ++ "frame-src https://www.9oo91e.qjz9zk;"); + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::StyleSrc, + "style-src 'unsafe-inline' 'self';"); diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -10382,7 +10190,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 -@@ -1622,7 +1622,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1638,7 +1638,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( @@ -10391,7 +10199,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( -@@ -1784,7 +1784,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source, +@@ -1800,7 +1800,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source, "privacySandboxPageExplanation1Phase2", l10n_util::GetStringFUTF16( IDS_SETTINGS_PRIVACY_SANDBOX_PAGE_EXPLANATION1_PHASE2, @@ -10400,7 +10208,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 -@@ -1794,7 +1794,7 @@ void AddPrivacySandboxStrings(content::WebUIDataSource* html_source, +@@ -1810,7 +1810,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, @@ -10508,6 +10316,18 @@ diff --git a/chrome/browser/vr/PRESUBMIT.py b/chrome/browser/vr/PRESUBMIT.py 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 +@@ -60,7 +60,7 @@ constexpr bool kAddAppsToQuickLaunchBarByDefault = true; + #if BUILDFLAG(IS_CHROMEOS) + const char kChromeOsPlayPlatform[] = "chromeos_play"; + const char kPlayIntentPrefix[] = +- "https://play.google.com/store/apps/details?id="; ++ "https://play.9oo91e.qjz9zk/store/apps/details?id="; + const char kPlayStorePackage[] = "com.android.vending"; + + struct PlayStoreIntent { diff --git a/chrome/browser/web_applications/externally_managed_app_manager.cc b/chrome/browser/web_applications/externally_managed_app_manager.cc --- a/chrome/browser/web_applications/externally_managed_app_manager.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager.cc @@ -10759,7 +10579,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc -@@ -66,7 +66,7 @@ namespace { +@@ -67,7 +67,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -10771,7 +10591,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 -@@ -311,7 +311,7 @@ bool ChromeWebAuthenticationDelegate::OriginMayUseRemoteDesktopClientOverride( +@@ -312,7 +312,7 @@ bool ChromeWebAuthenticationDelegate::OriginMayUseRemoteDesktopClientOverride( } constexpr char kGoogleCorpCrdOrigin[] = @@ -10780,7 +10600,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ if (caller_origin == url::Origin::Create(GURL(kGoogleCorpCrdOrigin))) { return true; } -@@ -358,7 +358,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( +@@ -359,7 +359,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( const url::Origin& caller_origin, const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = @@ -10789,7 +10609,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 -@@ -989,11 +989,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -995,11 +995,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. @@ -11154,7 +10974,7 @@ diff --git a/chrome/common/extensions/api/privacy.json b/chrome/common/extension diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/api/tabs.json --- a/chrome/common/extensions/api/tabs.json +++ b/chrome/common/extensions/api/tabs.json -@@ -365,7 +365,7 @@ +@@ -363,7 +363,7 @@ "url": { "type": "string", "optional": true, @@ -11163,7 +10983,7 @@ diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/a }, "active": { "type": "boolean", -@@ -820,7 +820,7 @@ +@@ -818,7 +818,7 @@ { "type": "string", "name": "language", @@ -12788,7 +12608,7 @@ diff --git a/chromecast/browser/webui/cast_webui.cc b/chromecast/browser/webui/c diff --git a/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc b/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc --- a/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc +++ b/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc -@@ -33,7 +33,7 @@ constexpr const char kJSEurekaInfoChangedCallback[] = +@@ -32,7 +32,7 @@ constexpr const char kJSEurekaInfoChangedCallback[] = // ContentSecurityOverride Prefix. constexpr const char kContentSecurityPolicyOverride[] = @@ -12800,7 +12620,7 @@ diff --git a/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc b/chr diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni --- a/chromecast/chromecast.gni +++ b/chromecast/chromecast.gni -@@ -170,7 +170,7 @@ if (chromecast_branding == "public") { +@@ -173,7 +173,7 @@ if (chromecast_branding == "public") { # All locales supported by Cast builds. This provides a single point of # reference for all GN files referencing a locales list. # |locales_without_pseudolocales| is declared in //build/config/locales.gni. @@ -12809,39 +12629,6 @@ diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni # pseudolocales in chromecast. cast_locales = locales_without_pseudolocales -diff --git a/chromecast/common/extensions_api/tabs.json b/chromecast/common/extensions_api/tabs.json ---- a/chromecast/common/extensions_api/tabs.json -+++ b/chromecast/common/extensions_api/tabs.json -@@ -342,7 +342,7 @@ - "url": { - "type": "string", - "optional": true, -- "description": "The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page." -+ "description": "The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.9oo91e.qjz9zk', not 'www.9oo91e.qjz9zk'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page." - }, - "active": { - "type": "boolean", -@@ -732,7 +732,7 @@ - { - "type": "string", - "name": "language", -- "description": "An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned." -+ "description": "An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned." - } - ] - } -diff --git a/chromecast/common/extensions_api/windows.json b/chromecast/common/extensions_api/windows.json ---- a/chromecast/common/extensions_api/windows.json -+++ b/chromecast/common/extensions_api/windows.json -@@ -208,7 +208,7 @@ - "name": "createData", - "properties": { - "url": { -- "description": "A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.", -+ "description": "A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.9oo91e.qjz9zk', not 'www.9oo91e.qjz9zk'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.", - "optional": true, - "choices": [ - {"type": "string"}, diff --git a/chromecast/crash/linux/minidump_uploader.cc b/chromecast/crash/linux/minidump_uploader.cc --- a/chromecast/crash/linux/minidump_uploader.cc +++ b/chromecast/crash/linux/minidump_uploader.cc @@ -12883,10 +12670,24 @@ 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 { + + 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/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 -@@ -710,7 +710,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() +@@ -638,7 +638,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() if (device_settings_host_->has_setting_changed()) { return AssistantQueryResponseType::kDeviceAction; } else if (!receive_url_response_.empty()) { @@ -12898,7 +12699,7 @@ diff --git a/chromeos/ash/services/assistant/assistant_manager_service_impl.cc b diff --git a/chromeos/ash/services/assistant/service.cc b/chromeos/ash/services/assistant/service.cc --- a/chromeos/ash/services/assistant/service.cc +++ b/chromeos/ash/services/assistant/service.cc -@@ -50,7 +50,7 @@ namespace assistant { +@@ -51,7 +51,7 @@ namespace ash::assistant { namespace { constexpr char kScopeAssistant[] = @@ -13311,7 +13112,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 -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ namespace autofill_assistant { @@ -13376,7 +13177,7 @@ diff --git a/components/browser_sync/PRESUBMIT.py b/components/browser_sync/PRES 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 -@@ -470,7 +470,7 @@ +@@ -476,7 +476,7 @@ From %1$sWikipedia @@ -13385,7 +13186,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Forget this site? -@@ -641,7 +641,7 @@ +@@ -647,7 +647,7 @@ A site is using your camera and microphone @@ -13394,7 +13195,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -789,7 +789,7 @@ +@@ -813,7 +813,7 @@ other {(+ # more)}} @@ -13436,7 +13237,7 @@ diff --git a/components/browsing_data/core/history_notice_utils.cc b/components/ diff --git a/components/captive_portal/core/captive_portal_detector.cc b/components/captive_portal/core/captive_portal_detector.cc --- a/components/captive_portal/core/captive_portal_detector.cc +++ b/components/captive_portal/core/captive_portal_detector.cc -@@ -41,7 +41,7 @@ GURL GetProbeUrl(const GURL& default_url) { +@@ -40,7 +40,7 @@ GURL GetProbeUrl(const GURL& default_url) { namespace captive_portal { const char CaptivePortalDetector::kDefaultURL[] = @@ -13558,6 +13359,27 @@ diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_ "midwayusa.com": "^https://(www|ads).midwayusa.com/cart/?$", "neimanmarcus.com": "^https://www.neimanmarcus.com/checkout/cart.jsp/?$", "newegg.com": "^https://secure.newegg.com/shop/cart/?$", +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 @@ + namespace { + + // For creating endpoint fetcher. +-const char kOAuthScope[] = "https://www.googleapis.com/auth/chromememex"; ++const char kOAuthScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromememex"; + 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; + + 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 kServiceBaseUrl{ + &commerce::kCommercePriceTracking, 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 @@ -13674,15 +13496,15 @@ diff --git a/components/cronet/PRESUBMIT.py b/components/cronet/PRESUBMIT.py 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 -@@ -67,7 +67,7 @@ def GenerateJavadoc(args, src_dir, output_dir): - '%s:%s' % (os.path.join(DOCLAVA_DIR, 'jsilver.jar'), - os.path.join(DOCLAVA_DIR, 'doclava.jar')), - '-title', 'Cronet API', -- '-federate', 'Android', 'https://developer.android.com/', -+ '-federate', 'Android', 'https://developer.8n6r01d.qjz9zk/', - '-federationapi', 'Android', os.path.join(DOCLAVA_DIR, 'current.txt'), - '-classpath', - '%s:%s' % (os.path.abspath(android_sdk_jar), +@@ -75,7 +75,7 @@ def GenerateJavadoc(args, src_dir, output_dir): + 'Cronet API', + '-federate', + 'Android', +- 'https://developer.android.com/', ++ 'https://developer.8n6r01d.qjz9zk/', + '-federationapi', + 'Android', + os.path.join(DOCLAVA_DIR, 'current.txt'), diff --git a/components/dom_distiller/core/html/dom_distiller_viewer.html b/components/dom_distiller/core/html/dom_distiller_viewer.html --- a/components/dom_distiller/core/html/dom_distiller_viewer.html +++ b/components/dom_distiller/core/html/dom_distiller_viewer.html @@ -14142,6 +13964,15 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature const base::Feature kWebFeedAwareness{"WebFeedAwareness", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -95,7 +95,7 @@ const base::Feature kEnableOpenInNewTabFromStartSurfaceFeed{ + + const base::Feature kWebUiFeed{"FeedWebUi", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::FeatureParam kWebUiFeedUrl{ +- &kWebUiFeed, "feedurl", "https://www.google.com/feed-api/following"}; ++ &kWebUiFeed, "feedurl", "https://www.9oo91e.qjz9zk/feed-api/following"}; + const base::FeatureParam kWebUiDisableContentSecurityPolicy{ + &kWebUiFeed, "disableCsp", false}; + diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feedback_uploader.cc --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc @@ -14174,7 +14005,7 @@ diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/reso diff --git a/components/gcm_driver/gcm_account_mapper.cc b/components/gcm_driver/gcm_account_mapper.cc --- a/components/gcm_driver/gcm_account_mapper.cc +++ b/components/gcm_driver/gcm_account_mapper.cc -@@ -19,7 +19,7 @@ namespace gcm { +@@ -20,7 +20,7 @@ namespace gcm { namespace { const char kGCMAccountMapperSenderId[] = "745476177629"; @@ -14262,7 +14093,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 -@@ -1332,7 +1332,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1329,7 +1329,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -14271,7 +14102,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 " -@@ -1374,7 +1374,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1371,7 +1371,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -14351,8 +14182,8 @@ 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 -@@ -38,7 +38,7 @@ const base::FeatureParam kEnableLensSidePanelFooter{ - &kLensStandalone, "enable-lens-side-panel-footer", true}; +@@ -44,7 +44,7 @@ const base::FeatureParam kEnableSidePanelForLens{ + &kLensStandalone, "enable-side-panel", true}; constexpr base::FeatureParam kHomepageURLForLens{ - &kLensStandalone, "lens-homepage-url", "https://lens.google.com/"}; @@ -14694,18 +14525,6 @@ diff --git a/components/omnibox/browser/document_suggestions_service.cc b/compon signin::ScopeSet scopes; scopes.insert(scope); token_fetcher_ = std::make_unique( -diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc ---- a/components/omnibox/browser/zero_suggest_provider.cc -+++ b/components/omnibox/browser/zero_suggest_provider.cc -@@ -134,7 +134,7 @@ bool AllowRemoteSendURL(const AutocompleteProviderClient* client, - - // Find out whether sending a request with the current page url or otherwise - // any eligible url is possible and log eligibility metrics. -- const GURL kArbitraryInsecureUrl{"http://www.google.com/"}; -+ const GURL kArbitraryInsecureUrl{"http://www.9oo91e.qjz9zk/"}; - Eligibility eligibility = can_send_request_with_url(input.current_url()) - ? Eligibility::kEligible - : can_send_request_with_url(kArbitraryInsecureUrl) diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/components/omnibox/resources/omnibox_pedal_concepts.json --- a/components/omnibox/resources/omnibox_pedal_concepts.json +++ b/components/omnibox/resources/omnibox_pedal_concepts.json @@ -17221,7 +17040,7 @@ diff --git a/components/password_manager/core/browser/password_sync_util.cc b/co diff --git a/components/password_manager/core/browser/password_ui_utils.cc b/components/password_manager/core/browser/password_ui_utils.cc --- a/components/password_manager/core/browser/password_ui_utils.cc +++ b/components/password_manager/core/browser/password_ui_utils.cc -@@ -28,7 +28,7 @@ namespace { +@@ -29,7 +29,7 @@ namespace { const char* const kRemovedPrefixes[] = {"m.", "mobile.", "www."}; constexpr char kPlayStoreAppPrefix[] = @@ -17268,7 +17087,7 @@ diff --git a/components/password_manager/core/browser/site_affiliation/hash_affi diff --git a/components/password_manager/ios/test_helpers.cc b/components/password_manager/ios/test_helpers.cc --- a/components/password_manager/ios/test_helpers.cc +++ b/components/password_manager/ios/test_helpers.cc -@@ -98,8 +98,8 @@ void SetFormData(const std::string& origin, +@@ -96,8 +96,8 @@ void SetFormData(const std::string& origin, autofill::FormData MakeSimpleFormData() { autofill::FormData form_data; @@ -17486,6 +17305,26 @@ diff --git a/components/policy/core/browser/signin/user_cloud_signin_restriction "v1:getManagedAccountsSigninRestriction"; std::unique_ptr CreateUrlLoader( +diff --git a/components/policy/core/common/cloud/user_info_fetcher.cc b/components/policy/core/common/cloud/user_info_fetcher.cc +--- a/components/policy/core/common/cloud/user_info_fetcher.cc ++++ b/components/policy/core/common/cloud/user_info_fetcher.cc +@@ -28,14 +28,14 @@ static std::string MakeAuthorizationHeader(const std::string& auth_token) { + return base::StringPrintf(kAuthorizationHeaderFormat, auth_token.c_str()); + } + +-static const char kLegacyGoogleApisHost[] = "www.googleapis.com"; ++static const char kLegacyGoogleApisHost[] = "www.9oo91eapis.qjz9zk"; + + // Replaces the host of the User Info API URL with the legacy host if needed. + // The legacy host is needed when the host is set to the new OAuth2 host which + // doesn't support the User Info API anymore. This is needed on iOS, which is + // the only platform that uses the new OAuth2 host at the moment. + GURL SwitchBackToLegacyHostIfNeeded(GURL url) { +- if (url.host() == "oauth2.googleapis.com") { ++ if (url.host() == "oauth2.9oo91eapis.qjz9zk") { + GURL::Replacements replace_host; + replace_host.SetHostStr(kLegacyGoogleApisHost); + url = url.ReplaceComponents(replace_host); diff --git a/components/policy/core/common/default_chrome_apps_migrator.cc b/components/policy/core/common/default_chrome_apps_migrator.cc --- a/components/policy/core/common/default_chrome_apps_migrator.cc +++ b/components/policy/core/common/default_chrome_apps_migrator.cc @@ -17564,7 +17403,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line. -@@ -631,7 +631,7 @@ +@@ -633,7 +633,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -17573,7 +17412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Default HTML renderer for $3Google Chrome Frame''', 'desc': '''Allows you to configure the default HTML renderer when $3Google Chrome Frame is installed. -@@ -646,7 +646,7 @@ +@@ -648,7 +648,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -17582,7 +17421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Allow $3Google Chrome Frame to handle the following content types''', 'desc': '''Allow $3Google Chrome Frame to handle the following content types.''', -@@ -1345,7 +1345,7 @@ +@@ -1346,7 +1346,7 @@ }, { 'name': 'FirstPartySets', @@ -17591,7 +17430,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.''', -@@ -1355,7 +1355,7 @@ +@@ -1356,7 +1356,7 @@ }, { 'name': 'HomepageLocation', @@ -17600,7 +17439,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-'], -@@ -1364,7 +1364,7 @@ +@@ -1366,7 +1366,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17609,7 +17448,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1381,7 +1381,7 @@ +@@ -1383,7 +1383,7 @@ }, { 'name': 'HomepageIsNewTabPage', @@ -17618,7 +17457,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-'], -@@ -1412,7 +1412,7 @@ +@@ -1415,7 +1415,7 @@ }, { 'name': 'NewTabPageLocation', @@ -17627,7 +17466,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-'], -@@ -1420,7 +1420,7 @@ +@@ -1424,7 +1424,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17636,7 +17475,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1439,7 +1439,7 @@ +@@ -1443,7 +1443,7 @@ }, { 'name': 'DefaultBrowserSettingEnabled', @@ -17645,7 +17484,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-'], -@@ -1465,12 +1465,12 @@ +@@ -1470,12 +1470,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -17660,7 +17499,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:8-'], -@@ -1493,7 +1493,7 @@ +@@ -1498,7 +1498,7 @@ }, { 'name': 'AlternateErrorPagesEnabled', @@ -17669,7 +17508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1526,7 +1526,7 @@ +@@ -1532,7 +1532,7 @@ }, { 'name': 'SearchSuggestEnabled', @@ -17678,7 +17517,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1562,7 +1562,7 @@ +@@ -1569,7 +1569,7 @@ }, { 'name': 'NativeWindowOcclusionEnabled', @@ -17687,7 +17526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1600,7 +1600,7 @@ +@@ -1607,7 +1607,7 @@ }, { 'name': 'WindowOcclusionEnabled', @@ -17696,7 +17535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1636,7 +1636,7 @@ +@@ -1643,7 +1643,7 @@ }, { 'name': 'DnsPrefetchingEnabled', @@ -17705,7 +17544,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'], -@@ -1662,7 +1662,7 @@ +@@ -1669,7 +1669,7 @@ }, { 'name': 'NetworkPredictionOptions', @@ -17714,7 +17553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1702,7 +1702,7 @@ +@@ -1710,7 +1710,7 @@ }, { 'name': 'WPADQuickCheckEnabled', @@ -17723,7 +17562,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-' ], -@@ -1733,7 +1733,7 @@ +@@ -1742,7 +1742,7 @@ }, { 'name': 'DisableSpdy', @@ -17732,7 +17571,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'], -@@ -1758,7 +1758,7 @@ +@@ -1767,7 +1767,7 @@ }, { 'name': 'DisabledSchemes', @@ -17741,7 +17580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1785,7 +1785,7 @@ +@@ -1794,7 +1794,7 @@ }, { 'name': 'GetDisplayMediaSetSelectAllScreensAllowedForUrls', @@ -17750,7 +17589,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1807,7 +1807,7 @@ +@@ -1816,7 +1816,7 @@ }, { 'name': 'GloballyScopeHTTPAuthCacheEnabled', @@ -17759,7 +17598,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-'], -@@ -1841,7 +1841,7 @@ +@@ -1851,7 +1851,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -17768,7 +17607,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-'], -@@ -1872,7 +1872,7 @@ +@@ -1883,7 +1883,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -17777,7 +17616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1919,7 +1919,7 @@ +@@ -1931,7 +1931,7 @@ }, { 'name': 'Http09OnNonDefaultPortsEnabled', @@ -17786,7 +17625,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'], -@@ -1954,7 +1954,7 @@ +@@ -1966,7 +1966,7 @@ }, { 'name': 'JavascriptEnabled', @@ -17795,7 +17634,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-'], -@@ -1987,7 +1987,7 @@ +@@ -2000,7 +2000,7 @@ }, { 'name': 'IncognitoEnabled', @@ -17804,7 +17643,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-'], -@@ -2021,7 +2021,7 @@ +@@ -2034,7 +2034,7 @@ }, { 'name': 'IncognitoModeAvailability', @@ -17813,7 +17652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -2074,7 +2074,7 @@ +@@ -2088,7 +2088,7 @@ }, { 'name': 'SavingBrowserHistoryDisabled', @@ -17822,7 +17661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2107,7 +2107,7 @@ +@@ -2122,7 +2122,7 @@ }, { 'name': 'AllowDeletingBrowserHistory', @@ -17831,7 +17670,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-'], -@@ -2135,7 +2135,7 @@ +@@ -2151,7 +2151,7 @@ }, { 'name': 'HistoryClustersVisible', @@ -17840,7 +17679,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-'], -@@ -2176,7 +2176,7 @@ +@@ -2193,7 +2193,7 @@ }, { 'name': 'AllowDinosaurEasterEgg', @@ -17849,7 +17688,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-'], -@@ -2205,7 +2205,7 @@ +@@ -2223,7 +2223,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -17858,7 +17697,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'], -@@ -2238,7 +2238,7 @@ +@@ -2256,7 +2256,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -17867,7 +17706,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'], -@@ -2261,7 +2261,7 @@ +@@ -2279,7 +2279,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -17876,7 +17715,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-'], -@@ -2279,7 +2279,7 @@ +@@ -2297,7 +2297,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -17885,7 +17724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2305,7 +2305,7 @@ +@@ -2324,7 +2324,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -17894,7 +17733,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-'], -@@ -2334,7 +2334,7 @@ +@@ -2354,7 +2354,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -17903,7 +17742,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-'], -@@ -2352,7 +2352,7 @@ +@@ -2372,7 +2372,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -17912,7 +17751,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2378,7 +2378,7 @@ +@@ -2399,7 +2399,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -17921,7 +17760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2401,7 +2401,7 @@ +@@ -2422,7 +2422,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -17930,7 +17769,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'], -@@ -2417,17 +2417,17 @@ +@@ -2438,17 +2438,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -17952,7 +17791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2456,7 +2456,7 @@ +@@ -2478,7 +2478,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -17961,7 +17800,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2485,7 +2485,7 @@ +@@ -2508,7 +2508,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -17970,7 +17809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2517,7 +2517,7 @@ +@@ -2541,7 +2541,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -17979,7 +17818,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-'], -@@ -2546,7 +2546,7 @@ +@@ -2571,7 +2571,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -17988,7 +17827,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-'], -@@ -2567,7 +2567,7 @@ +@@ -2593,7 +2593,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -17997,7 +17836,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-'], -@@ -2596,7 +2596,7 @@ +@@ -2622,7 +2622,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -18006,7 +17845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2618,7 +2618,7 @@ +@@ -2645,7 +2645,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -18015,7 +17854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2638,7 +2638,7 @@ +@@ -2666,7 +2666,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -18024,7 +17863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2656,7 +2656,7 @@ +@@ -2685,7 +2685,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -18033,7 +17872,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'], -@@ -2676,7 +2676,7 @@ +@@ -2705,7 +2705,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -18042,7 +17881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2706,7 +2706,7 @@ +@@ -2735,7 +2735,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -18051,7 +17890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2736,7 +2736,7 @@ +@@ -2766,7 +2766,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', @@ -18060,7 +17899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2767,7 +2767,7 @@ +@@ -2798,7 +2798,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteAccessConnections', @@ -18069,7 +17908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -2797,7 +2797,7 @@ +@@ -2829,7 +2829,7 @@ }, { 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', @@ -18078,7 +17917,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-'], -@@ -2817,7 +2817,7 @@ +@@ -2850,7 +2850,7 @@ }, { 'name': 'RemoteAccessHostClipboardSizeBytes', @@ -18087,7 +17926,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-'], -@@ -2845,7 +2845,7 @@ +@@ -2879,7 +2879,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteSupportConnections', @@ -18096,7 +17935,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-'], -@@ -2879,7 +2879,7 @@ +@@ -2914,7 +2914,7 @@ }, { 'name': 'DeviceAllowMGSToStoreDisplayProperties', @@ -18105,7 +17944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -2906,7 +2906,7 @@ +@@ -2941,7 +2941,7 @@ }, { 'name': 'PrintingEnabled', @@ -18114,7 +17953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2940,7 +2940,7 @@ +@@ -2976,7 +2976,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -18123,7 +17962,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2968,7 +2968,7 @@ +@@ -3005,7 +3005,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -18132,7 +17971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3009,7 +3009,7 @@ +@@ -3046,7 +3046,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -18141,7 +17980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3052,7 +3052,7 @@ +@@ -3089,7 +3089,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -18150,7 +17989,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3093,7 +3093,7 @@ +@@ -3130,7 +3130,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -18159,7 +17998,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3134,7 +3134,7 @@ +@@ -3172,7 +3172,7 @@ }, { 'name': 'PrintingColorDefault', @@ -18168,7 +18007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3169,7 +3169,7 @@ +@@ -3207,7 +3207,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -18177,7 +18016,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3210,7 +3210,7 @@ +@@ -3248,7 +3248,7 @@ }, { 'name': 'PrintingPinDefault', @@ -18186,7 +18025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3245,7 +3245,7 @@ +@@ -3283,7 +3283,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -18195,7 +18034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3280,7 +3280,7 @@ +@@ -3319,7 +3319,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -18204,7 +18043,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -3466,7 +3466,7 @@ +@@ -3506,7 +3506,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -18213,7 +18052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -3495,7 +3495,7 @@ +@@ -3535,7 +3535,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -18222,7 +18061,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-'], -@@ -3513,7 +3513,7 @@ +@@ -3553,7 +3553,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -18231,7 +18070,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'], -@@ -3542,7 +3542,7 @@ +@@ -3582,7 +3582,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -18240,7 +18079,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-'], -@@ -3564,7 +3564,7 @@ +@@ -3604,7 +3604,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -18249,7 +18088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3588,7 +3588,7 @@ +@@ -3628,7 +3628,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -18258,7 +18097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3609,7 +3609,7 @@ +@@ -3649,7 +3649,7 @@ }, { 'name': 'ForceSafeSearch', @@ -18267,7 +18106,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-'], -@@ -3643,7 +3643,7 @@ +@@ -3683,7 +3683,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -18276,7 +18115,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-'], -@@ -3672,7 +3672,7 @@ +@@ -3713,7 +3713,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -18285,7 +18124,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-'], -@@ -3707,7 +3707,7 @@ +@@ -3748,7 +3748,7 @@ }, { 'name': 'ForceYouTubeRestrict', @@ -18294,7 +18133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3751,7 +3751,7 @@ +@@ -3793,7 +3793,7 @@ }, { 'name': 'SafeBrowsingEnabled', @@ -18303,7 +18142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3786,7 +3786,7 @@ +@@ -3828,7 +3828,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. @@ -18312,7 +18151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy SafeBrowsingProtectionLevel is set, the value of the policy SafeBrowsingEnabled is ignored. -@@ -3794,7 +3794,7 @@ +@@ -3836,7 +3836,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -18321,7 +18160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3844,12 +3844,12 @@ +@@ -3887,12 +3887,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -18336,7 +18175,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3888,7 +3888,7 @@ +@@ -3931,7 +3931,7 @@ }, { 'name': 'PasswordManagerEnabled', @@ -18345,7 +18184,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3925,7 +3925,7 @@ +@@ -3969,7 +3969,7 @@ }, { 'name': 'PasswordManagerAllowShowPasswords', @@ -18354,7 +18193,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'], -@@ -3948,7 +3948,7 @@ +@@ -3992,7 +3992,7 @@ }, { 'name': 'PasswordLeakDetectionEnabled', @@ -18363,7 +18202,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3983,7 +3983,7 @@ +@@ -4028,7 +4028,7 @@ }, { 'name': 'PasswordDismissCompromisedAlertEnabled', @@ -18372,7 +18211,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4017,7 +4017,7 @@ +@@ -4063,7 +4063,7 @@ }, { 'name': 'AutoFillEnabled', @@ -18381,7 +18220,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4055,7 +4055,7 @@ +@@ -4101,7 +4101,7 @@ }, { 'name': 'AutofillAddressEnabled', @@ -18390,7 +18229,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4089,7 +4089,7 @@ +@@ -4136,7 +4136,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -18399,7 +18238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4123,7 +4123,7 @@ +@@ -4171,7 +4171,7 @@ }, { 'name': 'DisabledPlugins', @@ -18408,7 +18247,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4154,7 +4154,7 @@ +@@ -4202,7 +4202,7 @@ }, { 'name': 'EnabledPlugins', @@ -18417,7 +18256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4185,7 +4185,7 @@ +@@ -4233,7 +4233,7 @@ }, { 'name': 'DisabledPluginsExceptions', @@ -18426,7 +18265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4218,7 +4218,7 @@ +@@ -4266,7 +4266,7 @@ }, { 'name': 'AlwaysOpenPdfExternally', @@ -18435,7 +18274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:55-'], -@@ -4249,7 +4249,7 @@ +@@ -4298,7 +4298,7 @@ }, { 'name': 'DisablePluginFinder', @@ -18444,7 +18283,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'], -@@ -4279,7 +4279,7 @@ +@@ -4328,7 +4328,7 @@ }, { 'name': 'SyncDisabled', @@ -18453,7 +18292,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-'], -@@ -4312,7 +4312,7 @@ +@@ -4361,7 +4361,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -18462,7 +18301,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4333,7 +4333,7 @@ +@@ -4383,7 +4383,7 @@ }, { 'name': 'RoamingProfileSupportEnabled', @@ -18471,7 +18310,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-'], -@@ -4362,7 +4362,7 @@ +@@ -4413,7 +4413,7 @@ }, { 'name': 'RoamingProfileLocation', @@ -18480,7 +18319,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-'], -@@ -4378,7 +4378,7 @@ +@@ -4429,7 +4429,7 @@ If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used. @@ -18489,7 +18328,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. -@@ -4387,7 +4387,7 @@ +@@ -4438,7 +4438,7 @@ }, { 'name': 'SigninAllowed', @@ -18498,7 +18337,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -4420,7 +4420,7 @@ +@@ -4471,7 +4471,7 @@ }, { 'name': 'EnableDeprecatedWebBasedSignin', @@ -18507,7 +18346,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-42'], -@@ -4443,7 +4443,7 @@ +@@ -4494,7 +4494,7 @@ }, { 'name': 'UserDataDir', @@ -18516,7 +18355,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-'], -@@ -4462,14 +4462,14 @@ +@@ -4513,14 +4513,14 @@ If you set this policy, $1Google Chrome 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 $1Google Chrome manages its contents. @@ -18533,7 +18372,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:13-'], -@@ -4485,12 +4485,12 @@ +@@ -4537,12 +4537,12 @@ If not set, $1Google Chrome uses the default cache directory, but users can change that setting with the --disk-cache-dir command line flag. @@ -18548,7 +18387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-'], -@@ -4513,7 +4513,7 @@ +@@ -4566,7 +4566,7 @@ }, { 'name': 'MediaCacheSize', @@ -18557,7 +18396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-71'], -@@ -4535,7 +4535,7 @@ +@@ -4588,7 +4588,7 @@ }, { 'name': 'DownloadBubbleEnabled', @@ -18566,7 +18405,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-'], -@@ -4564,7 +4564,7 @@ +@@ -4618,7 +4618,7 @@ }, { 'name': 'DownloadRestrictions', @@ -18575,7 +18414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4609,7 +4609,7 @@ +@@ -4664,7 +4664,7 @@ 'tags': ['local-data-access'], 'desc': '''Setting the policy means users can't bypass download security decisions. @@ -18584,7 +18423,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 -@@ -4627,12 +4627,12 @@ +@@ -4682,12 +4682,12 @@ 4: Blocks malicious files flagged by the Safe Browsing server, does not block dangerous file types. Recommended. @@ -18599,7 +18438,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-'], -@@ -4651,13 +4651,13 @@ +@@ -4707,13 +4707,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. @@ -18615,7 +18454,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4684,7 +4684,7 @@ +@@ -4741,7 +4741,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -18624,7 +18463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4707,11 +4707,11 @@ +@@ -4765,11 +4765,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. @@ -18638,7 +18477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -4744,13 +4744,13 @@ +@@ -4803,13 +4803,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 ExternalProtocolDialogShowAlwaysOpenCheckbox policy is set to Disabled. This policy has no impact on per-protocol/per-site prompt exemptions set by users. @@ -18654,7 +18493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -4785,7 +4785,7 @@ +@@ -4844,7 +4844,7 @@ }, { 'name': 'ClearSiteDataOnExit', @@ -18663,7 +18502,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'], -@@ -4804,7 +4804,7 @@ +@@ -4863,7 +4863,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -18672,7 +18511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4834,7 +4834,7 @@ +@@ -4893,7 +4893,7 @@ }, { 'name': 'ProxyMode', @@ -18681,7 +18520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -4902,11 +4902,11 @@ +@@ -4962,11 +4962,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -18695,7 +18534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4962,7 +4962,7 @@ +@@ -5023,7 +5023,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: @@ -18704,7 +18543,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line. -@@ -4971,7 +4971,7 @@ +@@ -5032,7 +5032,7 @@ }, { 'name': 'ProxyServer', @@ -18713,7 +18552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4994,12 +4994,12 @@ +@@ -5055,12 +5055,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18728,7 +18567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5022,12 +5022,12 @@ +@@ -5083,12 +5083,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18743,7 +18582,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5050,13 +5050,13 @@ +@@ -5111,13 +5111,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18759,7 +18598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5105,12 +5105,12 @@ +@@ -5167,12 +5167,12 @@ * fixed_servers, the ProxyServer and ProxyBypassList fields are used. * pac_script, the ProxyPacUrl, ProxyPacMandatory and ProxyBypassList fields are used. @@ -18774,7 +18613,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-'], -@@ -5140,7 +5140,7 @@ +@@ -5203,7 +5203,7 @@ }, { 'name': 'AllHttpAuthSchemesAllowedForOrigins', @@ -18783,7 +18622,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-'], -@@ -5154,12 +5154,12 @@ +@@ -5218,12 +5218,12 @@ 'tags': [], 'desc': '''Setting the policy specifies for which origins to allow all the HTTP authentication schemes $1Google Chrome supports regardless of the AuthSchemes policy. @@ -18798,7 +18637,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-'], -@@ -5187,7 +5187,7 @@ +@@ -5252,7 +5252,7 @@ }, { 'name': 'EnableAuthNegotiatePort', @@ -18807,7 +18646,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-'], -@@ -5215,7 +5215,7 @@ +@@ -5281,7 +5281,7 @@ }, { 'name': 'BasicAuthOverHttpEnabled', @@ -18816,7 +18655,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-'], -@@ -5246,7 +5246,7 @@ +@@ -5313,7 +5313,7 @@ }, { 'name': 'AuthServerWhitelist', @@ -18825,7 +18664,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'], -@@ -5269,7 +5269,7 @@ +@@ -5336,7 +5336,7 @@ }, { 'name': 'AuthServerAllowlist', @@ -18834,7 +18673,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-'], -@@ -5289,7 +5289,7 @@ +@@ -5357,7 +5357,7 @@ }, { 'name': 'AuthNegotiateDelegateWhitelist', @@ -18843,7 +18682,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'], -@@ -5310,7 +5310,7 @@ +@@ -5378,7 +5378,7 @@ }, { 'name': 'AuthNegotiateDelegateAllowlist', @@ -18852,7 +18691,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-'], -@@ -5328,7 +5328,7 @@ +@@ -5397,7 +5397,7 @@ }, { 'name': 'AuthNegotiateDelegateByKdcPolicy', @@ -18861,7 +18700,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-'], -@@ -5358,7 +5358,7 @@ +@@ -5427,7 +5427,7 @@ }, { 'name': 'BrowserLabsEnabled', @@ -18870,7 +18709,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-'], -@@ -5389,7 +5389,7 @@ +@@ -5459,7 +5459,7 @@ }, { 'name': 'GSSAPILibraryName', @@ -18879,7 +18718,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.linux:9-'], -@@ -5407,7 +5407,7 @@ +@@ -5477,7 +5477,7 @@ }, { 'name': 'AuthAndroidNegotiateAccountType', @@ -18888,7 +18727,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-'], -@@ -5419,13 +5419,13 @@ +@@ -5489,13 +5489,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -18904,7 +18743,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-'], -@@ -5455,7 +5455,7 @@ +@@ -5526,7 +5526,7 @@ }, { 'name': 'NtlmV2Enabled', @@ -18913,7 +18752,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-'], -@@ -5486,7 +5486,7 @@ +@@ -5557,7 +5557,7 @@ }, { 'name': 'ExtensionInstallBlacklist', @@ -18922,7 +18761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5512,7 +5512,7 @@ +@@ -5583,7 +5583,7 @@ { 'name': 'ExtensionInstallBlocklist', @@ -18931,7 +18770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5536,7 +5536,7 @@ +@@ -5608,7 +5608,7 @@ }, { 'name': 'ExtensionInstallAllowlist', @@ -18940,7 +18779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5560,7 +5560,7 @@ +@@ -5633,7 +5633,7 @@ }, { 'name': 'ExtensionInstallWhitelist', @@ -18949,7 +18788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5583,7 +5583,7 @@ +@@ -5656,7 +5656,7 @@ }, { 'name': 'ExtensionInstallForcelist', @@ -18958,7 +18797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5594,7 +5594,7 @@ +@@ -5668,7 +5668,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18967,7 +18806,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'], -@@ -5610,15 +5610,15 @@ +@@ -5684,15 +5684,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 DeveloperToolsDisabled policy. @@ -18986,7 +18825,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5636,14 +5636,14 @@ +@@ -5711,14 +5711,14 @@ 'tags': ['full-admin-access', 'system-security'], 'desc': '''Setting the policy specifies which URLs may install extensions, apps, and themes. Before $1Google Chrome 21, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. Afterwards, such files must be downloaded and dragged to the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow. @@ -19003,7 +18842,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -5674,7 +5674,7 @@ +@@ -5750,7 +5750,7 @@ }, { 'name': 'ExtensionAllowedTypes', @@ -19012,7 +18851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -5759,7 +5759,7 @@ +@@ -5836,7 +5836,7 @@ }, { 'name': 'ExtensionSettings', @@ -19021,16 +18860,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5854,7 +5854,7 @@ +@@ -5931,7 +5931,7 @@ }, }, }, - 'url_schema': 'https://www.chromium.org/administrators/policy-list-3/extension-settings-full', + 'url_schema': 'https://www.ch40m1um.qjz9zk/administrators/policy-list-3/extension-settings-full', 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], + 'future_on': ['fuchsia'], 'features': { - 'dynamic_refresh': True, -@@ -5911,13 +5911,13 @@ +@@ -5989,13 +5989,13 @@ 'tags': [], 'desc': '''Setting the policy controls extension management settings for $1Google Chrome, including any controlled by existing extension-related policies. The policy supersedes any legacy policies that might be set. @@ -19046,7 +18885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-'], -@@ -5945,12 +5945,12 @@ +@@ -6024,12 +6024,12 @@ Setting this policy to Disabled or leaving it unset allows external extensions to be installed. @@ -19061,7 +18900,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-'], -@@ -5979,7 +5979,7 @@ +@@ -6059,7 +6059,7 @@ }, { 'name': 'DeveloperToolsDisabled', @@ -19070,7 +18909,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-'], -@@ -6015,7 +6015,7 @@ +@@ -6095,7 +6095,7 @@ }, { 'name': 'DeveloperToolsAvailability', @@ -19079,7 +18918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6120,7 +6120,7 @@ +@@ -6202,7 +6202,7 @@ }, { 'name': 'RestoreOnStartup', @@ -19088,7 +18927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6171,7 +6171,7 @@ +@@ -6255,7 +6255,7 @@ }, { 'name': 'RestoreOnStartupURLs', @@ -19097,7 +18936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6183,7 +6183,7 @@ +@@ -6268,7 +6268,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19106,7 +18945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -6195,7 +6195,7 @@ +@@ -6280,7 +6280,7 @@ }, { 'name': 'BlockThirdPartyCookies', @@ -19115,7 +18954,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-'], -@@ -6229,7 +6229,7 @@ +@@ -6315,7 +6315,7 @@ }, { 'name': 'DefaultSearchProviderEnabled', @@ -19124,7 +18963,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -6270,7 +6270,7 @@ +@@ -6357,7 +6357,7 @@ }, { 'name': 'DefaultSearchProviderContextMenuAccessAllowed', @@ -19133,7 +18972,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-'], -@@ -6303,7 +6303,7 @@ +@@ -6391,7 +6391,7 @@ }, { 'name': 'DefaultSearchProviderName', @@ -19142,7 +18981,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6327,7 +6327,7 @@ +@@ -6416,7 +6416,7 @@ }, { 'name': 'DefaultSearchProviderKeyword', @@ -19151,7 +18990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6351,7 +6351,7 @@ +@@ -6441,7 +6441,7 @@ }, { 'name': 'DefaultSearchProviderSearchURL', @@ -19160,7 +18999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6375,7 +6375,7 @@ +@@ -6466,7 +6466,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURL', @@ -19169,7 +19008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6399,7 +6399,7 @@ +@@ -6491,7 +6491,7 @@ }, { 'name': 'DefaultSearchProviderInstantURL', @@ -19178,7 +19017,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'], -@@ -6423,7 +6423,7 @@ +@@ -6515,7 +6515,7 @@ }, { 'name': 'DefaultSearchProviderIconURL', @@ -19187,7 +19026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6447,7 +6447,7 @@ +@@ -6540,7 +6540,7 @@ }, { 'name': 'DefaultSearchProviderEncodings', @@ -19196,7 +19035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6474,7 +6474,7 @@ +@@ -6568,7 +6568,7 @@ }, { 'name': 'DefaultSearchProviderAlternateURLs', @@ -19205,7 +19044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6501,7 +6501,7 @@ +@@ -6596,7 +6596,7 @@ }, { 'name': 'DefaultSearchProviderSearchTermsReplacementKey', @@ -19214,7 +19053,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'], -@@ -6523,7 +6523,7 @@ +@@ -6618,7 +6618,7 @@ }, { 'name': 'DefaultSearchProviderImageURL', @@ -19223,7 +19062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6547,7 +6547,7 @@ +@@ -6643,7 +6643,7 @@ }, { 'name': 'DefaultSearchProviderNewTabURL', @@ -19232,7 +19071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6571,7 +6571,7 @@ +@@ -6668,7 +6668,7 @@ }, { 'name': 'DefaultSearchProviderSearchURLPostParams', @@ -19241,7 +19080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6595,7 +6595,7 @@ +@@ -6693,7 +6693,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURLPostParams', @@ -19250,7 +19089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6619,7 +6619,7 @@ +@@ -6718,7 +6718,7 @@ }, { 'name': 'DefaultSearchProviderInstantURLPostParams', @@ -19259,7 +19098,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'], -@@ -6641,7 +6641,7 @@ +@@ -6740,7 +6740,7 @@ }, { 'name': 'DefaultSearchProviderImageURLPostParams', @@ -19268,7 +19107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6665,7 +6665,7 @@ +@@ -6765,7 +6765,7 @@ }, { 'name': 'DefaultCookiesSetting', @@ -19277,7 +19116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6709,7 +6709,7 @@ +@@ -6810,7 +6810,7 @@ }, { 'name': 'DefaultImagesSetting', @@ -19286,7 +19125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6742,7 +6742,7 @@ +@@ -6844,7 +6844,7 @@ }, { 'name': 'DefaultJavaScriptSetting', @@ -19295,7 +19134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6775,7 +6775,7 @@ +@@ -6878,7 +6878,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -19304,7 +19143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6816,7 +6816,7 @@ +@@ -6919,7 +6919,7 @@ }, { 'name': 'DefaultPopupsSetting', @@ -19313,7 +19152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6854,7 +6854,7 @@ +@@ -6958,7 +6958,7 @@ }, { 'name': 'DefaultNotificationsSetting', @@ -19322,7 +19161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6892,7 +6892,7 @@ +@@ -6997,7 +6997,7 @@ }, { 'name': 'DefaultGeolocationSetting', @@ -19331,7 +19170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6931,7 +6931,7 @@ +@@ -7037,7 +7037,7 @@ }, { 'name': 'DefaultMediaStreamSetting', @@ -19340,7 +19179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6965,7 +6965,7 @@ +@@ -7071,7 +7071,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', @@ -19349,7 +19188,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6999,7 +6999,7 @@ +@@ -7106,7 +7106,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -19358,7 +19197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7033,7 +7033,7 @@ +@@ -7140,7 +7140,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -19367,7 +19206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7067,7 +7067,7 @@ +@@ -7175,7 +7175,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -19376,7 +19215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7101,7 +7101,7 @@ +@@ -7210,7 +7210,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -19385,7 +19224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7133,7 +7133,7 @@ +@@ -7243,7 +7243,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -19394,7 +19233,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.''', -@@ -7150,7 +7150,7 @@ +@@ -7260,7 +7260,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -19403,7 +19242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7183,7 +7183,7 @@ +@@ -7293,7 +7293,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -19412,7 +19251,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.''', -@@ -7198,7 +7198,7 @@ +@@ -7308,7 +7308,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -19421,7 +19260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7219,11 +7219,11 @@ +@@ -7330,11 +7330,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19435,7 +19274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7244,11 +7244,11 @@ +@@ -7356,11 +7356,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19449,7 +19288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7282,7 +7282,7 @@ +@@ -7395,7 +7395,7 @@ }, { 'name': 'SerialAskForUrls', @@ -19458,7 +19297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7305,11 +7305,11 @@ +@@ -7419,11 +7419,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19472,7 +19311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7332,11 +7332,11 @@ +@@ -7447,11 +7447,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19486,7 +19325,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7361,7 +7361,7 @@ +@@ -7477,7 +7477,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -19495,7 +19334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7417,7 +7417,7 @@ +@@ -7534,7 +7534,7 @@ }, { 'name': 'DefaultWebHidGuardSetting', @@ -19504,7 +19343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7453,7 +7453,7 @@ +@@ -7571,7 +7571,7 @@ }, { 'name': 'WebHidAskForUrls', @@ -19513,7 +19352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7464,7 +7464,7 @@ +@@ -7583,7 +7583,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19522,7 +19361,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'], -@@ -7482,11 +7482,11 @@ +@@ -7601,11 +7601,11 @@ URL patterns must not conflict with WebHidBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19536,7 +19375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7497,7 +7497,7 @@ +@@ -7617,7 +7617,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19545,7 +19384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 945, 'caption': '''Block the WebHID API on these sites''', 'tags': [], -@@ -7515,11 +7515,11 @@ +@@ -7635,11 +7635,11 @@ URL patterns can't conflict with WebHidAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19559,7 +19398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7530,7 +7530,7 @@ +@@ -7651,7 +7651,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -19568,7 +19407,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'], -@@ -7544,7 +7544,7 @@ +@@ -7665,7 +7665,7 @@ }, { 'name': 'WebHidAllowDevicesForUrls', @@ -19577,7 +19416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7585,7 +7585,7 @@ +@@ -7707,7 +7707,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -19586,7 +19425,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.''', -@@ -7598,7 +7598,7 @@ +@@ -7720,7 +7720,7 @@ }, { 'name': 'WebHidAllowDevicesWithHidUsagesForUrls', @@ -19595,7 +19434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7639,7 +7639,7 @@ +@@ -7762,7 +7762,7 @@ }, 'example_value': [{ 'usages': [{'usage_page': 1234, 'usage': 5678}], @@ -19604,7 +19443,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.''', -@@ -7652,7 +7652,7 @@ +@@ -7775,7 +7775,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -19613,7 +19452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7687,7 +7687,7 @@ +@@ -7810,7 +7810,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -19622,7 +19461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7711,11 +7711,11 @@ +@@ -7834,11 +7834,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19636,7 +19475,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7739,11 +7739,11 @@ +@@ -7862,11 +7862,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19650,7 +19489,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7777,7 +7777,7 @@ +@@ -7901,7 +7901,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -19659,7 +19498,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7811,7 +7811,7 @@ +@@ -7936,7 +7936,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -19668,7 +19507,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7832,11 +7832,11 @@ +@@ -7958,11 +7958,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19682,7 +19521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7857,11 +7857,11 @@ +@@ -7984,11 +7984,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19696,7 +19535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7882,11 +7882,11 @@ +@@ -8010,11 +8010,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19710,7 +19549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7907,11 +7907,11 @@ +@@ -8036,11 +8036,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19724,7 +19563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7971,7 +7971,7 @@ +@@ -8101,7 +8101,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -19733,7 +19572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8026,11 +8026,11 @@ +@@ -8156,11 +8156,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -19747,7 +19586,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8055,11 +8055,11 @@ +@@ -8186,11 +8186,11 @@ See also policies CookiesBlockedForUrls and CookiesSessionOnlyForUrls. Note that there must be no conflicting URL patterns between these three policies - it is unspecified which policy takes precedence. @@ -19761,7 +19600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8084,11 +8084,11 @@ +@@ -8216,11 +8216,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -19775,7 +19614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8113,11 +8113,11 @@ +@@ -8246,11 +8246,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -19789,7 +19628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8136,13 +8136,13 @@ +@@ -8270,13 +8270,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19805,7 +19644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8161,13 +8161,13 @@ +@@ -8296,13 +8296,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19821,7 +19660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8186,11 +8186,11 @@ +@@ -8322,11 +8322,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19835,7 +19674,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8209,11 +8209,11 @@ +@@ -8346,11 +8346,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19849,7 +19688,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8249,7 +8249,7 @@ +@@ -8387,7 +8387,7 @@ }, { 'name': 'ClipboardAllowedForUrls', @@ -19858,7 +19697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8269,11 +8269,11 @@ +@@ -8408,11 +8408,11 @@ Leaving the policy unset means DefaultClipboardSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19872,7 +19711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8292,11 +8292,11 @@ +@@ -8432,11 +8432,11 @@ Leaving the policy unset means DefaultClipboardSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19886,7 +19725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8316,11 +8316,11 @@ +@@ -8456,11 +8456,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. @@ -19900,7 +19739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8340,11 +8340,11 @@ +@@ -8480,11 +8480,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. @@ -19914,7 +19753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8376,13 +8376,13 @@ +@@ -8516,13 +8516,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], 'deprecated': True, @@ -19930,7 +19769,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8401,17 +8401,17 @@ +@@ -8542,17 +8542,17 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -19951,7 +19790,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -8438,7 +8438,7 @@ +@@ -8579,7 +8579,7 @@ }, { 'name': 'LensRegionSearchEnabled', @@ -19960,7 +19799,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-'], -@@ -8465,7 +8465,7 @@ +@@ -8607,7 +8607,7 @@ }, { 'name': 'SideSearchEnabled', @@ -19969,7 +19808,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-'], -@@ -8495,9 +8495,9 @@ +@@ -8638,9 +8638,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -19982,7 +19821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -8543,9 +8543,9 @@ +@@ -8687,9 +8687,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -19995,7 +19834,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -8572,11 +8572,11 @@ +@@ -8717,11 +8717,11 @@ For origins not covered by the patterns specified here, the global default value will be used either from the InsecurePrivateNetworkRequestsAllowed policy, if it is set, or the user's personal configuration otherwise. @@ -20009,7 +19848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8596,11 +8596,11 @@ +@@ -8741,11 +8741,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20023,7 +19862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8620,11 +8620,11 @@ +@@ -8765,11 +8765,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20037,7 +19876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8648,11 +8648,11 @@ +@@ -8794,11 +8794,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20051,7 +19890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -8682,7 +8682,7 @@ +@@ -8829,7 +8829,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -20060,7 +19899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -8693,7 +8693,7 @@ +@@ -8840,7 +8840,7 @@ }, { 'name': 'PopupsBlockedForUrls', @@ -20069,7 +19908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8717,11 +8717,11 @@ +@@ -8865,11 +8865,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20083,7 +19922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8740,11 +8740,11 @@ +@@ -8889,11 +8889,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20097,7 +19936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8763,11 +8763,11 @@ +@@ -8913,11 +8913,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -20111,7 +19950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8788,7 +8788,7 @@ +@@ -8939,7 +8939,7 @@ If the same URL pattern exists in both this policy and the SensorsBlockedForUrls policy, the latter is prioritized and access to motion or light sensors will be blocked. @@ -20120,7 +19959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -8813,11 +8813,11 @@ +@@ -8965,11 +8965,11 @@ If the same URL pattern exists in both this policy and the SensorsAllowedForUrls policy, this policy is prioritized and access to motion or light sensors will be blocked. @@ -20134,7 +19973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8845,7 +8845,7 @@ +@@ -8997,7 +8997,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -20143,7 +19982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8870,7 +8870,7 @@ +@@ -9023,7 +9023,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -20152,7 +19991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8898,7 +8898,7 @@ +@@ -9051,7 +9051,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -20161,7 +20000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8923,7 +8923,7 @@ +@@ -9077,7 +9077,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -20170,7 +20009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -8951,7 +8951,7 @@ +@@ -9106,7 +9106,7 @@ }, { 'name': 'Disable3DAPIs', @@ -20179,7 +20018,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-'], -@@ -8979,7 +8979,7 @@ +@@ -9135,7 +9135,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -20188,7 +20027,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-'], -@@ -8999,7 +8999,7 @@ +@@ -9156,7 +9156,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -20197,7 +20036,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-'], -@@ -9018,7 +9018,7 @@ +@@ -9176,7 +9176,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -20206,7 +20045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -9050,7 +9050,7 @@ +@@ -9208,7 +9208,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -20215,7 +20054,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9069,11 +9069,11 @@ +@@ -9227,11 +9227,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -20229,7 +20068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9092,11 +9092,11 @@ +@@ -9250,11 +9250,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -20243,7 +20082,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -9114,7 +9114,7 @@ +@@ -9272,7 +9272,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -20252,7 +20091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -9136,7 +9136,7 @@ +@@ -9294,7 +9294,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -20261,7 +20100,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9157,7 +9157,7 @@ +@@ -9315,7 +9315,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -20270,7 +20109,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -9193,7 +9193,7 @@ +@@ -9351,7 +9351,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -20279,7 +20118,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9247,7 +9247,7 @@ +@@ -9405,7 +9405,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -20288,7 +20127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -9283,7 +9283,7 @@ +@@ -9441,7 +9441,7 @@ }, { 'name': 'SecondaryGoogleAccountUsage', @@ -20297,7 +20136,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9324,7 +9324,7 @@ +@@ -9482,7 +9482,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -20306,7 +20145,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -9354,7 +9354,7 @@ +@@ -9512,7 +9512,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -20315,7 +20154,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9390,7 +9390,7 @@ +@@ -9548,7 +9548,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -20324,7 +20163,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-'], -@@ -9406,7 +9406,7 @@ +@@ -9564,7 +9564,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -20333,7 +20172,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'], -@@ -9436,11 +9436,11 @@ +@@ -9594,11 +9594,11 @@ This policy was removed in $1Google Chrome version 102. @@ -20347,7 +20186,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'], -@@ -9468,7 +9468,7 @@ +@@ -9626,7 +9626,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -20355,8 +20194,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['robsc@ch40m1um.qjz9zk', 'bartfab@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:75-'], -@@ -9498,7 +9498,7 @@ + 'supported_on': ['chrome_os:75-99'], +@@ -9659,7 +9659,7 @@ }, { 'name': 'TranslateEnabled', @@ -20365,7 +20204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9537,7 +9537,7 @@ +@@ -9699,7 +9699,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -20374,7 +20213,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'], -@@ -9571,7 +9571,7 @@ +@@ -9733,7 +9733,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -20383,7 +20222,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'], -@@ -9600,7 +9600,7 @@ +@@ -9762,7 +9762,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -20392,7 +20231,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'], -@@ -9633,7 +9633,7 @@ +@@ -9795,7 +9795,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -20401,7 +20240,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-'], -@@ -9667,7 +9667,7 @@ +@@ -9830,7 +9830,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -20410,7 +20249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9700,7 +9700,7 @@ +@@ -9864,7 +9864,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -20419,7 +20258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -9733,7 +9733,7 @@ +@@ -9898,7 +9898,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -20428,7 +20267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -9762,7 +9762,7 @@ +@@ -9928,7 +9928,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -20437,7 +20276,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -9783,7 +9783,7 @@ +@@ -9950,7 +9950,7 @@ + }, + { + 'name': 'LoadCryptoTokenExtension', +- 'owners': ['martinkr@google.com', 'rdcronin@google.com'], ++ 'owners': ['martinkr@9oo91e.qjz9zk', 'rdcronin@9oo91e.qjz9zk'], + 'tags': [], + 'type': 'main', + 'schema': { 'type': 'boolean' }, +@@ -9978,7 +9978,7 @@ }, { 'name': 'U2fSecurityKeyApiEnabled', @@ -20446,7 +20294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9815,11 +9815,11 @@ +@@ -10010,11 +10010,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. @@ -20460,7 +20308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['full-admin-access'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9852,7 +9852,7 @@ +@@ -10048,7 +10048,7 @@ }, { 'name': 'GCFUserDataDir', @@ -20469,7 +20317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -9868,14 +9868,14 @@ +@@ -10064,14 +10064,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -20486,7 +20334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -9896,7 +9896,7 @@ +@@ -10092,7 +10092,7 @@ }, { 'name': 'ImportBookmarks', @@ -20495,7 +20343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9927,7 +9927,7 @@ +@@ -10124,7 +10124,7 @@ }, { 'name': 'ImportHistory', @@ -20504,7 +20352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9958,7 +9958,7 @@ +@@ -10156,7 +10156,7 @@ }, { 'name': 'ImportHomepage', @@ -20513,7 +20361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9987,7 +9987,7 @@ +@@ -10186,7 +10186,7 @@ }, { 'name': 'ImportSearchEngine', @@ -20522,7 +20370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -10017,7 +10017,7 @@ +@@ -10217,7 +10217,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -20531,7 +20379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -10047,7 +10047,7 @@ +@@ -10248,7 +10248,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -20540,7 +20388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -10077,7 +10077,7 @@ +@@ -10279,7 +10279,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -20549,7 +20397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -10097,7 +10097,7 @@ +@@ -10299,7 +10299,7 @@ }, { 'name': 'HideWebStorePromo', @@ -20558,7 +20406,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'], -@@ -10115,7 +10115,7 @@ +@@ -10317,7 +10317,7 @@ }, { 'name': 'URLBlacklist', @@ -20567,7 +20415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10138,7 +10138,7 @@ +@@ -10340,7 +10340,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -20576,7 +20424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome 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. -@@ -10147,7 +10147,7 @@ +@@ -10349,7 +10349,7 @@ }, { 'name': 'URLWhitelist', @@ -20585,7 +20433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10170,7 +10170,7 @@ +@@ -10372,7 +10372,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -20594,7 +20442,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:". -@@ -10181,7 +10181,7 @@ +@@ -10383,7 +10383,7 @@ }, { 'name': 'URLBlocklist', @@ -20603,7 +20451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10202,7 +10202,7 @@ +@@ -10405,7 +10405,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -20612,7 +20460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome 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. -@@ -10213,7 +10213,7 @@ +@@ -10416,7 +10416,7 @@ }, { 'name': 'URLAllowlist', @@ -20621,7 +20469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10234,7 +10234,7 @@ +@@ -10438,7 +10438,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -20630,7 +20478,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:". -@@ -10247,7 +10247,7 @@ +@@ -10451,7 +10451,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -20639,7 +20487,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-'], -@@ -10267,7 +10267,7 @@ +@@ -10482,7 +10482,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -20648,7 +20496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10303,7 +10303,7 @@ +@@ -10519,7 +10519,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -20657,7 +20505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -10374,7 +10374,7 @@ +@@ -10591,7 +10591,7 @@ }, { 'name': 'CloudUserPolicyMerge', @@ -20666,7 +20514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:92-', 'android:97-'], -@@ -10408,7 +10408,7 @@ +@@ -10626,7 +10626,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -20675,7 +20523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10437,7 +10437,7 @@ +@@ -10656,7 +10656,7 @@ }, { 'name': 'PolicyScopeDetection', @@ -20684,7 +20532,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.mac:105-107'], -@@ -10471,10 +10471,10 @@ +@@ -10690,10 +10690,10 @@ }, { 'name': 'OpenNetworkConfiguration', @@ -20697,7 +20545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -10489,10 +10489,10 @@ +@@ -10708,10 +10708,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', @@ -20710,7 +20558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -10507,7 +10507,7 @@ +@@ -10726,7 +10726,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', @@ -20719,7 +20567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10554,7 +10554,7 @@ +@@ -10773,7 +10773,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', @@ -20728,7 +20576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10597,7 +10597,7 @@ +@@ -10816,7 +10816,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', @@ -20737,7 +20585,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-'], -@@ -10620,7 +10620,7 @@ +@@ -10839,7 +10839,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', @@ -20746,7 +20594,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-'], -@@ -10643,7 +10643,7 @@ +@@ -10862,7 +10862,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', @@ -20755,7 +20603,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-'], -@@ -10666,7 +10666,7 @@ +@@ -10885,7 +10885,7 @@ }, { 'name': 'ChromadToCloudMigrationEnabled', @@ -20764,7 +20612,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -10700,7 +10700,7 @@ +@@ -10919,7 +10919,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -20773,7 +20621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-101'], -@@ -10721,7 +10721,7 @@ +@@ -10950,7 +10950,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -20782,7 +20630,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'], -@@ -10738,7 +10738,7 @@ +@@ -10967,7 +10967,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -20791,7 +20639,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'], -@@ -10755,7 +10755,7 @@ +@@ -10984,7 +10984,7 @@ }, { 'name': 'DisablePrintPreview', @@ -20800,7 +20648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -10773,7 +10773,7 @@ +@@ -11013,7 +11013,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -20809,7 +20657,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-'], -@@ -10792,7 +10792,7 @@ +@@ -11048,7 +11048,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -20818,7 +20666,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -10833,7 +10833,7 @@ +@@ -11090,7 +11090,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -20827,7 +20675,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'], -@@ -10852,7 +10852,7 @@ +@@ -11109,7 +11109,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -20836,7 +20684,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-'], -@@ -10872,7 +10872,7 @@ +@@ -11140,7 +11140,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -20845,7 +20693,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-'], -@@ -10901,7 +10901,7 @@ +@@ -11170,7 +11170,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -20854,7 +20702,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'], -@@ -10922,7 +10922,7 @@ +@@ -11201,7 +11201,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -20863,7 +20711,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'], -@@ -10943,7 +10943,7 @@ +@@ -11232,7 +11232,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -20872,7 +20720,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'], -@@ -10966,7 +10966,7 @@ +@@ -11265,7 +11265,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -20881,7 +20729,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-'], -@@ -10987,7 +10987,7 @@ +@@ -11301,7 +11301,7 @@ }, { 'name': 'ChromeRootStoreEnabled', @@ -20890,7 +20738,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-'], -@@ -11023,7 +11023,7 @@ +@@ -11337,7 +11337,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -20899,7 +20747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -11045,7 +11045,7 @@ +@@ -11370,7 +11370,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -20908,7 +20756,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-'], -@@ -11070,7 +11070,7 @@ +@@ -11395,7 +11395,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -20917,7 +20765,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-'], -@@ -11094,7 +11094,7 @@ +@@ -11419,7 +11419,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -20926,7 +20774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11127,7 +11127,7 @@ +@@ -11452,7 +11452,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -20935,7 +20783,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11160,7 +11160,7 @@ +@@ -11485,7 +11485,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -20944,7 +20792,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11200,7 +11200,7 @@ +@@ -11525,7 +11525,7 @@ }, { 'name': 'EnableDeviceGranularReporting', @@ -20953,7 +20801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11230,7 +11230,7 @@ +@@ -11555,7 +11555,7 @@ }, { 'name': 'ReportDeviceVersionInfo', @@ -20962,7 +20810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -11250,7 +11250,7 @@ +@@ -11585,7 +11585,7 @@ }, { 'name': 'ReportDeviceActivityTimes', @@ -20971,7 +20819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -11270,7 +11270,7 @@ +@@ -11615,7 +11615,7 @@ }, { 'name': 'ReportDeviceAudioStatus', @@ -20980,7 +20828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11302,7 +11302,7 @@ +@@ -11647,7 +11647,7 @@ }, { 'name': 'ReportDeviceAudioStatusCheckingRateMs', @@ -20989,7 +20837,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-'], -@@ -11325,7 +11325,7 @@ +@@ -11670,7 +11670,7 @@ }, { 'name': 'ReportDeviceBootMode', @@ -20998,7 +20846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -11345,7 +11345,7 @@ +@@ -11700,7 +11700,7 @@ }, { 'name': 'ReportDeviceLocation', @@ -21007,7 +20855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11365,7 +11365,7 @@ +@@ -11732,7 +11732,7 @@ }, { 'name': 'ReportDeviceNetworkConfiguration', @@ -21016,7 +20864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11397,7 +11397,7 @@ +@@ -11764,7 +11764,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', @@ -21025,7 +20873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -11418,7 +11418,7 @@ +@@ -11797,7 +11797,7 @@ }, { 'name': 'ReportDeviceNetworkStatus', @@ -21034,7 +20882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11450,7 +11450,7 @@ +@@ -11829,7 +11829,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryCollectionRateMs', @@ -21043,7 +20891,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-'], -@@ -11473,7 +11473,7 @@ +@@ -11852,7 +11852,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryEventCheckingRateMs', @@ -21052,7 +20900,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-'], -@@ -11496,7 +11496,7 @@ +@@ -11875,7 +11875,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -21061,7 +20909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -11516,7 +11516,7 @@ +@@ -11905,7 +11905,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -21070,7 +20918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11537,7 +11537,7 @@ +@@ -11938,7 +11938,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -21079,7 +20927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11557,7 +11557,7 @@ +@@ -11968,7 +11968,7 @@ }, { 'name': 'ReportDeviceSecurityStatus', @@ -21088,7 +20936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11589,7 +11589,7 @@ +@@ -12000,7 +12000,7 @@ }, { 'name': 'ReportDeviceGraphicsStatus', @@ -21097,7 +20945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11612,7 +11612,7 @@ +@@ -12033,7 +12033,7 @@ }, { 'name': 'ReportDeviceCrashReportInfo', @@ -21106,7 +20954,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11635,7 +11635,7 @@ +@@ -12066,7 +12066,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -21115,7 +20963,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11657,7 +11657,7 @@ +@@ -12098,7 +12098,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -21124,7 +20972,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11677,7 +11677,7 @@ +@@ -12118,7 +12118,7 @@ }, { 'name': 'ReportDevicePeripherals', @@ -21133,7 +20981,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:101-'], -@@ -11708,7 +11708,7 @@ +@@ -12149,7 +12149,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -21142,7 +20990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11729,7 +11729,7 @@ +@@ -12170,7 +12170,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -21151,7 +20999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11749,7 +11749,7 @@ +@@ -12190,7 +12190,7 @@ }, { 'name': 'ReportDeviceCpuInfo', @@ -21160,7 +21008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11770,7 +11770,7 @@ +@@ -12211,7 +12211,7 @@ }, { 'name': 'ReportDeviceTimezoneInfo', @@ -21169,7 +21017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11791,7 +11791,7 @@ +@@ -12232,7 +12232,7 @@ }, { 'name': 'ReportDeviceMemoryInfo', @@ -21178,7 +21026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11812,7 +11812,7 @@ +@@ -12253,7 +12253,7 @@ }, { 'name': 'ReportDeviceBacklightInfo', @@ -21187,7 +21035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11833,7 +11833,7 @@ +@@ -12274,7 +12274,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -21196,7 +21044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11854,7 +11854,7 @@ +@@ -12295,7 +12295,7 @@ }, { 'name': 'ReportDeviceBluetoothInfo', @@ -21205,7 +21053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11875,7 +11875,7 @@ +@@ -12316,7 +12316,7 @@ }, { 'name': 'ReportDeviceFanInfo', @@ -21214,7 +21062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11896,7 +11896,7 @@ +@@ -12337,7 +12337,7 @@ }, { 'name': 'ReportDeviceVpdInfo', @@ -21223,7 +21071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11918,7 +11918,7 @@ +@@ -12359,7 +12359,7 @@ }, { 'name': 'ReportDeviceSystemInfo', @@ -21232,7 +21080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -11939,7 +11939,7 @@ +@@ -12380,7 +12380,7 @@ }, { 'name': 'ReportDevicePrintJobs', @@ -21241,7 +21089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11971,7 +11971,7 @@ +@@ -12412,7 +12412,7 @@ }, { 'name': 'ReportDeviceLoginLogout', @@ -21250,7 +21098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -12003,7 +12003,7 @@ +@@ -12444,7 +12444,7 @@ }, { 'name': 'ReportCRDSessions', @@ -21259,7 +21107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -12035,7 +12035,7 @@ +@@ -12476,7 +12476,7 @@ }, { 'name': 'ReportUploadFrequency', @@ -21268,7 +21116,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-'], -@@ -12055,7 +12055,7 @@ +@@ -12496,7 +12496,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -21277,7 +21125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -12074,7 +12074,7 @@ +@@ -12525,7 +12525,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -21286,7 +21134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -12093,7 +12093,7 @@ +@@ -12554,7 +12554,7 @@ }, { 'name': 'HeartbeatEnabled', @@ -21295,7 +21143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -12113,7 +12113,7 @@ +@@ -12584,7 +12584,7 @@ }, { 'name': 'HeartbeatFrequency', @@ -21304,7 +21152,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-'], -@@ -12133,7 +12133,7 @@ +@@ -12604,7 +12604,7 @@ }, { 'name': 'LogUploadEnabled', @@ -21313,7 +21161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -12153,7 +12153,7 @@ +@@ -12634,7 +12634,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -21322,7 +21170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12166,11 +12166,11 @@ +@@ -12647,11 +12647,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -21336,7 +21184,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 DeviceAllowNewUsers policy to be configured appropriately. -@@ -12181,7 +12181,7 @@ +@@ -12662,7 +12662,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -21345,7 +21193,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12193,11 +12193,11 @@ +@@ -12674,11 +12674,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -21359,7 +21207,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 DeviceAllowNewUsers policy to be configured appropriately. If DeviceFamilyLinkAccountsAllowed is enabled, Family Link users will be allowed additionally to the accounts defined in this policy.''', -@@ -12205,7 +12205,7 @@ +@@ -12686,7 +12686,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -21368,7 +21216,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -12226,7 +12226,7 @@ +@@ -12717,7 +12717,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -21377,7 +21225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -12244,7 +12244,7 @@ +@@ -12745,7 +12745,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -21386,7 +21234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -12264,7 +12264,7 @@ +@@ -12775,7 +12775,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -21395,7 +21243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -12282,7 +12282,7 @@ +@@ -12803,7 +12803,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', @@ -21404,7 +21252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -12304,7 +12304,7 @@ +@@ -12825,7 +12825,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -21413,7 +21261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -12342,7 +12342,7 @@ +@@ -12863,7 +12863,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -21422,7 +21270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12360,7 +12360,7 @@ +@@ -12881,7 +12881,7 @@ }, { 'name': 'DeviceReleaseLtsTag', @@ -21431,7 +21279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -12376,7 +12376,7 @@ +@@ -12897,7 +12897,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -21440,7 +21288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12421,7 +12421,7 @@ +@@ -12942,7 +12942,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -21449,7 +21297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12437,7 +12437,7 @@ +@@ -12958,7 +12958,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -21458,7 +21306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12449,7 +12449,7 @@ +@@ -12970,7 +12970,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -21467,7 +21315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -12459,7 +12459,7 @@ +@@ -12980,7 +12980,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -21476,7 +21324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12480,7 +12480,7 @@ +@@ -13001,7 +13001,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -21485,7 +21333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12501,7 +12501,7 @@ +@@ -13022,7 +13022,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -21494,7 +21342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -12520,7 +12520,7 @@ +@@ -13041,7 +13041,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -21503,7 +21351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12541,7 +12541,7 @@ +@@ -13062,7 +13062,7 @@ }, { 'name': 'DeviceAppPack', @@ -21512,7 +21360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12553,7 +12553,7 @@ +@@ -13074,7 +13074,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -21521,7 +21369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -12565,7 +12565,7 @@ +@@ -13086,7 +13086,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -21530,7 +21378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12585,7 +12585,7 @@ +@@ -13106,7 +13106,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -21539,7 +21387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -12606,7 +12606,7 @@ +@@ -13127,7 +13127,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -21548,7 +21396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -12634,7 +12634,7 @@ +@@ -13155,7 +13155,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -21557,7 +21405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12673,7 +12673,7 @@ +@@ -13194,7 +13194,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -21566,7 +21414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -12698,7 +12698,7 @@ +@@ -13219,7 +13219,7 @@ }, { 'name': 'DeviceTargetVersionSelector', @@ -21575,7 +21423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:95-'], -@@ -12727,7 +12727,7 @@ +@@ -13248,7 +13248,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -21584,7 +21432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -12743,7 +12743,7 @@ +@@ -13264,7 +13264,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -21593,7 +21441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12764,7 +12764,7 @@ +@@ -13285,7 +13285,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -21602,7 +21450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12784,7 +12784,7 @@ +@@ -13305,7 +13305,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -21611,7 +21459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12806,7 +12806,7 @@ +@@ -13327,7 +13327,7 @@ }, { 'name': 'KioskCRXManifestUpdateURLIgnored', @@ -21620,7 +21468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12841,7 +12841,7 @@ +@@ -13362,7 +13362,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -21629,7 +21477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12860,7 +12860,7 @@ +@@ -13381,7 +13381,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -21638,7 +21486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -12881,7 +12881,7 @@ +@@ -13402,7 +13402,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -21647,7 +21495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12900,7 +12900,7 @@ +@@ -13421,7 +13421,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -21656,7 +21504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -12919,7 +12919,7 @@ +@@ -13440,7 +13440,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -21665,7 +21513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -12933,7 +12933,7 @@ +@@ -13454,7 +13454,7 @@ 'caption': '''Allow managed session on device''', 'tags': [], 'desc': '''Note that this policy is deprecated and will be removed in $2Google ChromeOS version 88. Public sessions are no longer supported. Please use DeviceLocalAccounts to configure managed-guest sessions instead. @@ -21674,7 +21522,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". -@@ -12941,7 +12941,7 @@ +@@ -13462,7 +13462,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -21683,7 +21531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -12960,7 +12960,7 @@ +@@ -13481,7 +13481,7 @@ 'arc_support': 'This policy controls $2Google ChromeOS developer mode only. If you want to prevent access to Android Developer Options, you need to set the DeveloperToolsDisabled policy.', }, { 'name': 'ManagedGuestSessionAutoLaunchNotificationReduced', @@ -21692,7 +21540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -12984,7 +12984,7 @@ +@@ -13505,7 +13505,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -21701,7 +21549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -13008,7 +13008,7 @@ +@@ -13529,7 +13529,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -21710,7 +21558,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-'], -@@ -13029,7 +13029,7 @@ +@@ -13550,7 +13550,7 @@ }, { 'name': 'DriveDisabled', @@ -21719,7 +21567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -13048,7 +13048,7 @@ +@@ -13569,7 +13569,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -21728,7 +21576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -13067,7 +13067,7 @@ +@@ -13588,7 +13588,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -21737,7 +21585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13079,20 +13079,20 @@ +@@ -13600,20 +13600,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -21761,7 +21609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -13112,7 +13112,7 @@ +@@ -13634,7 +13634,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -21770,7 +21618,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13133,11 +13133,11 @@ +@@ -13656,11 +13656,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -21784,7 +21632,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'], -@@ -13154,11 +13154,11 @@ +@@ -13677,11 +13677,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. @@ -21798,7 +21646,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-'], -@@ -13194,7 +13194,7 @@ +@@ -13718,7 +13718,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -21807,7 +21655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -13212,7 +13212,7 @@ +@@ -13736,7 +13736,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -21816,7 +21664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -13230,7 +13230,7 @@ +@@ -13754,7 +13754,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -21825,7 +21673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -13250,7 +13250,7 @@ +@@ -13774,7 +13774,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -21834,7 +21682,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-'], -@@ -13271,7 +13271,7 @@ +@@ -13796,7 +13796,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -21843,7 +21691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13288,11 +13288,11 @@ +@@ -13814,11 +13814,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 @@ -21857,7 +21705,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-'], -@@ -13312,7 +13312,7 @@ +@@ -13839,7 +13839,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -21866,7 +21714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13329,11 +13329,11 @@ +@@ -13857,11 +13857,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 @@ -21880,7 +21728,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-'], -@@ -13349,7 +13349,7 @@ +@@ -13878,7 +13878,7 @@ }, { 'name': 'SystemTimezone', @@ -21889,7 +21737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -13369,7 +13369,7 @@ +@@ -13898,7 +13898,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -21898,7 +21746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -13391,7 +13391,7 @@ +@@ -13920,7 +13920,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -21907,7 +21755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -13418,7 +13418,7 @@ +@@ -13947,7 +13947,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -21916,7 +21764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -13436,7 +13436,7 @@ +@@ -13965,7 +13965,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -21925,7 +21773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13462,7 +13462,7 @@ +@@ -13992,7 +13992,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -21934,7 +21782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13517,7 +13517,7 @@ +@@ -14048,7 +14048,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -21943,7 +21791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -13545,7 +13545,7 @@ +@@ -14077,7 +14077,7 @@ }, { 'name': 'AdditionalDnsQueryTypesEnabled', @@ -21952,7 +21800,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13582,7 +13582,7 @@ +@@ -14115,7 +14115,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -21961,7 +21809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13619,7 +13619,7 @@ +@@ -14152,7 +14152,7 @@ }, { 'name': 'ShelfAlignment', @@ -21970,7 +21818,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", -@@ -13674,7 +13674,7 @@ +@@ -14207,7 +14207,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -21979,7 +21827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -13760,7 +13760,7 @@ +@@ -14293,7 +14293,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -21988,7 +21836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13802,7 +13802,7 @@ +@@ -14335,7 +14335,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -21997,7 +21845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -13822,7 +13822,7 @@ +@@ -14355,7 +14355,7 @@ }, { 'name': 'UserDisplayName', @@ -22006,7 +21854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -13844,7 +13844,7 @@ +@@ -14377,7 +14377,7 @@ }, { 'name': 'SessionLengthLimit', @@ -22015,7 +21863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -13866,7 +13866,7 @@ +@@ -14399,7 +14399,7 @@ }, { 'name': 'FullscreenAllowed', @@ -22024,7 +21872,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-'], -@@ -13887,7 +13887,7 @@ +@@ -14421,7 +14421,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -22033,7 +21881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -13920,7 +13920,7 @@ +@@ -14454,7 +14454,7 @@ 'id': 930, 'name': 'KeepFullscreenWithoutNotificationUrlAllowList', 'caption': '''List of URLs which are allowed to remain in full screen mode without showing a notification''', @@ -22042,7 +21890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13939,13 +13939,13 @@ +@@ -14473,13 +14473,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. @@ -22058,7 +21906,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13976,7 +13976,7 @@ +@@ -14510,7 +14510,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -22067,7 +21915,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14007,7 +14007,7 @@ +@@ -14541,7 +14541,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -22076,7 +21924,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14040,7 +14040,7 @@ +@@ -14574,7 +14574,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -22085,7 +21933,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14071,7 +14071,7 @@ +@@ -14605,7 +14605,7 @@ }, { 'name': 'IdleDelayAC', @@ -22094,7 +21942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14100,7 +14100,7 @@ +@@ -14634,7 +14634,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -22103,7 +21951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14131,7 +14131,7 @@ +@@ -14665,7 +14665,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -22112,7 +21960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14162,7 +14162,7 @@ +@@ -14696,7 +14696,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -22121,7 +21969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14195,7 +14195,7 @@ +@@ -14729,7 +14729,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -22130,7 +21978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14226,7 +14226,7 @@ +@@ -14760,7 +14760,7 @@ }, { 'name': 'IdleDelayBattery', @@ -22139,7 +21987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -14255,7 +14255,7 @@ +@@ -14789,7 +14789,7 @@ }, { 'name': 'IdleAction', @@ -22148,7 +21996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14302,7 +14302,7 @@ +@@ -14836,7 +14836,7 @@ }, { 'name': 'IdleActionAC', @@ -22157,7 +22005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14351,7 +14351,7 @@ +@@ -14885,7 +14885,7 @@ }, { 'name': 'IdleActionBattery', @@ -22166,7 +22014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14400,7 +14400,7 @@ +@@ -14934,7 +14934,7 @@ }, { 'name': 'LidCloseAction', @@ -22175,7 +22023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14445,7 +14445,7 @@ +@@ -14979,7 +14979,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -22184,7 +22032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14463,7 +14463,7 @@ +@@ -14997,7 +14997,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -22193,7 +22041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14482,7 +14482,7 @@ +@@ -15016,7 +15016,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -22202,7 +22050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -14499,7 +14499,7 @@ +@@ -15033,7 +15033,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -22211,7 +22059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14519,7 +14519,7 @@ +@@ -15053,7 +15053,7 @@ }, { 'name': 'AllowWakeLocks', @@ -22220,7 +22068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -14548,7 +14548,7 @@ +@@ -15082,7 +15082,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -22229,7 +22077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -14577,7 +14577,7 @@ +@@ -15111,7 +15111,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -22238,7 +22086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14597,7 +14597,7 @@ +@@ -15131,7 +15131,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -22247,7 +22095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -14615,7 +14615,7 @@ +@@ -15149,7 +15149,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -22256,7 +22104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14719,7 +14719,7 @@ +@@ -15253,7 +15253,7 @@ }, { 'name': 'ScreenLockDelays', @@ -22265,7 +22113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14756,7 +14756,7 @@ +@@ -15290,7 +15290,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -22274,7 +22122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14844,7 +14844,7 @@ +@@ -15378,7 +15378,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -22283,7 +22131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14873,7 +14873,7 @@ +@@ -15407,7 +15407,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -22292,16 +22140,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -14893,7 +14893,7 @@ +@@ -15427,7 +15427,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['josiahk@google.com', 'file://ui/accessibility/OWNERS'], ++ 'owners': ['josiahk@9oo91e.qjz9zk', 'file://ui/accessibility/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -14914,7 +14914,7 @@ +@@ -15448,7 +15448,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -22310,7 +22158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -14935,7 +14935,7 @@ +@@ -15469,7 +15469,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -22319,7 +22167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14954,7 +14954,7 @@ +@@ -15488,7 +15488,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -22328,7 +22176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14973,7 +14973,7 @@ +@@ -15507,7 +15507,7 @@ }, { 'name': 'HighContrastEnabled', @@ -22337,7 +22185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14992,7 +14992,7 @@ +@@ -15526,7 +15526,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -22346,7 +22194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15018,7 +15018,7 @@ +@@ -15552,7 +15552,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -22355,16 +22203,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15043,7 +15043,7 @@ +@@ -15577,7 +15577,7 @@ }, { 'name': 'VirtualKeyboardEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['shend@google.com','e14s-eng@google.com'], ++ 'owners': ['shend@9oo91e.qjz9zk','e14s-eng@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -15062,7 +15062,7 @@ +@@ -15596,7 +15596,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -22373,7 +22221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -15114,7 +15114,7 @@ +@@ -15648,7 +15648,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -22382,7 +22230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -15133,7 +15133,7 @@ +@@ -15667,7 +15667,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -22391,7 +22239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -15158,7 +15158,7 @@ +@@ -15692,7 +15692,7 @@ }, { 'name': 'DictationEnabled', @@ -22400,7 +22248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15183,7 +15183,7 @@ +@@ -15717,7 +15717,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -22409,7 +22257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15210,7 +15210,7 @@ +@@ -15744,7 +15744,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -22418,7 +22266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15237,7 +15237,7 @@ +@@ -15771,7 +15771,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -22427,7 +22275,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15264,7 +15264,7 @@ +@@ -15798,7 +15798,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -22436,7 +22284,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15291,7 +15291,7 @@ +@@ -15825,7 +15825,7 @@ }, { 'name': 'AutoclickEnabled', @@ -22445,7 +22293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15318,7 +15318,7 @@ +@@ -15852,7 +15852,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -22454,7 +22302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -15337,7 +15337,7 @@ +@@ -15871,7 +15871,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -22463,7 +22311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15376,7 +15376,7 @@ +@@ -15910,7 +15910,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -22472,7 +22320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15398,7 +15398,7 @@ +@@ -15932,7 +15932,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -22481,7 +22329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15423,7 +15423,7 @@ +@@ -15957,7 +15957,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', @@ -22490,7 +22338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15445,7 +15445,7 @@ +@@ -15979,7 +15979,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -22499,7 +22347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15470,7 +15470,7 @@ +@@ -16004,7 +16004,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -22508,7 +22356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15492,7 +15492,7 @@ +@@ -16026,7 +16026,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -22517,7 +22365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15517,7 +15517,7 @@ +@@ -16051,7 +16051,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -22526,7 +22374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -15542,7 +15542,7 @@ +@@ -16076,7 +16076,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -22535,7 +22383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15567,7 +15567,7 @@ +@@ -16101,7 +16101,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -22544,7 +22392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15592,7 +15592,7 @@ +@@ -16126,7 +16126,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -22553,7 +22401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15617,7 +15617,7 @@ +@@ -16151,7 +16151,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -22562,7 +22410,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-'], -@@ -15643,7 +15643,7 @@ +@@ -16178,7 +16178,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -22571,7 +22419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15687,7 +15687,7 @@ +@@ -16222,7 +16222,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -22580,7 +22428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15734,7 +15734,7 @@ +@@ -16269,7 +16269,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -22589,7 +22437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15759,7 +15759,7 @@ +@@ -16294,7 +16294,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -22598,7 +22446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15784,7 +15784,7 @@ +@@ -16319,7 +16319,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -22607,7 +22455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15809,7 +15809,7 @@ +@@ -16344,7 +16344,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -22616,7 +22464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15834,7 +15834,7 @@ +@@ -16369,7 +16369,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -22625,7 +22473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15861,7 +15861,7 @@ +@@ -16396,7 +16396,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -22634,7 +22482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15888,7 +15888,7 @@ +@@ -16423,7 +16423,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -22643,7 +22491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15913,7 +15913,7 @@ +@@ -16448,7 +16448,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -22652,7 +22500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15940,7 +15940,7 @@ +@@ -16475,7 +16475,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -22661,7 +22509,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-'], -@@ -15960,7 +15960,7 @@ +@@ -16496,7 +16496,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -22670,7 +22518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15982,7 +15982,7 @@ +@@ -16518,7 +16518,7 @@ }, { 'name': 'UptimeLimit', @@ -22679,7 +22527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -16003,7 +16003,7 @@ +@@ -16539,7 +16539,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -22688,7 +22536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -16027,7 +16027,7 @@ +@@ -16563,7 +16563,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -22697,7 +22545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -16048,7 +16048,7 @@ +@@ -16585,7 +16585,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -22706,7 +22554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -16069,7 +16069,7 @@ +@@ -16606,7 +16606,7 @@ }, { 'name': 'ChromeVariations', @@ -22715,7 +22563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16106,7 +16106,7 @@ +@@ -16644,7 +16644,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -22724,7 +22572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to the browser. -@@ -16116,7 +16116,7 @@ +@@ -16654,7 +16654,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -22733,7 +22581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16151,7 +16151,7 @@ +@@ -16689,7 +16689,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google ChromeOS device. @@ -22742,7 +22590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to $2Google ChromeOS. -@@ -16161,7 +16161,7 @@ +@@ -16699,7 +16699,7 @@ }, { 'name': 'AttestationEnabledForDevice', @@ -22751,7 +22599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -16180,7 +16180,7 @@ +@@ -16718,7 +16718,7 @@ }, { 'name': 'AttestationEnabledForUser', @@ -22760,7 +22608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -16198,7 +16198,7 @@ +@@ -16736,7 +16736,7 @@ }, { 'name': 'AttestationExtensionAllowlist', @@ -22769,7 +22617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16219,7 +16219,7 @@ +@@ -16757,7 +16757,7 @@ }, { 'name': 'AttestationExtensionWhitelist', @@ -22778,7 +22626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16243,7 +16243,7 @@ +@@ -16781,7 +16781,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', @@ -22787,7 +22635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -16262,7 +16262,7 @@ +@@ -16800,7 +16800,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -22796,7 +22644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Suppress the $3Google Chrome Frame turndown prompt''', 'tags': [], 'desc': '''Suppresses the turndown prompt that appears when a site is rendered by $3Google Chrome Frame.''', -@@ -16278,7 +16278,7 @@ +@@ -16816,7 +16816,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -22805,7 +22653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -16301,7 +16301,7 @@ +@@ -16839,7 +16839,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -22814,7 +22662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -16324,7 +16324,7 @@ +@@ -16863,7 +16863,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', @@ -22823,7 +22671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -16343,7 +16343,7 @@ +@@ -16882,7 +16882,7 @@ }, { 'name': 'ManagedBookmarks', @@ -22832,7 +22680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -16376,20 +16376,20 @@ +@@ -16916,20 +16916,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -22857,7 +22705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -16397,13 +16397,13 @@ +@@ -16937,13 +16937,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -22873,7 +22721,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'deprecated': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -16422,7 +16422,7 @@ +@@ -16962,7 +16962,7 @@ }, { 'name': 'UserAvatarImage', @@ -22882,7 +22730,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16459,7 +16459,7 @@ +@@ -16999,7 +16999,7 @@ }, { 'name': 'WallpaperImage', @@ -22891,7 +22739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16494,7 +16494,7 @@ +@@ -17034,7 +17034,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -22900,7 +22748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -16533,7 +16533,7 @@ +@@ -17073,7 +17073,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -22909,7 +22757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16559,7 +16559,7 @@ +@@ -17099,7 +17099,7 @@ }, { 'name': 'DeviceAutofillSAMLUsername', @@ -22918,7 +22766,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -16584,7 +16584,7 @@ +@@ -17124,7 +17124,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -22927,7 +22775,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16605,7 +16605,7 @@ +@@ -17145,7 +17145,7 @@ }, { 'name': 'SessionLocales', @@ -22936,7 +22784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16633,7 +16633,7 @@ +@@ -17173,7 +17173,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -22945,7 +22793,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-'], -@@ -16653,7 +16653,7 @@ +@@ -17194,7 +17194,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -22954,7 +22802,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -16671,7 +16671,7 @@ +@@ -17213,7 +17213,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -22963,7 +22811,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-'], -@@ -16691,7 +16691,7 @@ +@@ -17234,7 +17234,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -22972,7 +22820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -16713,7 +16713,7 @@ +@@ -17256,7 +17256,7 @@ }, { 'name': 'BrowserSignin', @@ -22981,7 +22829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16752,13 +16752,13 @@ +@@ -17296,13 +17296,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 iOS, 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 $1Google Chrome 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 $1Google Chrome Sync, use the SyncDisabled policy. @@ -22997,7 +22845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16818,7 +16818,7 @@ +@@ -17363,7 +17363,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -23006,7 +22854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16863,7 +16863,7 @@ +@@ -17408,7 +17408,7 @@ }, { 'name': 'SSLVersionMax', @@ -23015,7 +22863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16941,7 +16941,7 @@ +@@ -17487,7 +17487,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -23024,7 +22872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16964,11 +16964,11 @@ +@@ -17511,11 +17511,11 @@ Leaving the policy unset means that if certificates requiring disclosure through Certificate Transparency aren't disclosed, then $1Google Chrome doesn't trust those certificates. @@ -23038,7 +22886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17001,7 +17001,7 @@ +@@ -17549,7 +17549,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -23047,7 +22895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17028,7 +17028,7 @@ +@@ -17577,7 +17577,7 @@ }, { 'name': 'RC4Enabled', @@ -23056,7 +22904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -17053,7 +17053,7 @@ +@@ -17602,7 +17602,7 @@ }, { 'name': 'DHEEnabled', @@ -23065,7 +22913,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -17080,7 +17080,7 @@ +@@ -17629,7 +17629,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -23074,7 +22922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -17111,7 +17111,7 @@ +@@ -17660,7 +17660,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -23083,7 +22931,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -17129,7 +17129,7 @@ +@@ -17678,7 +17678,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -23092,7 +22940,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -17148,7 +17148,7 @@ +@@ -17697,7 +17697,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -23101,7 +22949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -17166,7 +17166,7 @@ +@@ -17715,7 +17715,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -23110,7 +22958,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -17184,7 +17184,7 @@ +@@ -17733,7 +17733,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -23119,7 +22967,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-'], -@@ -17202,7 +17202,7 @@ +@@ -17752,7 +17752,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -23128,7 +22976,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17223,11 +17223,11 @@ +@@ -17774,11 +17774,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. @@ -23142,7 +22990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17238,7 +17238,7 @@ +@@ -17789,7 +17789,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -23151,7 +22999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 865, 'caption': '''Allow origins to query for device attributes''', 'tags': [], -@@ -17248,7 +17248,7 @@ +@@ -17799,7 +17799,7 @@ }, { 'name': 'QuicAllowed', @@ -23160,7 +23008,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-'], -@@ -17266,7 +17266,7 @@ +@@ -17818,7 +17818,7 @@ }, { 'name': 'KeyPermissions', @@ -23169,7 +23017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17309,7 +17309,7 @@ +@@ -17861,7 +17861,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -23178,7 +23026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -17328,7 +17328,7 @@ +@@ -17880,7 +17880,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -23187,7 +23035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -17346,7 +17346,7 @@ +@@ -17899,7 +17899,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -23196,7 +23044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -17365,7 +17365,7 @@ +@@ -17918,7 +17918,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -23205,7 +23053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17410,7 +17410,7 @@ +@@ -17963,7 +17963,7 @@ }, { 'name': 'ArcEnabled', @@ -23214,7 +23062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -17428,7 +17428,7 @@ +@@ -17981,7 +17981,7 @@ }, { 'name': 'ArcPolicy', @@ -23223,7 +23071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -17488,7 +17488,7 @@ +@@ -18041,7 +18041,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -23232,7 +23080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17510,7 +17510,7 @@ +@@ -18063,7 +18063,7 @@ }, { 'name': 'NewWindowsInKioskAllowed', @@ -23241,7 +23089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -17540,7 +17540,7 @@ +@@ -18093,7 +18093,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -23250,7 +23098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17576,7 +17576,7 @@ +@@ -18129,7 +18129,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -23259,7 +23107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -17617,7 +17617,7 @@ +@@ -18170,7 +18170,7 @@ }, { 'name': 'UsbDetachableAllowlist', @@ -23268,7 +23116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -17654,7 +17654,7 @@ +@@ -18207,7 +18207,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -23277,7 +23125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -17674,7 +17674,7 @@ +@@ -18227,7 +18227,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -23286,7 +23134,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 $1Google Chrome is running on an unsupported computer or operating system. -@@ -17692,7 +17692,7 @@ +@@ -18246,7 +18246,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -23295,7 +23143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17726,7 +17726,7 @@ +@@ -18280,7 +18280,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -23304,7 +23152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17780,7 +17780,7 @@ +@@ -18334,7 +18334,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -23313,7 +23161,7 @@ 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. -@@ -17798,7 +17798,7 @@ +@@ -18353,7 +18353,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -23322,7 +23170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -17836,7 +17836,7 @@ +@@ -18391,7 +18391,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -23331,7 +23179,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.''', -@@ -17871,7 +17871,7 @@ +@@ -18426,7 +18426,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -23340,7 +23188,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. -@@ -17890,7 +17890,7 @@ +@@ -18445,7 +18445,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -23349,7 +23197,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 $2Google ChromeOS turns off Wi-Fi, and users can't change it. -@@ -17909,7 +17909,7 @@ +@@ -18464,7 +18464,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -23358,7 +23206,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. -@@ -17954,7 +17954,7 @@ +@@ -18509,7 +18509,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -23367,7 +23215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17978,7 +17978,7 @@ +@@ -18533,7 +18533,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -23376,7 +23224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17989,7 +17989,7 @@ +@@ -18544,7 +18544,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -23385,7 +23233,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'], -@@ -18002,13 +18002,13 @@ +@@ -18557,13 +18557,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -23402,7 +23250,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. -@@ -18026,7 +18026,7 @@ +@@ -18581,7 +18581,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -23411,7 +23259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18059,7 +18059,7 @@ +@@ -18614,7 +18614,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -23420,7 +23268,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-'], -@@ -18068,7 +18068,7 @@ +@@ -18624,7 +18624,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -23429,7 +23277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 331, 'caption': '''Define domains allowed to access Google Workspace''', 'tags': ['filtering'], -@@ -18078,11 +18078,11 @@ +@@ -18634,11 +18634,11 @@ Users cannot change or override this setting. @@ -23443,7 +23291,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' ], -@@ -18175,7 +18175,7 @@ +@@ -18734,7 +18734,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -23452,7 +23300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -18193,7 +18193,7 @@ +@@ -18752,7 +18752,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -23461,7 +23309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -18211,7 +18211,7 @@ +@@ -18770,7 +18770,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -23470,7 +23318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-','ios:93-'], -@@ -18242,7 +18242,7 @@ +@@ -18801,7 +18801,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -23479,7 +23327,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-'], -@@ -18273,7 +18273,7 @@ +@@ -18833,7 +18833,7 @@ }, { 'name': 'NTPCardsVisible', @@ -23488,7 +23336,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-'], -@@ -18312,7 +18312,7 @@ +@@ -18873,7 +18873,7 @@ }, { 'name': 'NTPMiddleSlotAnnouncementVisible', @@ -23497,7 +23345,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-'], -@@ -18345,7 +18345,7 @@ +@@ -18907,7 +18907,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -23506,7 +23354,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-'], -@@ -18363,7 +18363,7 @@ +@@ -18926,7 +18926,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -23515,7 +23363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18385,7 +18385,7 @@ +@@ -18949,7 +18949,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -23524,7 +23372,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-'], -@@ -18404,7 +18404,7 @@ +@@ -18969,7 +18969,7 @@ }, { 'name': 'NativePrinters', @@ -23533,7 +23381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18428,7 +18428,7 @@ +@@ -18993,7 +18993,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -23542,7 +23390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -18484,7 +18484,7 @@ +@@ -19049,7 +19049,7 @@ }, { 'name': 'Printers', @@ -23551,7 +23399,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18508,7 +18508,7 @@ +@@ -19073,7 +19073,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -23560,7 +23408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -18561,7 +18561,7 @@ +@@ -19126,7 +19126,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -23569,7 +23417,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -18594,7 +18594,7 @@ +@@ -19159,7 +19159,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -23578,7 +23426,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -18624,7 +18624,7 @@ +@@ -19189,7 +19189,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -23587,7 +23435,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-100'], 'type': 'int-enum', -@@ -18672,7 +18672,7 @@ +@@ -19237,7 +19237,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -23596,7 +23444,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -18717,7 +18717,7 @@ +@@ -19282,7 +19282,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -23605,7 +23453,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 384, 'type': 'list', -@@ -18739,7 +18739,7 @@ +@@ -19304,7 +19304,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -23614,7 +23462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -18758,7 +18758,7 @@ +@@ -19323,7 +19323,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -23623,7 +23471,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 385, 'type': 'list', -@@ -18780,7 +18780,7 @@ +@@ -19345,7 +19345,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -23632,7 +23480,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -18799,7 +18799,7 @@ +@@ -19364,7 +19364,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -23641,7 +23489,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -18837,7 +18837,7 @@ +@@ -19402,7 +19402,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -23650,7 +23498,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-100'], -@@ -18885,7 +18885,7 @@ +@@ -19450,7 +19450,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -23659,7 +23507,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 388, -@@ -18907,7 +18907,7 @@ +@@ -19472,7 +19472,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -23668,7 +23516,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 389, -@@ -18930,7 +18930,7 @@ +@@ -19495,7 +19495,7 @@ }, { 'name': 'DevicePrinters', @@ -23677,7 +23525,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -18965,7 +18965,7 @@ +@@ -19530,7 +19530,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -23686,7 +23534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -19010,7 +19010,7 @@ +@@ -19575,7 +19575,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -23695,7 +23543,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -19029,7 +19029,7 @@ +@@ -19594,7 +19594,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -23704,7 +23552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -19049,7 +19049,7 @@ +@@ -19614,7 +19614,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -23713,7 +23561,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -19102,7 +19102,7 @@ +@@ -19667,7 +19667,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -23722,7 +23570,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -19128,7 +19128,7 @@ +@@ -19693,7 +19693,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -23731,7 +23579,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -19212,7 +19212,7 @@ +@@ -19777,7 +19777,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -23740,7 +23588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -19236,7 +19236,7 @@ +@@ -19801,7 +19801,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', @@ -23749,7 +23597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -19291,7 +19291,7 @@ +@@ -19856,7 +19856,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', @@ -23758,7 +23606,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -19349,7 +19349,7 @@ +@@ -19914,7 +19914,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -23767,7 +23615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19392,7 +19392,7 @@ +@@ -19957,7 +19957,7 @@ }, { 'name': 'WebAuthnFactors', @@ -23776,7 +23624,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -19446,7 +19446,7 @@ +@@ -20011,7 +20011,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -23785,7 +23633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -19464,7 +19464,7 @@ +@@ -20029,7 +20029,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -23794,7 +23642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -19482,7 +19482,7 @@ +@@ -20047,7 +20047,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -23803,7 +23651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -19500,7 +19500,7 @@ +@@ -20065,7 +20065,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -23812,7 +23660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -19533,7 +19533,7 @@ +@@ -20098,7 +20098,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -23821,7 +23669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19554,7 +19554,7 @@ +@@ -20119,7 +20119,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -23830,7 +23678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19575,7 +19575,7 @@ +@@ -20140,7 +20140,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -23839,7 +23687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -19598,7 +19598,7 @@ +@@ -20163,7 +20163,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -23848,7 +23696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19619,7 +19619,7 @@ +@@ -20184,7 +20184,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -23857,7 +23705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19642,7 +19642,7 @@ +@@ -20207,7 +20207,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -23866,7 +23714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -19663,7 +19663,7 @@ +@@ -20228,7 +20228,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -23875,7 +23723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -19684,7 +19684,7 @@ +@@ -20249,7 +20249,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -23884,7 +23732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19705,7 +19705,7 @@ +@@ -20270,7 +20270,7 @@ }, { 'name': 'PhoneHubCameraRollAllowed', @@ -23893,7 +23741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19736,7 +19736,7 @@ +@@ -20301,7 +20301,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -23902,7 +23750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19756,7 +19756,7 @@ +@@ -20321,7 +20321,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -23911,7 +23759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19776,7 +19776,7 @@ +@@ -20341,7 +20341,7 @@ }, { 'name': 'EcheAllowed', @@ -23920,7 +23768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -19807,7 +19807,7 @@ +@@ -20372,7 +20372,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -23929,7 +23777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -19828,7 +19828,7 @@ +@@ -20393,7 +20393,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -23938,7 +23786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -19859,7 +19859,7 @@ +@@ -20424,7 +20424,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -23947,7 +23795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -19888,7 +19888,7 @@ +@@ -20454,7 +20454,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -23956,7 +23804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19931,7 +19931,7 @@ +@@ -20497,7 +20497,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -23965,7 +23813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -19963,7 +19963,7 @@ +@@ -20530,7 +20530,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -23974,7 +23822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20009,7 +20009,7 @@ +@@ -20576,7 +20576,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -23983,7 +23831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20065,7 +20065,7 @@ +@@ -20632,7 +20632,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -23992,7 +23840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -20102,7 +20102,7 @@ +@@ -20669,7 +20669,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -24001,7 +23849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20132,7 +20132,7 @@ +@@ -20699,7 +20699,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -24010,7 +23858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20159,7 +20159,7 @@ +@@ -20726,7 +20726,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -24019,7 +23867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -20179,7 +20179,7 @@ +@@ -20746,7 +20746,7 @@ }, { 'name': 'CastReceiverName', @@ -24028,7 +23876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -20199,7 +20199,7 @@ +@@ -20766,7 +20766,7 @@ }, { 'name': 'DeviceOffHours', @@ -24037,7 +23885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20282,7 +20282,7 @@ +@@ -20849,7 +20849,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -24046,7 +23894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -20309,7 +20309,7 @@ +@@ -20877,7 +20877,7 @@ }, { 'name': 'CloudUserPolicyOverridesCloudMachinePolicy', @@ -24055,7 +23903,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-'], -@@ -20343,7 +20343,7 @@ +@@ -20912,7 +20912,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -24064,7 +23912,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-'], -@@ -20361,7 +20361,7 @@ +@@ -20931,7 +20931,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -24073,7 +23921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -20379,7 +20379,7 @@ +@@ -20949,7 +20949,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -24082,7 +23930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20431,7 +20431,7 @@ +@@ -21001,7 +21001,7 @@ }, { 'name': 'IsolateOrigins', @@ -24091,7 +23939,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-'], -@@ -20458,7 +20458,7 @@ +@@ -21029,7 +21029,7 @@ }, { 'name': 'SitePerProcess', @@ -24100,7 +23948,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-'], -@@ -20481,7 +20481,7 @@ +@@ -21053,7 +21053,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -24109,7 +23957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -20504,7 +20504,7 @@ +@@ -21076,7 +21076,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -24118,7 +23966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -20525,7 +20525,7 @@ +@@ -21097,7 +21097,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -24127,7 +23975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -20552,7 +20552,7 @@ +@@ -21124,7 +21124,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -24136,7 +23984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -20577,7 +20577,7 @@ +@@ -21149,7 +21149,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -24145,7 +23993,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-'], -@@ -20602,7 +20602,7 @@ +@@ -21175,7 +21175,7 @@ 'caption': '''Specifies whether SharedArrayBuffers can be used in a non cross-origin-isolated context''', 'tags': ['system-security'], 'desc': ''' @@ -24154,7 +24002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When set to Enabled, sites can use SharedArrayBuffer with no restrictions. -@@ -20610,7 +20610,7 @@ +@@ -21183,7 +21183,7 @@ }, { 'name': 'SandboxExternalProtocolBlocked', @@ -24163,7 +24011,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-'], -@@ -20635,7 +20635,7 @@ +@@ -21209,7 +21209,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 @@ -24172,7 +24020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When True, this lets Chrome blocks those navigations. -@@ -20648,7 +20648,7 @@ +@@ -21222,7 +21222,7 @@ }, { 'name': 'CrossOriginWebAssemblyModuleSharingEnabled', @@ -24181,7 +24029,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'], -@@ -20682,7 +20682,7 @@ +@@ -21256,7 +21256,7 @@ }, { 'name': 'DisplayCapturePermissionsPolicyEnabled', @@ -24190,7 +24038,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-'], -@@ -20719,7 +20719,7 @@ +@@ -21294,7 +21294,7 @@ }, { 'name': 'WebDriverOverridesIncompatiblePolicies', @@ -24199,7 +24047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -20747,7 +20747,7 @@ +@@ -21322,7 +21322,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -24208,7 +24056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20780,7 +20780,7 @@ +@@ -21356,7 +21356,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -24217,7 +24065,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-'], -@@ -20800,11 +20800,11 @@ +@@ -21377,11 +21377,11 @@ This policy has no effect if the policy DownloadDirectory is set. @@ -24231,7 +24079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -20823,7 +20823,7 @@ +@@ -21400,7 +21400,7 @@ }, { 'name': 'DeviceHostnameUserConfigurable', @@ -24240,7 +24088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -20856,7 +20856,7 @@ +@@ -21433,7 +21433,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -24249,7 +24097,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-'], -@@ -20885,7 +20885,7 @@ +@@ -21463,7 +21463,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -24258,7 +24106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20916,7 +20916,7 @@ +@@ -21494,7 +21494,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -24267,7 +24115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20950,7 +20950,7 @@ +@@ -21528,7 +21528,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -24276,7 +24124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20981,7 +20981,7 @@ +@@ -21559,7 +21559,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -24285,7 +24133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -20999,7 +20999,7 @@ +@@ -21577,7 +21577,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -24294,7 +24142,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-'], -@@ -21035,7 +21035,7 @@ +@@ -21614,7 +21614,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -24303,7 +24151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21069,7 +21069,7 @@ +@@ -21649,7 +21649,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -24312,7 +24160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21080,7 +21080,7 @@ +@@ -21660,7 +21660,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -24321,7 +24169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 410, 'caption': '''Restrict accounts that are visible in $1Google Chrome''', 'tags': [], -@@ -21094,7 +21094,7 @@ +@@ -21674,7 +21674,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -24330,7 +24178,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21143,7 +21143,7 @@ +@@ -21724,7 +21724,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -24339,7 +24187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21178,7 +21178,7 @@ +@@ -21760,7 +21760,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -24348,7 +24196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21199,7 +21199,7 @@ +@@ -21782,7 +21782,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -24357,7 +24205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21220,7 +21220,7 @@ +@@ -21803,7 +21803,7 @@ { 'id': 854, 'name': 'RelaunchWindow', @@ -24366,7 +24214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21290,7 +21290,7 @@ +@@ -21874,7 +21874,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -24375,7 +24223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -21309,7 +21309,7 @@ +@@ -21893,7 +21893,7 @@ }, { 'name': 'CrostiniAllowed', @@ -24384,7 +24232,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -21325,7 +21325,7 @@ +@@ -21909,7 +21909,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -24393,7 +24241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -21341,7 +21341,7 @@ +@@ -21925,7 +21925,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -24402,7 +24250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21357,7 +21357,7 @@ +@@ -21941,7 +21941,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -24411,7 +24259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -21376,7 +21376,7 @@ +@@ -21960,7 +21960,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -24420,7 +24268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21416,7 +21416,7 @@ +@@ -22000,7 +22000,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -24429,7 +24277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21454,7 +21454,7 @@ +@@ -22038,7 +22038,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -24438,7 +24286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -21495,7 +21495,7 @@ +@@ -22079,7 +22079,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -24447,7 +24295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21515,7 +21515,7 @@ +@@ -22099,7 +22099,7 @@ }, { 'name': 'SystemTerminalSshAllowed', @@ -24456,7 +24304,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -21545,7 +21545,7 @@ +@@ -22129,7 +22129,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -24465,7 +24313,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21571,7 +21571,7 @@ +@@ -22155,7 +22155,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -24474,7 +24322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21596,7 +21596,7 @@ +@@ -22181,7 +22181,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -24483,7 +24331,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21611,15 +21611,15 @@ +@@ -22197,15 +22197,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -24502,7 +24350,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-'], -@@ -21631,15 +21631,15 @@ +@@ -22218,15 +22218,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -24521,7 +24369,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-'], -@@ -21657,12 +21657,12 @@ +@@ -22245,12 +22245,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -24536,7 +24384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -21682,7 +21682,7 @@ +@@ -22270,7 +22270,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -24545,7 +24393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -21701,11 +21701,11 @@ +@@ -22290,11 +22290,11 @@ 'tags': [], 'desc': '''Setting the policy means $1Google Chrome tries to register itself with Chrome Browser Cloud Management. The value of this policy is an enrollment token you can retrieve from the Google Admin console. @@ -24559,7 +24407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -21722,11 +21722,11 @@ +@@ -22312,11 +22312,11 @@ Setting the policy to Disabled or leaving it unset renders Chrome Browser Cloud Management optional and doesn't block $1Google Chrome launch process if failed. @@ -24573,7 +24421,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-'], -@@ -21746,7 +21746,7 @@ +@@ -22337,7 +22337,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -24582,7 +24430,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21766,11 +21766,11 @@ +@@ -22357,11 +22357,11 @@ Setting the policy lets videos play automatically (without user consent) with audio content in $1Google Chrome. If AutoplayAllowed policy is set to True, then this policy has no effect. If AutoplayAllowed is set to False, then any URL patterns set in this policy can still play. If this policy changes while $1Google Chrome is running, it only applies to newly opened tabs. @@ -24596,7 +24444,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21787,11 +21787,11 @@ +@@ -22379,11 +22379,11 @@ 'tags': [], 'desc': '''Setting the policy lets videos play automatically (without user consent) with audio content in $1Google Chrome. If AutoplayAllowed policy is set to True, then this policy has no effect. If AutoplayAllowed is set to False, then any URL patterns set in this policy can still play. If this policy changes while $1Google Chrome is running, it only applies to newly opened tabs. @@ -24610,7 +24458,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'], -@@ -21806,13 +21806,13 @@ +@@ -22398,13 +22398,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -24626,7 +24474,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-100'], -@@ -21836,7 +21836,7 @@ +@@ -22428,7 +22428,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -24635,16 +24483,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -21857,7 +21857,7 @@ - }, - { - 'name': 'DeviceSamlLoginAuthenticationType', -- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], - 'type': 'int-enum', - 'schema': { - 'type': 'integer', -@@ -21894,7 +21894,7 @@ +@@ -22449,7 +22449,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -24653,7 +24492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21914,7 +21914,7 @@ +@@ -22469,7 +22469,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -24662,7 +24501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21936,7 +21936,7 @@ +@@ -22491,7 +22491,7 @@ }, { 'name': 'AllowedLanguages', @@ -24671,7 +24510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21960,7 +21960,7 @@ +@@ -22515,7 +22515,7 @@ }, { 'name': 'AllowedInputMethods', @@ -24680,7 +24519,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21986,7 +21986,7 @@ +@@ -22541,7 +22541,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -24689,7 +24528,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -22003,7 +22003,7 @@ +@@ -22558,7 +22558,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', @@ -24697,8 +24536,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['swapnilgupta@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:85-'], -@@ -22021,7 +22021,7 @@ + 'supported_on': ['chrome_os:85-106'], +@@ -22576,7 +22576,7 @@ }, { 'name': 'UsageTimeLimit', @@ -24707,7 +24546,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22174,7 +22174,7 @@ +@@ -22729,7 +22729,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -24716,7 +24555,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22216,7 +22216,7 @@ +@@ -22771,7 +22771,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -24725,7 +24564,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22258,7 +22258,7 @@ +@@ -22813,7 +22813,7 @@ }, { 'name': 'EnableSyncConsent', @@ -24734,7 +24573,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -22276,7 +22276,7 @@ +@@ -22831,7 +22831,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -24743,7 +24582,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -22297,7 +22297,7 @@ +@@ -22852,7 +22852,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -24752,7 +24591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22384,7 +22384,7 @@ +@@ -22939,7 +22939,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -24761,7 +24600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -22403,7 +22403,7 @@ +@@ -22959,7 +22959,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -24770,7 +24609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22441,7 +22441,7 @@ +@@ -22998,7 +22998,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -24779,7 +24618,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22465,7 +22465,7 @@ +@@ -23023,7 +23023,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -24788,7 +24627,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22510,7 +22510,7 @@ +@@ -23068,7 +23068,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -24797,7 +24636,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'], -@@ -22525,7 +22525,7 @@ +@@ -23083,7 +23083,7 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -24806,7 +24645,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.''', }, -@@ -22552,7 +22552,7 @@ +@@ -23111,7 +23111,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -24815,7 +24654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22567,7 +22567,7 @@ +@@ -23126,7 +23126,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -24824,7 +24663,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-'], -@@ -22587,7 +22587,7 @@ +@@ -23147,7 +23147,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -24833,7 +24672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -22605,7 +22605,7 @@ +@@ -23165,7 +23165,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -24842,7 +24681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22630,7 +22630,7 @@ +@@ -23191,7 +23191,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -24851,7 +24690,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22648,7 +22648,7 @@ +@@ -23209,7 +23209,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -24860,7 +24699,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22668,12 +22668,12 @@ +@@ -23230,12 +23230,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -24876,7 +24715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -22686,7 +22686,7 @@ +@@ -23248,7 +23248,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -24885,9 +24724,9 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22723,18 +22723,18 @@ +@@ -23285,18 +23285,18 @@ + 'per_profile': True, }, - 'max_size': 1048576, 'example_value': [{ - 'url': 'https://www.google.com/maps', + 'url': 'https://www.9oo91e.qjz9zk/maps', @@ -24908,7 +24747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'custom_name': 'Spreadsheets' }, { -@@ -22790,7 +22790,7 @@ +@@ -23352,7 +23352,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -24917,7 +24756,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22815,7 +22815,7 @@ +@@ -23377,7 +23377,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -24926,7 +24765,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22840,7 +22840,7 @@ +@@ -23402,7 +23402,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -24935,7 +24774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22864,7 +22864,7 @@ +@@ -23426,7 +23426,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -24944,7 +24783,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22889,7 +22889,7 @@ +@@ -23451,7 +23451,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -24953,7 +24792,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22914,7 +22914,7 @@ +@@ -23476,7 +23476,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -24962,7 +24801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22940,7 +22940,7 @@ +@@ -23502,7 +23502,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -24971,7 +24810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22966,7 +22966,7 @@ +@@ -23529,7 +23529,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -24980,7 +24819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -23005,7 +23005,7 @@ +@@ -23569,7 +23569,7 @@ { 'id': 942, 'name': 'CloudProfileReportingEnabled', @@ -24989,7 +24828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'tags': ['admin-sharing', 'google-sharing'], -@@ -23042,7 +23042,7 @@ +@@ -23606,7 +23606,7 @@ { 'id': 962, 'name': 'CloudReportingUploadFrequency', @@ -24998,7 +24837,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-'], -@@ -23067,7 +23067,7 @@ +@@ -23632,7 +23632,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -25007,7 +24846,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-'], -@@ -23087,7 +23087,7 @@ +@@ -23653,7 +23653,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -25016,7 +24855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -23106,7 +23106,7 @@ +@@ -23672,7 +23672,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -25025,7 +24864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -23124,7 +23124,7 @@ +@@ -23690,7 +23690,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -25034,7 +24873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -23169,7 +23169,7 @@ +@@ -23735,7 +23735,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -25043,7 +24882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23209,7 +23209,7 @@ +@@ -23775,7 +23775,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -25052,7 +24891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -23227,7 +23227,7 @@ +@@ -23794,7 +23794,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -25061,7 +24900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23258,7 +23258,7 @@ +@@ -23826,7 +23826,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -25070,7 +24909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -23278,7 +23278,7 @@ +@@ -23846,7 +23846,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -25079,7 +24918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23305,7 +23305,7 @@ +@@ -23873,7 +23873,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -25088,7 +24927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23332,7 +23332,7 @@ +@@ -23901,7 +23901,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -25097,7 +24936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23359,7 +23359,7 @@ +@@ -23929,7 +23929,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -25106,7 +24945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23376,12 +23376,12 @@ +@@ -23946,12 +23946,12 @@ When this policy is false or unset, $1Google Chrome does not use Internet Explorer®'s SiteList policy as a source of rules for switching browsers. @@ -25121,7 +24960,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', -@@ -23396,12 +23396,12 @@ +@@ -23967,12 +23967,12 @@ Leaving it unset (or set to a invalid URL) means $1Google Chrome doesn't use the policy as a source of rules for switching browsers. @@ -25136,7 +24975,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', -@@ -23416,12 +23416,12 @@ +@@ -23988,12 +23988,12 @@ Leaving it unset (or set to a invalid URL) means $1Google Chrome doesn't use the policy as a source of rules for not switching browsers. @@ -25151,7 +24990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -23439,7 +23439,7 @@ +@@ -24012,7 +24012,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -25160,7 +24999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23457,7 +23457,7 @@ +@@ -24031,7 +24031,7 @@ { 'id': 866, 'name': 'BrowserSwitcherParsingMode', @@ -25169,7 +25008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23500,7 +23500,7 @@ +@@ -24075,7 +24075,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -25178,7 +25017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -23517,7 +23517,7 @@ +@@ -24093,7 +24093,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -25187,7 +25026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23558,7 +23558,7 @@ +@@ -24134,7 +24134,7 @@ }, { 'name': 'PluginVmAllowed', @@ -25196,7 +25035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -23576,7 +23576,7 @@ +@@ -24152,7 +24152,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -25205,7 +25044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -23596,7 +23596,7 @@ +@@ -24172,7 +24172,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -25214,7 +25053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23618,7 +23618,7 @@ +@@ -24194,7 +24194,7 @@ }, { 'name': 'PluginVmUserId', @@ -25223,7 +25062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23637,7 +23637,7 @@ +@@ -24213,7 +24213,7 @@ }, { 'name': 'PluginVmImage', @@ -25232,7 +25071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23668,7 +23668,7 @@ +@@ -24244,7 +24244,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -25241,7 +25080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23687,7 +23687,7 @@ +@@ -24263,7 +24263,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -25250,7 +25089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23710,7 +23710,7 @@ +@@ -24286,7 +24286,7 @@ }, { 'name': 'ParentAccessCodeConfig', @@ -25259,7 +25098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -23788,7 +23788,7 @@ +@@ -24364,7 +24364,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -25268,7 +25107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23828,7 +23828,7 @@ +@@ -24404,7 +24404,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -25277,7 +25116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23875,7 +23875,7 @@ +@@ -24451,7 +24451,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -25286,7 +25125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -23892,7 +23892,7 @@ +@@ -24468,7 +24468,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -25295,7 +25134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -23932,7 +23932,7 @@ +@@ -24508,7 +24508,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -25304,7 +25143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23950,7 +23950,7 @@ +@@ -24526,7 +24526,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -25313,7 +25152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23968,7 +23968,7 @@ +@@ -24544,7 +24544,7 @@ }, { 'name': 'AssistantVoiceMatchEnabledDuringOobe', @@ -25322,7 +25161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:93-'], -@@ -23997,7 +23997,7 @@ +@@ -24573,7 +24573,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -25331,7 +25170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -24020,7 +24020,7 @@ +@@ -24596,7 +24596,7 @@ }, { 'name': 'QuickAnswersEnabled', @@ -25340,7 +25179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -24051,7 +24051,7 @@ +@@ -24627,7 +24627,7 @@ }, { 'name': 'QuickAnswersDefinitionEnabled', @@ -25349,7 +25188,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -24081,7 +24081,7 @@ +@@ -24657,7 +24657,7 @@ }, { 'name': 'QuickAnswersTranslationEnabled', @@ -25358,7 +25197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -24111,7 +24111,7 @@ +@@ -24687,7 +24687,7 @@ }, { 'name': 'QuickAnswersUnitConversionEnabled', @@ -25367,7 +25206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -24141,7 +24141,7 @@ +@@ -24717,7 +24717,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -25376,7 +25215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -24160,7 +24160,7 @@ +@@ -24736,7 +24736,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -25385,7 +25224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -24180,11 +24180,11 @@ +@@ -24757,11 +24757,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -25399,7 +25238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24213,7 +24213,7 @@ +@@ -24790,7 +24790,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -25408,7 +25247,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24234,7 +24234,7 @@ +@@ -24811,7 +24811,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -25417,7 +25256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24257,7 +24257,7 @@ +@@ -24834,7 +24834,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -25426,7 +25265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -24336,7 +24336,7 @@ +@@ -24913,7 +24913,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -25435,7 +25274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24357,7 +24357,7 @@ +@@ -24934,7 +24934,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -25444,7 +25283,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24382,7 +24382,7 @@ +@@ -24959,7 +24959,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -25453,21 +25292,35 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:75-', 'chrome_os:75-'], -@@ -24411,7 +24411,7 @@ +@@ -24989,7 +24989,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', -- 'owners': ['rodmartin@google.com', 'rogerta@chromium.org', 'mad@chromium.org', 'seblalancette@chromium.org'], -+ 'owners': ['rodmartin@9oo91e.qjz9zk', 'rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk', 'seblalancette@ch40m1um.qjz9zk'], +- 'owners': ['rodmartin@google.com', 'rogerta@chromium.org', 'mad@chromium.org', 'seblalancette@chromium.org', 'cbe-device-trust-eng@google.com'], ++ 'owners': ['rodmartin@9oo91e.qjz9zk', 'rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk', 'seblalancette@ch40m1um.qjz9zk', 'cbe-device-trust-eng@9oo91e.qjz9zk'], 'supported_on': ['chrome.*:95-', 'chrome_os:95-'], + 'future_on': ['fuchsia'], 'type': 'list', - 'schema': { -@@ -24439,11 +24439,11 @@ +@@ -25018,11 +25018,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 URL patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''', -+ For detailed information on valid URL patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''', +- For detailed information on valid URL patterns, please see https: //cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''', ++ For detailed information on valid URL patterns, please see https: //cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''', + }, + { + 'name': 'DeviceLoginScreenContextAwareAccessSignalsAllowlist', +- 'owners': ['lmasopust@google.com', 'rodmartin@google.com', 'cbe-device-trust-eng@google.com'], ++ 'owners': ['lmasopust@9oo91e.qjz9zk', 'rodmartin@9oo91e.qjz9zk', 'cbe-device-trust-eng@9oo91e.qjz9zk'], + 'future_on': ['chrome_os'], + 'device_only': True, + 'type': 'list', +@@ -25050,11 +25050,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 ContextAwareAccessSignalsAllowlist policy. + +- For detailed information on valid URL patterns, please see https: //cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''', ++ For detailed information on valid URL patterns, please see https: //cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''', }, { 'name': 'DeviceQuickFixBuildToken', @@ -25476,7 +25329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -24466,7 +24466,7 @@ +@@ -25077,7 +25077,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -25485,7 +25338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -24500,7 +24500,7 @@ +@@ -25111,7 +25111,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -25494,7 +25347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -24518,7 +24518,7 @@ +@@ -25129,7 +25129,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -25503,7 +25356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24549,7 +24549,7 @@ +@@ -25161,7 +25161,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -25512,7 +25365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24575,7 +24575,7 @@ +@@ -25187,7 +25187,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -25521,7 +25374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24596,7 +24596,7 @@ +@@ -25208,7 +25208,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -25530,7 +25383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -24663,7 +24663,7 @@ +@@ -25275,7 +25275,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -25539,7 +25392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24714,7 +24714,7 @@ +@@ -25326,7 +25326,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -25548,7 +25401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24737,7 +24737,7 @@ +@@ -25349,7 +25349,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -25557,7 +25410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24760,7 +24760,7 @@ +@@ -25372,7 +25372,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -25566,7 +25419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24806,7 +24806,7 @@ +@@ -25418,7 +25418,7 @@ }, { 'name': 'DeviceScheduledReboot', @@ -25575,7 +25428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24860,7 +24860,7 @@ +@@ -25472,7 +25472,7 @@ }, { 'name': 'KerberosEnabled', @@ -25584,7 +25437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24881,7 +24881,7 @@ +@@ -25493,7 +25493,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', @@ -25593,7 +25446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24902,7 +24902,7 @@ +@@ -25514,7 +25514,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', @@ -25602,7 +25455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24923,7 +24923,7 @@ +@@ -25535,7 +25535,7 @@ }, { 'name': 'KerberosAccounts', @@ -25611,7 +25464,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25000,7 +25000,7 @@ +@@ -25612,7 +25612,7 @@ + }, + { + 'name': 'KerberosDomainAutocomplete', +- 'owners': ['slutskii@google.com', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['slutskii@9oo91e.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'future_on': ['chrome_os'], +@@ -25633,7 +25633,7 @@ + }, + { + 'name': 'KerberosDefaultConfiguration', +- 'owners': ['slutskii@google.com', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['slutskii@9oo91e.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'future_on': ['chrome_os'], +@@ -25654,7 +25654,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -25620,7 +25491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -25031,7 +25031,7 @@ +@@ -25686,7 +25686,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -25629,7 +25500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -25052,7 +25052,7 @@ +@@ -25707,7 +25707,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -25638,7 +25509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25072,7 +25072,7 @@ +@@ -25727,7 +25727,7 @@ }, { 'name': 'ExternalPrintServers', @@ -25647,7 +25518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -25117,7 +25117,7 @@ +@@ -25772,7 +25772,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -25656,7 +25527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -25166,7 +25166,7 @@ +@@ -25821,7 +25821,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -25665,7 +25536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -25186,7 +25186,7 @@ +@@ -25841,7 +25841,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -25674,7 +25545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25224,7 +25224,7 @@ +@@ -25879,7 +25879,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -25683,7 +25554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25244,7 +25244,7 @@ +@@ -25899,7 +25899,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -25692,7 +25563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25402,11 +25402,11 @@ +@@ -26059,11 +26059,11 @@ The custom_messages, message, learn_more_url, language and tag 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. @@ -25706,7 +25577,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25564,11 +25564,11 @@ +@@ -26223,11 +26223,11 @@ The custom_messages, message, learn_more_url, language and tag 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. @@ -25720,7 +25591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25722,11 +25722,11 @@ +@@ -26383,11 +26383,11 @@ The custom_messages, message, learn_more_url, language and tag 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. @@ -25734,7 +25605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25870,11 +25870,11 @@ +@@ -26533,11 +26533,11 @@ The custom_messages, message, learn_more_url, language and tag 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. @@ -25748,7 +25619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26061,11 +26061,11 @@ +@@ -26724,11 +26724,11 @@ The custom_messages, message, learn_more_url, language and tag 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. @@ -25762,7 +25633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26114,11 +26114,11 @@ +@@ -26778,11 +26778,11 @@ The service_provider field identifies which reporting service provider the settings correspond to and the enabled_event_names field identifies which events are enabled for this provider. @@ -25776,7 +25647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26156,11 +26156,11 @@ +@@ -26821,11 +26821,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. @@ -25790,7 +25661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -26176,11 +26176,11 @@ +@@ -26841,11 +26841,11 @@ Setting the policy to Disabled has a detrimental effect on $1Google Chrome's security and stability as unknown and potentially hostile code can load inside $1Google Chrome's renderer processes. Only turn off the policy if there are compatibility issues with third-party software that must run inside $1Google Chrome's renderer processes. @@ -25804,7 +25675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:104-'], -@@ -26207,11 +26207,11 @@ +@@ -26872,11 +26872,11 @@ Setting the policy to Disabled has a detrimental effect on the security and stability of $1Google Chrome 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. @@ -25818,7 +25689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -26238,11 +26238,11 @@ +@@ -26903,11 +26903,11 @@ Setting the policy to Disabled has a detrimental effect on $1Google Chrome's security and stability as unknown and potentially hostile code can load inside $1Google Chrome's browser process. Only turn off the policy if there are compatibility issues with third-party software that must run inside $1Google Chrome's browser process. @@ -25832,7 +25703,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26268,7 +26268,7 @@ +@@ -26934,7 +26934,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -25841,7 +25712,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -26290,11 +26290,11 @@ +@@ -26957,11 +26957,11 @@ This policy was removed in Chrome 99. @@ -25855,7 +25726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -26320,7 +26320,7 @@ +@@ -26987,7 +26987,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -25864,7 +25735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -26345,7 +26345,7 @@ +@@ -27012,7 +27012,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -25873,7 +25744,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-'], -@@ -26366,7 +26366,7 @@ +@@ -27033,7 +27033,7 @@ }, { 'name': 'CorsMitigationList', @@ -25882,7 +25753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26384,19 +26384,19 @@ +@@ -27051,19 +27051,19 @@ 'tags': [], 'desc': '''Enable CORS check mitigations in the new CORS implementation, allowing Extensions to keep compatible behavior, and allowing $1Google Chrome to send specified headers without CORS checks. @@ -25905,7 +25776,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'], -@@ -26417,13 +26417,13 @@ +@@ -27084,13 +27084,13 @@ This policy will be removed after a couple of milestones. @@ -25921,7 +25792,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-100'], 'id': 631, 'features': { -@@ -26451,7 +26451,7 @@ +@@ -27118,7 +27118,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -25930,7 +25801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -26476,7 +26476,7 @@ +@@ -27143,7 +27143,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -25939,7 +25810,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, -@@ -26503,7 +26503,7 @@ +@@ -27170,7 +27170,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -25948,7 +25819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -26536,7 +26536,7 @@ +@@ -27204,7 +27204,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -25957,7 +25828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26571,7 +26571,7 @@ +@@ -27240,7 +27240,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -25966,7 +25837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26590,11 +26590,11 @@ +@@ -27260,11 +27260,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. @@ -25980,7 +25851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26613,11 +26613,11 @@ +@@ -27284,11 +27284,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. @@ -25994,7 +25865,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -26641,11 +26641,11 @@ +@@ -27312,11 +27312,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -26008,7 +25879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -26663,7 +26663,7 @@ +@@ -27334,7 +27334,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -26017,7 +25888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -26790,7 +26790,7 @@ +@@ -27461,7 +27461,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -26026,7 +25897,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -26813,7 +26813,7 @@ +@@ -27484,7 +27484,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -26035,7 +25906,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -26836,7 +26836,7 @@ +@@ -27507,7 +27507,7 @@ }, { 'name': 'EventPathEnabled', @@ -26044,7 +25915,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -26875,7 +26875,7 @@ +@@ -27547,7 +27547,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -26053,7 +25924,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-'], -@@ -26887,7 +26887,7 @@ +@@ -27560,7 +27560,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -26062,7 +25933,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. -@@ -26899,7 +26899,7 @@ +@@ -27572,7 +27572,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -26071,7 +25942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -26920,7 +26920,7 @@ +@@ -27594,7 +27594,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -26080,7 +25951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -26987,7 +26987,7 @@ +@@ -27662,7 +27662,7 @@ }, { 'name': 'PrintPostScriptMode', @@ -26089,7 +25960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27027,7 +27027,7 @@ +@@ -27702,7 +27702,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -26098,7 +25969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27067,7 +27067,7 @@ +@@ -27742,7 +27742,7 @@ }, { 'name': 'PrintPdfAsImageAvailability', @@ -26107,7 +25978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -27100,7 +27100,7 @@ +@@ -27775,7 +27775,7 @@ }, { 'name': 'PrintRasterizePdfDpi', @@ -26116,7 +25987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -27126,7 +27126,7 @@ +@@ -27802,7 +27802,7 @@ }, { 'name': 'PrintPdfAsImageDefault', @@ -26125,7 +25996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -27161,7 +27161,7 @@ +@@ -27838,7 +27838,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -26134,7 +26005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -27184,7 +27184,7 @@ +@@ -27861,7 +27861,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -26143,7 +26014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27239,7 +27239,7 @@ +@@ -27917,7 +27917,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -26152,7 +26023,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-'], -@@ -27259,7 +27259,7 @@ +@@ -27938,7 +27938,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -26161,7 +26032,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-'], -@@ -27281,7 +27281,7 @@ +@@ -27960,7 +27960,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -26170,7 +26041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -27325,8 +27325,8 @@ +@@ -28004,8 +28004,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -26181,7 +26052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -27355,7 +27355,7 @@ +@@ -28034,7 +28034,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -26190,7 +26061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -27398,8 +27398,8 @@ +@@ -28077,8 +28077,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -26201,7 +26072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -27426,7 +27426,7 @@ +@@ -28105,7 +28105,7 @@ }, { 'name': 'LocalDiscoveryEnabled', @@ -26210,7 +26081,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'], -@@ -27459,7 +27459,7 @@ +@@ -28138,7 +28138,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -26219,7 +26090,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-'], -@@ -27488,7 +27488,7 @@ +@@ -28168,7 +28168,7 @@ }, { 'name': 'ScreenCaptureAllowedByOrigins', @@ -26228,7 +26099,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27511,11 +27511,11 @@ +@@ -28192,11 +28192,11 @@ If a site matches a URL pattern in this policy, the ScreenCaptureAllowed will not be considered. @@ -26242,7 +26113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27538,11 +27538,11 @@ +@@ -28220,11 +28220,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -26256,7 +26127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27567,11 +27567,11 @@ +@@ -28250,11 +28250,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -26270,7 +26141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27594,11 +27594,11 @@ +@@ -28278,11 +28278,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: TabCaptureAllowedByOrigins, WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -26284,7 +26155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -27617,7 +27617,7 @@ +@@ -28301,7 +28301,7 @@ }, { 'name': 'SystemProxySettings', @@ -26293,7 +26164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -27673,7 +27673,7 @@ +@@ -28357,7 +28357,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -26302,7 +26173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -27701,7 +27701,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -28385,7 +28385,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -26311,7 +26182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -27728,7 +27728,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -28412,7 +28412,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -26320,7 +26191,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-100'], -@@ -27783,7 +27783,7 @@ If set to False, $1Google Chrome will not +@@ -28467,7 +28467,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -26329,7 +26200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27835,7 +27835,7 @@ If set to False, $1Google Chrome will not +@@ -28519,7 +28519,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -26338,7 +26209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27887,7 +27887,7 @@ If set to False, $1Google Chrome will not +@@ -28571,7 +28571,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -26347,7 +26218,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-'], -@@ -27904,7 +27904,7 @@ If set to False, $1Google Chrome will not +@@ -28589,7 +28589,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -26356,7 +26227,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-'], -@@ -27925,7 +27925,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28611,7 +28611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -26365,7 +26236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27944,7 +27944,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28630,7 +28630,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -26374,7 +26245,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-'], -@@ -27995,7 +27995,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28682,7 +28682,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -26383,7 +26254,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-'], -@@ -28033,7 +28033,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28721,7 +28721,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -26392,7 +26263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -28068,7 +28068,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28756,7 +28756,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -26401,7 +26272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -28094,7 +28094,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28782,7 +28782,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -26410,7 +26281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -28113,7 +28113,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28801,7 +28801,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -26419,7 +26290,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'], -@@ -28135,7 +28135,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28823,7 +28823,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsGREASEUpdateEnabled', @@ -26428,7 +26299,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-'], -@@ -28165,7 +28165,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28854,7 +28854,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UrlParamFilterEnabled', @@ -26437,7 +26308,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-'], -@@ -28194,7 +28194,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28884,7 +28884,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -26446,7 +26317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -28216,7 +28216,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28906,7 +28906,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -26455,7 +26326,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-'], -@@ -28239,7 +28239,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28930,7 +28930,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -26464,7 +26335,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-'], -@@ -28258,7 +28258,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28950,7 +28950,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -26473,7 +26344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28284,7 +28284,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28977,7 +28977,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -26482,7 +26353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -28314,7 +28314,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29007,7 +29007,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -26491,7 +26362,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -28357,7 +28357,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29050,7 +29050,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -26500,7 +26371,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'], -@@ -28387,7 +28387,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29080,7 +29080,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -26509,7 +26380,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'], -@@ -28417,7 +28417,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29110,7 +29110,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionClipboardCheckSizeLimit', @@ -26518,7 +26389,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-'], -@@ -28436,7 +28436,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29129,7 +29129,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionReportingEnabled', @@ -26527,7 +26398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -28468,7 +28468,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29161,7 +29161,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionRulesList', @@ -26536,7 +26407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28555,18 +28555,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29248,18 +29248,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -26561,7 +26432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -28599,8 +28599,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29292,8 +29292,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -26572,7 +26443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -28647,13 +28647,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29340,13 +29340,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. @@ -26588,7 +26459,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-'], -@@ -28686,7 +28686,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29380,7 +29380,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -26597,7 +26468,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-'], -@@ -28713,7 +28713,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29408,7 +29408,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -26606,7 +26477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -28737,7 +28737,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29432,7 +29432,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -26615,7 +26486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -28762,7 +28762,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29457,7 +29457,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -26624,7 +26495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28817,7 +28817,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29513,7 +29513,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -26633,7 +26504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-95'], -@@ -28850,7 +28850,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29546,7 +29546,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -26642,7 +26513,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-'], -@@ -28884,7 +28884,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29580,7 +29580,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAvailability', @@ -26651,7 +26522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28950,7 +28950,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29646,7 +29646,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -26660,7 +26531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-93'], -@@ -28978,7 +28978,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29674,7 +29674,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -26669,7 +26540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -29064,7 +29064,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29761,7 +29761,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -26678,7 +26549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29112,7 +29112,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29810,7 +29810,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -26687,7 +26558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -29148,7 +29148,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29847,7 +29847,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -26696,7 +26567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -29181,7 +29181,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29880,7 +29880,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -26705,7 +26576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -29268,7 +29268,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -29967,7 +29967,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -26714,7 +26585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -29302,7 +29302,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30001,7 +30001,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -26723,7 +26594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -29348,13 +29348,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30048,13 +30048,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 "*", which applies to all web apps without a custom configuration in this policy. @@ -26739,7 +26610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -29377,7 +29377,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30077,7 +30077,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -26748,7 +26619,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-'], -@@ -29400,7 +29400,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30101,7 +30101,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': [], @@ -26757,7 +26628,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. -@@ -29409,7 +29409,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30110,7 +30110,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -26766,7 +26637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -29438,7 +29438,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30139,7 +30139,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserBorealisAllowed', @@ -26775,7 +26646,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -29467,7 +29467,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30168,7 +30168,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -26784,7 +26655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -29504,7 +29504,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30205,7 +30205,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -26793,7 +26664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -29529,7 +29529,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30230,7 +30230,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -26802,7 +26673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -29553,7 +29553,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30255,7 +30255,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -26811,7 +26682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -29595,7 +29595,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30298,7 +30298,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -26820,7 +26691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -29626,7 +29626,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -30329,7 +30329,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -26829,7 +26700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -29650,7 +29650,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$1Google Chrome may render web content more slowly, and may also disable parts of JavaScript including WebAssembly. Disabling the JavaScript JIT may allow $1Google Chrome to render web content in a more secure configuration. @@ -26928,7 +26808,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. -@@ -30043,7 +30043,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$1Google Chrome will support the CORS non-wildcard request headers and behave as described above. -@@ -30618,7 +30618,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOSenable and disable 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. @@ -27125,7 +27005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -30738,12 +30738,12 @@ When this policy is set, $2Google ChromeOSUser-Agent Reduction and its timeline, read here: @@ -27140,7 +27020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -30802,8 +30802,8 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOSAndroid WebView. @@ -27435,7 +27315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:102-'], -@@ -31776,7 +31776,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$1Google Chrome 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. @@ -27496,7 +27403,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''', -@@ -32082,11 +32082,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -32952,11 +32952,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''', @@ -27510,7 +27417,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''', -@@ -32110,7 +32110,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -32980,7 +32980,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.''', @@ -27519,7 +27426,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.''', -@@ -32122,7 +32122,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -32992,7 +32992,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.''', @@ -27528,7 +27435,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.''', -@@ -32134,7 +32134,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -33004,7 +33004,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.''', @@ -27537,7 +27444,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 -@@ -32464,7 +32464,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -33334,7 +33334,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -27557,7 +27464,7 @@ diff --git a/components/policy/test_support/request_handler_for_policy.cc b/comp + ? "policy-testserver-service-account-identity@9ma1l.qjz9zk" : policy_storage()->service_account_identity()); policy_data.set_device_id(client_info.device_id); - policy_data.set_username( + std::string username = diff --git a/components/policy/test_support/signature_provider.h b/components/policy/test_support/signature_provider.h --- a/components/policy/test_support/signature_provider.h +++ b/components/policy/test_support/signature_provider.h @@ -27709,7 +27616,7 @@ diff --git a/components/quirks/quirks_client.cc b/components/quirks/quirks_clien diff --git a/components/resources/terms/terms_am.html b/components/resources/terms/terms_am.html --- a/components/resources/terms/terms_am.html +++ b/components/resources/terms/terms_am.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { ለመጨረሻ ጊዜ የተቀየረው፦ 01 ጃንዋሪ፣ 2021

@@ -27725,7 +27632,7 @@ diff --git a/components/resources/terms/terms_am.html b/components/resources/ter diff --git a/components/resources/terms/terms_ar.html b/components/resources/terms/terms_ar.html --- a/components/resources/terms/terms_ar.html +++ b/components/resources/terms/terms_ar.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { تاريخ آخر تعديل: 1 كانون الثاني (يناير) 2021

@@ -27741,7 +27648,7 @@ diff --git a/components/resources/terms/terms_ar.html b/components/resources/ter diff --git a/components/resources/terms/terms_bg.html b/components/resources/terms/terms_bg.html --- a/components/resources/terms/terms_bg.html +++ b/components/resources/terms/terms_bg.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Последна промяна: 1 януари 2021 г.

@@ -27757,7 +27664,7 @@ diff --git a/components/resources/terms/terms_bg.html b/components/resources/ter diff --git a/components/resources/terms/terms_bn.html b/components/resources/terms/terms_bn.html --- a/components/resources/terms/terms_bn.html +++ b/components/resources/terms/terms_bn.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { শেষবার পরিবর্তন করা হয়েছে: ১ জানুয়ারি, ২০২১

@@ -27773,7 +27680,7 @@ diff --git a/components/resources/terms/terms_bn.html b/components/resources/ter diff --git a/components/resources/terms/terms_ca.html b/components/resources/terms/terms_ca.html --- a/components/resources/terms/terms_ca.html +++ b/components/resources/terms/terms_ca.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Darrera modificació: 1 de gener de 2021

@@ -27789,7 +27696,7 @@ diff --git a/components/resources/terms/terms_ca.html b/components/resources/ter diff --git a/components/resources/terms/terms_cs.html b/components/resources/terms/terms_cs.html --- a/components/resources/terms/terms_cs.html +++ b/components/resources/terms/terms_cs.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Naposledy upraveno: 1. ledna 2021

@@ -27805,7 +27712,7 @@ diff --git a/components/resources/terms/terms_cs.html b/components/resources/ter diff --git a/components/resources/terms/terms_da.html b/components/resources/terms/terms_da.html --- a/components/resources/terms/terms_da.html +++ b/components/resources/terms/terms_da.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Sidst opdateret: 1. januar 2021

@@ -27821,7 +27728,7 @@ diff --git a/components/resources/terms/terms_da.html b/components/resources/ter diff --git a/components/resources/terms/terms_de.html b/components/resources/terms/terms_de.html --- a/components/resources/terms/terms_de.html +++ b/components/resources/terms/terms_de.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Letzte Änderung: 1. Januar 2021

@@ -27837,7 +27744,7 @@ diff --git a/components/resources/terms/terms_de.html b/components/resources/ter diff --git a/components/resources/terms/terms_el.html b/components/resources/terms/terms_el.html --- a/components/resources/terms/terms_el.html +++ b/components/resources/terms/terms_el.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Τελευταία τροποποίηση: 1η Ιανουαρίου 2021

@@ -27853,7 +27760,7 @@ diff --git a/components/resources/terms/terms_el.html b/components/resources/ter diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/terms/terms_en-GB.html --- a/components/resources/terms/terms_en-GB.html +++ b/components/resources/terms/terms_en-GB.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Last modified: 01 January, 2021

@@ -27869,7 +27776,7 @@ diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/ diff --git a/components/resources/terms/terms_en.html b/components/resources/terms/terms_en.html --- a/components/resources/terms/terms_en.html +++ b/components/resources/terms/terms_en.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Last modified: 01 January, 2021

@@ -27885,7 +27792,7 @@ diff --git a/components/resources/terms/terms_en.html b/components/resources/ter diff --git a/components/resources/terms/terms_es-419.html b/components/resources/terms/terms_es-419.html --- a/components/resources/terms/terms_es-419.html +++ b/components/resources/terms/terms_es-419.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Última modificación: 1 de enero de 2021

@@ -27901,7 +27808,7 @@ diff --git a/components/resources/terms/terms_es-419.html b/components/resources diff --git a/components/resources/terms/terms_es.html b/components/resources/terms/terms_es.html --- a/components/resources/terms/terms_es.html +++ b/components/resources/terms/terms_es.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Última modificación: 1 de enero del 2021

@@ -27917,7 +27824,7 @@ diff --git a/components/resources/terms/terms_es.html b/components/resources/ter diff --git a/components/resources/terms/terms_et.html b/components/resources/terms/terms_et.html --- a/components/resources/terms/terms_et.html +++ b/components/resources/terms/terms_et.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Viimati muudetud: 1. jaanuar 2021

@@ -27933,7 +27840,7 @@ diff --git a/components/resources/terms/terms_et.html b/components/resources/ter diff --git a/components/resources/terms/terms_fa.html b/components/resources/terms/terms_fa.html --- a/components/resources/terms/terms_fa.html +++ b/components/resources/terms/terms_fa.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { تاریخ آخرین تغییر: ۱ ژانویه ۲۰۲۱

@@ -27949,7 +27856,7 @@ diff --git a/components/resources/terms/terms_fa.html b/components/resources/ter diff --git a/components/resources/terms/terms_fi.html b/components/resources/terms/terms_fi.html --- a/components/resources/terms/terms_fi.html +++ b/components/resources/terms/terms_fi.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Muokattu viimeksi: 1.1.2021

@@ -27965,7 +27872,7 @@ diff --git a/components/resources/terms/terms_fi.html b/components/resources/ter diff --git a/components/resources/terms/terms_fil.html b/components/resources/terms/terms_fil.html --- a/components/resources/terms/terms_fil.html +++ b/components/resources/terms/terms_fil.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Huling binago: Enero 1, 2021

@@ -27981,7 +27888,7 @@ diff --git a/components/resources/terms/terms_fil.html b/components/resources/te diff --git a/components/resources/terms/terms_fr.html b/components/resources/terms/terms_fr.html --- a/components/resources/terms/terms_fr.html +++ b/components/resources/terms/terms_fr.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Dernière modification : 1er janvier 2021

@@ -27997,7 +27904,7 @@ diff --git a/components/resources/terms/terms_fr.html b/components/resources/ter diff --git a/components/resources/terms/terms_gu.html b/components/resources/terms/terms_gu.html --- a/components/resources/terms/terms_gu.html +++ b/components/resources/terms/terms_gu.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { છેલ્લે ફેરફાર કર્યાની તારીખ: 1 જાન્યુઆરી, 2021

@@ -28013,7 +27920,7 @@ diff --git a/components/resources/terms/terms_gu.html b/components/resources/ter diff --git a/components/resources/terms/terms_he.html b/components/resources/terms/terms_he.html --- a/components/resources/terms/terms_he.html +++ b/components/resources/terms/terms_he.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { תאריך השינוי האחרון: 1 בינואר 2021

@@ -28029,7 +27936,7 @@ diff --git a/components/resources/terms/terms_he.html b/components/resources/ter diff --git a/components/resources/terms/terms_hi.html b/components/resources/terms/terms_hi.html --- a/components/resources/terms/terms_hi.html +++ b/components/resources/terms/terms_hi.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { इस तारीख को अंतिम बार बदलाव किया गया था: 1 जनवरी, 2021

@@ -28045,7 +27952,7 @@ diff --git a/components/resources/terms/terms_hi.html b/components/resources/ter diff --git a/components/resources/terms/terms_hr.html b/components/resources/terms/terms_hr.html --- a/components/resources/terms/terms_hr.html +++ b/components/resources/terms/terms_hr.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Zadnja izmjena: 1. siječnja 2021.

@@ -28061,7 +27968,7 @@ diff --git a/components/resources/terms/terms_hr.html b/components/resources/ter diff --git a/components/resources/terms/terms_hu.html b/components/resources/terms/terms_hu.html --- a/components/resources/terms/terms_hu.html +++ b/components/resources/terms/terms_hu.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Legutóbbi módosítás: 2021. január 1.

@@ -28077,7 +27984,7 @@ diff --git a/components/resources/terms/terms_hu.html b/components/resources/ter diff --git a/components/resources/terms/terms_id.html b/components/resources/terms/terms_id.html --- a/components/resources/terms/terms_id.html +++ b/components/resources/terms/terms_id.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Terakhir diubah: 1 Januari 2021

@@ -28093,7 +28000,7 @@ diff --git a/components/resources/terms/terms_id.html b/components/resources/ter diff --git a/components/resources/terms/terms_it.html b/components/resources/terms/terms_it.html --- a/components/resources/terms/terms_it.html +++ b/components/resources/terms/terms_it.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Ultima modifica: 1° gennaio 2021

@@ -28109,7 +28016,7 @@ diff --git a/components/resources/terms/terms_it.html b/components/resources/ter diff --git a/components/resources/terms/terms_ja.html b/components/resources/terms/terms_ja.html --- a/components/resources/terms/terms_ja.html +++ b/components/resources/terms/terms_ja.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { 最終更新日: 2021 年 1 月 1 日

@@ -28125,7 +28032,7 @@ diff --git a/components/resources/terms/terms_ja.html b/components/resources/ter diff --git a/components/resources/terms/terms_kn.html b/components/resources/terms/terms_kn.html --- a/components/resources/terms/terms_kn.html +++ b/components/resources/terms/terms_kn.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { ಕೊನೆಯದಾಗಿ ಮಾರ್ಪಡಿಸಿದ ದಿನಾಂಕ: 01 ಜನವರಿ 2021

@@ -28141,7 +28048,7 @@ diff --git a/components/resources/terms/terms_kn.html b/components/resources/ter diff --git a/components/resources/terms/terms_ko.html b/components/resources/terms/terms_ko.html --- a/components/resources/terms/terms_ko.html +++ b/components/resources/terms/terms_ko.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { 최종 수정: 2021년 1월 1일

@@ -28157,7 +28064,7 @@ diff --git a/components/resources/terms/terms_ko.html b/components/resources/ter diff --git a/components/resources/terms/terms_lt.html b/components/resources/terms/terms_lt.html --- a/components/resources/terms/terms_lt.html +++ b/components/resources/terms/terms_lt.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Paskutinį kartą keista: 2021 m. sausio 1 d.

@@ -28173,7 +28080,7 @@ diff --git a/components/resources/terms/terms_lt.html b/components/resources/ter diff --git a/components/resources/terms/terms_lv.html b/components/resources/terms/terms_lv.html --- a/components/resources/terms/terms_lv.html +++ b/components/resources/terms/terms_lv.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Pēdējās izmaiņas: 2021. gada 1. janvārī

@@ -28189,7 +28096,7 @@ diff --git a/components/resources/terms/terms_lv.html b/components/resources/ter diff --git a/components/resources/terms/terms_ml.html b/components/resources/terms/terms_ml.html --- a/components/resources/terms/terms_ml.html +++ b/components/resources/terms/terms_ml.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { അവസാനം പരിഷ്‌ക്കരിച്ചത്: 2021 ജനുവരി 01

@@ -28205,7 +28112,7 @@ diff --git a/components/resources/terms/terms_ml.html b/components/resources/ter diff --git a/components/resources/terms/terms_mr.html b/components/resources/terms/terms_mr.html --- a/components/resources/terms/terms_mr.html +++ b/components/resources/terms/terms_mr.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { शेवटची केलेली सुधारणा: १ जानेवारी २०२१

@@ -28221,7 +28128,7 @@ diff --git a/components/resources/terms/terms_mr.html b/components/resources/ter diff --git a/components/resources/terms/terms_nb.html b/components/resources/terms/terms_nb.html --- a/components/resources/terms/terms_nb.html +++ b/components/resources/terms/terms_nb.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Sist endret: 1. januar 2021

@@ -28237,7 +28144,7 @@ diff --git a/components/resources/terms/terms_nb.html b/components/resources/ter diff --git a/components/resources/terms/terms_nl.html b/components/resources/terms/terms_nl.html --- a/components/resources/terms/terms_nl.html +++ b/components/resources/terms/terms_nl.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Laatst gewijzigd: 1 januari 2021

@@ -28253,7 +28160,7 @@ diff --git a/components/resources/terms/terms_nl.html b/components/resources/ter diff --git a/components/resources/terms/terms_pl.html b/components/resources/terms/terms_pl.html --- a/components/resources/terms/terms_pl.html +++ b/components/resources/terms/terms_pl.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Ostatnia zmiana: 1 stycznia 2021 r.

@@ -28269,7 +28176,7 @@ diff --git a/components/resources/terms/terms_pl.html b/components/resources/ter diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/terms/terms_pt-BR.html --- a/components/resources/terms/terms_pt-BR.html +++ b/components/resources/terms/terms_pt-BR.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Última modificação: 1º de janeiro de 2021

@@ -28285,7 +28192,7 @@ diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/terms/terms_pt-PT.html --- a/components/resources/terms/terms_pt-PT.html +++ b/components/resources/terms/terms_pt-PT.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Última modificação: 1 de janeiro de 2021

@@ -28301,7 +28208,7 @@ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/ diff --git a/components/resources/terms/terms_ro.html b/components/resources/terms/terms_ro.html --- a/components/resources/terms/terms_ro.html +++ b/components/resources/terms/terms_ro.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Ultima modificare: 1 ianuarie 2021

@@ -28317,7 +28224,7 @@ diff --git a/components/resources/terms/terms_ro.html b/components/resources/ter diff --git a/components/resources/terms/terms_ru.html b/components/resources/terms/terms_ru.html --- a/components/resources/terms/terms_ru.html +++ b/components/resources/terms/terms_ru.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Последнее изменение: 1 января 2021 г.

@@ -28333,7 +28240,7 @@ diff --git a/components/resources/terms/terms_ru.html b/components/resources/ter diff --git a/components/resources/terms/terms_sk.html b/components/resources/terms/terms_sk.html --- a/components/resources/terms/terms_sk.html +++ b/components/resources/terms/terms_sk.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Naposledy upravené: 1. januára 2021

@@ -28349,7 +28256,7 @@ diff --git a/components/resources/terms/terms_sk.html b/components/resources/ter diff --git a/components/resources/terms/terms_sl.html b/components/resources/terms/terms_sl.html --- a/components/resources/terms/terms_sl.html +++ b/components/resources/terms/terms_sl.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Zadnja sprememba: 1. januar 2021

@@ -28365,7 +28272,7 @@ diff --git a/components/resources/terms/terms_sl.html b/components/resources/ter diff --git a/components/resources/terms/terms_sr.html b/components/resources/terms/terms_sr.html --- a/components/resources/terms/terms_sr.html +++ b/components/resources/terms/terms_sr.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Последња измена: 1. јануар 2021.

@@ -28381,7 +28288,7 @@ diff --git a/components/resources/terms/terms_sr.html b/components/resources/ter diff --git a/components/resources/terms/terms_sv.html b/components/resources/terms/terms_sv.html --- a/components/resources/terms/terms_sv.html +++ b/components/resources/terms/terms_sv.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Senast ändrad: 1 januari 2021

@@ -28397,7 +28304,7 @@ diff --git a/components/resources/terms/terms_sv.html b/components/resources/ter diff --git a/components/resources/terms/terms_sw.html b/components/resources/terms/terms_sw.html --- a/components/resources/terms/terms_sw.html +++ b/components/resources/terms/terms_sw.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Mara ya mwisho kubadilishwa: 21 Januari 2021

@@ -28413,7 +28320,7 @@ diff --git a/components/resources/terms/terms_sw.html b/components/resources/ter diff --git a/components/resources/terms/terms_ta.html b/components/resources/terms/terms_ta.html --- a/components/resources/terms/terms_ta.html +++ b/components/resources/terms/terms_ta.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { கடைசியாக மாற்றியது: ஜனவரி 01, 2021

@@ -28429,7 +28336,7 @@ diff --git a/components/resources/terms/terms_ta.html b/components/resources/ter diff --git a/components/resources/terms/terms_te.html b/components/resources/terms/terms_te.html --- a/components/resources/terms/terms_te.html +++ b/components/resources/terms/terms_te.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { చివరగా సవరించినది: 01 జనవరి, 2021

@@ -28445,7 +28352,7 @@ diff --git a/components/resources/terms/terms_te.html b/components/resources/ter diff --git a/components/resources/terms/terms_th.html b/components/resources/terms/terms_th.html --- a/components/resources/terms/terms_th.html +++ b/components/resources/terms/terms_th.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { แก้ไขล่าสุด: 1 มกราคม 2021

@@ -28461,7 +28368,7 @@ diff --git a/components/resources/terms/terms_th.html b/components/resources/ter diff --git a/components/resources/terms/terms_tr.html b/components/resources/terms/terms_tr.html --- a/components/resources/terms/terms_tr.html +++ b/components/resources/terms/terms_tr.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Son değiştirilme tarihi: 1 Ocak 2021

@@ -28477,7 +28384,7 @@ diff --git a/components/resources/terms/terms_tr.html b/components/resources/ter diff --git a/components/resources/terms/terms_uk.html b/components/resources/terms/terms_uk.html --- a/components/resources/terms/terms_uk.html +++ b/components/resources/terms/terms_uk.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Востаннє оновлено 1 січня 2021 року

@@ -28493,7 +28400,7 @@ diff --git a/components/resources/terms/terms_uk.html b/components/resources/ter diff --git a/components/resources/terms/terms_vi.html b/components/resources/terms/terms_vi.html --- a/components/resources/terms/terms_vi.html +++ b/components/resources/terms/terms_vi.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { Lần sửa đổi gần đây nhất: Ngày 1 tháng 1 năm 2021

@@ -28509,7 +28416,7 @@ diff --git a/components/resources/terms/terms_vi.html b/components/resources/ter diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/terms/terms_zh-CN.html --- a/components/resources/terms/terms_zh-CN.html +++ b/components/resources/terms/terms_zh-CN.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { 上次修改时间：2021 年 1 月 1 日

@@ -28525,7 +28432,7 @@ diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/terms/terms_zh-TW.html --- a/components/resources/terms/terms_zh-TW.html +++ b/components/resources/terms/terms_zh-TW.html -@@ -30,10 +30,10 @@ h2 { +@@ -42,10 +42,10 @@ h2 { 上次修改日期：2021 年 1 月 1 日

@@ -28679,6 +28586,18 @@ diff --git a/components/safety_check/url_constants.cc b/components/safety_check/ + "https://connectivitycheck.95tat1c.qjz9zk/generate_204"; } // namespace safety_check +diff --git a/components/search_engines/template_url_starter_pack_data.cc b/components/search_engines/template_url_starter_pack_data.cc +--- a/components/search_engines/template_url_starter_pack_data.cc ++++ b/components/search_engines/template_url_starter_pack_data.cc +@@ -49,7 +49,7 @@ const StarterPackEngine tabs = { + // chrome://tabs does not currently exist and the tab search engine will + // only provide suggestions from the OpenTabProvider. + .search_url = "chrome://tabs/?q={searchTerms}", +- .destination_url = "http://support.google.com/chrome/?p=tab_search", ++ .destination_url = "http://support.9oo91e.qjz9zk/chrome/?p=tab_search", + .id = StarterPackID::kTabs, + .type = SEARCH_ENGINE_STARTER_PACK_TABS, + }; diff --git a/components/security_interstitials/content/https_only_mode_blocking_page.cc b/components/security_interstitials/content/https_only_mode_blocking_page.cc --- a/components/security_interstitials/content/https_only_mode_blocking_page.cc +++ b/components/security_interstitials/content/https_only_mode_blocking_page.cc @@ -28940,7 +28859,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_const + "https://www.ch40mestatus.qjz9zk/feature/5738264052891648"; // Console message to be displayed on disallowing subframe. - constexpr char kDisallowSubframeConsoleMessageFormat[] = + constexpr char kDisallowChildFrameConsoleMessageFormat[] = "Chrome blocked resource %s on this site because this site tends to show " "ads that interrupt, distract, mislead, or prevent user control. Learn " - "more at https://www.chromestatus.com/feature/5738264052891648"; @@ -29223,7 +29142,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 -@@ -781,7 +781,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -776,7 +776,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:. @@ -29307,7 +29226,7 @@ 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 -@@ -5386,7 +5386,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -5494,7 +5494,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -29316,7 +29235,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -5617,7 +5617,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -5725,7 +5725,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -29328,7 +29247,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 -@@ -398,7 +398,7 @@ int g_next_accessibility_reset_token = 1; +@@ -399,7 +399,7 @@ int g_next_accessibility_reset_token = 1; // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. bool g_allow_injecting_javascript = false; @@ -29376,7 +29295,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 -@@ -6998,7 +6998,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6986,7 +6986,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 " @@ -29388,7 +29307,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 -@@ -121,8 +121,8 @@ absl::optional MakeCredentialU2fAppIdOverride( +@@ -116,8 +116,8 @@ absl::optional MakeCredentialU2fAppIdOverride( return options->relying_party.id; } if (options->google_legacy_app_id_support && @@ -29670,7 +29589,7 @@ diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py 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 -@@ -195,7 +195,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { +@@ -179,7 +179,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { // TODO(battre) Merge this, CanExtensionAccessURL and // PermissionsData::CanAccessPage into one function. @@ -29679,7 +29598,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext static constexpr char kClient[] = "clients"; constexpr size_t kGoogleComLength = std::size(kGoogleCom) - 1; constexpr size_t kClientLength = std::size(kClient) - 1; -@@ -336,7 +336,7 @@ bool WebRequestPermissions::HideRequest( +@@ -320,7 +320,7 @@ bool WebRequestPermissions::HideRequest( extension_urls::IsBlocklistUpdateUrl(url) || extension_urls::IsSafeBrowsingUrl(url::Origin::Create(url), url.path_piece()) || @@ -29812,19 +29731,21 @@ diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validato diff --git a/extensions/common/extension_urls.cc b/extensions/common/extension_urls.cc --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -26,9 +26,9 @@ bool IsSourceFromAnExtension(const std::u16string& source) { +@@ -26,10 +26,10 @@ bool IsSourceFromAnExtension(const std::u16string& source) { namespace extension_urls { -const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; +-const char kNewChromeWebstoreBaseURL[] = "https://webstore.google.com/"; +const char kChromeWebstoreBaseURL[] = "https://chrome.9oo91e.qjz9zk/webstore"; ++const char kNewChromeWebstoreBaseURL[] = "https://webstore.9oo91e.qjz9zk/"; const char kChromeWebstoreUpdateURL[] = - "https://clients2.google.com/service/update2/crx"; + "https://clients2.9oo91e.qjz9zk/service/update2/crx"; GURL GetWebstoreLaunchURL() { extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get(); -@@ -86,9 +86,9 @@ bool IsBlocklistUpdateUrl(const GURL& url) { +@@ -94,9 +94,9 @@ bool IsBlocklistUpdateUrl(const GURL& url) { } bool IsSafeBrowsingUrl(const url::Origin& origin, base::StringPiece path) { @@ -29915,7 +29836,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 -@@ -624,7 +624,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, +@@ -580,7 +580,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. @@ -29924,7 +29845,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 = -@@ -776,7 +776,7 @@ void GaiaAuthFetcher::StartListAccounts() { +@@ -732,7 +732,7 @@ void GaiaAuthFetcher::StartListAccounts() { })"); CreateAndStartGaiaFetcher( " ", // To force an HTTP POST. @@ -30319,7 +30240,7 @@ diff --git a/gpu/command_buffer/PRESUBMIT.py b/gpu/command_buffer/PRESUBMIT.py 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 -@@ -176,7 +176,7 @@ class DawnIOSurfaceRepresentation : public DawnImageRepresentation { +@@ -175,7 +175,7 @@ class DawnIOSurfaceRepresentation : public DawnImageRepresentation { WGPUTexture texture_ = nullptr; WGPUTextureFormat wgpu_format_; @@ -30409,786 +30330,6 @@ diff --git a/infra/config/PRESUBMIT.py b/infra/config/PRESUBMIT.py ), ])), ] -diff --git a/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json b/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json ---- a/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json -+++ b/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json -@@ -49,7 +49,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json b/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json ---- a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json -+++ b/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json -@@ -96,7 +96,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json b/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/android-marshmallow-arm64-rel-compilator/properties.json -@@ -97,7 +97,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json -@@ -63,7 +63,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-official/properties.json b/infra/config/generated/builders/try/android-official/properties.json ---- a/infra/config/generated/builders/try/android-official/properties.json -+++ b/infra/config/generated/builders/try/android-official/properties.json -@@ -2,7 +2,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json b/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json ---- a/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json -+++ b/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json -@@ -90,7 +90,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json b/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json ---- a/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json -+++ b/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json -@@ -94,7 +94,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android-pie-arm64-rel-compilator/properties.json b/infra/config/generated/builders/try/android-pie-arm64-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/android-pie-arm64-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/android-pie-arm64-rel-compilator/properties.json -@@ -55,7 +55,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android_compile_dbg/properties.json b/infra/config/generated/builders/try/android_compile_dbg/properties.json ---- a/infra/config/generated/builders/try/android_compile_dbg/properties.json -+++ b/infra/config/generated/builders/try/android_compile_dbg/properties.json -@@ -50,7 +50,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json b/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json ---- a/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json -+++ b/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json -@@ -46,7 +46,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json b/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json ---- a/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json -+++ b/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json -@@ -46,7 +46,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android_cronet/properties.json b/infra/config/generated/builders/try/android_cronet/properties.json ---- a/infra/config/generated/builders/try/android_cronet/properties.json -+++ b/infra/config/generated/builders/try/android_cronet/properties.json -@@ -50,7 +50,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json ---- a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json -+++ b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json -@@ -47,7 +47,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/cast_shell_android/properties.json b/infra/config/generated/builders/try/cast_shell_android/properties.json ---- a/infra/config/generated/builders/try/cast_shell_android/properties.json -+++ b/infra/config/generated/builders/try/cast_shell_android/properties.json -@@ -48,7 +48,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/cast_shell_linux/properties.json b/infra/config/generated/builders/try/cast_shell_linux/properties.json ---- a/infra/config/generated/builders/try/cast_shell_linux/properties.json -+++ b/infra/config/generated/builders/try/cast_shell_linux/properties.json -@@ -43,7 +43,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json b/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json ---- a/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json -+++ b/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json -@@ -43,7 +43,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/properties.json ---- a/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/properties.json -+++ b/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/properties.json -@@ -48,7 +48,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json ---- a/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json -+++ b/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json -@@ -2,7 +2,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json -@@ -48,7 +48,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json b/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json ---- a/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json -+++ b/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json -@@ -47,7 +47,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-arm64-generic-rel/properties.json b/infra/config/generated/builders/try/chromeos-arm64-generic-rel/properties.json ---- a/infra/config/generated/builders/try/chromeos-arm64-generic-rel/properties.json -+++ b/infra/config/generated/builders/try/chromeos-arm64-generic-rel/properties.json -@@ -47,7 +47,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-jacuzzi-rel/properties.json b/infra/config/generated/builders/try/chromeos-jacuzzi-rel/properties.json ---- a/infra/config/generated/builders/try/chromeos-jacuzzi-rel/properties.json -+++ b/infra/config/generated/builders/try/chromeos-jacuzzi-rel/properties.json -@@ -49,7 +49,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-kevin-rel/properties.json b/infra/config/generated/builders/try/chromeos-kevin-rel/properties.json ---- a/infra/config/generated/builders/try/chromeos-kevin-rel/properties.json -+++ b/infra/config/generated/builders/try/chromeos-kevin-rel/properties.json -@@ -49,7 +49,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/chromeos-octopus-rel/properties.json b/infra/config/generated/builders/try/chromeos-octopus-rel/properties.json ---- a/infra/config/generated/builders/try/chromeos-octopus-rel/properties.json -+++ b/infra/config/generated/builders/try/chromeos-octopus-rel/properties.json -@@ -48,7 +48,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json ---- a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json -+++ b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json -@@ -117,7 +117,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json ---- a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json -+++ b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json -@@ -113,7 +113,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json ---- a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json -+++ b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json -@@ -114,7 +114,7 @@ - "$build/goma": { - "enable_ats": false, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json ---- a/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json -+++ b/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json -@@ -114,7 +114,7 @@ - "$build/goma": { - "enable_ats": false, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/fuchsia-arm64-cast/properties.json b/infra/config/generated/builders/try/fuchsia-arm64-cast/properties.json ---- a/infra/config/generated/builders/try/fuchsia-arm64-cast/properties.json -+++ b/infra/config/generated/builders/try/fuchsia-arm64-cast/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/fuchsia-official/properties.json b/infra/config/generated/builders/try/fuchsia-official/properties.json ---- a/infra/config/generated/builders/try/fuchsia-official/properties.json -+++ b/infra/config/generated/builders/try/fuchsia-official/properties.json -@@ -2,7 +2,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/fuchsia-x64-cast/properties.json b/infra/config/generated/builders/try/fuchsia-x64-cast/properties.json ---- a/infra/config/generated/builders/try/fuchsia-x64-cast/properties.json -+++ b/infra/config/generated/builders/try/fuchsia-x64-cast/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/fuchsia_arm64/properties.json b/infra/config/generated/builders/try/fuchsia_arm64/properties.json ---- a/infra/config/generated/builders/try/fuchsia_arm64/properties.json -+++ b/infra/config/generated/builders/try/fuchsia_arm64/properties.json -@@ -45,7 +45,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/fuchsia_x64/properties.json b/infra/config/generated/builders/try/fuchsia_x64/properties.json ---- a/infra/config/generated/builders/try/fuchsia_x64/properties.json -+++ b/infra/config/generated/builders/try/fuchsia_x64/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/ios-simulator-cronet/properties.json b/infra/config/generated/builders/try/ios-simulator-cronet/properties.json ---- a/infra/config/generated/builders/try/ios-simulator-cronet/properties.json -+++ b/infra/config/generated/builders/try/ios-simulator-cronet/properties.json -@@ -44,7 +44,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json b/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json ---- a/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json -+++ b/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json -@@ -55,7 +55,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/ios-simulator/properties.json b/infra/config/generated/builders/try/ios-simulator/properties.json ---- a/infra/config/generated/builders/try/ios-simulator/properties.json -+++ b/infra/config/generated/builders/try/ios-simulator/properties.json -@@ -55,7 +55,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json b/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json ---- a/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json -+++ b/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json -@@ -52,7 +52,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/lacros-arm-generic-rel/properties.json b/infra/config/generated/builders/try/lacros-arm-generic-rel/properties.json ---- a/infra/config/generated/builders/try/lacros-arm-generic-rel/properties.json -+++ b/infra/config/generated/builders/try/lacros-arm-generic-rel/properties.json -@@ -49,7 +49,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/lacros-arm64-generic-rel/properties.json b/infra/config/generated/builders/try/lacros-arm64-generic-rel/properties.json ---- a/infra/config/generated/builders/try/lacros-arm64-generic-rel/properties.json -+++ b/infra/config/generated/builders/try/lacros-arm64-generic-rel/properties.json -@@ -49,7 +49,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-blink-rel/properties.json b/infra/config/generated/builders/try/linux-blink-rel/properties.json ---- a/infra/config/generated/builders/try/linux-blink-rel/properties.json -+++ b/infra/config/generated/builders/try/linux-blink-rel/properties.json -@@ -40,7 +40,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json b/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json ---- a/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json -+++ b/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json -@@ -45,7 +45,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json b/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json ---- a/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json -+++ b/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json -@@ -53,7 +53,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-lacros-rel/properties.json b/infra/config/generated/builders/try/linux-lacros-rel/properties.json ---- a/infra/config/generated/builders/try/linux-lacros-rel/properties.json -+++ b/infra/config/generated/builders/try/linux-lacros-rel/properties.json -@@ -85,7 +85,7 @@ - "enable_ats": true, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-official/properties.json b/infra/config/generated/builders/try/linux-official/properties.json ---- a/infra/config/generated/builders/try/linux-official/properties.json -+++ b/infra/config/generated/builders/try/linux-official/properties.json -@@ -2,7 +2,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/linux-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/linux-rel-compilator/properties.json -@@ -164,7 +164,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux-wayland-rel/properties.json b/infra/config/generated/builders/try/linux-wayland-rel/properties.json ---- a/infra/config/generated/builders/try/linux-wayland-rel/properties.json -+++ b/infra/config/generated/builders/try/linux-wayland-rel/properties.json -@@ -86,7 +86,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json ---- a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json -+++ b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json -@@ -81,7 +81,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json b/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json ---- a/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json -+++ b/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json -@@ -83,7 +83,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json b/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json ---- a/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json -+++ b/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json -@@ -81,7 +81,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json ---- a/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json -+++ b/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json -@@ -85,7 +85,7 @@ - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_layout_tests_layout_ng_disabled/properties.json b/infra/config/generated/builders/try/linux_layout_tests_layout_ng_disabled/properties.json ---- a/infra/config/generated/builders/try/linux_layout_tests_layout_ng_disabled/properties.json -+++ b/infra/config/generated/builders/try/linux_layout_tests_layout_ng_disabled/properties.json -@@ -42,7 +42,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json b/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json ---- a/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json -+++ b/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/linux_vr/properties.json b/infra/config/generated/builders/try/linux_vr/properties.json ---- a/infra/config/generated/builders/try/linux_vr/properties.json -+++ b/infra/config/generated/builders/try/linux_vr/properties.json -@@ -46,7 +46,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/mac-official/properties.json b/infra/config/generated/builders/try/mac-official/properties.json ---- a/infra/config/generated/builders/try/mac-official/properties.json -+++ b/infra/config/generated/builders/try/mac-official/properties.json -@@ -40,7 +40,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/mac-rel-compilator/properties.json b/infra/config/generated/builders/try/mac-rel-compilator/properties.json ---- a/infra/config/generated/builders/try/mac-rel-compilator/properties.json -+++ b/infra/config/generated/builders/try/mac-rel-compilator/properties.json -@@ -193,7 +193,7 @@ - "$build/goma": { - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json b/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json ---- a/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json -+++ b/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json -@@ -78,7 +78,7 @@ - "$build/goma": { - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json b/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json ---- a/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json -+++ b/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json -@@ -42,7 +42,7 @@ - }, - "$build/goma": { - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json b/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json ---- a/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json -+++ b/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json -@@ -90,7 +90,7 @@ - "$build/goma": { - "enable_ats": true, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win-official/properties.json b/infra/config/generated/builders/try/win-official/properties.json ---- a/infra/config/generated/builders/try/win-official/properties.json -+++ b/infra/config/generated/builders/try/win-official/properties.json -@@ -41,7 +41,7 @@ - "$build/goma": { - "enable_ats": false, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win10_chromium_x64_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/win10_chromium_x64_rel_ng-compilator/properties.json ---- a/infra/config/generated/builders/try/win10_chromium_x64_rel_ng-compilator/properties.json -+++ b/infra/config/generated/builders/try/win10_chromium_x64_rel_ng-compilator/properties.json -@@ -166,7 +166,7 @@ - "enable_ats": false, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win32-official/properties.json b/infra/config/generated/builders/try/win32-official/properties.json ---- a/infra/config/generated/builders/try/win32-official/properties.json -+++ b/infra/config/generated/builders/try/win32-official/properties.json -@@ -41,7 +41,7 @@ - "$build/goma": { - "enable_ats": false, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win7-rel/properties.json b/infra/config/generated/builders/try/win7-rel/properties.json ---- a/infra/config/generated/builders/try/win7-rel/properties.json -+++ b/infra/config/generated/builders/try/win7-rel/properties.json -@@ -78,7 +78,7 @@ - "enable_ats": false, - "jobs": 300, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json b/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json ---- a/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json -+++ b/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json -@@ -42,7 +42,7 @@ - "enable_ats": false, - "jobs": 150, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { -diff --git a/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json b/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json ---- a/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json -+++ b/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json -@@ -44,7 +44,7 @@ - "$build/goma": { - "enable_ats": false, - "rpc_extra_params": "?prod", -- "server_host": "goma.chromium.org", -+ "server_host": "goma.ch40m1um.qjz9zk", - "use_luci_auth": true - }, - "$recipe_engine/resultdb/test_presentation": { 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 @@ -31213,6 +30354,15 @@ diff --git a/ios/PRESUBMIT.py b/ios/PRESUBMIT.py 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 @@ -31308,7 +30458,7 @@ diff --git a/ios/build/bots/scripts/xcode_util.py b/ios/build/bots/scripts/xcode diff --git a/ios/build/chrome_build.gni b/ios/build/chrome_build.gni --- a/ios/build/chrome_build.gni +++ b/ios/build/chrome_build.gni -@@ -40,7 +40,7 @@ declare_args() { +@@ -46,7 +46,7 @@ declare_args() { # Value of the encryption export compliance code. See "Cryptography and # U.S. Export Compliance" in "Submitting the App to App Review" in the @@ -31320,8 +30470,8 @@ diff --git a/ios/build/chrome_build.gni b/ios/build/chrome_build.gni diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/strings/ios_chromium_strings.grd --- a/ios/chrome/app/strings/ios_chromium_strings.grd +++ b/ios/chrome/app/strings/ios_chromium_strings.grd -@@ -205,7 +205,7 @@ locale. The strings in this file are specific to iOS. - Chromium tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. +@@ -208,7 +208,7 @@ locale. The strings in this file are specific to iOS. + To sign out of your Google Account on all websites, BEGIN_LINKsign out of ChromiumEND_LINK. - The selected data has been removed from Chromium and synced devices. Your Google Account may have other forms of browsing history like searches and activity from other Google services at history.google.com. @@ -31399,8 +30549,8 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/app/strings/ios_google_chrome_strings.grd --- a/ios/chrome/app/strings/ios_google_chrome_strings.grd +++ b/ios/chrome/app/strings/ios_google_chrome_strings.grd -@@ -205,7 +205,7 @@ locale. The strings in this file are specific to iOS. - Chrome tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. +@@ -208,7 +208,7 @@ locale. The strings in this file are specific to iOS. + To sign out of your Google Account on all websites, BEGIN_LINKsign out of ChromeEND_LINK. - The selected data has been removed from Chrome and synced devices. Your Google Account may have other forms of browsing history like searches and activity from other Google services at history.google.com. @@ -31507,7 +30657,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -1126,7 +1126,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1129,7 +1129,7 @@ See your search engine’s instructions for deleting your search history, if app You'll find your history here @@ -31516,7 +30666,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1286,7 +1286,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1292,7 +1292,7 @@ See your search engine’s instructions for deleting your search history, if app Manage Sync @@ -31525,7 +30675,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1779,7 +1779,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1785,7 +1785,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. @@ -31534,7 +30684,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Camera -@@ -1836,7 +1836,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1842,7 +1842,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Google Privacy Policy @@ -31543,7 +30693,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1908,7 +1908,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1914,7 +1914,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -31552,7 +30702,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -2281,7 +2281,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -2287,7 +2287,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across 3. Select Chrome @@ -31561,7 +30711,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Create, save, and manage your passwords so you can easily sign in to sites and apps. BEGIN_LINKLearn moreEND_LINK -@@ -2631,7 +2631,7 @@ Try to use a unique password for every site. +@@ -2646,7 +2646,7 @@ Try to use a unique password for every site. Active $12 Days Ago @@ -31570,7 +30720,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Message sent. -@@ -2837,12 +2837,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -31585,7 +30735,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 $2Sept 1, 2012. Enter it to start sync. -@@ -3162,10 +3162,10 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -3177,10 +3177,10 @@ Your data was encrypted with your sync passphrase on $2Sept Learn More @@ -31598,7 +30748,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Translate -@@ -3177,7 +3177,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -3192,7 +3192,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -31631,7 +30781,7 @@ diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/ diff --git a/ios/chrome/browser/autofill/automation/automation_action.mm b/ios/chrome/browser/autofill/automation/automation_action.mm --- a/ios/chrome/browser/autofill/automation/automation_action.mm +++ b/ios/chrome/browser/autofill/automation/automation_action.mm -@@ -108,7 +108,7 @@ +@@ -107,7 +107,7 @@ // a no-op when replaying. // We assume this action has a format resembling: // { @@ -31746,7 +30896,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 -@@ -553,7 +553,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -602,7 +602,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -31755,7 +30905,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, -@@ -1165,7 +1165,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { +@@ -1236,7 +1236,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -31878,7 +31028,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interfac diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm +++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm -@@ -64,15 +64,15 @@ +@@ -62,15 +62,15 @@ namespace { // URL for 'Manage Activity' item in the Discover feed menu. const char kFeedManageActivityURL[] = @@ -31901,7 +31051,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 -@@ -1638,7 +1638,7 @@ bool IsSigninForcedByPolicy() { +@@ -1678,7 +1678,7 @@ bool IsSigninForcedByPolicy() { return; if (self.sceneState.appState.initStage == InitStageFirstRun) { // This case is possible when using force FRE flag and opening chrome @@ -32190,7 +31340,7 @@ diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_serv -NSString* const kManagedIdentityEmailSuffix = @"@google.com"; +NSString* const kManagedIdentityEmailSuffix = @"@9oo91e.qjz9zk"; - const char* const kAddFakeIdentitiesArg = "add_fake_identities"; + NSString* const kManagedExampleIdentityEmailSuffix = @"@example.com"; diff --git a/ios/showcase/alert/sc_alert_coordinator.mm b/ios/showcase/alert/sc_alert_coordinator.mm --- a/ios/showcase/alert/sc_alert_coordinator.mm @@ -32264,42 +31414,6 @@ diff --git a/ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm b/ios/sh "images?q=tbn:ANd9GcRl35jshKCRWt76yUSKh5r0_" "BRbWuSU1uZOCGnzq95nJ8yXUg913LciCgz-s3reyfACsrAAYg"); suggestion.icon = [[SimpleOmniboxIcon alloc] -diff --git a/ios/testing/data/http_server_files/simple_login_form.html b/ios/testing/data/http_server_files/simple_login_form.html ---- a/ios/testing/data/http_server_files/simple_login_form.html -+++ b/ios/testing/data/http_server_files/simple_login_form.html -@@ -2,7 +2,7 @@ - - - Login form. --

-+ -
-
- -diff --git a/ios/testing/data/http_server_files/simple_signup_form.html b/ios/testing/data/http_server_files/simple_signup_form.html ---- a/ios/testing/data/http_server_files/simple_signup_form.html -+++ b/ios/testing/data/http_server_files/simple_signup_form.html -@@ -2,7 +2,7 @@ - - - Signup form. -- -+ -
-
- -diff --git a/ios/testing/data/http_server_files/window_open.html b/ios/testing/data/http_server_files/window_open.html ---- a/ios/testing/data/http_server_files/window_open.html -+++ b/ios/testing/data/http_server_files/window_open.html -@@ -141,7 +141,7 @@ found in the LICENSE file. --> - - - -- diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm --- a/ios/web/navigation/navigation_manager_impl.mm +++ b/ios/web/navigation/navigation_manager_impl.mm @@ -32356,7 +31470,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 -@@ -771,7 +771,7 @@ BOOL gChromeContextMenuEnabled = NO; +@@ -865,7 +865,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 @@ -33250,18 +32364,6 @@ diff --git a/mojo/PRESUBMIT.py b/mojo/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -diff --git a/native_client_sdk/PRESUBMIT.py b/native_client_sdk/PRESUBMIT.py ---- a/native_client_sdk/PRESUBMIT.py -+++ b/native_client_sdk/PRESUBMIT.py -@@ -4,7 +4,7 @@ - - """Top-level presubmit script for native_client_sdk. - --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/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 @@ -34249,7 +33351,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 -@@ -2281,10 +2281,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2279,10 +2279,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -34321,192 +33423,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/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html b/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html ---- a/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html -+++ b/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html -@@ -33,8 +33,8 @@ tester.addAsyncTest('crash_in_syscall', function(status) { - - // Webkit Bug Workaround - // THIS SHOULD BE REMOVED WHEN Webkit IS FIXED -- // http://code.google.com/p/nativeclient/issues/detail?id=2428 -- // http://code.google.com/p/chromium/issues/detail?id=103588 -+ // http://code.9oo91e.qjz9zk/p/nativeclient/issues/detail?id=2428 -+ // http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=103588 - ForcePluginLoadOnTimeout(embed, tester, 15000); - - var div = document.createElement('div'); -diff --git a/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html b/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html ---- a/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html -+++ b/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html -@@ -25,8 +25,8 @@ tester.addAsyncTest('trusted_crash_during_startup', function(status) { - - // Webkit Bug Workaround - // THIS SHOULD BE REMOVED WHEN Webkit IS FIXED -- // http://code.google.com/p/nativeclient/issues/detail?id=2428 -- // http://code.google.com/p/chromium/issues/detail?id=103588 -+ // http://code.9oo91e.qjz9zk/p/nativeclient/issues/detail?id=2428 -+ // http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=103588 - ForcePluginLoadOnTimeout(embed, tester, 15000); - - var div = document.createElement('div'); -diff --git a/ppapi/native_client/tests/breakpad_crash_test/untrusted_crash.html b/ppapi/native_client/tests/breakpad_crash_test/untrusted_crash.html ---- a/ppapi/native_client/tests/breakpad_crash_test/untrusted_crash.html -+++ b/ppapi/native_client/tests/breakpad_crash_test/untrusted_crash.html -@@ -33,8 +33,8 @@ tester.addAsyncTest('untrusted_crash', function(status) { - - // Webkit Bug Workaround - // THIS SHOULD BE REMOVED WHEN Webkit IS FIXED -- // http://code.google.com/p/nativeclient/issues/detail?id=2428 -- // http://code.google.com/p/chromium/issues/detail?id=103588 -+ // http://code.9oo91e.qjz9zk/p/nativeclient/issues/detail?id=2428 -+ // http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=103588 - ForcePluginLoadOnTimeout(embed, tester, 15000); - - var div = document.createElement('div'); -diff --git a/ppapi/tests/test_network_proxy.cc b/ppapi/tests/test_network_proxy.cc ---- a/ppapi/tests/test_network_proxy.cc -+++ b/ppapi/tests/test_network_proxy.cc -@@ -35,7 +35,7 @@ std::string TestNetworkProxy::TestGetProxyForURL() { - - callback.WaitForResult( - pp::NetworkProxy::GetProxyForURL(instance_, -- pp::Var("http://www.google.com"), -+ pp::Var("http://www.9oo91e.qjz9zk"), - callback.GetCallback())); - CHECK_CALLBACK_BEHAVIOR(callback); - ASSERT_EQ(PP_OK, callback.result()); -diff --git a/ppapi/tests/test_tcp_socket_private_disallowed.cc b/ppapi/tests/test_tcp_socket_private_disallowed.cc ---- a/ppapi/tests/test_tcp_socket_private_disallowed.cc -+++ b/ppapi/tests/test_tcp_socket_private_disallowed.cc -@@ -10,7 +10,7 @@ - - namespace { - --const char kServerName[] = "www.google.com"; -+const char kServerName[] = "www.9oo91e.qjz9zk"; - const int kPort = 80; - - } -diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc ---- a/ppapi/tests/test_url_loader.cc -+++ b/ppapi/tests/test_url_loader.cc -@@ -686,7 +686,7 @@ std::string TestURLLoader::TestUntrustedHttpRequests() { - // Untrusted requests with custom referrer should fail. - { - pp::URLRequestInfo request(instance_); -- request.SetCustomReferrerURL("http://www.google.com/"); -+ request.SetCustomReferrerURL("http://www.9oo91e.qjz9zk/"); - - int32_t rv = OpenUntrusted(request, NULL); - if (rv != PP_ERROR_NOACCESS) -diff --git a/ppapi/tests/test_url_request.cc b/ppapi/tests/test_url_request.cc ---- a/ppapi/tests/test_url_request.cc -+++ b/ppapi/tests/test_url_request.cc -@@ -189,7 +189,7 @@ std::string TestURLRequest::TestSetProperty() { - TEST_INT_INVALID(PP_URLREQUESTPROPERTY_PREFETCHBUFFERUPPERTHRESHOLD), - TEST_INT_INVALID(PP_URLREQUESTPROPERTY_PREFETCHBUFFERLOWERTHRESHOLD), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_URL), -- PP_MakeString("http://www.google.com"), PP_TRUE), -+ PP_MakeString("http://www.9oo91e.qjz9zk"), PP_TRUE), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_URL), - PP_MakeString("foo.jpg"), PP_TRUE), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_METHOD), -@@ -201,7 +201,7 @@ std::string TestURLRequest::TestSetProperty() { - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_HEADERS), PP_MakeString(""), - PP_TRUE), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_CUSTOMREFERRERURL), -- PP_MakeString("http://www.google.com"), PP_TRUE), -+ PP_MakeString("http://www.9oo91e.qjz9zk"), PP_TRUE), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_CUSTOMREFERRERURL), - PP_MakeString(""), PP_TRUE), - PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_CUSTOMREFERRERURL), -diff --git a/ppapi/tests/test_url_util.cc b/ppapi/tests/test_url_util.cc ---- a/ppapi/tests/test_url_util.cc -+++ b/ppapi/tests/test_url_util.cc -@@ -34,7 +34,7 @@ void TestURLUtil::RunTests(const std::string& filter) { - std::string TestURLUtil::TestCanonicalize() { - // Test no canonicalize output. - pp::Var result = util_->Canonicalize("http://Google.com"); -- ASSERT_TRUE(result.AsString() == "http://google.com/"); -+ ASSERT_TRUE(result.AsString() == "http://9oo91e.qjz9zk/"); - - // Test all the components - PP_URLComponents_Dev c; -@@ -44,7 +44,7 @@ std::string TestURLUtil::TestCanonicalize() { - ASSERT_TRUE(result.AsString() == - // 0 1 2 3 4 - // 0123456789012345678901234567890123456789012 -- "http://me:pw@google.com:1234/path?query#ref"); -+ "http://me:pw@9oo91e.qjz9zk:1234/path?query#ref"); - ASSERT_TRUE(ComponentEquals(c.scheme, 0, 4)); - ASSERT_TRUE(ComponentEquals(c.username, 7, 2)); - ASSERT_TRUE(ComponentEquals(c.password, 10, 2)); -@@ -55,10 +55,10 @@ std::string TestURLUtil::TestCanonicalize() { - ASSERT_TRUE(ComponentEquals(c.ref, 40, 3)); - - // Test minimal components. -- result = util_->Canonicalize("http://google.com/", &c); -+ result = util_->Canonicalize("http://9oo91e.qjz9zk/", &c); - // 0 1 - // 0123456789012345678 -- ASSERT_TRUE(result.AsString() == "http://google.com/"); -+ ASSERT_TRUE(result.AsString() == "http://9oo91e.qjz9zk/"); - ASSERT_TRUE(ComponentEquals(c.scheme, 0, 4)); - ASSERT_TRUE(ComponentEquals(c.username, 0, -1)); - ASSERT_TRUE(ComponentEquals(c.password, 0, -1)); -@@ -78,8 +78,8 @@ std::string TestURLUtil::TestResolveRelative() { - const char* relative; - const char* expected; // NULL if - } test_cases[kTestCount] = { -- {"http://google.com/", "foo", "http://google.com/foo"}, -- {"http://google.com/foo", "/bar", "http://google.com/bar"}, -+ {"http://9oo91e.qjz9zk/", "foo", "http://9oo91e.qjz9zk/foo"}, -+ {"http://9oo91e.qjz9zk/foo", "/bar", "http://9oo91e.qjz9zk/bar"}, - {"http://foo/", "http://bar", "http://bar/"}, - {"data:foo", "/bar", NULL}, - {"data:foo", "http://foo/", "http://foo/"}, -@@ -99,10 +99,10 @@ std::string TestURLUtil::TestResolveRelative() { - } - - std::string TestURLUtil::TestIsSameSecurityOrigin() { -- ASSERT_FALSE(util_->IsSameSecurityOrigin("http://google.com/", -+ ASSERT_FALSE(util_->IsSameSecurityOrigin("http://9oo91e.qjz9zk/", - "http://example.com/")); -- ASSERT_TRUE(util_->IsSameSecurityOrigin("http://google.com/foo", -- "http://google.com/bar")); -+ ASSERT_TRUE(util_->IsSameSecurityOrigin("http://9oo91e.qjz9zk/foo", -+ "http://9oo91e.qjz9zk/bar")); - PASS(); - } - -diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc ---- a/ppapi/tests/test_websocket.cc -+++ b/ppapi/tests/test_websocket.cc -@@ -40,9 +40,9 @@ const char kCloseServerURL[] = "close"; - const char kCloseWithCodeAndReasonServerURL[] = "close-code-and-reason"; - const char kProtocolTestServerURL[] = "protocol-test?protocol="; - --const char* const kInvalidURLs[] = {"http://www.google.com/invalid_scheme", -- "ws://www.google.com/invalid#fragment", -- "ws://www.google.com:7/invalid_port", -+const char* const kInvalidURLs[] = {"http://www.9oo91e.qjz9zk/invalid_scheme", -+ "ws://www.9oo91e.qjz9zk/invalid#fragment", -+ "ws://www.9oo91e.qjz9zk:7/invalid_port", - NULL}; - - // Internal packet sizes. -diff --git a/ppapi/tests/test_x509_certificate_private.cc b/ppapi/tests/test_x509_certificate_private.cc ---- a/ppapi/tests/test_x509_certificate_private.cc -+++ b/ppapi/tests/test_x509_certificate_private.cc -@@ -159,7 +159,7 @@ std::string TestX509CertificatePrivate::TestValidCertificate() { - ASSERT_TRUE(successful); - - ASSERT_TRUE(FieldMatchesString(certificate, -- PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME, "www.google.com")); -+ PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME, "www.9oo91e.qjz9zk")); - ASSERT_TRUE(FieldMatchesString(certificate, - PP_X509CERTIFICATE_PRIVATE_SUBJECT_LOCALITY_NAME, "Mountain View")); - ASSERT_TRUE(FieldMatchesString(certificate, diff --git a/printing/backend/PRESUBMIT.py b/printing/backend/PRESUBMIT.py --- a/printing/backend/PRESUBMIT.py +++ b/printing/backend/PRESUBMIT.py @@ -34522,7 +33438,7 @@ diff --git a/printing/backend/PRESUBMIT.py b/printing/backend/PRESUBMIT.py 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 -@@ -118,10 +118,10 @@ const char kXpsTicketTemplate[] = +@@ -119,10 +119,10 @@ const char kXpsTicketTemplate[] = "" " kApiKey{&kExperiment, -diff --git a/testing/PRESUBMIT.py b/testing/PRESUBMIT.py ---- a/testing/PRESUBMIT.py -+++ b/testing/PRESUBMIT.py -@@ -4,7 +4,7 @@ - - """Top-level presubmit script for testing. - --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/testing/android/native_test/java/AndroidManifest.xml.jinja2 b/testing/android/native_test/java/AndroidManifest.xml.jinja2 ---- a/testing/android/native_test/java/AndroidManifest.xml.jinja2 -+++ b/testing/android/native_test/java/AndroidManifest.xml.jinja2 -@@ -26,8 +26,8 @@ found in the LICENSE file. - -+ https://developer.8n6r01d.qjz9zk/training/data-storage#scoped-storage and -+ https://developer.8n6r01d.qjz9zk/training/data-storage/compatibility. --> - {% if allow_cleartext_traffic == 'true' %} - str: -- return 'http://ci.chromium.org/b/%s' % build_id -+ return 'http://ci.ch40m1um.qjz9zk/b/%s' % build_id - - - # These explicit overrides could likely be replaced by using regular dicts with -diff --git a/testing/unexpected_passes_common/queries.py b/testing/unexpected_passes_common/queries.py ---- a/testing/unexpected_passes_common/queries.py -+++ b/testing/unexpected_passes_common/queries.py -@@ -46,7 +46,7 @@ SUBMITTED_BUILDS_TEMPLATE = """\ - UNNEST(builds) as unnested_builds, - UNNEST(gerrit_changes) as unnested_changes - WHERE -- unnested_builds.host = "cr-buildbucket.appspot.com" -+ unnested_builds.host = "cr-buildbucket.8pp2p8t.qjz9zk" - AND unnested_changes.submit_status = "SUCCESS" - AND start_time > TIMESTAMP_SUB(CURRENT_TIMESTAMP(), - INTERVAL 30 DAY)""" -diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py ---- a/testing/variations/PRESUBMIT.py -+++ b/testing/variations/PRESUBMIT.py -@@ -3,7 +3,7 @@ - # found in the LICENSE file. - """Presubmit script validating field trial configs. - --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/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 -@@ -799,7 +799,7 @@ - { - "name": "Enabled_20210611", - "params": { -- "json_parameters": "\n{\n \"denylistedDomains\": [\"google.com\", \"facebook.com\", \"ampproject.org\",\n \"amazon.com\", \"pornhub.com\", \"xnxx.com\",\n \"xvideos.com\", \"twitter.com\", \"instagram.com\",\n \"craigslist.org\", \"yahoo.com\",\n \"googleadservices.com\", \"youtube.com\",\n \"zillow.com\", \"wikipedia.org\", \"xhamster.com\",\n \"pinterest.com\", \"reddit.com\", \"indeed.com\",\n \"dailymail.co.uk\", \"weather.com\", \"mlb.com\",\n \"live.com\", \"realtor.com\", \"trulia.com\",\n \"ca.gov\", \"pch.com\", \"paypal.com\", \"office.com\",\n \"espn.com\"],\n \"heuristics\":[\n {\n \"intent\":\"SHOPPING_ASSISTED_CHECKOUT\",\n \"conditionSet\":{\n \"schemes\":[\"https\"],\n \"urlMatches\":\"(?i)cart|trolley|basket|checkout|fulfil+ment|bag|shipping|pay|buy\"\n }\n },\n {\n \"intent\":\"SHOPPING_ASSISTED_CHECKOUT\",\n \"conditionSet\":{\n \"urlPrefix\":\"https://www.jegs.com/webapp/wcs/stores/servlet/OrderItemDisplay\"\n }\n }\n ]\n}" -+ "json_parameters": "\n{\n \"denylistedDomains\": [\"9oo91e.qjz9zk\", \"f8c3b00k.qjz9zk\", \"ampproject.org\",\n \"amazon.com\", \"pornhub.com\", \"xnxx.com\",\n \"xvideos.com\", \"twitter.com\", \"instagram.com\",\n \"craigslist.org\", \"yahoo.com\",\n \"9oo91eadservices.qjz9zk\", \"y0u1ub3.qjz9zk\",\n \"zillow.com\", \"wikipedia.org\", \"xhamster.com\",\n \"pinterest.com\", \"reddit.com\", \"indeed.com\",\n \"dailymail.co.uk\", \"weather.com\", \"mlb.com\",\n \"live.com\", \"realtor.com\", \"trulia.com\",\n \"ca.gov\", \"pch.com\", \"paypal.com\", \"office.com\",\n \"espn.com\"],\n \"heuristics\":[\n {\n \"intent\":\"SHOPPING_ASSISTED_CHECKOUT\",\n \"conditionSet\":{\n \"schemes\":[\"https\"],\n \"urlMatches\":\"(?i)cart|trolley|basket|checkout|fulfil+ment|bag|shipping|pay|buy\"\n }\n },\n {\n \"intent\":\"SHOPPING_ASSISTED_CHECKOUT\",\n \"conditionSet\":{\n \"urlPrefix\":\"https://www.jegs.com/webapp/wcs/stores/servlet/OrderItemDisplay\"\n }\n }\n ]\n}" - }, - "enable_features": [ - "AutofillAssistantInCctTriggering", -@@ -1536,7 +1536,7 @@ - { - "name": "Enabled_All_20220418", - "params": { -- "allowed_websites": "https://www.youtube.com|/embed,https://www.google.com|/maps/embed" -+ "allowed_websites": "https://www.y0u1ub3.qjz9zk|/embed,https://www.9oo91e.qjz9zk|/maps/embed" - }, - "enable_features": [ - "AutomaticLazyFrameLoadingToAds", -@@ -1547,7 +1547,7 @@ - { - "name": "Enabled_LazyEmbeds_20220418", - "params": { -- "allowed_websites": "https://www.youtube.com|/embed,https://www.google.com|/maps/embed" -+ "allowed_websites": "https://www.y0u1ub3.qjz9zk|/embed,https://www.9oo91e.qjz9zk|/maps/embed" - }, - "enable_features": [ - "AutomaticLazyFrameLoadingToEmbedUrls", -@@ -1570,7 +1570,7 @@ - { - "name": "Control_20220418", - "params": { -- "allowed_websites": "https://www.youtube.com|/embed,https://www.google.com|/maps/embed" -+ "allowed_websites": "https://www.y0u1ub3.qjz9zk|/embed,https://www.9oo91e.qjz9zk|/maps/embed" - }, - "enable_features": [ - "AutomaticLazyFrameLoadingToEmbedUrls" -@@ -7253,14 +7253,14 @@ - { - "name": "Prefetch_2_20220214", - "params": { -- "dns_canary_url": "http://dns-tunnel-check.googlezip.net/connect", -+ "dns_canary_url": "http://dns-tunnel-check.9oo91e21p.qjz9zk/connect", - "do_no_state_prefetch": "false", - "ineligible_decoy_request_probability": "1", - "lite_mode_only": "false", - "max_srp_prefetches": "5", - "max_subresource_count_per_prerender": "0", - "start_spare_renderer": "true", -- "tls_canary_url": "http://tls-tunnel-check.googlezip.net/connect", -+ "tls_canary_url": "http://tls-tunnel-check.9oo91e21p.qjz9zk/connect", - "use_speculation_rules": "true" - }, - "enable_features": [ -@@ -7452,7 +7452,7 @@ - { - "name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}", - "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -7477,7 +7477,7 @@ - { - "name": "EnabledExploreAndTrendingSegmentation2", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "behavioural_targeting": "model_comparison", - "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", - "image_prefetch_mode": "top", -@@ -9635,7 +9635,7 @@ - { - "name": "Enabled", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "default_locale": "en", - "enable_share": "true", - "experiment_tag": "", diff --git a/third_party/Python-Markdown/markdown/extensions/smarty.py b/third_party/Python-Markdown/markdown/extensions/smarty.py --- a/third_party/Python-Markdown/markdown/extensions/smarty.py +++ b/third_party/Python-Markdown/markdown/extensions/smarty.py @@ -36821,7 +35396,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 -@@ -2433,7 +2433,7 @@ void Element::UpdatePopupAttribute(String value) { +@@ -2439,7 +2439,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: " @@ -36869,7 +35444,7 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party 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 +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1773,7 +1773,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1780,7 +1780,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, "The frame attempting navigation of the top-level window is " "sandboxed with the 'allow-top-navigation-by-user-activation' " "flag, but has no user activation (aka gesture). See " @@ -36878,7 +35453,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } return false; } -@@ -1885,7 +1885,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1892,7 +1892,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, "The frame attempting navigation is targeting its top-level window, " "but is neither same-origin with its target nor has it received a " "user gesture. See " @@ -36890,7 +35465,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc --- a/third_party/blink/renderer/core/html/html_iframe_element.cc +++ b/third_party/blink/renderer/core/html/html_iframe_element.cc -@@ -282,7 +282,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -309,7 +309,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "