diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 9334f0a0..862962e5 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -d5d96df7c999fb23a203ac332784b203afe8614f- \ No newline at end of file +2b74f7c8269b43e04063b651ab995b67f56387c2- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index 9cd9dad5..41fd91b1 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -102.0.5005.96 \ No newline at end of file +103.0.5060.47 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index d3d70e92..1cc41f32 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -91e2c8c16071b47c9a1d2c1bba592f6a643dd1b1 \ No newline at end of file +a293a5dd3009f4017a8c4422a69f3eb9b3056776 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 8c592616..ea0b575f 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -1,4 +1,3 @@ -Disable-third-party-cookies-by-default.patch do-not-hide-.orig-files.patch Do-not-link-with-libatomic.patch do-not-add-suffix-to-package-name.patch @@ -13,7 +12,6 @@ disable-battery-status-updater.patch Battery-API-return-nothing.patch updater-disable-updater-pings.patch Remove-EV-certificates.patch -promo-disable-Google-promotion-fetching.patch Disable-omission-of-URL-elements-in-Omnibox.patch Modify-default-preferences.patch Do-not-hide-component-extensions.patch @@ -32,8 +30,7 @@ ungoogled-chromium-Disable-Gaia.patch ungoogled-chromium-Disable-Network-Time-Tracker.patch Disable-safe-browsing.patch Disable-all-promo-dialogs.patch -Remove-signin-integrations.patch -Hide-passwords-manager-link.patch +Remove-signin-and-sync-integrations.patch Disable-update-scheduler.patch Add-English-only-search-engine.patch Add-DuckDuckGo-Lite-search-engine.patch @@ -77,20 +74,17 @@ kill-Location-fall-back-to-system.patch kill-Auth.patch Remove-binary-blob-integrations.patch Remove-SMS-integration.patch +Remove-price-shopping-commerce-integrations.patch +Remove-voice-recognition-integration.patch Do-not-compile-QR-code-sharing.patch -Allow-website-sign-in-without-account-sign-in.patch Offer-builtin-autocomplete-for-chrome-flags.patch Use-4-tile-rows-never-show-logo.patch Disable-various-metrics.patch Enable-SPPI-for-devices-with-enough-memory.patch Enable-StrictOriginIsolation-and-SitePerProcess.patch Use-64-bit-WebView-processes.patch -prefs-disable-signinallowed-by-default.patch prefs-always-prompt-for-download-directory.patch Disable-offline-pages-in-CCT.patch -disable-payment-support-by-default.patch -disable-background-sync-by-default.patch -disable-sensors-access-site-setting-by-default.patch Disable-media-router-and-remoting-by-default.patch Restore-Search-Ready-Omnibox-flag.patch disable-AdsBlockedInfoBar.patch @@ -108,9 +102,9 @@ Show-site-settings-for-cookies-javascript-and-ads.patch Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch -disable-browser-autologin-by-default.patch AImageReader-CFI-crash-mitigations.patch Add-menu-item-to-view-source.patch +Revert-removal-of-execution-context-address-space.patch Block-gateway-attacks-via-websockets.patch Enable-prefetch-privacy-changes-by-default.patch Disable-support-for-RAR-files-inspection.patch @@ -126,7 +120,6 @@ Add-option-to-use-home-page-as-NTP.patch Revert-the-removal-of-an-option-to-block-autoplay.patch Disable-text-fragments-by-default.patch disable-WebView-variations-support.patch -ask-permission-to-play-protected-media-by-default.patch Enable-network-isolation-features.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch @@ -142,6 +135,7 @@ Add-AllowUserCertificates-flag.patch Add-IsCleartextPermitted-flag.patch Unexpire-tab-groups-flags.patch Add-flag-for-omnibox-autocomplete-filtering.patch +Revert-Delete-block-external-form-redirects.patch Enable-IntentBlockExternalFormRedirectsNoGesture.patch Add-flag-to-disable-external-intent-requests.patch Logcat-crash-reports-UI.patch @@ -167,7 +161,6 @@ Restore-offline-indicator-v2-flag.patch Reintroduce-override_build_timestamp.patch enable-ftrivial-auto-var-init-zero.patch disable-appending-variations-header.patch -Make-HTTPS-only-mode-the-default.patch Disable-idle-detection.patch Allow-building-without-supervised-users.patch Disable-minidump-upload-scheduling.patch @@ -192,8 +185,8 @@ Content-settings-infrastructure.patch Add-webGL-site-setting.patch Add-site-engagement-flag.patch Add-webRTC-site-settings.patch -enable-process-isolated-sandboxed-iframes-by-default.patch Enable-Certificate-Transparency.patch Invalidate-components-public-key.patch Improve-plain-text-rendering-on-mobile.patch +Remove-segmentation-platform.patch Automated-domain-substitution.patch diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 17c45c93..188a4659 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -8,5 +8,4 @@ Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch enable-ftrivial-auto-var-init-zero.patch Disable-feeds-support-by-default.patch -Allow-building-without-supervised-users.patch Chromium-package-name.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index f59377c6..72817562 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -17,6 +17,8 @@ See discussions at: * https://github.com/bromite/bromite/issues/445 * https://github.com/bromite/bromite/issues/814 * https://github.com/bromite/bromite/issues/1005 + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- base/android/android_image_reader_compat.cc | 8 +++++++- base/android/android_image_reader_compat.h | 4 ++++ @@ -82,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 -@@ -2243,9 +2243,9 @@ +@@ -2247,9 +2247,9 @@ "expiry_milestone": 106 }, { @@ -186,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 -@@ -580,6 +580,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -588,6 +588,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) @@ -229,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 -@@ -711,6 +711,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -730,6 +730,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}; @@ -243,7 +245,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -223,6 +223,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -227,6 +227,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays; MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; diff --git a/build/patches/API-level-21-prevent-crash-on-download.patch b/build/patches/API-level-21-prevent-crash-on-download.patch index 29fa852f..b49b0404 100644 --- a/build/patches/API-level-21-prevent-crash-on-download.patch +++ b/build/patches/API-level-21-prevent-crash-on-download.patch @@ -6,6 +6,8 @@ On Lollipop 5.0.x it is not possible to use the system persistent bundle. This patch ignores boolean settings for them and prevents the crash. See also: https://github.com/bromite/bromite/issues/1184 + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../BundleToPersistableBundleConverter.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 2935c2ae..73435c9b 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -4,6 +4,8 @@ Subject: AV1 codec support libaom build fixes (requires -fPIC) Report AV1 as playable on Android + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- third_party/libaom/BUILD.gn | 6 ++++-- third_party/libaom/libaom_srcs.gni | 5 +++++ @@ -54,7 +56,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -652,6 +652,11 @@ aom_rc_interface_sources = [ +@@ -665,6 +665,11 @@ aom_rc_interface_sources = [ "//third_party/libaom/source/libaom/test/yuv_video_source.h", ] diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index fa9b73a6..438234ea 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -2,6 +2,8 @@ From: uazo Date: Mon, 26 Apr 2021 13:28:24 +0000 Subject: Add AllowUserCertificates flag +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 3 +++ .../chrome/browser/app/flags/ChromeCachedFlags.java | 1 + @@ -18,7 +20,7 @@ Subject: Add AllowUserCertificates flag 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 -@@ -231,6 +231,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -26,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; -@@ -994,6 +995,8 @@ public abstract class ChromeActivity +@@ -949,6 +950,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -38,7 +40,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/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 -@@ -94,6 +94,7 @@ public class ChromeCachedFlags { +@@ -96,6 +96,7 @@ public class ChromeCachedFlags { .GIVE_JAVA_UI_THREAD_DEFAULT_TASK_TRAITS_USER_BLOCKING_PRIORITY); add(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS); add(ChromeFeatureList.IMMERSIVE_UI_MODE); @@ -49,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3220,7 +3220,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3242,7 +3242,11 @@ const FeatureEntry kFeatureEntries[] = { {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName, flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, @@ -101,7 +103,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -399,6 +400,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -408,6 +409,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -125,9 +127,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -51,6 +51,7 @@ public class CachedFeatureFlags { +@@ -50,6 +50,7 @@ public class CachedFeatureFlags { + ImmutableMap.builder() .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true) - .put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false) .put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false) + .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false) .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false) diff --git a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch index 9cb120db..34e2dfec 100644 --- a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch +++ b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 9 Mar 2021 19:43:00 +0100 Subject: Add Alt+D hotkey to focus address bar +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch index cbc167d0..d9c684c2 100644 --- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch +++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 12 Oct 2017 11:06:18 +0200 Subject: Add DuckDuckGo Lite search engine +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../search_engines/prepopulated_engines.json | 10 + .../search_engines/search_engine_type.h | 1 + @@ -31,11 +32,11 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -76,6 +76,7 @@ enum SearchEngineType { - SEARCH_ENGINE_ECOSIA = 59, - SEARCH_ENGINE_PETALSEARCH = 60, - SEARCH_ENGINE_GOOGLE_EN = 61, -+ SEARCH_ENGINE_DUCKDUCKGOLIGHT = 62, +@@ -78,6 +78,7 @@ enum SearchEngineType { + SEARCH_ENGINE_STARTER_PACK_BOOKMARKS = 61, + SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, + SEARCH_ENGINE_GOOGLE_EN = 63, ++ SEARCH_ENGINE_DUCKDUCKGOLIGHT = 64, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. }; diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index ddd37157..bf91f8f8 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -4,6 +4,8 @@ Subject: Add English-only search engine Add a Google search engine that forces languages to English, disable from all its searches RLZ and field experiments querystring parameters. + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../search_engines/prepopulated_engines.json | 21 ++ .../search_engines/search_engine_type.h | 1 + @@ -13,7 +15,7 @@ disable from all its searches RLZ and field experiments querystring parameters. diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -134,6 +134,27 @@ +@@ -135,6 +135,27 @@ "id": 1 }, @@ -44,11 +46,11 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -75,6 +75,7 @@ enum SearchEngineType { - SEARCH_ENGINE_PRIVACYWALL = 58, - SEARCH_ENGINE_ECOSIA = 59, +@@ -77,6 +77,7 @@ enum SearchEngineType { SEARCH_ENGINE_PETALSEARCH = 60, -+ SEARCH_ENGINE_GOOGLE_EN = 61, + SEARCH_ENGINE_STARTER_PACK_BOOKMARKS = 61, + SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, ++ SEARCH_ENGINE_GOOGLE_EN = 63, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. }; diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index bcd080e7..ad04956d 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -2,6 +2,8 @@ From: uazo Date: Mon, 26 Apr 2021 15:04:11 +0000 Subject: Add IsCleartextPermitted flag +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 4 ++++ @@ -14,7 +16,7 @@ Subject: Add IsCleartextPermitted flag 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 -@@ -8201,6 +8201,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8210,6 +8210,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -28,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 -@@ -1477,6 +1477,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1510,6 +1510,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -42,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 -@@ -834,6 +834,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -848,6 +848,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; @@ -80,7 +82,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -210,6 +210,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -211,6 +211,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 1c4b9f0e..d10e47a6 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -8,6 +8,8 @@ settings. Offer auto-complete for the proxy page URL. Store proxy settings in LocalState instead of Profile, so that proxy is used for SimpleURLLoaders as well. + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/res/values/values.xml | 3 + .../java/res/xml/privacy_preferences.xml | 4 + @@ -70,18 +72,18 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -58,6 +58,7 @@ public class PrivacySettings +@@ -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_INCOGNITO_LOCK = "incognito_lock"; - private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key"; + diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -275,6 +275,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -277,6 +277,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -93,8 +95,8 @@ 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 -@@ -74,6 +74,12 @@ - +@@ -79,6 +79,12 @@ + + @@ -190,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 -@@ -994,6 +996,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -983,6 +985,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -635,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 -@@ -281,6 +281,8 @@ static_library("ui") { +@@ -286,6 +286,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -647,15 +649,15 @@ 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 -@@ -56,6 +56,7 @@ +@@ -57,6 +57,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" +#include "chrome/browser/ui/webui/proxy_config_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" - #include "chrome/browser/ui/webui/profiles/profile_internals_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" -@@ -778,6 +779,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, + #include "chrome/browser/ui/webui/signin_internals_ui.h" +@@ -765,6 +766,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1126,7 +1128,7 @@ new file mode 100644 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -48,6 +48,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -45,6 +45,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -1135,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"; -@@ -421,6 +423,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -419,6 +421,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1143,7 +1145,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -672,6 +675,7 @@ const char* const kChromeHostURLs[] = { +@@ -671,6 +674,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1154,7 +1156,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -132,6 +132,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -133,6 +133,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -1302,7 +1304,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc --- a/components/proxy_config/proxy_policy_handler.cc +++ b/components/proxy_config/proxy_policy_handler.cc -@@ -258,7 +258,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, +@@ -260,7 +260,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, ProxyConfigDictionary::CreateFixedServers( server->GetString(), bypass_list && bypass_list->is_string() ? bypass_list->GetString() diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index f8eca5cc..76893845 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -1,4 +1,4 @@ -From: uazo +From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:20:36 +0200 Subject: Add an always-incognito mode @@ -14,7 +14,10 @@ IncognitoPlaceholder is also deactivated, both in the phone and tablet version. The relative tests are also present. based on the original work by Ryan Archer +Major contributions by uazo. See also: https://github.com/bromite/bromite/pull/1427 + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/chrome_java_resources.gni | 1 + chrome/android/chrome_java_sources.gni | 2 + @@ -39,7 +42,7 @@ See also: https://github.com/bromite/bromite/pull/1427 .../HistoricalTabModelObserver.java | 8 +- .../tab/tab_restore/HistoricalTabSaver.java | 2 +- .../tab_restore/HistoricalTabSaverImpl.java | 16 +- - .../tabbed_mode/TabbedRootUiCoordinator.java | 5 +- + .../tabbed_mode/TabbedRootUiCoordinator.java | 4 +- .../browser/tabmodel/ChromeTabCreator.java | 5 +- .../tabmodel/TabModelSelectorImpl.java | 3 + .../browser/tabmodel/TabPersistentStore.java | 9 + @@ -80,7 +83,7 @@ See also: https://github.com/bromite/bromite/pull/1427 .../omnibox/browser/base_search_provider.cc | 2 +- components/omnibox/browser/search_provider.cc | 4 +- .../host_content_settings_map_factory.cc | 1 + - 64 files changed, 688 insertions(+), 75 deletions(-) + 64 files changed, 687 insertions(+), 75 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 @@ -89,7 +92,7 @@ See also: https://github.com/bromite/bromite/pull/1427 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 -@@ -695,6 +695,7 @@ chrome_java_resources = [ +@@ -679,6 +679,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", @@ -108,7 +111,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", -@@ -973,6 +974,7 @@ chrome_java_sources = [ +@@ -952,6 +953,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", @@ -234,7 +237,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -56,6 +56,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; +@@ -53,6 +53,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; import org.chromium.base.task.PostTask; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -242,7 +245,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; -@@ -1853,8 +1854,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1903,6 +1904,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -286,7 +289,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; -@@ -96,6 +97,10 @@ import java.util.ArrayList; +@@ -97,6 +98,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -297,7 +300,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. -@@ -524,6 +529,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -527,6 +532,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -311,7 +314,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; -@@ -580,7 +592,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -583,7 +595,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -328,7 +331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App } if (item.getItemId() == R.id.menu_group_tabs) { item.setVisible(isMenuGroupTabsVisible); -@@ -817,7 +837,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -820,7 +840,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 @@ -342,7 +345,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -31,6 +31,7 @@ import org.chromium.base.ContextUtils; +@@ -30,6 +30,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; @@ -350,7 +353,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; -@@ -418,6 +419,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -374,6 +375,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -360,7 +363,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -436,6 +440,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -392,6 +396,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -368,7 +371,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); } -@@ -460,7 +465,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -416,7 +421,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -423,7 +426,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.DefaultBrowserInfo; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; -@@ -168,6 +169,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -171,6 +172,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat downloadItemVisible = false; openInChromeItemVisible = false; } @@ -446,7 +449,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; -@@ -748,7 +751,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -771,7 +774,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -498,15 +501,15 @@ 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 -@@ -22,6 +22,7 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment; import org.chromium.chrome.browser.flags.ChromeFeatureList; - import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; -@@ -43,6 +44,12 @@ import org.chromium.ui.base.Clipboard; + import org.chromium.chrome.browser.history_clusters.HistoryClustersCoordinator; +@@ -46,6 +47,12 @@ import org.chromium.ui.base.Clipboard; import java.util.List; @@ -519,8 +522,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Combines and manages the different UI components of browsing history. */ -@@ -229,7 +236,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve - : mSelectableListLayout; +@@ -255,7 +262,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve + return mRootView; } - private boolean shouldShowIncognitoPlaceholder() { @@ -540,14 +543,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java -@@ -10,12 +10,19 @@ import androidx.annotation.VisibleForTesting; +@@ -11,6 +11,7 @@ import androidx.annotation.VisibleForTesting; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; + import org.chromium.chrome.browser.history_clusters.HistoryClustersConstants; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; - import org.chromium.chrome.browser.ui.native_page.BasicNativePage; +@@ -18,6 +19,12 @@ import org.chromium.chrome.browser.ui.native_page.BasicNativePage; import org.chromium.chrome.browser.ui.native_page.NativePageHost; import org.chromium.components.embedder_support.util.UrlConstants; @@ -560,8 +564,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Native page for managing browsing history. */ -@@ -37,8 +44,17 @@ public class HistoryPage extends BasicNativePage { - boolean isIncognito, Supplier tabSupplier) { +@@ -40,6 +47,15 @@ public class HistoryPage extends BasicNativePage { + boolean isIncognito, Supplier tabSupplier, String url) { super(host); + if (isIncognito && @@ -572,12 +576,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History + if (historyEnabledInIncognito == true) isIncognito = false; + } + - mHistoryManager = - new HistoryManager(activity, false, snackbarManager, isIncognito, tabSupplier); + - mTitle = host.getContext().getResources().getString(R.string.menu_history); + Uri uri = Uri.parse(url); + assert uri.getHost().equals(UrlConstants.HISTORY_HOST); - initWithView(mHistoryManager.getView()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java @@ -641,7 +643,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 -@@ -73,7 +73,8 @@ public class RecentTabsManager implements AccountsChangeObserver { +@@ -82,7 +82,8 @@ public class RecentTabsManager { */ public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile, Context context, Runnable showHistoryManager) { @@ -819,7 +821,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -61,6 +61,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; +@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl; import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; @@ -827,7 +829,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -252,6 +253,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -258,6 +259,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -885,7 +887,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/tab/tab_restore/HistoricalTabSaverImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java -@@ -25,6 +25,8 @@ import java.util.Arrays; +@@ -29,6 +29,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -894,7 +896,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore /** * Creates historical entries in TabRestoreService. */ -@@ -46,10 +48,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { +@@ -62,10 +64,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { // HistoricalTabSaver implementation. @Override @@ -907,7 +909,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore } @Override -@@ -90,7 +92,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { +@@ -106,7 +108,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { // If there is only a single valid tab remaining save it individually. if (validEntries.size() == 1 && validEntries.get(0).isSingleTab()) { @@ -916,18 +918,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore return; } -@@ -107,8 +109,8 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { +@@ -128,10 +130,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { CollectionUtil.integerListToIntArray(perTabGroupId), allTabs.toArray(new Tab[0])); } - private void createHistoricalTabInternal(Tab tab) { -- HistoricalTabSaverImplJni.get().createHistoricalTab(tab); + private void createHistoricalTabInternal(Tab tab, boolean is_always_incognito) { + RecordHistogram.recordEnumeratedHistogram("Tabs.RecentlyClosed.HistoricalSaverCloseType", + HistoricalSaverCloseType.TAB, HistoricalSaverCloseType.COUNT); +- HistoricalTabSaverImplJni.get().createHistoricalTab(tab); + HistoricalTabSaverImplJni.get().createHistoricalTab(tab, is_always_incognito); } /** -@@ -116,7 +118,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { +@@ -139,7 +141,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { * internal Chrome scheme, about:blank, or a native page and it cannot be incognito. */ private boolean shouldSave(Tab tab) { @@ -936,7 +940,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore // {@link GURL#getScheme()} is not available in unit tests. if (mIgnoreUrlSchemesForTesting) return true; -@@ -194,7 +196,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { +@@ -217,7 +219,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { @NativeMethods interface Natives { @@ -948,7 +952,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 -@@ -122,6 +122,8 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -123,6 +123,8 @@ import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.util.TokenHolder; @@ -957,18 +961,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab /** * A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI. -@@ -493,11 +495,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { - - // TODO(twellington): Supply TabModelSelector as well and move initialization earlier. - if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { -+ boolean tabModel = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito(); - AppMenuHandler appMenuHandler = +@@ -499,7 +501,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); - mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper( - mTabModelSelectorSupplier.get(), -- mTabCreatorManagerSupplier.get().getTabCreator(false), mActivity, -+ mTabCreatorManagerSupplier.get().getTabCreator(tabModel), mActivity, - appMenuHandler, mSnackbarManagerSupplier.get(), mOverviewModeBehaviorSupplier); + mEmptyBackgroundViewWrapper = + new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), +- mTabCreatorManagerSupplier.get().getTabCreator(false), mActivity, ++ mTabCreatorManagerSupplier.get().getTabCreator(AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()), mActivity, + appMenuHandler, mSnackbarManagerSupplier.get(), mLayoutManagerSupplier); mEmptyBackgroundViewWrapper.initialize(); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java @@ -985,7 +984,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** * This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ -@@ -336,7 +340,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -338,7 +342,6 @@ public class ChromeTabCreator extends TabCreator { // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome. public Tab launchUrlFromExternalApp( LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { @@ -1087,7 +1086,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 -@@ -4373,6 +4373,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4384,6 +4384,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -1154,7 +1153,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -301,6 +301,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +@@ -303,6 +303,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() return IdentityManagerFactory::GetForProfile(profile_); } @@ -1228,7 +1227,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 -@@ -3338,6 +3338,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3363,6 +3363,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1244,7 +1243,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 -@@ -1896,6 +1896,9 @@ extern const char kNotificationPermissionRationaleDescription[]; +@@ -1912,6 +1912,9 @@ extern const char kNotificationPermissionRationaleDescription[]; extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingDescription[]; @@ -1257,7 +1256,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 -@@ -475,8 +475,8 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -478,8 +478,8 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1565,7 +1564,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 -@@ -221,6 +221,7 @@ +@@ -224,6 +224,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1573,7 +1572,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" -@@ -1368,6 +1369,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1354,6 +1355,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1582,8 +1581,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse + /*default_value=*/false); + HistoryTabHelper::RegisterProfilePrefs(registry); #else // BUILDFLAG(IS_ANDROID) + ApcClient::RegisterPrefs(registry); AppShortcutManager::RegisterProfilePrefs(registry); - browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn --- a/chrome/browser/ui/android/native_page/BUILD.gn +++ b/chrome/browser/ui/android/native_page/BUILD.gn @@ -1610,7 +1609,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ /** * An interface for pages that will be using Android views instead of html/rendered Web content. */ -@@ -120,12 +122,12 @@ public interface NativePage { +@@ -130,12 +132,12 @@ public interface NativePage { */ @Deprecated // Use GURL-variant instead. public static boolean isNativePageUrl(String url, boolean isIncognito) { @@ -1625,7 +1624,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -136,7 +138,8 @@ public interface NativePage { +@@ -146,7 +148,8 @@ public interface NativePage { */ // TODO(crbug/783819) - Convert to using GURL. public static @NativePageType int nativePageType( @@ -1635,7 +1634,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ if (url == null) return NativePageType.NONE; Uri uri = Uri.parse(url); -@@ -158,7 +161,8 @@ public interface NativePage { +@@ -168,7 +171,8 @@ public interface NativePage { return NativePageType.DOWNLOADS; } else if (UrlConstants.HISTORY_HOST.equals(host)) { return NativePageType.HISTORY; @@ -1648,7 +1647,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1113,6 +1113,37 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1143,6 +1143,37 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. @@ -1732,7 +1731,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 -@@ -3323,6 +3323,12 @@ const char kShowCaretBrowsingDialog[] = +@@ -3397,6 +3397,12 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1748,7 +1747,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 -@@ -1178,6 +1178,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1205,6 +1205,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1757,7 +1756,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1214,6 +1216,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1241,6 +1243,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1771,7 +1770,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -110,10 +110,12 @@ void PrefProvider::RegisterProfilePrefs( +@@ -119,10 +119,12 @@ void PrefProvider::RegisterProfilePrefs( PrefProvider::PrefProvider(PrefService* prefs, bool off_the_record, @@ -1784,7 +1783,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov store_last_modified_(store_last_modified), clock_(base::DefaultClock::GetInstance()) { TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider"); -@@ -147,7 +149,9 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -156,7 +158,9 @@ PrefProvider::PrefProvider(PrefService* prefs, content_settings_prefs_.insert(std::make_pair( info->type(), std::make_unique( info->type(), prefs_, &pref_change_registrar_, @@ -1900,7 +1899,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h --- a/components/omnibox/browser/autocomplete_provider_client.h +++ b/components/omnibox/browser/autocomplete_provider_client.h -@@ -130,6 +130,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { +@@ -129,6 +129,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { virtual signin::IdentityManager* GetIdentityManager() const = 0; virtual bool IsOffTheRecord() const = 0; @@ -1923,7 +1922,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 -@@ -770,7 +770,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { +@@ -814,7 +814,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 1d1edf37..cb7669fa 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -7,6 +7,8 @@ Reduce permissions needed for bookmarks import/export Completely remove contacts picker permission from the file dialog Requires patch: Adds-support-for-writing-URIs.patch + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/AndroidManifest.xml | 1 - .../res/menu/bookmark_action_bar_menu.xml | 14 + @@ -701,7 +703,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 -@@ -1845,6 +1845,13 @@ static_library("browser") { +@@ -1812,6 +1812,13 @@ static_library("browser") { "webid/federated_identity_sharing_permission_context_factory.h", ] @@ -715,16 +717,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3003,6 +3010,8 @@ static_library("browser") { - "autofill/manual_filling_view_interface.h", - "banners/android/chrome_app_banner_manager_android.cc", - "banners/android/chrome_app_banner_manager_android.h", +@@ -2957,6 +2964,8 @@ static_library("browser") { + "autofill/manual_filling_controller.h", + "autofill/manual_filling_controller_impl.cc", + "autofill/manual_filling_controller_impl.h", + "bookmarks/bookmark_html_writer.cc", + "bookmarks/bookmark_html_writer.h", - "browser_process_platform_part_android.cc", - "browser_process_platform_part_android.h", - "chrome_browser_field_trials_mobile.cc", -@@ -3621,8 +3630,6 @@ static_library("browser") { + "autofill/manual_filling_utils.cc", + "autofill/manual_filling_utils.h", + "autofill/manual_filling_view_interface.h", +@@ -3584,8 +3593,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -736,7 +738,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -8246,6 +8246,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8235,6 +8235,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -1156,7 +1158,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" @@ -1220,7 +1222,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java -@@ -37,12 +37,12 @@ import java.util.ArrayList; +@@ -36,12 +36,12 @@ import java.util.ArrayList; public class DownloadLocationDialogCoordinator implements ModalDialogProperties.Controller { @NonNull private DownloadLocationDialogController mController; @@ -1236,7 +1238,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse private long mTotalBytes; private @DownloadLocationDialogType int mDialogType; private String mSuggestedPath; -@@ -131,7 +131,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. +@@ -130,7 +130,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. * Called after retrieved the download directory options. * @param dirs An list of available download directories. */ @@ -1248,7 +1250,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 -@@ -5872,6 +5872,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -5915,6 +5915,11 @@ const char kWebKioskEnableLacrosDescription[] = "ChromeOS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1263,7 +1265,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 -@@ -3404,6 +3404,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3422,6 +3422,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1279,12 +1281,12 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse @@ -174,6 +174,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBulkTabRestore, &kCastDeviceFilter, - &kCloseAllTabsModalDialog, -+ &kBookmarksExportUseSaf, &kCloseTabSuggestions, ++ &kBookmarksExportUseSaf, &kCriticalPersistedTabData, &kCCTBackgroundTab, -@@ -854,6 +855,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", + &kCCTClientDataHeader, +@@ -876,6 +877,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1298,25 +1300,25 @@ 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 -@@ -154,6 +154,7 @@ extern const base::Feature kToolbarMicIphAndroid; +@@ -154,6 +154,7 @@ extern const base::Feature kTestDefaultDisabled; + extern const base::Feature kTestDefaultEnabled; + extern const base::Feature kToolbarIphAndroid; + extern const base::Feature kToolbarMicIphAndroid; ++extern const base::Feature kBookmarksExportUseSaf; extern const base::Feature kToolbarUseHardwareBitmapDraw; extern const base::Feature kTrustedWebActivityLocationDelegation; extern const base::Feature kTrustedWebActivityNewDisclosure; -+extern const base::Feature kBookmarksExportUseSaf; - extern const base::Feature kTrustedWebActivityPostMessage; - extern const base::Feature kTrustedWebActivityQualityEnforcement; - extern const base::Feature kTrustedWebActivityQualityEnforcementForced; 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 @@ -557,6 +557,7 @@ public abstract class ChromeFeatureList { - public static final String WEB_APK_INSTALL_SERVICE = "WebApkInstallService"; - public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; - public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; + 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"; + public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf"; - - @NativeMethods - interface Natives { + public static final String VOICE_BUTTON_IN_TOP_TOOLBAR = "VoiceButtonInTopToolbar"; + public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback"; + public static final String WEB_FEED = "WebFeed"; diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -1387,14 +1389,14 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1017,6 +1019,7 @@ public final class ChromePreferenceKeys { +@@ -1031,6 +1033,7 @@ public final class ChromePreferenceKeys { ASSISTANT_VOICE_SEARCH_ENABLED, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, + BOOKMARKS_LAST_EXPORT_URI, APPLICATION_OVERRIDE_LANGUAGE, + BLUETOOTH_NOTIFICATION_IDS, CHROME_SURVEY_DOWNLOAD_ATTEMPTS.pattern(), - CHROME_SURVEY_PROMPT_DISPLAYED_TIMESTAMP.pattern(), 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 @@ -1426,7 +1428,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 -@@ -383,6 +383,9 @@ static_library("common") { +@@ -390,6 +390,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1439,7 +1441,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 -@@ -78,8 +78,6 @@ static_library("utility") { +@@ -82,8 +82,6 @@ static_library("utility") { if (!is_android) { sources += [ @@ -1448,7 +1450,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", -@@ -196,6 +194,11 @@ static_library("utility") { +@@ -202,6 +200,11 @@ static_library("utility") { ] } @@ -1463,7 +1465,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc --- a/chrome/utility/importer/bookmark_html_reader.cc +++ b/chrome/utility/importer/bookmark_html_reader.cc -@@ -16,7 +16,9 @@ +@@ -17,7 +17,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/common/importer/imported_bookmark_entry.h" diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 34f76e91..2543fac7 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -8,6 +8,8 @@ open external links in incognito flag. Flags are mutually exclusive. See also: https://github.com/bromite/bromite/issues/1474 + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../java/res/xml/privacy_preferences.xml | 10 ++++++++ .../browser/LaunchIntentDispatcher.java | 22 +++++++++++++++++ @@ -123,7 +125,7 @@ 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 -@@ -83,6 +83,9 @@ public class PrivacySettings +@@ -81,6 +81,9 @@ public class PrivacySettings private ViewGroup mDialogContainer; private BottomSheetController mBottomSheetController; @@ -133,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 = -@@ -154,6 +157,9 @@ public class PrivacySettings +@@ -148,6 +151,9 @@ public class PrivacySettings updatePreferences(); } @@ -143,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(); -@@ -170,6 +176,14 @@ public class PrivacySettings +@@ -164,6 +170,14 @@ public class PrivacySettings } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -158,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -192,6 +206,16 @@ public class PrivacySettings +@@ -186,6 +200,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -194,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 -@@ -4626,6 +4626,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 a7e23b15..4d00355d 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -3,6 +3,8 @@ Date: Tue, 31 Jan 2017 22:12:27 -0500 Subject: Add exit menu item Corrected Exit functionality + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/res/menu/main_menu.xml | 6 ++++++ .../org/chromium/chrome/browser/ApplicationLifetime.java | 2 ++ @@ -15,17 +17,17 @@ Corrected Exit functionality diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -158,6 +158,9 @@ - android:icon="@drawable/ic_business" /> +@@ -156,6 +156,9 @@ + android:title="@string/managed_browser" + android:icon="@drawable/ic_business" /> + -@@ -184,6 +187,9 @@ +@@ -182,6 +185,9 @@ @@ -57,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 -@@ -215,6 +215,8 @@ import java.util.HashSet; +@@ -211,6 +211,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -66,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. -@@ -2137,6 +2139,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2395,6 +2396,11 @@ public abstract class ChromeActivity return true; } @@ -117,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 -@@ -3341,6 +3341,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 0e7e41f9..770d63ea 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -4,6 +4,8 @@ Subject: Add flag for omnibox autocomplete filtering Adds a flag that restricts whether search history, clipboard, bookmarks and internal chrome:// pages will be used for the autocomplete results. + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 22 ++++++++++++++++++- .../browser/autocomplete_controller.cc | 11 ++++++++++ @@ -15,7 +17,7 @@ and internal chrome:// pages will be used for the autocomplete results. 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 -@@ -466,6 +466,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -467,6 +467,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -38,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[] = { -@@ -3868,7 +3884,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3898,7 +3914,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsLacros | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -103,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" -@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -658,6 +659,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 13ba7f16..0a33e901 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -2,6 +2,7 @@ From: Wengling Chen Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add flag for save-data-header +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 5 ++++- chrome/browser/flag_descriptions.cc | 4 ++++ @@ -14,7 +15,7 @@ Subject: Add flag for save-data-header 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 -@@ -4443,7 +4443,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4472,7 +4472,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -29,9 +30,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 -@@ -1099,6 +1099,10 @@ const char kDisableKeepaliveFetchDescription[] = - "Disable fetch with keepalive set " - "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; +@@ -1137,6 +1137,10 @@ const char kDeprecateAltBasedSixPackDescription[] = + "Show deprecation notifications and disable functionality for Alt based " + "six pack deprecations. The Search based versions continue to work."; +const char kEnableSaveDataHeaderName[] = "Enable save-data header"; +const char kEnableSaveDataHeaderDescription[] = @@ -43,9 +44,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -583,6 +583,9 @@ extern const char kDeprecateAltBasedSixPackDescription[]; - extern const char kDisableKeepaliveFetchName[]; - extern const char kDisableKeepaliveFetchDescription[]; +@@ -594,6 +594,9 @@ extern const char kDeprecateAltClickDescription[]; + extern const char kDeprecateAltBasedSixPackName[]; + extern const char kDeprecateAltBasedSixPackDescription[]; +extern const char kEnableSaveDataHeaderName[]; +extern const char kEnableSaveDataHeaderDescription[]; @@ -98,8 +99,8 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h -@@ -47,7 +47,8 @@ COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kDisableKeepaliveFetch; +@@ -45,7 +45,8 @@ COMPONENT_EXPORT(NETWORK_CPP) + extern const base::Feature kMdnsResponderGeneratedNameListing; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kOpaqueResponseBlockingV01; - 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 600aa8ff..d3368ee1 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 @@ -5,6 +5,8 @@ Subject: Add flag to configure maximum connections per host With the introduction of this flag it is possible to increase the maximum allowed connections per host; this can however be detrimental to devices with limited CPU/memory resources and it is disabled by default. + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 8 ++++++++ chrome/browser/flag_descriptions.cc | 4 ++++ @@ -19,7 +21,7 @@ with limited CPU/memory resources and it is disabled by default. 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 -@@ -882,6 +882,11 @@ const FeatureEntry::FeatureVariation +@@ -902,6 +902,11 @@ const FeatureEntry::FeatureVariation std::size(kIsolatedPrerenderPrefetchLimitFifteen), nullptr}, }; @@ -31,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, -@@ -4417,6 +4422,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4428,6 +4433,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, @@ -44,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 -@@ -1600,6 +1600,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1637,6 +1637,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -58,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 -@@ -903,6 +903,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -920,6 +920,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 1d483176..8bf1239b 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 @@ -3,6 +3,8 @@ Date: Thu, 25 Oct 2018 23:13:34 +0200 Subject: Add flag to control video playback resume feature Disable it by default on Android as it is everywhere else + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 5 +++++ @@ -13,7 +15,7 @@ Disable it by default on Android as it is everywhere else 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 -@@ -3168,6 +3168,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3190,6 +3190,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebRtcRemoteEventLogName, flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)}, @@ -27,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 -@@ -1183,6 +1183,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1221,6 +1221,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -42,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 -@@ -646,6 +646,9 @@ extern const char kEnablePortalsDescription[]; +@@ -660,6 +660,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -55,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -276,11 +276,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -289,11 +289,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index ae0a669d..3005240b 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 18 Nov 2018 13:06:49 +0100 Subject: Add flag to disable IPv6 probes +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 4 ++++ @@ -16,7 +17,7 @@ Subject: Add flag to disable IPv6 probes 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 -@@ -5333,6 +5333,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5348,6 +5348,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -26,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_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + #if !BUILDFLAG(IS_ANDROID) 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 -@@ -3017,6 +3017,10 @@ const char kCCTResizableForThirdPartiesName[] = +@@ -3071,6 +3071,10 @@ const char kCCTResizableForThirdPartiesName[] = const char kCCTResizableForThirdPartiesDescription[] = "Enable bottom sheet Custom Tabs for third party apps."; @@ -44,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 -@@ -715,6 +715,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -729,6 +729,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -108,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" -@@ -4129,8 +4130,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -4102,8 +4103,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 3f09bd2e..7df13401 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 25 May 2021 19:46:14 +0200 Subject: Add flag to disable external intent requests +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 3 +++ chrome/browser/flag_descriptions.cc | 6 ++++++ @@ -11,7 +12,7 @@ Subject: Add flag to disable external intent requests 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 -@@ -3148,6 +3148,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3171,6 +3171,9 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -24,7 +25,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 -@@ -3391,6 +3391,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3422,6 +3422,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -40,7 +41,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 -@@ -1938,6 +1938,9 @@ extern const char kQueryTilesDescription[]; +@@ -1957,6 +1957,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 df65514a..ea31f574 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 27 Jun 2021 17:35:39 +0200 Subject: Add flag to disable vibration +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 3 +++ @@ -18,7 +19,7 @@ Subject: Add flag to disable vibration 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 -@@ -6670,6 +6670,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6677,6 +6677,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -32,20 +33,20 @@ 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 -@@ -5608,6 +5608,9 @@ const char kDefaultCalculatorWebAppDescription[] = - "chrome app."; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -5626,6 +5626,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; + + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) +const char kEnableVibrationName[] = "Vibration"; +const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed."; + #if BUILDFLAG(IS_CHROMEOS) - const char kDeprecateLowUsageCodecsName[] = "Deprecates low usage media codecs"; - const char kDeprecateLowUsageCodecsDescription[] = + const char kAllowDefaultWebAppMigrationForChromeOsManagedUsersName[] = + "Allow default web app migration for ChromeOS managed users"; 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 -@@ -3406,6 +3406,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3427,6 +3427,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -82,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 -@@ -318,6 +318,8 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -310,6 +310,8 @@ CONTENT_EXPORT extern const base::FeatureParam kCompositorLockTimeout; #endif // BUILDFLAG(IS_ANDROID) @@ -97,11 +98,11 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa @@ -87,6 +87,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation( bool); - BLINK_PLATFORM_EXPORT static void EnableCacheInlineScriptCode(bool); -+ BLINK_PLATFORM_EXPORT static void EnableVibration(bool); - BLINK_PLATFORM_EXPORT static void EnableCapabilityDelegationPaymentRequest( - bool enable); BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable); ++ BLINK_PLATFORM_EXPORT static void EnableVibration(bool); + BLINK_PLATFORM_EXPORT static void EnableCompositeBGColorAnimation( + bool enable); + BLINK_PLATFORM_EXPORT static void EnableCanvas2dImageChromium(bool); diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc @@ -113,7 +114,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c // Maximum number of entries in a vibration pattern. const unsigned kVibrationPatternLengthMax = 99; -@@ -149,6 +150,8 @@ bool VibrationController::vibrate(Navigator& navigator, +@@ -152,6 +153,8 @@ bool VibrationController::vibrate(Navigator& navigator, // reference to |window| or |navigator| was retained in another window. if (!navigator.DomWindow()) return false; @@ -125,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 -@@ -164,6 +164,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -156,6 +156,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); } @@ -139,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 -@@ -1668,6 +1668,10 @@ +@@ -1630,6 +1630,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 cafabd1a..48ed358c 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -48,6 +48,9 @@ origins and allows to perform operations when all the tabs relating to that orig deleting the session content settings of `UntilOriginClosed`. See also: https://github.com/bromite/bromite/issues/1549 + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../permissions/last_tab_standing_tracker.cc | 33 +++++++- .../permissions/last_tab_standing_tracker.h | 4 +- @@ -73,10 +76,10 @@ See also: https://github.com/bromite/bromite/issues/1549 components/page_info/page_info.h | 1 + .../permissions/PermissionDialogDelegate.java | 13 +++ .../permissions/PermissionDialogModel.java | 81 ++++++++++++++++++- - .../android/permission_dialog_delegate.cc | 19 +++++ - .../android/permission_dialog_delegate.h | 1 + - .../android/permission_prompt_android.cc | 8 ++ - .../android/permission_prompt_android.h | 2 + + .../permission_dialog_delegate.cc | 19 +++++ + .../permission_dialog_delegate.h | 1 + + .../permission_prompt_android.cc | 8 ++ + .../permission_prompt_android.h | 2 + .../android/permissions_android_strings.grd | 17 ++++ .../geolocation_permission_context_android.cc | 35 ++++++-- .../geolocation_permission_context_android.h | 13 ++- @@ -183,7 +186,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -372,10 +372,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -378,10 +378,7 @@ void ChromeBrowserMainExtraPartsProfiles:: InstantServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); @@ -362,7 +365,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp diff --git a/components/content_settings/android/BUILD.gn b/components/content_settings/android/BUILD.gn --- a/components/content_settings/android/BUILD.gn +++ b/components/content_settings/android/BUILD.gn -@@ -57,6 +57,7 @@ java_cpp_enum("content_settings_enums_javagen") { +@@ -58,6 +58,7 @@ java_cpp_enum("content_settings_enums_javagen") { "../core/common/content_settings_types.h", "../core/common/cookie_controls_enforcement.h", "../core/common/cookie_controls_status.h", @@ -615,7 +618,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 -@@ -982,6 +982,8 @@ void PageInfo::PresentSitePermissions() { +@@ -1057,6 +1057,8 @@ void PageInfo::PresentSitePermissions() { permission_info.source = info.source; permission_info.is_one_time = (info.session_model == content_settings::SessionModel::OneTime); @@ -627,7 +630,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 -@@ -174,6 +174,7 @@ class PageInfo { +@@ -175,6 +175,7 @@ class PageInfo { content_settings::SettingSource source = content_settings::SETTING_SOURCE_NONE; bool is_one_time = false; @@ -777,9 +780,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per } private static View loadDialogView(Context context) { -diff --git a/components/permissions/android/permission_dialog_delegate.cc b/components/permissions/android/permission_dialog_delegate.cc ---- a/components/permissions/android/permission_dialog_delegate.cc -+++ b/components/permissions/android/permission_dialog_delegate.cc +diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc +--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc ++++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc @@ -67,6 +67,11 @@ void PermissionDialogJavaDelegate::DismissDialog() { Java_PermissionDialogDelegate_dismissFromNative(env, j_delegate_); } @@ -819,9 +822,9 @@ diff --git a/components/permissions/android/permission_dialog_delegate.cc b/comp permission_prompt_->Deny(); } -diff --git a/components/permissions/android/permission_dialog_delegate.h b/components/permissions/android/permission_dialog_delegate.h ---- a/components/permissions/android/permission_dialog_delegate.h -+++ b/components/permissions/android/permission_dialog_delegate.h +diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h +--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h ++++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h @@ -35,6 +35,7 @@ class PermissionDialogJavaDelegate { PermissionDialogDelegate* owner); virtual void CreateDialog(); @@ -830,10 +833,10 @@ diff --git a/components/permissions/android/permission_dialog_delegate.h b/compo private: base::android::ScopedJavaGlobalRef j_delegate_; -diff --git a/components/permissions/android/permission_prompt_android.cc b/components/permissions/android/permission_prompt_android.cc ---- a/components/permissions/android/permission_prompt_android.cc -+++ b/components/permissions/android/permission_prompt_android.cc -@@ -83,6 +83,14 @@ void PermissionPromptAndroid::Accept() { +diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.cc b/components/permissions/android/permission_prompt/permission_prompt_android.cc +--- a/components/permissions/android/permission_prompt/permission_prompt_android.cc ++++ b/components/permissions/android/permission_prompt/permission_prompt_android.cc +@@ -40,6 +40,14 @@ void PermissionPromptAndroid::Accept() { delegate_->Accept(); } @@ -848,10 +851,10 @@ diff --git a/components/permissions/android/permission_prompt_android.cc b/compo void PermissionPromptAndroid::Deny() { delegate_->Deny(); } -diff --git a/components/permissions/android/permission_prompt_android.h b/components/permissions/android/permission_prompt_android.h ---- a/components/permissions/android/permission_prompt_android.h -+++ b/components/permissions/android/permission_prompt_android.h -@@ -50,7 +50,9 @@ class PermissionPromptAndroid : public permissions::PermissionPrompt, +diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h +--- a/components/permissions/android/permission_prompt/permission_prompt_android.h ++++ b/components/permissions/android/permission_prompt/permission_prompt_android.h +@@ -43,7 +43,9 @@ class PermissionPromptAndroid : public PermissionPrompt { void Closing(); void Accept(); 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 d9d052aa..6019be4f 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 18 Feb 2021 21:22:52 +0100 Subject: Add menu item to bookmark all tabs +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/res/menu/main_menu.xml | 7 +++ .../chrome/browser/ChromeTabbedActivity.java | 26 ++++++++ @@ -40,7 +41,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -181,6 +185,9 @@ +@@ -179,6 +183,9 @@ @@ -53,16 +54,16 @@ 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 -@@ -69,6 +69,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; - import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; - import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; - import org.chromium.chrome.browser.app.tabmodel.TabbedModeTabModelOrchestrator; -+import org.chromium.chrome.browser.bookmarks.BookmarkBridge; -+import org.chromium.chrome.browser.bookmarks.BookmarkModel; +@@ -70,6 +70,8 @@ import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -2150,6 +2152,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -71,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(), -@@ -2202,6 +2206,28 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -208,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 -@@ -633,6 +633,7 @@ public class BookmarkUtils { +@@ -610,6 +610,7 @@ public class BookmarkUtils { List topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -216,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -658,6 +659,9 @@ public class BookmarkUtils { +@@ -635,6 +636,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -349,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 -@@ -3414,6 +3414,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -536,7 +537,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc --- a/components/bookmarks/browser/bookmark_load_details.cc +++ b/components/bookmarks/browser/bookmark_load_details.cc -@@ -36,6 +36,10 @@ BookmarkLoadDetails::BookmarkLoadDetails(BookmarkClient* client) +@@ -37,6 +37,10 @@ BookmarkLoadDetails::BookmarkLoadDetails(BookmarkClient* client) root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks( max_id_++, client->IsPermanentNodeVisibleWhenEmpty(BookmarkNode::MOBILE)))); @@ -550,7 +551,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h --- a/components/bookmarks/browser/bookmark_load_details.h +++ b/components/bookmarks/browser/bookmark_load_details.h -@@ -43,6 +43,7 @@ class BookmarkLoadDetails { +@@ -47,6 +47,7 @@ class BookmarkLoadDetails { BookmarkPermanentNode* bb_node() { return bb_node_; } BookmarkPermanentNode* mobile_folder_node() { return mobile_folder_node_; } BookmarkPermanentNode* other_folder_node() { return other_folder_node_; } @@ -558,7 +559,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b TitledUrlIndex* index() { return index_.get(); } std::unique_ptr owned_index() { return std::move(index_); } -@@ -97,6 +98,7 @@ class BookmarkLoadDetails { +@@ -103,6 +104,7 @@ class BookmarkLoadDetails { raw_ptr bb_node_ = nullptr; raw_ptr other_folder_node_ = nullptr; raw_ptr mobile_folder_node_ = nullptr; @@ -569,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 -@@ -565,7 +565,7 @@ bool BookmarkModel::HasBookmarks() { +@@ -566,7 +566,7 @@ bool BookmarkModel::HasBookmarks() { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -578,7 +579,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) { -@@ -807,6 +807,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -808,6 +808,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(); @@ -674,7 +675,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc --- a/components/bookmarks/browser/model_loader.cc +++ b/components/bookmarks/browser/model_loader.cc -@@ -54,7 +54,8 @@ void LoadBookmarks(const base::FilePath& path, +@@ -56,7 +56,8 @@ void LoadBookmarks(const base::FilePath& path, std::string sync_metadata_str; BookmarkCodec codec; codec.Decode(*root, details->bb_node(), details->other_folder_node(), diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 75b07598..455aae3e 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 13 Jul 2020 00:37:06 +0200 Subject: Add menu item to view source +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/res/menu/custom_tabs_menu.xml | 3 +++ chrome/android/java/res/menu/main_menu.xml | 3 +++ @@ -41,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 -@@ -2176,6 +2176,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2510,6 +2510,11 @@ public abstract class ChromeActivity return true; } @@ -68,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 -@@ -507,6 +507,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -506,6 +506,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); @@ -76,8 +77,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); -@@ -1153,6 +1154,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate - stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled); +@@ -1129,6 +1130,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate + stopPriceTrackingMenuItem.setVisible(false); } + /** @@ -99,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -216,6 +216,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -219,6 +219,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat updateRequestDesktopSiteMenuItem( menu, currentTab, requestDesktopSiteVisible, isChromeScheme); @@ -110,8 +111,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust 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 -@@ -306,6 +306,10 @@ CHAR_LIMIT guidelines: - Chrome tips +@@ -309,6 +309,10 @@ CHAR_LIMIT guidelines: + Bluetooth + diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index afbabb16..529e9d7c 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -2,6 +2,7 @@ From: Wengling Chen Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add option to force tablet UI +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../preferences/ChromePreferenceKeys.java | 1 + .../preferences/LegacyChromePreferenceKeys.java | 1 + @@ -18,7 +19,7 @@ Subject: Add option to force tablet UI 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 -@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys { +@@ -438,6 +438,7 @@ public final class ChromePreferenceKeys { AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -29,7 +30,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -85,6 +85,7 @@ public class LegacyChromePreferenceKeys { +@@ -82,6 +82,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR, @@ -40,7 +41,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -365,7 +365,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse +@@ -352,7 +352,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse // OmniboxSuggestionsDropdownEmbedder implementation @Override public boolean isTablet() { @@ -52,7 +53,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1359,6 +1359,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1389,6 +1389,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 @@ -103,7 +104,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 -@@ -630,7 +630,7 @@ test("components_unittests") { +@@ -636,7 +636,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. @@ -112,7 +113,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -910,7 +910,7 @@ if (!is_ios) { +@@ -918,7 +918,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. @@ -174,14 +175,14 @@ diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn @@ -362,6 +362,8 @@ android_library("ui_no_recycler_view_java") { + deps = [ ":ui_java_resources", ":ui_utils_java", - "//base:base_java", + # dependency for ui_no_recycler_view_java + "//chrome/browser/preferences:java", - "//components/url_formatter/android:url_formatter_java", - "//third_party/androidx:androidx_annotation_annotation_java", - "//third_party/androidx:androidx_appcompat_appcompat_java", + "//base:base_java", + "//base:jni_java", + "//build/android:build_java", diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.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 d83eca20..6e76a555 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 @@ -2,12 +2,13 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 7 Sep 2019 15:07:42 +0200 Subject: Add option to not persist tabs across sessions +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../android/java/res/xml/privacy_preferences.xml | 5 +++++ - .../chrome/browser/ChromeTabbedActivity.java | 4 +++- + .../chrome/browser/ChromeTabbedActivity.java | 5 ++++- .../privacy/settings/PrivacySettings.java | 16 +++++++++++++++- .../android/strings/android_chrome_strings.grd | 6 ++++++ - 4 files changed, 29 insertions(+), 2 deletions(-) + 4 files changed, 30 insertions(+), 2 deletions(-) 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 @@ -27,7 +28,15 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1263,8 +1263,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 04c03550..0e1afe9a 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 @@ -3,6 +3,8 @@ Date: Sat, 20 Nov 2021 15:36:54 +0000 Subject: Add option to use home page as NTP And allow use about:blank as default homepage + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../java/res/xml/homepage_preferences.xml | 5 +++++ .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++ @@ -35,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java -@@ -214,6 +214,22 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat +@@ -223,6 +223,22 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat notifyHomepageUpdated(); } @@ -116,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome import org.chromium.chrome.browser.init.StartupTabPreloader; import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; import org.chromium.chrome.browser.ntp.NewTabPageUtils; -@@ -321,6 +322,12 @@ public class ChromeTabCreator extends TabCreator { +@@ -323,6 +324,12 @@ public class ChromeTabCreator extends TabCreator { * @return the created tab. */ public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) { @@ -133,17 +135,17 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro --- 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 @@ -449,6 +449,7 @@ public final class ChromePreferenceKeys { - public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled"; - public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI = - "Chrome.Homepage.PartnerCustomizedDefaultUri"; -+ public static final String HOMEPAGE_NTP_IS_HOMEPAGE = "newtabpage_is_homepage"; + public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = + "Chrome.Homepage.PartnerCustomizedDefaultGurl"; ++ public static final String HOMEPAGE_NTP_IS_HOMEPAGE = "newtabpage_is_homepage"; /** * Key used to save homepage location set by enterprise policy + */ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -90,6 +90,7 @@ public class LegacyChromePreferenceKeys { +@@ -87,6 +87,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -154,7 +156,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1174,6 +1174,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1204,6 +1204,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -193,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 -@@ -368,6 +368,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -372,6 +372,7 @@ extern const char kSettingsShowOSBanner[]; 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 c6747dea..872ac6a4 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -3,6 +3,9 @@ Date: Mon, 2 May 2022 11:48:03 +0000 Subject: Add site engagement flag Enabled by default. + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 6 ++++ chrome/browser/flag_descriptions.cc | 5 +++ @@ -26,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" -@@ -8495,6 +8496,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8496,6 +8497,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kReduceUserAgentMinorVersionDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kReduceUserAgentMinorVersion)}, @@ -41,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2953,6 +2953,11 @@ const char kReduceUserAgentMinorVersionDescription[] = +@@ -3000,6 +3000,11 @@ const char kReduceUserAgentMinorVersionDescription[] = "The Chrome version in the User-Agent string will be reported as " "Chrome/.0.0.0."; @@ -56,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1680,6 +1680,9 @@ extern const char kDurableClientHintsCacheDescription[]; +@@ -1702,6 +1702,9 @@ extern const char kDurableClientHintsCacheDescription[]; extern const char kReduceUserAgentMinorVersionName[]; extern const char kReduceUserAgentMinorVersionDescription[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 00fa7cf3..fedd0988 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -2,6 +2,8 @@ From: uazo Date: Mon, 17 May 2021 12:30:12 +0000 Subject: Add support for ISupportHelpAndFeedback +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../chrome/browser/settings/SettingsActivity.java | 11 ++++++++--- .../components/browser_ui/settings/SettingsUtils.java | 4 ++++ @@ -10,15 +12,15 @@ Subject: Add support for ISupportHelpAndFeedback diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -69,6 +69,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; - import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory; +@@ -73,6 +73,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto + import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -333,9 +334,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -338,9 +339,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-support-for-writing-URIs.patch b/build/patches/Add-support-for-writing-URIs.patch index f112f4c7..a09f9464 100644 --- a/build/patches/Add-support-for-writing-URIs.patch +++ b/build/patches/Add-support-for-writing-URIs.patch @@ -3,6 +3,9 @@ Date: Tue, 12 Apr 2022 15:58:01 +0000 Subject: Add support for writing URIs Allows native-side URI file writing + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- base/android/content_uri_utils.cc | 10 ++++++ base/android/content_uri_utils.h | 4 +++ diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index fd34a6b8..be8f106c 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -5,6 +5,9 @@ Subject: Add webGL site setting Do not provide any device information when serving context creation errors. Requires patch: Content-settings-infrastructure.patch + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../browser_ui/site_settings/android/BUILD.gn | 3 + .../BromiteCustomContentSettingImpl.java | 1 + @@ -208,7 +211,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -336,6 +336,7 @@ +@@ -337,6 +337,7 @@ @@ -219,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 -@@ -677,6 +677,20 @@ void ContentSettingsRegistry::Init() { +@@ -679,6 +679,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -316,7 +319,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -287,6 +287,8 @@ enum class ContentSettingsType : int32_t { +@@ -280,6 +280,8 @@ enum class ContentSettingsType : int32_t { // site instead of the mobile one. REQUEST_DESKTOP_SITE, @@ -370,7 +373,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -64,6 +64,29 @@ +@@ -65,6 +65,29 @@ namespace blink { @@ -425,7 +428,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -242,6 +242,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -243,6 +243,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -439,7 +442,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() { MutexLocker locker(WebGLContextLimitMutex()); DCHECK(webgl_context_limits_initialized_); -@@ -488,25 +495,6 @@ static String ExtractWebGLContextCreationError( +@@ -489,25 +496,6 @@ static String ExtractWebGLContextCreationError( const Platform::GraphicsInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -465,7 +468,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -574,6 +562,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -575,6 +563,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { @@ -481,7 +484,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 -@@ -1771,6 +1771,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1777,6 +1777,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 f445c113..fca39bf7 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -3,6 +3,9 @@ Date: Fri, 6 May 2022 14:27:17 +0000 Subject: Add webRTC site settings Requires patch: Content-settings-infrastructure.patch + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../browser_ui/site_settings/android/BUILD.gn | 3 + .../BromiteCustomContentSettingImpl.java | 1 + @@ -204,7 +207,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -337,6 +337,7 @@ +@@ -338,6 +338,7 @@ @@ -215,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 -@@ -691,6 +691,20 @@ void ContentSettingsRegistry::Init() { +@@ -693,6 +693,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); @@ -312,7 +315,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -289,6 +289,8 @@ enum class ContentSettingsType : int32_t { +@@ -282,6 +282,8 @@ enum class ContentSettingsType : int32_t { WEBGL, diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 698567d8..b0697393 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -2,6 +2,7 @@ From: Zoraver Kang Date: Fri, 22 May 2020 22:43:27 -0400 Subject: Allow building without enable_reporting +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../browser/devtools/protocol/network_handler.cc | 2 ++ .../net/cross_origin_embedder_policy_reporter.cc | 4 +++- @@ -112,8 +113,8 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten +#endif FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) { - FrameTreeNode* opener = frame->original_opener(); -@@ -229,6 +223,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( + FrameTreeNode* opener = +@@ -230,6 +224,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( network::mojom::SourceLocationPtr source_location, const std::string& reported_window_url, const std::string& initial_popup_url) const { @@ -121,7 +122,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten // Cross-Origin-Opener-Policy-Report-Only is not required to provide // endpoints. if (!coop_.report_only_reporting_endpoint) -@@ -277,12 +272,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( +@@ -278,12 +273,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, absl::nullopt, std::move(body)); @@ -136,7 +137,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten body.SetString(kDisposition, is_report_only ? kDispositionReporting : kDispositionEnforce); body.SetString( -@@ -291,6 +288,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport( +@@ -292,6 +289,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, /*user_agent=*/absl::nullopt, std::move(body)); @@ -174,15 +175,15 @@ 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 -@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( - void RenderFrameHostImpl::MaybeGenerateCrashReport( - base::TerminationStatus status, - int exit_code) { -+#if BUILDFLAG(ENABLE_REPORTING) - if (!last_committed_url_.SchemeIsHTTPOrHTTPS()) - return; +@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::TakeNewDocumentPropertiesFromNavigation( + early_hints_manager_ = navigation_request->TakeEarlyHintsManager(); -@@ -11486,6 +11487,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( + // Only take some properties if this is not the synchronous initial ++#if BUILDFLAG(ENABLE_REPORTING) + // `about:blank` navigation, because the values set at construction time + // should remain unmodified. + if (!navigation_request->IsWaitingToCommit()) { +@@ -11555,6 +11556,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), absl::nullopt /* user_agent */, std::move(body)); @@ -239,7 +240,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 -@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -455,10 +455,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkIsolationKey& network_isolation_key, const absl::optional& user_agent, @@ -266,7 +267,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 -@@ -1043,6 +1043,7 @@ interface NetworkContext { +@@ -1046,6 +1046,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -274,7 +275,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1056,6 +1057,7 @@ interface NetworkContext { +@@ -1059,6 +1060,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|. @@ -293,7 +294,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" -@@ -2334,9 +2335,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2340,9 +2341,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index b0eedfb4..f0af2d7d 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/patches/Allow-building-without-supervised-users.patch @@ -2,15 +2,15 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 21 Feb 2022 01:24:11 +0100 Subject: Allow building without supervised users +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../browser/childaccounts/ChildAccountService.java | 11 ----------- - chrome/browser/startup_data.cc | 3 --- + .../browser/supervised_user/ChildAccountService.java | 11 ----------- .../child_accounts/child_account_service_android.cc | 9 --------- - 3 files changed, 23 deletions(-) + 2 files changed, 20 deletions(-) -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java @@ -31,21 +31,10 @@ public class ChildAccountService { ThreadUtils.assertOnUiThread(); final Activity activity = windowAndroid.getActivity().get(); @@ -33,19 +33,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/C - void onReauthenticationFailed(long onFailureCallbackPtr); - } } -diff --git a/chrome/browser/startup_data.cc b/chrome/browser/startup_data.cc ---- a/chrome/browser/startup_data.cc -+++ b/chrome/browser/startup_data.cc -@@ -32,9 +32,6 @@ - #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" - #include "chrome/browser/profiles/pref_service_builder_utils.h" - #include "chrome/browser/profiles/profile_key.h" --#include "chrome/browser/supervised_user/supervised_user_pref_store.h" --#include "chrome/browser/supervised_user/supervised_user_settings_service.h" --#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h" - #include "chrome/common/chrome_constants.h" - #include "chrome/common/chrome_paths.h" - #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc --- a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index edfba706..808ed505 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -2,6 +2,7 @@ From: AlexeyBarabash Date: Thu, 2 Nov 2017 18:21:16 +0200 Subject: Allow playing audio in background +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../renderer/platform/media/web_media_player_impl.cc | 12 +++++++++++- .../renderer/platform/media/web_media_player_impl.h | 3 +++ @@ -10,7 +11,7 @@ Subject: Allow playing audio in background diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1214,6 +1214,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1218,6 +1218,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3586,7 +3592,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3585,7 +3591,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { // Audio only stream is allowed to play when in background. // TODO: We should check IsBackgroundOptimizationCandidate here. But we need // to move the logic of checking video frames out of that function. diff --git a/build/patches/Allow-website-sign-in-without-account-sign-in.patch b/build/patches/Allow-website-sign-in-without-account-sign-in.patch deleted file mode 100644 index ce4cc3a2..00000000 --- a/build/patches/Allow-website-sign-in-without-account-sign-in.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: xsmile -Date: Thu, 11 Oct 2018 21:29:35 +0200 -Subject: Allow website sign-in without account sign-in - -Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found in chrome://settings ---- - chrome/browser/signin/account_consistency_mode_manager.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc ---- a/chrome/browser/signin/account_consistency_mode_manager.cc -+++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -112,7 +112,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {} - // static - void AccountConsistencyModeManager::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { -- registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true); -+ registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false); - } - - // static --- -2.25.1 diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index d52e849d..dd23ca8b 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -3,22 +3,25 @@ Date: Wed, 27 Jun 2018 11:02:38 +0200 Subject: Always use new tab page for default home page Ignore any partner-provided home page. + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../org/chromium/chrome/browser/homepage/HomepageManager.java | 3 --- - 1 file changed, 3 deletions(-) + .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java -@@ -146,9 +146,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat +@@ -147,10 +147,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat * if the homepage button is force enabled via flag. */ public static String getDefaultHomepageUri() { - if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) { -- return PartnerBrowserCustomizations.getInstance().getHomePageUrl(); +- return PartnerBrowserCustomizations.getInstance().getHomePageUrl().getSpec(); - } - - String homepagePartnerDefaultUri = SharedPreferencesManager.getInstance().readString( - ChromePreferenceKeys.HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, ""); +- + String homepagePartnerDefaultUri; + String homepagePartnerDefaultGurlSerialized = + SharedPreferencesManager.getInstance().readString( -- 2.25.1 diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch index ad2e0564..250c104c 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -2,6 +2,7 @@ From: uazo Date: Sat, 20 Nov 2021 17:42:41 +0000 Subject: Ask user before closing all tabs +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/flags/android/chrome_feature_list.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -9,16 +10,16 @@ Subject: Ask user before closing all tabs 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 -@@ -454,8 +454,8 @@ const base::Feature kConditionalTabStripAndroid{ +@@ -460,8 +460,8 @@ const base::Feature kConditionalTabStripAndroid{ const base::Feature kCastDeviceFilter{"CastDeviceFilter", base::FEATURE_DISABLED_BY_DEFAULT}; --const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog", // Enabled by default in Bromite -+ base::FEATURE_ENABLED_BY_DEFAULT}; // ^ +-const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", +- base::FEATURE_DISABLED_BY_DEFAULT}; ++const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", // Enabled by default in Bromite ++ base::FEATURE_ENABLED_BY_DEFAULT}; // ^ - const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", - base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kCriticalPersistedTabData{ + "CriticalPersistedTabData", base::FEATURE_DISABLED_BY_DEFAULT}; -- 2.25.1 diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 0d0471e1..3bcee2e3 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -3,6 +3,8 @@ Date: Sun, 25 Mar 2018 21:49:37 +0200 Subject: AudioBuffer, AnalyserNode: fp mitigations Truncate base latency precision to two digits + +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++---- .../blink/renderer/modules/webaudio/audio_buffer.idl | 6 ------ @@ -46,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -492,7 +492,9 @@ double AudioContext::baseLatency() const { +@@ -486,7 +486,9 @@ double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 6f9801b8..24407ef0 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -2,6 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 21 Aug 2020 13:41:07 +0200 Subject: Automated domain substitution +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- PRESUBMIT.py | 70 +- .../cts_config/webview_cts_gcs_path.json | 28 +- @@ -47,8 +48,9 @@ Subject: Automated domain substitution .../backend/help_content_provider.cc | 4 +- .../os_feedback_ui/resources/fake_data.js | 14 +- .../personalization_app_ui.cc | 2 +- + .../resources/PRESUBMIT.py | 2 +- .../print_management/resources/PRESUBMIT.py | 2 +- - .../projector_app/projector_xhr_sender.cc | 8 +- + .../projector_app/projector_xhr_sender.cc | 10 +- .../projector_app/untrusted_projector_ui.cc | 12 +- ash/webui/scanning/resources/PRESUBMIT.py | 2 +- .../scanning/resources/scanning_app.html | 2 +- @@ -117,7 +119,7 @@ Subject: Automated domain substitution .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 22 +- - chrome/app/generated_resources.grd | 262 +- + chrome/app/generated_resources.grd | 266 +- chrome/app/google_chrome_strings.grd | 22 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -166,7 +168,7 @@ Subject: Automated domain substitution .../device_command_start_crd_session_job.cc | 6 +- .../policy/uploading/heartbeat_scheduler.cc | 4 +- chrome/browser/ash/u2f_notification.cc | 2 +- - .../wallpaper_handlers/wallpaper_handlers.cc | 18 +- + .../wallpaper_handlers/wallpaper_handlers.cc | 16 +- .../ash/web_applications/terminal_source.cc | 4 +- .../autofill/autofill_gstatic_reader.cc | 4 +- .../browser_switcher_service.cc | 2 +- @@ -205,7 +207,7 @@ Subject: Automated domain substitution .../lacros/lacros_startup_infobar_delegate.cc | 4 +- .../service_discovery_client_mac.mm | 4 +- .../long_screenshots_tab_service.cc | 2 +- - .../access_code_cast_discovery_interface.cc | 4 +- + .../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 +- @@ -218,6 +220,7 @@ Subject: Automated domain substitution .../tachyon_ice_config_fetcher.cc | 12 +- .../modules/drive/drive_service.cc | 8 +- .../modules/photos/photos_service.cc | 6 +- + .../obsolete_system/obsolete_system_linux.cc | 2 +- ...rvice_worker_page_load_metrics_observer.cc | 2 +- .../performance_hints_features.cc | 2 +- .../quiet_permission_prompt_model_android.cc | 2 +- @@ -232,6 +235,7 @@ Subject: Automated domain substitution .../push_messaging_service_impl.cc | 2 +- chrome/browser/resources/PRESUBMIT.py | 2 +- .../browser/resources/about_sys/about_sys.js | 2 +- + .../browsing_topics_internals.html | 4 +- .../resources/chromeos/about_os_credits.html | 6 +- .../dictation/macros/list_commands_macro.js | 2 +- .../magnifier/magnifier.js | 2 +- @@ -272,7 +276,6 @@ Subject: Automated domain substitution .../default_apps/external_extensions.json | 14 +- .../discards/graph_doc_template.html | 2 +- chrome/browser/resources/downloads/icons.html | 2 +- - .../resources/feedback/js/feedback_util.js | 10 +- .../resources/gaia_auth_host/PRESUBMIT.py | 2 +- .../resources/gaia_auth_host/authenticator.js | 2 +- .../saml_password_attributes.js | 2 +- @@ -283,7 +286,6 @@ Subject: Automated domain substitution .../query_tiles/query_tiles_internals.html | 2 +- .../query_tiles/query_tiles_internals.js | 4 +- .../resources/media/mei_preload/manifest.json | 2 +- - chrome/browser/resources/media/webrtc_logs.js | 2 +- .../shared/nearby_shared_icons.html | 4 +- .../nearby_shared_share_type_icons.html | 2 +- .../resources/net_internals/index.html | 6 +- @@ -333,11 +335,10 @@ Subject: Automated domain substitution .../browser/ssl/connection_help_tab_helper.cc | 2 +- chrome/browser/ssl/sct_reporting_service.cc | 4 +- .../child_accounts/kids_management_api.cc | 2 +- - .../kids_chrome_management_client.cc | 2 +- .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- - .../strings/android_chrome_strings.grd | 40 +- + .../strings/android_chrome_strings.grd | 42 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../ui/app_list/search/common/string_util.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- @@ -381,6 +382,7 @@ Subject: Automated domain substitution .../ui/webui/new_tab_page/foo/foo_handler.cc | 8 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- + .../ui/webui/sanitized_image_source.cc | 6 +- .../chromeos/parental_controls_handler.cc | 2 +- .../webui/settings/reset_settings_handler.cc | 2 +- .../settings_localized_strings_provider.cc | 2 +- @@ -426,7 +428,7 @@ Subject: Automated domain substitution chrome/common/extensions/api/windows.json | 2 +- .../extensions/chrome_extensions_client.cc | 4 +- chrome/common/google_url_loader_throttle.cc | 4 +- - chrome/common/url_constants.cc | 244 +- + chrome/common/url_constants.cc | 246 +- .../gaiacp/associated_user_validator.cc | 2 +- .../gaiacp/gaia_credential_base.cc | 8 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- @@ -487,10 +489,9 @@ Subject: Automated domain substitution chrome/tools/build/PRESUBMIT.py | 2 +- chrome/tools/webforms_aggregator_tests.py | 4 +- chrome/tools/weburl_links.txt | 6 +- - chrome/updater/branding.gni | 8 +- + chrome/updater/branding.gni | 12 +- chrome/updater/mac/setup/ks_tickets.mm | 2 +- chrome/updater/tools/PRESUBMIT.py | 2 +- - chrome/updater/win/app_install_controller.cc | 2 +- chrome/updater/win/signing/PRESUBMIT.py | 2 +- chrome/utility/importer/ie_importer_win.cc | 2 +- .../shell_devtools_discovery_page.html | 2 +- @@ -501,9 +502,9 @@ Subject: Automated domain substitution 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 +- chromeos/chromeos_strings.grd | 6 +- .../translation_result_loader.cc | 2 +- - chromeos/dbus/rmad/fake_rmad_client.cc | 2 +- chromeos/printing/ppd_provider.h | 2 +- chromeos/printing/printer_config_cache.cc | 2 +- .../printing/uri_fuzzer_seed_corpus/uri1.txt | 2 +- @@ -531,13 +532,14 @@ Subject: Automated domain substitution .../renderer/page_passwords_analyser.cc | 2 +- .../password_form_conversion_utils.cc | 2 +- .../core/browser/autofill_download_manager.cc | 2 +- - .../core/browser/autofill_experiments.cc | 4 +- + .../core/browser/autofill_experiments.cc | 6 +- .../browser/data_model/test_data_creator.cc | 6 +- .../credit_card_fido_authenticator.cc | 2 +- .../core/browser/payments/payments_client.cc | 2 +- .../browser/payments/payments_service_url.cc | 10 +- ...roid_chrome_autofill_assistant_strings.grd | 2 +- .../autofill_assistant_onboarding_fetcher.cc | 2 +- + .../browser/headless/client_headless.cc | 2 +- .../browser/service/server_url_fetcher.cc | 2 +- .../safe_browsing_triggered_popup_blocker.h | 4 +- .../core/breadcrumb_manager_tab_helper.cc | 2 +- @@ -546,7 +548,7 @@ Subject: Automated domain substitution .../core/counters/history_counter.cc | 2 +- .../core/history_notice_utils.cc | 4 +- .../core/captive_portal_detector.cc | 2 +- - .../data/log_list.json | 20 +- + .../data/log_list.json | 18 +- .../resources/cart_domain_cart_url_regex.json | 2 +- .../components_google_chrome_strings.grd | 2 +- .../notes/core/server/notes_repository.cc | 2 +- @@ -649,7 +651,6 @@ Subject: Automated domain substitution .../omnibox_pedal_concepts_desktop_zh-CN.json | 24 +- .../omnibox_pedal_concepts_desktop_zh-TW.json | 24 +- .../resources/omnibox_pedal_synonyms.grd | 88 +- - .../page_content_annotations_model_manager.cc | 2 +- .../core/optimization_guide_constants.cc | 4 +- .../core/page_entities_model_executor_impl.cc | 2 +- .../core/prediction_manager.cc | 8 +- @@ -662,7 +663,7 @@ Subject: Automated domain substitution .../browser/leak_detection_dialog_utils.cc | 2 +- .../browser/old_google_credentials_cleaner.cc | 8 +- .../core/browser/password_hash_data.cc | 2 +- - .../browser/password_manager_constants.cc | 6 +- + .../browser/password_manager_constants.cc | 10 +- .../core/browser/password_reuse_detector.cc | 2 +- .../browser/password_scripts_fetcher_impl.cc | 2 +- .../core/browser/password_sync_util.cc | 4 +- @@ -681,7 +682,7 @@ Subject: Automated domain substitution .../core/browser/browser_policy_connector.cc | 10 +- ...cloud_signin_restriction_policy_fetcher.cc | 2 +- .../core/common/policy_loader_common.cc | 4 +- - .../policy/resources/policy_templates.json | 2306 ++++++++--------- + .../policy/resources/policy_templates.json | 2318 ++++++++--------- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- .../syntax_check_policy_template_json.py | 2 +- @@ -762,7 +763,7 @@ Subject: Automated domain substitution ...ation_guide_segmentation_model_provider.cc | 2 +- .../internal/proto/PRESUBMIT.py | 2 +- .../services/quarantine/quarantine_mac.mm | 2 +- - .../core/common/disabled_sites.cc | 12 +- + .../core/common/disabled_sites.cc | 20 +- .../ios/shared_highlighting_constants.mm | 2 +- .../browser/chrome_connected_header_helper.cc | 4 +- .../browser/account_consistency_service.mm | 12 +- @@ -803,10 +804,11 @@ Subject: Automated domain substitution content/browser/resources/PRESUBMIT.py | 2 +- content/browser/resources/gpu/info_view.js | 2 +- .../speech/speech_recognition_engine.cc | 2 +- - content/browser/speech/tts_mac.mm | 2 +- .../browser/web_contents/web_contents_impl.cc | 2 +- - .../browser/webauth/authenticator_common.cc | 10 +- + .../browser/webauth/authenticator_common.cc | 4 +- content/browser/webauth/client_data_json.cc | 2 +- + .../webauth_request_security_checker.cc | 2 +- + .../webauth_request_security_checker.h | 4 +- .../webrtc/resources/webrtc_internals.js | 2 +- .../zygote_host/zygote_host_impl_linux.cc | 2 +- content/renderer/PRESUBMIT.py | 2 +- @@ -935,7 +937,7 @@ Subject: Automated domain substitution ios/chrome/browser/autofill/BUILD.gn | 4 +- .../autofill/automation/automation_action.mm | 2 +- ...chrome_browser_state_removal_controller.mm | 2 +- - ios/chrome/browser/chrome_url_constants.cc | 36 +- + ios/chrome/browser/chrome_url_constants.cc | 40 +- ios/chrome/browser/flags/about_flags.mm | 4 +- ios/chrome/browser/omaha/omaha_service.mm | 2 +- .../search_engine_tab_helper.mm | 8 +- @@ -1187,6 +1189,7 @@ Subject: Automated domain substitution .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- .../com_google_android_play_core/3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- @@ -1202,7 +1205,7 @@ Subject: Automated domain substitution .../Android_SDK_License-December_9_2016.txt | 4 +- .../development/scripts/PRESUBMIT.py | 2 +- .../runner/src/main/Android.mk | 2 +- - third_party/blink/PRESUBMIT.py | 4 +- + third_party/blink/PRESUBMIT.py | 2 +- .../common/loader/record_load_histograms.cc | 2 +- .../public/common/scheduler/PRESUBMIT.py | 2 +- .../mojom/permissions_policy/PRESUBMIT.py | 2 +- @@ -1216,7 +1219,6 @@ Subject: Automated domain substitution .../renderer/core/dom/events/event_target.cc | 4 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- - .../core/frame/deprecation/deprecation.cc | 22 +- .../blink/renderer/core/frame/local_frame.cc | 4 +- .../renderer/core/html/html_iframe_element.cc | 2 +- .../core/html/media/autoplay_policy.cc | 4 +- @@ -1229,7 +1231,7 @@ Subject: Automated domain substitution .../core/xmlhttprequest/xml_http_request.cc | 2 +- .../modules/bluetooth/bluetooth_error.cc | 16 +- .../modules/clipboard/clipboard_promise.cc | 2 +- - .../credentials_container.cc | 8 +- + .../credentials_container.cc | 10 +- .../encryptedmedia/encrypted_media_utils.h | 2 +- .../modules/geolocation/geolocation.cc | 2 +- .../play_app_url_manifest.json | 2 +- @@ -1463,15 +1465,18 @@ Subject: Automated domain substitution .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- .../src/benchmarks/chromium.linux.json | 152 +- third_party/pyjson5/src/setup.py | 2 +- + third_party/r8/3pp/fetch.py | 4 +- + third_party/rust/adler/v1/BUILD.gn | 2 +- third_party/rust/aho_corasick/v0_7/BUILD.gn | 2 +- third_party/rust/ansi_term/v0_11/BUILD.gn | 2 +- third_party/rust/atty/v0_2/BUILD.gn | 2 +- - third_party/rust/autocxx/v0_17/BUILD.gn | 2 +- - .../rust/autocxx_bindgen/v0_59/BUILD.gn | 4 +- - .../rust/autocxx_engine/v0_17/BUILD.gn | 2 +- - third_party/rust/autocxx_gen/v0_17/BUILD.gn | 2 +- - third_party/rust/autocxx_macro/v0_17/BUILD.gn | 2 +- - .../rust/autocxx_parser/v0_17/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_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 +- + .../rust/autocxx_parser/v0_22/BUILD.gn | 2 +- third_party/rust/bindgen/v0_59/BUILD.gn | 4 +- third_party/rust/clap/v2/BUILD.gn | 2 +- third_party/rust/cxx/v1/BUILD.gn | 2 +- @@ -1479,7 +1484,9 @@ Subject: Automated domain substitution third_party/rust/cxxbridge_cmd/v1/BUILD.gn | 4 +- third_party/rust/cxxbridge_macro/v1/BUILD.gn | 2 +- third_party/rust/fastrand/v1/BUILD.gn | 2 +- + third_party/rust/hashbrown/v0_11/BUILD.gn | 2 +- third_party/rust/heck/v0_4/BUILD.gn | 2 +- + third_party/rust/indexmap/v1/BUILD.gn | 2 +- third_party/rust/indoc/v1/BUILD.gn | 2 +- third_party/rust/itoa/v0_4/BUILD.gn | 2 +- third_party/rust/itoa/v1/BUILD.gn | 2 +- @@ -1487,8 +1494,10 @@ Subject: Automated domain substitution third_party/rust/link_cplusplus/v1/BUILD.gn | 2 +- third_party/rust/memchr/v2/BUILD.gn | 2 +- .../rust/minimal_lexical/v0_2/BUILD.gn | 2 +- - third_party/rust/moveit/v0_4/BUILD.gn | 2 +- + third_party/rust/miniz_oxide/v0_4/BUILD.gn | 2 +- + third_party/rust/moveit/v0_5/BUILD.gn | 2 +- third_party/rust/once_cell/v1/BUILD.gn | 2 +- + third_party/rust/pathdiff/v0_2/BUILD.gn | 2 +- .../rust/peeking_take_while/v0_1/BUILD.gn | 2 +- third_party/rust/proc_macro2/v1/BUILD.gn | 2 +- third_party/rust/quote/v1/BUILD.gn | 2 +- @@ -1509,6 +1518,9 @@ Subject: Automated domain substitution third_party/rust/syn/v1/BUILD.gn | 4 +- third_party/rust/tempfile/v3/BUILD.gn | 2 +- third_party/rust/termcolor/v1/BUILD.gn | 2 +- + third_party/rust/thiserror/v1/BUILD.gn | 2 +- + third_party/rust/thiserror_impl/v1/BUILD.gn | 2 +- + .../rust/unicode_linebreak/v0_1/BUILD.gn | 2 +- third_party/rust/unicode_width/v0_1/BUILD.gn | 2 +- third_party/rust/unicode_xid/v0_2/BUILD.gn | 2 +- third_party/rust/unindent/v0_1/BUILD.gn | 2 +- @@ -1536,6 +1548,7 @@ Subject: Automated domain substitution .../wpt_tools/wpt/tools/wptrunner/setup.py | 2 +- .../wptrunner/executors/executormarionette.py | 14 +- .../wptrunner/formatters/chromium.py | 2 +- + third_party/xnnpack/generate_build_gn.py | 2 +- .../codereview/download_issue.py | 6 +- tools/accessibility/codereview/mph.py | 2 +- tools/accessibility/inspect/ax_utils.cc | 2 +- @@ -1567,7 +1580,7 @@ Subject: Automated domain substitution .../libsupersize/viewer/upload_html_viewer.py | 2 +- tools/binary_size/libsupersize/zip_util.py | 2 +- .../binary_size/trybot_commit_size_checker.py | 4 +- - tools/bisect-builds.py | 28 +- + tools/bisect-builds.py | 30 +- tools/bisect_repackage/bisect_repackage.py | 4 +- .../bisect_repackage_utils.py | 4 +- tools/boilerplate.py | 2 +- @@ -1593,6 +1606,7 @@ Subject: Automated domain substitution tools/crbug/user-activity.js | 4 +- tools/cygprofile/PRESUBMIT.py | 2 +- .../cygprofile/orderfile_generator_backend.py | 4 +- + tools/determinism/compare_build_artifacts.py | 2 +- tools/download_optimization_profile.py | 2 +- .../dromaeo_benchmark_runner.py | 10 +- tools/emacs/trybot-mac.txt | 232 +- @@ -1715,7 +1729,7 @@ Subject: Automated domain substitution url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1712 files changed, 5238 insertions(+), 5238 deletions(-) + 1725 files changed, 5259 insertions(+), 5259 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1729,7 +1743,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -@@ -207,7 +207,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -213,7 +213,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -1738,7 +1752,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -216,7 +216,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -222,7 +222,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -1747,7 +1761,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -225,7 +225,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -231,7 +231,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -1756,7 +1770,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -234,7 +234,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -240,7 +240,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -1765,7 +1779,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -243,7 +243,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -249,7 +249,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -1774,7 +1788,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -252,7 +252,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -258,7 +258,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -1783,7 +1797,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -261,7 +261,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -267,7 +267,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -1792,7 +1806,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -270,7 +270,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -276,7 +276,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -1801,7 +1815,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -486,7 +486,7 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = ( +@@ -492,7 +492,7 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1810,7 +1824,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1017,7 +1017,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( +@@ -1025,7 +1025,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1819,7 +1833,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1156,9 +1156,9 @@ _KNOWN_ROBOTS = set( +@@ -1170,9 +1170,9 @@ _KNOWN_ROBOTS = set( 'infra-try-recipes-tester', 'lacros-tracking-roller') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1831,7 +1845,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1551,7 +1551,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1575,7 +1575,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' @@ -1840,7 +1854,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information') ] -@@ -1741,7 +1741,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1767,7 +1767,7 @@ def CheckNoPragmaOnce(input_api, output_api): return [ output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1849,7 +1863,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files) ] return [] -@@ -1981,7 +1981,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -2007,7 +2007,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1858,7 +1872,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2101,7 +2101,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2130,7 +2130,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' @@ -1867,16 +1881,16 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2898,7 +2898,7 @@ def CheckSecurityOwners(input_api, output_api): - if to_check: - # If there are any OWNERS files to check, there are IPC-related changes in - # this CL. Auto-CC the review list. +@@ -3007,7 +3007,7 @@ def CheckSecurityOwners(input_api, output_api): + input_api, output_api) + + if ipc_results.has_security_sensitive_files: - output_api.AppendCC('ipc-security-reviews@chromium.org') + output_api.AppendCC('ipc-security-reviews@ch40m1um.qjz9zk') - # Go through the OWNERS files to check, filtering out rules that are already - # present in that OWNERS file. -@@ -3213,7 +3213,7 @@ def _CheckAndroidToastUsage(input_api, output_api): + results = [] + if input_api.is_committing: +@@ -3305,7 +3305,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' @@ -1885,7 +1899,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3352,7 +3352,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3444,7 +3444,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): results.append( output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1894,7 +1908,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3384,7 +3384,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3476,7 +3476,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' @@ -1903,7 +1917,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3409,7 +3409,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3501,7 +3501,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.' @@ -1912,7 +1926,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3431,7 +3431,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3523,7 +3523,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' @@ -1921,7 +1935,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4033,7 +4033,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -4125,7 +4125,7 @@ def CheckGnGlobForward(input_api, output_api): 'The variables "visibilty" and "test_only" should be ' 'explicitly listed in forward_variables_from(). For more ' 'details, see:\n' @@ -1930,7 +1944,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from')) ] -@@ -4201,7 +4201,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4293,7 +4293,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 ' @@ -1939,7 +1953,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)) -@@ -4239,7 +4239,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4331,7 +4331,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 ' @@ -1948,7 +1962,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 -@@ -4455,7 +4455,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4547,7 +4547,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', @@ -1957,7 +1971,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4728,7 +4728,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4820,7 +4820,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1966,7 +1980,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) -@@ -5014,9 +5014,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -5107,9 +5107,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' @@ -1978,7 +1992,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems)) ] -@@ -5070,7 +5070,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -5163,7 +5163,7 @@ def CheckChangeOnCommit(input_api, output_api): input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1987,7 +2001,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5419,7 +5419,7 @@ def CheckStrings(input_api, output_api): +@@ -5509,7 +5509,7 @@ def CheckStrings(input_api, output_api): results.append( output_api.PresubmitPromptWarning( 'ICU syntax errors were found in the following strings (problems or ' @@ -1996,7 +2010,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py items=icu_syntax_errors)) return results -@@ -5732,7 +5732,7 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5829,7 +5829,7 @@ def CheckMPArchApiUsage(input_api, output_api): if not used_apis: return [] @@ -2005,7 +2019,7 @@ 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.') -@@ -5743,8 +5743,8 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5840,8 +5840,8 @@ def CheckMPArchApiUsage(input_api, output_api): 'navigation. 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' @@ -2052,49 +2066,49 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi @@ -137,12 +137,12 @@ "arch": { "arm64": { - "filename": "arm64/O/android-cts-arm64-8.0_r24.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-8.0_r24-linux_x86-arm.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-8.0_r24-linux_x86-arm.zip", - "unzip_dir": "arm64/O/8.0_r24" + "filename": "arm64/O/android-cts-arm64-8.0_r26.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-8.0_R26-linux_x86-arm.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-8.0_R26-linux_x86-arm.zip", + "unzip_dir": "arm64/O/8.0_r26" }, "x86": { - "filename": "x86/O/android-cts-x86-8.0_r24.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-8.0_r24-linux_x86-x86.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-8.0_r24-linux_x86-x86.zip", - "unzip_dir": "x86/O/8.0_r24/" + "filename": "x86/O/android-cts-x86-8.0_r26.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-8.0_R26-linux_x86-x86.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-8.0_R26-linux_x86-x86.zip", + "unzip_dir": "x86/O/8.0_r26" } }, @@ -159,12 +159,12 @@ "arch": { "arm64": { - "filename": "arm64/P/android-cts-arm64-9.0_r13.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r13-linux_x86-arm.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r13-linux_x86-arm.zip", - "unzip_dir": "arm64/P/9.0_r13/" + "filename": "arm64/P/android-cts-arm64-9.0_r19.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r19-linux_x86-arm.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r19-linux_x86-arm.zip", + "unzip_dir": "arm64/P/9.0_r19" }, "x86": { - "filename": "x86/P/android-cts-x86-9.0_r13.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r13-linux_x86-x86.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r13-linux_x86-x86.zip", - "unzip_dir": "x86/P/9.0_r13/" + "filename": "x86/P/android-cts-x86-9.0_r19.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-9.0_r19-linux_x86-x86.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-9.0_r19-linux_x86-x86.zip", + "unzip_dir": "x86/P/9.0_r19" } }, -@@ -187,12 +187,12 @@ +@@ -192,12 +192,12 @@ "arch": { "arm64": { - "filename": "arm64/Q/android-cts-arm64-10_r5.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r5-linux_x86-arm.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r5-linux_x86-arm.zip", - "unzip_dir": "arm64/Q/10_r5/" + "filename": "arm64/Q/android-cts-arm64-10_r11.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r11-linux_x86-arm.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r11-linux_x86-arm.zip", + "unzip_dir": "arm64/Q/10_r11" }, "x86": { - "filename": "x86/Q/android-cts-x86-10_r5.zip", -- "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r5-linux_x86-x86.zip", -+ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r5-linux_x86-x86.zip", - "unzip_dir": "x86/Q/10_r5/" + "filename": "x86/Q/android-cts-x86-10_r11.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-10_r11-linux_x86-x86.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-10_r11-linux_x86-x86.zip", + "unzip_dir": "x86/Q/10_r11" } }, -@@ -209,12 +209,12 @@ +@@ -241,12 +241,12 @@ "arch": { "arm64": { "filename": "arm64/R/android-cts-arm64-11_r7.zip", @@ -2109,7 +2123,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/R/11_r7/" } }, -@@ -231,12 +231,12 @@ +@@ -290,12 +290,12 @@ "arch": { "arm64": { "filename": "arm64/S/android-cts-arm64-12_r3.zip", @@ -2127,15 +2141,15 @@ 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 -@@ -259,7 +259,7 @@ double-check this picked the correct labels for your new features (labels are +@@ -331,7 +331,7 @@ double-check this picked the correct labels for your new features (labels are case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow these steps as a final check: -https://chromium.googlesource.com/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms +https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms + """ + print(message) - If any labels were generated incorrectly, please edit this script and change - KNOWN_MISTAKES. diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/record_netlog.py --- a/android_webview/tools/record_netlog.py +++ b/android_webview/tools/record_netlog.py @@ -2226,7 +2240,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 -@@ -666,7 +666,7 @@ This file contains the strings for ash. +@@ -681,7 +681,7 @@ This file contains the strings for ash. other {Update device within # seconds}} @@ -2235,7 +2249,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -691,7 +691,7 @@ This file contains the strings for ash. +@@ -706,7 +706,7 @@ This file contains the strings for ash. other {Change device to previous version within # seconds}} @@ -2244,7 +2258,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -701,10 +701,10 @@ This file contains the strings for ash. +@@ -716,10 +716,10 @@ This file contains the strings for ash. Update overdue @@ -2257,7 +2271,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -738,10 +738,10 @@ This file contains the strings for ash. +@@ -753,10 +753,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. @@ -2270,7 +2284,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. -@@ -835,7 +835,7 @@ This file contains the strings for ash. +@@ -850,7 +850,7 @@ This file contains the strings for ash. @@ -2279,7 +2293,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1236,7 +1236,7 @@ This file contains the strings for ash. +@@ -1251,7 +1251,7 @@ This file contains the strings for ash. Supervised user @@ -2288,7 +2302,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1529,7 +1529,7 @@ This file contains the strings for ash. +@@ -1550,7 +1550,7 @@ This file contains the strings for ash. Tap to configure @@ -2297,7 +2311,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -3105,7 +3105,7 @@ This file contains the strings for ash. +@@ -3166,7 +3166,7 @@ This file contains the strings for ash. Save your $1Pixel Buds @@ -2306,7 +2320,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Settings -@@ -3138,7 +3138,7 @@ This file contains the strings for ash. +@@ -3199,7 +3199,7 @@ This file contains the strings for ash. Connect $1Pixel Buds to this Chromebook @@ -2315,7 +2329,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Cancel -@@ -3264,7 +3264,7 @@ This file contains the strings for ash. +@@ -3325,7 +3325,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2324,7 +2338,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3767,7 +3767,7 @@ Here are some things you can try to get started. +@@ -3808,7 +3808,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2401,7 +2415,7 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link diff --git a/ash/components/device_activity/device_activity_controller.cc b/ash/components/device_activity/device_activity_controller.cc --- a/ash/components/device_activity/device_activity_controller.cc +++ b/ash/components/device_activity/device_activity_controller.cc -@@ -32,7 +32,7 @@ DeviceActivityController* g_ash_device_activity_controller = nullptr; +@@ -57,7 +57,7 @@ static const std::unordered_set& DeviceModeEnterprise() { // Production edge server for reporting device actives. // TODO(https://crbug.com/1267432): Enable passing base url as a runtime flag. @@ -2545,7 +2559,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 -@@ -35,9 +35,9 @@ +@@ -36,9 +36,9 @@ namespace { const char kDiscoveryLearnMoreLink[] = @@ -2649,7 +2663,7 @@ diff --git a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc diff --git a/ash/wallpaper/test_wallpaper_controller_client.cc b/ash/wallpaper/test_wallpaper_controller_client.cc --- a/ash/wallpaper/test_wallpaper_controller_client.cc +++ b/ash/wallpaper/test_wallpaper_controller_client.cc -@@ -112,7 +112,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( +@@ -122,7 +122,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( std::move(callback).Run( personalization_app::mojom::GooglePhotosPhoto::New( id, "test_name", base::TimeFormatFriendlyDate(time), @@ -2716,7 +2730,7 @@ diff --git a/ash/webui/camera_app_ui/resources/js/lib/analytics.js b/ash/webui/c diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd --- a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd -@@ -322,7 +322,7 @@ +@@ -325,7 +325,7 @@ Copy text @@ -2812,7 +2826,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 -@@ -106,7 +106,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( +@@ -109,7 +109,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( // Allow calls to Maps reverse geocoding API for loading metadata. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -2892,7 +2906,7 @@ diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feed diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui/personalization_app/personalization_app_ui.cc --- a/ash/webui/personalization_app/personalization_app_ui.cc +++ b/ash/webui/personalization_app/personalization_app_ui.cc -@@ -29,7 +29,7 @@ namespace personalization_app { +@@ -30,7 +30,7 @@ namespace personalization_app { namespace { @@ -2901,6 +2915,18 @@ diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui GURL GetGooglePhotosURL() { return GURL(kGooglePhotosURL); +diff --git a/ash/webui/personalization_app/resources/PRESUBMIT.py b/ash/webui/personalization_app/resources/PRESUBMIT.py +--- a/ash/webui/personalization_app/resources/PRESUBMIT.py ++++ b/ash/webui/personalization_app/resources/PRESUBMIT.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + """Presubmit script for Personalization app. + +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts + for more details about the presubmit API built into depot_tools. + """ + diff --git a/ash/webui/print_management/resources/PRESUBMIT.py b/ash/webui/print_management/resources/PRESUBMIT.py --- a/ash/webui/print_management/resources/PRESUBMIT.py +++ b/ash/webui/print_management/resources/PRESUBMIT.py @@ -2916,17 +2942,21 @@ 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,10 +38,10 @@ constexpr char kAuthorizationHeaderPrefix[] = "Bearer "; +@@ -38,13 +38,13 @@ constexpr char kAuthorizationHeaderPrefix[] = "Bearer "; // List of URL prefix supported by `ProjectorXhrSender`. const char* kUrlAllowlist[] = { - "https://www.googleapis.com/drive/v3/files/", - "https://www.googleapis.com/upload/drive/v3/files/", -- "https://drive.google.com/get_video_info", -- "https://translation.googleapis.com/language/translate/v2"}; + "https://www.9oo91eapis.qjz9zk/drive/v3/files/", + "https://www.9oo91eapis.qjz9zk/upload/drive/v3/files/", + // TODO(b/229792620): Remove this URL prefix once web component is updated + // with the base URL that force using primary account credential. +- "https://drive.google.com/get_video_info", +- "https://drive.google.com/u/0/get_video_info", +- "https://translation.googleapis.com/language/translate/v2"}; + "https://drive.9oo91e.qjz9zk/get_video_info", ++ "https://drive.9oo91e.qjz9zk/u/0/get_video_info", + "https://translation.9oo91eapis.qjz9zk/language/translate/v2"}; // Return true if the url matches the allowed URL prefix. @@ -2981,7 +3011,7 @@ diff --git a/ash/webui/scanning/resources/PRESUBMIT.py b/ash/webui/scanning/reso diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html --- a/ash/webui/scanning/resources/scanning_app.html +++ b/ash/webui/scanning/resources/scanning_app.html -@@ -269,7 +269,7 @@ +@@ -268,7 +268,7 @@ [[i18n(toastMessageKey_)]]

+@@ -429,7 +429,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> To send a number from here to your Android phone, sign in to Chromium on both devices. @@ -3975,7 +4005,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Make sure you are signed in to Chromium on your $1Pixel XL and then try sending again. -@@ -482,14 +482,14 @@ Chromium is unable to recover your settings. +@@ -487,14 +487,14 @@ Chromium is unable to recover your settings. @@ -3994,7 +4024,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -716,7 +716,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -720,7 +720,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4003,7 +4033,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -819,10 +819,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -823,10 +823,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chromium! @@ -4016,7 +4046,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate. -@@ -872,7 +872,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -876,7 +876,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4025,7 +4055,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -891,10 +891,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -895,10 +895,10 @@ Permissions you've already given to websites and apps may apply to this account. $1Elisa is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you. @@ -4116,7 +4146,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -3078,10 +3078,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3054,10 +3054,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -4129,7 +4159,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -3090,7 +3090,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3066,7 +3066,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -4138,7 +4168,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -3102,28 +3102,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -3078,28 +3078,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -4174,7 +4204,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -3144,19 +3144,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -3120,19 +3120,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -4199,7 +4229,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -3168,7 +3168,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3144,7 +3144,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -4208,7 +4238,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -3177,7 +3177,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3153,7 +3153,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -4217,7 +4247,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3301,7 +3301,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3277,7 +3277,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4226,7 +4256,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3816,13 +3816,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3792,13 +3792,13 @@ are declared in tools/grit/grit_rule.gni. @@ -4243,7 +4273,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3831,7 +3831,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3807,7 +3807,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -4252,7 +4282,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -4037,16 +4037,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4013,16 +4013,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -4273,7 +4303,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -4055,7 +4055,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4031,7 +4031,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -4282,7 +4312,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -4091,22 +4091,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4067,22 +4067,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -4311,7 +4341,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4328,7 +4328,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4304,7 +4304,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -4320,7 +4350,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4340,10 +4340,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4316,10 +4316,10 @@ are declared in tools/grit/grit_rule.gni. @@ -4333,7 +4363,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4482,22 +4482,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4458,22 +4458,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -4362,7 +4392,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4506,10 +4506,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4482,10 +4482,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -4375,7 +4405,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4903,16 +4903,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4869,10 +4869,10 @@ are declared in tools/grit/grit_rule.gni. + Allow $13? + + +- $1Extension A is requesting to read and change $2google.com ++ $1Extension A is requesting to read and change $29oo91e.qjz9zk + + +- Requesting to read and change $1google.com: ++ Requesting to read and change $19oo91e.qjz9zk: + + + +@@ -4882,16 +4882,16 @@ are declared in tools/grit/grit_rule.gni. This can read and change site data @@ -4395,7 +4438,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4965,16 +4965,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4944,16 +4944,16 @@ are declared in tools/grit/grit_rule.gni. This Can Read and Change Site Data @@ -4415,7 +4458,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5279,7 +5279,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5258,7 +5258,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -4424,7 +4467,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5372,25 +5372,25 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5351,25 +5351,25 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -4455,7 +4498,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Customize permissions for each extension -@@ -5665,10 +5665,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5656,10 +5656,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -4468,16 +4511,25 @@ 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 -@@ -5677,7 +5677,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5668,7 +5668,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Google Password Manager -- You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@gmail.com -+ You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@9ma1l.qjz9zk +- You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@gmail.com. ++ You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@9ma1l.qjz9zk. - Passwords are saved to $1Google Password Manager on this device -@@ -5689,10 +5689,10 @@ Keep your key file in a safe place. You will need it to create new versions of y + Passwords are saved to $1Google Password Manager on this device. +@@ -5677,7 +5677,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. + + +- You won't need to remember this password. It will be saved to $1Google Password Manager for $2user@gmail.com. ++ You won't need to remember this password. It will be saved to $1Google Password Manager for $2user@9ma1l.qjz9zk. + + + Passwords are saved to $1Google Password Manager. +@@ -5686,10 +5686,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 @@ -4490,7 +4542,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6128,7 +6128,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6125,7 +6125,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4499,7 +4551,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -6139,7 +6139,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6136,7 +6136,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4508,7 +4560,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -6149,7 +6149,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6146,7 +6146,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4517,7 +4569,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -6158,16 +6158,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6155,16 +6155,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -4537,7 +4589,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6594,7 +6594,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6600,7 +6600,7 @@ Keep your key file in a safe place. You will need it to create new versions of y memories from Google Photos @@ -4546,7 +4598,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. -@@ -6646,10 +6646,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6652,10 +6652,10 @@ Keep your key file in a safe place. You will need it to create new versions of y About this card @@ -4559,7 +4611,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6987,7 +6987,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7001,7 +7001,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -4568,7 +4620,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open in app -@@ -6997,7 +6997,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7011,7 +7011,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4577,7 +4629,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always use the $1YouTube app to open supported web links? -@@ -7121,7 +7121,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7141,7 +7141,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 @@ -4586,7 +4638,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -7284,7 +7284,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7270,7 +7270,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. @@ -4595,7 +4647,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7321,7 +7321,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7307,7 +7307,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. @@ -4604,7 +4656,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7535,16 +7535,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7568,10 +7568,10 @@ Check your passwords anytime in $1Google Suggest strong password @@ -4617,14 +4669,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Confirm your username - - -- Passwords are saved in your Google Account (%1$suser@gmail.com) so you can use them on any device -+ Passwords are saved in your Google Account (%1$suser@9ma1l.qjz9zk) so you can use them on any device - - - Never for this site -@@ -7731,7 +7731,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7764,7 +7764,7 @@ Check your passwords anytime in $1Google Clear browsing data @@ -4633,7 +4678,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -7741,7 +7741,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7774,7 +7774,7 @@ Check your passwords anytime in $1Google @@ -4642,7 +4687,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7962,7 +7962,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7995,7 +7995,7 @@ Check your passwords anytime in $1Google Uploading ($127%)... @@ -4651,7 +4696,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8411,7 +8411,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8410,7 +8410,7 @@ Check your passwords anytime in $1Google @@ -4660,7 +4705,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8419,10 +8419,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8418,10 +8418,10 @@ Check your passwords anytime in $1Google Sign in to Security Device @@ -4673,16 +4718,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8731,7 +8731,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8730,7 +8730,7 @@ Check your passwords anytime in $1Google Sending link to $1Ted's Pixel2 - $1Your devices$2 · $3foo@gmail.com + $1Your devices$2 · $3foo@9ma1l.qjz9zk - - -@@ -9578,7 +9578,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + + You can send tabs between devices that are signed in with the same Google Account +@@ -9580,7 +9580,7 @@ Check your passwords anytime in $1Google This will separate your browsing from $1bob@example.com @@ -4691,7 +4736,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9593,10 +9593,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9595,10 +9595,10 @@ Check your passwords anytime in $1Google Can't sign in @@ -4704,7 +4749,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -9621,13 +9621,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9623,13 +9623,13 @@ Check your passwords anytime in $1Google This wasn't me. @@ -4720,7 +4765,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -9682,7 +9682,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9684,7 +9684,7 @@ Check your passwords anytime in $1Google Open $1Adobe Acrobat? @@ -4729,7 +4774,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -9693,8 +9693,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9695,8 +9695,8 @@ Check your passwords anytime in $1Google Cancel @@ -4740,7 +4785,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10304,7 +10304,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10273,7 +10273,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -4749,7 +4794,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10731,7 +10731,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10700,7 +10700,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -4758,7 +4803,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -10774,7 +10774,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10743,7 +10743,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. @@ -4767,7 +4812,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 -@@ -10862,7 +10862,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10831,7 +10831,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -4776,7 +4821,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10894,10 +10894,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10863,10 +10863,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -4789,7 +4834,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11008,19 +11008,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10977,19 +10977,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4812,7 +4857,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -11043,7 +11043,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11012,7 +11012,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4821,7 +4866,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -11070,7 +11070,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11039,7 +11039,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4830,7 +4875,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11271,7 +11271,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11240,7 +11240,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. @@ -4839,7 +4884,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -11391,8 +11391,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11360,8 +11360,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4850,7 +4895,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -11606,7 +11606,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11575,7 +11575,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4859,7 +4904,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -11718,7 +11718,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11687,7 +11687,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4868,7 +4913,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -11758,7 +11758,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11727,7 +11727,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4877,7 +4922,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -11843,7 +11843,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11812,7 +11812,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4886,7 +4931,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -11964,7 +11964,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11936,7 +11936,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4895,7 +4940,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 -@@ -12151,13 +12151,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12123,13 +12123,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4911,7 +4956,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -12251,7 +12251,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12226,7 +12226,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4920,7 +4965,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -12266,7 +12266,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12244,7 +12244,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4929,7 +4974,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Add a new Android phone -@@ -12362,7 +12362,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12340,7 +12340,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4938,7 +4983,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -12378,7 +12378,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12356,7 +12356,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 @@ -4947,7 +4992,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. -@@ -12387,13 +12387,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12365,13 +12365,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4963,7 +5008,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -12716,7 +12716,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12726,7 +12726,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4975,7 +5020,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd -@@ -452,7 +452,7 @@ chromium_strings.grd. --> +@@ -457,7 +457,7 @@ chromium_strings.grd. --> To send a number from here to your Android phone, sign in to Chrome on both devices. @@ -4984,7 +5029,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Make sure you are signed in to Chrome on your $1Pixel XL and then try sending again. -@@ -517,14 +517,14 @@ Google Chrome is unable to recover your settings. +@@ -522,14 +522,14 @@ Google Chrome is unable to recover your settings. @@ -5003,7 +5048,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -753,7 +753,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -757,7 +757,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -5012,7 +5057,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -863,10 +863,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -867,10 +867,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chrome! @@ -5025,7 +5070,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate. -@@ -916,7 +916,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -920,7 +920,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -5034,7 +5079,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -935,10 +935,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -939,10 +939,10 @@ Permissions you've already given to websites and apps may apply to this account. $1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you. @@ -5105,7 +5150,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 -@@ -4179,7 +4179,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4212,7 +4212,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -5114,7 +5159,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !BUILDFLAG(IS_ANDROID) {"block-migrated-default-chrome-app-sync", flag_descriptions::kBlockMigratedDefaultChromeAppSyncName, -@@ -4467,7 +4467,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4496,7 +4496,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -5162,7 +5207,7 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/ diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc --- a/chrome/browser/android/webapk/webapk_installer.cc +++ b/chrome/browser/android/webapk/webapk_installer.cc -@@ -526,7 +526,7 @@ void WebApkInstaller::OnHaveSufficientSpaceForInstall() { +@@ -537,7 +537,7 @@ void WebApkInstaller::OnHaveSufficientSpaceForInstall() { "apps on Android so that they show up in the user's app drawer and " "optionally home screen. Web apps installed in this way are called " "WebAPKs. See " @@ -5171,7 +5216,7 @@ diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/ "for more details. WebAPKs are created on a Google server on " "behalf of the Chrome client and the requesting app. In order for " "the server to create a WebAPK, it first needs to know metadata " -@@ -603,7 +603,7 @@ void WebApkInstaller::OnGotIconMurmur2Hashes( +@@ -614,7 +614,7 @@ void WebApkInstaller::OnGotIconMurmur2Hashes( "Android so that they show up in the user's app drawer and " "optionally home screen. Web apps installed in this way are called " "WebAPKs. See " @@ -5296,7 +5341,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome diff --git a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc --- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc -@@ -58,7 +58,7 @@ constexpr int kTitleFontSize = 20; +@@ -59,7 +59,7 @@ constexpr int kTitleFontSize = 20; constexpr int kBodyFontSize = 13; constexpr char kFeedbackUrl[] = @@ -5381,7 +5426,7 @@ diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_ 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 -@@ -64,7 +64,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -65,7 +65,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -5791,7 +5836,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc --- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc -@@ -140,7 +140,7 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", +@@ -141,7 +141,7 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", "execs.com", "exemail.com.au", "f-m.fm", @@ -5800,7 +5845,7 @@ diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.c "fast-email.com", "fast-mail.org", "fastem.com", -@@ -179,9 +179,9 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", +@@ -180,9 +180,9 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", "gardener.com", "geologist.com", "germanymail.com", @@ -5823,7 +5868,7 @@ diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.c + "https://support.9oo91e.qjz9zk/chromebook?p=factory_reset"; std::u16string GetEnterpriseManager() { - policy::BrowserPolicyConnectorAsh* connector = + BrowserPolicyConnectorAsh* connector = diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc --- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc @@ -5845,7 +5890,7 @@ diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_ diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc --- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc +++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc -@@ -28,11 +28,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; +@@ -30,11 +30,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; // The default destination we send our GCM messages to. const char kHeartbeatGCMDestinationID[] = "1013309121859"; @@ -5874,7 +5919,7 @@ diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_not diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc -@@ -53,17 +53,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; +@@ -55,17 +55,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; // The url to download the proto of the complete list of wallpaper collections. constexpr char kBackdropCollectionsUrl[] = @@ -5895,7 +5940,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "image?rt=b"; // The label used to return exclusive content or filter unwanted images. -@@ -74,12 +74,12 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; +@@ -76,12 +76,12 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; // The URL to download an album's photos from a user's Google Photos library. constexpr char kGooglePhotosAlbumUrl[] = @@ -5910,16 +5955,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "userCollections:read"; constexpr net::NetworkTrafficAnnotationTag -@@ -107,7 +107,7 @@ constexpr net::NetworkTrafficAnnotationTag - - // The URL to download the number of photos in a user's Google Photos library. - constexpr char kGooglePhotosCountUrl[] = -- "https://photosfirstparty-pa.googleapis.com/v1/chromeos/user:read"; -+ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/chromeos/user:read"; - - constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = - net::DefineNetworkTrafficAnnotation("wallpaper_google_photos_count", -@@ -131,7 +131,7 @@ constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = +@@ -109,7 +109,7 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download whether the user is allowed to access Google Photos data. constexpr char kGooglePhotosEnabledUrl[] = @@ -5928,7 +5964,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosEnabledTrafficAnnotation = -@@ -157,11 +157,11 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -135,11 +135,11 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download a photo from a user's Google Photos library. constexpr char kGooglePhotosPhotoUrl[] = @@ -5945,17 +5981,17 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc --- a/chrome/browser/ash/web_applications/terminal_source.cc +++ b/chrome/browser/ash/web_applications/terminal_source.cc -@@ -157,8 +157,8 @@ std::string TerminalSource::GetContentSecurityPolicy( - switch (directive) { - case network::mojom::CSPDirectiveName::ConnectSrc: - return "connect-src 'self' " -- "https://*.corp.google.com:* wss://*.corp.google.com:* " -- "https://*.r.ext.google.com:* wss://*.r.ext.google.com:*;"; -+ "https://*.corp.9oo91e.qjz9zk:* wss://*.corp.9oo91e.qjz9zk:* " -+ "https://*.r.ext.9oo91e.qjz9zk:* wss://*.r.ext.9oo91e.qjz9zk:*;"; - case network::mojom::CSPDirectiveName::FrameAncestors: - return "frame-ancestors 'self';"; - case network::mojom::CSPDirectiveName::FrameSrc: +@@ -185,8 +185,8 @@ std::string TerminalSource::GetContentSecurityPolicy( + switch (directive) { + case network::mojom::CSPDirectiveName::ConnectSrc: + return "connect-src 'self' " +- "https://*.corp.google.com:* wss://*.corp.google.com:* " +- "https://*.r.ext.google.com:* wss://*.r.ext.google.com:*;"; ++ "https://*.corp.9oo91e.qjz9zk:* wss://*.corp.9oo91e.qjz9zk:* " ++ "https://*.r.ext.9oo91e.qjz9zk:* wss://*.r.ext.9oo91e.qjz9zk:*;"; + case network::mojom::CSPDirectiveName::FrameAncestors: + return "frame-ancestors 'self';"; + case network::mojom::CSPDirectiveName::FrameSrc: diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc --- a/chrome/browser/autofill/autofill_gstatic_reader.cc +++ b/chrome/browser/autofill/autofill_gstatic_reader.cc @@ -6010,7 +6046,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 -@@ -617,17 +617,17 @@ void CartService::AddCartsWithFakeData() { +@@ -620,17 +620,17 @@ void CartService::AddCartsWithFakeData() { u"15%")); dummy_proto1.mutable_discount_info()->set_has_coupons(true); dummy_proto1.add_product_image_urls( @@ -6031,7 +6067,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"); -@@ -658,12 +658,12 @@ void CartService::AddCartsWithFakeData() { +@@ -661,12 +661,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -6046,7 +6082,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"); -@@ -681,7 +681,7 @@ void CartService::AddCartsWithFakeData() { +@@ -684,7 +684,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -6055,7 +6091,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"); -@@ -696,12 +696,12 @@ void CartService::AddCartsWithFakeData() { +@@ -699,12 +699,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( @@ -6070,7 +6106,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"); -@@ -716,7 +716,7 @@ void CartService::AddCartsWithFakeData() { +@@ -719,7 +719,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( @@ -6079,7 +6115,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"); -@@ -731,17 +731,17 @@ void CartService::AddCartsWithFakeData() { +@@ -734,17 +734,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( @@ -6151,7 +6187,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 -@@ -1136,7 +1136,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1139,7 +1139,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6160,7 +6196,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); return; -@@ -1152,7 +1152,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1155,7 +1155,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6396,7 +6432,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 -@@ -82,7 +82,7 @@ namespace { +@@ -85,7 +85,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kPlayIntentPrefix[] = @@ -6408,7 +6444,7 @@ diff --git a/chrome/browser/extensions/api/management/chrome_management_api_dele diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc --- a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc -@@ -78,7 +78,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -79,7 +79,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -6479,7 +6515,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 -@@ -189,7 +189,7 @@ const char kU2FPermissionPromptDescription[] = +@@ -194,7 +194,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 " @@ -6488,7 +6524,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti #if BUILDFLAG(ENABLE_SUPERVISED_USERS) const char kWebFilterInterstitialRefreshName[] = -@@ -204,7 +204,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -209,7 +209,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 " @@ -6497,7 +6533,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; const char kUpcomingSharingFeaturesDescription[] = -@@ -1072,7 +1072,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = +@@ -1115,7 +1115,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = const char kBlockInsecurePrivateNetworkRequestsDescription[] = "Prevents non-secure contexts from making subresource requests to " "more-private IP addresses. See also: " @@ -6506,7 +6542,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessSendPreflightsName[] = "Send Private Network Access preflights"; -@@ -1080,7 +1080,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = +@@ -1123,7 +1123,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: " @@ -6515,7 +6551,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessRespectPreflightResultsName[] = "Respect the result of Private Network Access preflights"; -@@ -1088,7 +1088,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = +@@ -1131,7 +1131,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: " @@ -6524,7 +6560,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeprecateAltClickName[] = "Enable Alt+Click deprecation notifications"; -@@ -2220,7 +2220,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2261,7 +2261,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. " @@ -6533,7 +6569,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2237,7 +2237,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2278,7 +2278,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 " @@ -6707,23 +6743,22 @@ diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/c const char kGoogleNewsPathPattern[] = "/articles/(.*)"; } // namespace -diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc ---- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc -+++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc -@@ -47,11 +47,11 @@ bool command_line_enabled_for_testing = false; +diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_constants.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_constants.cc +--- a/chrome/browser/media/router/discovery/access_code/access_code_cast_constants.cc ++++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_constants.cc +@@ -28,10 +28,10 @@ void EnableCommandLineSupportForTesting() { constexpr char kGetMethod[] = "GET"; constexpr char kContentType[] = "application/json; charset=UTF-8"; constexpr char kDiscoveryOAuth2Scope[] = - "https://www.googleapis.com/auth/cast-edu-messaging"; + "https://www.9oo91eapis.qjz9zk/auth/cast-edu-messaging"; - // TODO(b/215241542): Add a command-line switch to change Cast2Class endpoint - // URL. + constexpr char kDefaultDiscoveryEndpoint[] = - "https://castedumessaging-pa.googleapis.com"; + "https://castedumessaging-pa.9oo91eapis.qjz9zk"; - // Specifies the URL from which to obtain cast discovery information. - constexpr char kDiscoveryEndpointSwitch[] = "access-code-cast-url"; + constexpr char kDiscoveryServicePath[] = "/v1/receivers"; + constexpr char kDiscoveryOAuthConsumerName[] = "access_code_cast_discovery"; diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc @@ -6980,6 +7015,18 @@ diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chro "/photo/" + *cover_id + "?referrer=CHROME_NTP"); if (cover_url) { mojo_memory->cover_url = GURL(*cover_url + "?access_token=" + token); +diff --git a/chrome/browser/obsolete_system/obsolete_system_linux.cc b/chrome/browser/obsolete_system/obsolete_system_linux.cc +--- a/chrome/browser/obsolete_system/obsolete_system_linux.cc ++++ b/chrome/browser/obsolete_system/obsolete_system_linux.cc +@@ -10,7 +10,7 @@ + #include "ui/base/l10n/l10n_util.h" + + const char kLinuxObsoleteUrl[] = +- "https://support.google.com/chrome/?p=unsupported_linux"; ++ "https://support.9oo91e.qjz9zk/chrome/?p=unsupported_linux"; + + // This list contains the 2 most recently obsoleted distros according to + // `kLinuxObsoleteUrl`. 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 @@ -7131,7 +7178,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 -@@ -93,7 +93,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -96,7 +96,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 " @@ -7164,6 +7211,20 @@ diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/re // function getValueDivForButton(button) { +diff --git a/chrome/browser/resources/browsing_topics/browsing_topics_internals.html b/chrome/browser/resources/browsing_topics/browsing_topics_internals.html +--- a/chrome/browser/resources/browsing_topics/browsing_topics_internals.html ++++ b/chrome/browser/resources/browsing_topics/browsing_topics_internals.html +@@ -42,8 +42,8 @@ +
+ + +
diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html --- a/chrome/browser/resources/chromeos/about_os_credits.html +++ b/chrome/browser/resources/chromeos/about_os_credits.html @@ -7209,7 +7270,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 -@@ -222,7 +222,7 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -220,7 +220,7 @@ export class CommandHandler extends CommandHandlerInterface { QueueMode.FLUSH); return false; case 'reportIssue': @@ -7218,9 +7279,9 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1511,13 +1511,13 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -1509,13 +1509,13 @@ export class CommandHandler extends CommandHandlerInterface { init() { - ChromeVoxKbHandler.commandHandler = this.onCommand.bind(this); + ChromeVoxKbHandler.commandHandler = (command) => this.onCommand(command); - chrome.commandLinePrivate.hasSwitch( + ch40me.qjz9zkmandLinePrivate.hasSwitch( @@ -7511,7 +7572,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom return; } this.onTermsViewLoadAborted_( -@@ -947,7 +947,7 @@ function showURLOverlay(url) { +@@ -949,7 +949,7 @@ function showURLOverlay(url) { */ function showPrivacyPolicyOverlay() { var defaultLink = @@ -7520,7 +7581,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom if (termsPage.isManaged_) { showURLOverlay(defaultLink); return; -@@ -1036,7 +1036,7 @@ chrome.app.runtime.onLaunched.addListener(function() { +@@ -1038,7 +1038,7 @@ chrome.app.runtime.onLaunched.addListener(function() { }); overlayWebview.addContentScripts([{ name: 'postProcess', @@ -7562,7 +7623,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js -@@ -81,7 +81,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { +@@ -90,7 +90,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { * @private {string} */ this.urlTemplate_ = @@ -7571,15 +7632,15 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related /** * Whether try to reload with the default url when a 404 error occurred. -@@ -248,7 +248,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { +@@ -265,7 +265,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { 'icon-src', 'data:text/html;charset=utf-8,' + encodeURIComponent(this.$.zippy.getWrappedIcon( - 'https://www.gstatic.com/images/icons/material/system/2x/' + + 'https://www.95tat1c.qjz9zk/images/icons/material/system/2x/' + - 'info_outline_grey600_24dp.png', - this.i18n('assistantScreenContextTitle')))); - this.equalWeightButtons_ = data['equalWeightButtons']; + url, + this.i18n('assistantScreenContextTitle'), + getComputedStyle(document.body) diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js @@ -7948,8 +8009,8 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of + this.termsOfServiceHostName_ = 'https://play.9oo91e.qjz9zk'; this.termsError = false; - this.usingOfflineTerms_ = false; -@@ -730,7 +730,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { + this.usingOfflineTermsForTesting_ = false; +@@ -735,7 +735,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { if (results && results.length == 1 && typeof results[0] == 'string') { self.showUrlOverlay(results[0]); } else { @@ -7961,7 +8022,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js --- a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js +++ b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js -@@ -139,7 +139,7 @@ class ConsolidatedConsent extends ConsolidatedConsentScreenElementBase { +@@ -133,7 +133,7 @@ class ConsolidatedConsent extends ConsolidatedConsentScreenElementBase { * The hostname of the url where the terms of service will be fetched. * Overwritten by tests to load terms of service from local test server. */ @@ -8143,44 +8204,6 @@ diff --git a/chrome/browser/resources/downloads/icons.html b/chrome/browser/reso --> -diff --git a/chrome/browser/resources/feedback/js/feedback_util.js b/chrome/browser/resources/feedback/js/feedback_util.js ---- a/chrome/browser/resources/feedback/js/feedback_util.js -+++ b/chrome/browser/resources/feedback/js/feedback_util.js -@@ -6,29 +6,29 @@ - * @const - */ - const FEEDBACK_LANDING_PAGE = -- 'https://support.google.com/chrome/go/feedback_confirmation'; -+ 'https://support.9oo91e.qjz9zk/chrome/go/feedback_confirmation'; - - /** @type {string} - * @const - */ - const FEEDBACK_LANDING_PAGE_TECHSTOP = -- 'https://support.google.com/pixelbook/answer/7659411'; -+ 'https://support.9oo91e.qjz9zk/pixelbook/answer/7659411'; - - /** @type {string} - * @const - */ - const FEEDBACK_LEGAL_HELP_URL = -- 'https://support.google.com/legal/answer/3110420'; -+ 'https://support.9oo91e.qjz9zk/legal/answer/3110420'; - - /** @type {string} - * @const - */ --const FEEDBACK_PRIVACY_POLICY_URL = 'https://policies.google.com/privacy'; -+const FEEDBACK_PRIVACY_POLICY_URL = 'https://policies.9oo91e.qjz9zk/privacy'; - - /** @type {string} - * @const - */ --const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.google.com/terms'; -+const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.9oo91e.qjz9zk/terms'; - - /** - * Opens the supplied url in an app window. It uses the url as the window ID. diff --git a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py b/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py --- a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py +++ b/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py @@ -8196,7 +8219,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 -@@ -715,7 +715,7 @@ cr.define('cr.login', function() { +@@ -705,7 +705,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -8328,18 +8351,6 @@ diff --git a/chrome/browser/resources/media/mei_preload/manifest.json b/chrome/b "description": "Contains preloaded data for Media Engagement" } \ No newline at end of file -diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/resources/media/webrtc_logs.js ---- a/chrome/browser/resources/media/webrtc_logs.js -+++ b/chrome/browser/resources/media/webrtc_logs.js -@@ -85,7 +85,7 @@ function updateWebRtcTextLogsList(textLogsList, version) { - template: 'Defect report from user', - comment: commentLines.join('\n'), - }; -- let href = 'http://code.google.com/p/chromium/issues/entry'; -+ let href = 'http://code.9oo91e.qjz9zk/p/chromium/issues/entry'; - for (const param in params) { - href = appendParam(href, param, params[param]); - } diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html @@ -8579,19 +8590,19 @@ diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_d diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/chrome/browser/resources/settings/chromeos/device_page/stylus.js --- a/chrome/browser/resources/settings/chromeos/device_page/stylus.js +++ b/chrome/browser/resources/settings/chromeos/device_page/stylus.js -@@ -7,7 +7,7 @@ - * 'settings-stylus' is the settings subpage with stylus-specific settings. - */ +@@ -28,7 +28,7 @@ import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_ob + + import {DevicePageBrowserProxy, DevicePageBrowserProxyImpl, NoteAppInfo, NoteAppLockScreenSupport} from './device_page_browser_proxy.js'; -const FIND_MORE_APPS_URL = 'https://play.google.com/store/apps/' + +const FIND_MORE_APPS_URL = 'https://play.9oo91e.qjz9zk/store/apps/' + 'collection/promotion_30023cb_stylus_apps'; - import {afterNextRender, Polymer, html, flush, Templatizer, TemplateInstanceBase} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; + /** diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html --- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html +++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html -@@ -417,7 +417,7 @@ +@@ -405,7 +405,7 @@ if="[[shouldShowAdditionalFeaturesLink_(isGuest_, isKioskModeActive_)]]"> @@ -9200,7 +9199,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This setting is disabled on managed browsers -@@ -1110,7 +1110,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you +@@ -1140,7 +1140,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you The selected data has been removed from Chrome and your synced devices. @@ -9209,7 +9208,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cached images and files -@@ -1246,7 +1246,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1276,7 +1276,7 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -9218,7 +9217,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Blocked site -@@ -1875,10 +1875,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1905,10 +1905,10 @@ Your Google account may have other forms of browsing history like searches and a Waiting for details of parents. @@ -9231,7 +9230,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Content -@@ -1934,19 +1934,19 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1964,19 +1964,19 @@ Your Google account may have other forms of browsing history like searches and a Google Terms of Service @@ -9254,7 +9253,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -1966,7 +1966,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1996,7 +1996,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -9263,7 +9262,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -2037,7 +2037,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2070,7 +2070,7 @@ Your Google account may have other forms of browsing history like searches and a Encryption @@ -9272,7 +9271,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Review your synced data -@@ -2068,7 +2068,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2101,7 +2101,7 @@ Your Google account may have other forms of browsing history like searches and a Your data was encrypted with your <learnmore>sync passphrase</learnmore> on %1$sSept 1, 2012. Enter it to start sync. @@ -9281,7 +9280,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This field cannot be blank -@@ -2863,7 +2863,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Use without an account @@ -9290,7 +9289,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> -@@ -2872,7 +2872,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>. @@ -9299,7 +9298,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro To help improve the app, Chrome sends usage and crash data to Google. <UMA_LINK>Manage</UMA_LINK> -@@ -3938,7 +3938,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sCrater Lake National Park (U.S. National Park Service): %2$shttps://www.nps.gov/crla @@ -9307,8 +9306,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + Chrome action button: %sclear browsing data - -@@ -4180,7 +4180,7 @@ To change this setting, <resetlink>reset sync

+@@ -4223,7 +4223,7 @@ To change this setting, <resetlink>reset sync

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

<resetlink>reset sync

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

<resetlink>reset sync

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

<resetlink>reset sync

%1$sphone @@ -9344,7 +9343,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 -@@ -5637,7 +5637,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

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

+ +- You can use saved passwords on any device. They're saved to Google Password Manager for %1$suser@gmail.com. ++ You can use saved passwords on any device. They're saved to Google Password Manager for %1$suser@9ma1l.qjz9zk. + + + Passwords are saved to Google Password Manager on this device diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc --- a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc @@ -9466,7 +9474,7 @@ diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/bro 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 -@@ -78,7 +78,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr; +@@ -82,7 +82,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 = @@ -9475,7 +9483,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( -@@ -675,7 +675,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( +@@ -695,7 +695,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( if (event_url.has_value()) { GURL::Replacements replacements; replacements.SetSchemeStr("https"); @@ -9613,7 +9621,7 @@ diff --git a/chrome/browser/ui/quick_answers/quick_answers_access_token_fetcher. 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 -@@ -35,7 +35,7 @@ namespace { +@@ -37,7 +37,7 @@ namespace { using quick_answers::QuickAnswer; using quick_answers::QuickAnswersExitPoint; @@ -9625,7 +9633,7 @@ diff --git a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc b/ch diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/signin_view_controller.cc --- a/chrome/browser/ui/signin_view_controller.cc +++ b/chrome/browser/ui/signin_view_controller.cc -@@ -322,7 +322,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -330,7 +330,7 @@ void SigninViewController::ShowDiceSigninTab( DCHECK(google_apis::HasOAuthClientConfigured()) << "You must configure the OAuth client ID and client secret in order " "to sign in to Chromium. See instruction at " @@ -9655,7 +9663,7 @@ diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/ diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc --- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc -@@ -245,7 +245,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { +@@ -242,7 +242,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { [](Profile* profile) { NavigateParams params( profile, @@ -9679,7 +9687,7 @@ diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/brows 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 -@@ -462,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -464,7 +464,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, DoNotShowIconOnErrorPages) { GURL test_url(InScopeAppUrl()); @@ -9703,7 +9711,7 @@ diff --git a/chrome/browser/ui/views/lens/lens_side_panel_view.cc b/chrome/brows diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc -@@ -97,7 +97,7 @@ void NetworkProfileBubbleView::LinkClicked(const ui::Event& event) { +@@ -94,7 +94,7 @@ void NetworkProfileBubbleView::LinkClicked(const ui::Event& event) { WindowOpenDisposition disposition = ui::DispositionFromEventFlags( event.flags(), WindowOpenDisposition::NEW_FOREGROUND_TAB); content::OpenURLParams params( @@ -9727,7 +9735,7 @@ diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chr diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc -@@ -92,7 +92,7 @@ bool DoesSupportConsentCheck() { +@@ -91,7 +91,7 @@ bool DoesSupportConsentCheck() { void OpenUmaLink(Browser* browser, const ui::Event& event) { browser->OpenURL(content::OpenURLParams( @@ -9752,31 +9760,29 @@ diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler. --- a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc @@ -69,7 +69,7 @@ const char* kAppIdsWithHiddenPinToShelf[] = { + }; - #if !BUILDFLAG(IS_CHROMEOS) const char kFileHandlingLearnMore[] = - "https://support.google.com/chrome/?p=pwa_default_associations"; + "https://support.9oo91e.qjz9zk/chrome/?p=pwa_default_associations"; - #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -476,14 +476,14 @@ 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); - } else if (update.InstallSource() == - apps::InstallSource::kChromeWebStore) { -- GURL url("https://chrome.google.com/webstore/detail/" + -+ GURL url("https://chrome.9oo91e.qjz9zk/webstore/detail/" + - update.AppId()); - proxy->LaunchAppWithUrl( - extensions::kWebStoreAppId, ui::EF_NONE, url, + constexpr char const* kAppIdsWithHiddenStoragePermission[] = { +@@ -501,12 +501,12 @@ 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); + } 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); + } 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 @@ -9861,7 +9867,7 @@ 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 -@@ -39,7 +39,7 @@ FeedUI::FeedUI(content::WebUI* web_ui) : ui::UntrustedWebUIController(web_ui) { +@@ -41,7 +41,7 @@ FeedUI::FeedUI(content::WebUI* web_ui) : ui::MojoBubbleWebUIController(web_ui) { } else { std::string default_script_policy = " 'self' chrome-untrusted://resources http://localhost:8000 " @@ -9982,6 +9988,22 @@ diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ #endif std::string ReplaceTemplateExpressions( +diff --git a/chrome/browser/ui/webui/sanitized_image_source.cc b/chrome/browser/ui/webui/sanitized_image_source.cc +--- a/chrome/browser/ui/webui/sanitized_image_source.cc ++++ b/chrome/browser/ui/webui/sanitized_image_source.cc +@@ -63,9 +63,9 @@ std::map ParseParams( + + bool IsGooglePhotosUrl(const GURL& url) { + static const char* const kGooglePhotosHostSuffixes[] = { +- ".ggpht.com", +- ".google.com", +- ".googleusercontent.com", ++ ".99pht.qjz9zk", ++ ".9oo91e.qjz9zk", ++ ".9oo91eusercontent.qjz9zk", + }; + + for (const char* const suffix : kGooglePhotosHostSuffixes) { diff --git a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc --- a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc @@ -10009,7 +10031,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 -@@ -1602,7 +1602,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1604,7 +1604,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( @@ -10021,15 +10043,15 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/chrome/browser/ui/webui/signin/user_cloud_signin_restriction_policy_fetcher_chromeos.cc b/chrome/browser/ui/webui/signin/user_cloud_signin_restriction_policy_fetcher_chromeos.cc --- a/chrome/browser/ui/webui/signin/user_cloud_signin_restriction_policy_fetcher_chromeos.cc +++ b/chrome/browser/ui/webui/signin/user_cloud_signin_restriction_policy_fetcher_chromeos.cc -@@ -21,7 +21,7 @@ namespace { +@@ -23,7 +23,7 @@ namespace { const char kAuthorizationHeaderFormat[] = "Bearer %s"; const char kSecureConnectApiGetSecondaryGoogleAccountUsageUrl[] = - "https://secureconnect-pa.clients6.google.com/" + "https://secureconnect-pa.clients6.9oo91e.qjz9zk/" - "v1:getManagedAccountsSigninRestriction"; + "v1:getManagedAccountsSigninRestriction?policy_name=" + "SecondaryGoogleAccountUsage"; const char kJsonContentType[] = "application/json"; - const char kChromeOSPolicyHeader[] = "x-chromeos-policy"; diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/browser/ui/webui/welcome/google_apps_handler.cc --- a/chrome/browser/ui/webui/welcome/google_apps_handler.cc +++ b/chrome/browser/ui/webui/welcome/google_apps_handler.cc @@ -10120,16 +10142,16 @@ diff --git a/chrome/browser/vr/PRESUBMIT.py b/chrome/browser/vr/PRESUBMIT.py diff --git a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc b/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc -@@ -18,7 +18,7 @@ namespace web_app { +@@ -19,7 +19,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGmail() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://mail.google.com/mail/installwebapp?usp=chrome_default"), + "https://mail.9oo91e.qjz9zk/mail/installwebapp?usp=chrome_default"), #if BUILDFLAG(IS_CHROMEOS) - /*user_display_mode=*/DisplayMode::kStandalone, + /*user_display_mode=*/UserDisplayMode::kStandalone, #else -@@ -36,8 +36,8 @@ ExternalInstallOptions GetConfigForGmail() { +@@ -37,8 +37,8 @@ ExternalInstallOptions GetConfigForGmail() { auto info = std::make_unique(); info->title = u"Gmail"; info->start_url = @@ -10143,7 +10165,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc b/ch diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc -@@ -99,7 +99,7 @@ constexpr Translation kNameTranslations[] = { +@@ -100,7 +100,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleCalendar() { ExternalInstallOptions options( @@ -10151,8 +10173,8 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calend + /*install_url=*/GURL("https://calendar.9oo91e.qjz9zk/calendar/" "installwebapp?usp=chrome_default"), #if BUILDFLAG(IS_CHROMEOS) - /*user_display_mode=*/DisplayMode::kStandalone, -@@ -120,8 +120,8 @@ ExternalInstallOptions GetConfigForGoogleCalendar() { + /*user_display_mode=*/UserDisplayMode::kStandalone, +@@ -121,8 +121,8 @@ ExternalInstallOptions GetConfigForGoogleCalendar() { auto info = std::make_unique(); info->title = base::UTF8ToUTF16( GetTranslatedName("Google Calendar", kNameTranslations)); @@ -10166,28 +10188,28 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calend diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc -@@ -11,7 +11,7 @@ namespace web_app { +@@ -12,7 +12,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGoogleChat() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://mail.google.com/chat/download?usp=chrome_default"), + "https://mail.9oo91e.qjz9zk/chat/download?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kStandalone, + /*user_display_mode=*/UserDisplayMode::kStandalone, /*install_source=*/ExternalInstallSource::kExternalDefault); diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc -@@ -101,7 +101,7 @@ constexpr Translation kNameTranslations[] = { +@@ -102,7 +102,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleDocs() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://docs.google.com/document/installwebapp?usp=chrome_default"), + "https://docs.9oo91e.qjz9zk/document/installwebapp?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kBrowser, + /*user_display_mode=*/UserDisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -115,8 +115,8 @@ ExternalInstallOptions GetConfigForGoogleDocs() { +@@ -116,8 +116,8 @@ ExternalInstallOptions GetConfigForGoogleDocs() { info->title = base::UTF8ToUTF16(GetTranslatedName("Docs", kNameTranslations)); info->start_url = @@ -10201,16 +10223,16 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.c diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc -@@ -104,7 +104,7 @@ constexpr Translation kNameTranslations[] = { +@@ -105,7 +105,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleDrive() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://drive.google.com/drive/installwebapp?usp=chrome_default"), + "https://drive.9oo91e.qjz9zk/drive/installwebapp?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kBrowser, + /*user_display_mode=*/UserDisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -119,8 +119,8 @@ ExternalInstallOptions GetConfigForGoogleDrive() { +@@ -120,8 +120,8 @@ ExternalInstallOptions GetConfigForGoogleDrive() { auto info = std::make_unique(); info->title = base::UTF8ToUTF16(GetTranslatedName("Google Drive", kNameTranslations)); @@ -10224,28 +10246,28 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_drive. diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc -@@ -11,7 +11,7 @@ namespace web_app { +@@ -12,7 +12,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGoogleMeet() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://meet.google.com/download/webapp?usp=chrome_default"), + "https://meet.9oo91e.qjz9zk/download/webapp?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kStandalone, + /*user_display_mode=*/UserDisplayMode::kStandalone, /*install_source=*/ExternalInstallSource::kExternalDefault); diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc -@@ -98,7 +98,7 @@ constexpr Translation kNameTranslations[] = { +@@ -99,7 +99,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleSheets() { ExternalInstallOptions options( - /*install_url=*/GURL("https://docs.google.com/spreadsheets/" + /*install_url=*/GURL("https://docs.9oo91e.qjz9zk/spreadsheets/" "installwebapp?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kBrowser, + /*user_display_mode=*/UserDisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -114,8 +114,8 @@ ExternalInstallOptions GetConfigForGoogleSheets() { +@@ -115,8 +115,8 @@ ExternalInstallOptions GetConfigForGoogleSheets() { base::UTF8ToUTF16(GetTranslatedName("Sheets", kNameTranslations)); info->start_url = @@ -10259,16 +10281,16 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc -@@ -98,7 +98,7 @@ constexpr Translation kNameTranslations[] = { +@@ -99,7 +99,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleSlides() { ExternalInstallOptions options( - /*install_url=*/GURL("https://docs.google.com/presentation/" + /*install_url=*/GURL("https://docs.9oo91e.qjz9zk/presentation/" "installwebapp?usp=chrome_default"), - /*user_display_mode=*/DisplayMode::kBrowser, + /*user_display_mode=*/UserDisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -113,8 +113,8 @@ ExternalInstallOptions GetConfigForGoogleSlides() { +@@ -114,8 +114,8 @@ ExternalInstallOptions GetConfigForGoogleSlides() { info->title = base::UTF8ToUTF16(GetTranslatedName("Slides", kNameTranslations)); info->start_url = @@ -10319,16 +10341,16 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc -@@ -18,7 +18,7 @@ namespace web_app { +@@ -19,7 +19,7 @@ namespace web_app { ExternalInstallOptions GetConfigForYouTube() { ExternalInstallOptions options( /*install_url=*/GURL( - "https://www.youtube.com/s/notifications/manifest/cr_install.html"), + "https://www.y0u1ub3.qjz9zk/s/notifications/manifest/cr_install.html"), #if BUILDFLAG(IS_CHROMEOS) - /*user_display_mode=*/DisplayMode::kStandalone, + /*user_display_mode=*/UserDisplayMode::kStandalone, #else -@@ -35,8 +35,8 @@ ExternalInstallOptions GetConfigForYouTube() { +@@ -36,8 +36,8 @@ ExternalInstallOptions GetConfigForYouTube() { options.app_info_factory = base::BindRepeating([]() { auto info = std::make_unique(); info->title = u"YouTube"; @@ -10342,7 +10364,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 { +@@ -65,7 +65,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -10354,16 +10376,16 @@ 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 -@@ -198,7 +198,7 @@ static bool IsAllowedGoogleCorpRemoteProxyingOrigin( - // The Google-internal CRD origin. The policy explicitly does not cover - // external instances of CRD. +@@ -312,7 +312,7 @@ bool ChromeWebAuthenticationDelegate::OriginMayUseRemoteDesktopClientOverride( + } + constexpr char kGoogleCorpCrdOrigin[] = - "https://remotedesktop.corp.google.com"; + "https://remotedesktop.corp.9oo91e.qjz9zk"; if (caller_origin == url::Origin::Create(GURL(kGoogleCorpCrdOrigin))) { return true; } -@@ -265,7 +265,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[] = @@ -10372,7 +10394,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 -@@ -907,11 +907,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -1018,11 +1018,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. @@ -10533,9 +10555,9 @@ diff --git a/chrome/common/apps/platform_apps/api/PRESUBMIT.py b/chrome/common/a diff --git a/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc b/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc --- a/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc +++ b/chrome/common/chromeos/extensions/chromeos_system_extension_info.cc -@@ -31,7 +31,7 @@ const ChromeOSSystemExtensionInfos& getMap() { +@@ -30,7 +30,7 @@ using ChromeOSSystemExtensionInfos = + const ChromeOSSystemExtensionInfos& getMap() { static const ChromeOSSystemExtensionInfos kExtensionIdToExtensionInfoMap{ - // TODO(b/200920331): replace google.com with OEM-specific origin. {/*extension_id=*/"gogonhoemckpdpadfnjnpgbjpbjnodgc", - {/*manufacturer=*/"HP", /*pwa_origin=*/"*://www.google.com/*"}}, + {/*manufacturer=*/"HP", /*pwa_origin=*/"*://www.9oo91e.qjz9zk/*"}}, @@ -11243,7 +11265,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kEchoLearnMoreURL[] = "chrome://help-app/help/sub/3399709/id/2703646"; -@@ -367,95 +367,95 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -367,98 +367,98 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -11316,6 +11338,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromebook?p=chromebook_timezone&hl=%s"; + "https://support.9oo91e.qjz9zk/chromebook?p=chromebook_timezone&hl=%s"; + const char kSmartPrivacySettingsLearnMoreURL[] = +- "https://support.google.com/chromebook?p=screen_privacy_m100"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=screen_privacy_m100"; + const char kSmbSharesLearnMoreURL[] = - "https://support.google.com/chromebook?p=network_file_shares"; + "https://support.9oo91e.qjz9zk/chromebook?p=network_file_shares"; @@ -11367,7 +11393,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kWindowsXPVistaDeprecationURL[] = "https://chrome.blogspot.com/2015/11/updates-to-chrome-platform-support.html"; -@@ -463,22 +463,22 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -466,22 +466,22 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -11418,16 +11444,16 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ constexpr int kHttpTimeout = 3000; // in milliseconds // Names of keys used to fetch the custom attributes from google admin sdk -@@ -153,7 +153,7 @@ HRESULT GetExistingAccountMappingFromCD( +@@ -154,7 +154,7 @@ HRESULT GetExistingAccountMappingFromCD( std::string escape_url_encoded_email = - net::EscapeUrlEncodedData(base::WideToUTF8(email), true); + base::EscapeUrlEncodedData(base::WideToUTF8(email), true); std::string get_cd_user_url = base::StringPrintf( - "https://www.googleapis.com/admin/directory/v1/users/" + "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" "%s?projection=full&viewType=domain_public", escape_url_encoded_email.c_str()); LOGFN(VERBOSE) << "Encoded URL : " << get_cd_user_url; -@@ -475,9 +475,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, +@@ -478,9 +478,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, // Determine if the email is a consumer domain (gmail.com or googlemail.com). std::wstring email = GetDictString(result, kKeyEmail); std::transform(email.begin(), email.end(), email.begin(), ::tolower); @@ -11451,7 +11477,7 @@ diff --git a/chrome/credential_provider/gaiacp/gcp_utils.cc b/chrome/credential_ constexpr int kMaxNumConsecutiveUploadDeviceFailures = 3; const base::TimeDelta kMaxTimeDeltaSinceLastUserPolicyRefresh = base::Days(1); -@@ -1304,7 +1304,7 @@ std::wstring GetDevelopmentUrl(const std::wstring& url, +@@ -1308,7 +1308,7 @@ std::wstring GetDevelopmentUrl(const std::wstring& url, std::string project; std::string final_part; if (re2::RE2::FullMatch(base::WideToUTF8(url), @@ -12114,7 +12140,7 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe diff --git a/chrome/renderer/cart/commerce_hint_agent.cc b/chrome/renderer/cart/commerce_hint_agent.cc --- a/chrome/renderer/cart/commerce_hint_agent.cc +++ b/chrome/renderer/cart/commerce_hint_agent.cc -@@ -50,7 +50,7 @@ constexpr unsigned kLengthLimit = 4096; +@@ -52,7 +52,7 @@ constexpr unsigned kLengthLimit = 4096; constexpr char kAmazonDomain[] = "amazon.com"; constexpr char kEbayDomain[] = "ebay.com"; constexpr char kElectronicExpressDomain[] = "electronicexpress.com"; @@ -12230,25 +12256,29 @@ diff --git a/chrome/tools/weburl_links.txt b/chrome/tools/weburl_links.txt diff --git a/chrome/updater/branding.gni b/chrome/updater/branding.gni --- a/chrome/updater/branding.gni +++ b/chrome/updater/branding.gni -@@ -8,7 +8,7 @@ if (is_chrome_branded) { +@@ -8,8 +8,8 @@ if (is_chrome_branded) { browser_name = "Chrome" browser_product_name = "Google Chrome" crash_product_name = "Update4" - crash_upload_url = "https://clients2.google.com/cr/report" +- help_center_url = "http://support.google.com/installer/" + crash_upload_url = "https://clients2.9oo91e.qjz9zk/cr/report" ++ help_center_url = "http://support.9oo91e.qjz9zk/installer/" keystone_app_name = "GoogleSoftwareUpdate" mac_browser_bundle_identifier = "com.google.Chrome" mac_updater_bundle_identifier = "com.google.GoogleUpdater" -@@ -23,7 +23,7 @@ if (is_chrome_branded) { +@@ -24,8 +24,8 @@ if (is_chrome_branded) { browser_name = "Chromium" browser_product_name = "Chromium" crash_product_name = "ChromiumUpdater" - crash_upload_url = "https://clients2.google.com/cr/staging_report" +- help_center_url = "http://support.google.com/installer/" + crash_upload_url = "https://clients2.9oo91e.qjz9zk/cr/staging_report" ++ help_center_url = "http://support.9oo91e.qjz9zk/installer/" keystone_app_name = "ChromiumSoftwareUpdate" mac_browser_bundle_identifier = "org.chromium.Chromium" mac_updater_bundle_identifier = "org.chromium.ChromiumUpdater" -@@ -37,5 +37,5 @@ if (is_chrome_branded) { +@@ -39,5 +39,5 @@ if (is_chrome_branded) { } # Chrome and Chromium share the same endpoints for now. @@ -12280,18 +12310,6 @@ diff --git a/chrome/updater/tools/PRESUBMIT.py b/chrome/updater/tools/PRESUBMIT. for more details about the presubmit API built into depot_tools. """ -diff --git a/chrome/updater/win/app_install_controller.cc b/chrome/updater/win/app_install_controller.cc ---- a/chrome/updater/win/app_install_controller.cc -+++ b/chrome/updater/win/app_install_controller.cc -@@ -605,7 +605,7 @@ void AppInstallControllerImpl::HandleInstallResult( - observer_info.completion_code = completion_code; - observer_info.completion_text = completion_text; - // TODO(sorin): implement handling the help URL. https://crbug.com/1014622 -- observer_info.help_url = u"http://www.google.com"; -+ observer_info.help_url = u"http://www.9oo91e.qjz9zk"; - // TODO(sorin): implement the installer API and provide the - // application info in the observer info. https://crbug.com/1014630 - observer_info.apps_info.push_back({}); diff --git a/chrome/updater/win/signing/PRESUBMIT.py b/chrome/updater/win/signing/PRESUBMIT.py --- a/chrome/updater/win/signing/PRESUBMIT.py +++ b/chrome/updater/win/signing/PRESUBMIT.py @@ -12363,7 +12381,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 -@@ -159,7 +159,7 @@ if (chromecast_branding == "public") { +@@ -169,7 +169,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. @@ -12434,10 +12452,22 @@ diff --git a/chromecast/net/connectivity_checker_impl.h b/chromecast/net/connect // The default URLs above are expected to respond with HTTP 204 (no content). constexpr net::HttpStatusCode kConnectivitySuccessStatusCode = +diff --git a/chromeos/ash/components/dbus/rmad/fake_rmad_client.cc b/chromeos/ash/components/dbus/rmad/fake_rmad_client.cc +--- a/chromeos/ash/components/dbus/rmad/fake_rmad_client.cc ++++ b/chromeos/ash/components/dbus/rmad/fake_rmad_client.cc +@@ -16,7 +16,7 @@ constexpr char rsu_challenge_code[] = + "P3DNV4"; + constexpr char rsu_hwid[] = "SAMUSTEST_2082"; + constexpr char rsu_challenge_url[] = +- "https://chromeos.google.com/partner/console/" ++ "https://chromeos.9oo91e.qjz9zk/partner/console/" + "cr50reset?challenge=" + "HRBXHV84NSTHT25WJECYQKB8SARWFTMSWNGFT2FVEEPX69VE99USV3QFBEANDVXGQVL93QK2M6" + "P3DNV4&hwid=SAMUSTEST_2082"; diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd --- a/chromeos/chromeos_strings.grd +++ b/chromeos/chromeos_strings.grd -@@ -2094,7 +2094,7 @@ Try tapping the mic to ask me anything. +@@ -2109,7 +2109,7 @@ Try tapping the mic to ask me anything. Photos @@ -12446,7 +12476,7 @@ diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd My Images -@@ -2236,10 +2236,10 @@ Try tapping the mic to ask me anything. +@@ -2251,10 +2251,10 @@ Try tapping the mic to ask me anything. Celsius @@ -12471,18 +12501,6 @@ diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ch constexpr char kAuthorizationHeaderFormat[] = "Bearer "; constexpr base::StringPiece kQueryKey = "q"; -diff --git a/chromeos/dbus/rmad/fake_rmad_client.cc b/chromeos/dbus/rmad/fake_rmad_client.cc ---- a/chromeos/dbus/rmad/fake_rmad_client.cc -+++ b/chromeos/dbus/rmad/fake_rmad_client.cc -@@ -16,7 +16,7 @@ constexpr char rsu_challenge_code[] = - "P3DNV4"; - constexpr char rsu_hwid[] = "SAMUSTEST_2082"; - constexpr char rsu_challenge_url[] = -- "https://chromeos.google.com/partner/console/" -+ "https://chromeos.9oo91e.qjz9zk/partner/console/" - "cr50reset?challenge=" - "HRBXHV84NSTHT25WJECYQKB8SARWFTMSWNGFT2FVEEPX69VE99USV3QFBEANDVXGQVL93QK2M6" - "P3DNV4&hwid=SAMUSTEST_2082"; diff --git a/chromeos/printing/ppd_provider.h b/chromeos/printing/ppd_provider.h --- a/chromeos/printing/ppd_provider.h +++ b/chromeos/printing/ppd_provider.h @@ -12628,7 +12646,7 @@ diff --git a/chromeos/printing/uri_fuzzer_seed_corpus/uri5.txt b/chromeos/printi diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc -@@ -605,7 +605,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() +@@ -675,7 +675,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() if (device_settings_host_->has_setting_changed()) { return AssistantQueryResponseType::kDeviceAction; } else if (!receive_url_response_.empty()) { @@ -12748,17 +12766,19 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc --- a/components/autofill/core/browser/autofill_experiments.cc +++ b/components/autofill/core/browser/autofill_experiments.cc -@@ -169,8 +169,8 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service, +@@ -216,9 +216,9 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service, + // @googlemail, @gmail, @google, or @chromium domains. + // example.com is on the list because ChromeOS tests rely on using this. That // should be fine, since example.com is an IANA reserved domain. - if (!base::FeatureList::IsEnabled( - features::kAutofillUpstreamAllowAllEmailDomains) && -- !(domain == "googlemail.com" || domain == "gmail.com" || -- domain == "google.com" || domain == "chromium.org" || -+ !(domain == "9oo91email.qjz9zk" || domain == "9ma1l.qjz9zk" || -+ domain == "9oo91e.qjz9zk" || domain == "ch40m1um.qjz9zk" || - domain == "example.com")) { - AutofillMetrics::LogCardUploadEnabledMetric( - AutofillMetrics::CardUploadEnabledMetric::EMAIL_DOMAIN_NOT_SUPPORTED, +- bool using_google_domain = domain == "googlemail.com" || +- domain == "gmail.com" || domain == "google.com" || +- domain == "chromium.org" || ++ bool using_google_domain = domain == "9oo91email.qjz9zk" || ++ domain == "9ma1l.qjz9zk" || domain == "9oo91e.qjz9zk" || ++ domain == "ch40m1um.qjz9zk" || + domain == "example.com"; + if (!all_domains_supported && !using_supported_additional_domain && + !using_google_domain) { diff --git a/components/autofill/core/browser/data_model/test_data_creator.cc b/components/autofill/core/browser/data_model/test_data_creator.cc --- a/components/autofill/core/browser/data_model/test_data_creator.cc +++ b/components/autofill/core/browser/data_model/test_data_creator.cc @@ -12869,6 +12889,18 @@ diff --git a/components/autofill_assistant/browser/autofill_assistant_onboarding constexpr int kMaxDownloadSizeInBytes = 10 * 1024; +diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc +--- a/components/autofill_assistant/browser/headless/client_headless.cc ++++ b/components/autofill_assistant/browser/headless/client_headless.cc +@@ -37,7 +37,7 @@ + + namespace autofill_assistant { + +-const char kOAuth2Scope[] = "https://www.googleapis.com/auth/userinfo.profile"; ++const char kOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/userinfo.profile"; + const char kConsumerName[] = "autofill_assistant"; + + ClientHeadless::ClientHeadless( diff --git a/components/autofill_assistant/browser/service/server_url_fetcher.cc b/components/autofill_assistant/browser/service/server_url_fetcher.cc --- a/components/autofill_assistant/browser/service/server_url_fetcher.cc +++ b/components/autofill_assistant/browser/service/server_url_fetcher.cc @@ -12943,7 +12975,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -769,7 +769,7 @@ +@@ -783,7 +783,7 @@ other {(+ # more)}} @@ -13042,15 +13074,6 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "state": { "usable": { @@ -76,7 +76,7 @@ - "description": "Google 'Aviator' log", - "log_id": "aPaY+B9kgr46jO65KB1M/HFRXWeT1ETRCmesu09P+8Q=", - "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1/TMabLkDpCjiupacAlP7xNi0I1JYP8bQFAHDG1xhtolSY1l4QgNRzRrvSe8liE+NPWHdjGxfx3JhTsN9x8/6Q==", -- "url": "https://ct.googleapis.com/aviator/", -+ "url": "https://ct.9oo91eapis.qjz9zk/aviator/", - "mmd": 86400, - "state": { - "readonly": { -@@ -92,7 +92,7 @@ "description": "Google 'Icarus' log", "log_id": "KTxRllTIOWW6qlD8WAfUt2+/WHopctykwwz05UVH9Hg=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETtK8v7MICve56qTHHDhhBOuV4IlUaESxZryCfk9QbG9co/CqPvTsgPDbCpp6oFtyAHwlDhnvr7JijXRD9Cb2FA==", @@ -13058,8 +13081,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components + "url": "https://ct.9oo91eapis.qjz9zk/icarus/", "mmd": 86400, "state": { - "usable": { -@@ -104,7 +104,7 @@ + "readonly": { +@@ -92,7 +92,7 @@ "description": "Google 'Pilot' log", "log_id": "pLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BA=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==", @@ -13067,8 +13090,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components + "url": "https://ct.9oo91eapis.qjz9zk/pilot/", "mmd": 86400, "state": { - "usable": { -@@ -116,7 +116,7 @@ + "readonly": { +@@ -108,7 +108,7 @@ "description": "Google 'Rocketeer' log", "log_id": "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/cs=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==", @@ -13076,8 +13099,8 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components + "url": "https://ct.9oo91eapis.qjz9zk/rocketeer/", "mmd": 86400, "state": { - "usable": { -@@ -128,7 +128,7 @@ + "readonly": { +@@ -124,7 +124,7 @@ "description": "Google 'Skydiver' log", "log_id": "u9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YU=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEmyGDvYXsRJsNyXSrYc9DjHsIa2xzb4UR7ZxVoV6mrc9iZB7xjI6+NrOiwH+P/xxkRmOFG6Jel20q37hTh58rA==", @@ -13085,7 +13108,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components + "url": "https://ct.9oo91eapis.qjz9zk/skydiver/", "mmd": 86400, "state": { - "usable": { + "readonly": { diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json --- a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json +++ b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json @@ -13214,7 +13237,7 @@ 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 -@@ -66,7 +66,7 @@ def GenerateJavadoc(args, src_dir, output_dir): +@@ -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', @@ -13704,7 +13727,7 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature 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 -@@ -38,7 +38,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = +@@ -37,7 +37,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = FILE_PATH_LITERAL("Feedback Reports"); constexpr char kFeedbackPostUrl[] = @@ -13821,7 +13844,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 -@@ -1304,7 +1304,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1303,7 +1303,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -13830,7 +13853,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 " -@@ -1346,7 +1346,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1345,7 +1345,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -13886,7 +13909,7 @@ diff --git a/components/invalidation/impl/per_user_topic_subscription_manager.cc diff --git a/components/javascript_dialogs/tab_modal_dialog_manager.cc b/components/javascript_dialogs/tab_modal_dialog_manager.cc --- a/components/javascript_dialogs/tab_modal_dialog_manager.cc +++ b/components/javascript_dialogs/tab_modal_dialog_manager.cc -@@ -199,7 +199,7 @@ void TabModalDialogManager::RunJavaScriptDialog( +@@ -198,7 +198,7 @@ void TabModalDialogManager::RunJavaScriptDialog( "A window.%s() dialog generated by this page was suppressed " "because this page is not the active tab of the front window. " "Please make sure your dialogs are triggered by user interactions " @@ -13934,7 +13957,7 @@ diff --git a/components/media_router/common/media_source.h b/components/media_ro diff --git a/components/metrics/net/net_metrics_log_uploader.cc b/components/metrics/net/net_metrics_log_uploader.cc --- a/components/metrics/net/net_metrics_log_uploader.cc +++ b/components/metrics/net/net_metrics_log_uploader.cc -@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( +@@ -55,7 +55,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( "Usage statistics contain information such as preferences, button " "clicks, and memory usage and do not include web page URLs or " "personal information. See more at " @@ -14024,7 +14047,7 @@ diff --git a/components/network_time/network_time_tracker.cc b/components/networ +const char kTimeServiceURL[] = "http://clients2.9oo91e.qjz9zk/time/1/current"; // This is an ECDSA prime256v1 named-curve key. - const int kKeyVersion = 5; + const int kKeyVersion = 6; diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc --- a/components/ntp_snippets/features.cc +++ b/components/ntp_snippets/features.cc @@ -14187,7 +14210,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo if ((!net::GetValueForKeyInQuery(url, "q", &url_str) || url_str.empty()) && (!net::GetValueForKeyInQuery(url, "url", &url_str) || url_str.empty())) return GURL(); -@@ -956,5 +956,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -957,5 +957,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Canonicalize to the /open form without any extra args. // This is similar to what we expect from the server. @@ -16488,18 +16511,6 @@ diff --git a/components/omnibox/resources/omnibox_pedal_synonyms.grd b/component always open links in chrome, always use chrome, chrome as default, default browser, delete safari, how to make chrome default browser, main browser, make chrome default, make chrome default browser, make chrome my default browser, open links in chrome, pick chrome as default browser, primary browser, remove safari, search in chrome, set chrome as default, set chrome as default browser, standard browser -diff --git a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc ---- a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc -+++ b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc -@@ -27,7 +27,7 @@ namespace optimization_guide { - namespace { - - const char kPageTopicsModelMetadataTypeUrl[] = -- "type.googleapis.com/" -+ "type.9oo91eapis.qjz9zk/" - "google.internal.chrome.optimizationguide.v1.PageTopicsModelMetadata"; - - // The ID of the NONE category in the taxonomy. This node always exists. diff --git a/components/optimization_guide/core/optimization_guide_constants.cc b/components/optimization_guide/core/optimization_guide_constants.cc --- a/components/optimization_guide/core/optimization_guide_constants.cc +++ b/components/optimization_guide/core/optimization_guide_constants.cc @@ -16519,7 +16530,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_constants.cc diff --git a/components/optimization_guide/core/page_entities_model_executor_impl.cc b/components/optimization_guide/core/page_entities_model_executor_impl.cc --- a/components/optimization_guide/core/page_entities_model_executor_impl.cc +++ b/components/optimization_guide/core/page_entities_model_executor_impl.cc -@@ -18,7 +18,7 @@ namespace optimization_guide { +@@ -20,7 +20,7 @@ namespace optimization_guide { namespace { const char kPageEntitiesModelMetadataTypeUrl[] = @@ -16527,13 +16538,13 @@ diff --git a/components/optimization_guide/core/page_entities_model_executor_imp + "type.9oo91eapis.qjz9zk/" "google.internal.chrome.optimizationguide.v1.PageEntitiesModelMetadata"; - PageEntitiesModelExecutorConfig& GetPageEntitiesModelExecutorConfigInternal() { + // The max number of page entities that should be output. diff --git a/components/optimization_guide/core/prediction_manager.cc b/components/optimization_guide/core/prediction_manager.cc --- a/components/optimization_guide/core/prediction_manager.cc +++ b/components/optimization_guide/core/prediction_manager.cc -@@ -182,19 +182,19 @@ BuildPredictionModelFromCommandLineForOptimizationTarget( - bool IsModelMetadataTypeOnServerAllowlist( - const optimization_guide::proto::Any& model_metadata) { +@@ -148,19 +148,19 @@ bool ShouldFetchModels(bool off_the_record, bool component_updates_enabled) { + // Returns whether the model metadata proto is on the server allowlist. + bool IsModelMetadataTypeOnServerAllowlist(const proto::Any& model_metadata) { return model_metadata.type_url() == - "type.googleapis.com/" + "type.9oo91eapis.qjz9zk/" @@ -16558,7 +16569,7 @@ diff --git a/components/optimization_guide/core/prediction_manager.cc b/componen diff --git a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc -@@ -96,7 +96,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, +@@ -95,7 +95,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, bool will_unload_adframe) { const char kChromeStatusMessage[] = "See " @@ -16582,7 +16593,7 @@ diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_m diff --git a/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc -@@ -34,7 +34,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, +@@ -38,7 +38,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, blink::mojom::ConsoleMessageLevel::kWarning, "Download is disallowed. The frame initiating or instantiating the " "download is sandboxed, but the flag ‘allow-downloads’ is not set. " @@ -16591,7 +16602,7 @@ diff --git a/components/page_load_metrics/browser/observers/use_counter_page_loa "details."); return; case WebFeature::kDownloadInAdFrameWithoutUserGesture: -@@ -42,7 +42,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, +@@ -46,7 +46,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, blink::mojom::ConsoleMessageLevel::kWarning, "[Intervention] Download in ad frame without user activation is " "not allowed. See " @@ -16646,8 +16657,8 @@ diff --git a/components/password_manager/core/browser/leak_detection_dialog_util - "https://passwords.google.com/checkup/start?hideExplanation=true"; + "https://passwords.9oo91e.qjz9zk/checkup/start?hideExplanation=true"; - constexpr base::FeatureParam kPasswordChangeUseBasicCloseLabel{ - &password_manager::features::kPasswordChange, "use_basic_close_label", + CredentialLeakType CreateLeakType(IsSaved is_saved, + IsReused is_reused, diff --git a/components/password_manager/core/browser/old_google_credentials_cleaner.cc b/components/password_manager/core/browser/old_google_credentials_cleaner.cc --- a/components/password_manager/core/browser/old_google_credentials_cleaner.cc +++ b/components/password_manager/core/browser/old_google_credentials_cleaner.cc @@ -16681,7 +16692,7 @@ diff --git a/components/password_manager/core/browser/password_hash_data.cc b/co diff --git a/components/password_manager/core/browser/password_manager_constants.cc b/components/password_manager/core/browser/password_manager_constants.cc --- a/components/password_manager/core/browser/password_manager_constants.cc +++ b/components/password_manager/core/browser/password_manager_constants.cc -@@ -14,12 +14,12 @@ const base::FilePath::CharType kLoginDataForAccountFileName[] = +@@ -14,19 +14,19 @@ const base::FilePath::CharType kLoginDataForAccountFileName[] = FILE_PATH_LITERAL("Login Data For Account"); const char kPasswordManagerAccountDashboardURL[] = @@ -16696,11 +16707,20 @@ diff --git a/components/password_manager/core/browser/password_manager_constants - "https://support.google.com/accounts?p=smart_lock_chrome"; + "https://support.9oo91e.qjz9zk/accounts?p=smart_lock_chrome"; +-const char kManageMyPasswordsURL[] = "https://passwords.google.com/app"; ++const char kManageMyPasswordsURL[] = "https://passwords.9oo91e.qjz9zk/app"; + + const char kReferrerURL[] = "https://passwords.google/"; + + const char kTestingReferrerURL[] = +- "https://xl-password-manager-staging.uc.r.appspot.com/"; ++ "https://xl-password-manager-staging.uc.r.8pp2p8t.qjz9zk/"; + } // namespace password_manager diff --git a/components/password_manager/core/browser/password_reuse_detector.cc b/components/password_manager/core/browser/password_reuse_detector.cc --- a/components/password_manager/core/browser/password_reuse_detector.cc +++ b/components/password_manager/core/browser/password_reuse_detector.cc -@@ -329,7 +329,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { +@@ -323,7 +323,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { *gaia_password_hash_data_list_, [](const PasswordHashData& data) { std::string email = CanonicalizeUsername(data.username, data.is_gaia_password); @@ -16712,7 +16732,7 @@ diff --git a/components/password_manager/core/browser/password_reuse_detector.cc diff --git a/components/password_manager/core/browser/password_scripts_fetcher_impl.cc b/components/password_manager/core/browser/password_scripts_fetcher_impl.cc --- a/components/password_manager/core/browser/password_scripts_fetcher_impl.cc +++ b/components/password_manager/core/browser/password_scripts_fetcher_impl.cc -@@ -90,7 +90,7 @@ base::flat_set ParseDomainSpecificParamaters( +@@ -96,7 +96,7 @@ base::flat_set ParseDomainSpecificParamaters( namespace password_manager { constexpr char kDefaultChangePasswordScriptsListUrl[] = @@ -17055,7 +17075,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. -@@ -625,7 +625,7 @@ +@@ -628,7 +628,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -17064,7 +17084,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. -@@ -640,7 +640,7 @@ +@@ -643,7 +643,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -17073,7 +17093,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.''', -@@ -1337,7 +1337,7 @@ +@@ -1340,7 +1340,7 @@ }, { 'name': 'FirstPartySets', @@ -17082,7 +17102,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.''', -@@ -1347,7 +1347,7 @@ +@@ -1350,7 +1350,7 @@ }, { 'name': 'HomepageLocation', @@ -17091,7 +17111,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-'], -@@ -1356,7 +1356,7 @@ +@@ -1359,7 +1359,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17100,7 +17120,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1373,7 +1373,7 @@ +@@ -1376,7 +1376,7 @@ }, { 'name': 'HomepageIsNewTabPage', @@ -17109,7 +17129,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-'], -@@ -1404,7 +1404,7 @@ +@@ -1407,7 +1407,7 @@ }, { 'name': 'NewTabPageLocation', @@ -17118,7 +17138,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-'], -@@ -1412,7 +1412,7 @@ +@@ -1415,7 +1415,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17127,7 +17147,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1431,7 +1431,7 @@ +@@ -1434,7 +1434,7 @@ }, { 'name': 'DefaultBrowserSettingEnabled', @@ -17136,7 +17156,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-'], -@@ -1457,12 +1457,12 @@ +@@ -1460,12 +1460,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -17151,7 +17171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:8-'], -@@ -1485,7 +1485,7 @@ +@@ -1488,7 +1488,7 @@ }, { 'name': 'AlternateErrorPagesEnabled', @@ -17160,7 +17180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1518,7 +1518,7 @@ +@@ -1521,7 +1521,7 @@ }, { 'name': 'SearchSuggestEnabled', @@ -17169,7 +17189,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1554,7 +1554,7 @@ +@@ -1557,7 +1557,7 @@ }, { 'name': 'NativeWindowOcclusionEnabled', @@ -17178,7 +17198,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1592,7 +1592,7 @@ +@@ -1595,7 +1595,7 @@ }, { 'name': 'WindowOcclusionEnabled', @@ -17187,7 +17207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1628,7 +1628,7 @@ +@@ -1631,7 +1631,7 @@ }, { 'name': 'DnsPrefetchingEnabled', @@ -17196,7 +17216,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'], -@@ -1654,7 +1654,7 @@ +@@ -1657,7 +1657,7 @@ }, { 'name': 'NetworkPredictionOptions', @@ -17205,7 +17225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1694,7 +1694,7 @@ +@@ -1697,7 +1697,7 @@ }, { 'name': 'WPADQuickCheckEnabled', @@ -17214,7 +17234,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-' ], -@@ -1725,7 +1725,7 @@ +@@ -1728,7 +1728,7 @@ }, { 'name': 'DisableSpdy', @@ -17223,7 +17243,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'], -@@ -1750,7 +1750,7 @@ +@@ -1753,7 +1753,7 @@ }, { 'name': 'DisabledSchemes', @@ -17232,7 +17252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1777,7 +1777,7 @@ +@@ -1780,7 +1780,7 @@ }, { 'name': 'GetDisplayMediaSetSelectAllScreensAllowedForUrls', @@ -17241,7 +17261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1799,7 +1799,7 @@ +@@ -1802,7 +1802,7 @@ }, { 'name': 'GloballyScopeHTTPAuthCacheEnabled', @@ -17250,7 +17270,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-'], -@@ -1833,7 +1833,7 @@ +@@ -1836,7 +1836,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -17259,7 +17279,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-'], -@@ -1864,7 +1864,7 @@ +@@ -1867,7 +1867,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -17268,7 +17288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1911,7 +1911,7 @@ +@@ -1914,7 +1914,7 @@ }, { 'name': 'Http09OnNonDefaultPortsEnabled', @@ -17277,7 +17297,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'], -@@ -1946,7 +1946,7 @@ +@@ -1949,7 +1949,7 @@ }, { 'name': 'JavascriptEnabled', @@ -17286,7 +17306,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-'], -@@ -1979,7 +1979,7 @@ +@@ -1982,7 +1982,7 @@ }, { 'name': 'IncognitoEnabled', @@ -17295,7 +17315,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-'], -@@ -2013,7 +2013,7 @@ +@@ -2016,7 +2016,7 @@ }, { 'name': 'IncognitoModeAvailability', @@ -17304,7 +17324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -2066,7 +2066,7 @@ +@@ -2069,7 +2069,7 @@ }, { 'name': 'SavingBrowserHistoryDisabled', @@ -17313,7 +17333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2099,7 +2099,7 @@ +@@ -2102,7 +2102,7 @@ }, { 'name': 'AllowDeletingBrowserHistory', @@ -17322,16 +17342,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:57-', 'chrome_os:57-'], -@@ -2127,7 +2127,7 @@ +@@ -2130,7 +2130,7 @@ }, { 'name': 'HistoryClustersVisible', -- 'owners': ['file://components/history_clusters/OWNERS', 'mahmadi@chromium.org'], -+ 'owners': ['file://components/history_clusters/OWNERS', 'mahmadi@ch40m1um.qjz9zk'], +- 'owners': ['file://components/history_clusters/OWNERS', 'mahmadi@chromium.org', 'chrome-journeys@google.com'], ++ 'owners': ['file://components/history_clusters/OWNERS', 'mahmadi@ch40m1um.qjz9zk', 'chrome-journeys@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:97-', 'chrome_os:97-'], -@@ -2166,7 +2166,7 @@ +@@ -2171,7 +2171,7 @@ }, { 'name': 'AllowDinosaurEasterEgg', @@ -17340,7 +17360,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-'], -@@ -2195,7 +2195,7 @@ +@@ -2200,7 +2200,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -17349,7 +17369,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'], -@@ -2228,7 +2228,7 @@ +@@ -2233,7 +2233,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -17358,7 +17378,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'], -@@ -2251,7 +2251,7 @@ +@@ -2256,7 +2256,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -17367,7 +17387,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-'], -@@ -2269,7 +2269,7 @@ +@@ -2274,7 +2274,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -17376,7 +17396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2295,7 +2295,7 @@ +@@ -2300,7 +2300,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -17385,7 +17405,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-'], -@@ -2324,7 +2324,7 @@ +@@ -2329,7 +2329,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -17394,7 +17414,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-'], -@@ -2342,7 +2342,7 @@ +@@ -2347,7 +2347,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -17403,7 +17423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2368,7 +2368,7 @@ +@@ -2373,7 +2373,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -17412,7 +17432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2391,7 +2391,7 @@ +@@ -2396,7 +2396,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -17421,7 +17441,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'], -@@ -2407,17 +2407,17 @@ +@@ -2412,17 +2412,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -17443,7 +17463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2446,7 +2446,7 @@ +@@ -2451,7 +2451,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -17452,7 +17472,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2475,7 +2475,7 @@ +@@ -2480,7 +2480,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -17461,7 +17481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2507,7 +2507,7 @@ +@@ -2512,7 +2512,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -17470,7 +17490,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-'], -@@ -2536,7 +2536,7 @@ +@@ -2541,7 +2541,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -17479,7 +17499,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-'], -@@ -2557,7 +2557,7 @@ +@@ -2562,7 +2562,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -17488,7 +17508,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-'], -@@ -2586,7 +2586,7 @@ +@@ -2591,7 +2591,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -17497,7 +17517,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2608,7 +2608,7 @@ +@@ -2613,7 +2613,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -17506,7 +17526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2628,7 +2628,7 @@ +@@ -2633,7 +2633,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -17515,7 +17535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2646,7 +2646,7 @@ +@@ -2651,7 +2651,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -17524,7 +17544,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'], -@@ -2666,7 +2666,7 @@ +@@ -2671,7 +2671,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -17533,7 +17553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2696,7 +2696,7 @@ +@@ -2701,7 +2701,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -17542,7 +17562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2726,7 +2726,7 @@ +@@ -2731,7 +2731,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', @@ -17551,7 +17571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2757,7 +2757,7 @@ +@@ -2762,7 +2762,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteAccessConnections', @@ -17560,7 +17580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -2787,7 +2787,7 @@ +@@ -2792,7 +2792,7 @@ }, { 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', @@ -17569,7 +17589,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-'], -@@ -2807,7 +2807,7 @@ +@@ -2812,7 +2812,7 @@ }, { 'name': 'RemoteAccessHostClipboardSizeBytes', @@ -17578,7 +17598,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-'], -@@ -2835,7 +2835,7 @@ +@@ -2840,7 +2840,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteSupportConnections', @@ -17587,7 +17607,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-'], -@@ -2869,7 +2869,7 @@ +@@ -2874,7 +2874,7 @@ }, { 'name': 'DeviceAllowMGSToStoreDisplayProperties', @@ -17596,7 +17616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -2896,7 +2896,7 @@ +@@ -2901,7 +2901,7 @@ }, { 'name': 'PrintingEnabled', @@ -17605,7 +17625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2930,7 +2930,7 @@ +@@ -2935,7 +2935,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -17614,7 +17634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2958,7 +2958,7 @@ +@@ -2963,7 +2963,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -17623,7 +17643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2999,7 +2999,7 @@ +@@ -3004,7 +3004,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -17632,7 +17652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3042,7 +3042,7 @@ +@@ -3047,7 +3047,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -17641,7 +17661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3083,7 +3083,7 @@ +@@ -3088,7 +3088,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -17650,7 +17670,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3124,7 +3124,7 @@ +@@ -3129,7 +3129,7 @@ }, { 'name': 'PrintingColorDefault', @@ -17659,7 +17679,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3159,7 +3159,7 @@ +@@ -3164,7 +3164,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -17668,7 +17688,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3200,7 +3200,7 @@ +@@ -3205,7 +3205,7 @@ }, { 'name': 'PrintingPinDefault', @@ -17677,7 +17697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3235,7 +3235,7 @@ +@@ -3240,7 +3240,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -17686,7 +17706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3270,7 +3270,7 @@ +@@ -3275,7 +3275,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -17695,7 +17715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -3456,7 +3456,7 @@ +@@ -3461,7 +3461,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -17704,7 +17724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -3485,7 +3485,7 @@ +@@ -3490,7 +3490,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -17713,7 +17733,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-'], -@@ -3503,7 +3503,7 @@ +@@ -3508,7 +3508,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -17722,7 +17742,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'], -@@ -3532,7 +3532,7 @@ +@@ -3537,7 +3537,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -17731,7 +17751,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-'], -@@ -3554,7 +3554,7 @@ +@@ -3559,7 +3559,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -17740,7 +17760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3578,7 +3578,7 @@ +@@ -3583,7 +3583,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -17749,7 +17769,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3599,7 +3599,7 @@ +@@ -3604,7 +3604,7 @@ }, { 'name': 'ForceSafeSearch', @@ -17758,7 +17778,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-'], -@@ -3633,7 +3633,7 @@ +@@ -3638,7 +3638,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -17767,7 +17787,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-'], -@@ -3662,7 +3662,7 @@ +@@ -3667,7 +3667,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -17776,7 +17796,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-'], -@@ -3697,7 +3697,7 @@ +@@ -3702,7 +3702,7 @@ }, { 'name': 'ForceYouTubeRestrict', @@ -17785,7 +17805,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3741,7 +3741,7 @@ +@@ -3746,7 +3746,7 @@ }, { 'name': 'SafeBrowsingEnabled', @@ -17794,7 +17814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3776,7 +3776,7 @@ +@@ -3781,7 +3781,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. @@ -17803,7 +17823,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. -@@ -3784,7 +3784,7 @@ +@@ -3789,7 +3789,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -17812,7 +17832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3834,12 +3834,12 @@ +@@ -3839,12 +3839,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -17827,7 +17847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3878,7 +3878,7 @@ +@@ -3883,7 +3883,7 @@ }, { 'name': 'PasswordManagerEnabled', @@ -17836,7 +17856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3915,7 +3915,7 @@ +@@ -3920,7 +3920,7 @@ }, { 'name': 'PasswordManagerAllowShowPasswords', @@ -17845,7 +17865,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'], -@@ -3938,7 +3938,7 @@ +@@ -3943,7 +3943,7 @@ }, { 'name': 'PasswordLeakDetectionEnabled', @@ -17854,7 +17874,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3973,7 +3973,7 @@ +@@ -3978,7 +3978,7 @@ }, { 'name': 'PasswordDismissCompromisedAlertEnabled', @@ -17863,7 +17883,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4007,7 +4007,7 @@ +@@ -4012,7 +4012,7 @@ }, { 'name': 'AutoFillEnabled', @@ -17872,7 +17892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4045,7 +4045,7 @@ +@@ -4050,7 +4050,7 @@ }, { 'name': 'AutofillAddressEnabled', @@ -17881,7 +17901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4079,7 +4079,7 @@ +@@ -4084,7 +4084,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -17890,7 +17910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4113,7 +4113,7 @@ +@@ -4118,7 +4118,7 @@ }, { 'name': 'DisabledPlugins', @@ -17899,7 +17919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4144,7 +4144,7 @@ +@@ -4149,7 +4149,7 @@ }, { 'name': 'EnabledPlugins', @@ -17908,7 +17928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4175,7 +4175,7 @@ +@@ -4180,7 +4180,7 @@ }, { 'name': 'DisabledPluginsExceptions', @@ -17917,7 +17937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4208,7 +4208,7 @@ +@@ -4213,7 +4213,7 @@ }, { 'name': 'AlwaysOpenPdfExternally', @@ -17926,7 +17946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:55-'], -@@ -4239,7 +4239,7 @@ +@@ -4244,7 +4244,7 @@ }, { 'name': 'DisablePluginFinder', @@ -17935,7 +17955,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'], -@@ -4269,7 +4269,7 @@ +@@ -4274,7 +4274,7 @@ }, { 'name': 'SyncDisabled', @@ -17944,7 +17964,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-'], -@@ -4302,7 +4302,7 @@ +@@ -4307,7 +4307,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -17953,7 +17973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4323,7 +4323,7 @@ +@@ -4328,7 +4328,7 @@ }, { 'name': 'RoamingProfileSupportEnabled', @@ -17962,7 +17982,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-'], -@@ -4352,7 +4352,7 @@ +@@ -4357,7 +4357,7 @@ }, { 'name': 'RoamingProfileLocation', @@ -17971,7 +17991,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-'], -@@ -4368,7 +4368,7 @@ +@@ -4373,7 +4373,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. @@ -17980,7 +18000,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. -@@ -4377,7 +4377,7 @@ +@@ -4382,7 +4382,7 @@ }, { 'name': 'SigninAllowed', @@ -17989,7 +18009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -4408,7 +4408,7 @@ +@@ -4413,7 +4413,7 @@ }, { 'name': 'EnableDeprecatedWebBasedSignin', @@ -17998,7 +18018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-42'], -@@ -4431,7 +4431,7 @@ +@@ -4436,7 +4436,7 @@ }, { 'name': 'UserDataDir', @@ -18007,7 +18027,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-'], -@@ -4450,14 +4450,14 @@ +@@ -4455,14 +4455,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. @@ -18024,7 +18044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:13-'], -@@ -4473,12 +4473,12 @@ +@@ -4478,12 +4478,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. @@ -18039,7 +18059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-'], -@@ -4501,7 +4501,7 @@ +@@ -4506,7 +4506,7 @@ }, { 'name': 'MediaCacheSize', @@ -18048,7 +18068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-71'], -@@ -4523,7 +4523,7 @@ +@@ -4528,7 +4528,7 @@ }, { 'name': 'DownloadBubbleEnabled', @@ -18057,7 +18077,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-'], -@@ -4552,7 +4552,7 @@ +@@ -4557,7 +4557,7 @@ }, { 'name': 'DownloadRestrictions', @@ -18066,7 +18086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4597,7 +4597,7 @@ +@@ -4602,7 +4602,7 @@ 'tags': ['local-data-access'], 'desc': '''Setting the policy means users can't bypass download security decisions. @@ -18075,7 +18095,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 -@@ -4615,12 +4615,12 @@ +@@ -4620,12 +4620,12 @@ 4: Blocks malicious files flagged by the Safe Browsing server, does not block dangerous file types. Recommended. @@ -18090,7 +18110,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-'], -@@ -4639,13 +4639,13 @@ +@@ -4644,13 +4644,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. @@ -18106,7 +18126,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4672,7 +4672,7 @@ +@@ -4677,7 +4677,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -18115,7 +18135,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4695,11 +4695,11 @@ +@@ -4700,11 +4700,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. @@ -18129,7 +18149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -4732,13 +4732,13 @@ +@@ -4737,13 +4737,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. @@ -18145,7 +18165,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -4773,7 +4773,7 @@ +@@ -4778,7 +4778,7 @@ }, { 'name': 'ClearSiteDataOnExit', @@ -18154,7 +18174,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'], -@@ -4792,7 +4792,7 @@ +@@ -4797,7 +4797,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -18163,7 +18183,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4822,7 +4822,7 @@ +@@ -4827,7 +4827,7 @@ }, { 'name': 'ProxyMode', @@ -18172,7 +18192,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -4890,11 +4890,11 @@ +@@ -4895,11 +4895,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -18186,7 +18206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4950,7 +4950,7 @@ +@@ -4955,7 +4955,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: @@ -18195,7 +18215,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. -@@ -4959,7 +4959,7 @@ +@@ -4964,7 +4964,7 @@ }, { 'name': 'ProxyServer', @@ -18204,7 +18224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4982,12 +4982,12 @@ +@@ -4987,12 +4987,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18219,7 +18239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5010,12 +5010,12 @@ +@@ -5015,12 +5015,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18234,7 +18254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5038,13 +5038,13 @@ +@@ -5043,13 +5043,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18250,7 +18270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5093,12 +5093,12 @@ +@@ -5098,12 +5098,12 @@ * fixed_servers, the ProxyServer and ProxyBypassList fields are used. * pac_script, the ProxyPacUrl, ProxyPacMandatory and ProxyBypassList fields are used. @@ -18265,7 +18285,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-'], -@@ -5128,7 +5128,7 @@ +@@ -5133,7 +5133,7 @@ }, { 'name': 'AllHttpAuthSchemesAllowedForOrigins', @@ -18274,7 +18294,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-'], -@@ -5142,12 +5142,12 @@ +@@ -5147,12 +5147,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. @@ -18289,7 +18309,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-'], -@@ -5175,7 +5175,7 @@ +@@ -5180,7 +5180,7 @@ }, { 'name': 'EnableAuthNegotiatePort', @@ -18298,7 +18318,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-'], -@@ -5203,7 +5203,7 @@ +@@ -5208,7 +5208,7 @@ }, { 'name': 'BasicAuthOverHttpEnabled', @@ -18307,7 +18327,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-'], -@@ -5234,7 +5234,7 @@ +@@ -5239,7 +5239,7 @@ }, { 'name': 'AuthServerWhitelist', @@ -18316,7 +18336,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'], -@@ -5257,7 +5257,7 @@ +@@ -5262,7 +5262,7 @@ }, { 'name': 'AuthServerAllowlist', @@ -18325,7 +18345,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-'], -@@ -5277,7 +5277,7 @@ +@@ -5282,7 +5282,7 @@ }, { 'name': 'AuthNegotiateDelegateWhitelist', @@ -18334,7 +18354,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'], -@@ -5298,7 +5298,7 @@ +@@ -5303,7 +5303,7 @@ }, { 'name': 'AuthNegotiateDelegateAllowlist', @@ -18343,7 +18363,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-'], -@@ -5316,7 +5316,7 @@ +@@ -5321,7 +5321,7 @@ }, { 'name': 'AuthNegotiateDelegateByKdcPolicy', @@ -18352,7 +18372,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-'], -@@ -5346,7 +5346,7 @@ +@@ -5351,7 +5351,7 @@ }, { 'name': 'BrowserLabsEnabled', @@ -18361,7 +18381,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-'], -@@ -5377,7 +5377,7 @@ +@@ -5382,7 +5382,7 @@ }, { 'name': 'GSSAPILibraryName', @@ -18370,7 +18390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.linux:9-'], -@@ -5395,7 +5395,7 @@ +@@ -5400,7 +5400,7 @@ }, { 'name': 'AuthAndroidNegotiateAccountType', @@ -18379,7 +18399,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-'], -@@ -5407,13 +5407,13 @@ +@@ -5412,13 +5412,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -18395,7 +18415,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-'], -@@ -5443,7 +5443,7 @@ +@@ -5448,7 +5448,7 @@ }, { 'name': 'NtlmV2Enabled', @@ -18404,7 +18424,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-'], -@@ -5474,7 +5474,7 @@ +@@ -5479,7 +5479,7 @@ }, { 'name': 'ExtensionInstallBlacklist', @@ -18413,7 +18433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5500,7 +5500,7 @@ +@@ -5505,7 +5505,7 @@ { 'name': 'ExtensionInstallBlocklist', @@ -18422,7 +18442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5524,7 +5524,7 @@ +@@ -5529,7 +5529,7 @@ }, { 'name': 'ExtensionInstallAllowlist', @@ -18431,7 +18451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5548,7 +5548,7 @@ +@@ -5553,7 +5553,7 @@ }, { 'name': 'ExtensionInstallWhitelist', @@ -18440,7 +18460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5571,7 +5571,7 @@ +@@ -5576,7 +5576,7 @@ }, { 'name': 'ExtensionInstallForcelist', @@ -18449,7 +18469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5582,7 +5582,7 @@ +@@ -5587,7 +5587,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18458,7 +18478,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'], -@@ -5598,15 +5598,15 @@ +@@ -5603,15 +5603,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. @@ -18477,7 +18497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5624,14 +5624,14 @@ +@@ -5629,14 +5629,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. @@ -18494,7 +18514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -5662,7 +5662,7 @@ +@@ -5667,7 +5667,7 @@ }, { 'name': 'ExtensionAllowedTypes', @@ -18503,7 +18523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -5747,7 +5747,7 @@ +@@ -5752,7 +5752,7 @@ }, { 'name': 'ExtensionSettings', @@ -18512,7 +18532,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5842,7 +5842,7 @@ +@@ -5847,7 +5847,7 @@ }, }, }, @@ -18521,7 +18541,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -5899,13 +5899,13 @@ +@@ -5904,13 +5904,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. @@ -18537,7 +18557,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-'], -@@ -5933,12 +5933,12 @@ +@@ -5938,12 +5938,12 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -18552,7 +18572,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-'], -@@ -5967,7 +5967,7 @@ +@@ -5972,7 +5972,7 @@ }, { 'name': 'DeveloperToolsDisabled', @@ -18561,7 +18581,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-'], -@@ -6003,7 +6003,7 @@ +@@ -6008,7 +6008,7 @@ }, { 'name': 'DeveloperToolsAvailability', @@ -18570,7 +18590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6108,7 +6108,7 @@ +@@ -6113,7 +6113,7 @@ }, { 'name': 'RestoreOnStartup', @@ -18579,7 +18599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6159,7 +6159,7 @@ +@@ -6164,7 +6164,7 @@ }, { 'name': 'RestoreOnStartupURLs', @@ -18588,7 +18608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6171,7 +6171,7 @@ +@@ -6176,7 +6176,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18597,7 +18617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -6183,7 +6183,7 @@ +@@ -6188,7 +6188,7 @@ }, { 'name': 'BlockThirdPartyCookies', @@ -18606,7 +18626,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-'], -@@ -6217,7 +6217,7 @@ +@@ -6222,7 +6222,7 @@ }, { 'name': 'DefaultSearchProviderEnabled', @@ -18615,7 +18635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -6258,7 +6258,7 @@ +@@ -6263,7 +6263,7 @@ }, { 'name': 'DefaultSearchProviderContextMenuAccessAllowed', @@ -18624,7 +18644,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-'], -@@ -6291,7 +6291,7 @@ +@@ -6296,7 +6296,7 @@ }, { 'name': 'DefaultSearchProviderName', @@ -18633,7 +18653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6315,7 +6315,7 @@ +@@ -6320,7 +6320,7 @@ }, { 'name': 'DefaultSearchProviderKeyword', @@ -18642,7 +18662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6339,7 +6339,7 @@ +@@ -6344,7 +6344,7 @@ }, { 'name': 'DefaultSearchProviderSearchURL', @@ -18651,7 +18671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6363,7 +6363,7 @@ +@@ -6368,7 +6368,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURL', @@ -18660,7 +18680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6387,7 +6387,7 @@ +@@ -6392,7 +6392,7 @@ }, { 'name': 'DefaultSearchProviderInstantURL', @@ -18669,7 +18689,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'], -@@ -6411,7 +6411,7 @@ +@@ -6416,7 +6416,7 @@ }, { 'name': 'DefaultSearchProviderIconURL', @@ -18678,7 +18698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6435,7 +6435,7 @@ +@@ -6440,7 +6440,7 @@ }, { 'name': 'DefaultSearchProviderEncodings', @@ -18687,7 +18707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6462,7 +6462,7 @@ +@@ -6467,7 +6467,7 @@ }, { 'name': 'DefaultSearchProviderAlternateURLs', @@ -18696,7 +18716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6489,7 +6489,7 @@ +@@ -6494,7 +6494,7 @@ }, { 'name': 'DefaultSearchProviderSearchTermsReplacementKey', @@ -18705,7 +18725,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'], -@@ -6511,7 +6511,7 @@ +@@ -6516,7 +6516,7 @@ }, { 'name': 'DefaultSearchProviderImageURL', @@ -18714,7 +18734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6535,7 +6535,7 @@ +@@ -6540,7 +6540,7 @@ }, { 'name': 'DefaultSearchProviderNewTabURL', @@ -18723,7 +18743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6559,7 +6559,7 @@ +@@ -6564,7 +6564,7 @@ }, { 'name': 'DefaultSearchProviderSearchURLPostParams', @@ -18732,7 +18752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6583,7 +6583,7 @@ +@@ -6588,7 +6588,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURLPostParams', @@ -18741,7 +18761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6607,7 +6607,7 @@ +@@ -6612,7 +6612,7 @@ }, { 'name': 'DefaultSearchProviderInstantURLPostParams', @@ -18750,7 +18770,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'], -@@ -6629,7 +6629,7 @@ +@@ -6634,7 +6634,7 @@ }, { 'name': 'DefaultSearchProviderImageURLPostParams', @@ -18759,7 +18779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6653,7 +6653,7 @@ +@@ -6658,7 +6658,7 @@ }, { 'name': 'DefaultCookiesSetting', @@ -18768,7 +18788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6697,7 +6697,7 @@ +@@ -6702,7 +6702,7 @@ }, { 'name': 'DefaultImagesSetting', @@ -18777,7 +18797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6730,7 +6730,7 @@ +@@ -6735,7 +6735,7 @@ }, { 'name': 'DefaultJavaScriptSetting', @@ -18786,7 +18806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6763,7 +6763,7 @@ +@@ -6768,7 +6768,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -18795,7 +18815,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6804,7 +6804,7 @@ +@@ -6809,7 +6809,7 @@ }, { 'name': 'DefaultPopupsSetting', @@ -18804,7 +18824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6842,7 +6842,7 @@ +@@ -6847,7 +6847,7 @@ }, { 'name': 'DefaultNotificationsSetting', @@ -18813,7 +18833,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6880,7 +6880,7 @@ +@@ -6885,7 +6885,7 @@ }, { 'name': 'DefaultGeolocationSetting', @@ -18822,7 +18842,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6919,7 +6919,7 @@ +@@ -6924,7 +6924,7 @@ }, { 'name': 'DefaultMediaStreamSetting', @@ -18831,7 +18851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6953,7 +6953,7 @@ +@@ -6958,7 +6958,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', @@ -18840,7 +18860,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6987,7 +6987,7 @@ +@@ -6992,7 +6992,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -18849,7 +18869,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7021,7 +7021,7 @@ +@@ -7026,7 +7026,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -18858,7 +18878,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7055,7 +7055,7 @@ +@@ -7060,7 +7060,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -18867,7 +18887,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7089,7 +7089,7 @@ +@@ -7094,7 +7094,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -18876,7 +18896,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7121,7 +7121,7 @@ +@@ -7126,7 +7126,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18885,7 +18905,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.''', -@@ -7138,7 +7138,7 @@ +@@ -7143,7 +7143,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -18894,7 +18914,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7171,7 +7171,7 @@ +@@ -7176,7 +7176,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18903,7 +18923,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.''', -@@ -7186,7 +7186,7 @@ +@@ -7191,7 +7191,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -18912,7 +18932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7207,11 +7207,11 @@ +@@ -7212,11 +7212,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18926,7 +18946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7232,11 +7232,11 @@ +@@ -7237,11 +7237,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18940,7 +18960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7270,7 +7270,7 @@ +@@ -7275,7 +7275,7 @@ }, { 'name': 'SerialAskForUrls', @@ -18949,7 +18969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7293,11 +7293,11 @@ +@@ -7298,11 +7298,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18963,7 +18983,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7320,11 +7320,11 @@ +@@ -7325,11 +7325,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18977,7 +18997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7349,7 +7349,7 @@ +@@ -7354,7 +7354,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -18986,7 +19006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7405,7 +7405,7 @@ +@@ -7410,7 +7410,7 @@ }, { 'name': 'DefaultWebHidGuardSetting', @@ -18995,7 +19015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7441,7 +7441,7 @@ +@@ -7446,7 +7446,7 @@ }, { 'name': 'WebHidAskForUrls', @@ -19004,7 +19024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7452,7 +7452,7 @@ +@@ -7457,7 +7457,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19013,7 +19033,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'], -@@ -7470,11 +7470,11 @@ +@@ -7475,11 +7475,11 @@ URL patterns must not conflict with WebHidBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19027,7 +19047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7485,7 +7485,7 @@ +@@ -7490,7 +7490,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19036,7 +19056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 945, 'caption': '''Block the WebHID API on these sites''', 'tags': [], -@@ -7503,11 +7503,11 @@ +@@ -7508,11 +7508,11 @@ URL patterns can't conflict with WebHidAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19050,7 +19070,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7518,7 +7518,7 @@ +@@ -7523,7 +7523,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -19059,7 +19079,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'], -@@ -7532,7 +7532,7 @@ +@@ -7537,7 +7537,7 @@ }, { 'name': 'WebHidAllowDevicesForUrls', @@ -19068,7 +19088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7573,7 +7573,7 @@ +@@ -7578,7 +7578,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -19077,7 +19097,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.''', -@@ -7586,7 +7586,7 @@ +@@ -7591,7 +7591,7 @@ }, { 'name': 'WebHidAllowDevicesWithHidUsagesForUrls', @@ -19086,7 +19106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7627,7 +7627,7 @@ +@@ -7632,7 +7632,7 @@ }, 'example_value': [{ 'usages': [{'usage_page': 1234, 'usage': 5678}], @@ -19095,7 +19115,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.''', -@@ -7640,7 +7640,7 @@ +@@ -7645,7 +7645,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -19104,7 +19124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7675,7 +7675,7 @@ +@@ -7680,7 +7680,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -19113,7 +19133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7699,11 +7699,11 @@ +@@ -7704,11 +7704,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19127,7 +19147,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7727,11 +7727,11 @@ +@@ -7732,11 +7732,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19141,7 +19161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7765,7 +7765,7 @@ +@@ -7770,7 +7770,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -19150,7 +19170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7799,7 +7799,7 @@ +@@ -7804,7 +7804,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -19159,7 +19179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7820,11 +7820,11 @@ +@@ -7825,11 +7825,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19173,7 +19193,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7845,11 +7845,11 @@ +@@ -7850,11 +7850,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19187,7 +19207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7870,11 +7870,11 @@ +@@ -7875,11 +7875,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19201,7 +19221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7895,11 +7895,11 @@ +@@ -7900,11 +7900,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19215,7 +19235,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7959,7 +7959,7 @@ +@@ -7964,7 +7964,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -19224,7 +19244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8014,11 +8014,11 @@ +@@ -8019,11 +8019,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -19238,7 +19258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8043,11 +8043,11 @@ +@@ -8048,11 +8048,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. @@ -19252,7 +19272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8072,11 +8072,11 @@ +@@ -8077,11 +8077,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -19266,7 +19286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8101,11 +8101,11 @@ +@@ -8106,11 +8106,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -19280,7 +19300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8124,13 +8124,13 @@ +@@ -8129,13 +8129,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19296,7 +19316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8149,13 +8149,13 @@ +@@ -8154,13 +8154,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19312,7 +19332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8174,11 +8174,11 @@ +@@ -8179,11 +8179,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19326,10 +19346,47 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8197,11 +8197,11 @@ +@@ -8202,11 +8202,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. +- For detailed information on valid url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', ++ For detailed information on valid url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', + }, + { + 'name': 'DefaultClipboardSetting', +- 'owners': ['domfc@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['domfc@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -8242,7 +8242,7 @@ + }, + { + 'name': 'ClipboardAllowedForUrls', +- 'owners': ['domfc@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['domfc@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8262,11 +8262,11 @@ + + Leaving the policy unset means DefaultClipboardSetting applies for all sites, if it's set. If not, the user's personal setting applies. + +- For detailed information on valid url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', ++ For detailed information on valid url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', + }, + { + 'name': 'ClipboardBlockedForUrls', +- 'owners': ['domfc@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['domfc@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8285,11 +8285,11 @@ + + Leaving the policy unset means DefaultClipboardSetting applies for all sites, if it's set. If not, the user's personal setting applies. + - For detailed information on valid url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', + For detailed information on valid url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', }, @@ -19340,7 +19397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8221,11 +8221,11 @@ +@@ -8309,11 +8309,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. @@ -19354,7 +19411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8245,11 +8245,11 @@ +@@ -8333,11 +8333,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. @@ -19368,7 +19425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8281,13 +8281,13 @@ +@@ -8369,13 +8369,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], 'deprecated': True, @@ -19384,7 +19441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8306,17 +8306,17 @@ +@@ -8394,17 +8394,17 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -19405,7 +19462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -8343,7 +8343,7 @@ +@@ -8431,7 +8431,7 @@ }, { 'name': 'LensRegionSearchEnabled', @@ -19414,7 +19471,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-'], -@@ -8370,7 +8370,7 @@ +@@ -8458,7 +8458,7 @@ }, { 'name': 'SideSearchEnabled', @@ -19423,7 +19480,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-'], -@@ -8400,9 +8400,9 @@ +@@ -8488,9 +8488,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -19436,7 +19493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -8448,9 +8448,9 @@ +@@ -8536,9 +8536,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -19449,7 +19506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -8477,11 +8477,11 @@ +@@ -8565,11 +8565,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. @@ -19463,7 +19520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8501,11 +8501,11 @@ +@@ -8589,11 +8589,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19477,7 +19534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8525,11 +8525,11 @@ +@@ -8613,11 +8613,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19491,7 +19548,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8553,11 +8553,11 @@ +@@ -8641,11 +8641,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19505,7 +19562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -8587,7 +8587,7 @@ +@@ -8675,7 +8675,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -19514,7 +19571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -8598,7 +8598,7 @@ +@@ -8686,7 +8686,7 @@ }, { 'name': 'PopupsBlockedForUrls', @@ -19523,7 +19580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8622,11 +8622,11 @@ +@@ -8710,11 +8710,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19537,7 +19594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8645,11 +8645,11 @@ +@@ -8733,11 +8733,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19551,7 +19608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8668,11 +8668,11 @@ +@@ -8756,11 +8756,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19565,7 +19622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8693,7 +8693,7 @@ +@@ -8781,7 +8781,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. @@ -19574,7 +19631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -8718,11 +8718,11 @@ +@@ -8806,11 +8806,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. @@ -19588,7 +19645,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8750,7 +8750,7 @@ +@@ -8838,7 +8838,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -19597,7 +19654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8775,7 +8775,7 @@ +@@ -8863,7 +8863,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -19606,7 +19663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8803,7 +8803,7 @@ +@@ -8891,7 +8891,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -19615,7 +19672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8828,7 +8828,7 @@ +@@ -8916,7 +8916,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -19624,7 +19681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -8856,7 +8856,7 @@ +@@ -8944,7 +8944,7 @@ }, { 'name': 'Disable3DAPIs', @@ -19633,7 +19690,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-'], -@@ -8884,7 +8884,7 @@ +@@ -8972,7 +8972,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -19642,7 +19699,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-'], -@@ -8904,7 +8904,7 @@ +@@ -8992,7 +8992,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -19651,7 +19708,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-'], -@@ -8923,7 +8923,7 @@ +@@ -9011,7 +9011,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -19660,7 +19717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8955,7 +8955,7 @@ +@@ -9043,7 +9043,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -19669,7 +19726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8974,11 +8974,11 @@ +@@ -9062,11 +9062,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19683,7 +19740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8997,11 +8997,11 @@ +@@ -9085,11 +9085,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19697,7 +19754,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -9019,7 +9019,7 @@ +@@ -9107,7 +9107,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -19706,7 +19763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -9041,7 +9041,7 @@ +@@ -9129,7 +9129,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -19715,7 +19772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9062,7 +9062,7 @@ +@@ -9150,7 +9150,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -19724,7 +19781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -9098,7 +9098,7 @@ +@@ -9186,7 +9186,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -19733,7 +19790,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9152,7 +9152,7 @@ +@@ -9240,7 +9240,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -19742,7 +19799,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -9188,7 +9188,7 @@ +@@ -9276,7 +9276,7 @@ }, { 'name': 'SecondaryGoogleAccountUsage', @@ -19751,7 +19808,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9229,7 +9229,7 @@ +@@ -9317,7 +9317,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -19760,7 +19817,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -9249,7 +9249,7 @@ +@@ -9337,7 +9337,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -19769,7 +19826,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9285,7 +9285,7 @@ +@@ -9373,7 +9373,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -19778,7 +19835,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-'], -@@ -9301,7 +9301,7 @@ +@@ -9389,7 +9389,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -19787,7 +19844,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'], -@@ -9331,11 +9331,11 @@ +@@ -9419,11 +9419,11 @@ This policy was removed in $1Google Chrome version 102. @@ -19801,7 +19858,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'], -@@ -9363,7 +9363,7 @@ +@@ -9451,7 +9451,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -19810,7 +19867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -9383,7 +9383,7 @@ +@@ -9471,7 +9471,7 @@ }, { 'name': 'TranslateEnabled', @@ -19819,7 +19876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9407,7 +9407,7 @@ +@@ -9495,7 +9495,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -19828,7 +19885,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'], -@@ -9426,7 +9426,7 @@ +@@ -9514,7 +9514,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -19837,7 +19894,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'], -@@ -9445,7 +9445,7 @@ +@@ -9533,7 +9533,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -19846,7 +19903,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'], -@@ -9468,7 +9468,7 @@ +@@ -9556,7 +9556,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -19855,7 +19912,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-'], -@@ -9487,7 +9487,7 @@ +@@ -9575,7 +9575,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -19864,7 +19921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9510,7 +9510,7 @@ +@@ -9598,7 +9598,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -19873,7 +19930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -9543,7 +9543,7 @@ +@@ -9631,7 +9631,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -19882,7 +19939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -9572,7 +9572,7 @@ +@@ -9660,7 +9660,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -19891,7 +19948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -9593,7 +9593,7 @@ +@@ -9681,7 +9681,7 @@ }, { 'name': 'U2fSecurityKeyApiEnabled', @@ -19900,7 +19957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9624,11 +9624,11 @@ +@@ -9713,11 +9713,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. @@ -19914,7 +19971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['full-admin-access'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9661,7 +9661,7 @@ +@@ -9750,7 +9750,7 @@ }, { 'name': 'GCFUserDataDir', @@ -19923,7 +19980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -9677,14 +9677,14 @@ +@@ -9766,14 +9766,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -19940,7 +19997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -9705,7 +9705,7 @@ +@@ -9794,7 +9794,7 @@ }, { 'name': 'ImportBookmarks', @@ -19949,7 +20006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9726,7 +9726,7 @@ +@@ -9815,7 +9815,7 @@ }, { 'name': 'ImportHistory', @@ -19958,7 +20015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9747,7 +9747,7 @@ +@@ -9836,7 +9836,7 @@ }, { 'name': 'ImportHomepage', @@ -19967,7 +20024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9766,7 +9766,7 @@ +@@ -9855,7 +9855,7 @@ }, { 'name': 'ImportSearchEngine', @@ -19976,7 +20033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9786,7 +9786,7 @@ +@@ -9875,7 +9875,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -19985,7 +20042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9806,7 +9806,7 @@ +@@ -9895,7 +9895,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -19994,7 +20051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -9826,7 +9826,7 @@ +@@ -9915,7 +9915,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -20003,7 +20060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -9845,7 +9845,7 @@ +@@ -9934,7 +9934,7 @@ }, { 'name': 'HideWebStorePromo', @@ -20012,7 +20069,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'], -@@ -9863,7 +9863,7 @@ +@@ -9952,7 +9952,7 @@ }, { 'name': 'URLBlacklist', @@ -20021,7 +20078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9886,7 +9886,7 @@ +@@ -9975,7 +9975,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -20030,7 +20087,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. -@@ -9895,7 +9895,7 @@ +@@ -9984,7 +9984,7 @@ }, { 'name': 'URLWhitelist', @@ -20039,7 +20096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9918,7 +9918,7 @@ +@@ -10007,7 +10007,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -20048,7 +20105,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:". -@@ -9929,7 +9929,7 @@ +@@ -10018,7 +10018,7 @@ }, { 'name': 'URLBlocklist', @@ -20057,7 +20114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9950,7 +9950,7 @@ +@@ -10039,7 +10039,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -20066,7 +20123,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. -@@ -9961,7 +9961,7 @@ +@@ -10050,7 +10050,7 @@ }, { 'name': 'URLAllowlist', @@ -20075,7 +20132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9982,7 +9982,7 @@ +@@ -10071,7 +10071,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -20084,7 +20141,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:". -@@ -9995,7 +9995,7 @@ +@@ -10084,7 +10084,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -20093,7 +20150,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-'], -@@ -10015,7 +10015,7 @@ +@@ -10104,7 +10104,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -20102,7 +20159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10050,7 +10050,7 @@ +@@ -10139,7 +10139,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -20111,7 +20168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -10121,7 +10121,7 @@ +@@ -10210,7 +10210,7 @@ }, { 'name': 'CloudUserPolicyMerge', @@ -20120,7 +20177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:92-', 'android:97-'], -@@ -10155,7 +10155,7 @@ +@@ -10244,7 +10244,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -20129,7 +20186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10184,10 +10184,10 @@ +@@ -10273,10 +10273,10 @@ }, { 'name': 'OpenNetworkConfiguration', @@ -20142,7 +20199,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -10202,10 +10202,10 @@ +@@ -10291,10 +10291,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', @@ -20155,7 +20212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -10220,7 +10220,7 @@ +@@ -10309,7 +10309,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', @@ -20164,7 +20221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10267,7 +10267,7 @@ +@@ -10356,7 +10356,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', @@ -20173,7 +20230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10310,7 +10310,7 @@ +@@ -10399,7 +10399,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', @@ -20182,7 +20239,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-'], -@@ -10333,7 +10333,7 @@ +@@ -10422,7 +10422,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', @@ -20191,7 +20248,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-'], -@@ -10356,7 +10356,7 @@ +@@ -10445,7 +10445,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', @@ -20200,7 +20257,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-'], -@@ -10379,7 +10379,7 @@ +@@ -10468,7 +10468,7 @@ }, { 'name': 'ChromadToCloudMigrationEnabled', @@ -20209,7 +20266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -10413,7 +10413,7 @@ +@@ -10502,7 +10502,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -20218,7 +20275,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-101'], -@@ -10434,7 +10434,7 @@ +@@ -10523,7 +10523,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -20227,7 +20284,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'], -@@ -10451,7 +10451,7 @@ +@@ -10540,7 +10540,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -20236,7 +20293,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'], -@@ -10468,7 +10468,7 @@ +@@ -10557,7 +10557,7 @@ }, { 'name': 'DisablePrintPreview', @@ -20245,7 +20302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -10486,7 +10486,7 @@ +@@ -10575,7 +10575,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -20254,7 +20311,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-'], -@@ -10505,7 +10505,7 @@ +@@ -10594,7 +10594,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -20263,7 +20320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -10546,7 +10546,7 @@ +@@ -10635,7 +10635,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -20272,7 +20329,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'], -@@ -10565,7 +10565,7 @@ +@@ -10654,7 +10654,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -20281,7 +20338,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-'], -@@ -10585,7 +10585,7 @@ +@@ -10674,7 +10674,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -20290,7 +20347,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-'], -@@ -10614,7 +10614,7 @@ +@@ -10703,7 +10703,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -20299,7 +20356,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'], -@@ -10635,7 +10635,7 @@ +@@ -10724,7 +10724,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -20308,7 +20365,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'], -@@ -10656,7 +10656,7 @@ +@@ -10745,7 +10745,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -20317,7 +20374,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'], -@@ -10679,7 +10679,7 @@ +@@ -10768,7 +10768,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -20326,7 +20383,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-'], -@@ -10700,7 +10700,7 @@ +@@ -10789,7 +10789,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -20335,7 +20392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -10722,7 +10722,7 @@ +@@ -10811,7 +10811,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -20344,7 +20401,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-'], -@@ -10747,7 +10747,7 @@ +@@ -10836,7 +10836,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -20353,7 +20410,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-'], -@@ -10771,7 +10771,7 @@ +@@ -10860,7 +10860,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -20362,7 +20419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10804,7 +10804,7 @@ +@@ -10893,7 +10893,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -20371,7 +20428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10837,7 +10837,7 @@ +@@ -10926,7 +10926,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -20380,7 +20437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10877,7 +10877,7 @@ +@@ -10966,7 +10966,7 @@ }, { 'name': 'EnableDeviceGranularReporting', @@ -20389,7 +20446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10907,7 +10907,7 @@ +@@ -10996,7 +10996,7 @@ }, { 'name': 'ReportDeviceVersionInfo', @@ -20398,7 +20455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10927,7 +10927,7 @@ +@@ -11016,7 +11016,7 @@ }, { 'name': 'ReportDeviceActivityTimes', @@ -20407,7 +20464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10947,7 +10947,7 @@ +@@ -11036,7 +11036,7 @@ }, { 'name': 'ReportDeviceAudioStatus', @@ -20416,7 +20473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10979,7 +10979,7 @@ +@@ -11068,7 +11068,7 @@ }, { 'name': 'ReportDeviceAudioStatusCheckingRateMs', @@ -20424,8 +20481,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'albertojuarez@9oo91e.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, - 'future_on': ['chrome_os'], -@@ -11000,7 +11000,7 @@ + 'supported_on': ['chrome_os:103-'], +@@ -11091,7 +11091,7 @@ }, { 'name': 'ReportDeviceBootMode', @@ -20434,7 +20491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -11020,7 +11020,7 @@ +@@ -11111,7 +11111,7 @@ }, { 'name': 'ReportDeviceLocation', @@ -20443,7 +20500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11040,7 +11040,7 @@ +@@ -11131,7 +11131,7 @@ }, { 'name': 'ReportDeviceNetworkConfiguration', @@ -20452,7 +20509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11072,7 +11072,7 @@ +@@ -11163,7 +11163,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', @@ -20461,7 +20518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -11093,7 +11093,7 @@ +@@ -11184,7 +11184,7 @@ }, { 'name': 'ReportDeviceNetworkStatus', @@ -20470,7 +20527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11125,7 +11125,7 @@ +@@ -11216,7 +11216,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryCollectionRateMs', @@ -20478,8 +20535,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['anasr@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, - 'future_on': ['chrome_os'], -@@ -11146,7 +11146,7 @@ + 'supported_on': ['chrome_os:103-'], +@@ -11239,7 +11239,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryEventCheckingRateMs', @@ -20487,8 +20544,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['anasr@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, - 'future_on': ['chrome_os'], -@@ -11167,7 +11167,7 @@ + 'supported_on': ['chrome_os:103-'], +@@ -11262,7 +11262,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -20497,7 +20554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -11187,7 +11187,7 @@ +@@ -11282,7 +11282,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -20506,7 +20563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11208,7 +11208,7 @@ +@@ -11303,7 +11303,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -20515,7 +20572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11228,7 +11228,7 @@ +@@ -11323,7 +11323,7 @@ }, { 'name': 'ReportDeviceSecurityStatus', @@ -20524,7 +20581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11260,7 +11260,7 @@ +@@ -11355,7 +11355,7 @@ }, { 'name': 'ReportDeviceGraphicsStatus', @@ -20533,7 +20590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11283,7 +11283,7 @@ +@@ -11378,7 +11378,7 @@ }, { 'name': 'ReportDeviceCrashReportInfo', @@ -20542,7 +20599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11306,7 +11306,7 @@ +@@ -11401,7 +11401,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -20551,7 +20608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11328,7 +11328,7 @@ +@@ -11423,7 +11423,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -20560,7 +20617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11348,7 +11348,7 @@ +@@ -11443,7 +11443,7 @@ }, { 'name': 'ReportDevicePeripherals', @@ -20569,7 +20626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:101-'], -@@ -11379,7 +11379,7 @@ +@@ -11474,7 +11474,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -20578,7 +20635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11400,7 +11400,7 @@ +@@ -11495,7 +11495,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -20587,7 +20644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11420,7 +11420,7 @@ +@@ -11515,7 +11515,7 @@ }, { 'name': 'ReportDeviceCpuInfo', @@ -20596,7 +20653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11441,7 +11441,7 @@ +@@ -11536,7 +11536,7 @@ }, { 'name': 'ReportDeviceTimezoneInfo', @@ -20605,7 +20662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11462,7 +11462,7 @@ +@@ -11557,7 +11557,7 @@ }, { 'name': 'ReportDeviceMemoryInfo', @@ -20614,7 +20671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11483,7 +11483,7 @@ +@@ -11578,7 +11578,7 @@ }, { 'name': 'ReportDeviceBacklightInfo', @@ -20623,7 +20680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11504,7 +11504,7 @@ +@@ -11599,7 +11599,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -20632,7 +20689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11525,7 +11525,7 @@ +@@ -11620,7 +11620,7 @@ }, { 'name': 'ReportDeviceBluetoothInfo', @@ -20641,7 +20698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11546,7 +11546,7 @@ +@@ -11641,7 +11641,7 @@ }, { 'name': 'ReportDeviceFanInfo', @@ -20650,7 +20707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11567,7 +11567,7 @@ +@@ -11662,7 +11662,7 @@ }, { 'name': 'ReportDeviceVpdInfo', @@ -20659,7 +20716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11589,7 +11589,7 @@ +@@ -11684,7 +11684,7 @@ }, { 'name': 'ReportDeviceSystemInfo', @@ -20668,7 +20725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -11610,7 +11610,7 @@ +@@ -11705,7 +11705,7 @@ }, { 'name': 'ReportDevicePrintJobs', @@ -20677,7 +20734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11642,7 +11642,7 @@ +@@ -11737,7 +11737,7 @@ }, { 'name': 'ReportDeviceLoginLogout', @@ -20686,7 +20743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11674,7 +11674,7 @@ +@@ -11769,7 +11769,7 @@ }, { 'name': 'ReportCRDSessions', @@ -20695,7 +20752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -11706,7 +11706,7 @@ +@@ -11801,7 +11801,7 @@ }, { 'name': 'ReportUploadFrequency', @@ -20704,7 +20761,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-'], -@@ -11726,7 +11726,7 @@ +@@ -11821,7 +11821,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -20713,7 +20770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -11745,7 +11745,7 @@ +@@ -11840,7 +11840,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -20722,7 +20779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -11764,7 +11764,7 @@ +@@ -11859,7 +11859,7 @@ }, { 'name': 'HeartbeatEnabled', @@ -20731,7 +20788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -11784,7 +11784,7 @@ +@@ -11879,7 +11879,7 @@ }, { 'name': 'HeartbeatFrequency', @@ -20740,7 +20797,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-'], -@@ -11804,7 +11804,7 @@ +@@ -11899,7 +11899,7 @@ }, { 'name': 'LogUploadEnabled', @@ -20749,7 +20806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -11824,7 +11824,7 @@ +@@ -11919,7 +11919,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -20758,7 +20815,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11837,11 +11837,11 @@ +@@ -11932,11 +11932,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20772,7 +20829,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. -@@ -11852,7 +11852,7 @@ +@@ -11947,7 +11947,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -20781,7 +20838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11864,11 +11864,11 @@ +@@ -11959,11 +11959,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -20795,7 +20852,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.''', -@@ -11876,7 +11876,7 @@ +@@ -11971,7 +11971,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -20804,7 +20861,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11897,7 +11897,7 @@ +@@ -11992,7 +11992,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -20813,7 +20870,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11915,7 +11915,7 @@ +@@ -12010,7 +12010,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -20822,7 +20879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11935,7 +11935,7 @@ +@@ -12030,7 +12030,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -20831,7 +20888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11953,7 +11953,7 @@ +@@ -12048,7 +12048,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', @@ -20840,7 +20897,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -11975,7 +11975,7 @@ +@@ -12070,7 +12070,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -20849,7 +20906,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -12013,7 +12013,7 @@ +@@ -12108,7 +12108,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -20858,7 +20915,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12031,7 +12031,7 @@ +@@ -12126,7 +12126,7 @@ }, { 'name': 'DeviceReleaseLtsTag', @@ -20867,7 +20924,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -12047,7 +12047,7 @@ +@@ -12142,7 +12142,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -20876,7 +20933,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12092,7 +12092,7 @@ +@@ -12187,7 +12187,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -20885,7 +20942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12108,7 +12108,7 @@ +@@ -12203,7 +12203,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -20894,7 +20951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12120,7 +12120,7 @@ +@@ -12215,7 +12215,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20903,7 +20960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -12130,7 +12130,7 @@ +@@ -12225,7 +12225,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -20912,7 +20969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12151,7 +12151,7 @@ +@@ -12246,7 +12246,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -20921,7 +20978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12172,7 +12172,7 @@ +@@ -12267,7 +12267,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -20930,7 +20987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -12191,7 +12191,7 @@ +@@ -12286,7 +12286,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -20939,7 +20996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12212,7 +12212,7 @@ +@@ -12307,7 +12307,7 @@ }, { 'name': 'DeviceAppPack', @@ -20948,7 +21005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12224,7 +12224,7 @@ +@@ -12319,7 +12319,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20957,7 +21014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -12236,7 +12236,7 @@ +@@ -12331,7 +12331,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -20966,7 +21023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12256,7 +12256,7 @@ +@@ -12351,7 +12351,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -20975,7 +21032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -12277,7 +12277,7 @@ +@@ -12372,7 +12372,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -20984,7 +21041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -12305,7 +12305,7 @@ +@@ -12400,7 +12400,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -20993,7 +21050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12344,7 +12344,7 @@ +@@ -12439,7 +12439,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -21002,7 +21059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -12369,7 +12369,7 @@ +@@ -12464,7 +12464,7 @@ }, { 'name': 'DeviceTargetVersionSelector', @@ -21011,7 +21068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:95-'], -@@ -12398,7 +12398,7 @@ +@@ -12493,7 +12493,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -21020,7 +21077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -12414,7 +12414,7 @@ +@@ -12509,7 +12509,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -21029,7 +21086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12435,7 +12435,7 @@ +@@ -12530,7 +12530,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -21038,7 +21095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12455,7 +12455,7 @@ +@@ -12550,7 +12550,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -21047,7 +21104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12477,7 +12477,7 @@ +@@ -12572,7 +12572,7 @@ }, { 'name': 'KioskCRXManifestUpdateURLIgnored', @@ -21056,7 +21113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12509,7 +12509,7 @@ +@@ -12604,7 +12604,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -21065,7 +21122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12528,7 +12528,7 @@ +@@ -12623,7 +12623,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -21074,7 +21131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -12549,7 +12549,7 @@ +@@ -12644,7 +12644,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -21083,7 +21140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12568,7 +12568,7 @@ +@@ -12663,7 +12663,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -21092,7 +21149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -12587,7 +12587,7 @@ +@@ -12682,7 +12682,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -21101,7 +21158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -12601,7 +12601,7 @@ +@@ -12696,7 +12696,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. @@ -21110,7 +21167,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". -@@ -12609,7 +12609,7 @@ +@@ -12704,7 +12704,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -21119,7 +21176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -12628,7 +12628,7 @@ +@@ -12723,7 +12723,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', @@ -21128,7 +21185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -12652,7 +12652,7 @@ +@@ -12747,7 +12747,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -21137,7 +21194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12676,7 +12676,7 @@ +@@ -12771,7 +12771,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -21146,7 +21203,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-'], -@@ -12697,7 +12697,7 @@ +@@ -12792,7 +12792,7 @@ }, { 'name': 'DriveDisabled', @@ -21155,7 +21212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12716,7 +12716,7 @@ +@@ -12811,7 +12811,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -21164,7 +21221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12735,7 +12735,7 @@ +@@ -12830,7 +12830,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -21173,7 +21230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12747,20 +12747,20 @@ +@@ -12842,20 +12842,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -21197,7 +21254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -12780,7 +12780,7 @@ +@@ -12875,7 +12875,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -21206,7 +21263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12801,11 +12801,11 @@ +@@ -12896,11 +12896,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -21220,7 +21277,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'], -@@ -12822,11 +12822,11 @@ +@@ -12917,11 +12917,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. @@ -21234,7 +21291,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-'], -@@ -12862,7 +12862,7 @@ +@@ -12957,7 +12957,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -21243,7 +21300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -12880,7 +12880,7 @@ +@@ -12975,7 +12975,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -21252,7 +21309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12898,7 +12898,7 @@ +@@ -12993,7 +12993,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -21261,7 +21318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -12918,7 +12918,7 @@ +@@ -13013,7 +13013,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -21270,7 +21327,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-'], -@@ -12939,7 +12939,7 @@ +@@ -13034,7 +13034,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -21279,7 +21336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12956,11 +12956,11 @@ +@@ -13051,11 +13051,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 @@ -21293,7 +21350,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-'], -@@ -12980,7 +12980,7 @@ +@@ -13075,7 +13075,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -21302,7 +21359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12997,11 +12997,11 @@ +@@ -13092,11 +13092,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 @@ -21316,7 +21373,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-'], -@@ -13017,7 +13017,7 @@ +@@ -13112,7 +13112,7 @@ }, { 'name': 'SystemTimezone', @@ -21325,7 +21382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -13037,7 +13037,7 @@ +@@ -13132,7 +13132,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -21334,7 +21391,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -13059,7 +13059,7 @@ +@@ -13154,7 +13154,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -21343,7 +21400,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -13086,7 +13086,7 @@ +@@ -13181,7 +13181,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -21352,7 +21409,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -13104,7 +13104,7 @@ +@@ -13199,7 +13199,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -21361,7 +21418,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13130,7 +13130,7 @@ +@@ -13225,7 +13225,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -21370,7 +21427,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13185,7 +13185,7 @@ +@@ -13280,7 +13280,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -21379,7 +21436,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -13213,7 +13213,7 @@ +@@ -13308,7 +13308,7 @@ }, { 'name': 'AdditionalDnsQueryTypesEnabled', @@ -21388,7 +21445,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13250,7 +13250,7 @@ +@@ -13345,7 +13345,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -21397,7 +21454,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13287,7 +13287,7 @@ +@@ -13382,7 +13382,7 @@ }, { 'name': 'ShelfAlignment', @@ -21406,7 +21463,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", -@@ -13342,7 +13342,7 @@ +@@ -13437,7 +13437,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -21415,7 +21472,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -13428,7 +13428,7 @@ +@@ -13523,7 +13523,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -21424,7 +21481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13470,7 +13470,7 @@ +@@ -13565,7 +13565,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -21433,7 +21490,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -13490,7 +13490,7 @@ +@@ -13585,7 +13585,7 @@ }, { 'name': 'UserDisplayName', @@ -21442,7 +21499,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -13512,7 +13512,7 @@ +@@ -13607,7 +13607,7 @@ }, { 'name': 'SessionLengthLimit', @@ -21451,7 +21508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -13534,7 +13534,7 @@ +@@ -13629,7 +13629,7 @@ }, { 'name': 'FullscreenAllowed', @@ -21460,7 +21517,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-'], -@@ -13555,7 +13555,7 @@ +@@ -13650,7 +13650,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -21469,7 +21526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -13588,7 +13588,7 @@ +@@ -13683,7 +13683,7 @@ 'id': 930, 'name': 'KeepFullscreenWithoutNotificationUrlAllowList', 'caption': '''List of URLs which are allowed to remain in full screen mode without showing a notification''', @@ -21478,7 +21535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13607,13 +13607,13 @@ +@@ -13702,13 +13702,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. @@ -21494,7 +21551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13644,7 +13644,7 @@ +@@ -13739,7 +13739,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -21503,7 +21560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13675,7 +13675,7 @@ +@@ -13770,7 +13770,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -21512,7 +21569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13708,7 +13708,7 @@ +@@ -13803,7 +13803,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -21521,7 +21578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13739,7 +13739,7 @@ +@@ -13834,7 +13834,7 @@ }, { 'name': 'IdleDelayAC', @@ -21530,7 +21587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13768,7 +13768,7 @@ +@@ -13863,7 +13863,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -21539,7 +21596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13799,7 +13799,7 @@ +@@ -13894,7 +13894,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -21548,7 +21605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13830,7 +13830,7 @@ +@@ -13925,7 +13925,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -21557,7 +21614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13863,7 +13863,7 @@ +@@ -13958,7 +13958,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -21566,7 +21623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13894,7 +13894,7 @@ +@@ -13989,7 +13989,7 @@ }, { 'name': 'IdleDelayBattery', @@ -21575,7 +21632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13923,7 +13923,7 @@ +@@ -14018,7 +14018,7 @@ }, { 'name': 'IdleAction', @@ -21584,7 +21641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13970,7 +13970,7 @@ +@@ -14065,7 +14065,7 @@ }, { 'name': 'IdleActionAC', @@ -21593,7 +21650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14019,7 +14019,7 @@ +@@ -14114,7 +14114,7 @@ }, { 'name': 'IdleActionBattery', @@ -21602,7 +21659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14068,7 +14068,7 @@ +@@ -14163,7 +14163,7 @@ }, { 'name': 'LidCloseAction', @@ -21611,7 +21668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14113,7 +14113,7 @@ +@@ -14208,7 +14208,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -21620,7 +21677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14131,7 +14131,7 @@ +@@ -14226,7 +14226,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -21629,7 +21686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14150,7 +14150,7 @@ +@@ -14245,7 +14245,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -21638,7 +21695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -14167,7 +14167,7 @@ +@@ -14262,7 +14262,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -21647,7 +21704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14187,7 +14187,7 @@ +@@ -14282,7 +14282,7 @@ }, { 'name': 'AllowWakeLocks', @@ -21656,7 +21713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -14216,7 +14216,7 @@ +@@ -14311,7 +14311,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -21665,7 +21722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -14245,7 +14245,7 @@ +@@ -14340,7 +14340,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -21674,7 +21731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14265,7 +14265,7 @@ +@@ -14360,7 +14360,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -21683,7 +21740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -14283,7 +14283,7 @@ +@@ -14378,7 +14378,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -21692,7 +21749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14387,7 +14387,7 @@ +@@ -14482,7 +14482,7 @@ }, { 'name': 'ScreenLockDelays', @@ -21701,7 +21758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14424,7 +14424,7 @@ +@@ -14519,7 +14519,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -21710,7 +21767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14512,7 +14512,7 @@ +@@ -14607,7 +14607,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -21719,7 +21776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14541,7 +14541,7 @@ +@@ -14636,7 +14636,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -21728,7 +21785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -14561,7 +14561,7 @@ +@@ -14656,7 +14656,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', @@ -21737,7 +21794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -14582,7 +14582,7 @@ +@@ -14677,7 +14677,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -21746,7 +21803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -14603,7 +14603,7 @@ +@@ -14698,7 +14698,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -21755,7 +21812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14622,7 +14622,7 @@ +@@ -14717,7 +14717,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -21764,7 +21821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14641,7 +14641,7 @@ +@@ -14736,7 +14736,7 @@ }, { 'name': 'HighContrastEnabled', @@ -21773,7 +21830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14660,7 +14660,7 @@ +@@ -14755,7 +14755,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -21782,7 +21839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14686,7 +14686,7 @@ +@@ -14781,7 +14781,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -21791,7 +21848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14711,7 +14711,7 @@ +@@ -14806,7 +14806,7 @@ }, { 'name': 'VirtualKeyboardEnabled', @@ -21800,7 +21857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -14730,7 +14730,7 @@ +@@ -14825,7 +14825,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -21809,7 +21866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14782,7 +14782,7 @@ +@@ -14877,7 +14877,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -21818,7 +21875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -14801,7 +14801,7 @@ +@@ -14896,7 +14896,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -21827,7 +21884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -14826,7 +14826,7 @@ +@@ -14921,7 +14921,7 @@ }, { 'name': 'DictationEnabled', @@ -21836,7 +21893,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14851,7 +14851,7 @@ +@@ -14946,7 +14946,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -21845,7 +21902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14878,7 +14878,7 @@ +@@ -14973,7 +14973,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -21854,7 +21911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14905,7 +14905,7 @@ +@@ -15000,7 +15000,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -21863,7 +21920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14932,7 +14932,7 @@ +@@ -15027,7 +15027,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -21872,7 +21929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14959,7 +14959,7 @@ +@@ -15054,7 +15054,7 @@ }, { 'name': 'AutoclickEnabled', @@ -21881,7 +21938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14986,7 +14986,7 @@ +@@ -15081,7 +15081,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -21890,7 +21947,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -15005,7 +15005,7 @@ +@@ -15100,7 +15100,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -21899,7 +21956,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15044,7 +15044,7 @@ +@@ -15139,7 +15139,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -21908,7 +21965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15066,7 +15066,7 @@ +@@ -15161,7 +15161,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -21917,7 +21974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -15091,7 +15091,7 @@ +@@ -15186,7 +15186,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', @@ -21926,7 +21983,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15113,7 +15113,7 @@ +@@ -15208,7 +15208,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -21935,7 +21992,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15138,7 +15138,7 @@ +@@ -15233,7 +15233,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -21944,7 +22001,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15160,7 +15160,7 @@ +@@ -15255,7 +15255,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -21953,7 +22010,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15185,7 +15185,7 @@ +@@ -15280,7 +15280,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -21962,7 +22019,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -15210,7 +15210,7 @@ +@@ -15305,7 +15305,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -21971,7 +22028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15235,7 +15235,7 @@ +@@ -15330,7 +15330,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -21980,7 +22037,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15260,7 +15260,7 @@ +@@ -15355,7 +15355,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -21989,7 +22046,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15285,7 +15285,7 @@ +@@ -15380,7 +15380,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -21998,7 +22055,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-'], -@@ -15311,7 +15311,7 @@ +@@ -15406,7 +15406,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -22007,7 +22064,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15355,7 +15355,7 @@ +@@ -15450,7 +15450,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -22016,7 +22073,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15402,7 +15402,7 @@ +@@ -15497,7 +15497,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -22025,7 +22082,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15427,7 +15427,7 @@ +@@ -15522,7 +15522,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -22034,7 +22091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15452,7 +15452,7 @@ +@@ -15547,7 +15547,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -22043,7 +22100,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15477,7 +15477,7 @@ +@@ -15572,7 +15572,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -22052,7 +22109,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15502,7 +15502,7 @@ +@@ -15597,7 +15597,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -22061,7 +22118,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15529,7 +15529,7 @@ +@@ -15624,7 +15624,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -22070,7 +22127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15556,7 +15556,7 @@ +@@ -15651,7 +15651,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -22079,7 +22136,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15581,7 +15581,7 @@ +@@ -15676,7 +15676,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -22088,7 +22145,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15608,7 +15608,7 @@ +@@ -15703,7 +15703,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -22097,7 +22154,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-'], -@@ -15628,7 +15628,7 @@ +@@ -15723,7 +15723,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -22106,7 +22163,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15650,7 +15650,7 @@ +@@ -15745,7 +15745,7 @@ }, { 'name': 'UptimeLimit', @@ -22115,7 +22172,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -15671,7 +15671,7 @@ +@@ -15766,7 +15766,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -22124,7 +22181,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15695,7 +15695,7 @@ +@@ -15790,7 +15790,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -22133,7 +22190,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -15716,7 +15716,7 @@ +@@ -15811,7 +15811,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -22142,7 +22199,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -15737,7 +15737,7 @@ +@@ -15832,7 +15832,7 @@ }, { 'name': 'ChromeVariations', @@ -22151,7 +22208,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15774,7 +15774,7 @@ +@@ -15869,7 +15869,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -22160,7 +22217,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. -@@ -15784,7 +15784,7 @@ +@@ -15879,7 +15879,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -22169,7 +22226,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15819,7 +15819,7 @@ +@@ -15914,7 +15914,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google ChromeOS device. @@ -22178,7 +22235,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. -@@ -15829,7 +15829,7 @@ +@@ -15924,7 +15924,7 @@ }, { 'name': 'AttestationEnabledForDevice', @@ -22187,7 +22244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15848,7 +15848,7 @@ +@@ -15943,7 +15943,7 @@ }, { 'name': 'AttestationEnabledForUser', @@ -22196,7 +22253,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15866,7 +15866,7 @@ +@@ -15961,7 +15961,7 @@ }, { 'name': 'AttestationExtensionAllowlist', @@ -22205,7 +22262,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15887,7 +15887,7 @@ +@@ -15982,7 +15982,7 @@ }, { 'name': 'AttestationExtensionWhitelist', @@ -22214,7 +22271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15911,7 +15911,7 @@ +@@ -16006,7 +16006,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', @@ -22223,7 +22280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -15930,7 +15930,7 @@ +@@ -16025,7 +16025,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -22232,7 +22289,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.''', -@@ -15946,7 +15946,7 @@ +@@ -16041,7 +16041,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -22241,7 +22298,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15969,7 +15969,7 @@ +@@ -16064,7 +16064,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -22250,7 +22307,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15992,7 +15992,7 @@ +@@ -16087,7 +16087,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', @@ -22259,7 +22316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -16011,7 +16011,7 @@ +@@ -16106,7 +16106,7 @@ }, { 'name': 'ManagedBookmarks', @@ -22268,7 +22325,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -16044,20 +16044,20 @@ +@@ -16139,20 +16139,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -22293,7 +22350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -16065,13 +16065,13 @@ +@@ -16160,13 +16160,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -22309,7 +22366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'deprecated': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -16090,7 +16090,7 @@ +@@ -16185,7 +16185,7 @@ }, { 'name': 'UserAvatarImage', @@ -22318,7 +22375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16127,7 +16127,7 @@ +@@ -16222,7 +16222,7 @@ }, { 'name': 'WallpaperImage', @@ -22327,7 +22384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16162,7 +16162,7 @@ +@@ -16257,7 +16257,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -22336,7 +22393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -16201,7 +16201,7 @@ +@@ -16296,7 +16296,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -22345,7 +22402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16227,7 +16227,7 @@ +@@ -16322,7 +16322,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -22354,7 +22411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16248,7 +16248,7 @@ +@@ -16343,7 +16343,7 @@ }, { 'name': 'SessionLocales', @@ -22363,7 +22420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16276,7 +16276,7 @@ +@@ -16371,7 +16371,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -22372,7 +22429,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-'], -@@ -16296,7 +16296,7 @@ +@@ -16391,7 +16391,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -22381,7 +22438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -16314,7 +16314,7 @@ +@@ -16409,7 +16409,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -22390,7 +22447,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-'], -@@ -16334,7 +16334,7 @@ +@@ -16429,7 +16429,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -22399,7 +22456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -16355,7 +16355,7 @@ +@@ -16450,7 +16450,7 @@ }, { 'name': 'BrowserSignin', @@ -22408,7 +22465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16394,13 +16394,13 @@ +@@ -16489,13 +16489,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. @@ -22424,7 +22481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16460,7 +16460,7 @@ +@@ -16555,7 +16555,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -22433,7 +22490,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16505,7 +16505,7 @@ +@@ -16600,7 +16600,7 @@ }, { 'name': 'SSLVersionMax', @@ -22442,7 +22499,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16583,7 +16583,7 @@ +@@ -16678,7 +16678,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -22451,7 +22508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16606,11 +16606,11 @@ +@@ -16701,11 +16701,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. @@ -22465,7 +22522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16643,7 +16643,7 @@ +@@ -16738,7 +16738,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -22474,7 +22531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16670,7 +16670,7 @@ +@@ -16765,7 +16765,7 @@ }, { 'name': 'RC4Enabled', @@ -22483,7 +22540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16695,7 +16695,7 @@ +@@ -16790,7 +16790,7 @@ }, { 'name': 'DHEEnabled', @@ -22492,7 +22549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16722,7 +16722,7 @@ +@@ -16817,7 +16817,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -22501,7 +22558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -16753,7 +16753,7 @@ +@@ -16848,7 +16848,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -22510,7 +22567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -16771,7 +16771,7 @@ +@@ -16866,7 +16866,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -22519,7 +22576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -16790,7 +16790,7 @@ +@@ -16885,7 +16885,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -22528,7 +22585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -16808,7 +16808,7 @@ +@@ -16903,7 +16903,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -22537,7 +22594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -16826,7 +16826,7 @@ +@@ -16921,7 +16921,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -22546,7 +22603,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-'], -@@ -16844,7 +16844,7 @@ +@@ -16939,7 +16939,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -22555,7 +22612,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16865,11 +16865,11 @@ +@@ -16960,11 +16960,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. @@ -22569,7 +22626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16880,7 +16880,7 @@ +@@ -16975,7 +16975,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22578,7 +22635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 865, 'caption': '''Allow origins to query for device attributes''', 'tags': [], -@@ -16890,7 +16890,7 @@ +@@ -16985,7 +16985,7 @@ }, { 'name': 'QuicAllowed', @@ -22587,7 +22644,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-'], -@@ -16908,7 +16908,7 @@ +@@ -17003,7 +17003,7 @@ }, { 'name': 'KeyPermissions', @@ -22596,7 +22653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -16951,7 +16951,7 @@ +@@ -17046,7 +17046,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -22605,7 +22662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -16970,7 +16970,7 @@ +@@ -17065,7 +17065,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -22614,7 +22671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -16988,7 +16988,7 @@ +@@ -17083,7 +17083,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -22623,7 +22680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -17007,7 +17007,7 @@ +@@ -17102,7 +17102,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -22632,7 +22689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17052,7 +17052,7 @@ +@@ -17147,7 +17147,7 @@ }, { 'name': 'ArcEnabled', @@ -22641,7 +22698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -17070,7 +17070,7 @@ +@@ -17165,7 +17165,7 @@ }, { 'name': 'ArcPolicy', @@ -22650,7 +22707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -17130,7 +17130,7 @@ +@@ -17225,7 +17225,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -22659,7 +22716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17152,7 +17152,7 @@ +@@ -17247,7 +17247,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -22668,7 +22725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17188,7 +17188,7 @@ +@@ -17283,7 +17283,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -22677,7 +22734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -17229,7 +17229,7 @@ +@@ -17324,7 +17324,7 @@ }, { 'name': 'UsbDetachableAllowlist', @@ -22686,7 +22743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -17266,7 +17266,7 @@ +@@ -17361,7 +17361,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -22695,7 +22752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -17286,7 +17286,7 @@ +@@ -17381,7 +17381,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -22704,7 +22761,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. -@@ -17304,7 +17304,7 @@ +@@ -17399,7 +17399,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -22713,7 +22770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17338,7 +17338,7 @@ +@@ -17433,7 +17433,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -22722,7 +22779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17392,7 +17392,7 @@ +@@ -17487,7 +17487,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -22731,7 +22788,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. -@@ -17410,7 +17410,7 @@ +@@ -17505,7 +17505,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -22740,7 +22797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -17448,7 +17448,7 @@ +@@ -17543,7 +17543,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -22749,7 +22806,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.''', -@@ -17483,7 +17483,7 @@ +@@ -17578,7 +17578,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -22758,7 +22815,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. -@@ -17502,7 +17502,7 @@ +@@ -17597,7 +17597,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -22767,7 +22824,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. -@@ -17521,7 +17521,7 @@ +@@ -17616,7 +17616,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -22776,7 +22833,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. -@@ -17566,7 +17566,7 @@ +@@ -17661,7 +17661,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -22785,7 +22842,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17590,7 +17590,7 @@ +@@ -17685,7 +17685,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -22794,7 +22851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17601,7 +17601,7 @@ +@@ -17696,7 +17696,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -22803,7 +22860,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'], -@@ -17614,13 +17614,13 @@ +@@ -17709,13 +17709,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -22820,7 +22877,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. -@@ -17638,7 +17638,7 @@ +@@ -17733,7 +17733,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -22829,7 +22886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17671,7 +17671,7 @@ +@@ -17766,7 +17766,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -22838,7 +22895,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-'], -@@ -17680,7 +17680,7 @@ +@@ -17775,7 +17775,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22847,7 +22904,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'], -@@ -17690,11 +17690,11 @@ +@@ -17785,11 +17785,11 @@ Users cannot change or override this setting. @@ -22861,7 +22918,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' ], -@@ -17787,7 +17787,7 @@ +@@ -17882,7 +17882,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -22870,7 +22927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -17805,7 +17805,7 @@ +@@ -17900,7 +17900,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -22879,7 +22936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -17823,7 +17823,7 @@ +@@ -17918,7 +17918,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -22888,7 +22945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-','ios:93-'], -@@ -17854,7 +17854,7 @@ +@@ -17949,7 +17949,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -22897,7 +22954,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-'], -@@ -17885,7 +17885,7 @@ +@@ -17980,7 +17980,7 @@ }, { 'name': 'NTPCardsVisible', @@ -22906,7 +22963,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-'], -@@ -17924,7 +17924,7 @@ +@@ -18019,7 +18019,7 @@ }, { 'name': 'NTPMiddleSlotAnnouncementVisible', @@ -22915,7 +22972,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-'], -@@ -17957,7 +17957,7 @@ +@@ -18052,7 +18052,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -22924,7 +22981,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-'], -@@ -17975,7 +17975,7 @@ +@@ -18070,7 +18070,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -22933,7 +22990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17997,7 +17997,7 @@ +@@ -18092,7 +18092,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -22942,7 +22999,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-'], -@@ -18016,7 +18016,7 @@ +@@ -18111,7 +18111,7 @@ }, { 'name': 'NativePrinters', @@ -22951,7 +23008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18040,7 +18040,7 @@ +@@ -18135,7 +18135,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -22960,7 +23017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -18096,7 +18096,7 @@ +@@ -18191,7 +18191,7 @@ }, { 'name': 'Printers', @@ -22969,7 +23026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18120,7 +18120,7 @@ +@@ -18215,7 +18215,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -22978,7 +23035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -18173,7 +18173,7 @@ +@@ -18268,7 +18268,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -22987,7 +23044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -18206,7 +18206,7 @@ +@@ -18301,7 +18301,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -22996,7 +23053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -18236,7 +18236,7 @@ +@@ -18331,7 +18331,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -23005,7 +23062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-100'], 'type': 'int-enum', -@@ -18284,7 +18284,7 @@ +@@ -18379,7 +18379,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -23014,7 +23071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -18329,7 +18329,7 @@ +@@ -18424,7 +18424,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -23023,7 +23080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 384, 'type': 'list', -@@ -18351,7 +18351,7 @@ +@@ -18446,7 +18446,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -23032,7 +23089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -18370,7 +18370,7 @@ +@@ -18465,7 +18465,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -23041,7 +23098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 385, 'type': 'list', -@@ -18392,7 +18392,7 @@ +@@ -18487,7 +18487,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -23050,7 +23107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -18411,7 +18411,7 @@ +@@ -18506,7 +18506,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -23059,7 +23116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -18449,7 +18449,7 @@ +@@ -18544,7 +18544,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -23068,7 +23125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-100'], -@@ -18497,7 +18497,7 @@ +@@ -18592,7 +18592,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -23077,7 +23134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 388, -@@ -18519,7 +18519,7 @@ +@@ -18614,7 +18614,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -23086,7 +23143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 389, -@@ -18542,7 +18542,7 @@ +@@ -18637,7 +18637,7 @@ }, { 'name': 'DevicePrinters', @@ -23095,7 +23152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -18577,7 +18577,7 @@ +@@ -18672,7 +18672,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -23104,7 +23161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -18622,7 +18622,7 @@ +@@ -18717,7 +18717,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -23113,7 +23170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -18641,7 +18641,7 @@ +@@ -18736,7 +18736,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -23122,7 +23179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -18661,7 +18661,7 @@ +@@ -18756,7 +18756,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -23131,7 +23188,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -18714,7 +18714,7 @@ +@@ -18809,7 +18809,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -23140,7 +23197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -18740,7 +18740,7 @@ +@@ -18835,7 +18835,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -23149,7 +23206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -18824,7 +18824,7 @@ +@@ -18919,7 +18919,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -23158,7 +23215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -18848,7 +18848,7 @@ +@@ -18943,7 +18943,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', @@ -23167,7 +23224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -18903,7 +18903,7 @@ +@@ -18998,7 +18998,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', @@ -23176,7 +23233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -18961,7 +18961,7 @@ +@@ -19056,7 +19056,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -23185,7 +23242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19004,7 +19004,7 @@ +@@ -19099,7 +19099,7 @@ }, { 'name': 'WebAuthnFactors', @@ -23194,7 +23251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -19058,7 +19058,7 @@ +@@ -19153,7 +19153,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -23203,7 +23260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -19076,7 +19076,7 @@ +@@ -19171,7 +19171,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -23212,7 +23269,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -19094,7 +19094,7 @@ +@@ -19189,7 +19189,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -23221,7 +23278,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -19112,7 +19112,7 @@ +@@ -19207,7 +19207,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -23230,7 +23287,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -19145,7 +19145,7 @@ +@@ -19240,7 +19240,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -23239,7 +23296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19166,7 +19166,7 @@ +@@ -19261,7 +19261,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -23248,7 +23305,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19187,7 +19187,7 @@ +@@ -19282,7 +19282,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -23257,7 +23314,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -19210,7 +19210,7 @@ +@@ -19305,7 +19305,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -23266,7 +23323,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19231,7 +19231,7 @@ +@@ -19326,7 +19326,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -23275,7 +23332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19254,7 +19254,7 @@ +@@ -19349,7 +19349,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -23284,7 +23341,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -19275,7 +19275,7 @@ +@@ -19370,7 +19370,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -23293,7 +23350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -19296,7 +19296,7 @@ +@@ -19391,7 +19391,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -23302,7 +23359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19317,7 +19317,7 @@ +@@ -19412,7 +19412,7 @@ }, { 'name': 'PhoneHubCameraRollAllowed', @@ -23311,7 +23368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19348,7 +19348,7 @@ +@@ -19443,7 +19443,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -23320,7 +23377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19368,7 +19368,7 @@ +@@ -19463,7 +19463,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -23329,7 +23386,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19388,7 +19388,7 @@ +@@ -19483,7 +19483,7 @@ }, { 'name': 'EcheAllowed', @@ -23338,7 +23395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -19419,7 +19419,7 @@ +@@ -19514,7 +19514,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -23347,7 +23404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -19440,7 +19440,7 @@ +@@ -19535,7 +19535,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -23356,7 +23413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -19471,7 +19471,7 @@ +@@ -19566,7 +19566,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -23365,7 +23422,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -19500,7 +19500,7 @@ +@@ -19595,7 +19595,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -23374,7 +23431,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19543,7 +19543,7 @@ +@@ -19638,7 +19638,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -23383,7 +23440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -19575,7 +19575,7 @@ +@@ -19670,7 +19670,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -23392,7 +23449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19621,7 +19621,7 @@ +@@ -19716,7 +19716,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -23401,7 +23458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19677,7 +19677,7 @@ +@@ -19772,7 +19772,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -23410,7 +23467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -19714,7 +19714,7 @@ +@@ -19809,7 +19809,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -23419,7 +23476,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19744,7 +19744,7 @@ +@@ -19839,7 +19839,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -23428,7 +23485,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19771,7 +19771,7 @@ +@@ -19866,7 +19866,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -23437,7 +23494,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19791,7 +19791,7 @@ +@@ -19886,7 +19886,7 @@ }, { 'name': 'CastReceiverName', @@ -23446,7 +23503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -19811,7 +19811,7 @@ +@@ -19906,7 +19906,7 @@ }, { 'name': 'DeviceOffHours', @@ -23455,7 +23512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19894,7 +19894,7 @@ +@@ -19989,7 +19989,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -23464,7 +23521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -19919,7 +19919,7 @@ +@@ -20014,7 +20014,7 @@ }, { 'name': 'CloudUserPolicyOverridesCloudMachinePolicy', @@ -23473,7 +23530,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:96-', 'android:97-'], -@@ -19953,7 +19953,7 @@ +@@ -20048,7 +20048,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -23482,7 +23539,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-'], -@@ -19971,7 +19971,7 @@ +@@ -20066,7 +20066,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -23491,7 +23548,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -19989,7 +19989,7 @@ +@@ -20084,7 +20084,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -23500,7 +23557,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20041,7 +20041,7 @@ +@@ -20136,7 +20136,7 @@ }, { 'name': 'IsolateOrigins', @@ -23509,7 +23566,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-'], -@@ -20068,7 +20068,7 @@ +@@ -20163,7 +20163,7 @@ }, { 'name': 'SitePerProcess', @@ -23518,7 +23575,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-'], -@@ -20091,7 +20091,7 @@ +@@ -20186,7 +20186,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -23527,7 +23584,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -20114,7 +20114,7 @@ +@@ -20209,7 +20209,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -23536,7 +23593,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -20135,7 +20135,7 @@ +@@ -20230,7 +20230,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -23545,7 +23602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -20162,7 +20162,7 @@ +@@ -20257,7 +20257,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -23554,7 +23611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -20187,7 +20187,7 @@ +@@ -20282,7 +20282,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -23563,7 +23620,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-'], -@@ -20212,7 +20212,7 @@ +@@ -20307,7 +20307,7 @@ 'caption': '''Specifies whether SharedArrayBuffers can be used in a non cross-origin-isolated context''', 'tags': ['system-security'], 'desc': ''' @@ -23572,7 +23629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When set to Enabled, sites can use SharedArrayBuffer with no restrictions. -@@ -20220,7 +20220,7 @@ +@@ -20315,7 +20315,7 @@ }, { 'name': 'SandboxExternalProtocolBlocked', @@ -23581,7 +23638,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-'], -@@ -20245,7 +20245,7 @@ +@@ -20340,7 +20340,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 @@ -23590,7 +23647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When True, this lets Chrome blocks those navigations. -@@ -20258,7 +20258,7 @@ +@@ -20353,7 +20353,7 @@ }, { 'name': 'CrossOriginWebAssemblyModuleSharingEnabled', @@ -23599,7 +23656,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'], -@@ -20292,7 +20292,7 @@ +@@ -20387,7 +20387,7 @@ }, { 'name': 'DisplayCapturePermissionsPolicyEnabled', @@ -23608,7 +23665,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-'], -@@ -20329,7 +20329,7 @@ +@@ -20424,7 +20424,7 @@ }, { 'name': 'WebDriverOverridesIncompatiblePolicies', @@ -23617,7 +23674,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -20357,7 +20357,7 @@ +@@ -20452,7 +20452,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -23626,7 +23683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20390,7 +20390,7 @@ +@@ -20485,7 +20485,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -23635,7 +23692,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-'], -@@ -20410,11 +20410,11 @@ +@@ -20505,11 +20505,11 @@ This policy has no effect if the policy DownloadDirectory is set. @@ -23649,7 +23706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -20433,7 +20433,7 @@ +@@ -20528,7 +20528,7 @@ }, { 'name': 'DeviceHostnameUserConfigurable', @@ -23658,7 +23715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -20466,7 +20466,7 @@ +@@ -20561,7 +20561,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -23667,7 +23724,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-'], -@@ -20495,7 +20495,7 @@ +@@ -20590,7 +20590,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -23676,7 +23733,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20526,7 +20526,7 @@ +@@ -20621,7 +20621,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -23685,7 +23742,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20560,7 +20560,7 @@ +@@ -20655,7 +20655,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -23694,7 +23751,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20591,7 +20591,7 @@ +@@ -20686,7 +20686,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -23703,7 +23760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -20609,7 +20609,7 @@ +@@ -20704,7 +20704,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -23712,7 +23769,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-'], -@@ -20645,7 +20645,7 @@ +@@ -20740,7 +20740,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -23721,7 +23778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20679,7 +20679,7 @@ +@@ -20774,7 +20774,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -23730,7 +23787,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20690,7 +20690,7 @@ +@@ -20785,7 +20785,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -23739,16 +23796,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 410, 'caption': '''Restrict accounts that are visible in $1Google Chrome''', 'tags': [], -@@ -20704,7 +20704,7 @@ +@@ -20799,7 +20799,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20753,7 +20753,7 @@ +@@ -20848,7 +20848,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -23757,7 +23814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20788,7 +20788,7 @@ +@@ -20883,7 +20883,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -23766,7 +23823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20809,7 +20809,7 @@ +@@ -20904,7 +20904,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -23775,7 +23832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20828,7 +20828,7 @@ +@@ -20923,7 +20923,7 @@ { 'id': 854, 'name': 'RelaunchWindow', @@ -23784,7 +23841,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20898,7 +20898,7 @@ +@@ -20993,7 +20993,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -23793,7 +23850,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -20917,7 +20917,7 @@ +@@ -21012,7 +21012,7 @@ }, { 'name': 'CrostiniAllowed', @@ -23802,7 +23859,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20933,7 +20933,7 @@ +@@ -21028,7 +21028,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -23811,7 +23868,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20949,7 +20949,7 @@ +@@ -21044,7 +21044,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -23820,7 +23877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20965,7 +20965,7 @@ +@@ -21060,7 +21060,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -23829,7 +23886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -20984,7 +20984,7 @@ +@@ -21079,7 +21079,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -23838,7 +23895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21024,7 +21024,7 @@ +@@ -21119,7 +21119,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -23847,7 +23904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21062,7 +21062,7 @@ +@@ -21157,7 +21157,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -23856,7 +23913,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -21103,7 +21103,7 @@ +@@ -21198,7 +21198,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -23865,7 +23922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21123,7 +21123,7 @@ +@@ -21218,7 +21218,7 @@ }, { 'name': 'SystemTerminalSshAllowed', @@ -23874,34 +23931,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -21153,7 +21153,7 @@ +@@ -21248,7 +21248,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -21179,7 +21179,7 @@ +@@ -21274,7 +21274,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -21204,7 +21204,7 @@ +@@ -21299,7 +21299,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -21219,15 +21219,15 @@ +@@ -21314,15 +21314,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -23915,12 +23972,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PasswordProtectionChangePasswordURL', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:69-', 'chrome_os:69-'], -@@ -21239,15 +21239,15 @@ +@@ -21334,15 +21334,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -23934,12 +23991,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SafeBrowsingExtendedReportingEnabled', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:66-', 'chrome_os:66-', 'android: 87-'], -@@ -21265,12 +21265,12 @@ +@@ -21360,12 +21360,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -23954,7 +24011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -21290,7 +21290,7 @@ +@@ -21385,7 +21385,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -23963,7 +24020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -21309,11 +21309,11 @@ +@@ -21404,11 +21404,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. @@ -23977,7 +24034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -21330,11 +21330,11 @@ +@@ -21425,11 +21425,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. @@ -23991,7 +24048,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-'], -@@ -21354,7 +21354,7 @@ +@@ -21449,7 +21449,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -24000,7 +24057,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21374,11 +21374,11 @@ +@@ -21469,11 +21469,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. @@ -24014,7 +24071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21395,11 +21395,11 @@ +@@ -21490,11 +21490,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. @@ -24028,7 +24085,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'], -@@ -21414,13 +21414,13 @@ +@@ -21509,13 +21509,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -24044,7 +24101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-100'], -@@ -21444,7 +21444,7 @@ +@@ -21539,7 +21539,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -24053,7 +24110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -21465,7 +21465,7 @@ +@@ -21560,7 +21560,7 @@ }, { 'name': 'DeviceSamlLoginAuthenticationType', @@ -24062,7 +24119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21502,7 +21502,7 @@ +@@ -21597,7 +21597,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -24071,7 +24128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21522,7 +21522,7 @@ +@@ -21617,7 +21617,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -24080,7 +24137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21544,7 +21544,7 @@ +@@ -21639,7 +21639,7 @@ }, { 'name': 'AllowedLanguages', @@ -24089,7 +24146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21568,7 +21568,7 @@ +@@ -21663,7 +21663,7 @@ }, { 'name': 'AllowedInputMethods', @@ -24098,7 +24155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21592,7 +21592,7 @@ +@@ -21687,7 +21687,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -24107,7 +24164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -21609,7 +21609,7 @@ +@@ -21704,7 +21704,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', @@ -24116,7 +24173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21627,7 +21627,7 @@ +@@ -21722,7 +21722,7 @@ }, { 'name': 'UsageTimeLimit', @@ -24125,7 +24182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21780,7 +21780,7 @@ +@@ -21875,7 +21875,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -24134,7 +24191,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21822,7 +21822,7 @@ +@@ -21917,7 +21917,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -24143,7 +24200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21864,7 +21864,7 @@ +@@ -21959,7 +21959,7 @@ }, { 'name': 'EnableSyncConsent', @@ -24152,7 +24209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -21882,7 +21882,7 @@ +@@ -21977,7 +21977,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -24161,7 +24218,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -21903,7 +21903,7 @@ +@@ -21998,7 +21998,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -24170,7 +24227,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21990,7 +21990,7 @@ +@@ -22085,7 +22085,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -24179,16 +24236,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -22009,7 +22009,7 @@ +@@ -22104,7 +22104,7 @@ }, { 'name': 'SafeSitesFilterBehavior', -- 'owners': ['bdea@chromium.org', 'nparker@chromium.org'], -+ 'owners': ['bdea@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], +- 'owners': ['nwokedi@chromium.org', 'nparker@chromium.org'], ++ 'owners': ['nwokedi@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22047,7 +22047,7 @@ +@@ -22142,7 +22142,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -24197,7 +24254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22071,7 +22071,7 @@ +@@ -22166,7 +22166,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -24206,7 +24263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22116,7 +22116,7 @@ +@@ -22211,7 +22211,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -24215,7 +24272,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'], -@@ -22131,7 +22131,7 @@ +@@ -22226,7 +22226,7 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -24224,7 +24281,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.''', }, -@@ -22158,7 +22158,7 @@ +@@ -22253,7 +22253,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -24233,7 +24290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22173,7 +22173,7 @@ +@@ -22268,7 +22268,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -24242,7 +24299,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-'], -@@ -22193,7 +22193,7 @@ +@@ -22288,7 +22288,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -24251,7 +24308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -22211,7 +22211,7 @@ +@@ -22306,7 +22306,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -24260,7 +24317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22236,7 +22236,7 @@ +@@ -22331,7 +22331,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -24269,7 +24326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22254,7 +22254,7 @@ +@@ -22349,7 +22349,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -24278,7 +24335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22274,12 +22274,12 @@ +@@ -22369,12 +22369,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -24294,7 +24351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -22292,7 +22292,7 @@ +@@ -22387,7 +22387,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -24303,7 +24360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22329,18 +22329,18 @@ +@@ -22424,18 +22424,18 @@ }, 'max_size': 1048576, 'example_value': [{ @@ -24326,7 +24383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'custom_name': 'Spreadsheets' }, { -@@ -22396,7 +22396,7 @@ +@@ -22491,7 +22491,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -24335,7 +24392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22421,7 +22421,7 @@ +@@ -22516,7 +22516,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -24344,7 +24401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22446,7 +22446,7 @@ +@@ -22541,7 +22541,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -24353,7 +24410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22470,7 +22470,7 @@ +@@ -22565,7 +22565,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -24362,7 +24419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22495,7 +22495,7 @@ +@@ -22590,7 +22590,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -24371,7 +24428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22520,7 +22520,7 @@ +@@ -22615,7 +22615,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -24380,7 +24437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22546,7 +22546,7 @@ +@@ -22641,7 +22641,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -24389,7 +24446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22572,7 +22572,7 @@ +@@ -22667,7 +22667,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -24398,7 +24455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22611,7 +22611,7 @@ +@@ -22706,7 +22706,7 @@ { 'id': 942, 'name': 'CloudProfileReportingEnabled', @@ -24407,7 +24464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22648,7 +22648,7 @@ +@@ -22743,7 +22743,7 @@ { 'id': 962, 'name': 'CloudReportingUploadFrequency', @@ -24416,7 +24473,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-'], -@@ -22673,7 +22673,7 @@ +@@ -22768,7 +22768,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -24425,7 +24482,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-'], -@@ -22693,7 +22693,7 @@ +@@ -22788,7 +22788,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -24434,7 +24491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -22712,7 +22712,7 @@ +@@ -22807,7 +22807,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -24443,7 +24500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22730,7 +22730,7 @@ +@@ -22825,7 +22825,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -24452,7 +24509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22775,7 +22775,7 @@ +@@ -22870,7 +22870,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -24461,7 +24518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22815,7 +22815,7 @@ +@@ -22910,7 +22910,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -24470,7 +24527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22833,7 +22833,7 @@ +@@ -22928,7 +22928,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -24479,7 +24536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22864,7 +22864,7 @@ +@@ -22959,7 +22959,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -24488,7 +24545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22884,7 +22884,7 @@ +@@ -22979,7 +22979,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -24497,7 +24554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22911,7 +22911,7 @@ +@@ -23006,7 +23006,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -24506,7 +24563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22938,7 +22938,7 @@ +@@ -23033,7 +23033,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -24515,7 +24572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22965,7 +22965,7 @@ +@@ -23060,7 +23060,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -24524,7 +24581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22982,12 +22982,12 @@ +@@ -23077,12 +23077,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. @@ -24539,7 +24596,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', -@@ -23002,12 +23002,12 @@ +@@ -23097,12 +23097,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. @@ -24554,7 +24611,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', -@@ -23022,12 +23022,12 @@ +@@ -23117,12 +23117,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. @@ -24569,7 +24626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -23045,7 +23045,7 @@ +@@ -23140,7 +23140,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -24578,7 +24635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23063,7 +23063,7 @@ +@@ -23158,7 +23158,7 @@ { 'id': 866, 'name': 'BrowserSwitcherParsingMode', @@ -24587,7 +24644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23106,7 +23106,7 @@ +@@ -23201,7 +23201,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -24596,7 +24653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -23123,7 +23123,7 @@ +@@ -23218,7 +23218,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -24605,7 +24662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23164,7 +23164,7 @@ +@@ -23259,7 +23259,7 @@ }, { 'name': 'PluginVmAllowed', @@ -24614,7 +24671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -23182,7 +23182,7 @@ +@@ -23277,7 +23277,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -24623,7 +24680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -23202,7 +23202,7 @@ +@@ -23297,7 +23297,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -24632,7 +24689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23224,7 +23224,7 @@ +@@ -23319,7 +23319,7 @@ }, { 'name': 'PluginVmUserId', @@ -24641,7 +24698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23243,7 +23243,7 @@ +@@ -23338,7 +23338,7 @@ }, { 'name': 'PluginVmImage', @@ -24650,7 +24707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23274,7 +23274,7 @@ +@@ -23369,7 +23369,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -24659,7 +24716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23293,7 +23293,7 @@ +@@ -23388,7 +23388,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -24668,7 +24725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23316,7 +23316,7 @@ +@@ -23411,7 +23411,7 @@ }, { 'name': 'ParentAccessCodeConfig', @@ -24677,7 +24734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -23394,7 +23394,7 @@ +@@ -23489,7 +23489,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -24686,7 +24743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23434,7 +23434,7 @@ +@@ -23529,7 +23529,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -24695,7 +24752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23481,7 +23481,7 @@ +@@ -23576,7 +23576,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -24704,7 +24761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -23498,7 +23498,7 @@ +@@ -23593,7 +23593,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -24713,7 +24770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -23538,7 +23538,7 @@ +@@ -23633,7 +23633,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -24722,7 +24779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23556,7 +23556,7 @@ +@@ -23651,7 +23651,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -24731,7 +24788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23574,7 +23574,7 @@ +@@ -23669,7 +23669,7 @@ }, { 'name': 'AssistantVoiceMatchEnabledDuringOobe', @@ -24740,7 +24797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:93-'], -@@ -23603,7 +23603,7 @@ +@@ -23698,7 +23698,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -24749,7 +24806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -23626,7 +23626,7 @@ +@@ -23721,7 +23721,7 @@ }, { 'name': 'QuickAnswersEnabled', @@ -24758,7 +24815,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23657,7 +23657,7 @@ +@@ -23752,7 +23752,7 @@ }, { 'name': 'QuickAnswersDefinitionEnabled', @@ -24767,7 +24824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23687,7 +23687,7 @@ +@@ -23782,7 +23782,7 @@ }, { 'name': 'QuickAnswersTranslationEnabled', @@ -24776,7 +24833,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23717,7 +23717,7 @@ +@@ -23812,7 +23812,7 @@ }, { 'name': 'QuickAnswersUnitConversionEnabled', @@ -24785,7 +24842,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23747,7 +23747,7 @@ +@@ -23842,7 +23842,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -24794,7 +24851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23766,7 +23766,7 @@ +@@ -23861,7 +23861,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -24803,7 +24860,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -23786,11 +23786,11 @@ +@@ -23881,11 +23881,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -24817,7 +24874,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -23819,7 +23819,7 @@ +@@ -23914,7 +23914,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -24826,7 +24883,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23840,7 +23840,7 @@ +@@ -23935,7 +23935,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -24835,7 +24892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23863,7 +23863,7 @@ +@@ -23958,7 +23958,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -24844,7 +24901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23942,7 +23942,7 @@ +@@ -24037,7 +24037,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -24853,7 +24910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23963,7 +23963,7 @@ +@@ -24058,7 +24058,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -24862,7 +24919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23988,7 +23988,7 @@ +@@ -24083,7 +24083,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -24871,7 +24928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:75-', 'chrome_os:75-'], -@@ -24017,7 +24017,7 @@ +@@ -24112,7 +24112,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', @@ -24880,7 +24937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:95-', 'chrome_os:95-'], 'type': 'list', 'schema': { -@@ -24045,11 +24045,11 @@ +@@ -24140,11 +24140,11 @@ For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server. @@ -24894,7 +24951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -24072,7 +24072,7 @@ +@@ -24167,7 +24167,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -24903,7 +24960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -24106,7 +24106,7 @@ +@@ -24201,7 +24201,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -24912,7 +24969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -24124,7 +24124,7 @@ +@@ -24219,7 +24219,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -24921,7 +24978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24155,7 +24155,7 @@ +@@ -24250,7 +24250,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -24930,7 +24987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24181,7 +24181,7 @@ +@@ -24276,7 +24276,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -24939,7 +24996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24202,7 +24202,7 @@ +@@ -24297,7 +24297,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -24948,7 +25005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -24269,7 +24269,7 @@ +@@ -24364,7 +24364,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -24957,7 +25014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24320,7 +24320,7 @@ +@@ -24415,7 +24415,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -24966,7 +25023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24343,7 +24343,7 @@ +@@ -24438,7 +24438,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -24975,7 +25032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24366,7 +24366,7 @@ +@@ -24461,7 +24461,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -24984,7 +25041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24412,7 +24412,7 @@ +@@ -24507,7 +24507,7 @@ }, { 'name': 'DeviceScheduledReboot', @@ -24993,7 +25050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24457,7 +24457,7 @@ +@@ -24552,7 +24552,7 @@ }, { 'name': 'KerberosEnabled', @@ -25002,7 +25059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24478,7 +24478,7 @@ +@@ -24573,7 +24573,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', @@ -25011,7 +25068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24499,7 +24499,7 @@ +@@ -24594,7 +24594,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', @@ -25020,7 +25077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24520,7 +24520,7 @@ +@@ -24615,7 +24615,7 @@ }, { 'name': 'KerberosAccounts', @@ -25029,7 +25086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24597,7 +24597,7 @@ +@@ -24692,7 +24692,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -25038,7 +25095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -24628,7 +24628,7 @@ +@@ -24723,7 +24723,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -25047,7 +25104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -24649,7 +24649,7 @@ +@@ -24744,7 +24744,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -25056,7 +25113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24669,7 +24669,7 @@ +@@ -24764,7 +24764,7 @@ }, { 'name': 'ExternalPrintServers', @@ -25065,7 +25122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24714,7 +24714,7 @@ +@@ -24809,7 +24809,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -25074,7 +25131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24763,7 +24763,7 @@ +@@ -24858,7 +24858,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -25083,7 +25140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -24783,7 +24783,7 @@ +@@ -24878,7 +24878,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -25092,7 +25149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24821,7 +24821,7 @@ +@@ -24916,7 +24916,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -25101,7 +25158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24841,7 +24841,7 @@ +@@ -24936,7 +24936,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -25110,7 +25167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24971,11 +24971,11 @@ +@@ -25066,11 +25066,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. @@ -25124,7 +25181,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25105,11 +25105,11 @@ +@@ -25200,11 +25200,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. @@ -25138,7 +25195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25235,11 +25235,11 @@ +@@ -25330,11 +25330,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. @@ -25152,7 +25209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25355,11 +25355,11 @@ +@@ -25450,11 +25450,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. @@ -25166,7 +25223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25408,11 +25408,11 @@ +@@ -25503,11 +25503,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. @@ -25180,7 +25237,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25450,11 +25450,11 @@ +@@ -25545,11 +25545,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. @@ -25194,7 +25251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -25470,11 +25470,11 @@ +@@ -25565,11 +25565,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. @@ -25208,7 +25265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -25501,11 +25501,11 @@ +@@ -25596,11 +25596,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. @@ -25222,7 +25279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25531,7 +25531,7 @@ +@@ -25626,7 +25626,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -25231,7 +25288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -25553,11 +25553,11 @@ +@@ -25648,11 +25648,11 @@ This policy was removed in Chrome 99. @@ -25245,7 +25302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -25583,7 +25583,7 @@ +@@ -25678,7 +25678,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -25254,7 +25311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25608,7 +25608,7 @@ +@@ -25703,7 +25703,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -25263,7 +25320,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-'], -@@ -25629,7 +25629,7 @@ +@@ -25724,7 +25724,7 @@ }, { 'name': 'CorsMitigationList', @@ -25272,7 +25329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25647,19 +25647,19 @@ +@@ -25742,19 +25742,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. @@ -25295,7 +25352,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'], -@@ -25680,13 +25680,13 @@ +@@ -25775,13 +25775,13 @@ This policy will be removed after a couple of milestones. @@ -25311,7 +25368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-100'], 'id': 631, 'features': { -@@ -25714,7 +25714,7 @@ +@@ -25809,7 +25809,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -25320,7 +25377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -25739,7 +25739,7 @@ +@@ -25834,7 +25834,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -25329,7 +25386,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, -@@ -25766,7 +25766,7 @@ +@@ -25861,7 +25861,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -25338,7 +25395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25799,7 +25799,7 @@ +@@ -25894,7 +25894,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -25347,7 +25404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25834,7 +25834,7 @@ +@@ -25929,7 +25929,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -25356,7 +25413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25853,11 +25853,11 @@ +@@ -25948,11 +25948,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. @@ -25370,7 +25427,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25876,11 +25876,11 @@ +@@ -25971,11 +25971,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. @@ -25384,7 +25441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -25904,11 +25904,11 @@ +@@ -25999,11 +25999,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -25398,7 +25455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -25926,7 +25926,7 @@ +@@ -26021,7 +26021,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -25407,7 +25464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -26053,7 +26053,7 @@ +@@ -26148,7 +26148,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -25416,7 +25473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -26076,7 +26076,7 @@ +@@ -26171,7 +26171,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -25425,7 +25482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -26099,7 +26099,7 @@ +@@ -26194,7 +26194,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -25434,7 +25491,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-'], -@@ -26111,7 +26111,7 @@ +@@ -26206,7 +26206,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -25443,7 +25500,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. -@@ -26123,7 +26123,7 @@ +@@ -26218,7 +26218,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -25452,7 +25509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -26144,7 +26144,7 @@ +@@ -26239,7 +26239,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -25461,7 +25518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -26211,7 +26211,7 @@ +@@ -26306,7 +26306,7 @@ }, { 'name': 'PrintPostScriptMode', @@ -25470,7 +25527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26251,7 +26251,7 @@ +@@ -26346,7 +26346,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -25479,7 +25536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26291,7 +26291,7 @@ +@@ -26386,7 +26386,7 @@ }, { 'name': 'PrintPdfAsImageAvailability', @@ -25488,7 +25545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -26324,7 +26324,7 @@ +@@ -26419,7 +26419,7 @@ }, { 'name': 'PrintRasterizePdfDpi', @@ -25497,7 +25554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -26350,7 +26350,7 @@ +@@ -26445,7 +26445,7 @@ }, { 'name': 'PrintPdfAsImageDefault', @@ -25506,7 +25563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -26385,7 +26385,7 @@ +@@ -26480,7 +26480,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -25515,7 +25572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -26408,7 +26408,7 @@ +@@ -26503,7 +26503,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -25524,7 +25581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26463,7 +26463,7 @@ +@@ -26558,7 +26558,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -25533,7 +25590,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-'], -@@ -26483,7 +26483,7 @@ +@@ -26578,7 +26578,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -25542,7 +25599,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-'], -@@ -26505,7 +26505,7 @@ +@@ -26600,7 +26600,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -25551,7 +25608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -26549,8 +26549,8 @@ +@@ -26644,8 +26644,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -25562,7 +25619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -26579,7 +26579,7 @@ +@@ -26674,7 +26674,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -25571,7 +25628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -26622,8 +26622,8 @@ +@@ -26717,8 +26717,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -25582,7 +25639,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -26650,7 +26650,7 @@ +@@ -26745,7 +26745,7 @@ }, { 'name': 'LocalDiscoveryEnabled', @@ -25591,7 +25648,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'], -@@ -26683,7 +26683,7 @@ +@@ -26778,7 +26778,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -25600,7 +25657,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-'], -@@ -26712,7 +26712,7 @@ +@@ -26807,7 +26807,7 @@ }, { 'name': 'ScreenCaptureAllowedByOrigins', @@ -25609,7 +25666,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26735,11 +26735,11 @@ +@@ -26830,11 +26830,11 @@ If a site matches a URL pattern in this policy, the ScreenCaptureAllowed will not be considered. @@ -25623,7 +25680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26762,11 +26762,11 @@ +@@ -26857,11 +26857,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25637,7 +25694,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26791,11 +26791,11 @@ +@@ -26886,11 +26886,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25651,7 +25708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26818,11 +26818,11 @@ +@@ -26913,11 +26913,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: TabCaptureAllowedByOrigins, WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25665,7 +25722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -26841,7 +26841,7 @@ +@@ -26936,7 +26936,7 @@ }, { 'name': 'SystemProxySettings', @@ -25674,7 +25731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -26897,7 +26897,7 @@ +@@ -26992,7 +26992,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -25683,7 +25740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -26925,7 +26925,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -27020,7 +27020,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -25692,7 +25749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -26952,7 +26952,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -27047,7 +27047,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -25701,7 +25758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-100'], -@@ -27007,7 +27007,7 @@ If set to False, $1Google Chrome will not +@@ -27102,7 +27102,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -25710,7 +25767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27059,7 +27059,7 @@ If set to False, $1Google Chrome will not +@@ -27154,7 +27154,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -25719,7 +25776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27111,7 +27111,7 @@ If set to False, $1Google Chrome will not +@@ -27206,7 +27206,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -25728,7 +25785,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-'], -@@ -27128,7 +27128,7 @@ If set to False, $1Google Chrome will not +@@ -27223,7 +27223,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -25737,7 +25794,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-'], -@@ -27149,7 +27149,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27244,7 +27244,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -25746,7 +25803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27168,7 +27168,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27263,7 +27263,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -25755,7 +25812,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-'], -@@ -27219,7 +27219,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27314,7 +27314,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -25764,7 +25821,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-'], -@@ -27257,7 +27257,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27352,7 +27352,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -25773,7 +25830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -27292,7 +27292,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27387,7 +27387,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -25782,7 +25839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27318,7 +27318,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27413,7 +27413,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -25791,7 +25848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27337,7 +27337,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27432,7 +27432,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -25800,7 +25857,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'], -@@ -27359,7 +27359,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27454,7 +27454,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsGREASEUpdateEnabled', @@ -25809,7 +25866,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-'], -@@ -27389,7 +27389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27484,7 +27484,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UrlParamFilterEnabled', @@ -25818,7 +25875,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-'], -@@ -27418,7 +27418,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27513,7 +27513,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -25827,7 +25884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -27440,7 +27440,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27535,7 +27535,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -25836,7 +25893,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-'], -@@ -27463,7 +27463,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27558,7 +27558,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -25845,7 +25902,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-'], -@@ -27482,7 +27482,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27577,7 +27577,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -25854,7 +25911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27508,7 +27508,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27603,7 +27603,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -25863,7 +25920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -27538,7 +27538,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27633,7 +27633,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -25872,7 +25929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27581,7 +27581,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27676,7 +27676,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -25881,7 +25938,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'], -@@ -27611,7 +27611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27706,7 +27706,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -25890,7 +25947,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'], -@@ -27641,7 +27641,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27736,7 +27736,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionClipboardCheckSizeLimit', @@ -25899,7 +25956,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-'], -@@ -27660,7 +27660,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27755,7 +27755,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionReportingEnabled', @@ -25908,7 +25965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -27692,7 +27692,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27787,7 +27787,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionRulesList', @@ -25917,7 +25974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27779,18 +27779,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27874,18 +27874,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25942,7 +25999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27823,8 +27823,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27918,8 +27918,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25953,7 +26010,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27871,13 +27871,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27966,13 +27966,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. @@ -25969,7 +26026,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-'], -@@ -27910,7 +27910,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28005,7 +28005,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -25978,7 +26035,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-'], -@@ -27937,7 +27937,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28032,7 +28032,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -25987,7 +26044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -27961,7 +27961,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28056,7 +28056,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -25996,7 +26053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -27986,7 +27986,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28081,7 +28081,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -26005,7 +26062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28041,7 +28041,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28136,7 +28136,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -26014,7 +26071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-95'], -@@ -28074,7 +28074,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28169,7 +28169,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -26023,7 +26080,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-'], -@@ -28108,7 +28108,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28203,7 +28203,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAvailability', @@ -26032,7 +26089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28174,7 +28174,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28269,7 +28269,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -26041,7 +26098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-93'], -@@ -28202,7 +28202,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28297,7 +28297,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -26050,7 +26107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -28288,7 +28288,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28383,7 +28383,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -26059,7 +26116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -28335,7 +28335,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28430,7 +28430,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -26068,7 +26125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -28371,7 +28371,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28466,7 +28466,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -26077,7 +26134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -28404,7 +28404,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28499,7 +28499,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -26086,7 +26143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28491,7 +28491,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28586,7 +28586,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -26095,7 +26152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -28525,7 +28525,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28620,7 +28620,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -26104,7 +26161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28571,13 +28571,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28666,13 +28666,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. @@ -26120,7 +26177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -28600,7 +28600,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28695,7 +28695,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -26129,7 +26186,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-'], -@@ -28623,7 +28623,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28718,7 +28718,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': [], @@ -26138,7 +26195,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. -@@ -28632,7 +28632,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28727,7 +28727,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -26147,7 +26204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28661,7 +28661,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': 'UserBorealisAllowed', @@ -26156,7 +26213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28690,7 +28690,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28785,7 +28785,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -26165,7 +26222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -28727,7 +28727,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28822,7 +28822,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -26174,7 +26231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28751,7 +28751,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28846,7 +28846,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -26183,7 +26240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -28775,7 +28775,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28870,7 +28870,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -26192,7 +26249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28817,7 +28817,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28912,7 +28912,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -26201,7 +26258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28848,7 +28848,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28943,7 +28943,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -26210,7 +26267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28872,7 +28872,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$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. @@ -26309,7 +26366,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. -@@ -29262,7 +29262,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$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 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. @@ -26497,7 +26554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29957,12 +29957,12 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOSUser-Agent Reduction and its timeline, read here: @@ -26512,7 +26569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -30021,8 +30021,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 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 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. @@ -26808,7 +26874,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''', -@@ -31095,11 +31095,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31226,11 +31226,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''', @@ -26822,7 +26888,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''', -@@ -31123,7 +31123,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31254,7 +31254,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.''', @@ -26831,7 +26897,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.''', -@@ -31135,7 +31135,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31266,7 +31266,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.''', @@ -26840,7 +26906,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.''', -@@ -31147,7 +31147,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31278,7 +31278,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.''', @@ -26849,7 +26915,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 -@@ -31476,7 +31476,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31607,7 +31607,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -27853,7 +27919,7 @@ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/ diff --git a/components/safe_browsing/content/browser/client_side_detection_service.cc b/components/safe_browsing/content/browser/client_side_detection_service.cc --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -61,7 +61,7 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; +@@ -63,7 +63,7 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = @@ -27979,7 +28045,7 @@ diff --git a/components/safe_search_api/stub_url_checker.cc b/components/safe_se + "https://safesearch.9oo91eapis.qjz9zk/v1:classify"; std::string BuildResponse(bool is_porn) { - base::Value dict(base::Value::Type::DICTIONARY); + base::Value::Dict dict; diff --git a/components/safety_check/url_constants.cc b/components/safety_check/url_constants.cc --- a/components/safety_check/url_constants.cc +++ b/components/safety_check/url_constants.cc @@ -28098,29 +28164,46 @@ diff --git a/components/services/quarantine/quarantine_mac.mm b/components/servi diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/components/shared_highlighting/core/common/disabled_sites.cc --- a/components/shared_highlighting/core/common/disabled_sites.cc +++ b/components/shared_highlighting/core/common/disabled_sites.cc -@@ -20,17 +20,17 @@ bool ShouldOfferLinkToText(const GURL& url) { - // any page on the foo.com domain. - static constexpr auto kBlocklist = - base::MakeFixedFlatMap( -- {{"facebook.com", ".*"}, -+ {{"f8c3b00k.qjz9zk", ".*"}, - // TODO(crbug.com/1157981): special case this to cover other Google - // TLDs -- {"google.com", "^\\/amp\\/.*"}, -+ {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, - {"instagram.com", ".*"}, -- {"mail.google.com", ".*"}, -+ {"mail.9oo91e.qjz9zk", ".*"}, - {"outlook.live.com", ".*"}, - {"reddit.com", ".*"}, - {"twitter.com", ".*"}, - {"web.whatsapp.com", ".*"}, -- {"youtube.com", ".*"}}); -+ {"y0u1ub3.qjz9zk", ".*"}}); +@@ -16,30 +16,30 @@ namespace shared_highlighting { + static auto CreateBlocklist() { + if (base::FeatureList::IsEnabled(kSharedHighlightingRefinedBlocklist)) { + return base::MakeFixedFlatMap( +- {{"facebook.com", "(?!.*(about)).*"}, ++ {{"f8c3b00k.qjz9zk", "(?!.*(about)).*"}, + // TODO(crbug.com/1157981): special case this to cover other Google + // TLDs +- {"google.com", "^\\/amp\\/.*"}, ++ {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, + {"instagram.com", "(?!.*(/p/)).*"}, +- {"mail.google.com", ".*"}, ++ {"mail.9oo91e.qjz9zk", ".*"}, + {"outlook.live.com", ".*"}, + {"reddit.com", "(?!.*(comments)).*"}, + {"twitter.com", "(?!.*(status)).*"}, + {"web.whatsapp.com", ".*"}, +- {"youtube.com", "?!.*(about|community)).*"}}); ++ {"y0u1ub3.qjz9zk", "?!.*(about|community)).*"}}); + } else { + return base::MakeFixedFlatMap( +- {{"facebook.com", ".*"}, ++ {{"f8c3b00k.qjz9zk", ".*"}, + // TODO(crbug.com/1157981): special case this to cover other Google + // TLDs +- {"google.com", "^\\/amp\\/.*"}, ++ {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, + {"instagram.com", ".*"}, +- {"mail.google.com", ".*"}, ++ {"mail.9oo91e.qjz9zk", ".*"}, + {"outlook.live.com", ".*"}, + {"reddit.com", ".*"}, + {"twitter.com", ".*"}, + {"web.whatsapp.com", ".*"}, +- {"youtube.com", ".*"}}); ++ {"y0u1ub3.qjz9zk", ".*"}}); + } + } - std::string domain = url.host(); - if (domain.compare(0, 4, "www.") == 0) { -@@ -42,7 +42,7 @@ bool ShouldOfferLinkToText(const GURL& url) { +@@ -60,7 +60,7 @@ bool ShouldOfferLinkToText(const GURL& url) { } if (base::FeatureList::IsEnabled(kSharedHighlightingAmp) && @@ -28129,7 +28212,7 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp return true; } -@@ -55,7 +55,7 @@ bool ShouldOfferLinkToText(const GURL& url) { +@@ -73,7 +73,7 @@ bool ShouldOfferLinkToText(const GURL& url) { bool SupportsLinkGenerationInIframe(GURL main_frame_url) { const std::unordered_set good_hosts = { @@ -28310,7 +28393,7 @@ diff --git a/components/sync/base/sync_util.h b/components/sync/base/sync_util.h diff --git a/components/sync/trusted_vault/standalone_trusted_vault_client.cc b/components/sync/trusted_vault/standalone_trusted_vault_client.cc --- a/components/sync/trusted_vault/standalone_trusted_vault_client.cc +++ b/components/sync/trusted_vault/standalone_trusted_vault_client.cc -@@ -34,7 +34,7 @@ constexpr base::TaskTraits kBackendTaskTraits = { +@@ -35,7 +35,7 @@ constexpr base::TaskTraits kBackendTaskTraits = { base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}; constexpr char kDefaultTrustedVaultServiceURL[] = @@ -28525,7 +28608,7 @@ diff --git a/components/webapps/browser/installable/installable_logging.cc b/com diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc --- a/components/wifi/wifi_service_win.cc +++ b/components/wifi/wifi_service_win.cc -@@ -1759,7 +1759,7 @@ bool WiFiServiceImpl::CreateProfile( +@@ -1760,7 +1760,7 @@ bool WiFiServiceImpl::CreateProfile( xml_writer.StartElement("WLANProfile"); xml_writer.AddAttribute( "xmlns", @@ -28557,7 +28640,7 @@ diff --git a/content/app/resources/README.txt b/content/app/resources/README.txt 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 -@@ -788,7 +788,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -789,7 +789,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:. @@ -28565,7 +28648,7 @@ diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/co + // See: http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=47141 // Instead of sending mouse events to the input method first, we now just // simply confirm all ongoing composition here. - if (type == NSLeftMouseDown || type == NSRightMouseDown || + if (type == NSEventTypeLeftMouseDown || type == NSEventTypeRightMouseDown || diff --git a/content/browser/attribution_reporting/PRESUBMIT.py b/content/browser/attribution_reporting/PRESUBMIT.py --- a/content/browser/attribution_reporting/PRESUBMIT.py +++ b/content/browser/attribution_reporting/PRESUBMIT.py @@ -28581,24 +28664,24 @@ diff --git a/content/browser/attribution_reporting/PRESUBMIT.py b/content/browse diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc -@@ -3188,7 +3188,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { +@@ -3190,7 +3190,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { const std::string schema_version_key = SchemaVersionKey::Encode(); Status s; -- if (storage_key_.origin().host() != "docs.google.com") { -+ if (storage_key_.origin().host() != "docs.9oo91e.qjz9zk") { +- if (bucket_locator_.storage_key.origin().host() != "docs.google.com") { ++ if (bucket_locator_.storage_key.origin().host() != "docs.9oo91e.qjz9zk") { s = ValidateBlobFiles(db_.get()); if (!s.ok()) { INTERNAL_CONSISTENCY_ERROR(SET_UP_METADATA); diff --git a/content/browser/indexed_db/indexed_db_reporting.cc b/content/browser/indexed_db/indexed_db_reporting.cc --- a/content/browser/indexed_db/indexed_db_reporting.cc +++ b/content/browser/indexed_db/indexed_db_reporting.cc -@@ -20,7 +20,7 @@ namespace { +@@ -21,7 +21,7 @@ namespace { - std::string StorageKeyToCustomHistogramSuffix( - const blink::StorageKey& storage_key) { -- if (storage_key.origin().host() == "docs.google.com") -+ if (storage_key.origin().host() == "docs.9oo91e.qjz9zk") + std::string BucketLocatorToCustomHistogramSuffix( + const storage::BucketLocator& bucket_locator) { +- if (bucket_locator.storage_key.origin().host() == "docs.google.com") ++ if (bucket_locator.storage_key.origin().host() == "docs.9oo91e.qjz9zk") return ".Docs"; return std::string(); } @@ -28629,7 +28712,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 -@@ -5260,7 +5260,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -5319,7 +5319,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -28638,7 +28721,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -5475,7 +5475,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -5533,7 +5533,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -28707,22 +28790,10 @@ diff --git a/content/browser/speech/speech_recognition_engine.cc b/content/brows const char kDownstreamUrl[] = "/down?"; const char kUpstreamUrl[] = "/up?"; -diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac.mm ---- a/content/browser/speech/tts_mac.mm -+++ b/content/browser/speech/tts_mac.mm -@@ -34,7 +34,7 @@ class TtsPlatformImplMac; - // two reasons: - // 1. To associate delegate callbacks with a particular utterance, - // without assuming anything undocumented about the protocol. --// 2. To work around http://openradar.appspot.com/radar?id=2854403, -+// 2. To work around http://openradar.8pp2p8t.qjz9zk/radar?id=2854403, - // where Nuance voices don't retain the utterance string and - // crash when trying to call willSpeakWord. - @interface SingleUseSpeechSynthesizer : NSSpeechSynthesizer { 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 -@@ -6909,7 +6909,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6891,7 +6891,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 " @@ -28734,28 +28805,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 -@@ -92,9 +92,9 @@ enum class RequestExtension { - namespace { - - constexpr char kGstaticAppId[] = -- "https://www.gstatic.com/securitykey/origins.json"; -+ "https://www.95tat1c.qjz9zk/securitykey/origins.json"; - constexpr char kGstaticCorpAppId[] = -- "https://www.gstatic.com/securitykey/a/google.com/origins.json"; -+ "https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json"; - - WebAuthenticationDelegate* GetWebAuthenticationDelegate() { - return GetContentClient()->browser()->GetWebAuthenticationDelegate(); -@@ -185,7 +185,7 @@ absl::optional ProcessAppIdExtension( - const GURL gstatic_appid(kGstaticAppId); - const GURL gstatic_corp_appid(kGstaticCorpAppId); - DCHECK(gstatic_appid.is_valid() && gstatic_corp_appid.is_valid()); -- if (caller_origin.DomainIs("google.com") && !appid_url.has_ref() && -+ if (caller_origin.DomainIs("9oo91e.qjz9zk") && !appid_url.has_ref() && - (appid_url.EqualsIgnoringRef(gstatic_appid) || - appid_url.EqualsIgnoringRef(gstatic_corp_appid))) { - return appid; -@@ -208,8 +208,8 @@ absl::optional MakeCredentialU2fAppIdOverride( +@@ -119,8 +119,8 @@ absl::optional MakeCredentialU2fAppIdOverride( return options->relying_party.id; } if (options->google_legacy_app_id_support && @@ -28763,13 +28813,13 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w - if (caller_origin.DomainIs("login.corp.google.com")) { + options->relying_party.id == "9oo91e.qjz9zk") { + if (caller_origin.DomainIs("login.corp.9oo91e.qjz9zk")) { - return kGstaticCorpAppId; + return WebAuthRequestSecurityChecker::kGstaticCorpAppId; } - return kGstaticAppId; + return WebAuthRequestSecurityChecker::kGstaticAppId; diff --git a/content/browser/webauth/client_data_json.cc b/content/browser/webauth/client_data_json.cc --- a/content/browser/webauth/client_data_json.cc +++ b/content/browser/webauth/client_data_json.cc -@@ -152,7 +152,7 @@ std::string BuildClientDataJson( +@@ -159,7 +159,7 @@ std::string BuildClientDataJson(ClientDataJsonParams params) { ret.append(R"(,"other_keys_can_be_added_here":")"); ret.append( "do not compare clientDataJSON against a template. See " @@ -28778,10 +28828,37 @@ diff --git a/content/browser/webauth/client_data_json.cc b/content/browser/webau } ret.append("}"); +diff --git a/content/browser/webauth/webauth_request_security_checker.cc b/content/browser/webauth/webauth_request_security_checker.cc +--- a/content/browser/webauth/webauth_request_security_checker.cc ++++ b/content/browser/webauth/webauth_request_security_checker.cc +@@ -309,7 +309,7 @@ WebAuthRequestSecurityChecker::ValidateAppIdExtension( + const GURL gstatic_appid(kGstaticAppId); + const GURL gstatic_corp_appid(kGstaticCorpAppId); + DCHECK(gstatic_appid.is_valid() && gstatic_corp_appid.is_valid()); +- if (caller_origin.DomainIs("google.com") && !appid_url.has_ref() && ++ if (caller_origin.DomainIs("9oo91e.qjz9zk") && !appid_url.has_ref() && + (appid_url.EqualsIgnoringRef(gstatic_appid) || + appid_url.EqualsIgnoringRef(gstatic_corp_appid))) { + *out_appid = appid; +diff --git a/content/browser/webauth/webauth_request_security_checker.h b/content/browser/webauth/webauth_request_security_checker.h +--- a/content/browser/webauth/webauth_request_security_checker.h ++++ b/content/browser/webauth/webauth_request_security_checker.h +@@ -42,9 +42,9 @@ class CONTENT_EXPORT WebAuthRequestSecurityChecker + // Legacy App IDs, which google.com origins are allowed to assert for + // compatibility reasons. + static constexpr char kGstaticAppId[] = +- "https://www.gstatic.com/securitykey/origins.json"; ++ "https://www.95tat1c.qjz9zk/securitykey/origins.json"; + static constexpr char kGstaticCorpAppId[] = +- "https://www.gstatic.com/securitykey/a/google.com/origins.json"; ++ "https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json"; + + explicit WebAuthRequestSecurityChecker(RenderFrameHost* host); + WebAuthRequestSecurityChecker(const WebAuthRequestSecurityChecker&) = delete; diff --git a/content/browser/webrtc/resources/webrtc_internals.js b/content/browser/webrtc/resources/webrtc_internals.js --- a/content/browser/webrtc/resources/webrtc_internals.js +++ b/content/browser/webrtc/resources/webrtc_internals.js -@@ -352,7 +352,7 @@ function addPeerConnection(data) { +@@ -344,7 +344,7 @@ function addPeerConnection(data) { 'compatibility issues on modern browsers. The standardized SDP ' + 'format, \"unified-plan\", has been used by default since M72 ' + '(January, 2019). Dropping support for Plan B is targeted for ' + @@ -28829,7 +28906,7 @@ diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/re diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -433,17 +433,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -434,17 +434,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -28853,7 +28930,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -462,7 +462,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -463,7 +463,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -28865,7 +28942,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -86,7 +86,7 @@ GURL GetStartupURL() { +@@ -85,7 +85,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -28877,7 +28954,7 @@ diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/b diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc -@@ -108,7 +108,7 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, +@@ -109,7 +109,7 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, if (!setuid_sandbox->IsSuidSandboxUpToDate()) { LOG(WARNING) << "You are using a wrong version of the setuid binary!\n" "Please read " @@ -29243,7 +29320,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 -@@ -626,7 +626,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, +@@ -625,7 +625,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. @@ -29252,7 +29329,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 = -@@ -778,7 +778,7 @@ void GaiaAuthFetcher::StartListAccounts() { +@@ -777,7 +777,7 @@ void GaiaAuthFetcher::StartListAccounts() { })"); CreateAndStartGaiaFetcher( " ", // To force an HTTP POST. @@ -29264,7 +29341,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc -@@ -24,9 +24,9 @@ namespace gaia { +@@ -26,9 +26,9 @@ namespace gaia { namespace { @@ -29473,7 +29550,7 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc -@@ -182,7 +182,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( +@@ -181,7 +181,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( trigger: "This request is triggered when a Chrome service requires an " "access token and a refresh token (e.g. Cloud Print, Chrome Remote " @@ -29482,7 +29559,7 @@ diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth "/OAuth2 for more information about the Google implementation of " "the OAuth 2.0 protocol." data: -@@ -336,9 +336,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, +@@ -335,9 +335,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, "The response is a dictionary of response values. The provided " "access token may have any scope, and basic results will be " "returned: issued_to, audience, scope, expires_in, access_type. In " @@ -29719,11 +29796,11 @@ diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/br --- a/headless/lib/browser/protocol/headless_handler.cc +++ b/headless/lib/browser/protocol/headless_handler.cc @@ -113,7 +113,7 @@ void HeadlessHandler::BeginFrame(Maybe in_frame_time_ticks, - callback->sendFailure( - Response::ServerError("Command is only supported with " - "--run-all-compositor-stages-before-draw, see " -- "https://goo.gl/3zHXhB for more info.")); -+ "https://goo.gl.qjz9zk/3zHXhB for more info.")); + callback->sendFailure(Response::ServerError( + "Command is only supported with " + "--run-all-compositor-stages-before-draw, see " +- "https://goo.gle/chrome-headless-rendering for more info.")); ++ "https://goo.gl.qjz9zke/chrome-headless-rendering for more info.")); return; } @@ -29775,7 +29852,7 @@ diff --git a/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests 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 -@@ -94,7 +94,7 @@ +@@ -97,7 +97,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -29835,7 +29912,7 @@ diff --git a/infra/config/generated/builders/try/android-pie-arm64-dbg/propertie 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 -@@ -6,7 +6,7 @@ +@@ -55,7 +55,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -30315,7 +30392,7 @@ diff --git a/infra/config/generated/builders/try/linux_chromium_dbg_ng/propertie 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 -@@ -3,7 +3,7 @@ +@@ -85,7 +85,7 @@ "enable_ats": true, "jobs": 150, "rpc_extra_params": "?prod", @@ -30632,7 +30709,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -344,7 +344,7 @@ Things to consider: +@@ -347,7 +347,7 @@ Things to consider: Welcome to Chromium @@ -30641,7 +30718,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st To help improve the app, Chromium sends usage and crash data to Google. BEGIN_LINKManageEND_LINK -@@ -372,7 +372,7 @@ Things to consider: +@@ -375,7 +375,7 @@ Things to consider: Data from Chromium sync @@ -30650,7 +30727,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -381,13 +381,13 @@ Things to consider: +@@ -384,13 +384,13 @@ Things to consider: You are signing in with an account managed by $1doe.com and giving its administrator control over your Chromium data. Your data will become permanently tied to this account. Signing out of Chromium will delete your data from this device, but it will remain stored in your Google Account. @@ -30666,7 +30743,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Chromium Page -@@ -468,7 +468,7 @@ Things to consider: +@@ -474,7 +474,7 @@ Things to consider: Choose whether to clear your Chromium data from this device or keep it @@ -30675,7 +30752,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Use Chromium Everywhere -@@ -528,7 +528,7 @@ Things to consider: +@@ -540,7 +540,7 @@ Things to consider: Your organization requires you to stay signed out of Chromium. @@ -30684,7 +30761,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Chromium can't check your passwords -@@ -564,10 +564,10 @@ Things to consider: +@@ -576,10 +576,10 @@ Things to consider: Allow Chromium Sign-in @@ -30709,7 +30786,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -344,7 +344,7 @@ Things to consider: +@@ -347,7 +347,7 @@ Things to consider: Welcome to Chrome @@ -30718,7 +30795,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a To help improve the app, Chrome sends usage and crash data to Google. BEGIN_LINKManageEND_LINK -@@ -372,7 +372,7 @@ Things to consider: +@@ -375,7 +375,7 @@ Things to consider: Data from Chrome sync @@ -30727,7 +30804,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -381,13 +381,13 @@ Things to consider: +@@ -384,13 +384,13 @@ Things to consider: You are signing in with an account managed by $1doe.com and giving its administrator control over your Chrome data. Your data will become permanently tied to this account. Signing out of Chrome will delete your data from this device, but it will remain stored in your Google Account. @@ -30743,7 +30820,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Google Chrome Page -@@ -468,7 +468,7 @@ Things to consider: +@@ -474,7 +474,7 @@ Things to consider: Choose whether to clear your Chrome data from this device or keep it @@ -30752,7 +30829,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Use Chrome Everywhere -@@ -528,7 +528,7 @@ Things to consider: +@@ -540,7 +540,7 @@ Things to consider: Your organization requires you to stay signed out of Chrome. @@ -30761,7 +30838,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Chrome can't check your passwords -@@ -564,10 +564,10 @@ Things to consider: +@@ -576,10 +576,10 @@ Things to consider: Allow Chrome Sign-in @@ -30806,7 +30883,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -1120,7 +1120,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1117,7 +1117,7 @@ See your search engine’s instructions for deleting your search history, if app You'll find your history here @@ -30815,7 +30892,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1271,7 +1271,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1268,7 +1268,7 @@ See your search engine’s instructions for deleting your search history, if app Manage Sync @@ -30824,7 +30901,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1734,7 +1734,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1743,7 +1743,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. @@ -30833,7 +30910,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Camera -@@ -1791,7 +1791,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1800,7 +1800,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Google Privacy Policy @@ -30842,7 +30919,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1863,7 +1863,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1872,7 +1872,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -30851,7 +30928,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -2235,7 +2235,7 @@ Follow the steps below: +@@ -2244,7 +2244,7 @@ Follow the steps below: 3. Select Chrome @@ -30860,7 +30937,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 -@@ -2564,7 +2564,7 @@ Try to use a unique password for every site. +@@ -2585,7 +2585,7 @@ Try to use a unique password for every site. Active $12 Days Ago @@ -30869,7 +30946,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Message sent. -@@ -2776,12 +2776,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -30884,7 +30961,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. -@@ -3092,10 +3092,10 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -3116,10 +3116,10 @@ Your data was encrypted with your sync passphrase on $2Sept Learn More @@ -30897,7 +30974,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Translate -@@ -3107,7 +3107,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -3131,7 +3131,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -30954,7 +31031,7 @@ diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_contr diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc -@@ -81,57 +81,57 @@ const char* const kChromeHostURLs[] = { +@@ -81,62 +81,62 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = std::size(kChromeHostURLs); const char kSyncGoogleDashboardURL[] = @@ -30982,6 +31059,13 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr - "https://support.google.com/chrome/answer/114836?p=settings_privacy&ios=1"; + "https://support.9oo91e.qjz9zk/chrome/answer/114836?p=settings_privacy&ios=1"; +-const char kTermsOfServiceURL[] = "https://policies.google.com/terms"; ++const char kTermsOfServiceURL[] = "https://policies.9oo91e.qjz9zk/terms"; + + const char kEmbeddedTermsOfServiceURL[] = +- "https://policies.google.com/terms/embedded"; ++ "https://policies.9oo91e.qjz9zk/terms/embedded"; + const char kDoNotTrackLearnMoreURL[] = - "https://support.google.com/chrome/answer/" + "https://support.9oo91e.qjz9zk/chrome/answer/" @@ -31029,7 +31113,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr const char kReadingListReferrerURL[] = "chrome://do_not_consider_for_most_visited/reading_list"; -@@ -139,4 +139,4 @@ const char kReadingListReferrerURL[] = +@@ -144,4 +144,4 @@ const char kReadingListReferrerURL[] = const char kChromeUIAboutNewTabURL[] = "about://newtab/"; const char kManagementLearnMoreURL[] = @@ -31038,7 +31122,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 -@@ -409,7 +409,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -407,7 +407,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -31047,7 +31131,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, -@@ -901,7 +901,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { +@@ -960,7 +960,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -31059,7 +31143,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ diff --git a/ios/chrome/browser/omaha/omaha_service.mm b/ios/chrome/browser/omaha/omaha_service.mm --- a/ios/chrome/browser/omaha/omaha_service.mm +++ b/ios/chrome/browser/omaha/omaha_service.mm -@@ -228,7 +228,7 @@ class XmlWrapper { +@@ -227,7 +227,7 @@ class XmlWrapper { // // // @@ -31170,7 +31254,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 -@@ -63,15 +63,15 @@ +@@ -62,15 +62,15 @@ namespace { // URL for 'Manage Activity' item in the Discover feed menu. const char kFeedManageActivityURL[] = @@ -31193,7 +31277,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 -@@ -1594,7 +1594,7 @@ bool IsSigninForcedByPolicy() { +@@ -1640,7 +1640,7 @@ bool IsSigninForcedByPolicy() { return; if (self.sceneState.appState.initStage == InitStageFirstRun) { // This case is possible when using force FRE flag and opening chrome @@ -31215,7 +31299,7 @@ diff --git a/ios/chrome/browser/ui/ntp/discover_feed_constants.mm b/ios/chrome/b diff --git a/ios/chrome/browser/ui/ntp/incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito_view.mm --- a/ios/chrome/browser/ui/ntp/incognito_view.mm +++ b/ios/chrome/browser/ui/ntp/incognito_view.mm -@@ -42,7 +42,7 @@ const CGFloat kLayoutGuideMinHeight = 12.0; +@@ -46,7 +46,7 @@ NSInteger kIncognitoSymbolImagePointSize = 72; // The URL for the the Learn More page shown on incognito new tab. // Taken from ntp_resource_cache.cc. const char kLearnMoreIncognitoUrl[] = @@ -31239,7 +31323,7 @@ diff --git a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm b/ios/chr diff --git a/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm b/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm --- a/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm +++ b/ios/chrome/browser/ui/ntp/revamped_incognito_view.mm -@@ -45,7 +45,7 @@ const CGFloat kLearnMoreHorizontalInnerMargin = 16.0; +@@ -49,7 +49,7 @@ NSInteger kIncognitoSymbolImagePointSize = 72; // The URL for the the Learn More page shown on incognito new tab. // Taken from ntp_resource_cache.cc. const char kLearnMoreIncognitoUrl[] = @@ -31275,7 +31359,7 @@ diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chro diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm --- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm +++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm -@@ -569,16 +569,16 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -586,16 +586,16 @@ typedef NS_ENUM(NSInteger, ItemType) { TableViewURLItem* item = [[TableViewURLItem alloc] initWithType:ItemTypeURLNoMetadata]; item.title = @"Google Design"; @@ -31295,7 +31379,7 @@ diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.m item.metadata = @"3:42 PM"; [model addItem:item toSectionWithIdentifier:SectionIdentifierURL]; -@@ -598,7 +598,7 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -615,7 +615,7 @@ typedef NS_ENUM(NSInteger, ItemType) { item = [[TableViewURLItem alloc] initWithType:ItemTypeURLWithBadgeImage]; item.title = @"Photos - Google Photos"; @@ -31581,7 +31665,7 @@ diff --git a/ios/testing/data/http_server_files/window_open.html b/ios/testing/d 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 -@@ -827,10 +827,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, +@@ -822,10 +822,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, // Reload with ORIGINAL_REQUEST_URL type should reload with the original // request url of the pending item, or last committed item if the pending item // doesn't exist. The reason is that a server side redirect may change the @@ -31634,7 +31718,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 -@@ -779,7 +779,7 @@ BOOL gChromeContextMenuEnabled = NO; +@@ -771,7 +771,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 @@ -33445,7 +33529,7 @@ diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -419,7 +419,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -416,7 +416,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { data: "The domain name that is being requested" destination: OTHER destination_other: "The user configured DNS over HTTPS server, which" @@ -33527,7 +33611,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 -@@ -2246,10 +2246,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2277,10 +2277,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -33590,7 +33674,7 @@ diff --git a/net/tools/testserver/testserver.py.vpython3 b/net/tools/testserver/ diff --git a/net/tools/transport_security_state_generator/transport_security_state_generator.cc b/net/tools/transport_security_state_generator/transport_security_state_generator.cc --- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc +++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc -@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const TransportSecurityStateEntries& entries) { +@@ -126,7 +126,7 @@ bool CheckDuplicateEntries(const TransportSecurityStateEntries& entries) { bool CheckNoopEntries(const TransportSecurityStateEntries& entries) { for (const auto& entry : entries) { if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) { @@ -33941,7 +34025,7 @@ diff --git a/remoting/host/linux/remoting_user_session.cc b/remoting/host/linux/ diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc -@@ -208,7 +208,7 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED"; +@@ -212,7 +212,7 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED"; // The default email domain for Googlers. Used to determine whether the host's // email address is Google-internal or not. @@ -34353,7 +34437,7 @@ diff --git a/testing/scripts/PRESUBMIT.py b/testing/scripts/PRESUBMIT.py diff --git a/testing/scripts/common.py b/testing/scripts/common.py --- a/testing/scripts/common.py +++ b/testing/scripts/common.py -@@ -283,7 +283,7 @@ def get_gtest_summary_passes(output): +@@ -285,7 +285,7 @@ def get_gtest_summary_passes(output): Only partially parses the format. This code is based on code in tools/build, specifically @@ -34365,7 +34449,7 @@ diff --git a/testing/scripts/common.py b/testing/scripts/common.py diff --git a/testing/test.gni b/testing/test.gni --- a/testing/test.gni +++ b/testing/test.gni -@@ -1090,7 +1090,7 @@ set_defaults("test") { +@@ -1095,7 +1095,7 @@ set_defaults("test") { if (is_mac) { # TODO(lgrey): Maybe restore this. # Don't strip tests for visibility into test crashes/hangs. @@ -34386,7 +34470,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -218,7 +218,7 @@ def run_command(argv, env=None, cwd=None, log=True): +@@ -219,7 +219,7 @@ def run_command(argv, env=None, cwd=None, log=True): """Run command and stream its stdout/stderr both to stdout. Also forward_signals to obey @@ -34395,7 +34479,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -237,7 +237,7 @@ def run_command_output_to_handle(argv, file_handle, env=None, cwd=None): +@@ -238,7 +238,7 @@ def run_command_output_to_handle(argv, file_handle, env=None, cwd=None): """Run command and stream its stdout/stderr both to |file_handle|. Also forward_signals to obey @@ -34404,7 +34488,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -277,7 +277,7 @@ def forward_signals(procs): +@@ -278,7 +278,7 @@ def forward_signals(procs): """Forwards unix's SIGTERM or win's CTRL_BREAK_EVENT to the given processes. This plays nicely with swarming's timeout handling. See also @@ -34428,7 +34512,7 @@ diff --git a/testing/trigger_scripts/PRESUBMIT.py b/testing/trigger_scripts/PRES diff --git a/testing/trigger_scripts/base_test_triggerer.py b/testing/trigger_scripts/base_test_triggerer.py --- a/testing/trigger_scripts/base_test_triggerer.py +++ b/testing/trigger_scripts/base_test_triggerer.py -@@ -148,11 +148,11 @@ class BaseTestTriggerer(object): # pylint: disable=useless-object-inheritance +@@ -151,11 +151,11 @@ class BaseTestTriggerer(object): # pylint: disable=useless-object-inheritance def list_bots(self, dimensions, @@ -34442,7 +34526,7 @@ diff --git a/testing/trigger_scripts/base_test_triggerer.py b/testing/trigger_sc """ args = [SWARMING_GO, 'bots', '-server', server] -@@ -170,11 +170,11 @@ class BaseTestTriggerer(object): # pylint: disable=useless-object-inheritance +@@ -173,11 +173,11 @@ class BaseTestTriggerer(object): # pylint: disable=useless-object-inheritance return json.load(f) def list_tasks(self, tags, limit=None, @@ -34495,7 +34579,7 @@ diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py 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 -@@ -648,7 +648,7 @@ +@@ -691,7 +691,7 @@ { "name": "Enabled_20210611", "params": { @@ -34504,16 +34588,16 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillAssistantInCctTriggering", -@@ -1378,7 +1378,7 @@ +@@ -1351,7 +1351,7 @@ { - "name": "EnabledWithAllowedWebsites_20210922", + "name": "Enabled_LazyEmbeds_20220418", "params": { -- "allowed_websites": "https://www.youtube.com|/embed,https://www.google.com|/maps/embed,https://platform.twitter.com|/embed,https://www.redditmedia.com|embed=true,https://www.instagram.com|/embed" -+ "allowed_websites": "https://www.y0u1ub3.qjz9zk|/embed,https://www.9oo91e.qjz9zk|/maps/embed,https://platform.twitter.com|/embed,https://www.redditmedia.com|embed=true,https://www.instagram.com|/embed" +- "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", -@@ -2951,7 +2951,7 @@ +@@ -3067,7 +3067,7 @@ "params": { "DnsHttpssvcControlDomainWildcard": "true", "DnsHttpssvcEnableQueryOverInsecure": "true", @@ -34522,7 +34606,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -6059,14 +6059,14 @@ +@@ -6193,14 +6193,14 @@ { "name": "Prefetch_2_20220214", "params": { @@ -34539,7 +34623,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "use_speculation_rules": "true" }, "enable_features": [ -@@ -6176,7 +6176,7 @@ +@@ -6310,7 +6310,7 @@ { "name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2", "params": { @@ -34548,7 +34632,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -6201,7 +6201,7 @@ +@@ -6335,7 +6335,7 @@ { "name": "EnabledExploreAndTrendingSegmentation2", "params": { @@ -34557,7 +34641,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "behavioural_targeting": "model_comparison", "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", "image_prefetch_mode": "top", -@@ -8123,7 +8123,7 @@ +@@ -8221,7 +8221,7 @@ { "name": "Enabled", "params": { @@ -35413,6 +35497,18 @@ diff --git a/third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetc _GROUP_NAME = 'com/android/tools' _MODULE_NAME = 'sdk-common' _FILE_EXT = 'jar' +diff --git a/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework/3pp/fetch.py +--- a/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework/3pp/fetch.py ++++ b/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework/3pp/fetch.py +@@ -12,7 +12,7 @@ import os + import re + import urllib.request + +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/apps/common/testing/accessibility/framework' + _MODULE_NAME = 'accessibility-test-framework' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_datatransport_transport_api/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_datatransport_transport_api/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_datatransport_transport_api/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_datatransport_transport_api/3pp/fetch.py @@ -35884,15 +35980,6 @@ diff --git a/third_party/blink/PRESUBMIT.py b/third_party/blink/PRESUBMIT.py for more details about the presubmit API built into gcl. """ -@@ -247,7 +247,7 @@ def CheckChangeOnCommit(input_api, output_api): - input_api.canned_checks.CheckTreeIsOpen( - input_api, - output_api, -- json_url='http://chromium-status.appspot.com/current?format=json')) -+ json_url='http://chromium-status.8pp2p8t.qjz9zk/current?format=json')) - results.extend( - input_api.canned_checks.CheckChangeHasDescription( - input_api, output_api)) diff --git a/third_party/blink/common/loader/record_load_histograms.cc b/third_party/blink/common/loader/record_load_histograms.cc --- a/third_party/blink/common/loader/record_load_histograms.cc +++ b/third_party/blink/common/loader/record_load_histograms.cc @@ -36039,7 +36126,7 @@ diff --git a/third_party/blink/renderer/build/scripts/update_css_ranking.py b/th diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/third_party/blink/renderer/core/css/remote_font_face_source.cc --- a/third_party/blink/renderer/core/css/remote_font_face_source.cc +++ b/third_party/blink/renderer/core/css/remote_font_face_source.cc -@@ -367,7 +367,7 @@ void RemoteFontFaceSource::BeginLoadIfNeeded() { +@@ -385,7 +385,7 @@ void RemoteFontFaceSource::BeginLoadIfNeeded() { mojom::ConsoleMessageSource::kIntervention, mojom::ConsoleMessageLevel::kInfo, "Slow network is detected. See " @@ -36093,112 +36180,10 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party auto* local_dom_window = DynamicTo(view()); if (local_dom_window && local_dom_window->GetFrame()) { Intervention::GenerateReport(local_dom_window->GetFrame(), id, message); -diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/third_party/blink/renderer/core/frame/deprecation/deprecation.cc ---- a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc -+++ b/third_party/blink/renderer/core/frame/deprecation/deprecation.cc -@@ -202,7 +202,7 @@ class DeprecationInfo final { - return DeprecationInfo( - DeprecationIssueType::kUntranslated, id, - String::Format( -- "%s See https://www.chromestatus.com/feature/%s for more details.", -+ "%s See https://www.ch40mestatus.qjz9zk/feature/%s for more details.", - details.Ascii().c_str(), chrome_status_id.Ascii().c_str())); - } - -@@ -229,7 +229,7 @@ class DeprecationInfo final { - DeprecationIssueType::kUntranslated, id, - String::Format( - "%s is deprecated and will be removed in %s. See " -- "https://www.chromestatus.com/feature/%s for more details.", -+ "https://www.ch40mestatus.qjz9zk/feature/%s for more details.", - feature.Ascii().c_str(), MilestoneString(milestone).Ascii().c_str(), - chrome_status_id.Ascii().c_str())); - } -@@ -246,7 +246,7 @@ class DeprecationInfo final { - DeprecationIssueType::kUntranslated, id, - String::Format( - "%s is deprecated and will be removed in %s. Please use %s " -- "instead. See https://www.chromestatus.com/feature/%s for more " -+ "instead. See https://www.ch40mestatus.qjz9zk/feature/%s for more " - "details.", - feature.Ascii().c_str(), MilestoneString(milestone).Ascii().c_str(), - replacement.Ascii().c_str(), chrome_status_id.Ascii().c_str())); -@@ -362,7 +362,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "getCurrentPosition() and watchPosition() no longer work on insecure " - "origins. To use this feature, you should consider switching your " - "application to a secure origin, such as HTTPS. See " -- "https://goo.gl/rStTGz for more details."); -+ "https://goo.gl.qjz9zk/rStTGz for more details."); - - case WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved: - case WebFeature::kGeolocationInsecureOriginIframeDeprecatedNotRemoved: -@@ -371,7 +371,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "getCurrentPosition() and watchPosition() are deprecated on insecure " - "origins. To use this feature, you should consider switching your " - "application to a secure origin, such as HTTPS. See " -- "https://goo.gl/rStTGz for more details."); -+ "https://goo.gl.qjz9zk/rStTGz for more details."); - - case WebFeature::kGetUserMediaInsecureOrigin: - case WebFeature::kGetUserMediaInsecureOriginIframe: -@@ -379,7 +379,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "GetUserMediaInsecureOrigin", kUnknown, - "getUserMedia() no longer works on insecure origins. To use this " - "feature, you should consider switching your application to a secure " -- "origin, such as HTTPS. See https://goo.gl/rStTGz for more details."); -+ "origin, such as HTTPS. See https://goo.gl.qjz9zk/rStTGz for more details."); - - case WebFeature::kMediaSourceAbortRemove: - return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -409,7 +409,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "NotificationInsecureOrigin", kUnknown, - "The Notification API may no longer be used from insecure origins. " - "You should consider switching your application to a secure origin, " -- "such as HTTPS. See https://goo.gl/rStTGz for more details."); -+ "such as HTTPS. See https://goo.gl.qjz9zk/rStTGz for more details."); - - case WebFeature::kNotificationPermissionRequestedIframe: - return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -552,7 +552,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "SharedArrayBufferConstructedWithoutIsolation", kM92, - String::Format("SharedArrayBuffer will require cross-origin " - "isolation as of %s. See " -- "https://developer.chrome.com/blog/" -+ "https://developer.ch40me.qjz9zk/blog/" - "enabling-shared-array-buffer/ for more details.", - MilestoneString(kM92).Ascii().c_str())); - -@@ -621,7 +621,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "V8SharedArrayBufferConstructedInExtensionWithoutIsolation", kM96, - "Extensions should opt into cross-origin isolation to continue using " - "SharedArrayBuffer. See " -- "https://developer.chrome.com/docs/extensions/mv3/" -+ "https://developer.ch40me.qjz9zk/docs/extensions/mv3/" - "cross-origin-isolation/."); - - case WebFeature::kCrossOriginWindowAlert: -@@ -659,7 +659,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "Constructing a VideoFrame without a timestamp is deprecated and " - "support will be removed in M99. Please provide a timestamp via " - "VideoFrameInit. See " -- "https://www.chromestatus.com/feature/5667793157488640 for more " -+ "https://www.ch40mestatus.qjz9zk/feature/5667793157488640 for more " - "details."); - - case WebFeature::kDocumentDomainSettingWithoutOriginAgentClusterHeader: -@@ -674,7 +674,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "along with the HTTP response for the document and " - "frames. See %s for more details.", - MilestoneString(kM106).Ascii().c_str(), -- "https://developer.chrome.com/blog/immutable-document-domain/")); -+ "https://developer.ch40me.qjz9zk/blog/immutable-document-domain/")); - - case WebFeature::kCrossOriginAccessBasedOnDocumentDomain: - return DeprecationInfo::WithDetails( 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 -@@ -1728,7 +1728,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1729,7 +1729,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 " @@ -36207,7 +36192,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } return false; } -@@ -1840,7 +1840,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1841,7 +1841,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 " @@ -36219,7 +36204,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 -@@ -280,7 +280,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -281,7 +281,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "