diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 1598696f..8edd943d 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -ffc51d2508554ada1582051f7917a6a2830d8376- \ No newline at end of file +b92e2ab3a2b6a09618543a73bb93f5f5d0576954- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index e29aae56..5f3d7da7 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -99.0.4844.77 \ No newline at end of file +100.0.4896.57 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index 82283783..8e189f2f 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -005c250c47b142587053167a94f3576b257f482b \ No newline at end of file +0f34819c0a4181afe12f832d7248059a108e86fb \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 53f47e9d..4dc9406b 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -34,7 +34,7 @@ ungoogled-chromium-Disable-Network-Time-Tracker.patch Disable-safe-browsing.patch Skip-the-first-run-and-remove-report-sending.patch Disable-all-promo-dialogs.patch -Remove-signin-and-data-saver-integrations.patch +Remove-signin-integrations.patch Hide-passwords-manager-link.patch Disable-update-scheduler.patch Add-English-only-search-engine.patch @@ -55,15 +55,22 @@ Add-bookmark-import-export-actions.patch Add-an-always-incognito-mode.patch Add-history-support-in-incognito-mode.patch Add-option-to-not-persist-tabs-across-sessions.patch +Add-a-proxy-configuration-page.patch +Move-some-account-settings-back-to-privacy-settings.patch +Remove-contextual-search-manager.patch +Add-custom-tab-intents-privacy-option.patch +Disable-FLoC-and-privacy-sandbox.patch +History-number-of-days-privacy-setting.patch Disable-fetching-of-all-field-trials.patch Disable-plugins-enumeration.patch net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +Add-flag-to-disable-IPv6-probes.patch profile-resetter-do-not-tick-send-settings-by-default.patch Do-not-build-API-keys-infobar.patch autofill-disable-autofill-download-manager.patch first_run-deactivate-autoupdate-globally.patch -translate-disable-fetching-of-translate-languages-from-server.patch +translate-disable-fetching-of-languages-from-server.patch kill-Vision.patch kill-Location-fall-back-to-system.patch kill-Auth.patch @@ -72,8 +79,6 @@ Remove-SMS-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 -Add-flag-to-disable-IPv6-probes.patch -Add-a-proxy-configuration-page.patch Use-4-tile-rows-never-show-logo.patch Disable-metrics-on-all-I-O-threads.patch Disable-various-metrics.patch @@ -120,8 +125,6 @@ Block-qjz9zk-or-trk-requests.patch Hardening-against-incognito-mode-detection.patch Remove-weblayer-dependency-on-Play-Services.patch Timezone-customization.patch -Move-some-account-settings-back-to-privacy-settings.patch -Remove-contextual-search-manager.patch Restore-Simplified-NTP-launch.patch Add-option-to-use-home-page-as-NTP.patch Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -157,7 +160,6 @@ Client-hints-overrides.patch Disable-AGSA-by-default.patch Allow-building-without-enable_reporting.patch Disable-lock-icon-in-address-bar-by-default.patch -Add-custom-tab-intents-privacy-option.patch Enable-share-intent.patch Site-setting-for-images.patch Bromite-auto-updater.patch @@ -167,7 +169,6 @@ Keep-empty-tabs-between-sessions.patch Disable-third-party-origin-trials.patch Never-use-HTTP-probes-for-connection-detection.patch Disable-Accessibility-service-by-default.patch -Disable-FLoC-and-privacy-sandbox.patch Disable-conversion-measurement-api.patch Restore-offline-indicator-v2-flag.patch Reintroduce-override_build_timestamp.patch @@ -181,11 +182,11 @@ Disable-minidump-upload-scheduling.patch Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch Disable-safety-check.patch Disable-all-predictors-code.patch -Allow-adding-search-engines-from-incognito-mode.patch +OpenSearch-allow-paths-and-incognito-mode.patch Enable-Certificate-Transparency.patch Update-i18n-zh_CN-support.patch -History-number-of-days-privacy-setting.patch Add-flag-for-save-data-header.patch Disable-UA-full-version.patch -Automated-domain-substitution.patch Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch +Disable-AsyncDNS-by-default.patch +Automated-domain-substitution.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 16b32c3d..05cea31d 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -82,7 +82,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 -@@ -2159,9 +2159,9 @@ +@@ -2232,9 +2232,9 @@ "expiry_milestone": 100 }, { @@ -150,7 +150,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -116,6 +116,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -117,6 +117,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !BUILDFLAG(IS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -160,7 +160,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -324,6 +327,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -330,6 +333,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] = kGpuFeatureStatusBlocklisted; } @@ -181,14 +181,14 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list disable_accelerated_av1_decode +disable_aimagereader disable_accelerated_h264_encode + disable_accelerated_hevc_decode disable_accelerated_vp8_decode - disable_accelerated_vp8_encode 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 -@@ -519,6 +519,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -544,6 +544,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } - #endif // defined(OS_MAC) + #endif // BUILDFLAG(IS_WIN) + // Disable AImageReader if the workaround is enabled. + if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { @@ -229,7 +229,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 -@@ -663,6 +663,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -679,6 +679,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 +243,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 -@@ -212,6 +212,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -214,6 +214,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 329b1abb..29fa852f 100644 --- a/build/patches/API-level-21-prevent-crash-on-download.patch +++ b/build/patches/API-level-21-prevent-crash-on-download.patch @@ -7,13 +7,21 @@ This patch ignores boolean settings for them and prevents the crash. See also: https://github.com/bromite/bromite/issues/1184 --- - .../internal/BundleToPersistableBundleConverter.java | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + .../BundleToPersistableBundleConverter.java | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java --- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java +++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java -@@ -85,9 +85,17 @@ class BundleToPersistableBundleConverter { +@@ -4,6 +4,7 @@ + + package org.chromium.components.background_task_scheduler.internal; + ++import android.os.Build; + import android.os.Bundle; + import android.os.PersistableBundle; + +@@ -82,9 +83,17 @@ class BundleToPersistableBundleConverter { if (obj == null) { persistableBundle.putString(key, null); } else if (obj instanceof Boolean) { diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 8dee9120..fdfc4c1d 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -54,9 +54,9 @@ 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 -@@ -643,6 +643,11 @@ aom_mem_sources = [ - - aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/float.asm" ] +@@ -650,6 +650,11 @@ aom_rc_interface_sources = [ + "//third_party/libaom/source/libaom/test/yuv_video_source.h", + ] +aom_ports_arm_sources = [ + "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c", diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index f06ec05b..1aa6d57c 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -18,7 +18,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 -@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -232,6 +232,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 +26,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; -@@ -980,6 +981,8 @@ public abstract class ChromeActivity +@@ -994,6 +995,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -38,7 +38,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 -@@ -93,6 +93,7 @@ public class ChromeCachedFlags { +@@ -94,6 +94,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 +49,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 -@@ -2792,7 +2792,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2979,7 +2979,11 @@ const FeatureEntry kFeatureEntries[] = { {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName, flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, @@ -93,7 +93,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -146,6 +146,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedLoadingPlaceholder, &feed::kInterestFeedContentSuggestions, &feed::kInterestFeedSpinnerAlwaysAnimate, @@ -101,7 +101,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -393,6 +394,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -402,6 +403,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -147,7 +147,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java -@@ -488,6 +488,8 @@ public class X509Util { +@@ -436,6 +436,8 @@ public class X509Util { return false; } @@ -156,7 +156,7 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j public static AndroidCertVerifyResult verifyServerCertificates(byte[][] certChain, String authType, String host) -@@ -568,6 +570,9 @@ public class X509Util { +@@ -516,6 +518,9 @@ public class X509Util { isIssuedByKnownRoot = isKnownRoot(root); } 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 e4b88940..f18b54ea 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 @@ -9,7 +9,7 @@ Subject: Add Alt+D hotkey to focus address bar diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -156,6 +156,8 @@ public class KeyboardShortcuts { +@@ -157,6 +157,8 @@ public class KeyboardShortcuts { KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON); addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar, KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON); diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 608c8eca..a8ddf2db 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -14,7 +14,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 -@@ -7638,6 +7638,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7948,6 +7948,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1451,6 +1451,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1530,6 +1530,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -42,7 +42,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 -@@ -836,6 +836,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -874,6 +874,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; @@ -68,8 +68,8 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -38,6 +38,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin; - // empty string. +@@ -37,6 +37,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin; + // Enables the ParsedCookie domain attribute to be the empty string. NET_EXPORT extern const base::Feature kCookieDomainAttributeEmptyString; +NET_EXPORT extern const base::Feature kIsCleartextPermitted; @@ -80,7 +80,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 -@@ -207,6 +207,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -209,6 +209,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 da0f4e4a..289318e8 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -51,8 +51,8 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res + chrome://proxy + - 500 - 800 + 1200 + 200 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -70,7 +70,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -56,6 +56,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -57,6 +57,7 @@ import org.chromium.ui.text.SpanApplier; public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener, INeedSnackbarManager { @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -278,6 +278,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -276,6 +276,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -93,7 +93,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -89,6 +89,12 @@ +@@ -88,6 +88,12 @@ @@ -181,7 +181,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -160,6 +160,8 @@ +@@ -158,6 +158,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -190,7 +190,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 -@@ -964,6 +966,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -970,6 +972,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -202,7 +202,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -160,7 +160,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -159,7 +159,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { SetValue( proxy_config::prefs::kProxy, std::make_unique(ProxyConfigDictionary::CreateFixedServers( @@ -635,7 +635,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 -@@ -280,6 +280,8 @@ static_library("ui") { +@@ -276,6 +276,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -647,15 +647,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 -@@ -53,6 +53,7 @@ +@@ -54,6 +54,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/predictors/predictors_ui.h" +#include "chrome/browser/ui/webui/proxy_config_ui.h" - #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" + #include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" -@@ -690,6 +691,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -741,6 +742,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1135,7 +1135,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"; -@@ -397,6 +399,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -403,6 +405,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1143,7 +1143,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -634,6 +637,7 @@ const char* const kChromeHostURLs[] = { +@@ -644,6 +647,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1154,7 +1154,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 -@@ -129,6 +129,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -128,6 +128,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index bcf2b654..75417fcc 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -18,7 +18,7 @@ Use a native flag (credits to @uazo) .../CustomTabActivityLifecycleUmaTracker.java | 25 --------- .../CustomTabIntentDataProvider.java | 5 +- .../browser/init/StartupTabPreloader.java | 14 +++-- - .../privacy/settings/PrivacySettings.java | 39 +++++++++++++- + .../privacy/settings/PrivacySettings.java | 40 +++++++++++++- .../browser/settings/SettingsActivity.java | 4 ++ .../tabbed_mode/TabbedRootUiCoordinator.java | 5 +- .../browser/tabmodel/ChromeTabCreator.java | 5 +- @@ -39,7 +39,7 @@ Use a native flag (credits to @uazo) .../browser/autocomplete_provider_client.h | 1 + .../omnibox/browser/base_search_provider.cc | 2 +- components/omnibox/browser/search_provider.cc | 4 +- - 31 files changed, 255 insertions(+), 39 deletions(-) + 31 files changed, 256 insertions(+), 39 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java @@ -138,7 +138,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; -@@ -1788,8 +1789,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1962,6 +1963,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -272,7 +272,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -49,6 +49,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -50,6 +50,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.version_info.VersionInfo; import org.chromium.device.mojom.ScreenOrientationLockType; @@ -282,7 +282,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; -@@ -731,7 +734,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -748,7 +751,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -333,7 +333,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab 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 -@@ -29,6 +29,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen +@@ -30,6 +30,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; @@ -345,7 +345,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; -@@ -45,7 +50,12 @@ import org.chromium.ui.text.SpanApplier; +@@ -46,7 +51,12 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -359,9 +359,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -107,6 +117,25 @@ public class PrivacySettings - (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); - canMakePaymentPref.setOnPreferenceChangeListener(this); +@@ -130,6 +140,11 @@ public class PrivacySettings + if (PREF_CAN_MAKE_PAYMENT.equals(key)) { + UserPrefs.get(Profile.getLastUsedRegularProfile()) + .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); ++ } else if (PREF_ALWAYS_INCOGNITO.equals(key)) { ++ AlwaysIncognitoLinkInterceptor.setAlwaysIncognito((boolean) newValue); ++ if (!mSnackbarManager.isShowing()) { ++ mSnackbarManager.showSnackbar(mSnackbar); ++ } + } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { + UserPrefs.get(Profile.getLastUsedRegularProfile()) + .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); +@@ -162,6 +177,25 @@ public class PrivacySettings + : R.string.text_off); + } + ChromeSwitchPreference alwaysIncognitoPref = + (ChromeSwitchPreference) findPreference(PREF_ALWAYS_INCOGNITO); @@ -383,20 +395,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + .setDuration(/*durationMs*/70000); + Preference preloadPagesPreference = findPreference(PREF_PRELOAD_PAGES); - preloadPagesPreference.setSummary( - PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext())); -@@ -136,6 +165,10 @@ public class PrivacySettings - if (PREF_CAN_MAKE_PAYMENT.equals(key)) { - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); -+ } else if (PREF_ALWAYS_INCOGNITO.equals(key)) { -+ AlwaysIncognitoLinkInterceptor.setAlwaysIncognito((boolean) newValue); -+ if (!mSnackbarManager.isShowing()) -+ mSnackbarManager.showSnackbar(mSnackbar); - } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); -@@ -220,4 +253,8 @@ public class PrivacySettings + if (preloadPagesPreference != null) { + preloadPagesPreference.setSummary( +@@ -220,4 +254,8 @@ public class PrivacySettings public void setBottomSheetController(BottomSheetController controller) { mBottomSheetController = controller; } @@ -408,17 +409,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 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 -@@ -55,6 +55,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; +@@ -57,6 +57,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; +import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager; 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.bottomsheet.BottomSheetController; -@@ -240,6 +241,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity - .getSiteSettingsDelegate()); - delegate.setSnackbarManager(mSnackbarManager); + import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; +@@ -250,6 +251,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity + if (fragment instanceof AdPersonalizationRemovedFragment) { + ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } + if (fragment instanceof INeedSnackbarManager) { + ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager); @@ -429,7 +430,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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 -@@ -119,6 +119,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; @@ -438,7 +439,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab /** * A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI. -@@ -489,11 +491,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -496,11 +498,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { // TODO(twellington): Supply TabModelSelector as well and move initialization earlier. if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { @@ -502,10 +503,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import org.chromium.base.Callback; import org.chromium.base.CallbackController; +import org.chromium.base.ContextUtils; + import org.chromium.base.FeatureList; import org.chromium.base.Log; import org.chromium.base.ObserverList; - import org.chromium.base.StreamUtil; -@@ -58,6 +59,8 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -59,6 +60,8 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.url.GURL; @@ -514,7 +515,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -@@ -722,6 +725,13 @@ public class TabPersistentStore { +@@ -741,6 +744,13 @@ public class TabPersistentStore { } } } @@ -646,7 +647,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c 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 -@@ -470,7 +470,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -479,7 +479,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -658,7 +659,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -1326,6 +1326,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1335,6 +1335,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -671,7 +672,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/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 -@@ -959,6 +959,19 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1110,6 +1110,19 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. @@ -694,7 +695,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn --- a/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn -@@ -22,6 +22,7 @@ android_resources("java_resources") { +@@ -24,6 +24,7 @@ android_resources("java_resources") { android_library("java") { sources = [ "java/src/org/chromium/chrome/browser/ui/messages/infobar/SimpleConfirmInfoBarBuilder.java", @@ -737,7 +738,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 -@@ -3277,6 +3277,10 @@ const char kShowCaretBrowsingDialog[] = +@@ -3284,6 +3284,10 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -751,7 +752,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 -@@ -1161,6 +1161,7 @@ extern const char kCartDiscountConsentShown[]; +@@ -1166,6 +1166,7 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index ab93a14b..91262d95 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -239,7 +239,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/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java -@@ -15,6 +15,11 @@ import org.chromium.chrome.browser.IntentHandler; +@@ -16,6 +16,11 @@ import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.SnackbarActivity; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.embedder_support.util.UrlConstants; @@ -251,7 +251,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager} -@@ -24,6 +29,7 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -25,6 +30,7 @@ import org.chromium.components.embedder_support.util.UrlConstants; public class BookmarkActivity extends SnackbarActivity { private BookmarkManager mBookmarkManager; @@ -259,10 +259,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm static final int EDIT_BOOKMARK_REQUEST_CODE = 14; public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId"; -@@ -40,8 +46,23 @@ public class BookmarkActivity extends SnackbarActivity { - if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL; +@@ -42,8 +48,23 @@ public class BookmarkActivity extends SnackbarActivity { mBookmarkManager.updateForUrl(url); setContentView(mBookmarkManager.getView()); + BackPressHelper.create(this, getOnBackPressedDispatcher(), mBookmarkManager::onBackPressed); + + final boolean listenToActivityState = true; + IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this); @@ -283,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm @Override protected void onDestroy() { super.onDestroy(); -@@ -56,6 +77,7 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -53,6 +74,7 @@ public class BookmarkActivity extends SnackbarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -291,7 +291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) { BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getStringExtra( INTENT_VISIT_BOOKMARK_ID)); -@@ -63,6 +85,14 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -60,6 +82,14 @@ public class BookmarkActivity extends SnackbarActivity { } } @@ -664,7 +664,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private BookmarkUndoController mUndoController; private final ObserverList mUIObservers = new ObserverList<>(); private BasicNativePage mNativePage; -@@ -352,6 +356,14 @@ public class BookmarkManager +@@ -351,6 +355,14 @@ public class BookmarkManager mNativePage = nativePage; } @@ -679,7 +679,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Current URL representing the UI state of bookmark manager. If no state has been shown * yet in this session, on phone return last used state stored in preference; on tablet -@@ -532,6 +544,16 @@ public class BookmarkManager +@@ -531,6 +543,16 @@ public class BookmarkManager } } @@ -734,9 +734,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.base.supplier.DestroyableObservableSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.app.ChromeActivity; + import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; - import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -54,7 +55,7 @@ import org.chromium.ui.util.ColorUtils; * Creates NativePage objects to show chrome-native:// URLs using the native Android view system. */ @@ -785,7 +785,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 -@@ -1837,6 +1837,13 @@ static_library("browser") { +@@ -1815,6 +1815,13 @@ static_library("browser") { "webid/federated_identity_sharing_permission_context_factory.h", ] @@ -799,7 +799,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3000,6 +3007,8 @@ static_library("browser") { +@@ -2986,6 +2993,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", @@ -808,7 +808,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "browser_process_platform_part_android.cc", "browser_process_platform_part_android.h", "chrome_browser_field_trials_mobile.cc", -@@ -3615,8 +3624,6 @@ static_library("browser") { +@@ -3599,8 +3608,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -820,7 +820,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 -@@ -7691,6 +7691,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7993,6 +7993,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -1332,7 +1332,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 -@@ -5530,6 +5530,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -5717,6 +5717,11 @@ const char kWebKioskEnableLacrosDescription[] = "Chrome OS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1347,7 +1347,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 -@@ -3218,6 +3218,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3325,6 +3325,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1360,7 +1360,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 -@@ -169,6 +169,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -171,6 +171,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kAppToWebAttribution, &kBackgroundThreadPool, &kBookmarkBottomSheet, @@ -1368,7 +1368,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseAllTabsModalDialog, &kCloseTabSuggestions, -@@ -860,6 +861,10 @@ const base::Feature kWebApkInstallCompleteNotification{ +@@ -872,6 +873,10 @@ const base::Feature kWebApkInstallCompleteNotification{ const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1382,7 +1382,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -159,6 +159,7 @@ extern const base::Feature kToolbarMicIphAndroid; +@@ -160,6 +160,7 @@ extern const base::Feature kToolbarMicIphAndroid; extern const base::Feature kToolbarUseHardwareBitmapDraw; extern const base::Feature kTrustedWebActivityLocationDelegation; extern const base::Feature kTrustedWebActivityNewDisclosure; @@ -1393,7 +1393,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -553,6 +553,7 @@ public abstract class ChromeFeatureList { +@@ -563,6 +563,7 @@ public abstract class ChromeFeatureList { "WebApkTrampolineOnInitialIntent"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; @@ -1462,7 +1462,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -101,6 +101,8 @@ public final class ChromePreferenceKeys { +@@ -103,6 +103,8 @@ public final class ChromePreferenceKeys { public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url"; public static final String BOOKMARKS_LAST_USED_PARENT = "enhanced_bookmark_last_used_parent_folder"; @@ -1471,7 +1471,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1064,6 +1066,7 @@ public final class ChromePreferenceKeys { +@@ -1015,6 +1017,7 @@ public final class ChromePreferenceKeys { ATTRIBUTION_PROVIDER_LAST_BROWSER_START, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1510,7 +1510,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 -@@ -382,6 +382,9 @@ static_library("common") { +@@ -383,6 +383,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1675,7 +1675,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui /** * Creates and starts an intent based on the passed fileTypes and capture value. * @param fileTypes MIME types requested (i.e. "image/*") -@@ -266,7 +273,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -265,7 +272,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick List missingPermissions = new ArrayList<>(); String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE; boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); @@ -1684,7 +1684,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (!window.hasPermission(storagePermission)) missingPermissions.add(storagePermission); } else { if (((mSupportsImageCapture && shouldShowImageTypes()) -@@ -294,7 +301,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -293,7 +300,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } // TODO(finnur): Remove once we figure out the cause of crbug.com/950024. @@ -1693,7 +1693,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions.length != requestPermissions.length) { throw new RuntimeException( String.format("Permissions arrays misaligned: %d != %d", -@@ -308,7 +315,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -307,7 +314,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } } @@ -1702,7 +1702,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui onFileNotSelected(); return; } -@@ -504,6 +511,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -503,6 +510,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType); } @@ -1710,7 +1710,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -811,6 +819,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -808,6 +816,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mFileTypes.size(); } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index de550314..e16953d8 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -123,7 +123,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 -@@ -92,6 +92,9 @@ public class PrivacySettings +@@ -93,6 +93,9 @@ public class PrivacySettings private ViewGroup mDialogContainer; private BottomSheetController mBottomSheetController; @@ -133,7 +133,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -188,6 +191,9 @@ public class PrivacySettings +@@ -163,6 +166,9 @@ public class PrivacySettings updatePreferences(); } @@ -143,10 +143,10 @@ 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(); -@@ -201,6 +207,14 @@ public class PrivacySettings - } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); +@@ -181,6 +187,14 @@ public class PrivacySettings + if (!mSnackbarManager.isShowing()) { + mSnackbarManager.showSnackbar(mSnackbar); + } + } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) { + SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); + sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue); @@ -155,10 +155,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); + sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue); + sharedPreferencesEditor.apply(); - } else if (PREF_ALWAYS_INCOGNITO.equals(key)) { - AlwaysIncognitoLinkInterceptor.setAlwaysIncognito((boolean) newValue); - if (!mSnackbarManager.isShowing()) -@@ -235,6 +249,16 @@ public class PrivacySettings + } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { + UserPrefs.get(Profile.getLastUsedRegularProfile()) + .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); +@@ -211,6 +225,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -194,7 +194,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 -@@ -4741,6 +4741,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 93f7e7d7..09425b53 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -15,8 +15,8 @@ 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 -@@ -153,6 +153,9 @@ - android:icon="@drawable/gm_filled_cardboard_24" /> +@@ -158,6 +158,9 @@ + android:icon="@drawable/ic_business" /> + -@@ -179,6 +182,9 @@ +@@ -184,6 +187,9 @@ @@ -57,7 +57,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 -@@ -209,6 +209,8 @@ import java.util.HashSet; +@@ -214,6 +214,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -66,7 +66,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. -@@ -2050,6 +2052,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2396,6 +2397,11 @@ public abstract class ChromeActivity return true; } @@ -117,7 +117,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 -@@ -3365,6 +3365,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 b366494c..ef45eccd 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -15,7 +15,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 -@@ -449,6 +449,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -464,6 +464,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -38,7 +38,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[] = { -@@ -3427,7 +3443,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3616,7 +3632,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -63,7 +63,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" -@@ -270,6 +272,15 @@ AutocompleteController::AutocompleteController( +@@ -272,6 +274,15 @@ AutocompleteController::AutocompleteController( search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 91a9df45..e5c28bad 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -14,7 +14,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 -@@ -3975,7 +3975,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4203,7 +4203,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1083,6 +1083,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1148,6 +1148,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; @@ -43,7 +43,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 -@@ -584,6 +584,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; +@@ -616,6 +616,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -72,24 +72,24 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -20,6 +20,11 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting", +@@ -20,6 +20,11 @@ namespace features { + const base::Feature kExpectCTReporting{"ExpectCTReporting", + base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kNetworkErrorLogging{"NetworkErrorLogging", - base::FEATURE_ENABLED_BY_DEFAULT}; + +// Enable save-data header separately (without enabled data reduction service). +const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader", + base::FEATURE_DISABLED_BY_DEFAULT}; + - // Enables the network service. - const base::Feature kNetworkService { - #if BUILDFLAG(IS_ANDROID) + const base::Feature kNetworkErrorLogging{"NetworkErrorLogging", + base::FEATURE_ENABLED_BY_DEFAULT}; + 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 -@@ -52,6 +52,8 @@ extern const base::FeatureParam +@@ -50,6 +50,8 @@ extern const base::Feature kDisableKeepaliveFetch; COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kDisableKeepaliveFetch; + extern const base::Feature kOpaqueResponseBlockingV01; +extern const base::Feature kEnableSaveDataHeader; +COMPONENT_EXPORT(NETWORK_CPP) 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 8cd317db..2119e371 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 @@ -19,7 +19,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 -@@ -842,6 +842,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -857,6 +857,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -3960,6 +3965,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4183,6 +4188,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1564,6 +1564,10 @@ const char kLogJsConsoleMessagesDescription[] = +@@ -1635,6 +1635,10 @@ const char kLogJsConsoleMessagesDescription[] = "Enable logging JS console messages in system logs, please note that they " "may contain PII."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -899,6 +899,9 @@ extern const char kLensCameraAssistedSearchDescription[]; +@@ -934,6 +934,9 @@ extern const char kLensCameraAssistedSearchDescription[]; extern const char kLogJsConsoleMessagesName[]; extern const char kLogJsConsoleMessagesDescription[]; 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 9cece546..77d060f2 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 @@ -13,7 +13,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 -@@ -2735,6 +2735,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2921,6 +2921,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebRtcRemoteEventLogName, flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)}, @@ -27,7 +27,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 -@@ -1170,6 +1170,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1238,6 +1238,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -42,7 +42,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 -@@ -656,6 +656,9 @@ extern const char kEnablePortalsDescription[]; +@@ -688,6 +688,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 036c575c..47d124f8 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,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 -@@ -4911,6 +4911,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5101,6 +5101,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -30,21 +30,21 @@ 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 -@@ -3010,6 +3010,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -3029,6 +3029,10 @@ const char kCCTResizableForThirdPartiesName[] = + const char kCCTResizableForThirdPartiesDescription[] = + "Enable bottom sheet Custom Tabs for third party apps."; - const char kContextualSearchSecondTapName[] = - "Contextual Search second tap triggering"; +const char kIPv6ProbingName[] = "Enable IPv6 probing."; +const char kIPv6ProbingDescription[] = + "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity."; + - const char kContextualSearchSecondTapDescription[] = - "Enables triggering on a second tap gesture even when Ranker would " - "normally suppress that tap."; + const char kChimeAlwaysShowNotificationDescription[] = + "A debug flag to always show Chime notification after receiving a payload."; + const char kChimeAlwaysShowNotificationName[] = 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 -@@ -716,6 +716,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -748,6 +748,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -100,7 +100,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -98,6 +98,7 @@ +@@ -102,6 +102,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -108,7 +108,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" -@@ -3918,8 +3919,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3906,8 +3907,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -127,7 +127,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -43,6 +43,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -36,6 +36,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kThrottleDelayable{"ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -141,9 +141,9 @@ 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 -@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging; +@@ -17,6 +17,8 @@ extern const base::Feature kExpectCTReporting; COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kNetworkService; + extern const base::Feature kNetworkErrorLogging; COMPONENT_EXPORT(NETWORK_CPP) +extern const base::Feature kIPv6Probing; +COMPONENT_EXPORT(NETWORK_CPP) diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index 6ba6cbdd..a8fa4648 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL 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 -@@ -2686,6 +2686,9 @@ const FeatureEntry::FeatureVariation kUseMultipleOverlaysVariations[] = { +@@ -2855,6 +2855,9 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = { // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and @@ -24,7 +24,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 -@@ -680,6 +680,10 @@ const char kDocumentTransitionSlowdownFactorName[] = +@@ -718,6 +718,10 @@ const char kDocumentTransitionSlowdownFactorName[] = const char kDocumentTransitionSlowdownFactorDescription[] = "Slows down animations triggered by documentTransition JavaScript API for " "debugging."; @@ -33,12 +33,12 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti +const char kDisableWebGLDescription[] = "Enable or disable all versions of WebGL"; + - const char kEnableAutofillAddressSavePromptName[] = - "Autofill Address Save Prompts"; + const char kEnableAutoDisableAccessibilityName[] = "Auto-disable Accessibility"; + const char kEnableAutoDisableAccessibilityDescription[] = 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 -@@ -375,6 +375,9 @@ extern const char kForceColorProfileSRGB[]; +@@ -398,6 +398,9 @@ extern const char kForceColorProfileSRGB[]; extern const char kForceColorProfileP3[]; extern const char kForceColorProfileColorSpin[]; extern const char kForceColorProfileSCRGBLinear[]; 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 1518a2fb..093c0959 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -11,7 +11,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 -@@ -2722,6 +2722,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2909,6 +2909,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebrtcCaptureMultiChannelApmName, flag_descriptions::kWebrtcCaptureMultiChannelApmDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebRtcEnableCaptureMultiChannelApm)}, @@ -24,7 +24,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 -@@ -3303,6 +3303,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3424,6 +3424,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -40,7 +40,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 -@@ -1907,6 +1907,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -1979,6 +1979,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOmniboxName[]; extern const char kQueryTilesOmniboxDescription[]; 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 2414f670..9c146143 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -18,7 +18,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 -@@ -6145,6 +6145,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6454,6 +6454,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -32,7 +32,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 -@@ -5321,6 +5321,9 @@ const char kDefaultCalculatorWebAppDescription[] = +@@ -5506,6 +5506,9 @@ const char kDefaultCalculatorWebAppDescription[] = "chrome app."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3223,6 +3223,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3330,6 +3330,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -99,6 +99,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if BUILDFLAG(IS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -82,8 +82,8 @@ 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 -@@ -299,6 +299,8 @@ extern const char kBigLittleSchedulingNetworkMainBigParam[]; - extern const char kBigLittleSchedulingGpuMainBigParam[]; +@@ -315,6 +315,8 @@ CONTENT_EXPORT extern const base::FeatureParam + kCompositorLockTimeout; #endif // BUILDFLAG(IS_ANDROID) +CONTENT_EXPORT extern const base::Feature kVibration; @@ -94,7 +94,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -90,6 +90,7 @@ class WebRuntimeFeatures { +@@ -88,6 +88,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation( bool); BLINK_PLATFORM_EXPORT static void EnableCacheInlineScriptCode(bool); @@ -125,7 +125,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 -@@ -190,6 +190,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -168,6 +168,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); } @@ -139,7 +139,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 -@@ -1608,6 +1608,10 @@ +@@ -1639,6 +1639,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index 8bc3f640..586a5de2 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -57,7 +57,7 @@ See also: https://github.com/bromite/bromite/pull/1427 diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni --- a/chrome/android/chrome_junit_test_java_sources.gni +++ b/chrome/android/chrome_junit_test_java_sources.gni -@@ -230,3 +230,7 @@ chrome_junit_test_java_sources = [ +@@ -235,3 +235,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java", ] @@ -69,9 +69,9 @@ diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/ diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome_test_java_sources.gni --- a/chrome/android/chrome_test_java_sources.gni +++ b/chrome/android/chrome_test_java_sources.gni -@@ -658,3 +658,9 @@ chrome_test_java_sources = [ - if (enable_feed_v2) { - chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java" ] +@@ -667,3 +667,9 @@ if (enable_feed_v2) { + if (is_java_debug) { + chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/payments/PaymentErrorStringsTest.java" ] } + +# Bromite tests @@ -181,8 +181,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.IntentHandler; - import org.chromium.chrome.browser.download.items.OfflineContentAggregatorFactory; -@@ -71,6 +72,10 @@ import org.chromium.ui.widget.Toast; + import org.chromium.chrome.browser.app.download.home.DownloadActivity; +@@ -72,6 +73,10 @@ import org.chromium.ui.widget.Toast; import java.io.File; @@ -193,7 +193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo /** * A class containing some utility static methods. */ -@@ -311,7 +316,16 @@ public class DownloadUtils { +@@ -312,7 +317,16 @@ public class DownloadUtils { // Offline pages isn't supported in Incognito. This should be checked before calling // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found // for incognito profile. @@ -222,7 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; -@@ -41,6 +42,12 @@ import org.chromium.ui.base.Clipboard; +@@ -43,6 +44,12 @@ import org.chromium.ui.base.Clipboard; import java.util.List; @@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Combines and manages the different UI components of browsing history. */ -@@ -213,7 +220,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve +@@ -229,7 +236,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve : mSelectableListLayout; } @@ -303,8 +303,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.app.ChromeActivity; + import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; - import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; @@ -243,7 +244,8 @@ public class NativePageFactory { String url, NativePage candidatePage, Tab tab, boolean isIncognito) { NativePage page; @@ -349,7 +349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.R; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -156,6 +157,11 @@ public class PrivacySettings +@@ -131,6 +132,11 @@ public class PrivacySettings phoneAsASecurityKey.setVisible( ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_AUTH_PHONE_SUPPORT)); @@ -361,7 +361,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updatePreferences(); } -@@ -172,10 +178,15 @@ public class PrivacySettings +@@ -148,10 +154,15 @@ public class PrivacySettings } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); @@ -377,8 +377,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onResume() { super.onResume(); -@@ -201,6 +212,13 @@ public class PrivacySettings - : R.string.text_off); +@@ -202,6 +213,13 @@ public class PrivacySettings + PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext())); } + ChromeSwitchPreference historyInIncognitoPref = @@ -432,7 +432,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalT diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -189,7 +189,10 @@ public class TabPersistentStore { +@@ -193,7 +193,10 @@ public class TabPersistentStore { @Override public void didCloseTab(Tab tab) { PersistedTabData.onTabClose(tab); @@ -1317,7 +1317,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -358,6 +361,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -330,6 +333,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1331,7 +1331,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return NULL; -@@ -365,6 +375,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -337,6 +347,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1381,7 +1381,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/browser/history/history_tab_helper_unittest.cc --- a/chrome/browser/history/history_tab_helper_unittest.cc +++ b/chrome/browser/history/history_tab_helper_unittest.cc -@@ -40,6 +40,9 @@ +@@ -42,6 +42,9 @@ using testing::NiceMock; @@ -1391,7 +1391,7 @@ diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/brow namespace { #if BUILDFLAG(IS_ANDROID) -@@ -49,6 +52,25 @@ class TestFeedApi : public feed::StubFeedApi { +@@ -51,6 +54,25 @@ class TestFeedApi : public feed::StubFeedApi { }; #endif @@ -1420,7 +1420,7 @@ diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/brow diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrome/browser/offline_pages/android/offline_page_bridge.cc --- a/chrome/browser/offline_pages/android/offline_page_bridge.cc +++ b/chrome/browser/offline_pages/android/offline_page_bridge.cc -@@ -49,6 +49,9 @@ +@@ -48,6 +48,9 @@ #include "content/public/browser/web_contents.h" #include "net/base/filename_util.h" #include "url/android/gurl_android.h" @@ -1430,7 +1430,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom using base::android::ConvertJavaStringToUTF8; using base::android::ConvertUTF16ToJavaString; -@@ -158,7 +161,13 @@ void ValidateFileCallback( +@@ -157,7 +160,13 @@ void ValidateFileCallback( int64_t offline_id, const GURL& url, const base::FilePath& file_path, @@ -1444,7 +1444,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom // If trusted, the launch url will be the http/https url of the offline // page. If the file path is content URI, directly open it. Otherwise, the // launch url will be the file URL pointing to the archive file of the offline -@@ -785,7 +794,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( +@@ -784,7 +793,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) { ValidateFileCallback(launch_location, j_callback_obj, offline_page->offline_id, offline_page->url, @@ -1453,7 +1453,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom return; } -@@ -795,7 +804,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( +@@ -794,7 +803,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( offline_page->file_size, offline_page->digest), base::BindOnce(&ValidateFileCallback, launch_location, j_callback_obj, offline_page->offline_id, offline_page->url, @@ -1611,7 +1611,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 -@@ -215,6 +215,7 @@ +@@ -214,6 +214,7 @@ #endif #if BUILDFLAG(IS_ANDROID) @@ -1619,7 +1619,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" -@@ -1329,6 +1330,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1338,6 +1339,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, // register incognito pref registry->RegisterBooleanPref(prefs::kAlwaysIncognitoEnabled, /*default_value=*/false); @@ -1732,7 +1732,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 -@@ -972,6 +972,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1123,6 +1123,12 @@ Your Google account may have other forms of browsing history like searches and a Your changes will take effect the next time you relaunch Bromite. @@ -1748,7 +1748,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3279,6 +3279,8 @@ const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; +@@ -3286,6 +3286,8 @@ const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #if BUILDFLAG(IS_ANDROID) const char kAlwaysIncognitoEnabled[] = "always_incognito_enabled"; @@ -1760,21 +1760,21 @@ 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 -@@ -1202,6 +1202,10 @@ extern const char kCorsNonWildcardRequestHeadersSupport[]; - extern const char kOriginAgentClusterDefaultEnabled[]; +@@ -1203,6 +1203,10 @@ extern const char kPrivacyGuideViewed[]; + + extern const char kCorsNonWildcardRequestHeadersSupport[]; - extern const char kForceMajorVersionToMinorPositionInUserAgent[]; -+ +#if BUILDFLAG(IS_ANDROID) +extern const char kIncognitoTabHistoryEnabled[]; +#endif - } // namespace prefs ++ + extern const char kOriginAgentClusterDefaultEnabled[]; - #endif // CHROME_COMMON_PREF_NAMES_H_ + extern const char kForceMajorVersionToMinorPositionInUserAgent[]; diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -4899,6 +4899,11 @@ test("unit_tests") { +@@ -5062,6 +5062,11 @@ test("unit_tests") { ] } 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 d9f113d8..769bf810 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -176,6 +180,9 @@ +@@ -181,6 +185,9 @@ @@ -53,7 +53,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 -@@ -68,6 +68,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; +@@ -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; @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -2067,6 +2069,8 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

Track prices @@ -385,7 +385,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc --- a/components/bookmarks/browser/bookmark_codec.cc +++ b/components/bookmarks/browser/bookmark_codec.cc -@@ -33,6 +33,7 @@ const char BookmarkCodec::kRootFolderNameKey[] = "bookmark_bar"; +@@ -33,6 +33,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar"; const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other"; // The value is left as 'synced' for historical reasons. const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced"; @@ -393,33 +393,33 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const char BookmarkCodec::kVersionKey[] = "version"; const char BookmarkCodec::kChecksumKey[] = "checksum"; const char BookmarkCodec::kIdKey[] = "id"; -@@ -62,7 +63,8 @@ BookmarkCodec::~BookmarkCodec() = default; +@@ -74,7 +75,8 @@ BookmarkCodec::~BookmarkCodec() = default; base::Value BookmarkCodec::Encode(BookmarkModel* model, - const std::string& sync_metadata_str) { + std::string sync_metadata_str) { return Encode(model->bookmark_bar_node(), model->other_node(), - model->mobile_node(), model->root_node()->GetMetaInfoMap(), + model->mobile_node(), model->tabs_collection_node(), + model->root_node()->GetMetaInfoMap(), - sync_metadata_str); + std::move(sync_metadata_str)); } -@@ -70,6 +72,7 @@ base::Value BookmarkCodec::Encode( +@@ -82,6 +84,7 @@ base::Value BookmarkCodec::Encode( const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, + const BookmarkNode* tabs_folder_node, const BookmarkNode::MetaInfoMap* model_meta_info_map, - const std::string& sync_metadata_str) { + std::string sync_metadata_str) { ids_reassigned_ = false; -@@ -79,6 +82,7 @@ base::Value BookmarkCodec::Encode( - roots.SetKey(kRootFolderNameKey, EncodeNode(bookmark_bar_node)); +@@ -103,6 +106,7 @@ base::Value BookmarkCodec::Encode( + roots.SetKey(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node)); roots.SetKey(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node)); roots.SetKey(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node)); + roots.SetKey(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node)); if (model_meta_info_map) roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map)); - base::Value main(base::Value::Type::DICTIONARY); -@@ -102,6 +106,7 @@ bool BookmarkCodec::Decode(const base::Value& value, + FinalizeChecksum(); +@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value& value, BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -427,7 +427,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar int64_t* max_id, std::string* sync_metadata_str) { ids_.clear(); -@@ -109,7 +114,8 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -126,7 +131,8 @@ bool BookmarkCodec::Decode(const base::Value& value, base::GUID::ParseLowercase(BookmarkNode::kBookmarkBarNodeGuid), base::GUID::ParseLowercase(BookmarkNode::kOtherBookmarksNodeGuid), base::GUID::ParseLowercase(BookmarkNode::kMobileBookmarksNodeGuid), @@ -437,7 +437,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar ids_reassigned_ = false; guids_reassigned_ = false; ids_valid_ = true; -@@ -117,12 +123,13 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -134,12 +140,13 @@ bool BookmarkCodec::Decode(const base::Value& value, stored_checksum_.clear(); InitializeChecksum(); bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node, @@ -452,7 +452,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar *max_id = maximum_id_ + 1; return success; } -@@ -172,6 +179,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( +@@ -189,6 +196,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -460,20 +460,20 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const base::Value& value, std::string* sync_metadata_str) { if (!value.is_dict()) -@@ -203,6 +211,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, - DecodeNode(*root_folder_value, nullptr, bb_node); - DecodeNode(*other_folder_value, nullptr, other_folder_node); +@@ -220,6 +228,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, + return false; + DecodeNode(*bb_value, nullptr, bb_node); + const base::DictionaryValue* tabs_folder_d_value = nullptr; + const base::Value* tabs_folder_value = + roots->FindDictKey(kTabsBookmarkFolderNameKey); + if (tabs_folder_value && tabs_folder_value->GetAsDictionary(&tabs_folder_d_value)) + DecodeNode(*tabs_folder_d_value, nullptr, tabs_folder_node); + - // Fail silently if we can't deserialize mobile bookmarks. We can't require - // them to exist in order to be backwards-compatible with older versions of - // chrome. -@@ -452,11 +466,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( + DecodeNode(*other_folder_value, nullptr, other_folder_node); + DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node); + +@@ -455,11 +469,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -491,15 +491,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h --- a/components/bookmarks/browser/bookmark_codec.h +++ b/components/bookmarks/browser/bookmark_codec.h -@@ -49,6 +49,7 @@ class BookmarkCodec { +@@ -48,6 +48,7 @@ class BookmarkCodec { base::Value Encode(const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, + const BookmarkNode* tabs_folder_node, const BookmarkNode::MetaInfoMap* model_meta_info_map, - const std::string& sync_metadata_str); + std::string sync_metadata_str); -@@ -61,6 +62,7 @@ class BookmarkCodec { +@@ -60,6 +61,7 @@ class BookmarkCodec { BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -507,7 +507,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark int64_t* max_node_id, std::string* sync_metadata_str); -@@ -106,6 +108,7 @@ class BookmarkCodec { +@@ -105,6 +107,7 @@ class BookmarkCodec { // Allows the BookmarkClient to read and a write a string blob from the JSON // file. That string captures the bookmarks sync metadata. static const char kSyncMetadata[]; @@ -515,7 +515,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark // Possible values for kTypeKey. static const char kTypeURL[]; -@@ -122,6 +125,7 @@ class BookmarkCodec { +@@ -121,6 +124,7 @@ class BookmarkCodec { bool DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -523,7 +523,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark const base::Value& value, std::string* sync_metadata_str); -@@ -133,7 +137,8 @@ class BookmarkCodec { +@@ -132,7 +136,8 @@ class BookmarkCodec { // Reassigns bookmark IDs for all nodes. void ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index e75a458b..0b13b9f0 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -41,7 +41,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 -@@ -2097,6 +2097,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2521,6 +2521,11 @@ public abstract class ChromeActivity return true; } @@ -110,8 +110,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 -@@ -299,6 +299,10 @@ CHAR_LIMIT guidelines: - Sign-in verifications +@@ -302,6 +302,10 @@ CHAR_LIMIT guidelines: + Chrome tips + diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 3103eaa4..126c0e62 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -3,72 +3,23 @@ Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add option to force tablet UI --- - .../java/res/xml/accessibility_preferences.xml | 5 +++++ - .../settings/AccessibilitySettings.java | 10 ++++++++++ .../preferences/ChromePreferenceKeys.java | 1 + .../preferences/LegacyChromePreferenceKeys.java | 1 + .../browser/omnibox/LocationBarCoordinator.java | 2 +- .../android/strings/android_chrome_strings.grd | 6 ++++++ .../toolbar/top/ToolbarControlContainer.java | 16 ---------------- - components/BUILD.gn | 4 ++-- + components/BUILD.gn | 6 +++--- + .../java/res/xml/accessibility_preferences.xml | 5 +++++ + .../accessibility/AccessibilitySettings.java | 10 ++++++++++ ui/android/BUILD.gn | 2 ++ .../org/chromium/ui/base/DeviceFormFactor.java | 5 +++++ - 10 files changed, 33 insertions(+), 19 deletions(-) + 10 files changed, 34 insertions(+), 20 deletions(-) -diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/android/java/res/xml/accessibility_preferences.xml ---- a/chrome/android/java/res/xml/accessibility_preferences.xml -+++ b/chrome/android/java/res/xml/accessibility_preferences.xml -@@ -29,6 +29,11 @@ - android:key="captions" - android:title="@string/accessibility_captions_title"/> - -+ -+ - - Turn off +@@ -1344,6 +1344,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 + + Open chromium in Tablet Mode @@ -112,8 +63,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + Force Tablet Mode + - - + + diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java @@ -143,28 +94,86 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -570,7 +570,7 @@ test("components_unittests") { +@@ -43,7 +43,7 @@ if (is_ios) { - # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. + # Omit Lacros because it allows //components to depend on //chrome, which in + # turn depends on //extensions. +-if (!is_chromeos_lacros) { ++if (!is_chromeos_lacros && !is_android) { + 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 +@@ -604,7 +604,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. - if (!is_chromeos_lacros) { + if (!is_chromeos_lacros && !is_android) { assert_no_deps = [ "//chrome/*" ] + assert_no_deps += disallowed_extension_deps_ } - -@@ -833,7 +833,7 @@ if (!is_ios) { - - # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. - # On other platforms, no components should depend on Chrome. +@@ -877,7 +877,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. - if (!is_chromeos_lacros) { + if (!is_chromeos_lacros && !is_android) { assert_no_deps = [ "//chrome/*" ] + assert_no_deps += disallowed_extension_deps_ } +diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml ++++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +@@ -25,6 +25,11 @@ + android:summary="@string/accessibility_tab_switcher_summary" + android:title="@string/accessibility_tab_switcher_title" /> ++ ++ + +diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java ++++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +@@ -27,6 +27,7 @@ public class AccessibilitySettings + public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility"; + public static final String PREF_CAPTIONS = "captions"; + ++ static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; + private TextScalePreference mTextScalePref; + private ChromeBaseCheckBoxPreference mForceEnableZoomPref; + private boolean mRecordFontSizeChangeOnStop; +@@ -85,6 +86,12 @@ public class AccessibilitySettings + getPreferenceScreen().removePreference(readerForAccessibilityPref); + } + ++ ChromeBaseCheckBoxPreference forceTabletUiPref = ++ (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI); ++ forceTabletUiPref.setChecked(SharedPreferencesManager.getInstance().readBoolean( ++ ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)); ++ forceTabletUiPref.setOnPreferenceChangeListener(this); ++ + ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref = + (ChromeBaseCheckBoxPreference) findPreference( + AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER); +@@ -133,6 +140,9 @@ public class AccessibilitySettings + mFontSizePrefs.setUserFontScaleFactor((Float) newValue); + } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { + mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); ++ } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) { ++ SharedPreferencesManager.getInstance().writeBoolean( ++ ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, (Boolean) newValue); + } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) { + if (mReaderForAccessibilityDelegate != null) { + mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue); diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -357,6 +357,8 @@ android_library("ui_no_recycler_view_java") { +@@ -358,6 +358,8 @@ android_library("ui_no_recycler_view_java") { ":ui_java_resources", ":ui_utils_java", "//base:base_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 f7dd7f1c..7e020a56 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 @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1199,8 +1199,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 f9e06876..caba40e3 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 @@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -500,6 +500,7 @@ public final class ChromePreferenceKeys { +@@ -451,6 +451,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"; @@ -143,7 +143,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 -@@ -100,6 +100,7 @@ public class LegacyChromePreferenceKeys { +@@ -90,6 +90,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -154,7 +154,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 -@@ -990,6 +990,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1159,6 +1159,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -193,7 +193,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 -@@ -366,6 +366,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -363,6 +363,7 @@ extern const char kSettingsShowOSBanner[]; extern const char kUsedPolicyCertificates[]; #endif // BUILDFLAG(IS_CHROMEOS) extern const char kShowHomeButton[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 3f6572cc..7e4800b9 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -10,7 +10,7 @@ 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 -@@ -62,6 +62,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; +@@ -65,6 +65,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -321,9 +322,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -331,9 +332,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Allow-adding-search-engines-from-incognito-mode.patch b/build/patches/Allow-adding-search-engines-from-incognito-mode.patch deleted file mode 100644 index 7181d6ae..00000000 --- a/build/patches/Allow-adding-search-engines-from-incognito-mode.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 6 Mar 2022 18:55:58 +0100 -Subject: Allow adding search engines from incognito mode - ---- - chrome/browser/ui/search_engines/search_engine_tab_helper.cc | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc ---- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc -+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc -@@ -129,8 +129,7 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument( - Profile* profile = - Profile::FromBrowserContext(web_contents()->GetBrowserContext()); - if (page_url != web_contents()->GetLastCommittedURL() || -- !TemplateURLFetcherFactory::GetForProfile(profile) || -- profile->IsOffTheRecord()) -+ !TemplateURLFetcherFactory::GetForProfile(profile)) - return; - - // If the current page is a form submit, find the last page that was not a --- -2.25.1 diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 48bbd514..e34c5c02 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -3,27 +3,27 @@ Date: Fri, 22 May 2020 22:43:27 -0400 Subject: Allow building without enable_reporting --- - .../devtools/protocol/network_handler.cc | 2 ++ - .../cross_origin_embedder_policy_reporter.cc | 3 ++- - .../net/cross_origin_opener_policy_reporter.cc | 16 +++++++--------- - .../renderer_host/render_frame_host_impl.cc | 2 ++ - .../web_package/signed_exchange_reporter.cc | 2 ++ - ...ntent_switch_dependent_feature_overrides.cc | 1 + - net/reporting/reporting_service.cc | 6 ++++++ - services/network/network_context.cc | 18 +----------------- - services/network/network_context.h | 11 ----------- - services/network/public/mojom/BUILD.gn | 1 - - .../network/public/mojom/network_context.mojom | 2 ++ - .../blink/renderer/core/frame/local_frame.cc | 3 +++ - .../blink/renderer/core/frame/local_frame.h | 6 +++--- - .../renderer/core/frame/reporting_context.cc | 9 +++++++++ - .../renderer/core/frame/reporting_context.h | 7 +++++-- - 15 files changed, 45 insertions(+), 44 deletions(-) + .../browser/devtools/protocol/network_handler.cc | 2 ++ + .../net/cross_origin_embedder_policy_reporter.cc | 4 +++- + .../net/cross_origin_opener_policy_reporter.cc | 16 +++++++--------- + content/browser/net/reporting_service_proxy.cc | 3 +++ + .../renderer_host/render_frame_host_impl.cc | 2 ++ + .../web_package/signed_exchange_reporter.cc | 2 ++ + ...content_switch_dependent_feature_overrides.cc | 1 + + net/reporting/reporting_service.cc | 6 ++++++ + services/network/network_context.h | 4 ++-- + services/network/public/mojom/BUILD.gn | 1 - + .../network/public/mojom/network_context.mojom | 2 ++ + .../blink/renderer/core/frame/local_frame.cc | 3 +++ + .../blink/renderer/core/frame/local_frame.h | 6 +++--- + .../renderer/core/frame/reporting_context.cc | 9 +++++++++ + .../renderer/core/frame/reporting_context.h | 7 +++++-- + 15 files changed, 50 insertions(+), 18 deletions(-) diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc -@@ -1285,6 +1285,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1290,6 +1290,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -31,7 +31,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { std::vector urls; base::queue queue; -@@ -1302,6 +1303,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1307,6 +1308,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { } return urls; } @@ -42,7 +42,15 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/content/browser/net/cross_origin_embedder_policy_reporter.cc --- a/content/browser/net/cross_origin_embedder_policy_reporter.cc +++ b/content/browser/net/cross_origin_embedder_policy_reporter.cc -@@ -112,6 +112,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( +@@ -4,6 +4,7 @@ + + #include "content/browser/net/cross_origin_embedder_policy_reporter.h" + ++#include "net/base/features.h" + #include "base/strings/string_piece.h" + #include "base/values.h" + #include "content/public/browser/storage_partition.h" +@@ -112,6 +113,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( kType, context_url_, blink::mojom::ReportBody::New(std::move(list)))); } if (endpoint) { @@ -50,7 +58,7 @@ diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/cont base::DictionaryValue body_to_pass; for (const auto& pair : body) { body_to_pass.SetString(pair.first, pair.second); -@@ -123,7 +124,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( +@@ -123,7 +125,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( kType, *endpoint, context_url_, reporting_source_, network_isolation_key_, /*user_agent=*/absl::nullopt, std::move(body_to_pass)); @@ -97,15 +105,15 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { switch (coop_value) { case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone: -@@ -56,6 +49,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { - return "same-origin-plus-coep"; +@@ -59,6 +52,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { + return "same-origin-allow-popups-plus-coep"; } } +#endif FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) { FrameTreeNode* opener = frame->original_opener(); -@@ -226,6 +220,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( +@@ -229,6 +223,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( network::mojom::SourceLocationPtr source_location, const std::string& reported_window_url, const std::string& initial_popup_url) const { @@ -113,7 +121,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) -@@ -274,12 +269,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( +@@ -277,12 +272,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, absl::nullopt, std::move(body)); @@ -128,7 +136,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( -@@ -288,6 +285,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport( +@@ -291,6 +288,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, /*user_agent=*/absl::nullopt, std::move(body)); @@ -136,10 +144,37 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten } } // namespace content +diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/net/reporting_service_proxy.cc +--- a/content/browser/net/reporting_service_proxy.cc ++++ b/content/browser/net/reporting_service_proxy.cc +@@ -11,6 +11,7 @@ + #include "base/memory/ref_counted.h" + #include "base/unguessable_token.h" + #include "base/values.h" ++#include "net/base/features.h" + #include "content/browser/service_worker/service_worker_host.h" + #include "content/browser/worker_host/dedicated_worker_host.h" + #include "content/browser/worker_host/shared_worker_host.h" +@@ -173,6 +174,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { + const std::string& group, + const std::string& type, + std::unique_ptr body) { ++#if BUILDFLAG(ENABLE_REPORTING) + auto* rph = RenderProcessHost::FromID(render_process_id_); + if (!rph) + return; +@@ -180,6 +182,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { + type, group, url, reporting_source_, network_isolation_key_, + /*user_agent=*/absl::nullopt, + base::Value::FromUniquePtrValue(std::move(body))); ++#endif + } + + const int render_process_id_; 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 -@@ -10883,6 +10883,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( +@@ -11018,6 +11018,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( void RenderFrameHostImpl::MaybeGenerateCrashReport( base::TerminationStatus status, int exit_code) { @@ -147,7 +182,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b if (!last_committed_url_.SchemeIsHTTPOrHTTPS()) return; -@@ -10932,6 +10933,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -11067,6 +11068,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), absl::nullopt /* user_agent */, std::move(body)); @@ -158,7 +193,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc --- a/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc -@@ -125,6 +125,7 @@ bool ShouldDowngradeReport(const char* result_string, +@@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string, void ReportResult(int frame_tree_node_id, network::mojom::SignedExchangeReportPtr report, const net::NetworkIsolationKey& network_isolation_key) { @@ -166,7 +201,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b FrameTreeNode* frame_tree_node = FrameTreeNode::GloballyFindByID(frame_tree_node_id); if (!frame_tree_node) -@@ -139,6 +140,7 @@ void ReportResult(int frame_tree_node_id, +@@ -141,6 +142,7 @@ void ReportResult(int frame_tree_node_id, DCHECK(partition); partition->GetNetworkContext()->QueueSignedExchangeReport( std::move(report), network_isolation_key); @@ -201,61 +236,26 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic DCHECK(initialized_); context_->cache()->AddReport( reporting_source, network_isolation_key, sanitized_url, user_agent, -diff --git a/services/network/network_context.cc b/services/network/network_context.cc ---- a/services/network/network_context.cc -+++ b/services/network/network_context.cc -@@ -1165,25 +1165,9 @@ void NetworkContext::SetDocumentReportingEndpoints( - - void NetworkContext::SendReportsAndRemoveSource( - const base::UnguessableToken& reporting_source) { -- NOTREACHED(); -+ // NOTREACHED(); removed for build in debug - } - --void NetworkContext::QueueReport( -- const std::string& type, -- const std::string& group, -- const GURL& url, -- const absl::optional& reporting_source, -- const net::NetworkIsolationKey& network_isolation_key, -- const absl::optional& user_agent, -- base::Value body) { -- NOTREACHED(); --} -- --void NetworkContext::QueueSignedExchangeReport( -- mojom::SignedExchangeReportPtr report, -- const net::NetworkIsolationKey& network_isolation_key) { -- NOTREACHED(); --} - #endif // BUILDFLAG(ENABLE_REPORTING) - - void NetworkContext::ClearDomainReliability( 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 -@@ -423,17 +423,6 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext - const base::flat_map& endpoints) override; - void SendReportsAndRemoveSource( - const base::UnguessableToken& reporting_source) override; -- void QueueReport( -- const std::string& type, -- const std::string& group, -- const GURL& url, -- const absl::optional& reporting_source, -- const net::NetworkIsolationKey& network_isolation_key, -- const absl::optional& user_agent, +@@ -439,10 +439,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + const absl::optional& reporting_source, + const net::NetworkIsolationKey& network_isolation_key, + const absl::optional& user_agent, - base::Value body) override; -- void QueueSignedExchangeReport( -- mojom::SignedExchangeReportPtr report, ++ base::Value body); + void QueueSignedExchangeReport( + mojom::SignedExchangeReportPtr report, - const net::NetworkIsolationKey& network_isolation_key) override; ++ const net::NetworkIsolationKey& network_isolation_key); void AddDomainReliabilityContextForTesting( const GURL& origin, const GURL& upload_url, diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn -@@ -959,7 +959,6 @@ mojom("mojom") { +@@ -963,7 +963,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -266,7 +266,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 -@@ -1005,6 +1005,7 @@ interface NetworkContext { +@@ -1037,6 +1037,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -274,7 +274,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1018,6 +1019,7 @@ interface NetworkContext { +@@ -1050,6 +1051,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 +293,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" -@@ -2281,9 +2282,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2274,9 +2275,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -319,7 +319,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -542,9 +542,9 @@ class CORE_EXPORT LocalFrame final +@@ -547,9 +547,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); @@ -342,7 +342,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" -@@ -54,7 +55,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext"; +@@ -53,7 +54,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext"; ReportingContext::ReportingContext(ExecutionContext& context) : Supplement(context), execution_context_(context), @@ -352,7 +352,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ receiver_(this, &context) {} // static -@@ -118,7 +121,9 @@ void ReportingContext::Trace(Visitor* visitor) const { +@@ -117,7 +120,9 @@ void ReportingContext::Trace(Visitor* visitor) const { visitor->Trace(observers_); visitor->Trace(report_buffer_); visitor->Trace(execution_context_); @@ -362,7 +362,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ visitor->Trace(receiver_); Supplement::Trace(visitor); } -@@ -140,6 +145,7 @@ void ReportingContext::CountReport(Report* report) { +@@ -139,6 +144,7 @@ void ReportingContext::CountReport(Report* report) { UseCounter::Count(execution_context_, feature); } @@ -370,7 +370,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const HeapMojoRemote& ReportingContext::GetReportingService() const { if (!reporting_service_.is_bound()) { -@@ -149,6 +155,7 @@ ReportingContext::GetReportingService() const { +@@ -148,6 +154,7 @@ ReportingContext::GetReportingService() const { } return reporting_service_; } @@ -378,7 +378,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ void ReportingContext::NotifyInternal(Report* report) { // Buffer the report. -@@ -171,6 +178,7 @@ void ReportingContext::NotifyInternal(Report* report) { +@@ -170,6 +177,7 @@ void ReportingContext::NotifyInternal(Report* report) { void ReportingContext::SendToReportingAPI(Report* report, const String& endpoint) const { @@ -386,7 +386,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const String& type = report->type(); if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation || type == ReportType::kPermissionsPolicyViolation || -@@ -226,6 +234,7 @@ void ReportingContext::SendToReportingAPI(Report* report, +@@ -225,6 +233,7 @@ void ReportingContext::SendToReportingAPI(Report* report, url, endpoint, body->featureId(), body->disposition(), body->message(), body->sourceFile(), line_number, column_number); } diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 68588b1d..32552f93 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -3,27 +3,14 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200 Subject: Allow playing audio in background --- - .../public/platform/media/web_media_player_impl.h | 3 +++ .../renderer/platform/media/web_media_player_impl.cc | 12 +++++++++++- + .../renderer/platform/media/web_media_player_impl.h | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) -diff --git a/third_party/blink/public/platform/media/web_media_player_impl.h b/third_party/blink/public/platform/media/web_media_player_impl.h ---- a/third_party/blink/public/platform/media/web_media_player_impl.h -+++ b/third_party/blink/public/platform/media/web_media_player_impl.h -@@ -163,6 +163,9 @@ class BLINK_PLATFORM_EXPORT WebMediaPlayerImpl - bool HasVideo() const override; - bool HasAudio() const override; - -+ // True is has video and it's frame size is not zero -+ bool HasVideoNonEmptySize() const; -+ - void EnabledAudioTracksChanged( - const WebVector& enabledTrackIds) override; - void SelectedVideoTrackChanged( 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 -@@ -1188,6 +1188,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1211,6 +1211,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -36,7 +23,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()); -@@ -3559,7 +3565,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3581,7 +3587,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. @@ -49,5 +36,18 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc return false; if (using_media_player_renderer_ && +diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h +--- a/third_party/blink/renderer/platform/media/web_media_player_impl.h ++++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h +@@ -190,6 +190,9 @@ class BLINK_PLATFORM_EXPORT WebMediaPlayerImpl + bool HasVideo() const override; + bool HasAudio() const override; + ++ // True is has video and it's frame size is not zero ++ bool HasVideoNonEmptySize() const; ++ + void EnabledAudioTracksChanged( + const WebVector& enabledTrackIds) override; + void SelectedVideoTrackChanged( -- 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 9f51f8cb..1848eab6 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -9,7 +9,7 @@ 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 -@@ -448,8 +448,8 @@ const base::Feature kConditionalTabStripAndroid{ +@@ -457,8 +457,8 @@ const base::Feature kConditionalTabStripAndroid{ const base::Feature kCastDeviceFilter{"CastDeviceFilter", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index b8525058..222151dd 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -3,7 +3,7 @@ Date: Fri, 21 Aug 2020 13:41:07 +0200 Subject: Automated domain substitution --- - PRESUBMIT.py | 66 +- + PRESUBMIT.py | 70 +- .../cts_config/webview_cts_gcs_path.json | 20 +- android_webview/tools/generate_flag_labels.py | 2 +- android_webview/tools/record_netlog.py | 6 +- @@ -11,33 +11,39 @@ Subject: Automated domain substitution android_webview/tools/update_cts.py | 4 +- ash/accelerators/accelerator_notifications.cc | 2 +- ash/app_list/PRESUBMIT.py | 2 +- - ash/ash_strings.grd | 24 +- + ash/ash_strings.grd | 26 +- ash/assistant/PRESUBMIT.py | 2 +- ash/assistant/assistant_setup_controller.cc | 2 +- ash/assistant/util/deep_link_util.cc | 16 +- .../device_activity_controller.cc | 2 +- ash/components/drivefs/drivefs_auth.cc | 2 +- - .../fwupd/firmware_update_manager.cc | 2 +- .../simple_geolocation_provider.cc | 2 +- ash/components/phonehub/url_constants.cc | 2 +- ash/components/timezone/timezone_request.cc | 2 +- .../trial_group/trial_group_checker.cc | 2 +- + ash/constants/url_constants.cc | 6 +- .../fast_pair/device_metadata_fetcher.cc | 2 +- .../fast_pair/footprints_fetcher.cc | 4 +- + .../ui/fast_pair/fast_pair_presenter_impl.cc | 4 +- ash/resources/PRESUBMIT.py | 4 +- ash/services/ime/constants.cc | 2 +- ...pcie_peripheral_notification_controller.cc | 2 +- - .../usb_peripheral_notification_controller.cc | 2 +- - ash/webui/camera_app_ui/camera_app_ui.cc | 2 +- + .../usb_peripheral_notification_controller.cc | 4 +- + ash/wallpaper/wallpaper_controller_impl.cc | 2 +- + .../camera_app_ui/camera_app_untrusted_ui.cc | 2 +- .../resources/js/lib/analytics.js | 14 +- .../resources/strings/camera_strings.grd | 2 +- - .../diagnostics_ui/resources/network_card.js | 4 +- + .../resources/keyboard_tester.html | 2 +- + .../diagnostics_ui/resources/network_card.js | 2 +- .../resources/routine_section.js | 2 +- .../help_app_kids_magazine_untrusted_ui.cc | 2 +- ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- + .../os_feedback_ui/resources/fake_data.js | 10 +- ...untrusted_personalization_app_ui_config.cc | 2 +- + .../print_management/resources/PRESUBMIT.py | 2 +- .../projector_app/projector_xhr_sender.cc | 8 +- - .../projector_app/untrusted_projector_ui.cc | 8 +- + .../projector_app/untrusted_projector_ui.cc | 12 +- + ash/webui/scanning/resources/PRESUBMIT.py | 2 +- .../scanning/resources/scanning_app.html | 2 +- ash/webui/scanning/resources/scanning_app.js | 2 +- ...boarding_enter_rsu_wp_disable_code_page.js | 2 +- @@ -101,9 +107,9 @@ Subject: Automated domain substitution .../javatest_manifest_config_delta.json | 12 +- .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- - chrome/app/chromium_strings.grd | 14 +- - chrome/app/generated_resources.grd | 246 +- - chrome/app/google_chrome_strings.grd | 14 +- + chrome/app/chromium_strings.grd | 22 +- + chrome/app/generated_resources.grd | 252 +- + chrome/app/google_chrome_strings.grd | 22 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- chrome/browser/about_flags.cc | 4 +- @@ -128,9 +134,9 @@ Subject: Automated domain substitution .../eche_app_notification_controller.cc | 2 +- .../enhanced_network_tts_constants.cc | 2 +- .../file_manager/file_manager_string_util.cc | 12 +- - .../first_run/drive_first_run_controller.cc | 4 +- chrome/browser/ash/hats/hats_dialog.cc | 2 +- .../assistive_suggester_client_filter.cc | 16 +- + .../ash/input_method/ime_rules_config.h | 6 +- .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../ash/login/gaia_reauth_token_fetcher.cc | 2 +- .../ash/login/marketing_backend_connector.cc | 4 +- @@ -149,7 +155,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 | 10 +- + .../wallpaper_handlers/wallpaper_handlers.cc | 16 +- .../ash/web_applications/terminal_source.cc | 4 +- .../autofill/autofill_gstatic_reader.cc | 4 +- .../browser_switcher_service.cc | 2 +- @@ -162,7 +168,6 @@ Subject: Automated domain substitution .../browser/chrome_browser_application_mac.mm | 2 +- .../file_manager/private_api_misc.cc | 2 +- .../dlp/dlp_clipboard_bubble_constants.h | 2 +- - .../data_reduction_proxy_chrome_settings.cc | 4 +- chrome/browser/devtools/url_constants.cc | 4 +- .../mixed_content_download_blocking.cc | 2 +- .../connectors/connectors_service.cc | 4 +- @@ -181,8 +186,7 @@ Subject: Automated domain substitution chrome/browser/extensions/install_signer.cc | 2 +- .../chrome_extension_downloader_factory.cc | 2 +- .../updater/chrome_update_client_config.cc | 2 +- - .../floc_remote_permission_service.cc | 2 +- - chrome/browser/flag_descriptions.cc | 10 +- + chrome/browser/flag_descriptions.cc | 14 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- .../lacros/lacros_startup_infobar_delegate.cc | 4 +- @@ -201,6 +205,7 @@ Subject: Automated domain substitution .../tachyon_ice_config_fetcher.cc | 12 +- .../modules/drive/drive_service.cc | 8 +- .../modules/photos/photos_service.cc | 6 +- + .../prediction/prediction_manager.cc | 8 +- ...rvice_worker_page_load_metrics_observer.cc | 2 +- .../performance_hints_features.cc | 2 +- .../quiet_permission_prompt_model_android.cc | 2 +- @@ -240,7 +245,7 @@ Subject: Automated domain substitution .../edu_coexistence/edu_coexistence_ui.js | 2 +- .../chromeos/emoji_picker/icons.html | 2 +- .../resources/chromeos/emulator/icons.html | 2 +- - .../input_method/google_xkb_manifest.json | 10 +- + .../input_method/google_xkb_manifest.json | 8 +- .../resources/chromeos/login/debug/debug.js | 2 +- .../screens/common/arc_terms_of_service.js | 4 +- .../screens/common/consolidated_consent.js | 2 +- @@ -267,17 +272,12 @@ Subject: Automated domain substitution .../query_tiles/query_tiles_internals.js | 4 +- .../resources/media/mei_preload/manifest.json | 2 +- chrome/browser/resources/media/webrtc_logs.js | 2 +- - .../shared/nearby_contact_visibility.js | 2 +- .../shared/nearby_shared_icons.html | 4 +- .../nearby_shared_share_type_icons.html | 2 +- .../resources/net_internals/index.html | 6 +- .../network_speech_synthesis/manifest.json | 2 +- .../network_speech_synthesis/tts_extension.js | 2 +- - .../new_tab_page/doodle_share_dialog.js | 2 +- - .../new_tab_page/modules/drive/module.js | 2 +- - .../new_tab_page/modules/drive_v2/module.js | 2 +- .../new_tab_page/modules/photos/module.html | 2 +- - .../new_tab_page/voice_search_overlay.js | 2 +- chrome/browser/resources/omnibox/omnibox.html | 2 +- .../resources/omnibox/omnibox_output.js | 4 +- .../browser/resources/pdf/elements/icons.html | 2 +- @@ -320,20 +320,22 @@ Subject: Automated domain substitution .../sharing/web_push/web_push_sender.cc | 4 +- chrome/browser/signin/signin_ui_util.cc | 2 +- .../browser/ssl/connection_help_tab_helper.cc | 2 +- - chrome/browser/ssl/sct_reporting_service.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 +- + .../supervised_user_url_filter.cc | 10 +- .../strings/android_chrome_strings.grd | 44 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- .../ui/app_list/search/omnibox_provider.cc | 2 +- + .../ui/app_list/search/open_tab_result.cc | 2 +- .../ui/ash/ambient/ambient_client_impl.cc | 8 +- .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- .../ui/ash/in_session_auth_dialog_client.cc | 2 +- + .../browser/ui/ash/system_tray_client_impl.cc | 4 +- .../tab_under_navigation_throttle.h | 2 +- ...r_content_setting_bubble_model_delegate.cc | 4 +- .../browser_navigator_browsertest_chromeos.cc | 2 +- @@ -349,18 +351,18 @@ Subject: Automated domain substitution .../toolbar/media_router_contextual_menu.cc | 6 +- .../app_dialog/app_uninstall_dialog_view.cc | 2 +- .../ui/views/hats/hats_next_web_dialog.cc | 2 +- - ...picker_bubble_view_browsertest_chromeos.cc | 32 +- + ...picker_bubble_view_browsertest_chromeos.cc | 2 +- .../ui/views/lens/lens_side_panel_view.cc | 2 +- .../ui/views/network_profile_bubble_view.cc | 2 +- .../plugin_vm/plugin_vm_installer_view.cc | 2 +- .../ui/views/session_crashed_bubble_view.cc | 2 +- - ...rofile_signin_confirmation_dialog_views.cc | 2 +- chrome/browser/ui/webui/PRESUBMIT.py | 2 +- .../internals_ui_handler.cc | 2 +- .../add_supervision/add_supervision_ui.cc | 4 +- .../edu_coexistence_login_handler_chromeos.cc | 2 +- .../consolidated_consent_screen_handler.h | 4 +- .../parent_access/parent_access_ui.cc | 4 +- + chrome/browser/ui/webui/feed/feed_ui.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- .../quick_pair/quick_pair_handler.cc | 2 +- @@ -382,6 +384,7 @@ Subject: Automated domain substitution .../preinstalled_web_apps/google_meet.cc | 2 +- .../preinstalled_web_apps/google_sheets.cc | 6 +- .../preinstalled_web_apps/google_slides.cc | 6 +- + .../preinstalled_web_apps.cc | 8 +- .../preinstalled_web_apps/youtube.cc | 6 +- .../web_applications/web_app_install_task.cc | 2 +- .../chrome_authenticator_request_delegate.cc | 6 +- @@ -411,7 +414,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 | 250 +- + 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 +- @@ -526,7 +529,7 @@ Subject: Automated domain substitution .../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 | 8 +- + .../browser/payments/payments_service_url.cc | 10 +- ...roid_chrome_autofill_assistant_strings.grd | 2 +- .../autofill_assistant_onboarding_fetcher.cc | 2 +- .../browser/service/server_url_fetcher.cc | 2 +- @@ -548,7 +551,6 @@ Subject: Automated domain substitution components/cronet/PRESUBMIT.py | 2 +- components/cronet/tools/generate_javadoc.py | 2 +- .../protocol_handler_registry.cc | 4 +- - .../core/common/chrome_proxy_header.txt | 4 +- .../core/html/dom_distiller_viewer.html | 2 +- .../core/javascript/dom_distiller_viewer.js | 2 +- components/dom_distiller/core/viewer.cc | 6 +- @@ -568,7 +570,7 @@ Subject: Automated domain substitution .../per_user_topic_subscription_manager.cc | 2 +- .../tab_modal_dialog_manager.cc | 2 +- .../core/keyed_service_base_factory.cc | 2 +- - components/lens/lens_features.cc | 4 +- + components/lens/lens_features.cc | 2 +- components/media_router/common/media_source.h | 2 +- .../metrics/net/net_metrics_log_uploader.cc | 2 +- components/metrics/url_constants.cc | 6 +- @@ -671,8 +673,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 | 2204 ++++++++--------- - .../policy/test_support/policy_testserver.py | 14 +- + .../policy/resources/policy_templates.json | 2268 ++++++++--------- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- .../syntax_check_policy_template_json.py | 2 +- @@ -753,7 +754,8 @@ Subject: Automated domain substitution .../model_execution_manager_factory.cc | 2 +- .../internal/proto/PRESUBMIT.py | 2 +- .../services/quarantine/quarantine_mac.mm | 2 +- - .../core/common/disabled_sites.cc | 10 +- + .../core/common/disabled_sites.cc | 12 +- + .../ios/shared_highlighting_constants.mm | 2 +- .../browser/chrome_connected_header_helper.cc | 4 +- .../browser/account_consistency_service.mm | 12 +- .../signin/public/base/test_signin_client.cc | 2 +- @@ -762,10 +764,10 @@ Subject: Automated domain substitution .../browser/subresource_filter_constants.h | 8 +- .../core/common/PRESUBMIT.py | 2 +- components/sync/PRESUBMIT.py | 2 +- - components/sync/base/sync_util.cc | 4 +- + components/sync/base/sync_util.h | 4 +- .../standalone_trusted_vault_client.cc | 2 +- ...ted_vault_access_token_fetcher_frontend.cc | 2 +- - .../trusted_vault_server_constants.cc | 2 +- + .../trusted_vault_server_constants.h | 2 +- components/sync_bookmarks/PRESUBMIT.py | 2 +- components/sync_sessions/PRESUBMIT.py | 2 +- .../core/browser/translate_ranker_impl.cc | 6 +- @@ -783,7 +785,7 @@ Subject: Automated domain substitution content/app/resources/README.txt | 4 +- .../render_widget_host_view_cocoa.mm | 2 +- .../attribution_reporting/PRESUBMIT.py | 2 +- - .../indexed_db/indexed_db_backing_store.cc | 4 +- + .../indexed_db/indexed_db_backing_store.cc | 2 +- .../indexed_db/indexed_db_reporting.cc | 2 +- .../portal/portal_navigation_throttle.cc | 2 +- .../renderer_host/navigation_request.cc | 4 +- @@ -846,7 +848,6 @@ Subject: Automated domain substitution gpu/ipc/common/PRESUBMIT.py | 2 +- gpu/vulkan/PRESUBMIT.py | 2 +- .../lib/browser/protocol/headless_handler.cc | 2 +- - .../resources/devtools_discovery_page.html | 2 +- infra/config/PRESUBMIT.py | 4 +- .../android-cronet-arm-dbg/properties.json | 2 +- .../properties.json | 2 +- @@ -925,10 +926,10 @@ Subject: Automated domain substitution .../search_engine_tab_helper.mm | 8 +- ios/chrome/browser/u2f/u2f_controller.mm | 4 +- .../activity_services/activity_type_util.mm | 2 +- - .../signin_earl_grey_app_interface.mm | 6 +- .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- .../new_tab_page_app_interface.mm | 4 +- .../content_suggestions/ntp_home_mediator.mm | 6 +- + .../browser/ui/main/scene_controller.mm | 2 +- .../browser/ui/ntp/discover_feed_constants.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- @@ -943,6 +944,7 @@ Subject: Automated domain substitution ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- ios/net/crn_http_protocol_handler.mm | 2 +- .../browser/signin/chrome_identity_service.mm | 4 +- + .../browser/signin/fake_chrome_identity.mm | 6 +- .../signin/fake_chrome_identity_service.mm | 2 +- .../fake_chrome_identity_service_constants.mm | 2 +- ios/showcase/alert/sc_alert_coordinator.mm | 8 +- @@ -959,7 +961,7 @@ Subject: Automated domain substitution media/PRESUBMIT.py | 4 +- media/base/win/mf_initializer.cc | 2 +- .../native_pixmap_handle_mojom_traits.cc | 4 +- - ...stable_video_decoder_types_mojom_traits.cc | 116 +- + ...stable_video_decoder_types_mojom_traits.cc | 150 +- mojo/PRESUBMIT.py | 2 +- native_client_sdk/PRESUBMIT.py | 2 +- .../src/build_tools/build_paths.py | 2 +- @@ -1044,7 +1046,6 @@ Subject: Automated domain substitution remoting/host/remoting_me2me_host.cc | 2 +- ....chrome.remote_desktop-firefox.json.jinja2 | 2 +- remoting/host/setup/start_host_main.cc | 2 +- - remoting/ios/app/app_delegate.mm | 4 +- remoting/ios/app/help_view_controller.mm | 2 +- .../ios/app/host_setup_view_controller.mm | 2 +- .../ios/app/remoting_menu_view_controller.mm | 10 +- @@ -1080,7 +1081,7 @@ Subject: Automated domain substitution .../unexpected_passes_common/data_types.py | 2 +- testing/unexpected_passes_common/queries.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 24 +- + .../variations/fieldtrial_testing_config.json | 18 +- .../markdown/extensions/smarty.py | 2 +- .../Python-Markdown/markdown/pep562.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- @@ -1382,7 +1383,6 @@ Subject: Automated domain substitution third_party/jstemplate/jstemplate_jsunit.html | 10 +- third_party/libaddressinput/BUILD.gn | 2 +- .../chromium/tools/require_fields.py | 2 +- - third_party/libjingle_xmpp/xmpp/constants.cc | 24 +- .../libpng/contrib/oss-fuzz/README.txt | 2 +- .../libusb/src/libusb/os/windows_usb.c | 4 +- third_party/libxslt/chromium/roll.py | 2 +- @@ -1452,23 +1452,17 @@ Subject: Automated domain substitution .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- .../src/benchmarks/chromium.linux.json | 152 +- third_party/pyjson5/src/setup.py | 2 +- - .../tcmalloc/chromium/src/config_linux.h | 2 +- - .../tcmalloc/chromium/src/debugallocation.cc | 2 +- - .../chromium/src/windows/addr2line-pdb.c | 2 +- - .../tcmalloc/chromium/src/windows/config.h | 2 +- - .../tcmalloc/chromium/src/windows/nm-pdb.c | 2 +- - .../tcmalloc/vendor/README_windows.txt | 8 +- - .../tcmalloc/vendor/src/debugallocation.cc | 2 +- - .../vendor/src/windows/addr2line-pdb.c | 2 +- - .../tcmalloc/vendor/src/windows/config.h | 2 +- - .../tcmalloc/vendor/src/windows/nm-pdb.c | 2 +- + .../v0_12/crate/docs/head/COPYRIGHT.txt | 2 +- .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- .../metrics/text_similarity_metric_ops.py | 2 +- + .../updater/chrome_mac_universal/3pp/fetch.py | 2 +- + .../updater/chrome_win_x86/3pp/fetch.py | 2 +- + .../updater/chrome_win_x86_64/3pp/fetch.py | 2 +- .../updater/chromium_mac_amd64/3pp/fetch.py | 6 +- .../updater/chromium_mac_arm64/3pp/fetch.py | 6 +- .../updater/chromium_win_x86/3pp/fetch.py | 6 +- .../updater/chromium_win_x86_64/3pp/fetch.py | 6 +- - third_party/wpt_tools/roll_wpt_tooling.py | 4 +- + third_party/wpt_tools/roll_wpt.py | 8 +- third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- .../tools/third_party/pywebsocket3/setup.py | 2 +- .../wpt/tools/webdriver/webdriver/client.py | 2 +- @@ -1530,6 +1524,9 @@ Subject: Automated domain substitution tools/coverity/coverity.py | 2 +- tools/cr/cr/base/android.py | 2 +- tools/cr/main.py | 2 +- + tools/crbug/crbug.js | 8 +- + tools/crbug/pinpoint.js | 4 +- + tools/crbug/user-activity.js | 4 +- tools/cygprofile/PRESUBMIT.py | 2 +- .../cygprofile/orderfile_generator_backend.py | 4 +- tools/download_optimization_profile.py | 2 +- @@ -1617,7 +1614,6 @@ Subject: Automated domain substitution tools/win/RetrieveSymbols/RetrieveSymbols.cpp | 2 +- tools/win/ShowThreadNames/ReadMe.txt | 2 +- tools/win/sizeviewer/template.html | 2 +- - ui/accessibility/extensions/alt/background.js | 2 +- .../chromevox/background/background.js | 2 +- .../chromevox/background/prefs.js | 4 +- .../chromevox/injected/history.js | 2 +- @@ -1637,7 +1633,6 @@ Subject: Automated domain substitution ui/file_manager/audio_player/manifest.json | 2 +- .../file_manager/common/js/mock_chrome.js | 6 +- .../foreground/elements/icons.html | 2 +- - .../foreground/js/file_transfer_controller.js | 2 +- ui/file_manager/file_manager/manifest.json | 10 +- ui/file_manager/image_loader/piex/Makefile | 2 +- ui/gl/gl_image_io_surface_egl.mm | 2 +- @@ -1654,7 +1649,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 +- - 1651 files changed, 5075 insertions(+), 5075 deletions(-) + 1646 files changed, 5118 insertions(+), 5118 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1668,7 +1663,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ PRESUBMIT_VERSION = '2.0.0' -@@ -197,7 +197,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -184,7 +184,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -1677,7 +1672,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -206,7 +206,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -193,7 +193,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -1686,7 +1681,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -215,7 +215,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -202,7 +202,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -1695,7 +1690,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -224,7 +224,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -211,7 +211,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -1704,7 +1699,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -233,7 +233,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -220,7 +220,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -1713,7 +1708,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -242,7 +242,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -229,7 +229,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -1722,7 +1717,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -251,7 +251,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -238,7 +238,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -1731,7 +1726,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -260,7 +260,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -247,7 +247,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -1740,7 +1735,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -489,7 +489,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -476,7 +476,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1749,7 +1744,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1037,7 +1037,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1042,7 +1042,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1758,7 +1753,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1170,9 +1170,9 @@ _KNOWN_ROBOTS = set( +@@ -1175,9 +1175,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') @@ -1770,124 +1765,124 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1552,7 +1552,7 @@ def CheckNoDEPSGIT(input_api, output_api): - 'Never commit changes to .DEPS.git. This file is maintained by an\n' - 'automated system based on what\'s in DEPS and your changes will be\n' - 'overwritten.\n' -- 'See https://sites.google.com/a/chromium.org/dev/developers/how-tos/' -+ 'See https://sites.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/dev/developers/how-tos/' - 'get-the-code#Rolling_DEPS\n' - 'for more information')] - return [] -@@ -1763,7 +1763,7 @@ def CheckNoPragmaOnce(input_api, output_api): - if files: - return [output_api.PresubmitError( - 'Do not use #pragma once in header files.\n' -- 'See http://www.chromium.org/developers/coding-style#TOC-File-headers', -+ 'See http://www.ch40m1um.qjz9zk/developers/coding-style#TOC-File-headers', - files)] - return [] - -@@ -1987,7 +1987,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1570,7 +1570,7 @@ def CheckNoDEPSGIT(input_api, output_api): + 'Never commit changes to .DEPS.git. This file is maintained by an\n' + 'automated system based on what\'s in DEPS and your changes will be\n' + 'overwritten.\n' +- 'See https://sites.google.com/a/chromium.org/dev/developers/how-tos/' ++ 'See https://sites.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/dev/developers/how-tos/' + 'get-the-code#Rolling_DEPS\n' + 'for more information') + ] +@@ -1797,7 +1797,7 @@ def CheckNoPragmaOnce(input_api, output_api): + return [ + output_api.PresubmitError( + 'Do not use #pragma once in header files.\n' +- 'See http://www.chromium.org/developers/coding-style#TOC-File-headers', ++ 'See http://www.ch40m1um.qjz9zk/developers/coding-style#TOC-File-headers', + files) + ] + return [] +@@ -2037,7 +2037,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): -- pattern = input_api.re.compile('support\.google\.com\/chrome.*/answer') -+ pattern = input_api.re.compile('support\.9oo91e\.qjz9zk\/chrome.*/answer') - errors = [] - for f in input_api.AffectedFiles(): - for line_num, line in f.ChangedContents(): -@@ -2096,7 +2096,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): - results.append(output_api.PresubmitError( - 'The name of PNG files should not have abbreviations. \n' - 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' -- 'Contact oshima@chromium.org if you have questions.', errors)) -+ 'Contact oshima@ch40m1um.qjz9zk if you have questions.', errors)) - return results +- pattern = input_api.re.compile('support\.google\.com\/chrome.*/answer') ++ pattern = input_api.re.compile('support\.9oo91e\.qjz9zk\/chrome.*/answer') + errors = [] + for f in input_api.AffectedFiles(): + for line_num, line in f.ChangedContents(): +@@ -2157,7 +2157,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): + output_api.PresubmitError( + 'The name of PNG files should not have abbreviations. \n' + 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' +- 'Contact oshima@chromium.org if you have questions.', errors)) ++ 'Contact oshima@ch40m1um.qjz9zk if you have questions.', errors)) + return results -@@ -2873,7 +2873,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. -- output_api.AppendCC('ipc-security-reviews@chromium.org') -+ output_api.AppendCC('ipc-security-reviews@ch40m1um.qjz9zk') +@@ -2955,7 +2955,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. +- 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. -@@ -3179,7 +3179,7 @@ def _CheckAndroidToastUsage(input_api, output_api): - 'android.widget.Toast usage is detected. Android toasts use hardware' - ' acceleration, and can be\ncostly on low-end devices. Please use' - ' org.chromium.ui.widget.Toast instead.\n' -- 'Contact dskiba@chromium.org if you have any questions.', -+ 'Contact dskiba@ch40m1um.qjz9zk if you have any questions.', - errors)) + # Go through the OWNERS files to check, filtering out rules that are already + # present in that OWNERS file. +@@ -3269,7 +3269,7 @@ def _CheckAndroidToastUsage(input_api, output_api): + 'android.widget.Toast usage is detected. Android toasts use hardware' + ' acceleration, and can be\ncostly on low-end devices. Please use' + ' org.chromium.ui.widget.Toast instead.\n' +- 'Contact dskiba@chromium.org if you have any questions.', ++ 'Contact dskiba@ch40m1um.qjz9zk if you have any questions.', + errors)) - return results -@@ -3313,7 +3313,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): - if errors: - results.append(output_api.PresubmitError( - 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' -- '(org.junit.*) from //third_party/junit. Contact yolandyan@chromium.org' -+ '(org.junit.*) from //third_party/junit. Contact yolandyan@ch40m1um.qjz9zk' - ' if you have any question.', errors)) - return results + return results +@@ -3408,7 +3408,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): + results.append( + output_api.PresubmitError( + 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' +- '(org.junit.*) from //third_party/junit. Contact yolandyan@chromium.org' ++ '(org.junit.*) from //third_party/junit. Contact yolandyan@ch40m1um.qjz9zk' + ' if you have any question.', errors)) + return results -@@ -3344,7 +3344,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): - results.append(output_api.PresubmitPromptWarning( - 'The newly created files include Test classes that inherits from base' - ' class. Please do not use inheritance in JUnit4 tests or add new' -- ' JUnit3 tests. Contact yolandyan@chromium.org if you have any' -+ ' JUnit3 tests. Contact yolandyan@ch40m1um.qjz9zk if you have any' - ' questions.', errors)) - return results +@@ -3440,7 +3440,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): + output_api.PresubmitPromptWarning( + 'The newly created files include Test classes that inherits from base' + ' class. Please do not use inheritance in JUnit4 tests or add new' +- ' JUnit3 tests. Contact yolandyan@chromium.org if you have any' ++ ' JUnit3 tests. Contact yolandyan@ch40m1um.qjz9zk if you have any' + ' questions.', errors)) + return results -@@ -3368,7 +3368,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): - 'Annotations in android.test.suitebuilder.annotation have been' - ' deprecated since API level 24. Please use android.support.test.filters' - ' from //third_party/android_support_test_runner:runner_java instead.' -- ' Contact yolandyan@chromium.org if you have any questions.', errors)) -+ ' Contact yolandyan@ch40m1um.qjz9zk if you have any questions.', errors)) - return results +@@ -3465,7 +3465,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): + 'Annotations in android.test.suitebuilder.annotation have been' + ' deprecated since API level 24. Please use android.support.test.filters' + ' from //third_party/android_support_test_runner:runner_java instead.' +- ' Contact yolandyan@chromium.org if you have any questions.', ++ ' Contact yolandyan@ch40m1um.qjz9zk if you have any questions.', + errors)) + return results + +@@ -3487,7 +3487,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): + 'MDPI assets should be placed in /res/drawable-mdpi/ or ' + '/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and' + '/res/drawable-ldrtl/.\n' +- 'Contact newt@chromium.org if you have questions.', errors)) ++ 'Contact newt@ch40m1um.qjz9zk if you have questions.', errors)) + return results -@@ -3388,7 +3388,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): - 'MDPI assets should be placed in /res/drawable-mdpi/ or ' - '/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and' - '/res/drawable-ldrtl/.\n' -- 'Contact newt@chromium.org if you have questions.', errors)) -+ 'Contact newt@ch40m1um.qjz9zk if you have questions.', errors)) - return results +@@ -4089,7 +4089,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' +- 'https://chromium.googlesource.com/chromium/src/+/HEAD/' ++ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/' + 'build/docs/writing_gn_templates.md' + '#Using-forward_variables_from')) + ] +@@ -4257,7 +4257,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): + 'LLVMFuzzerInitialize should not be used, unless your fuzz target needs ' + 'to access command line arguments passed to the fuzzer. Instead, prefer ' + 'static initialization and shared resources as documented in ' +- 'https://chromium.googlesource.com/chromium/src/+/main/testing/' ++ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/testing/' + 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' + % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)) - -@@ -3948,7 +3948,7 @@ def CheckGnGlobForward(input_api, output_api): - long_text=('The variables "visibilty" and "test_only" should be ' - 'explicitly listed in forward_variables_from(). For more ' - 'details, see:\n' -- 'https://chromium.googlesource.com/chromium/src/+/HEAD/' -+ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/' - 'build/docs/writing_gn_templates.md' - '#Using-forward_variables_from'))] - return [] -@@ -4110,7 +4110,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): - 'LLVMFuzzerInitialize should not be used, unless your fuzz target needs ' - 'to access command line arguments passed to the fuzzer. Instead, prefer ' - 'static initialization and shared resources as documented in ' -- 'https://chromium.googlesource.com/chromium/src/+/main/testing/' -+ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/testing/' - 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( - ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) - ) -@@ -4145,7 +4145,7 @@ def _CheckNewImagesWarning(input_api, output_api): - errors.append(output_api.PresubmitPromptWarning( - 'It looks like you are trying to commit some images. If these are ' - 'non-test-only images, please make sure to read and apply the tips in ' -- 'https://chromium.googlesource.com/chromium/src/+/HEAD/docs/speed/' -+ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/docs/speed/' - 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' - 'FYI only and will not block your CL on the CQ.', image_paths)) - return errors -@@ -4347,7 +4347,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4295,7 +4295,7 @@ def _CheckNewImagesWarning(input_api, output_api): + output_api.PresubmitPromptWarning( + 'It looks like you are trying to commit some images. If these are ' + 'non-test-only images, please make sure to read and apply the tips in ' +- 'https://chromium.googlesource.com/chromium/src/+/HEAD/docs/speed/' ++ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/docs/speed/' + 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' + 'FYI only and will not block your CL on the CQ.', image_paths)) + return errors +@@ -4511,7 +4511,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', @@ -1896,54 +1891,65 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4598,7 +4598,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4782,7 +4782,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): - """Check for same IPC rules described in -- http://www.chromium.org/Home/chromium-security/education/security-tips-for-ipc -+ http://www.ch40m1um.qjz9zk/Home/chromium-security/education/security-tips-for-ipc - """ - base_pattern = r'IPC_ENUM_TRAITS\(' - inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -4851,9 +4851,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): - return [output_api.PresubmitPromptWarning('You are adding/modifying code' - 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,' - ' PNaCl, PPAPI). See this blog post for more details:\n' -- 'https://blog.chromium.org/2020/08/changes-to-chrome-app-support-timeline.html\n' -+ 'https://blog.ch40m1um.qjz9zk/2020/08/changes-to-chrome-app-support-timeline.html\n' - 'and this documentation for options to replace these technologies:\n' -- 'https://developer.chrome.com/docs/apps/migration/\n'+ -+ 'https://developer.ch40me.qjz9zk/docs/apps/migration/\n'+ - '\n'.join(problems))] + """Check for same IPC rules described in +- http://www.chromium.org/Home/chromium-security/education/security-tips-for-ipc ++ http://www.ch40m1um.qjz9zk/Home/chromium-security/education/security-tips-for-ipc + """ + base_pattern = r'IPC_ENUM_TRAITS\(' + inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) +@@ -5063,9 +5063,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): + 'You are adding/modifying code' + 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,' + ' PNaCl, PPAPI). See this blog post for more details:\n' +- 'https://blog.chromium.org/2020/08/changes-to-chrome-app-support-timeline.html\n' ++ 'https://blog.ch40m1um.qjz9zk/2020/08/changes-to-chrome-app-support-timeline.html\n' + 'and this documentation for options to replace these technologies:\n' +- 'https://developer.chrome.com/docs/apps/migration/\n' + ++ 'https://developer.ch40me.qjz9zk/docs/apps/migration/\n' + + '\n'.join(problems)) + ] - return [] -@@ -4896,7 +4896,7 @@ def CheckChangeOnCommit(input_api, output_api): - results.extend(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')) +@@ -5119,7 +5119,7 @@ def CheckChangeOnCommit(input_api, output_api): + input_api.canned_checks.CheckTreeIsOpen( + input_api, + output_api, +- json_url='http://chromium-status.appspot.com/current?format=json')) ++ json_url='http://chromium-status.8pp2p8t.qjz9zk/current?format=json')) - results.extend( - input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5228,7 +5228,7 @@ def CheckStrings(input_api, output_api): - if icu_syntax_errors: - results.append(output_api.PresubmitPromptWarning( - 'ICU syntax errors were found in the following strings (problems or ' -- 'feedback? Contact rainhard@chromium.org):', items=icu_syntax_errors)) -+ 'feedback? Contact rainhard@ch40m1um.qjz9zk):', items=icu_syntax_errors)) + results.extend( + input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) +@@ -5468,7 +5468,7 @@ def CheckStrings(input_api, output_api): + results.append( + output_api.PresubmitPromptWarning( + 'ICU syntax errors were found in the following strings (problems or ' +- 'feedback? Contact rainhard@chromium.org):', ++ 'feedback? Contact rainhard@ch40m1um.qjz9zk):', + items=icu_syntax_errors)) - return results + return results +@@ -5779,7 +5779,7 @@ def CheckMPArchApiUsage(input_api, output_api): + if not used_apis: + return [] -@@ -5529,7 +5529,7 @@ def CheckMPArchApiUsage(input_api, output_api): - break - - if uses_concerning_api: - output_api.AppendCC('mparch-reviews+watch@chromium.org') + output_api.AppendCC('mparch-reviews+watch@ch40m1um.qjz9zk') - - return [] - + message = ('This change uses API(s) that are ambiguous in the presence of ' + 'MPArch features such as bfcache, prerendering, and fenced ' + 'frames.') +@@ -5790,8 +5790,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' +- '[1] https://docs.google.com/document/d/13l16rWTal3o5wce4i0RwdpMP5ESELLKr439Faj2BBRo/edit?usp=sharing\n' +- '[2] https://docs.google.com/document/d/1NginQ8k0w3znuwTiJ5qjYmBKgZDekvEPC22q0I4swxQ/edit?usp=sharing' ++ '[1] https://docs.9oo91e.qjz9zk/document/d/13l16rWTal3o5wce4i0RwdpMP5ESELLKr439Faj2BBRo/edit?usp=sharing\n' ++ '[2] https://docs.9oo91e.qjz9zk/document/d/1NginQ8k0w3znuwTiJ5qjYmBKgZDekvEPC22q0I4swxQ/edit?usp=sharing' + ) + return [ + output_api.PresubmitNotifyResult(message, diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/android_webview/tools/cts_config/webview_cts_gcs_path.json --- a/android_webview/tools/cts_config/webview_cts_gcs_path.json +++ b/android_webview/tools/cts_config/webview_cts_gcs_path.json @@ -2025,7 +2031,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/tools/generate_flag_labels.py --- a/android_webview/tools/generate_flag_labels.py +++ b/android_webview/tools/generate_flag_labels.py -@@ -248,7 +248,7 @@ double-check this picked the correct labels for your new features (labels are +@@ -250,7 +250,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: @@ -2177,7 +2183,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1299,7 +1299,7 @@ This file contains the strings for ash. +@@ -1324,7 +1324,7 @@ This file contains the strings for ash. Supervised user @@ -2186,7 +2192,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1586,7 +1586,7 @@ This file contains the strings for ash. +@@ -1611,7 +1611,7 @@ This file contains the strings for ash. Tap to configure @@ -2195,7 +2201,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. +@@ -3157,7 +3157,7 @@ This file contains the strings for ash. Save $1Pixel Buds @@ -2204,7 +2210,16 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Settings -@@ -3243,7 +3243,7 @@ This file contains the strings for ash. +@@ -3178,7 +3178,7 @@ This file contains the strings for ash. + Connect $1Pixel Buds to this Chromebook + + +- Your $1Pixel Buds will appear on devices linked with $2alisha123@gmail.com ++ Your $1Pixel Buds will appear on devices linked with $2alisha123@9ma1l.qjz9zk + + + Cancel +@@ -3304,7 +3304,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2213,7 +2228,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3714,7 +3714,7 @@ Here are some things you can try to get started. +@@ -3807,7 +3807,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2297,8 +2312,8 @@ diff --git a/ash/components/device_activity/device_activity_controller.cc b/ash/ -const char kFresnelBaseUrl[] = "https://crosfresnel-pa.googleapis.com"; +const char kFresnelBaseUrl[] = "https://crosfresnel-pa.9oo91eapis.qjz9zk"; - class PsmDelegateImpl : public PsmDelegate { - public: + // Default value for devices that are missing the hardware class. + const char kHardwareClassKeyNotFound[] = "HARDWARE_CLASS_KEY_NOT_FOUND"; diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/drivefs_auth.cc --- a/ash/components/drivefs/drivefs_auth.cc +++ b/ash/components/drivefs/drivefs_auth.cc @@ -2311,18 +2326,6 @@ diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/dri access_token_fetcher_ = std::make_unique( kIdentityConsumerId, identity_manager, scopes, -diff --git a/ash/components/fwupd/firmware_update_manager.cc b/ash/components/fwupd/firmware_update_manager.cc ---- a/ash/components/fwupd/firmware_update_manager.cc -+++ b/ash/components/fwupd/firmware_update_manager.cc -@@ -84,7 +84,7 @@ const char kBaseRootPath[] = "firmware-updates"; - const char kCachePath[] = "cache"; - const char kCabFileExtension[] = ".cab"; - const char kFirmwareMirrorPrefix[] = -- "https://storage.googleapis.com/chromeos-localmirror/lvfs/"; -+ "https://storage.9oo91eapis.qjz9zk/chromeos-localmirror/lvfs/"; - const char kAllowedFilepathChars[] = - "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+-._"; - diff --git a/ash/components/geolocation/simple_geolocation_provider.cc b/ash/components/geolocation/simple_geolocation_provider.cc --- a/ash/components/geolocation/simple_geolocation_provider.cc +++ b/ash/components/geolocation/simple_geolocation_provider.cc @@ -2371,10 +2374,29 @@ diff --git a/ash/components/trial_group/trial_group_checker.cc b/ash/components/ } // namespace +diff --git a/ash/constants/url_constants.cc b/ash/constants/url_constants.cc +--- a/ash/constants/url_constants.cc ++++ b/ash/constants/url_constants.cc +@@ -7,12 +7,12 @@ + namespace chrome { + + const char kAndroidMessagesLearnMoreURL[] = +- "https://support.google.com/chromebook/?p=multi_device_messages"; ++ "https://support.9oo91e.qjz9zk/chromebook/?p=multi_device_messages"; + + const char kLinuxExportImportHelpURL[] = +- "https://support.google.com/chromebook?p=linux_backup_restore"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=linux_backup_restore"; + + const char kMultiDeviceLearnMoreURL[] = +- "https://support.google.com/chromebook/?p=multi_device"; ++ "https://support.9oo91e.qjz9zk/chromebook/?p=multi_device"; + + } // namespace chrome diff --git a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc --- a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc +++ b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ namespace { const char kGetObservedDeviceUrl[] = @@ -2382,7 +2404,7 @@ diff --git a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc b/as + "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/device/" "%d?key=%s&mode=MODE_RELEASE&alt=proto"; - // TODO(crbug/1226117): Update annotation with policy details when available. + const net::NetworkTrafficAnnotationTag kTrafficAnnotation = diff --git a/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc b/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc --- a/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc +++ b/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc @@ -2399,7 +2421,22 @@ diff --git a/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc b/ash/qui + "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/user/devices/%s" "?key=%s&alt=proto"; - // TODO(crbug/1226117): Update annotation with policy details when available. + const net::PartialNetworkTrafficAnnotationTag kTrafficAnnotation = +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 @@ + namespace { + + const char kDiscoveryLearnMoreLink[] = +- "https://support.google.com/chromebook?p=fast_pair_m101"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=fast_pair_m101"; + const char kAssociateAccountLearnMoreLink[] = +- "https://support.google.com/chromebook?p=bluetooth_pairing_m101"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=bluetooth_pairing_m101"; + + bool ShouldShowUserEmail(ash::LoginStatus status) { + switch (status) { diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py --- a/ash/resources/PRESUBMIT.py +++ b/ash/resources/PRESUBMIT.py @@ -2442,19 +2479,34 @@ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller. diff --git a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc b/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc --- a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc +++ b/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc -@@ -22,7 +22,7 @@ const char kNotifierUsbPeripheral[] = "ash.usb_peripheral"; - const char kUsbPeripheralInvalidDpCableNotificationId[] = - "cros_usb_peripheral_invalid_dp_cable_notification_id"; - const char kNotificationLandingPageUrl[] = +@@ -33,9 +33,9 @@ const char kUsbPeripheralInvalidTBTCableNotificationId[] = + const char kUsbPeripheralSpeedLimitingCableNotificationId[] = + "cros_usb_peripheral_speed_limiting_cable_notification_id"; + const char kNotificationDisplayLandingPageUrl[] = - "https://support.google.com/chromebook?p=cable_notification"; + "https://support.9oo91e.qjz9zk/chromebook?p=cable_notification"; + const char kNotificationDeviceLandingPageUrl[] = +- "https://support.google.com/chromebook?p=cable_notification_2"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=cable_notification_2"; bool ShouldDisplayNotification() { return Shell::Get()->session_controller()->GetSessionState() == -diff --git a/ash/webui/camera_app_ui/camera_app_ui.cc b/ash/webui/camera_app_ui/camera_app_ui.cc ---- a/ash/webui/camera_app_ui/camera_app_ui.cc -+++ b/ash/webui/camera_app_ui/camera_app_ui.cc -@@ -85,7 +85,7 @@ content::WebUIDataSource* CreateUntrustedCameraAppUIHTMLSource() { +diff --git a/ash/wallpaper/wallpaper_controller_impl.cc b/ash/wallpaper/wallpaper_controller_impl.cc +--- a/ash/wallpaper/wallpaper_controller_impl.cc ++++ b/ash/wallpaper/wallpaper_controller_impl.cc +@@ -1239,7 +1239,7 @@ void WallpaperControllerImpl::SetOnlineWallpaperFromData( + std::string FetchGooglePhotosMetadataFromId(const std::string& id) { + // Stubbed, return the url of the google logo for testing. + NOTIMPLEMENTED(); +- return "https://www.google.com/images/branding/googlelogo/1x/" ++ return "https://www.9oo91e.qjz9zk/images/branding/googlelogo/1x/" + "googlelogo_color_272x92dp.png"; + } + +diff --git a/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc b/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc +--- a/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc ++++ b/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc +@@ -27,7 +27,7 @@ content::WebUIDataSource* CreateUntrustedCameraAppUIHTMLSource() { untrusted_source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -2518,6 +2570,18 @@ diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd b/ash/ Text detected. +diff --git a/ash/webui/diagnostics_ui/resources/keyboard_tester.html b/ash/webui/diagnostics_ui/resources/keyboard_tester.html +--- a/ash/webui/diagnostics_ui/resources/keyboard_tester.html ++++ b/ash/webui/diagnostics_ui/resources/keyboard_tester.html +@@ -48,7 +48,7 @@ + TODO(crbug.com/1207678): update this link when the Help Center is + ready. + --> +- Help Center ++ Help Center +

+ +
diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js --- a/ash/webui/diagnostics_ui/resources/network_card.js +++ b/ash/webui/diagnostics_ui/resources/network_card.js @@ -2530,15 +2594,6 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diag const SETTINGS_URL = 'chrome://os-settings/'; /** -@@ -203,7 +203,7 @@ Polymer({ - /** @protected */ - onTroubleConnectingClicked_() { - // TODO(michaelcheco): Add correct URL. -- window.open('https://support.google.com/chromebook?p=diagnostics_'); -+ window.open('https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'); - }, - - /** diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/diagnostics_ui/resources/routine_section.js --- a/ash/webui/diagnostics_ui/resources/routine_section.js +++ b/ash/webui/diagnostics_ui/resources/routine_section.js @@ -2566,7 +2621,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 -@@ -84,7 +84,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( +@@ -107,7 +107,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( // Allow calls to Maps reverse geocoding API for loading metadata. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -2575,6 +2630,44 @@ diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ // Allow use of SharedArrayBuffer (required by the wasm). source->OverrideCrossOriginOpenerPolicy("same-origin"); +diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feedback_ui/resources/fake_data.js +--- a/ash/webui/os_feedback_ui/resources/fake_data.js ++++ b/ash/webui/os_feedback_ui/resources/fake_data.js +@@ -13,29 +13,29 @@ import {HelpContentList, HelpContentType, SearchRequest, SearchResponse, stringT + export const fakeHelpContentList = [ + { + title: stringToMojoString16('Fix connection problems'), +- url: {url: 'https://support.google.com/chromebook/?q=6318213'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=6318213'}, + content_type: HelpContentType.kArticle + }, + { + title: stringToMojoString16( + 'Why won\'t my wireless mouse with a USB piece wor...?'), +- url: {url: 'https://support.google.com/chromebook/?q=123920509'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=123920509'}, + content_type: HelpContentType.kForum + }, + { + title: stringToMojoString16('Wifi Issues - only on Chromebooks'), +- url: {url: 'https://support.google.com/chromebook/?q=114174470'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=114174470'}, + content_type: HelpContentType.kForum + }, + { + title: stringToMojoString16('Network Connectivity Fault'), +- url: {url: 'https://support.google.com/chromebook/?q=131459420'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=131459420'}, + content_type: HelpContentType.kForum + }, + { + title: stringToMojoString16( + 'Connected to WiFi but can\'t connect to the internet'), +- url: {url: 'https://support.google.com/chromebook/?q=22864239'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=22864239'}, + content_type: HelpContentType.kForum + } + ]; diff --git a/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc b/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc --- a/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc +++ b/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc @@ -2587,6 +2680,18 @@ diff --git a/ash/webui/personalization_app/untrusted_personalization_app_ui_conf source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ScriptSrc, +diff --git a/ash/webui/print_management/resources/PRESUBMIT.py b/ash/webui/print_management/resources/PRESUBMIT.py +--- a/ash/webui/print_management/resources/PRESUBMIT.py ++++ b/ash/webui/print_management/resources/PRESUBMIT.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + """Presubmit script for Print Management. + +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts + for more details about the presubmit API built into depot_tools. + """ + diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/projector_app/projector_xhr_sender.cc --- a/ash/webui/projector_app/projector_xhr_sender.cc +++ b/ash/webui/projector_app/projector_xhr_sender.cc @@ -2608,7 +2713,17 @@ diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/project diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/projector_app/untrusted_projector_ui.cc --- a/ash/webui/projector_app/untrusted_projector_ui.cc +++ b/ash/webui/projector_app/untrusted_projector_ui.cc -@@ -63,15 +63,15 @@ content::WebUIDataSource* CreateProjectorHTMLSource( +@@ -43,23 +43,23 @@ content::WebUIDataSource* CreateProjectorHTMLSource( + // Allow fonts. + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::FontSrc, +- "font-src https://fonts.gstatic.com;"); ++ "font-src https://fonts.95tat1c.qjz9zk;"); + // Allow styles to include inline styling needed for Polymer elements. + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::StyleSrc, +- "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;"); ++ "style-src 'self' 'unsafe-inline' https://f0ntz.9oo91e8p1.qjz9zk;"); source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::MediaSrc, // Allows streaming video. @@ -2626,12 +2741,24 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje + "connect-src 'self' https://www.9oo91eapis.qjz9zk " + "https://drive.9oo91e.qjz9zk;"); - // TODO(b/210064058): COEP is conflicting with loading cross origin resources. - // Comment out COEP overrides for now until the issue is resolved. If we + // TODO(b/197120695): re-enable trusted type after fixing the issue that icon + // template is setting innerHTML. +diff --git a/ash/webui/scanning/resources/PRESUBMIT.py b/ash/webui/scanning/resources/PRESUBMIT.py +--- a/ash/webui/scanning/resources/PRESUBMIT.py ++++ b/ash/webui/scanning/resources/PRESUBMIT.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + """Presubmit script for Scanning. + +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts + for more details about the presubmit API built into depot_tools. + """ + diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html --- a/ash/webui/scanning/resources/scanning_app.html +++ b/ash/webui/scanning/resources/scanning_app.html -@@ -255,7 +255,7 @@ +@@ -269,7 +269,7 @@ [[i18n(toastMessageKey_)]]
Make sure you are signed in to Chromium on your $1Pixel XL and then try sending again. -@@ -671,7 +671,7 @@ Chromium is unable to recover your settings. +@@ -480,14 +480,14 @@ Chromium is unable to recover your settings. + + + +-If you want to use this account one-time only, you can use Guest mode in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. ++If you want to use this account one-time only, you can use Guest mode in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. + +-Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. ++Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. + + +-If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. ++If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. + +-Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. ++Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. + + + +@@ -679,7 +679,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -3610,7 +3756,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -774,10 +774,10 @@ Chromium is unable to recover your settings. +@@ -782,10 +782,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chromium! @@ -3623,7 +3769,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. -@@ -827,7 +827,7 @@ Chromium is unable to recover your settings. +@@ -835,7 +835,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -3632,7 +3778,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -846,10 +846,10 @@ Chromium is unable to recover your settings. +@@ -854,10 +854,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. @@ -3678,7 +3824,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -783,7 +783,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -787,7 +787,7 @@ are declared in tools/grit/grit_rule.gni. Search images with $1Google Lens @@ -3687,7 +3833,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -858,7 +858,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -862,7 +862,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3696,7 +3842,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1039,7 +1039,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1047,7 +1047,7 @@ are declared in tools/grit/grit_rule.gni. Search Images with $1Google Lens @@ -3705,7 +3851,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1265,7 +1265,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1273,7 +1273,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3714,7 +3860,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1402,7 +1402,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1410,7 +1410,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3723,7 +3869,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2878,10 +2878,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2898,10 +2898,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3736,7 +3882,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2890,7 +2890,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2910,7 +2910,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3745,7 +3891,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2902,28 +2902,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2922,28 +2922,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3781,7 +3927,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2944,19 +2944,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2964,19 +2964,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3806,7 +3952,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2968,7 +2968,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2988,7 +2988,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3815,7 +3961,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2977,7 +2977,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2997,7 +2997,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3824,7 +3970,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3101,7 +3101,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3121,7 +3121,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3833,7 +3979,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3610,13 +3610,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3630,13 +3630,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3850,7 +3996,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3625,7 +3625,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3645,7 +3645,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -3859,7 +4005,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -3831,16 +3831,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3851,16 +3851,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3880,7 +4026,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3849,7 +3849,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3869,7 +3869,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3889,7 +4035,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3885,22 +3885,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -3905,22 +3905,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -3918,7 +4064,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4115,7 +4115,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4142,7 +4142,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -3927,7 +4073,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4127,10 +4127,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4154,10 +4154,10 @@ are declared in tools/grit/grit_rule.gni. @@ -3940,7 +4086,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4269,22 +4269,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4296,22 +4296,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3969,7 +4115,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4293,10 +4293,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4320,10 +4320,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3982,7 +4128,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4670,7 +4670,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4717,7 +4717,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3991,7 +4137,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4717,7 +4717,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4773,7 +4773,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -4000,7 +4146,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5013,7 +5013,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5078,7 +5078,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -4009,7 +4155,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5052,10 +5052,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5117,19 +5117,19 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -4020,9 +4166,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Requested to read and change $1google.com + Requested to read and change $19oo91e.qjz9zk - - Installed -@@ -5301,10 +5301,10 @@ Keep your key file in a safe place. You will need it to create new versions of y + + Choose your default setting + + +- Allow all extensions to read and change $1google.com ++ Allow all extensions to read and change $19oo91e.qjz9zk + + +- Don't allow any extensions to read and change $1google.com ++ Don't allow any extensions to read and change $19oo91e.qjz9zk + + + Customize permissions for each extension +@@ -5404,10 +5404,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -4035,7 +4192,23 @@ 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 -@@ -5651,7 +5651,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5416,13 +5416,13 @@ 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 + + +- To Google Password Manager for $1user@gmail.com ++ To Google Password Manager for $1user@9ma1l.qjz9zk + + + To Google Password Manager on this device + + +- In Google Password Manager for $1user@gmail.com ++ In Google Password Manager for $1user@9ma1l.qjz9zk + + + In Google Password Manager on this device +@@ -5769,7 +5769,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4044,7 +4217,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5662,7 +5662,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5780,7 +5780,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4053,7 +4226,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5672,7 +5672,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5790,7 +5790,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4062,7 +4235,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5681,16 +5681,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5799,16 +5799,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -4082,7 +4255,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6081,7 +6081,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6199,7 +6199,7 @@ Keep your key file in a safe place. You will need it to create new versions of y You’re seeing your recent and suggested documents based on your previous activity using Google Drive. <br> <br> @@ -4091,7 +4264,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources From your Google Photos -@@ -6108,7 +6108,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6226,7 +6226,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Your memories from Google Photos are shown here. They are visible only to you, whenever you’re signed in. <br> <br> @@ -4100,7 +4273,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Explore more of your memories in Google Photos -@@ -6141,10 +6141,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6275,10 +6275,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? @@ -4113,16 +4286,24 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6434,7 +6434,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6590,14 +6590,14 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome - From $1https://google.com + From $1https://9oo91e.qjz9zk - + + Open in app + -@@ -6547,7 +6547,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + +- ++ + Always use the $1YouTube app to open supported web links? + + +@@ -6721,7 +6721,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 @@ -4131,7 +4312,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6674,7 +6674,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6851,7 +6851,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. @@ -4140,7 +4321,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6711,7 +6711,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6888,7 +6888,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. @@ -4149,7 +4330,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6928,13 +6928,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7105,13 +7105,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Suggest strong password @@ -4165,7 +4346,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7118,7 +7118,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7295,7 +7295,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -4174,7 +4355,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -7128,7 +7128,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7305,7 +7305,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4183,7 +4364,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7352,7 +7352,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7526,7 +7526,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -4192,7 +4373,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7784,7 +7784,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7958,7 +7958,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4201,7 +4382,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7792,10 +7792,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7966,10 +7966,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -4214,7 +4395,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8117,7 +8117,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8291,7 +8291,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Sending link to $1Ted's Pixel2 @@ -4223,7 +4404,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8891,7 +8891,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9129,7 +9129,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This will separate your browsing from $1bob@example.com @@ -4232,7 +4413,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8906,10 +8906,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9144,10 +9144,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -4245,7 +4426,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8934,13 +8934,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9172,13 +9172,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -4261,7 +4442,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8995,7 +8995,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9233,7 +9233,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -4270,7 +4451,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -9006,8 +9006,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9244,8 +9244,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -4281,7 +4462,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9617,7 +9617,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9855,7 +9855,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -4290,7 +4471,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10044,7 +10044,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10282,7 +10282,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -4299,7 +4480,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -10087,7 +10087,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10325,7 +10325,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. @@ -4308,7 +4489,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 -@@ -10180,7 +10180,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10413,7 +10413,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -4317,7 +4498,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10212,10 +10212,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10445,10 +10445,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -4330,7 +4511,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10326,19 +10326,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10559,19 +10559,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4353,20 +4534,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -10356,10 +10356,10 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - -- Allow $1google.com to open all $2search links? -+ Allow $19oo91e.qjz9zk to open all $2search links? - - -- Allow $1google.com to open all $2search links instead of $3Elgoog Search? -+ Allow $19oo91e.qjz9zk to open all $2search links instead of $3Elgoog Search? - - - Open $1search links -@@ -10396,7 +10396,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10599,7 +10599,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4375,7 +4543,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -10423,7 +10423,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10626,7 +10626,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4384,7 +4552,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10624,7 +10624,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10827,7 +10827,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. @@ -4393,7 +4561,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -10677,7 +10677,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10880,7 +10880,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4402,7 +4570,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10749,8 +10749,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10952,8 +10952,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4413,7 +4581,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10961,7 +10961,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11167,7 +11167,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4422,7 +4590,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -11073,7 +11073,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11279,7 +11279,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4431,7 +4599,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -11113,7 +11113,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11319,7 +11319,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4440,7 +4608,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -11170,7 +11170,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11384,7 +11384,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4449,7 +4617,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -11291,7 +11291,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11505,7 +11505,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4458,7 +4626,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 -@@ -11478,13 +11478,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11692,13 +11692,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4474,7 +4642,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -11578,7 +11578,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11792,7 +11792,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4483,16 +4651,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -11593,7 +11593,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11807,7 +11807,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request - accounts.google.com$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. + accounts.9oo91e.qjz9zk$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. - - Add a new phone -@@ -11689,7 +11689,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + + Add a new Android phone +@@ -11903,7 +11903,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4501,7 +4669,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -11705,7 +11705,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11919,7 +11919,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 @@ -4510,7 +4678,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. -@@ -11714,13 +11714,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11928,13 +11928,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4526,7 +4694,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -12034,7 +12034,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12263,7 +12263,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4538,7 +4706,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 -@@ -428,7 +428,7 @@ chromium_strings.grd. --> +@@ -451,7 +451,7 @@ chromium_strings.grd. --> To send a number from here to your Android phone, sign in to Chrome on both devices. @@ -4547,7 +4715,26 @@ 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. -@@ -679,7 +679,7 @@ Google Chrome is unable to recover your settings. +@@ -516,14 +516,14 @@ Google Chrome is unable to recover your settings. + + + +-If you want to use this account one-time only, you can use Guest mode in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. ++If you want to use this account one-time only, you can use Guest mode in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. + +-Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. ++Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. + + +-If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. ++If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. + +-Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. ++Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. + + + +@@ -717,7 +717,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4556,7 +4743,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -782,10 +782,10 @@ Google Chrome is unable to recover your settings. +@@ -827,10 +827,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chrome! @@ -4569,7 +4756,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. -@@ -835,7 +835,7 @@ Google Chrome is unable to recover your settings. +@@ -880,7 +880,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4578,7 +4765,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -854,10 +854,10 @@ Google Chrome is unable to recover your settings. +@@ -899,10 +899,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. @@ -4649,16 +4836,16 @@ 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 -@@ -3759,7 +3759,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3950,7 +3950,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( - switches::kSyncServiceURL, + syncer::kSyncServiceURL, - "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, + "https://chrome-sync.sandbox.9oo91e.qjz9zk/chrome-sync/alpha")}, #if !BUILDFLAG(IS_ANDROID) - {"media-router-cast-allow-all-ips", - flag_descriptions::kMediaRouterCastAllowAllIPsName, -@@ -3998,7 +3998,7 @@ const FeatureEntry kFeatureEntries[] = { + {"block-migrated-default-chrome-app-sync", + flag_descriptions::kBlockMigratedDefaultChromeAppSyncName, +@@ -4226,7 +4226,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4706,7 +4893,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 -@@ -511,7 +511,7 @@ void WebApkInstaller::OnGotIconMurmur2Hashes( +@@ -512,7 +512,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 " @@ -4928,7 +5115,7 @@ diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome diff --git a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc --- a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc +++ b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc -@@ -32,7 +32,7 @@ const char kEcheAppDisabledByPhoneNotifierId[] = +@@ -39,7 +39,7 @@ const char kEcheAppDisabledByPhoneNotifierId[] = // TODO(crbug.com/1241352): This should probably have a ?p= at // some point. @@ -4984,27 +5171,6 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom // Location of the help page for low space warning in the downloads directory. const int kDownloadsLowSpaceWarningHelpNumber = 1061547; -diff --git a/chrome/browser/ash/first_run/drive_first_run_controller.cc b/chrome/browser/ash/first_run/drive_first_run_controller.cc ---- a/chrome/browser/ash/first_run/drive_first_run_controller.cc -+++ b/chrome/browser/ash/first_run/drive_first_run_controller.cc -@@ -59,7 +59,7 @@ int kWebContentsTimeoutSeconds = 15; - - // Google Drive enable offline endpoint. - const char kDriveOfflineEndpointUrl[] = -- "https://docs.google.com/offline/autoenable"; -+ "https://docs.9oo91e.qjz9zk/offline/autoenable"; - - // Google Drive app id. - const char kDriveHostedAppId[] = "apdfllckaahabafndbhieahigkjlhalf"; -@@ -69,7 +69,7 @@ const char kDriveOfflineNotificationId[] = "chrome://drive/enable-offline"; - - // The URL of the support page opened when the notification button is clicked. - const char kDriveOfflineSupportUrl[] = -- "https://support.google.com/drive/answer/1628467"; -+ "https://support.9oo91e.qjz9zk/drive/answer/1628467"; - - } // namespace - diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc --- a/chrome/browser/ash/hats/hats_dialog.cc +++ b/chrome/browser/ash/hats/hats_dialog.cc @@ -5053,6 +5219,23 @@ diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.c }; const char* kTestUrls[] = { +diff --git a/chrome/browser/ash/input_method/ime_rules_config.h b/chrome/browser/ash/input_method/ime_rules_config.h +--- a/chrome/browser/ash/input_method/ime_rules_config.h ++++ b/chrome/browser/ash/input_method/ime_rules_config.h +@@ -49,10 +49,10 @@ class ImeRulesConfig { + std::vector rule_auto_correct_domain_denylist_; + // The default denylist of domains that will turn off auto_correct feature. + std::vector default_auto_correct_domain_denylist_{ +- "amazon.com", "b.corp.google.com", "classroom.google.com", +- "desmos.com", "docs.google.com", "facebook.com", ++ "amazon.com", "b.corp.9oo91e.qjz9zk", "classroom.9oo91e.qjz9zk", ++ "desmos.com", "docs.9oo91e.qjz9zk", "f8c3b00k.qjz9zk", + "instagram.com", "outlook.live.com", "outlook.office.com", +- "quizlet.com", "whatsapp.com", "youtube.com", ++ "quizlet.com", "whatsapp.com", "y0u1ub3.qjz9zk", + }; + }; + diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc @@ -5313,7 +5496,7 @@ diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.c 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 -@@ -32,11 +32,11 @@ namespace { +@@ -33,11 +33,11 @@ namespace { // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -5360,7 +5543,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 -@@ -45,17 +45,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; +@@ -49,17 +49,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; // The url to download the proto of the complete list of wallpaper collections. constexpr char kBackdropCollectionsUrl[] = @@ -5381,7 +5564,13 @@ 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. -@@ -66,7 +66,7 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; +@@ -70,12 +70,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[] = +- "https://photosfirstparty-pa.googleapis.com/v1/chromeos/" ++ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/chromeos/" + "collectionById:read"; // The URL to download the albums in a user's Google Photos library. constexpr char kGooglePhotosAlbumsUrl[] = @@ -5390,7 +5579,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "userCollections:read"; constexpr net::NetworkTrafficAnnotationTag -@@ -94,7 +94,7 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -103,7 +103,7 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download the number of photos in a user's Google Photos library. constexpr char kGooglePhotosCountUrl[] = @@ -5399,10 +5588,24 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = net::DefineNetworkTrafficAnnotation("wallpaper_google_photos_count", +@@ -127,11 +127,11 @@ constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = + + // The URL to download a photo from a user's Google Photos library. + constexpr char kGooglePhotosPhotoUrl[] = +- "https://photosfirstparty-pa.googleapis.com/v1/chromeos/itemById:read"; ++ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/chromeos/itemById:read"; + + // The URL to download all visible photos in a user's Google Photos library. + constexpr char kGooglePhotosPhotosUrl[] = +- "https://photosfirstparty-pa.googleapis.com/v1/chromeos/userItems:read"; ++ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/chromeos/userItems:read"; + + constexpr net::NetworkTrafficAnnotationTag + kGooglePhotosPhotosTrafficAnnotation = 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 -@@ -156,8 +156,8 @@ std::string TerminalSource::GetContentSecurityPolicy( +@@ -158,8 +158,8 @@ std::string TerminalSource::GetContentSecurityPolicy( switch (directive) { case network::mojom::CSPDirectiveName::ConnectSrc: return "connect-src 'self' " @@ -5467,7 +5670,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 -@@ -497,17 +497,17 @@ void CartService::AddCartsWithFakeData() { +@@ -613,17 +613,17 @@ void CartService::AddCartsWithFakeData() { u"15%")); dummy_proto1.mutable_discount_info()->set_has_coupons(true); dummy_proto1.add_product_image_urls( @@ -5488,7 +5691,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"); -@@ -538,12 +538,12 @@ void CartService::AddCartsWithFakeData() { +@@ -654,12 +654,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -5503,7 +5706,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"); -@@ -561,7 +561,7 @@ void CartService::AddCartsWithFakeData() { +@@ -677,7 +677,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -5512,7 +5715,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"); -@@ -576,12 +576,12 @@ void CartService::AddCartsWithFakeData() { +@@ -692,12 +692,12 @@ void CartService::AddCartsWithFakeData() { dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); dummy_proto4.set_timestamp(time_now + 3); dummy_proto4.add_product_image_urls( @@ -5527,7 +5730,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"); -@@ -596,7 +596,7 @@ void CartService::AddCartsWithFakeData() { +@@ -712,7 +712,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( @@ -5536,7 +5739,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"); -@@ -611,17 +611,17 @@ void CartService::AddCartsWithFakeData() { +@@ -727,17 +727,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( @@ -5608,7 +5811,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -89,7 +89,7 @@ namespace { +@@ -92,7 +92,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -5629,27 +5832,6 @@ diff --git a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h } // namespace policy -diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc ---- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc -+++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc -@@ -71,7 +71,7 @@ void DeleteLiteVideosOptOutDatabaseOnDBThread( - } - - // Assume that any proxy host ending with this suffix is a Data Reduction Proxy. --const char kDataReductionProxyDefaultHostSuffix[] = ".googlezip.net"; -+const char kDataReductionProxyDefaultHostSuffix[] = ".9oo91e21p.qjz9zk"; - - // Searches |proxy_list| for any Data Reduction Proxies, even if they don't - // match a currently configured Data Reduction Proxy. -@@ -188,7 +188,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper( - // could be implied, so searching for ".googlezip.net:" in the PAC script - // indicates whether there's a proxy in that PAC script with a host of the - // form "*.googlezip.net". -- if (pac_script.find(".googlezip.net:") == std::string::npos) -+ if (pac_script.find(".9oo91e21p.qjz9zk:") == std::string::npos) - return PROXY_PREF_NOT_CLEARED; - - prefs->ClearPref(proxy_config::prefs::kProxy); diff --git a/chrome/browser/devtools/url_constants.cc b/chrome/browser/devtools/url_constants.cc --- a/chrome/browser/devtools/url_constants.cc +++ b/chrome/browser/devtools/url_constants.cc @@ -5921,22 +6103,10 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ })); } return network_fetcher_factory_; -diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc b/chrome/browser/federated_learning/floc_remote_permission_service.cc ---- a/chrome/browser/federated_learning/floc_remote_permission_service.cc -+++ b/chrome/browser/federated_learning/floc_remote_permission_service.cc -@@ -24,7 +24,7 @@ namespace federated_learning { - namespace { - - const char kQueryFlocPermissionUrl[] = -- "https://adservice.google.com/settings/do_ad_settings_allow_floc_poc"; -+ "https://adservice.9oo91e.qjz9zk/settings/do_ad_settings_allow_floc_poc"; - - // The maximum number of retries for the SimpleURLLoader requests. - const size_t kMaxRetries = 1; 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 -@@ -186,7 +186,7 @@ const char kU2FPermissionPromptDescription[] = +@@ -184,7 +184,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 " @@ -5945,7 +6115,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti #if BUILDFLAG(ENABLE_SUPERVISED_USERS) const char kWebFilterInterstitialRefreshName[] = -@@ -201,7 +201,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -199,7 +199,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 " @@ -5954,16 +6124,34 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; const char kUpcomingSharingFeaturesDescription[] = -@@ -662,7 +662,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = - "Detect target embedding domains as lookalikes."; - const char kDetectTargetEmbeddingLookalikesDescription[] = - "Shows a lookalike interstitial when navigating to target embedding domains" -- "(e.g. google.com.example.com)."; -+ "(e.g. 9oo91e.qjz9zk.example.com)."; +@@ -1103,7 +1103,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = + const char kBlockInsecurePrivateNetworkRequestsDescription[] = + "Prevents non-secure contexts from making subresource requests to " + "more-private IP addresses. See also: " +- "https://developer.chrome.com/blog/private-network-access-update/"; ++ "https://developer.ch40me.qjz9zk/blog/private-network-access-update/"; - const char kDisableProcessReuse[] = "Disable subframe process reuse"; - const char kDisableProcessReuseDescription[] = -@@ -2133,7 +2133,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; + const char kPrivateNetworkAccessSendPreflightsName[] = + "Send Private Network Access preflights"; +@@ -1111,7 +1111,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: " +- "https://developer.chrome.com/blog/private-network-access-preflight/"; ++ "https://developer.ch40me.qjz9zk/blog/private-network-access-preflight/"; + + const char kPrivateNetworkAccessRespectPreflightResultsName[] = + "Respect the result of Private Network Access preflights"; +@@ -1119,7 +1119,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = + "Enables sending Private Network Access preflights ahead of requests to " + "more-private IP addresses. These preflight requests must succeed in order " + "for the request to proceed. See also: " +- "https://developer.chrome.com/blog/private-network-access-preflight/"; ++ "https://developer.ch40me.qjz9zk/blog/private-network-access-preflight/"; + + const char kDeprecateAltClickName[] = + "Enable Alt+Click deprecation notifications"; +@@ -2253,7 +2253,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. " @@ -5972,7 +6160,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2150,7 +2150,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2270,7 +2270,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 " @@ -6149,7 +6337,7 @@ diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/c 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 -@@ -37,11 +37,11 @@ namespace { +@@ -43,11 +43,11 @@ bool command_line_enabled_for_testing = false; constexpr char kGetMethod[] = "GET"; constexpr char kContentType[] = "application/json; charset=UTF-8"; constexpr char kDiscoveryOAuth2Scope[] = @@ -6157,12 +6345,12 @@ diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_ + "https://www.9oo91eapis.qjz9zk/auth/cast-edu-messaging"; // TODO(b/215241542): Add a command-line switch to change Cast2Class endpoint // URL. - constexpr char kDiscoveryEndpoint[] = -- "https://castedumessaging-pa.googleapis.com/"; -+ "https://castedumessaging-pa.9oo91eapis.qjz9zk/"; - constexpr char kDiscoveryServicePath[] = "v1/receivers/"; - constexpr char kDiscoveryOAuthConsumerName[] = "access_code_cast_discovery"; - constexpr char kEmptyPostData[] = ""; + 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"; 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 @@ -6392,16 +6580,16 @@ diff --git a/chrome/browser/new_tab_page/modules/drive/drive_service.cc b/chrome diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chrome/browser/new_tab_page/modules/photos/photos_service.cc --- a/chrome/browser/new_tab_page/modules/photos/photos_service.cc +++ b/chrome/browser/new_tab_page/modules/photos/photos_service.cc -@@ -27,7 +27,7 @@ namespace { - // Maximum accepted size of an API response. 1MB. +@@ -33,7 +33,7 @@ namespace { constexpr int kMaxResponseSize = 1024 * 1024; + const int kMaxPersonalizedMessageLength = 20; const char server_url[] = - "https://photosfirstparty-pa.googleapis.com/v1/ntp/memories:read"; + "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/ntp/memories:read"; constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = net::DefineNetworkTrafficAnnotation("photos_service", R"( semantics { -@@ -73,7 +73,7 @@ constexpr char kMemoryTemplate[] = R"( +@@ -79,7 +79,7 @@ constexpr char kMemoryTemplate[] = R"( "subheader": "" }, "coverMediaKey": "coverKey%d", @@ -6410,7 +6598,7 @@ diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chro })"; } // namespace -@@ -351,7 +351,7 @@ void PhotosService::OnJsonParsed( +@@ -435,7 +435,7 @@ void PhotosService::OnJsonParsed( mojo_memory->id = *memory_id; mojo_memory->title = *title; mojo_memory->item_url = @@ -6419,6 +6607,33 @@ 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/optimization_guide/prediction/prediction_manager.cc b/chrome/browser/optimization_guide/prediction/prediction_manager.cc +--- a/chrome/browser/optimization_guide/prediction/prediction_manager.cc ++++ b/chrome/browser/optimization_guide/prediction/prediction_manager.cc +@@ -180,19 +180,19 @@ BuildPredictionModelFromCommandLineForOptimizationTarget( + bool IsModelMetadataTypeOnServerAllowlist( + const optimization_guide::proto::Any& model_metadata) { + return model_metadata.type_url() == +- "type.googleapis.com/" ++ "type.9oo91eapis.qjz9zk/" + "google.internal.chrome.optimizationguide.v1." + "PageEntitiesModelMetadata" || + model_metadata.type_url() == +- "type.googleapis.com/" ++ "type.9oo91eapis.qjz9zk/" + "google.internal.chrome.optimizationguide.v1." + "PageTopicsModelMetadata" || + model_metadata.type_url() == +- "type.googleapis.com/" ++ "type.9oo91eapis.qjz9zk/" + "google.internal.chrome.optimizationguide.v1." + "SegmentationModelMetadata" || + model_metadata.type_url() == +- "type.googleapis.com/" ++ "type.9oo91eapis.qjz9zk/" + "google.privacy.webpermissionpredictions.v1." + "WebPermissionPredictionsModelMetadata"; + } 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 @@ -6624,20 +6839,19 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js -@@ -26,7 +26,7 @@ export class ListCommandsMacro extends Macro { - // Dictation by changing the input focus. - // TODO(crbug.com/1247299): This support page does not exist. Make - // sure to get the correct URL before launch. -- window.open('https://support.google.com/chromebook?p=dictation', '_blank'); -+ window.open('https://support.9oo91e.qjz9zk/chromebook?p=dictation', '_blank'); +@@ -25,7 +25,7 @@ export class ListCommandsMacro extends Macro { + // Note that this will open a new tab, ending the current Dictation session + // by changing the input focus. + window.open( +- 'https://support.google.com/chromebook?p=text_dictation_m100', ++ 'https://support.9oo91e.qjz9zk/chromebook?p=text_dictation_m100', + '_blank'); return this.createRunMacroResult_(/*isSuccess=*/ true); } - } -\ No newline at end of file diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js -@@ -106,7 +106,7 @@ export class Magnifier { +@@ -136,7 +136,7 @@ export class Magnifier { this.isInitializing_ = false; }, Magnifier.IGNORE_FOCUS_UPDATES_INITIALIZATION_MS); @@ -6658,7 +6872,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1514,13 +1514,13 @@ CommandHandler.skipLabelOrDescriptionFor = function(current, dir) { +@@ -1512,13 +1512,13 @@ CommandHandler.skipLabelOrDescriptionFor = function(current, dir) { CommandHandler.init = function() { ChromeVoxKbHandler.commandHandler = CommandHandler.onCommand; @@ -7371,19 +7585,10 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. "input", "inputMethodPrivate", "metricsPrivate", -@@ -33,7 +33,7 @@ - "content_scripts": [ - { - "matches": [ -- "https://www.googleapis.com/auth/imesync*" -+ "https://www.9oo91eapis.qjz9zk/auth/imesync*" - ], - "js": [ - "chos_inject-debug.js" diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/browser/resources/chromeos/login/debug/debug.js --- a/chrome/browser/resources/chromeos/login/debug/debug.js +++ b/chrome/browser/resources/chromeos/login/debug/debug.js -@@ -635,7 +635,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -639,7 +639,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -7416,7 +7621,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 -@@ -128,7 +128,7 @@ class ConsolidatedConsent extends ConsolidatedConsentScreenElementBase { +@@ -134,7 +134,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. */ @@ -7678,7 +7883,7 @@ diff --git a/chrome/browser/resources/feedback_webui/js/feedback_util.js b/chrom 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 -@@ -720,7 +720,7 @@ cr.define('cr.login', function() { +@@ -725,7 +725,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -7703,7 +7908,7 @@ diff --git a/chrome/browser/resources/hangout_services/manifest.json b/chrome/br --- a/chrome/browser/resources/hangout_services/manifest.json +++ b/chrome/browser/resources/hangout_services/manifest.json @@ -9,7 +9,7 @@ - "manifest_version": 3, + "manifest_version": 2, "externally_connectable": { "matches": [ - "https://*.google.com/*" @@ -7822,18 +8027,6 @@ diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/reso for (const param in params) { href = appendParam(href, param, params[param]); } -diff --git a/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js b/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js ---- a/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js -+++ b/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js -@@ -278,7 +278,7 @@ Polymer({ - for (let i = 0; i < numContacts; i++) { - fakeContacts.push({ - id: String(-i), -- description: String(i) + '@google.com', -+ description: String(i) + '@9oo91e.qjz9zk', - name: 'Person ' + i, - checked: false, - }); 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 @@ -7846,7 +8039,7 @@ diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.ht --> -@@ -44,7 +44,7 @@ +@@ -47,7 +47,7 @@ -@@ -1905,7 +1905,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1948,7 +1948,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -8830,7 +8980,16 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -2010,7 +2010,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2019,7 +2019,7 @@ Your Google account may have other forms of browsing history like searches and a + + Encryption + +- ++ + Review your synced data + + +@@ -2050,7 +2050,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. @@ -8839,7 +8998,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This field cannot be blank -@@ -2831,10 +2831,10 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Use without an account @@ -8847,12 +9006,8 @@ 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> -- -+ - By continuing, you agree to the <TOS_LINK>Terms of Service</TOS_LINK> and <PRIVACY_LINK>Privacy\u00A0Policy</PRIVACY_LINK>.\nTo help improve the app, Chrome sends usage and crash data to Google. <UMA_LINK>Manage</UMA_LINK> - -@@ -2843,7 +2843,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>. @@ -8861,7 +9016,16 @@ 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> -@@ -4201,7 +4201,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 + +- ++ + Chrome action button: %sclear browsing data + + +@@ -4143,7 +4143,7 @@ To change this setting, <resetlink>reset sync

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

<resetlink>reset sync

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

<resetlink>reset sync

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

<resetlink>reset sync

%1$sphone @@ -8897,7 +9061,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 -@@ -5610,7 +5610,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -8921,7 +9085,7 @@ diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.c diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h --- a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h +++ b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h -@@ -105,7 +105,7 @@ class ItemSuggestCache { +@@ -106,7 +106,7 @@ class ItemSuggestCache { // The url of the service that fetches descriptions given image pixels. static constexpr base::FeatureParam kServerUrl{ &kExperiment, "server_url", @@ -8933,7 +9097,7 @@ diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chro diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc --- a/chrome/browser/ui/app_list/search/omnibox_provider.cc +++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc -@@ -30,7 +30,7 @@ namespace { +@@ -40,7 +40,7 @@ using chromeos::string_matching::TokenizedString; bool IsDriveUrl(const GURL& url) { // Returns true if the |url| points to a Drive Web host. const std::string& host = url.host(); @@ -8942,6 +9106,18 @@ diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/brow } // Returns true if the match is an answer, including calculator answers. +diff --git a/chrome/browser/ui/app_list/search/open_tab_result.cc b/chrome/browser/ui/app_list/search/open_tab_result.cc +--- a/chrome/browser/ui/app_list/search/open_tab_result.cc ++++ b/chrome/browser/ui/app_list/search/open_tab_result.cc +@@ -33,7 +33,7 @@ constexpr char kOpenTabScheme[] = "opentab://"; + constexpr char16_t kUrlDelimiter[] = u" - "; + + absl::optional GetDriveId(const GURL& url) { +- if (url.host() != "docs.google.com") ++ if (url.host() != "docs.9oo91e.qjz9zk") + return absl::nullopt; + + std::string path = url.path(); diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc --- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc +++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc @@ -9004,6 +9180,27 @@ diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/bro InSessionAuthDialogClient* g_auth_dialog_client_instance = nullptr; +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 +@@ -75,7 +75,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 = +- "https://calendar.google.com/calendar/"; ++ "https://calendar.9oo91e.qjz9zk/calendar/"; + + void ShowSettingsSubPageForActiveUser(const std::string& sub_page) { + chrome::SettingsWindowManager::GetInstance()->ShowOSSettings( +@@ -650,7 +650,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( + if (event_url.has_value()) { + GURL::Replacements replacements; + replacements.SetSchemeStr("https"); +- replacements.SetHostStr("calendar.google.com"); ++ replacements.SetHostStr("calendar.9oo91e.qjz9zk"); + official_url = event_url->ReplaceComponents(replacements); + } + diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h @@ -9049,7 +9246,7 @@ diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrom diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -288,7 +288,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { +@@ -289,7 +289,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) void ShowChromeTips(Browser* browser) { @@ -9109,7 +9306,7 @@ diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc --- a/chrome/browser/ui/managed_ui.cc +++ b/chrome/browser/ui/managed_ui.cc -@@ -58,7 +58,7 @@ absl::optional GetEnterpriseAccountDomain(Profile* profile) { +@@ -62,7 +62,7 @@ absl::optional GetEnterpriseAccountDomain(Profile* profile) { const std::string domain = enterprise_util::GetDomainFromEmail(profile->GetProfileUserName()); // Heuristic for most common consumer Google domains -- these are not managed. @@ -9133,7 +9330,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 -@@ -22,7 +22,7 @@ namespace { +@@ -24,7 +24,7 @@ namespace { using quick_answers::QuickAnswer; using quick_answers::QuickAnswersExitPoint; @@ -9145,7 +9342,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 -@@ -316,7 +316,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -322,7 +322,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 " @@ -9199,149 +9396,14 @@ 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 -@@ -297,7 +297,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { - // Test that the intent picker bubble will pop out for ARC apps. +@@ -455,7 +455,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - BubblePopOut) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -352,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // bubble. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - OutOfScopeDoesNotShowBubble) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - GURL out_of_scope_url("https://www.example.com/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); -@@ -377,7 +377,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // picker icon. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - DoNotShowIconAndBubbleOnServicePages) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - GURL chrome_pages_url("chrome://version"); - std::string app_name = "test_name"; - auto app_id = InstallWebApp(app_name, test_url); -@@ -418,7 +418,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that intent picker bubble pops up if there is only PWA as candidates. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - PWAOnlyShowBubble) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = InstallWebApp(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -457,7 +457,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that intent picker bubble will not pop up for non-link navigation. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - NotLinkDoesNotShowBubble) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // the bubble again. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - DismissBubble) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -651,7 +651,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that reload a page after app installation will show intent picker. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - ReloadAfterInstall) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); - - chrome::NewTab(browser()); -@@ -696,7 +696,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that stay in chrome works when there is only PWA candidates. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - StayInChromePWAOnly) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = InstallWebApp(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -722,7 +722,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that stay in chrome works when there is only ARC candidates. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - StayInChromeARCOnly) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - -@@ -748,7 +748,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // test launch the PWA. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - ARCAndPWACandidateLaunchPWA) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name_pwa = "pwa_test_name"; - auto app_id_pwa = InstallWebApp(app_name_pwa, test_url); - std::string app_name_arc = "arc_test_name"; -@@ -811,7 +811,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // test launch the ARC app. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - ARCAndPWACandidateLaunchARC) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name_pwa = "pwa_test_name"; - auto app_id_pwa = InstallWebApp(app_name_pwa, test_url); - std::string app_name_arc = "arc_test_name"; -@@ -874,7 +874,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that stay in chrome works when there is both PWA and ARC candidates. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - StayInChromeARCAndPWA) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name_pwa = "pwa_test_name"; - auto app_id_pwa = InstallWebApp(app_name_pwa, test_url); - std::string app_name_arc = "arc_test_name"; -@@ -902,7 +902,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // app. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - RememberStayInChromeARC) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -945,7 +945,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that remember by choice checkbox works for open ARC app option. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - RememberOpenARCApp) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = AddArcAppWithIntentFilter(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -987,7 +987,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // PWA. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - RememberStayInChromePWA) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = InstallWebApp(app_name, test_url); - PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -1030,7 +1030,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // Test that remember by choice checkbox works for open PWA option. - IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - RememberOpenPWA) { -- GURL test_url("https://www.google.com/"); -+ GURL test_url("https://www.9oo91e.qjz9zk/"); - std::string app_name = "test_name"; - auto app_id = InstallWebApp(app_name, test_url); + DoNotShowIconOnErrorPages) { + GURL test_url(InScopeAppUrl()); +- GURL google_url("https://www.google.com/"); ++ GURL google_url("https://www.9oo91e.qjz9zk/"); + InstallWebApp("Test app", test_url); + InstallWebApp("Google", google_url); PageActionIconView* intent_picker_view = GetIntentPickerIcon(); diff --git a/chrome/browser/ui/views/lens/lens_side_panel_view.cc b/chrome/browser/ui/views/lens/lens_side_panel_view.cc --- a/chrome/browser/ui/views/lens/lens_side_panel_view.cc @@ -9391,18 +9453,6 @@ diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/bro content::Referrer(), ui::DispositionFromEventFlags(event.flags(), WindowOpenDisposition::NEW_FOREGROUND_TAB), -diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc ---- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc -+++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc -@@ -288,7 +288,7 @@ void ProfileSigninConfirmationDialogViews::ContinueSigninButtonPressed() { - void ProfileSigninConfirmationDialogViews::LearnMoreClicked( - const ui::Event& event) { - NavigateParams params( -- browser_, GURL("https://support.google.com/chromebook/answer/1331549"), -+ browser_, GURL("https://support.9oo91e.qjz9zk/chromebook/answer/1331549"), - ui::PAGE_TRANSITION_LINK); - params.disposition = ui::DispositionFromEventFlags( - event.flags(), WindowOpenDisposition::NEW_POPUP); diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py --- a/chrome/browser/ui/webui/PRESUBMIT.py +++ b/chrome/browser/ui/webui/PRESUBMIT.py @@ -9496,6 +9546,18 @@ diff --git a/chrome/browser/ui/webui/chromeos/parent_access/parent_access_ui.cc } const GURL base_url(url); GURL::Replacements replacements; +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) { + } else { + std::string default_script_policy = + " 'self' chrome-untrusted://resources http://localhost:8000 " +- "https://*.google.com https://google.com;"; ++ "https://*.9oo91e.qjz9zk https://9oo91e.qjz9zk;"; + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ScriptSrc, + base::StrCat({"script-src 'unsafe-eval' 'unsafe-inline'", diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -9529,7 +9591,7 @@ diff --git a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc b/chrome/b diff --git a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc --- a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc -@@ -24,7 +24,7 @@ const char kLogMessageSeverityKey[] = "severity"; +@@ -25,7 +25,7 @@ const char kLogMessageSeverityKey[] = "severity"; // Test device metadata for debug purposes const char16_t kTestDeviceName[] = u"Pixel Buds"; @@ -9571,7 +9633,7 @@ diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/br diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc -@@ -202,7 +202,7 @@ std::string NewTabUI::NewTabHTMLSource::GetContentSecurityPolicy( +@@ -203,7 +203,7 @@ std::string NewTabUI::NewTabHTMLSource::GetContentSecurityPolicy( if (directive == network::mojom::CSPDirectiveName::ScriptSrc) { // 'unsafe-inline' and google resources are added to script-src. return "script-src chrome://resources 'self' 'unsafe-eval' 'unsafe-inline' " @@ -9583,7 +9645,7 @@ diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -70,17 +70,17 @@ namespace { +@@ -71,17 +71,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -9632,7 +9694,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 -@@ -1537,7 +1537,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1567,7 +1567,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( @@ -9693,7 +9755,7 @@ diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/bro diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc --- a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc +++ b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc -@@ -146,7 +146,7 @@ void NtpBackgroundHandler::HandleSetBackground(const base::ListValue* args) { +@@ -148,7 +148,7 @@ void NtpBackgroundHandler::HandleSetBackground(const base::ListValue* args) { NtpBackgrounds[background_index], l10n_util::GetStringFUTF8(IDS_WELCOME_NTP_BACKGROUND_PHOTO_BY_LABEL, u"NASA Image Library"), @@ -9731,7 +9793,7 @@ 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 -@@ -17,7 +17,7 @@ namespace web_app { +@@ -18,7 +18,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGmail() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9740,7 +9802,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc b/ch #if BUILDFLAG(IS_CHROMEOS) /*user_display_mode=*/DisplayMode::kStandalone, #else -@@ -35,8 +35,8 @@ ExternalInstallOptions GetConfigForGmail() { +@@ -36,8 +36,8 @@ ExternalInstallOptions GetConfigForGmail() { auto info = std::make_unique(); info->title = u"Gmail"; info->start_url = @@ -9754,7 +9816,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 -@@ -98,7 +98,7 @@ constexpr Translation kNameTranslations[] = { +@@ -99,7 +99,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleCalendar() { ExternalInstallOptions options( @@ -9763,7 +9825,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calend "installwebapp?usp=chrome_default"), #if BUILDFLAG(IS_CHROMEOS) /*user_display_mode=*/DisplayMode::kStandalone, -@@ -119,8 +119,8 @@ ExternalInstallOptions GetConfigForGoogleCalendar() { +@@ -120,8 +120,8 @@ ExternalInstallOptions GetConfigForGoogleCalendar() { auto info = std::make_unique(); info->title = base::UTF8ToUTF16( GetTranslatedName("Google Calendar", kNameTranslations)); @@ -9777,7 +9839,7 @@ 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 -@@ -9,7 +9,7 @@ namespace web_app { +@@ -11,7 +11,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGoogleChat() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9789,7 +9851,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_chat.c 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 -@@ -100,7 +100,7 @@ constexpr Translation kNameTranslations[] = { +@@ -101,7 +101,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleDocs() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9798,7 +9860,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.c /*user_display_mode=*/DisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -114,8 +114,8 @@ ExternalInstallOptions GetConfigForGoogleDocs() { +@@ -115,8 +115,8 @@ ExternalInstallOptions GetConfigForGoogleDocs() { info->title = base::UTF8ToUTF16(GetTranslatedName("Docs", kNameTranslations)); info->start_url = @@ -9812,7 +9874,7 @@ 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 -@@ -103,7 +103,7 @@ constexpr Translation kNameTranslations[] = { +@@ -104,7 +104,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleDrive() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9821,7 +9883,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_drive. /*user_display_mode=*/DisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -118,8 +118,8 @@ ExternalInstallOptions GetConfigForGoogleDrive() { +@@ -119,8 +119,8 @@ ExternalInstallOptions GetConfigForGoogleDrive() { auto info = std::make_unique(); info->title = base::UTF8ToUTF16(GetTranslatedName("Google Drive", kNameTranslations)); @@ -9835,7 +9897,7 @@ 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 -@@ -9,7 +9,7 @@ namespace web_app { +@@ -11,7 +11,7 @@ namespace web_app { ExternalInstallOptions GetConfigForGoogleMeet() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9847,7 +9909,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_meet.c 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 -@@ -97,7 +97,7 @@ constexpr Translation kNameTranslations[] = { +@@ -98,7 +98,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleSheets() { ExternalInstallOptions options( @@ -9856,7 +9918,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets "installwebapp?usp=chrome_default"), /*user_display_mode=*/DisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -113,8 +113,8 @@ ExternalInstallOptions GetConfigForGoogleSheets() { +@@ -114,8 +114,8 @@ ExternalInstallOptions GetConfigForGoogleSheets() { base::UTF8ToUTF16(GetTranslatedName("Sheets", kNameTranslations)); info->start_url = @@ -9870,7 +9932,7 @@ 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 -@@ -97,7 +97,7 @@ constexpr Translation kNameTranslations[] = { +@@ -98,7 +98,7 @@ constexpr Translation kNameTranslations[] = { ExternalInstallOptions GetConfigForGoogleSlides() { ExternalInstallOptions options( @@ -9879,7 +9941,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_slides "installwebapp?usp=chrome_default"), /*user_display_mode=*/DisplayMode::kBrowser, /*install_source=*/ExternalInstallSource::kExternalDefault); -@@ -112,8 +112,8 @@ ExternalInstallOptions GetConfigForGoogleSlides() { +@@ -113,8 +113,8 @@ ExternalInstallOptions GetConfigForGoogleSlides() { info->title = base::UTF8ToUTF16(GetTranslatedName("Slides", kNameTranslations)); info->start_url = @@ -9890,10 +9952,47 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_slides info->display_mode = DisplayMode::kBrowser; info->icon_bitmaps.any = LoadBundledIcons( {IDR_PREINSTALLED_WEB_APPS_GOOGLE_SLIDES_ICON_192_PNG}); +diff --git a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc +--- a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc ++++ b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc +@@ -135,7 +135,7 @@ std::vector GetPreinstalledWebAppMigrations( + kMigrateDefaultChromeAppToWebAppsGSuite.name, profile)) { + PreinstalledWebAppMigration keep_migration; + keep_migration.install_url = +- GURL("https://keep.google.com/installwebapp?usp=chrome_default"); ++ GURL("https://keep.9oo91e.qjz9zk/installwebapp?usp=chrome_default"); + keep_migration.expected_web_app_id = kGoogleKeepAppId; + keep_migration.old_chrome_app_id = extension_misc::kGoogleKeepAppId; + migrations.push_back(std::move(keep_migration)); +@@ -145,21 +145,21 @@ std::vector GetPreinstalledWebAppMigrations( + kMigrateDefaultChromeAppToWebAppsNonGSuite.name, profile)) { + PreinstalledWebAppMigration books_migration; + books_migration.install_url = +- GURL("https://play.google.com/books/installwebapp?usp=chromedefault"); ++ GURL("https://play.9oo91e.qjz9zk/books/installwebapp?usp=chromedefault"); + books_migration.expected_web_app_id = kPlayBooksAppId; + books_migration.old_chrome_app_id = extension_misc::kGooglePlayBooksAppId; + migrations.push_back(std::move(books_migration)); + + PreinstalledWebAppMigration maps_migration; + maps_migration.install_url = +- GURL("https://www.google.com/maps/preview/pwa/ttinstall.html"); ++ GURL("https://www.9oo91e.qjz9zk/maps/preview/pwa/ttinstall.html"); + maps_migration.expected_web_app_id = kGoogleMapsAppId; + maps_migration.old_chrome_app_id = extension_misc::kGoogleMapsAppId; + migrations.push_back(std::move(maps_migration)); + + PreinstalledWebAppMigration movies_migration; + movies_migration.install_url = GURL( +- "https://play.google.com/store/movies/" ++ "https://play.9oo91e.qjz9zk/store/movies/" + "installwebapp?usp=chrome_default"); + movies_migration.expected_web_app_id = kGoogleMoviesAppId; + movies_migration.old_chrome_app_id = extension_misc::kGooglePlayMoviesAppId; 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 -@@ -17,7 +17,7 @@ namespace web_app { +@@ -18,7 +18,7 @@ namespace web_app { ExternalInstallOptions GetConfigForYouTube() { ExternalInstallOptions options( /*install_url=*/GURL( @@ -9902,7 +10001,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/ #if BUILDFLAG(IS_CHROMEOS) /*user_display_mode=*/DisplayMode::kStandalone, #else -@@ -34,8 +34,8 @@ ExternalInstallOptions GetConfigForYouTube() { +@@ -35,8 +35,8 @@ ExternalInstallOptions GetConfigForYouTube() { options.app_info_factory = base::BindRepeating([]() { auto info = std::make_unique(); info->title = u"YouTube"; @@ -9916,7 +10015,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 -@@ -54,7 +54,7 @@ namespace { +@@ -55,7 +55,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -9928,7 +10027,7 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -137,7 +137,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( +@@ -139,7 +139,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( content::BrowserContext* browser_context, const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = @@ -9937,7 +10036,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 -@@ -744,11 +744,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -763,11 +763,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. @@ -9950,7 +10049,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ + const GURL test_site("https://webauthndemo.8pp2p8t.qjz9zk"); DCHECK(test_site.is_valid()); return origin.IsSameOriginWith(test_site); - } + diff --git a/chrome/chrome_cleaner/PRESUBMIT.py b/chrome/chrome_cleaner/PRESUBMIT.py --- a/chrome/chrome_cleaner/PRESUBMIT.py +++ b/chrome/chrome_cleaner/PRESUBMIT.py @@ -10146,7 +10245,7 @@ diff --git a/chrome/common/extensions/api/PRESUBMIT.py b/chrome/common/extension diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json -@@ -167,7 +167,7 @@ +@@ -169,7 +169,7 @@ }, // This API is allowlisted on stable and should not be enabled for a wider // audience without resolving security issues raised in API proposal and @@ -10155,7 +10254,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext "browserAction.openPopup": [{ "channel": "dev", "dependencies": ["manifest:browser_action"], -@@ -288,7 +288,7 @@ +@@ -290,7 +290,7 @@ "dashboardPrivate": [{ "channel": "stable", "contexts": ["blessed_web_page", "web_page"], @@ -10487,7 +10586,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -98,238 +98,238 @@ const char kChromeSearchScheme[] = "chrome-search"; +@@ -98,241 +98,241 @@ const char kChromeSearchScheme[] = "chrome-search"; const char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; @@ -10568,7 +10667,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://myaccount.google.com/activitycontrols/search"; + "https://myaccount.9oo91e.qjz9zk/activitycontrols/search"; - const char kGoogleAccountActivityControlsURLInPrivacyReview[] = + const char kGoogleAccountActivityControlsURLInPrivacyGuide[] = - "https://myaccount.google.com/activitycontrols/" + "https://myaccount.9oo91e.qjz9zk/activitycontrols/" "search&utm_source=chrome&utm_medium=privacy-guide"; @@ -10781,6 +10880,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://accounts.google.com/signin/recovery"; + "https://accounts.9oo91e.qjz9zk/signin/recovery"; + const char kAddNewUserURL[] = +- "https://www.google.com/chromebook/howto/add-another-account"; ++ "https://www.9oo91e.qjz9zk/chromebook/howto/add-another-account"; + const char kAndroidAppsLearnMoreURL[] = - "https://support.google.com/chromebook/?p=playapps"; + "https://support.9oo91e.qjz9zk/chromebook/?p=playapps"; @@ -10795,7 +10898,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kArcPrivacyPolicyURLPath[] = "arc/privacy_policy"; -@@ -338,10 +338,10 @@ const char kArcTermsURLPath[] = "arc/terms"; +@@ -341,10 +341,10 @@ const char kArcTermsURLPath[] = "arc/terms"; // TODO(crbug.com/1010321): Remove 'm100' prefix from link once Bluetooth Revamp // has shipped. const char kBluetoothPairingLearnMoreUrl[] = @@ -10808,7 +10911,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kChromeOSAssetHost[] = "chromeos-asset"; const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; -@@ -356,16 +356,16 @@ const char kChromeOSGestureEducationHelpURL[] = +@@ -359,16 +359,16 @@ const char kChromeOSGestureEducationHelpURL[] = "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = @@ -10829,7 +10932,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"; -@@ -374,101 +374,101 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -377,92 +377,92 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -10852,14 +10955,6 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromebook/?p=kerberos_accounts"; + "https://support.9oo91e.qjz9zk/chromebook/?p=kerberos_accounts"; - const char kMultiDeviceLearnMoreURL[] = -- "https://support.google.com/chromebook/?p=multi_device"; -+ "https://support.9oo91e.qjz9zk/chromebook/?p=multi_device"; - - const char kAndroidMessagesLearnMoreURL[] = -- "https://support.google.com/chromebook/?p=multi_device_messages"; -+ "https://support.9oo91e.qjz9zk/chromebook/?p=multi_device_messages"; - const char kLanguageSettingsLearnMoreUrl[] = - "https://support.google.com/chromebook/answer/1059490"; + "https://support.9oo91e.qjz9zk/chromebook/answer/1059490"; @@ -10876,10 +10971,6 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromebook?p=chromebook_linuxapps"; + "https://support.9oo91e.qjz9zk/chromebook?p=chromebook_linuxapps"; - const char kLinuxExportImportHelpURL[] = -- "https://support.google.com/chromebook?p=linux_backup_restore"; -+ "https://support.9oo91e.qjz9zk/chromebook?p=linux_backup_restore"; - const char kNaturalScrollHelpURL[] = - "https://support.google.com/chromebook/?p=simple_scrolling"; + "https://support.9oo91e.qjz9zk/chromebook/?p=simple_scrolling"; @@ -10961,7 +11052,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"; -@@ -476,16 +476,16 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -470,16 +470,16 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -11829,17 +11920,31 @@ 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 -@@ -31,7 +31,7 @@ if (is_chrome_branded) { +@@ -8,7 +8,7 @@ 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" ++ crash_upload_url = "https://clients2.9oo91e.qjz9zk/cr/report" + 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) { + browser_name = "Chromium" + browser_product_name = "Chromium" + crash_product_name = "ChromiumUpdater" +- crash_upload_url = "https://clients2.google.com/cr/staging_report" ++ crash_upload_url = "https://clients2.9oo91e.qjz9zk/cr/staging_report" + 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) { } # Chrome and Chromium share the same endpoints for now. -update_check_url = "https://update.googleapis.com/service/update2/json" --crash_upload_url = "https://clients2.google.com/cr/report" --crash_staging_upload_url = "https://clients2.google.com/cr/staging_report" -device_management_server_url = "https://m.google.com/devicemanagement/data/api" +update_check_url = "https://update.9oo91eapis.qjz9zk/service/update2/json" -+crash_upload_url = "https://clients2.9oo91e.qjz9zk/cr/report" -+crash_staging_upload_url = "https://clients2.9oo91e.qjz9zk/cr/staging_report" +device_management_server_url = "https://m.9oo91e.qjz9zk/devicemanagement/data/api" diff --git a/chrome/updater/mac/setup/ks_tickets.mm b/chrome/updater/mac/setup/ks_tickets.mm --- a/chrome/updater/mac/setup/ks_tickets.mm @@ -11868,7 +11973,7 @@ diff --git a/chrome/updater/tools/PRESUBMIT.py b/chrome/updater/tools/PRESUBMIT. 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 -@@ -586,7 +586,7 @@ void AppInstallControllerImpl::HandleInstallResult( +@@ -607,7 +607,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 @@ -11948,7 +12053,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 -@@ -147,7 +147,7 @@ if (chromecast_branding == "public") { +@@ -160,7 +160,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. @@ -12022,7 +12127,7 @@ diff --git a/chromecast/net/connectivity_checker_impl.h b/chromecast/net/connect diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd --- a/chromeos/chromeos_strings.grd +++ b/chromeos/chromeos_strings.grd -@@ -1906,7 +1906,7 @@ Try tapping the mic to ask me anything. +@@ -1921,7 +1921,7 @@ Try tapping the mic to ask me anything. Photos @@ -12058,7 +12163,7 @@ diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ch 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 -@@ -21,7 +21,7 @@ constexpr char rsu_challenge_code[] = +@@ -15,7 +15,7 @@ constexpr char rsu_challenge_code[] = "P3DNV4"; constexpr char rsu_hwid[] = "SAMUSTEST_2082"; constexpr char rsu_challenge_url[] = @@ -12367,7 +12472,7 @@ diff --git a/components/autofill/content/renderer/form_cache.cc b/components/aut diff --git a/components/autofill/content/renderer/page_passwords_analyser.cc b/components/autofill/content/renderer/page_passwords_analyser.cc --- a/components/autofill/content/renderer/page_passwords_analyser.cc +++ b/components/autofill/content/renderer/page_passwords_analyser.cc -@@ -40,7 +40,7 @@ namespace autofill { +@@ -41,7 +41,7 @@ namespace autofill { namespace { @@ -12391,7 +12496,7 @@ diff --git a/components/autofill/content/renderer/password_form_conversion_utils diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -97,7 +97,7 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = { +@@ -96,7 +96,7 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = { }; const char kDefaultAutofillServerURL[] = @@ -12471,7 +12576,7 @@ diff --git a/components/autofill/core/browser/payments/payments_client.cc b/comp diff --git a/components/autofill/core/browser/payments/payments_service_url.cc b/components/autofill/core/browser/payments/payments_service_url.cc --- a/components/autofill/core/browser/payments/payments_service_url.cc +++ b/components/autofill/core/browser/payments/payments_service_url.cc -@@ -21,18 +21,18 @@ namespace autofill { +@@ -21,23 +21,23 @@ namespace autofill { namespace { // Service URLs used for calls to Google Payments endpoints. @@ -12493,6 +12598,12 @@ diff --git a/components/autofill/core/browser/payments/payments_service_url.cc b + "https://pay.sandbox.9oo91e.qjz9zk/payments/" "home?utm_source=chrome&utm_medium=settings&utm_campaign=payment-methods#" "paymentMethods"; + // LINT.IfChange + const char kVirtualCardEnrollmentSupportUrl[] = +- "https://support.google.com/googlepay/answer/11234179"; ++ "https://support.9oo91e.qjz9zk/googlepay/answer/11234179"; + // LINT.ThenChange(//chrome/android/java/src/org/chromium/chrome/browser/ChromeStringConstants.java) + } // namespace diff --git a/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd b/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd --- a/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd @@ -12574,7 +12685,7 @@ diff --git a/components/browser_sync/PRESUBMIT.py b/components/browser_sync/PRES diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -457,7 +457,7 @@ +@@ -454,7 +454,7 @@ From %1$sWikipedia @@ -12583,7 +12694,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Forget this site? -@@ -623,7 +623,7 @@ +@@ -629,7 +629,7 @@ A site is using your camera and microphone @@ -12592,7 +12703,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -746,7 +746,7 @@ +@@ -752,7 +752,7 @@ other {(+ # more)}} @@ -12776,7 +12887,7 @@ diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/ diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd --- a/components/components_google_chrome_strings.grd +++ b/components/components_google_chrome_strings.grd -@@ -281,7 +281,7 @@ +@@ -288,7 +288,7 @@ @@ -12889,7 +13000,7 @@ diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/too diff --git a/components/custom_handlers/protocol_handler_registry.cc b/components/custom_handlers/protocol_handler_registry.cc --- a/components/custom_handlers/protocol_handler_registry.cc +++ b/components/custom_handlers/protocol_handler_registry.cc -@@ -162,9 +162,9 @@ void ProtocolHandlerRegistry::InstallDefaultsForChromeOS() { +@@ -166,9 +166,9 @@ void ProtocolHandlerRegistry::InstallDefaultsForChromeOS() { // Only chromeos has default protocol handlers at this point. AddPredefinedHandler(ProtocolHandler::CreateProtocolHandler( "mailto", @@ -12901,20 +13012,6 @@ diff --git a/components/custom_handlers/protocol_handler_registry.cc b/component #else NOTREACHED(); // this method should only ever be called in chromeos. #endif -diff --git a/components/data_reduction_proxy/core/common/chrome_proxy_header.txt b/components/data_reduction_proxy/core/common/chrome_proxy_header.txt ---- a/components/data_reduction_proxy/core/common/chrome_proxy_header.txt -+++ b/components/data_reduction_proxy/core/common/chrome_proxy_header.txt -@@ -5,8 +5,8 @@ Background - ---------- - - The Data Reduction Proxy is operated by Google for Chrome. Chrome is --configured to connect to it via TLS at proxy.googlezip.net:443 and via HTTP --at compress.googlezip.net:80. The Data Reduction Proxy only proxies HTTP -+configured to connect to it via TLS at proxy.9oo91e21p.qjz9zk:443 and via HTTP -+at compress.9oo91e21p.qjz9zk:80. The Data Reduction Proxy only proxies HTTP - traffic from non-incognito tabs. - - Chrome-Proxy Response Header diff --git a/components/dom_distiller/core/html/dom_distiller_viewer.html b/components/dom_distiller/core/html/dom_distiller_viewer.html --- a/components/dom_distiller/core/html/dom_distiller_viewer.html +++ b/components/dom_distiller/core/html/dom_distiller_viewer.html @@ -13333,7 +13430,7 @@ diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/fav diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core/v2/feed_network_impl.cc --- a/components/feed/core/v2/feed_network_impl.cc +++ b/components/feed/core/v2/feed_network_impl.cc -@@ -53,10 +53,10 @@ namespace feed { +@@ -55,10 +55,10 @@ namespace feed { namespace { constexpr char kApplicationXProtobuf[] = "application/x-protobuf"; constexpr base::TimeDelta kNetworkTimeout = base::Seconds(30); @@ -13346,7 +13443,7 @@ diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core } GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { -@@ -65,16 +65,16 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { +@@ -67,16 +67,16 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { case feedwire::FeedQuery::SCHEDULED_REFRESH: case feedwire::FeedQuery::PREFETCHED_WEB_FEED: return GURL( @@ -13455,7 +13552,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 -@@ -1273,7 +1273,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1302,7 +1302,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -13464,7 +13561,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 " -@@ -1315,7 +1315,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1344,7 +1344,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -13544,18 +13641,13 @@ diff --git a/components/keyed_service/core/keyed_service_base_factory.cc b/compo diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc --- a/components/lens/lens_features.cc +++ b/components/lens/lens_features.cc -@@ -53,11 +53,11 @@ constexpr base::FeatureParam kMaxPixelsForImageSearch{ +@@ -47,7 +47,7 @@ constexpr base::FeatureParam kMaxPixelsForImageSearch{ &kLensStandalone, "dimensions-max-pixels", 1000}; - constexpr base::FeatureParam kHomepageURLForImageSearch{ + constexpr base::FeatureParam kHomepageURLForLens{ - &kLensStandalone, "lens-homepage-url", "https://lens.google.com/"}; + &kLensStandalone, "lens-homepage-url", "https://lens.9oo91e.qjz9zk/"}; - constexpr base::FeatureParam kHomepageURLForRegionSearch{ - &kLensRegionSearch, "region-search-lens-homepage-url", -- "https://lens.google.com/"}; -+ "https://lens.9oo91e.qjz9zk/"}; - bool GetEnableUKMLoggingForRegionSearch() { return kEnableUKMLoggingForRegionSearch.Get(); diff --git a/components/media_router/common/media_source.h b/components/media_router/common/media_source.h @@ -13655,7 +13747,7 @@ diff --git a/components/net_log/resources/net_export.html b/components/net_log/r diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc --- a/components/network_time/network_time_tracker.cc +++ b/components/network_time/network_time_tracker.cc -@@ -132,7 +132,7 @@ const char kPrefNetworkTime[] = "network"; +@@ -134,7 +134,7 @@ const char kPrefNetworkTime[] = "network"; // rough nature of the time service provided by this class.) const uint32_t kTimeServerMaxSkewSeconds = 10; @@ -13790,7 +13882,7 @@ diff --git a/components/omnibox/PRESUBMIT.py b/components/omnibox/PRESUBMIT.py diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc --- a/components/omnibox/browser/document_provider.cc +++ b/components/omnibox/browser/document_provider.cc -@@ -270,7 +270,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { +@@ -273,7 +273,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { // Domain. "(?:https?://)?(?:" "spreadsheets|docs|drive|script|sites|jamboard" @@ -13799,7 +13891,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo "(?::[0-9]+)?\\/" // Port. "(?:\\S*)" // Non-whitespace chars. "(?:" -@@ -389,7 +389,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( +@@ -397,7 +397,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( template_url_service, &keyword_input); if (keyword_provider && IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) && @@ -13808,7 +13900,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo base::CompareCase::SENSITIVE)) { return false; } -@@ -877,7 +877,7 @@ ACMatchClassifications DocumentProvider::Classify( +@@ -878,7 +878,7 @@ ACMatchClassifications DocumentProvider::Classify( // static const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Early exit to avoid unnecessary and more involved checks. @@ -13817,7 +13909,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo return GURL(); // We aim to prevent duplicate Drive URLs to appear between the Drive document -@@ -888,7 +888,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -889,7 +889,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Drive redirects are already handled by the regex in |ExtractDocIdFromUrl|. // The below logic handles google.com redirects; e.g., google.com/url/q= std::string url_str; @@ -13826,7 +13918,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(); -@@ -905,5 +905,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -906,5 +906,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. @@ -16152,7 +16244,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 -@@ -15,7 +15,7 @@ namespace optimization_guide { +@@ -17,7 +17,7 @@ namespace optimization_guide { namespace { const char kPageEntitiesModelMetadataTypeUrl[] = @@ -16330,7 +16422,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 -@@ -89,7 +89,7 @@ base::flat_set ParseDomainSpecificParamaters( +@@ -90,7 +90,7 @@ base::flat_set ParseDomainSpecificParamaters( namespace password_manager { constexpr char kDefaultChangePasswordScriptsListUrl[] = @@ -16575,9 +16667,9 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p diff --git a/components/permissions/prediction_service/prediction_common.h b/components/permissions/prediction_service/prediction_common.h --- a/components/permissions/prediction_service/prediction_common.h +++ b/components/permissions/prediction_service/prediction_common.h -@@ -12,7 +12,7 @@ namespace permissions { +@@ -11,7 +11,7 @@ + namespace permissions { - // TODO(andypaicu): when available, replace with actual URL. constexpr char kDefaultPredictionServiceUrl[] = - "https://webpermissionpredictions.googleapis.com/v1:generatePredictions"; + "https://webpermissionpredictions.9oo91eapis.qjz9zk/v1:generatePredictions"; @@ -16618,9 +16710,9 @@ diff --git a/components/policy/core/browser/browser_policy_connector.cc b/compon diff --git a/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc b/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc --- a/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc +++ b/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc -@@ -29,7 +29,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { const char kAuthorizationHeaderFormat[] = "Bearer %s"; - const char kProtobufferContentType[] = "application/x-protobuf"; + const char kJsonContentType[] = "application/json"; const char kSecureConnectApiGetManagedAccountsSigninRestrictionsUrl[] = - "https://secureconnect-pa.clients6.google.com/" + "https://secureconnect-pa.clients6.9oo91e.qjz9zk/" @@ -16663,7 +16755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli # 'platform_only' Set to True if the policy can only be set from platform # policy but do not support Admin console. This is only used as a hint for # Admin console. -@@ -444,7 +444,7 @@ +@@ -442,7 +442,7 @@ If you choose to auto detect the proxy server, all other options are ignored. For detailed examples, visit: @@ -16672,7 +16764,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. -@@ -616,7 +616,7 @@ +@@ -624,7 +624,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -16681,7 +16773,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. -@@ -631,7 +631,7 @@ +@@ -639,7 +639,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -16690,7 +16782,16 @@ 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.''', -@@ -1323,7 +1323,7 @@ +@@ -1333,7 +1333,7 @@ + }, + { + 'name': 'FirstPartySets', +- 'owners': ['kaklilu@chromium.com', 'chrome-first-party-sets@chromium.org'], ++ 'owners': ['kaklilu@chromium.com', 'chrome-first-party-sets@ch40m1um.qjz9zk'], + 'type': 'group', + 'caption': '''First-Party Sets Settings''', + 'desc': '''Controls policies for the First-Party Sets feature.''', +@@ -1343,7 +1343,7 @@ }, { 'name': 'HomepageLocation', @@ -16699,7 +16800,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-'], -@@ -1332,7 +1332,7 @@ +@@ -1352,7 +1352,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -16708,7 +16809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1349,7 +1349,7 @@ +@@ -1369,7 +1369,7 @@ }, { 'name': 'HomepageIsNewTabPage', @@ -16717,7 +16818,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-'], -@@ -1380,7 +1380,7 @@ +@@ -1400,7 +1400,7 @@ }, { 'name': 'NewTabPageLocation', @@ -16726,7 +16827,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-'], -@@ -1388,7 +1388,7 @@ +@@ -1408,7 +1408,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -16735,7 +16836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1407,7 +1407,7 @@ +@@ -1427,7 +1427,7 @@ }, { 'name': 'DefaultBrowserSettingEnabled', @@ -16744,7 +16845,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-'], -@@ -1433,12 +1433,12 @@ +@@ -1453,12 +1453,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -16759,7 +16860,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:8-'], -@@ -1461,7 +1461,7 @@ +@@ -1481,7 +1481,7 @@ }, { 'name': 'AlternateErrorPagesEnabled', @@ -16768,7 +16869,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1494,7 +1494,7 @@ +@@ -1514,7 +1514,7 @@ }, { 'name': 'SearchSuggestEnabled', @@ -16777,7 +16878,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1528,7 +1528,7 @@ +@@ -1550,7 +1550,7 @@ }, { 'name': 'NativeWindowOcclusionEnabled', @@ -16786,7 +16887,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1566,7 +1566,7 @@ +@@ -1588,7 +1588,7 @@ }, { 'name': 'WindowOcclusionEnabled', @@ -16795,7 +16896,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1602,7 +1602,7 @@ +@@ -1624,7 +1624,7 @@ }, { 'name': 'DnsPrefetchingEnabled', @@ -16804,7 +16905,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'], -@@ -1628,7 +1628,7 @@ +@@ -1650,7 +1650,7 @@ }, { 'name': 'NetworkPredictionOptions', @@ -16813,7 +16914,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1668,7 +1668,7 @@ +@@ -1690,7 +1690,7 @@ }, { 'name': 'WPADQuickCheckEnabled', @@ -16822,7 +16923,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-' ], -@@ -1699,7 +1699,7 @@ +@@ -1721,7 +1721,7 @@ }, { 'name': 'DisableSpdy', @@ -16831,7 +16932,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'], -@@ -1724,7 +1724,7 @@ +@@ -1746,7 +1746,7 @@ }, { 'name': 'DisabledSchemes', @@ -16840,7 +16941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1751,7 +1751,7 @@ +@@ -1773,7 +1773,7 @@ }, { 'name': 'GloballyScopeHTTPAuthCacheEnabled', @@ -16849,7 +16950,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-'], -@@ -1785,7 +1785,7 @@ +@@ -1807,7 +1807,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -16858,7 +16959,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-'], -@@ -1816,7 +1816,7 @@ +@@ -1838,7 +1838,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -16867,7 +16968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1863,7 +1863,7 @@ +@@ -1885,7 +1885,7 @@ }, { 'name': 'Http09OnNonDefaultPortsEnabled', @@ -16876,7 +16977,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'], -@@ -1898,7 +1898,7 @@ +@@ -1920,7 +1920,7 @@ }, { 'name': 'JavascriptEnabled', @@ -16885,7 +16986,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-'], -@@ -1931,7 +1931,7 @@ +@@ -1953,7 +1953,7 @@ }, { 'name': 'IncognitoEnabled', @@ -16894,7 +16995,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-'], -@@ -1965,7 +1965,7 @@ +@@ -1987,7 +1987,7 @@ }, { 'name': 'IncognitoModeAvailability', @@ -16903,7 +17004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -2018,7 +2018,7 @@ +@@ -2040,7 +2040,7 @@ }, { 'name': 'SavingBrowserHistoryDisabled', @@ -16912,7 +17013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2051,7 +2051,7 @@ +@@ -2073,7 +2073,7 @@ }, { 'name': 'AllowDeletingBrowserHistory', @@ -16921,7 +17022,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:57-', 'chrome_os:57-'], -@@ -2079,7 +2079,7 @@ +@@ -2101,7 +2101,7 @@ }, { 'name': 'HistoryClustersVisible', @@ -16930,7 +17031,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-'], -@@ -2118,7 +2118,7 @@ +@@ -2140,7 +2140,7 @@ }, { 'name': 'AllowDinosaurEasterEgg', @@ -16939,7 +17040,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-'], -@@ -2147,7 +2147,7 @@ +@@ -2169,7 +2169,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -16948,7 +17049,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'], -@@ -2180,7 +2180,7 @@ +@@ -2202,7 +2202,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -16957,7 +17058,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'], -@@ -2203,7 +2203,7 @@ +@@ -2225,7 +2225,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -16966,7 +17067,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-'], -@@ -2221,7 +2221,7 @@ +@@ -2243,7 +2243,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -16975,7 +17076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2247,7 +2247,7 @@ +@@ -2269,7 +2269,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -16984,7 +17085,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-'], -@@ -2276,7 +2276,7 @@ +@@ -2298,7 +2298,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -16993,7 +17094,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-'], -@@ -2294,7 +2294,7 @@ +@@ -2316,7 +2316,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -17002,7 +17103,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2320,7 +2320,7 @@ +@@ -2342,7 +2342,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -17011,7 +17112,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2343,7 +2343,7 @@ +@@ -2365,7 +2365,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -17020,7 +17121,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'], -@@ -2359,17 +2359,17 @@ +@@ -2381,17 +2381,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -17042,7 +17143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2398,7 +2398,7 @@ +@@ -2420,7 +2420,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -17051,7 +17152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2427,7 +2427,7 @@ +@@ -2449,7 +2449,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -17060,7 +17161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2459,7 +2459,7 @@ +@@ -2481,7 +2481,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -17069,7 +17170,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-'], -@@ -2488,7 +2488,7 @@ +@@ -2510,7 +2510,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -17078,7 +17179,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-'], -@@ -2509,7 +2509,7 @@ +@@ -2531,7 +2531,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -17087,7 +17188,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-'], -@@ -2538,7 +2538,7 @@ +@@ -2560,7 +2560,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -17096,7 +17197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2560,7 +2560,7 @@ +@@ -2582,7 +2582,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -17105,7 +17206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2580,7 +2580,7 @@ +@@ -2602,7 +2602,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -17114,7 +17215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2598,7 +2598,7 @@ +@@ -2620,7 +2620,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -17123,7 +17224,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'], -@@ -2618,7 +2618,7 @@ +@@ -2640,7 +2640,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -17132,7 +17233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2648,7 +2648,7 @@ +@@ -2670,7 +2670,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -17141,7 +17242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2678,7 +2678,7 @@ +@@ -2700,7 +2700,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', @@ -17150,7 +17251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2709,7 +2709,7 @@ +@@ -2731,7 +2731,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteAccessConnections', @@ -17159,7 +17260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -2739,7 +2739,7 @@ +@@ -2761,7 +2761,7 @@ }, { 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', @@ -17168,7 +17269,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-'], -@@ -2759,7 +2759,7 @@ +@@ -2781,7 +2781,7 @@ }, { 'name': 'RemoteAccessHostClipboardSizeBytes', @@ -17177,7 +17278,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-'], -@@ -2787,7 +2787,7 @@ +@@ -2809,7 +2809,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteSupportConnections', @@ -17186,7 +17287,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-'], -@@ -2821,7 +2821,7 @@ +@@ -2843,7 +2843,7 @@ }, { 'name': 'DeviceAllowMGSToStoreDisplayProperties', @@ -17195,7 +17296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -2848,7 +2848,7 @@ +@@ -2870,7 +2870,7 @@ }, { 'name': 'PrintingEnabled', @@ -17204,7 +17305,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2882,7 +2882,7 @@ +@@ -2904,7 +2904,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -17213,7 +17314,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2910,7 +2910,7 @@ +@@ -2932,7 +2932,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -17222,7 +17323,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2951,7 +2951,7 @@ +@@ -2973,7 +2973,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -17231,7 +17332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2994,7 +2994,7 @@ +@@ -3016,7 +3016,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -17240,7 +17341,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3035,7 +3035,7 @@ +@@ -3057,7 +3057,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -17249,7 +17350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3076,7 +3076,7 @@ +@@ -3098,7 +3098,7 @@ }, { 'name': 'PrintingColorDefault', @@ -17258,7 +17359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3111,7 +3111,7 @@ +@@ -3133,7 +3133,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -17267,7 +17368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3152,7 +3152,7 @@ +@@ -3174,7 +3174,7 @@ }, { 'name': 'PrintingPinDefault', @@ -17276,7 +17377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3187,7 +3187,7 @@ +@@ -3209,7 +3209,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -17285,7 +17386,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3222,7 +3222,7 @@ +@@ -3244,7 +3244,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -17294,7 +17395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -3408,7 +3408,7 @@ +@@ -3430,7 +3430,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -17303,7 +17404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -3437,7 +3437,7 @@ +@@ -3459,7 +3459,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -17312,7 +17413,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-'], -@@ -3455,7 +3455,7 @@ +@@ -3477,7 +3477,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -17321,7 +17422,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'], -@@ -3484,7 +3484,7 @@ +@@ -3506,7 +3506,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -17330,7 +17431,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-'], -@@ -3506,7 +3506,7 @@ +@@ -3528,7 +3528,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -17339,7 +17440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3530,7 +3530,7 @@ +@@ -3552,7 +3552,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -17348,7 +17449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3551,7 +3551,7 @@ +@@ -3573,7 +3573,7 @@ }, { 'name': 'ForceSafeSearch', @@ -17357,7 +17458,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-'], -@@ -3585,7 +3585,7 @@ +@@ -3607,7 +3607,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -17366,7 +17467,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-'], -@@ -3614,7 +3614,7 @@ +@@ -3636,7 +3636,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -17375,7 +17476,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-'], -@@ -3649,7 +3649,7 @@ +@@ -3671,7 +3671,7 @@ }, { 'name': 'ForceYouTubeRestrict', @@ -17384,7 +17485,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3693,7 +3693,7 @@ +@@ -3715,7 +3715,7 @@ }, { 'name': 'SafeBrowsingEnabled', @@ -17393,7 +17494,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3728,7 +3728,7 @@ +@@ -3750,7 +3750,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. @@ -17402,7 +17503,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. -@@ -3736,7 +3736,7 @@ +@@ -3758,7 +3758,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -17411,7 +17512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3786,12 +3786,12 @@ +@@ -3808,12 +3808,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -17426,7 +17527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3830,7 +3830,7 @@ +@@ -3852,7 +3852,7 @@ }, { 'name': 'PasswordManagerEnabled', @@ -17435,7 +17536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3867,7 +3867,7 @@ +@@ -3889,7 +3889,7 @@ }, { 'name': 'PasswordManagerAllowShowPasswords', @@ -17444,7 +17545,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'], -@@ -3890,7 +3890,7 @@ +@@ -3912,7 +3912,7 @@ }, { 'name': 'PasswordLeakDetectionEnabled', @@ -17453,7 +17554,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3925,7 +3925,7 @@ +@@ -3947,7 +3947,7 @@ + }, + { + 'name': 'PasswordDismissCompromisedAlertEnabled', +- 'owners': ['file://components/password_manager/OWNERS', 'eliaskh@chromium.org'], ++ 'owners': ['file://components/password_manager/OWNERS', 'eliaskh@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3981,7 +3981,7 @@ }, { 'name': 'AutoFillEnabled', @@ -17462,7 +17572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3963,7 +3963,7 @@ +@@ -4019,7 +4019,7 @@ }, { 'name': 'AutofillAddressEnabled', @@ -17471,7 +17581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3997,7 +3997,7 @@ +@@ -4053,7 +4053,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -17480,7 +17590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4031,7 +4031,7 @@ +@@ -4087,7 +4087,7 @@ }, { 'name': 'DisabledPlugins', @@ -17489,7 +17599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4062,7 +4062,7 @@ +@@ -4118,7 +4118,7 @@ }, { 'name': 'EnabledPlugins', @@ -17498,7 +17608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4093,7 +4093,7 @@ +@@ -4149,7 +4149,7 @@ }, { 'name': 'DisabledPluginsExceptions', @@ -17507,7 +17617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4126,7 +4126,7 @@ +@@ -4182,7 +4182,7 @@ }, { 'name': 'AlwaysOpenPdfExternally', @@ -17516,7 +17626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:55-'], -@@ -4157,7 +4157,7 @@ +@@ -4213,7 +4213,7 @@ }, { 'name': 'DisablePluginFinder', @@ -17525,7 +17635,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'], -@@ -4187,7 +4187,7 @@ +@@ -4243,7 +4243,7 @@ }, { 'name': 'SyncDisabled', @@ -17534,7 +17644,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-'], -@@ -4220,7 +4220,7 @@ +@@ -4276,7 +4276,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -17543,7 +17653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4241,7 +4241,7 @@ +@@ -4297,7 +4297,7 @@ }, { 'name': 'RoamingProfileSupportEnabled', @@ -17552,7 +17662,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-'], -@@ -4270,7 +4270,7 @@ +@@ -4326,7 +4326,7 @@ }, { 'name': 'RoamingProfileLocation', @@ -17561,7 +17671,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-'], -@@ -4286,7 +4286,7 @@ +@@ -4342,7 +4342,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. @@ -17570,7 +17680,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. -@@ -4295,7 +4295,7 @@ +@@ -4351,7 +4351,7 @@ }, { 'name': 'SigninAllowed', @@ -17579,7 +17689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -4326,7 +4326,7 @@ +@@ -4382,7 +4382,7 @@ }, { 'name': 'EnableDeprecatedWebBasedSignin', @@ -17588,7 +17698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-42'], -@@ -4349,7 +4349,7 @@ +@@ -4405,7 +4405,7 @@ }, { 'name': 'UserDataDir', @@ -17597,7 +17707,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-'], -@@ -4368,14 +4368,14 @@ +@@ -4424,14 +4424,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. @@ -17614,7 +17724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:13-'], -@@ -4391,12 +4391,12 @@ +@@ -4447,12 +4447,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. @@ -17629,7 +17739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-'], -@@ -4419,7 +4419,7 @@ +@@ -4475,7 +4475,7 @@ }, { 'name': 'MediaCacheSize', @@ -17638,7 +17748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-71'], -@@ -4441,7 +4441,7 @@ +@@ -4497,7 +4497,7 @@ }, { 'name': 'DownloadRestrictions', @@ -17647,7 +17757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4486,7 +4486,7 @@ +@@ -4542,7 +4542,7 @@ 'tags': ['local-data-access'], 'desc': '''Setting the policy means users can't bypass download security decisions. @@ -17656,7 +17766,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 -@@ -4504,12 +4504,12 @@ +@@ -4560,12 +4560,12 @@ 4: Blocks malicious files flagged by the Safe Browsing server, does not block dangerous file types. Recommended. @@ -17671,7 +17781,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-'], -@@ -4526,13 +4526,13 @@ +@@ -4582,13 +4582,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. @@ -17687,7 +17797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4559,7 +4559,7 @@ +@@ -4615,7 +4615,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -17696,7 +17806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4582,11 +4582,11 @@ +@@ -4638,11 +4638,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. @@ -17710,7 +17820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -4619,13 +4619,13 @@ +@@ -4675,13 +4675,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. @@ -17726,7 +17836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -4660,7 +4660,7 @@ +@@ -4716,7 +4716,7 @@ }, { 'name': 'ClearSiteDataOnExit', @@ -17735,7 +17845,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'], -@@ -4679,7 +4679,7 @@ +@@ -4735,7 +4735,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -17744,7 +17854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4709,7 +4709,7 @@ +@@ -4765,7 +4765,7 @@ }, { 'name': 'ProxyMode', @@ -17753,7 +17863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -4777,11 +4777,11 @@ +@@ -4833,11 +4833,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -17767,7 +17877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4837,7 +4837,7 @@ +@@ -4893,7 +4893,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: @@ -17776,7 +17886,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. -@@ -4846,7 +4846,7 @@ +@@ -4902,7 +4902,7 @@ }, { 'name': 'ProxyServer', @@ -17785,7 +17895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4869,12 +4869,12 @@ +@@ -4925,12 +4925,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -17800,7 +17910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4897,12 +4897,12 @@ +@@ -4953,12 +4953,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -17815,7 +17925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4925,13 +4925,13 @@ +@@ -4981,13 +4981,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -17831,7 +17941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -4980,12 +4980,12 @@ +@@ -5036,12 +5036,12 @@ * fixed_servers, the ProxyServer and ProxyBypassList fields are used. * pac_script, the ProxyPacUrl, ProxyPacMandatory and ProxyBypassList fields are used. @@ -17846,7 +17956,22 @@ 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-'], -@@ -5015,7 +5015,7 @@ +@@ -5071,7 +5071,7 @@ + }, + { + 'name': 'AllHttpAuthSchemesAllowedForOrigins', +- 'owners': ['file://components/policy/resources/OWNERS', 'ydago@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'ydago@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { 'type': 'array', 'items': { 'type': 'string' } }, + 'supported_on': ['chrome.*:100-','android:100-','chrome_os:100-'], +@@ -5085,12 +5085,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. + +- Format the origin pattern according to this format (https://www.chromium.org/administrators/url-blocklist-filter-format). Up to 1,000 exceptions can be defined in AllHttpAuthSchemesAllowedForOrigins. ++ Format the origin pattern according to this format (https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format). Up to 1,000 exceptions can be defined in AllHttpAuthSchemesAllowedForOrigins. + Wildcards are allowed for the whole origin or parts of the origin, either the scheme, host, port.''', }, { 'name': 'DisableAuthNegotiateCnameLookup', @@ -17855,7 +17980,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-'], -@@ -5043,7 +5043,7 @@ +@@ -5118,7 +5118,7 @@ }, { 'name': 'EnableAuthNegotiatePort', @@ -17864,7 +17989,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-'], -@@ -5071,7 +5071,7 @@ +@@ -5146,7 +5146,7 @@ }, { 'name': 'BasicAuthOverHttpEnabled', @@ -17873,7 +17998,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-'], -@@ -5102,7 +5102,7 @@ +@@ -5177,7 +5177,7 @@ }, { 'name': 'AuthServerWhitelist', @@ -17882,7 +18007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:9-','android:46-','webview_android:49-','chrome_os:62-'], -@@ -5125,7 +5125,7 @@ +@@ -5200,7 +5200,7 @@ }, { 'name': 'AuthServerAllowlist', @@ -17891,7 +18016,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-'], -@@ -5145,7 +5145,7 @@ +@@ -5220,7 +5220,7 @@ }, { 'name': 'AuthNegotiateDelegateWhitelist', @@ -17900,7 +18025,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-'], -@@ -5166,7 +5166,7 @@ +@@ -5241,7 +5241,7 @@ }, { 'name': 'AuthNegotiateDelegateAllowlist', @@ -17909,7 +18034,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-'], -@@ -5184,7 +5184,7 @@ +@@ -5259,7 +5259,7 @@ }, { 'name': 'AuthNegotiateDelegateByKdcPolicy', @@ -17918,7 +18043,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-'], -@@ -5214,7 +5214,7 @@ +@@ -5289,7 +5289,7 @@ }, { 'name': 'BrowserLabsEnabled', @@ -17927,7 +18052,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-'], -@@ -5245,7 +5245,7 @@ +@@ -5320,7 +5320,7 @@ }, { 'name': 'GSSAPILibraryName', @@ -17936,7 +18061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.linux:9-'], -@@ -5263,7 +5263,7 @@ +@@ -5338,7 +5338,7 @@ }, { 'name': 'AuthAndroidNegotiateAccountType', @@ -17945,7 +18070,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-'], -@@ -5275,13 +5275,13 @@ +@@ -5350,13 +5350,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -17961,7 +18086,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-'], -@@ -5311,7 +5311,7 @@ +@@ -5386,7 +5386,7 @@ }, { 'name': 'NtlmV2Enabled', @@ -17970,7 +18095,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-'], -@@ -5342,7 +5342,7 @@ +@@ -5417,7 +5417,7 @@ }, { 'name': 'ExtensionInstallBlacklist', @@ -17979,7 +18104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5368,7 +5368,7 @@ +@@ -5443,7 +5443,7 @@ { 'name': 'ExtensionInstallBlocklist', @@ -17988,7 +18113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5392,7 +5392,7 @@ +@@ -5467,7 +5467,7 @@ }, { 'name': 'ExtensionInstallAllowlist', @@ -17997,7 +18122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5416,7 +5416,7 @@ +@@ -5491,7 +5491,7 @@ }, { 'name': 'ExtensionInstallWhitelist', @@ -18006,7 +18131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5439,7 +5439,7 @@ +@@ -5514,7 +5514,7 @@ }, { 'name': 'ExtensionInstallForcelist', @@ -18015,7 +18140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5450,7 +5450,7 @@ +@@ -5525,7 +5525,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18024,7 +18149,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'], -@@ -5466,15 +5466,15 @@ +@@ -5541,15 +5541,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. @@ -18043,7 +18168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5492,14 +5492,14 @@ +@@ -5567,14 +5567,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. @@ -18060,7 +18185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -5530,7 +5530,7 @@ +@@ -5605,7 +5605,7 @@ }, { 'name': 'ExtensionAllowedTypes', @@ -18069,7 +18194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5583,7 +5583,7 @@ +@@ -5658,7 +5658,7 @@ }, { 'name': 'ExtensionSettings', @@ -18078,7 +18203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5678,7 +5678,7 @@ +@@ -5753,7 +5753,7 @@ }, }, }, @@ -18087,7 +18212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -5735,13 +5735,13 @@ +@@ -5810,13 +5810,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. @@ -18103,7 +18228,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-'], -@@ -5769,12 +5769,12 @@ +@@ -5844,12 +5844,12 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -18118,7 +18243,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-'], -@@ -5803,7 +5803,7 @@ +@@ -5878,7 +5878,7 @@ }, { 'name': 'DeveloperToolsDisabled', @@ -18127,7 +18252,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-'], -@@ -5839,7 +5839,7 @@ +@@ -5914,7 +5914,7 @@ }, { 'name': 'DeveloperToolsAvailability', @@ -18136,7 +18261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5944,7 +5944,7 @@ +@@ -6019,7 +6019,7 @@ }, { 'name': 'RestoreOnStartup', @@ -18145,7 +18270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5987,7 +5987,7 @@ +@@ -6070,7 +6070,7 @@ }, { 'name': 'RestoreOnStartupURLs', @@ -18154,7 +18279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5999,7 +5999,7 @@ +@@ -6082,7 +6082,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18163,7 +18288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -6011,7 +6011,7 @@ +@@ -6094,7 +6094,7 @@ }, { 'name': 'BlockThirdPartyCookies', @@ -18172,7 +18297,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-'], -@@ -6045,7 +6045,7 @@ +@@ -6128,7 +6128,7 @@ }, { 'name': 'DefaultSearchProviderEnabled', @@ -18181,7 +18306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -6086,7 +6086,7 @@ +@@ -6169,7 +6169,7 @@ }, { 'name': 'DefaultSearchProviderContextMenuAccessAllowed', @@ -18190,7 +18315,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-'], -@@ -6119,7 +6119,7 @@ +@@ -6202,7 +6202,7 @@ }, { 'name': 'DefaultSearchProviderName', @@ -18199,7 +18324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6143,7 +6143,7 @@ +@@ -6226,7 +6226,7 @@ }, { 'name': 'DefaultSearchProviderKeyword', @@ -18208,7 +18333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6167,7 +6167,7 @@ +@@ -6250,7 +6250,7 @@ }, { 'name': 'DefaultSearchProviderSearchURL', @@ -18217,7 +18342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6191,7 +6191,7 @@ +@@ -6274,7 +6274,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURL', @@ -18226,7 +18351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6215,7 +6215,7 @@ +@@ -6298,7 +6298,7 @@ }, { 'name': 'DefaultSearchProviderInstantURL', @@ -18235,7 +18360,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'], -@@ -6239,7 +6239,7 @@ +@@ -6322,7 +6322,7 @@ }, { 'name': 'DefaultSearchProviderIconURL', @@ -18244,7 +18369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6263,7 +6263,7 @@ +@@ -6346,7 +6346,7 @@ }, { 'name': 'DefaultSearchProviderEncodings', @@ -18253,7 +18378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6290,7 +6290,7 @@ +@@ -6373,7 +6373,7 @@ }, { 'name': 'DefaultSearchProviderAlternateURLs', @@ -18262,7 +18387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6317,7 +6317,7 @@ +@@ -6400,7 +6400,7 @@ }, { 'name': 'DefaultSearchProviderSearchTermsReplacementKey', @@ -18271,7 +18396,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'], -@@ -6339,7 +6339,7 @@ +@@ -6422,7 +6422,7 @@ }, { 'name': 'DefaultSearchProviderImageURL', @@ -18280,7 +18405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6363,7 +6363,7 @@ +@@ -6446,7 +6446,7 @@ }, { 'name': 'DefaultSearchProviderNewTabURL', @@ -18289,7 +18414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6387,7 +6387,7 @@ +@@ -6470,7 +6470,7 @@ }, { 'name': 'DefaultSearchProviderSearchURLPostParams', @@ -18298,7 +18423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6411,7 +6411,7 @@ +@@ -6494,7 +6494,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURLPostParams', @@ -18307,7 +18432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6435,7 +6435,7 @@ +@@ -6518,7 +6518,7 @@ }, { 'name': 'DefaultSearchProviderInstantURLPostParams', @@ -18316,7 +18441,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'], -@@ -6457,7 +6457,7 @@ +@@ -6540,7 +6540,7 @@ }, { 'name': 'DefaultSearchProviderImageURLPostParams', @@ -18325,7 +18450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6481,7 +6481,7 @@ +@@ -6564,7 +6564,7 @@ }, { 'name': 'DefaultCookiesSetting', @@ -18334,7 +18459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6525,7 +6525,7 @@ +@@ -6608,7 +6608,7 @@ }, { 'name': 'DefaultImagesSetting', @@ -18343,7 +18468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6558,7 +6558,7 @@ +@@ -6641,7 +6641,7 @@ }, { 'name': 'DefaultJavaScriptSetting', @@ -18352,7 +18477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6591,7 +6591,7 @@ +@@ -6674,7 +6674,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -18361,7 +18486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6632,7 +6632,7 @@ +@@ -6715,7 +6715,7 @@ }, { 'name': 'DefaultPopupsSetting', @@ -18370,7 +18495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6670,7 +6670,7 @@ +@@ -6753,7 +6753,7 @@ }, { 'name': 'DefaultNotificationsSetting', @@ -18379,7 +18504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6708,7 +6708,7 @@ +@@ -6791,7 +6791,7 @@ }, { 'name': 'DefaultGeolocationSetting', @@ -18388,7 +18513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6747,7 +6747,7 @@ +@@ -6830,7 +6830,7 @@ }, { 'name': 'DefaultMediaStreamSetting', @@ -18397,7 +18522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6781,7 +6781,7 @@ +@@ -6864,7 +6864,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', @@ -18406,7 +18531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6815,7 +6815,7 @@ +@@ -6898,7 +6898,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -18415,7 +18540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6849,7 +6849,7 @@ +@@ -6932,7 +6932,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -18424,7 +18549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6883,7 +6883,7 @@ +@@ -6966,7 +6966,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -18433,7 +18558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6917,7 +6917,7 @@ +@@ -7000,7 +7000,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -18442,7 +18567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6949,7 +6949,7 @@ +@@ -7032,7 +7032,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18451,7 +18576,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.''', -@@ -6966,7 +6966,7 @@ +@@ -7049,7 +7049,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -18460,7 +18585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6999,7 +6999,7 @@ +@@ -7082,7 +7082,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18469,7 +18594,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.''', -@@ -7014,7 +7014,7 @@ +@@ -7097,7 +7097,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -18478,7 +18603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7035,11 +7035,11 @@ +@@ -7118,11 +7118,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18492,7 +18617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7060,11 +7060,11 @@ +@@ -7143,11 +7143,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18506,7 +18631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7098,7 +7098,7 @@ +@@ -7181,7 +7181,7 @@ }, { 'name': 'SerialAskForUrls', @@ -18515,7 +18640,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7121,11 +7121,11 @@ +@@ -7204,11 +7204,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18529,7 +18654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7148,11 +7148,11 @@ +@@ -7231,11 +7231,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18543,7 +18668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7177,7 +7177,7 @@ +@@ -7260,7 +7260,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -18552,7 +18677,116 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7233,7 +7233,7 @@ +@@ -7316,7 +7316,7 @@ + }, + { + 'name': 'DefaultWebHidGuardSetting', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -7352,7 +7352,7 @@ + }, + { + 'name': 'WebHidAskForUrls', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7363,7 +7363,7 @@ + 'dynamic_refresh': True, + 'per_profile': True, + }, +- 'example_value': ['https://google.com', 'https://chromium.org'], ++ 'example_value': ['https://9oo91e.qjz9zk', 'https://ch40m1um.qjz9zk'], + 'id': 944, + 'caption': '''Allow the WebHID API on these sites''', + 'tags': ['website-sharing'], +@@ -7381,11 +7381,11 @@ + + URL patterns must not conflict with WebHidBlockedForUrls. Neither policy takes precedence if a URL matches with both. + +- 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': 'WebHidBlockedForUrls', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7396,7 +7396,7 @@ + 'dynamic_refresh': True, + 'per_profile': True, + }, +- 'example_value': ['https://google.com', 'https://chromium.org'], ++ 'example_value': ['https://9oo91e.qjz9zk', 'https://ch40m1um.qjz9zk'], + 'id': 945, + 'caption': '''Block the WebHID API on these sites''', + 'tags': [], +@@ -7414,11 +7414,11 @@ + + URL patterns can't conflict with WebHidAskForUrls. Neither policy takes precedence if a URL matches with both. + +- 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': 'WebHidAllowAllDevicesForUrls', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7429,7 +7429,7 @@ + 'dynamic_refresh': True, + 'per_profile': False, + }, +- 'example_value': ['https://google.com', 'https://chromium.org'], ++ 'example_value': ['https://9oo91e.qjz9zk', 'https://ch40m1um.qjz9zk'], + 'id': 953, + 'caption': '''Automatically grant permission to sites to connect to any HID device.''', + 'tags': ['website-sharing'], +@@ -7443,7 +7443,7 @@ + }, + { + 'name': 'WebHidAllowDevicesForUrls', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -7484,7 +7484,7 @@ + }, + 'example_value': [{ + 'devices': [{'vendor_id': 1234, 'product_id': 5678}], +- 'urls': ['https://google.com', 'https://chromium.org'], ++ 'urls': ['https://9oo91e.qjz9zk', 'https://ch40m1um.qjz9zk'], + }], + 'id': 954, + 'caption': '''Automatically grant permission to these sites to connect to HID devices with the given vendor and product IDs.''', +@@ -7497,7 +7497,7 @@ + }, + { + 'name': 'WebHidAllowDevicesWithHidUsagesForUrls', +- 'owners': ['mattreynolds@chromium.org', 'file://third_party/blink/renderer/modules/hid/OWNERS'], ++ 'owners': ['mattreynolds@ch40m1um.qjz9zk', 'file://third_party/blink/renderer/modules/hid/OWNERS'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -7538,7 +7538,7 @@ + }, + 'example_value': [{ + 'usages': [{'usage_page': 1234, 'usage': 5678}], +- 'urls': ['https://google.com', 'https://chromium.org'], ++ 'urls': ['https://9oo91e.qjz9zk', 'https://ch40m1um.qjz9zk'], + }], + 'id': 955, + 'caption': '''Automatically grant permission to these sites to connect to HID devices containing top-level collections with the given HID usage.''', +@@ -7551,7 +7551,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -18561,7 +18795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7268,7 +7268,7 @@ +@@ -7586,7 +7586,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -18570,7 +18804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7292,11 +7292,11 @@ +@@ -7610,11 +7610,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18584,7 +18818,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7320,11 +7320,11 @@ +@@ -7638,11 +7638,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18598,7 +18832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7358,7 +7358,7 @@ +@@ -7676,7 +7676,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -18607,7 +18841,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7392,7 +7392,7 @@ +@@ -7710,7 +7710,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -18616,7 +18850,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7413,11 +7413,11 @@ +@@ -7731,11 +7731,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18630,7 +18864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7438,11 +7438,11 @@ +@@ -7756,11 +7756,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18644,7 +18878,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7463,11 +7463,11 @@ +@@ -7781,11 +7781,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18658,7 +18892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7488,11 +7488,11 @@ +@@ -7806,11 +7806,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18672,7 +18906,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7552,7 +7552,7 @@ +@@ -7870,7 +7870,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -18681,7 +18915,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7607,11 +7607,11 @@ +@@ -7925,11 +7925,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -18695,7 +18929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7636,11 +7636,11 @@ +@@ -7954,11 +7954,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. @@ -18709,7 +18943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7665,11 +7665,11 @@ +@@ -7983,11 +7983,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -18723,7 +18957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7694,11 +7694,11 @@ +@@ -8012,11 +8012,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -18737,7 +18971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7717,13 +7717,13 @@ +@@ -8035,13 +8035,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18753,7 +18987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7742,13 +7742,13 @@ +@@ -8060,13 +8060,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18769,7 +19003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7767,11 +7767,11 @@ +@@ -8085,11 +8085,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18783,7 +19017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7790,11 +7790,11 @@ +@@ -8108,11 +8108,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18797,7 +19031,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7814,11 +7814,11 @@ +@@ -8132,11 +8132,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. @@ -18811,7 +19045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7838,11 +7838,11 @@ +@@ -8156,11 +8156,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. @@ -18825,7 +19059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7874,13 +7874,13 @@ +@@ -8192,13 +8192,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], 'deprecated': True, @@ -18841,7 +19075,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7899,17 +7899,17 @@ +@@ -8217,17 +8217,17 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -18862,7 +19096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -7936,7 +7936,7 @@ +@@ -8254,7 +8254,7 @@ }, { 'name': 'LensRegionSearchEnabled', @@ -18871,7 +19105,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-'], -@@ -7963,7 +7963,7 @@ +@@ -8281,7 +8281,7 @@ }, { 'name': 'SideSearchEnabled', @@ -18880,7 +19114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema' : {'type': 'boolean'}, 'supported_on': ['chrome_os:96-'], -@@ -7993,9 +7993,9 @@ +@@ -8311,9 +8311,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -18893,7 +19127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -8039,9 +8039,9 @@ +@@ -8359,9 +8359,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -18906,7 +19140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -8068,11 +8068,11 @@ +@@ -8388,11 +8388,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. @@ -18920,7 +19154,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8092,11 +8092,11 @@ +@@ -8412,11 +8412,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18934,7 +19168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8116,11 +8116,11 @@ +@@ -8436,11 +8436,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18948,7 +19182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8144,11 +8144,11 @@ +@@ -8464,11 +8464,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18962,7 +19196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -8178,7 +8178,7 @@ +@@ -8498,7 +8498,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -18971,7 +19205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -8189,7 +8189,7 @@ +@@ -8509,7 +8509,7 @@ }, { 'name': 'PopupsBlockedForUrls', @@ -18980,7 +19214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8213,11 +8213,11 @@ +@@ -8533,11 +8533,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -18994,7 +19228,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8236,11 +8236,11 @@ +@@ -8556,11 +8556,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19008,7 +19242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8259,11 +8259,11 @@ +@@ -8579,11 +8579,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19022,7 +19256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8284,7 +8284,7 @@ +@@ -8604,7 +8604,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. @@ -19031,7 +19265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -8309,11 +8309,11 @@ +@@ -8629,11 +8629,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. @@ -19045,7 +19279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8341,7 +8341,7 @@ +@@ -8661,7 +8661,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -19054,7 +19288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8366,7 +8366,7 @@ +@@ -8686,7 +8686,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -19063,7 +19297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8394,7 +8394,7 @@ +@@ -8714,7 +8714,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -19072,7 +19306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8419,7 +8419,7 @@ +@@ -8739,7 +8739,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -19081,7 +19315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -8447,7 +8447,7 @@ +@@ -8767,7 +8767,7 @@ }, { 'name': 'Disable3DAPIs', @@ -19090,7 +19324,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-'], -@@ -8475,7 +8475,7 @@ +@@ -8795,7 +8795,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -19099,7 +19333,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-'], -@@ -8495,7 +8495,7 @@ +@@ -8815,7 +8815,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -19108,7 +19342,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-'], -@@ -8514,7 +8514,7 @@ +@@ -8834,7 +8834,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -19117,7 +19351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8546,7 +8546,7 @@ +@@ -8866,7 +8866,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -19126,7 +19360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8565,11 +8565,11 @@ +@@ -8885,11 +8885,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19140,7 +19374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8588,11 +8588,11 @@ +@@ -8908,11 +8908,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19154,7 +19388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -8610,7 +8610,7 @@ +@@ -8930,7 +8930,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -19163,7 +19397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -8632,7 +8632,7 @@ +@@ -8952,7 +8952,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -19172,7 +19406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8653,7 +8653,7 @@ +@@ -8973,7 +8973,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -19181,7 +19415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -8689,7 +8689,7 @@ +@@ -9009,7 +9009,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -19190,7 +19424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -8743,7 +8743,7 @@ +@@ -9063,7 +9063,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -19199,7 +19433,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -8779,7 +8779,7 @@ +@@ -9099,7 +9099,7 @@ + }, + { + 'name': 'SecondaryGoogleAccountUsage', +- 'owners': ['rodmartin@google.com', 'sinhak@chromium.org', 'chromeos-commercial-identity@google.com'], ++ 'owners': ['rodmartin@9oo91e.qjz9zk', 'sinhak@ch40m1um.qjz9zk', 'chromeos-commercial-identity@9oo91e.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -9140,7 +9140,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -19208,7 +19451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -8799,7 +8799,7 @@ +@@ -9160,7 +9160,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -19217,7 +19460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -8835,7 +8835,7 @@ +@@ -9196,7 +9196,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -19226,7 +19469,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-'], -@@ -8851,7 +8851,7 @@ +@@ -9212,7 +9212,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -19235,7 +19478,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-', 'android:88-'], -@@ -8880,11 +8880,11 @@ +@@ -9241,11 +9241,11 @@ This policy will be removed in $1Google Chrome version 95. @@ -19249,7 +19492,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'], -@@ -8912,7 +8912,7 @@ +@@ -9273,7 +9273,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -19258,7 +19501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -8932,7 +8932,7 @@ +@@ -9293,7 +9293,7 @@ }, { 'name': 'TranslateEnabled', @@ -19267,7 +19510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -8956,7 +8956,7 @@ +@@ -9317,7 +9317,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -19276,7 +19519,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'], -@@ -8975,7 +8975,7 @@ +@@ -9336,7 +9336,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -19285,7 +19528,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'], -@@ -8994,7 +8994,7 @@ +@@ -9355,7 +9355,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -19294,7 +19537,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'], -@@ -9017,7 +9017,7 @@ +@@ -9378,7 +9378,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -19303,7 +19546,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-'], -@@ -9036,7 +9036,7 @@ +@@ -9397,7 +9397,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -19312,7 +19555,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9059,7 +9059,7 @@ +@@ -9420,7 +9420,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -19321,7 +19564,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -9092,7 +9092,7 @@ +@@ -9453,7 +9453,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -19330,7 +19573,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -9121,7 +9121,7 @@ +@@ -9482,7 +9482,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -19339,7 +19582,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -9142,7 +9142,7 @@ +@@ -9503,7 +9503,7 @@ }, { 'name': 'U2fSecurityKeyApiEnabled', @@ -19348,7 +19591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9173,11 +9173,11 @@ +@@ -9534,11 +9534,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. @@ -19362,7 +19605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -9193,14 +9193,14 @@ +@@ -9554,14 +9554,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -19379,7 +19622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -9221,7 +9221,7 @@ +@@ -9582,7 +9582,7 @@ }, { 'name': 'ImportBookmarks', @@ -19388,7 +19631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9242,7 +9242,7 @@ +@@ -9603,7 +9603,7 @@ }, { 'name': 'ImportHistory', @@ -19397,7 +19640,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9263,7 +9263,7 @@ +@@ -9624,7 +9624,7 @@ }, { 'name': 'ImportHomepage', @@ -19406,7 +19649,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9282,7 +9282,7 @@ +@@ -9643,7 +9643,7 @@ }, { 'name': 'ImportSearchEngine', @@ -19415,7 +19658,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9302,7 +9302,7 @@ +@@ -9663,7 +9663,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -19424,7 +19667,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9322,7 +9322,7 @@ +@@ -9683,7 +9683,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -19433,7 +19676,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -9342,7 +9342,7 @@ +@@ -9703,7 +9703,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -19442,7 +19685,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -9361,7 +9361,7 @@ +@@ -9722,7 +9722,7 @@ }, { 'name': 'HideWebStorePromo', @@ -19451,7 +19694,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'], -@@ -9379,7 +9379,7 @@ +@@ -9740,7 +9740,7 @@ }, { 'name': 'URLBlacklist', @@ -19460,7 +19703,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9402,7 +9402,7 @@ +@@ -9763,7 +9763,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -19469,7 +19712,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. -@@ -9411,7 +9411,7 @@ +@@ -9772,7 +9772,7 @@ }, { 'name': 'URLWhitelist', @@ -19478,7 +19721,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9434,7 +9434,7 @@ +@@ -9795,7 +9795,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -19487,7 +19730,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:". -@@ -9445,7 +9445,7 @@ +@@ -9806,7 +9806,7 @@ }, { 'name': 'URLBlocklist', @@ -19496,7 +19739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9466,7 +9466,7 @@ +@@ -9827,7 +9827,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -19505,7 +19748,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. -@@ -9477,7 +9477,7 @@ +@@ -9838,7 +9838,7 @@ }, { 'name': 'URLAllowlist', @@ -19514,7 +19757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9498,7 +9498,7 @@ +@@ -9859,7 +9859,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -19523,7 +19766,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:". -@@ -9511,7 +9511,7 @@ +@@ -9872,7 +9872,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -19532,7 +19775,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-'], -@@ -9531,7 +9531,7 @@ +@@ -9892,7 +9892,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -19541,7 +19784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9564,7 +9564,7 @@ +@@ -9925,7 +9925,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -19550,7 +19793,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -9633,7 +9633,7 @@ +@@ -9994,7 +9994,7 @@ }, { 'name': 'CloudUserPolicyMerge', @@ -19559,7 +19802,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:92-', 'android:97-'], -@@ -9667,7 +9667,7 @@ +@@ -10028,7 +10028,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -19568,7 +19811,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9696,10 +9696,10 @@ +@@ -10057,10 +10057,10 @@ }, { 'name': 'OpenNetworkConfiguration', @@ -19581,7 +19824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -9714,10 +9714,10 @@ +@@ -10075,10 +10075,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', @@ -19594,7 +19837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -9732,7 +9732,7 @@ +@@ -10093,7 +10093,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', @@ -19603,7 +19846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -9779,7 +9779,7 @@ +@@ -10140,7 +10140,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', @@ -19612,7 +19855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -9822,7 +9822,7 @@ +@@ -10183,7 +10183,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', @@ -19621,7 +19864,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-'], -@@ -9845,7 +9845,7 @@ +@@ -10206,7 +10206,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', @@ -19630,7 +19873,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-'], -@@ -9868,7 +9868,7 @@ +@@ -10229,7 +10229,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', @@ -19639,7 +19882,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-'], -@@ -9891,7 +9891,7 @@ +@@ -10252,7 +10252,7 @@ }, { 'name': 'ChromadToCloudMigrationEnabled', @@ -19648,7 +19891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -9925,7 +9925,7 @@ +@@ -10286,7 +10286,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -19657,7 +19900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -9945,7 +9945,7 @@ +@@ -10306,7 +10306,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -19666,7 +19909,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'], -@@ -9962,7 +9962,7 @@ +@@ -10323,7 +10323,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -19675,7 +19918,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'], -@@ -9979,7 +9979,7 @@ +@@ -10340,7 +10340,7 @@ }, { 'name': 'DisablePrintPreview', @@ -19684,7 +19927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -9997,7 +9997,7 @@ +@@ -10358,7 +10358,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -19693,7 +19936,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-'], -@@ -10016,7 +10016,7 @@ +@@ -10377,7 +10377,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -19702,7 +19945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -10057,7 +10057,7 @@ +@@ -10418,7 +10418,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -19711,7 +19954,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'], -@@ -10076,7 +10076,7 @@ +@@ -10437,7 +10437,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -19720,7 +19963,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-'], -@@ -10096,7 +10096,7 @@ +@@ -10457,7 +10457,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -19729,7 +19972,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-'], -@@ -10125,7 +10125,7 @@ +@@ -10486,7 +10486,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -19738,7 +19981,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'], -@@ -10146,7 +10146,7 @@ +@@ -10507,7 +10507,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -19747,7 +19990,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'], -@@ -10167,7 +10167,7 @@ +@@ -10528,7 +10528,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -19756,7 +19999,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'], -@@ -10190,7 +10190,7 @@ +@@ -10551,7 +10551,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -19765,7 +20008,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-'], -@@ -10215,7 +10215,7 @@ +@@ -10572,7 +10572,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -19774,7 +20017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -10237,7 +10237,7 @@ +@@ -10594,7 +10594,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -19783,7 +20026,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-'], -@@ -10262,7 +10262,7 @@ +@@ -10619,7 +10619,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -19792,7 +20035,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-'], -@@ -10286,7 +10286,7 @@ +@@ -10643,7 +10643,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -19801,7 +20044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10319,7 +10319,7 @@ +@@ -10676,7 +10676,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -19810,7 +20053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10352,7 +10352,7 @@ +@@ -10709,7 +10709,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -19819,7 +20062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10392,7 +10392,7 @@ +@@ -10749,7 +10749,7 @@ }, { 'name': 'EnableDeviceGranularReporting', @@ -19828,7 +20071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10422,7 +10422,7 @@ +@@ -10779,7 +10779,7 @@ }, { 'name': 'ReportDeviceVersionInfo', @@ -19837,7 +20080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10442,7 +10442,7 @@ +@@ -10799,7 +10799,7 @@ }, { 'name': 'ReportDeviceActivityTimes', @@ -19846,7 +20089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10462,7 +10462,7 @@ +@@ -10819,7 +10819,7 @@ }, { 'name': 'ReportDeviceAudioStatus', @@ -19855,7 +20098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10494,7 +10494,7 @@ +@@ -10851,7 +10851,7 @@ }, { 'name': 'ReportDeviceAudioStatusCheckingRateMs', @@ -19864,7 +20107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -10515,7 +10515,7 @@ +@@ -10872,7 +10872,7 @@ }, { 'name': 'ReportDeviceBootMode', @@ -19873,7 +20116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10535,7 +10535,7 @@ +@@ -10892,7 +10892,7 @@ }, { 'name': 'ReportDeviceLocation', @@ -19882,7 +20125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -10555,7 +10555,7 @@ +@@ -10912,7 +10912,7 @@ }, { 'name': 'ReportDeviceNetworkConfiguration', @@ -19891,7 +20134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10587,7 +10587,7 @@ +@@ -10944,7 +10944,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', @@ -19899,8 +20142,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:29-95'], -@@ -10608,7 +10608,7 @@ + 'supported_on': ['chrome_os:29-'], +@@ -10965,7 +10965,7 @@ }, { 'name': 'ReportDeviceNetworkStatus', @@ -19909,7 +20152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10640,7 +10640,7 @@ +@@ -10997,7 +10997,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryCollectionRateMs', @@ -19918,7 +20161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -10661,7 +10661,7 @@ +@@ -11018,7 +11018,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryEventCheckingRateMs', @@ -19927,7 +20170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -10682,7 +10682,7 @@ +@@ -11039,7 +11039,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -19936,7 +20179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -10702,7 +10702,7 @@ +@@ -11059,7 +11059,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -19944,8 +20187,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:42-95'], -@@ -10723,7 +10723,7 @@ + 'supported_on': ['chrome_os:42-'], +@@ -11080,7 +11080,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -19954,7 +20197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -10743,7 +10743,7 @@ +@@ -11100,7 +11100,7 @@ }, { 'name': 'ReportDeviceSecurityStatus', @@ -19963,7 +20206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10775,7 +10775,7 @@ +@@ -11132,7 +11132,7 @@ }, { 'name': 'ReportDeviceGraphicsStatus', @@ -19972,7 +20215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -10798,7 +10798,7 @@ +@@ -11155,7 +11155,7 @@ }, { 'name': 'ReportDeviceCrashReportInfo', @@ -19981,7 +20224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -10821,7 +10821,7 @@ +@@ -11178,7 +11178,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -19990,7 +20233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10843,7 +10843,7 @@ +@@ -11200,7 +11200,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -19999,7 +20242,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -10863,7 +10863,7 @@ +@@ -11220,7 +11220,7 @@ + }, + { + 'name': 'ReportDevicePeripherals', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'tylergarrett@google.com'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'tylergarrett@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:101-'], +@@ -11251,7 +11251,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -20008,7 +20260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -10884,7 +10884,7 @@ +@@ -11272,7 +11272,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -20017,7 +20269,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -10904,7 +10904,7 @@ +@@ -11292,7 +11292,7 @@ }, { 'name': 'ReportDeviceCpuInfo', @@ -20026,7 +20278,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -10925,7 +10925,7 @@ +@@ -11313,7 +11313,7 @@ }, { 'name': 'ReportDeviceTimezoneInfo', @@ -20035,7 +20287,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -10946,7 +10946,7 @@ +@@ -11334,7 +11334,7 @@ }, { 'name': 'ReportDeviceMemoryInfo', @@ -20044,7 +20296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -10967,7 +10967,7 @@ +@@ -11355,7 +11355,7 @@ }, { 'name': 'ReportDeviceBacklightInfo', @@ -20053,7 +20305,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -10988,7 +10988,7 @@ +@@ -11376,7 +11376,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -20062,7 +20314,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11009,7 +11009,7 @@ +@@ -11397,7 +11397,7 @@ }, { 'name': 'ReportDeviceBluetoothInfo', @@ -20071,7 +20323,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11030,7 +11030,7 @@ +@@ -11418,7 +11418,7 @@ }, { 'name': 'ReportDeviceFanInfo', @@ -20080,7 +20332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11051,7 +11051,7 @@ +@@ -11439,7 +11439,7 @@ }, { 'name': 'ReportDeviceVpdInfo', @@ -20089,7 +20341,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11073,7 +11073,7 @@ +@@ -11461,7 +11461,7 @@ }, { 'name': 'ReportDeviceSystemInfo', @@ -20098,7 +20350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -11094,7 +11094,7 @@ +@@ -11482,7 +11482,7 @@ }, { 'name': 'ReportDevicePrintJobs', @@ -20107,7 +20359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11126,7 +11126,7 @@ +@@ -11514,7 +11514,7 @@ }, { 'name': 'ReportDeviceLoginLogout', @@ -20116,7 +20368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11158,7 +11158,7 @@ +@@ -11546,7 +11546,7 @@ }, { 'name': 'ReportCRDSessions', @@ -20125,7 +20377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -11190,7 +11190,7 @@ +@@ -11578,7 +11578,7 @@ }, { 'name': 'ReportUploadFrequency', @@ -20134,7 +20386,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-'], -@@ -11210,7 +11210,7 @@ +@@ -11598,7 +11598,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -20143,7 +20395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -11229,7 +11229,7 @@ +@@ -11617,7 +11617,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -20152,7 +20404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -11248,7 +11248,7 @@ +@@ -11636,7 +11636,7 @@ }, { 'name': 'HeartbeatEnabled', @@ -20161,7 +20413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -11268,7 +11268,7 @@ +@@ -11656,7 +11656,7 @@ }, { 'name': 'HeartbeatFrequency', @@ -20170,7 +20422,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-'], -@@ -11288,7 +11288,7 @@ +@@ -11676,7 +11676,7 @@ }, { 'name': 'LogUploadEnabled', @@ -20179,7 +20431,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -11308,7 +11308,7 @@ +@@ -11696,7 +11696,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -20188,7 +20440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11321,11 +11321,11 @@ +@@ -11709,11 +11709,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20202,7 +20454,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. -@@ -11336,7 +11336,7 @@ +@@ -11724,7 +11724,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -20211,7 +20463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11348,11 +11348,11 @@ +@@ -11736,11 +11736,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -20225,7 +20477,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.''', -@@ -11360,7 +11360,7 @@ +@@ -11748,7 +11748,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -20234,7 +20486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11381,7 +11381,7 @@ +@@ -11769,7 +11769,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -20243,7 +20495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11399,7 +11399,7 @@ +@@ -11787,7 +11787,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -20252,7 +20504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11419,7 +11419,7 @@ +@@ -11807,7 +11807,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -20261,7 +20513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11437,7 +11437,7 @@ +@@ -11825,7 +11825,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', @@ -20270,7 +20522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -11459,7 +11459,7 @@ +@@ -11847,7 +11847,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -20279,7 +20531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11497,7 +11497,7 @@ +@@ -11885,7 +11885,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -20288,7 +20540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -11515,7 +11515,7 @@ +@@ -11903,7 +11903,7 @@ }, { 'name': 'DeviceReleaseLtsTag', @@ -20297,7 +20549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -11531,7 +11531,7 @@ +@@ -11919,7 +11919,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -20306,7 +20558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -11576,7 +11576,7 @@ +@@ -11964,7 +11964,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -20315,7 +20567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -11592,7 +11592,7 @@ +@@ -11980,7 +11980,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -20324,7 +20576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11604,7 +11604,7 @@ +@@ -11992,7 +11992,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20333,7 +20585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -11614,7 +11614,7 @@ +@@ -12002,7 +12002,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -20342,7 +20594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -11635,7 +11635,7 @@ +@@ -12023,7 +12023,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -20351,7 +20603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -11656,7 +11656,7 @@ +@@ -12044,7 +12044,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -20360,7 +20612,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -11675,7 +11675,7 @@ +@@ -12063,7 +12063,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -20369,7 +20621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -11696,7 +11696,7 @@ +@@ -12084,7 +12084,7 @@ }, { 'name': 'DeviceAppPack', @@ -20378,7 +20630,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11708,7 +11708,7 @@ +@@ -12096,7 +12096,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20387,7 +20639,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -11720,7 +11720,7 @@ +@@ -12108,7 +12108,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -20396,7 +20648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -11740,7 +11740,7 @@ +@@ -12128,7 +12128,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -20405,7 +20657,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -11761,7 +11761,7 @@ +@@ -12149,7 +12149,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -20414,7 +20666,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11789,7 +11789,7 @@ +@@ -12177,7 +12177,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -20423,7 +20675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -11828,7 +11828,7 @@ +@@ -12216,7 +12216,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -20432,7 +20684,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -11853,7 +11853,7 @@ +@@ -12241,7 +12241,7 @@ }, { 'name': 'DeviceTargetVersionSelector', @@ -20441,7 +20693,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:95-'], -@@ -11882,7 +11882,7 @@ +@@ -12270,7 +12270,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -20450,7 +20702,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -11898,7 +11898,7 @@ +@@ -12286,7 +12286,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -20459,7 +20711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11919,7 +11919,7 @@ +@@ -12307,7 +12307,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -20468,7 +20720,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -11939,7 +11939,7 @@ +@@ -12327,7 +12327,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -20477,7 +20729,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11961,7 +11961,7 @@ +@@ -12349,7 +12349,7 @@ }, { 'name': 'KioskCRXManifestUpdateURLIgnored', @@ -20486,7 +20738,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -11993,7 +11993,7 @@ +@@ -12381,7 +12381,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -20495,7 +20747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12012,7 +12012,7 @@ +@@ -12400,7 +12400,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -20504,7 +20756,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -12033,7 +12033,7 @@ +@@ -12421,7 +12421,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -20513,7 +20765,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12052,7 +12052,7 @@ +@@ -12440,7 +12440,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -20522,7 +20774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -12071,7 +12071,7 @@ +@@ -12459,7 +12459,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -20531,7 +20783,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -12085,7 +12085,7 @@ +@@ -12473,7 +12473,7 @@ 'caption': '''Allow managed session on device''', 'tags': [], 'desc': '''Note that this policy is deprecated and will be removed in $2Google Chrome OS version 88. Public sessions are no longer supported. Please use DeviceLocalAccounts to configure managed-guest sessions instead. @@ -20540,7 +20792,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". -@@ -12093,7 +12093,7 @@ +@@ -12481,7 +12481,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -20549,7 +20801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -12112,7 +12112,7 @@ +@@ -12500,7 +12500,7 @@ 'arc_support': 'This policy controls $2Google Chrome OS developer mode only. If you want to prevent access to Android Developer Options, you need to set the DeveloperToolsDisabled policy.', }, { 'name': 'ManagedGuestSessionAutoLaunchNotificationReduced', @@ -20558,7 +20810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -12136,7 +12136,7 @@ +@@ -12524,7 +12524,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -20567,7 +20819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12160,7 +12160,7 @@ +@@ -12548,7 +12548,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -20576,7 +20828,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-'], -@@ -12181,7 +12181,7 @@ +@@ -12569,7 +12569,7 @@ }, { 'name': 'DriveDisabled', @@ -20585,7 +20837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12200,7 +12200,7 @@ +@@ -12588,7 +12588,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -20594,7 +20846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12219,7 +12219,7 @@ +@@ -12607,7 +12607,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -20603,7 +20855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12231,20 +12231,20 @@ +@@ -12619,20 +12619,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -20627,7 +20879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -12264,7 +12264,7 @@ +@@ -12652,7 +12652,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -20636,7 +20888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12285,11 +12285,11 @@ +@@ -12673,11 +12673,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -20650,7 +20902,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'], -@@ -12306,11 +12306,11 @@ +@@ -12694,11 +12694,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. @@ -20664,7 +20916,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-'], -@@ -12346,7 +12346,7 @@ +@@ -12734,7 +12734,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -20673,7 +20925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -12364,7 +12364,7 @@ +@@ -12752,7 +12752,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -20682,7 +20934,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12382,7 +12382,7 @@ +@@ -12770,7 +12770,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -20691,7 +20943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -12402,7 +12402,7 @@ +@@ -12790,7 +12790,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -20700,7 +20952,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-'], -@@ -12423,7 +12423,7 @@ +@@ -12811,7 +12811,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -20709,7 +20961,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12440,11 +12440,11 @@ +@@ -12828,11 +12828,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 @@ -20723,7 +20975,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-'], -@@ -12464,7 +12464,7 @@ +@@ -12852,7 +12852,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -20732,7 +20984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12481,11 +12481,11 @@ +@@ -12869,11 +12869,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 @@ -20746,7 +20998,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-'], -@@ -12501,7 +12501,7 @@ +@@ -12889,7 +12889,7 @@ }, { 'name': 'SystemTimezone', @@ -20755,7 +21007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -12521,7 +12521,7 @@ +@@ -12909,7 +12909,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -20764,7 +21016,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -12543,7 +12543,7 @@ +@@ -12931,7 +12931,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -20773,7 +21025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -12570,7 +12570,7 @@ +@@ -12958,7 +12958,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -20782,7 +21034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -12588,7 +12588,7 @@ +@@ -12976,7 +12976,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -20791,7 +21043,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12614,7 +12614,7 @@ +@@ -13002,7 +13002,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -20800,7 +21052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -12669,7 +12669,7 @@ +@@ -13057,7 +13057,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -20809,7 +21061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -12697,7 +12697,7 @@ +@@ -13085,7 +13085,7 @@ }, { 'name': 'AdditionalDnsQueryTypesEnabled', @@ -20818,7 +21070,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12734,7 +12734,7 @@ +@@ -13122,7 +13122,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -20827,7 +21079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -12771,7 +12771,7 @@ +@@ -13159,7 +13159,7 @@ }, { 'name': 'ShelfAlignment', @@ -20836,7 +21088,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", -@@ -12826,7 +12826,7 @@ +@@ -13214,7 +13214,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -20845,7 +21097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -12912,7 +12912,7 @@ +@@ -13300,7 +13300,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -20854,7 +21106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -12954,7 +12954,7 @@ +@@ -13342,7 +13342,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -20863,7 +21115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -12974,7 +12974,7 @@ +@@ -13362,7 +13362,7 @@ }, { 'name': 'UserDisplayName', @@ -20872,7 +21124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -12996,7 +12996,7 @@ +@@ -13384,7 +13384,7 @@ }, { 'name': 'SessionLengthLimit', @@ -20881,7 +21133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -13018,7 +13018,7 @@ +@@ -13406,7 +13406,7 @@ }, { 'name': 'FullscreenAllowed', @@ -20890,7 +21142,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-'], -@@ -13039,7 +13039,7 @@ +@@ -13427,7 +13427,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -20899,7 +21151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -13072,7 +13072,7 @@ +@@ -13460,7 +13460,7 @@ 'id': 930, 'name': 'KeepFullscreenWithoutNotificationUrlAllowList', 'caption': '''List of URLs which are allowed to remain in full screen mode without showing a notification''', @@ -20908,7 +21160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13091,13 +13091,13 @@ +@@ -13479,13 +13479,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. @@ -20924,7 +21176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13128,7 +13128,7 @@ +@@ -13516,7 +13516,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -20933,7 +21185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13159,7 +13159,7 @@ +@@ -13547,7 +13547,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -20942,7 +21194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13192,7 +13192,7 @@ +@@ -13580,7 +13580,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -20951,7 +21203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13223,7 +13223,7 @@ +@@ -13611,7 +13611,7 @@ }, { 'name': 'IdleDelayAC', @@ -20960,7 +21212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13252,7 +13252,7 @@ +@@ -13640,7 +13640,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -20969,7 +21221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13283,7 +13283,7 @@ +@@ -13671,7 +13671,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -20978,7 +21230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13314,7 +13314,7 @@ +@@ -13702,7 +13702,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -20987,7 +21239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13347,7 +13347,7 @@ +@@ -13735,7 +13735,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -20996,7 +21248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13378,7 +13378,7 @@ +@@ -13766,7 +13766,7 @@ }, { 'name': 'IdleDelayBattery', @@ -21005,7 +21257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13407,7 +13407,7 @@ +@@ -13795,7 +13795,7 @@ }, { 'name': 'IdleAction', @@ -21014,7 +21266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13454,7 +13454,7 @@ +@@ -13842,7 +13842,7 @@ }, { 'name': 'IdleActionAC', @@ -21023,7 +21275,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13503,7 +13503,7 @@ +@@ -13891,7 +13891,7 @@ }, { 'name': 'IdleActionBattery', @@ -21032,7 +21284,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13552,7 +13552,7 @@ +@@ -13940,7 +13940,7 @@ }, { 'name': 'LidCloseAction', @@ -21041,7 +21293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13597,7 +13597,7 @@ +@@ -13985,7 +13985,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -21050,7 +21302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -13615,7 +13615,7 @@ +@@ -14003,7 +14003,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -21059,7 +21311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -13634,7 +13634,7 @@ +@@ -14022,7 +14022,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -21068,7 +21320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -13651,7 +13651,7 @@ +@@ -14039,7 +14039,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -21077,7 +21329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -13671,7 +13671,7 @@ +@@ -14059,7 +14059,7 @@ }, { 'name': 'AllowWakeLocks', @@ -21086,7 +21338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -13700,7 +13700,7 @@ +@@ -14088,7 +14088,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -21095,7 +21347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -13729,7 +13729,7 @@ +@@ -14117,7 +14117,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -21104,7 +21356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -13749,7 +13749,7 @@ +@@ -14137,7 +14137,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -21113,7 +21365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -13767,7 +13767,7 @@ +@@ -14155,7 +14155,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -21122,7 +21374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -13871,7 +13871,7 @@ +@@ -14259,7 +14259,7 @@ }, { 'name': 'ScreenLockDelays', @@ -21131,7 +21383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -13908,7 +13908,7 @@ +@@ -14296,7 +14296,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -21140,7 +21392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -13996,7 +13996,7 @@ +@@ -14384,7 +14384,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -21149,7 +21401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14025,7 +14025,7 @@ +@@ -14413,7 +14413,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -21158,7 +21410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -14045,7 +14045,7 @@ +@@ -14433,7 +14433,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', @@ -21167,7 +21419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -14066,7 +14066,7 @@ +@@ -14454,7 +14454,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -21176,7 +21428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -14087,7 +14087,7 @@ +@@ -14475,7 +14475,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -21185,7 +21437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14106,7 +14106,7 @@ +@@ -14494,7 +14494,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -21194,7 +21446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14125,7 +14125,7 @@ +@@ -14513,7 +14513,7 @@ }, { 'name': 'HighContrastEnabled', @@ -21203,7 +21455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14144,7 +14144,7 @@ +@@ -14532,7 +14532,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -21212,7 +21464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14170,7 +14170,7 @@ +@@ -14558,7 +14558,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -21221,7 +21473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14195,7 +14195,7 @@ +@@ -14583,7 +14583,7 @@ }, { 'name': 'VirtualKeyboardEnabled', @@ -21230,7 +21482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -14214,7 +14214,7 @@ +@@ -14602,7 +14602,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -21239,7 +21491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14266,7 +14266,7 @@ +@@ -14654,7 +14654,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -21248,7 +21500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -14285,7 +14285,7 @@ +@@ -14673,7 +14673,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -21257,7 +21509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -14310,7 +14310,7 @@ +@@ -14698,7 +14698,7 @@ }, { 'name': 'DictationEnabled', @@ -21266,7 +21518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14335,7 +14335,7 @@ +@@ -14723,7 +14723,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -21275,7 +21527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14362,7 +14362,7 @@ +@@ -14750,7 +14750,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -21284,7 +21536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14389,7 +14389,7 @@ +@@ -14777,7 +14777,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -21293,7 +21545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14416,7 +14416,7 @@ +@@ -14804,7 +14804,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -21302,7 +21554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14443,7 +14443,7 @@ +@@ -14831,7 +14831,7 @@ }, { 'name': 'AutoclickEnabled', @@ -21311,7 +21563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14470,7 +14470,7 @@ +@@ -14858,7 +14858,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -21320,7 +21572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -14489,7 +14489,7 @@ +@@ -14877,7 +14877,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -21329,7 +21581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14528,7 +14528,7 @@ +@@ -14916,7 +14916,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -21338,7 +21590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14550,7 +14550,7 @@ +@@ -14938,7 +14938,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -21347,16 +21599,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14575,7 +14575,7 @@ +@@ -14963,7 +14963,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['amraboelkher@chromium.org', 'emaxx@chromium.org'], ++ 'owners': ['amraboelkher@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14597,7 +14597,7 @@ +@@ -14985,7 +14985,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -21365,7 +21617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14622,7 +14622,7 @@ +@@ -15010,7 +15010,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -21374,7 +21626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14644,7 +14644,7 @@ +@@ -15032,7 +15032,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -21383,7 +21635,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14669,7 +14669,7 @@ +@@ -15057,7 +15057,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -21392,7 +21644,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -14694,7 +14694,7 @@ +@@ -15082,7 +15082,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -21401,7 +21653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14719,7 +14719,7 @@ +@@ -15107,7 +15107,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -21410,7 +21662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14744,7 +14744,7 @@ +@@ -15132,7 +15132,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -21419,7 +21671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14769,7 +14769,7 @@ +@@ -15157,7 +15157,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -21428,7 +21680,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-'], -@@ -14795,7 +14795,7 @@ +@@ -15183,7 +15183,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -21437,7 +21689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14839,7 +14839,7 @@ +@@ -15227,7 +15227,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -21446,7 +21698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14886,7 +14886,7 @@ +@@ -15274,7 +15274,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -21455,7 +21707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14911,7 +14911,7 @@ +@@ -15299,7 +15299,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -21464,7 +21716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14936,7 +14936,7 @@ +@@ -15324,7 +15324,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -21473,7 +21725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14961,7 +14961,7 @@ +@@ -15349,7 +15349,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -21482,7 +21734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -14986,7 +14986,7 @@ +@@ -15374,7 +15374,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -21491,7 +21743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15013,7 +15013,7 @@ +@@ -15401,7 +15401,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -21500,7 +21752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15040,7 +15040,7 @@ +@@ -15428,7 +15428,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -21509,7 +21761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15065,7 +15065,7 @@ +@@ -15453,7 +15453,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -21518,7 +21770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15092,7 +15092,7 @@ +@@ -15480,7 +15480,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -21527,7 +21779,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-'], -@@ -15112,7 +15112,7 @@ +@@ -15500,7 +15500,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -21536,7 +21788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15134,7 +15134,7 @@ +@@ -15522,7 +15522,7 @@ }, { 'name': 'UptimeLimit', @@ -21545,7 +21797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -15155,7 +15155,7 @@ +@@ -15543,7 +15543,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -21554,7 +21806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15179,7 +15179,7 @@ +@@ -15567,7 +15567,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -21563,7 +21815,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -15200,7 +15200,7 @@ +@@ -15588,7 +15588,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -21572,7 +21824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -15221,7 +15221,7 @@ +@@ -15609,7 +15609,7 @@ }, { 'name': 'ChromeVariations', @@ -21581,7 +21833,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15258,7 +15258,7 @@ +@@ -15646,7 +15646,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -21590,7 +21842,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. -@@ -15268,7 +15268,7 @@ +@@ -15656,7 +15656,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -21599,7 +21851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15303,7 +15303,7 @@ +@@ -15691,7 +15691,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google Chrome OS device. @@ -21608,7 +21860,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 Chrome OS. -@@ -15313,7 +15313,7 @@ +@@ -15701,7 +15701,7 @@ }, { 'name': 'AttestationEnabledForDevice', @@ -21617,7 +21869,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15332,7 +15332,7 @@ +@@ -15720,7 +15720,7 @@ }, { 'name': 'AttestationEnabledForUser', @@ -21626,7 +21878,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15350,7 +15350,7 @@ +@@ -15738,7 +15738,7 @@ }, { 'name': 'AttestationExtensionAllowlist', @@ -21635,7 +21887,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15371,7 +15371,7 @@ +@@ -15759,7 +15759,7 @@ }, { 'name': 'AttestationExtensionWhitelist', @@ -21644,7 +21896,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15395,7 +15395,7 @@ +@@ -15783,7 +15783,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', @@ -21653,7 +21905,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -15414,7 +15414,7 @@ +@@ -15802,7 +15802,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -21662,7 +21914,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.''', -@@ -15430,7 +15430,7 @@ +@@ -15818,7 +15818,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -21671,7 +21923,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15453,7 +15453,7 @@ +@@ -15841,7 +15841,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -21680,7 +21932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15476,7 +15476,7 @@ +@@ -15864,7 +15864,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', @@ -21689,7 +21941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15495,7 +15495,7 @@ +@@ -15883,7 +15883,7 @@ }, { 'name': 'ManagedBookmarks', @@ -21698,7 +21950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -15528,20 +15528,20 @@ +@@ -15916,20 +15916,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -21723,7 +21975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -15549,13 +15549,13 @@ +@@ -15937,13 +15937,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -21736,10 +21988,10 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'name': 'DataCompressionProxyEnabled', - 'owners': ['bolian@chromium.org', 'pmarko@chromium.org'], + 'owners': ['bolian@ch40m1um.qjz9zk', 'pmarko@ch40m1um.qjz9zk'], + 'deprecated': True, 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['android:31-'], -@@ -15573,7 +15573,7 @@ +@@ -15962,7 +15962,7 @@ }, { 'name': 'UserAvatarImage', @@ -21748,7 +22000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -15610,7 +15610,7 @@ +@@ -15999,7 +15999,7 @@ }, { 'name': 'WallpaperImage', @@ -21757,7 +22009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -15645,7 +15645,7 @@ +@@ -16034,7 +16034,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -21766,7 +22018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -15684,7 +15684,7 @@ +@@ -16073,7 +16073,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -21775,7 +22027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -15710,7 +15710,7 @@ +@@ -16099,7 +16099,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -21784,7 +22036,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -15731,7 +15731,7 @@ +@@ -16120,7 +16120,7 @@ }, { 'name': 'SessionLocales', @@ -21793,7 +22045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15759,7 +15759,7 @@ +@@ -16148,7 +16148,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -21801,8 +22053,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['mlerman@ch40m1um.qjz9zk', 'zmin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:38-'], -@@ -15777,7 +15777,7 @@ + 'supported_on': ['chrome.*:38-', 'chrome_os:100-'], +@@ -16168,7 +16168,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -21811,7 +22063,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -15795,7 +15795,7 @@ +@@ -16186,7 +16186,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -21819,8 +22071,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['mlerman@ch40m1um.qjz9zk', 'zmin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:39-'], -@@ -15813,7 +15813,7 @@ + 'supported_on': ['chrome.*:39-', 'chrome_os:100-'], +@@ -16206,7 +16206,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -21829,7 +22081,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -15834,7 +15834,7 @@ +@@ -16227,7 +16227,7 @@ }, { 'name': 'BrowserSignin', @@ -21838,7 +22090,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15873,13 +15873,13 @@ +@@ -16266,13 +16266,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. @@ -21854,7 +22106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -15939,7 +15939,7 @@ +@@ -16332,7 +16332,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -21863,7 +22115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -15984,7 +15984,7 @@ +@@ -16377,7 +16377,7 @@ }, { 'name': 'SSLVersionMax', @@ -21872,7 +22124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16062,7 +16062,7 @@ +@@ -16455,7 +16455,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -21881,7 +22133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16085,11 +16085,11 @@ +@@ -16478,11 +16478,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. @@ -21895,7 +22147,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16122,7 +16122,7 @@ +@@ -16515,7 +16515,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -21904,7 +22156,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16149,7 +16149,7 @@ +@@ -16542,7 +16542,7 @@ }, { 'name': 'RC4Enabled', @@ -21913,7 +22165,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16174,7 +16174,7 @@ +@@ -16567,7 +16567,7 @@ }, { 'name': 'DHEEnabled', @@ -21922,7 +22174,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16201,7 +16201,7 @@ +@@ -16594,7 +16594,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -21931,7 +22183,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -16232,7 +16232,7 @@ +@@ -16625,7 +16625,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -21940,7 +22192,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -16250,7 +16250,7 @@ +@@ -16643,7 +16643,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -21949,7 +22201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -16269,7 +16269,7 @@ +@@ -16662,7 +16662,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -21958,7 +22210,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -16287,7 +16287,7 @@ +@@ -16680,7 +16680,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -21967,7 +22219,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -16305,7 +16305,7 @@ +@@ -16698,7 +16698,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -21976,7 +22228,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-'], -@@ -16323,7 +16323,7 @@ +@@ -16716,7 +16716,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -21985,7 +22237,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16344,11 +16344,11 @@ +@@ -16737,11 +16737,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. @@ -21999,7 +22251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16359,7 +16359,7 @@ +@@ -16752,7 +16752,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22008,7 +22260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 865, 'caption': '''Allow origins to query for device attributes''', 'tags': [], -@@ -16369,7 +16369,7 @@ +@@ -16762,7 +16762,7 @@ }, { 'name': 'QuicAllowed', @@ -22017,7 +22269,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-'], -@@ -16387,7 +16387,7 @@ +@@ -16780,7 +16780,7 @@ }, { 'name': 'KeyPermissions', @@ -22026,7 +22278,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -16430,7 +16430,7 @@ +@@ -16823,7 +16823,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -22035,7 +22287,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -16449,7 +16449,7 @@ +@@ -16842,7 +16842,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -22044,7 +22296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -16467,7 +16467,7 @@ +@@ -16860,7 +16860,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -22053,7 +22305,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -16486,7 +16486,7 @@ +@@ -16879,7 +16879,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -22062,7 +22314,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16531,7 +16531,7 @@ +@@ -16924,7 +16924,7 @@ }, { 'name': 'ArcEnabled', @@ -22071,7 +22323,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -16549,7 +16549,7 @@ +@@ -16942,7 +16942,7 @@ }, { 'name': 'ArcPolicy', @@ -22080,7 +22332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -16609,7 +16609,7 @@ +@@ -17002,7 +17002,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -22089,7 +22341,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -16631,7 +16631,7 @@ +@@ -17024,7 +17024,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -22098,7 +22350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16667,7 +16667,7 @@ +@@ -17060,7 +17060,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -22107,7 +22359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16708,7 +16708,7 @@ +@@ -17101,7 +17101,7 @@ }, { 'name': 'UsbDetachableAllowlist', @@ -22116,7 +22368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16745,7 +16745,7 @@ +@@ -17138,7 +17138,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -22125,7 +22377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -16765,7 +16765,7 @@ +@@ -17158,7 +17158,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -22134,7 +22386,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. -@@ -16783,7 +16783,7 @@ +@@ -17176,7 +17176,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -22143,7 +22395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -16817,7 +16817,7 @@ +@@ -17210,7 +17210,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -22152,7 +22404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16871,7 +16871,7 @@ +@@ -17264,7 +17264,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -22161,7 +22413,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. -@@ -16889,7 +16889,7 @@ +@@ -17282,7 +17282,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -22170,7 +22422,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -16927,7 +16927,7 @@ +@@ -17320,7 +17320,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -22179,7 +22431,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.''', -@@ -16962,7 +16962,7 @@ +@@ -17355,7 +17355,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -22188,7 +22440,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. -@@ -16981,7 +16981,7 @@ +@@ -17374,7 +17374,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -22197,7 +22449,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 Chrome OS turns off Wi-Fi, and users can't change it. -@@ -17000,7 +17000,7 @@ +@@ -17393,7 +17393,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -22206,7 +22458,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. -@@ -17045,7 +17045,7 @@ +@@ -17438,7 +17438,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -22215,7 +22467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17069,7 +17069,7 @@ +@@ -17462,7 +17462,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -22224,7 +22476,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17080,7 +17080,7 @@ +@@ -17473,7 +17473,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -22233,7 +22485,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'], -@@ -17093,13 +17093,13 @@ +@@ -17486,13 +17486,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -22250,7 +22502,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. -@@ -17117,7 +17117,7 @@ +@@ -17510,7 +17510,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -22259,7 +22511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17150,7 +17150,7 @@ +@@ -17543,7 +17543,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -22268,7 +22520,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-'], -@@ -17159,7 +17159,7 @@ +@@ -17552,7 +17552,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22277,7 +22529,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'], -@@ -17169,11 +17169,11 @@ +@@ -17562,11 +17562,11 @@ Users cannot change or override this setting. @@ -22291,7 +22543,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' ], -@@ -17266,7 +17266,7 @@ +@@ -17659,7 +17659,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -22300,7 +22552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -17284,7 +17284,7 @@ +@@ -17677,7 +17677,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -22309,7 +22561,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -17302,7 +17302,7 @@ +@@ -17695,7 +17695,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -22318,7 +22570,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-','ios:93-'], -@@ -17333,7 +17333,7 @@ +@@ -17726,7 +17726,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -22327,7 +22579,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-'], -@@ -17364,7 +17364,7 @@ +@@ -17757,7 +17757,7 @@ }, { 'name': 'NTPCardsVisible', @@ -22336,7 +22588,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-'], -@@ -17403,7 +17403,7 @@ +@@ -17796,7 +17796,7 @@ }, { 'name': 'NTPMiddleSlotAnnouncementVisible', @@ -22345,7 +22597,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-'], -@@ -17436,7 +17436,7 @@ +@@ -17829,7 +17829,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -22354,7 +22606,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-'], -@@ -17454,7 +17454,7 @@ +@@ -17847,7 +17847,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -22363,7 +22615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17476,7 +17476,7 @@ +@@ -17869,7 +17869,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -22372,7 +22624,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-'], -@@ -17495,7 +17495,7 @@ +@@ -17888,7 +17888,7 @@ }, { 'name': 'NativePrinters', @@ -22381,7 +22633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17519,7 +17519,7 @@ +@@ -17912,7 +17912,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -22390,7 +22642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -17575,7 +17575,7 @@ +@@ -17968,7 +17968,7 @@ }, { 'name': 'Printers', @@ -22399,7 +22651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17599,7 +17599,7 @@ +@@ -17992,7 +17992,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -22408,7 +22660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -17652,7 +17652,7 @@ +@@ -18045,7 +18045,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -22417,7 +22669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -17685,7 +17685,7 @@ +@@ -18078,7 +18078,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -22426,7 +22678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -17715,7 +17715,7 @@ +@@ -18108,7 +18108,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -22435,7 +22687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-'], 'type': 'int-enum', -@@ -17763,7 +17763,7 @@ +@@ -18156,7 +18156,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -22444,7 +22696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -17808,7 +17808,7 @@ +@@ -18201,7 +18201,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -22453,7 +22705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 384, 'type': 'list', -@@ -17830,7 +17830,7 @@ +@@ -18223,7 +18223,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -22462,7 +22714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -17849,7 +17849,7 @@ +@@ -18242,7 +18242,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -22471,7 +22723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 385, 'type': 'list', -@@ -17871,7 +17871,7 @@ +@@ -18264,7 +18264,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -22480,7 +22732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -17890,7 +17890,7 @@ +@@ -18283,7 +18283,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -22489,7 +22741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -17928,7 +17928,7 @@ +@@ -18321,7 +18321,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -22498,7 +22750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-'], -@@ -17976,7 +17976,7 @@ +@@ -18369,7 +18369,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -22507,7 +22759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 388, -@@ -17998,7 +17998,7 @@ +@@ -18391,7 +18391,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -22516,7 +22768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 389, -@@ -18021,7 +18021,7 @@ +@@ -18414,7 +18414,7 @@ }, { 'name': 'DevicePrinters', @@ -22525,7 +22777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -18056,7 +18056,7 @@ +@@ -18449,7 +18449,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -22534,7 +22786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -18101,7 +18101,7 @@ +@@ -18494,7 +18494,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -22543,7 +22795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -18120,7 +18120,7 @@ +@@ -18513,7 +18513,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -22552,7 +22804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -18140,7 +18140,7 @@ +@@ -18533,7 +18533,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -22561,7 +22813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -18193,7 +18193,7 @@ +@@ -18586,7 +18586,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -22570,7 +22822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -18219,7 +18219,7 @@ +@@ -18612,7 +18612,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -22579,7 +22831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -18303,7 +18303,7 @@ +@@ -18696,7 +18696,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -22588,7 +22840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -18327,7 +18327,7 @@ +@@ -18720,7 +18720,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', @@ -22597,7 +22849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18365,7 +18365,7 @@ +@@ -18758,7 +18758,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', @@ -22606,7 +22858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18406,7 +18406,7 @@ +@@ -18799,7 +18799,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -22615,7 +22867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18449,7 +18449,7 @@ +@@ -18842,7 +18842,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -22624,7 +22876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -18467,7 +18467,7 @@ +@@ -18860,7 +18860,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -22633,7 +22885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -18485,7 +18485,7 @@ +@@ -18878,7 +18878,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -22642,7 +22894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -18503,7 +18503,7 @@ +@@ -18896,7 +18896,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -22651,7 +22903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -18536,7 +18536,7 @@ +@@ -18929,7 +18929,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -22660,7 +22912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18557,7 +18557,7 @@ +@@ -18950,7 +18950,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -22669,7 +22921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18578,7 +18578,7 @@ +@@ -18971,7 +18971,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -22678,7 +22930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -18601,7 +18601,7 @@ +@@ -18994,7 +18994,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -22687,7 +22939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -18622,7 +18622,7 @@ +@@ -19015,7 +19015,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -22696,7 +22948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -18645,7 +18645,7 @@ +@@ -19038,7 +19038,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -22705,7 +22957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -18666,7 +18666,7 @@ +@@ -19059,7 +19059,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -22714,7 +22966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -18687,7 +18687,7 @@ +@@ -19080,7 +19080,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -22723,7 +22975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -18708,7 +18708,7 @@ +@@ -19101,7 +19101,7 @@ }, { 'name': 'PhoneHubCameraRollAllowed', @@ -22732,7 +22984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -18739,7 +18739,7 @@ +@@ -19132,7 +19132,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -22741,7 +22993,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -18759,7 +18759,7 @@ +@@ -19152,7 +19152,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -22750,7 +23002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -18779,7 +18779,7 @@ +@@ -19172,7 +19172,7 @@ }, { 'name': 'EcheAllowed', @@ -22759,7 +23011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -18810,7 +18810,7 @@ +@@ -19203,7 +19203,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -22768,7 +23020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -18831,7 +18831,7 @@ +@@ -19224,7 +19224,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -22777,7 +23029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -18862,7 +18862,7 @@ +@@ -19255,7 +19255,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -22786,7 +23038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -18891,7 +18891,7 @@ +@@ -19284,7 +19284,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -22795,7 +23047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18934,7 +18934,7 @@ +@@ -19327,7 +19327,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -22804,7 +23056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -18966,7 +18966,7 @@ +@@ -19359,7 +19359,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -22813,7 +23065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19012,7 +19012,7 @@ +@@ -19405,7 +19405,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -22822,7 +23074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19068,7 +19068,7 @@ +@@ -19461,7 +19461,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -22831,7 +23083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -19105,7 +19105,7 @@ +@@ -19498,7 +19498,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -22840,7 +23092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19135,7 +19135,7 @@ +@@ -19528,7 +19528,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -22849,7 +23101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19162,7 +19162,7 @@ +@@ -19555,7 +19555,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -22858,7 +23110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19182,7 +19182,7 @@ +@@ -19575,7 +19575,7 @@ }, { 'name': 'CastReceiverName', @@ -22867,7 +23119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -19202,7 +19202,7 @@ +@@ -19595,7 +19595,7 @@ }, { 'name': 'DeviceOffHours', @@ -22876,7 +23128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19285,7 +19285,7 @@ +@@ -19678,7 +19678,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -22885,7 +23137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -19310,7 +19310,7 @@ +@@ -19703,7 +19703,7 @@ }, { 'name': 'CloudUserPolicyOverridesCloudMachinePolicy', @@ -22894,7 +23146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:96-', 'android:97-'], -@@ -19344,7 +19344,7 @@ +@@ -19737,7 +19737,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -22903,7 +23155,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-'], -@@ -19362,7 +19362,7 @@ +@@ -19755,7 +19755,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -22912,7 +23164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -19380,7 +19380,7 @@ +@@ -19773,7 +19773,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -22921,7 +23173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19432,7 +19432,7 @@ +@@ -19825,7 +19825,7 @@ }, { 'name': 'IsolateOrigins', @@ -22930,7 +23182,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-'], -@@ -19459,7 +19459,7 @@ +@@ -19852,7 +19852,7 @@ }, { 'name': 'SitePerProcess', @@ -22939,7 +23191,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-'], -@@ -19482,7 +19482,7 @@ +@@ -19875,7 +19875,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -22948,7 +23200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -19505,7 +19505,7 @@ +@@ -19898,7 +19898,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -22957,7 +23209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -19526,7 +19526,7 @@ +@@ -19919,7 +19919,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -22966,7 +23218,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -19553,7 +19553,7 @@ +@@ -19946,7 +19946,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -22975,7 +23227,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -19578,7 +19578,7 @@ +@@ -19971,7 +19971,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -22984,7 +23236,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-'], -@@ -19603,7 +19603,7 @@ +@@ -19996,7 +19996,7 @@ 'caption': '''Specifies whether SharedArrayBuffers can be used in a non cross-origin-isolated context''', 'tags': ['system-security'], 'desc': ''' @@ -22993,7 +23245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When set to Enabled, sites can use SharedArrayBuffer with no restrictions. -@@ -19611,7 +19611,7 @@ +@@ -20004,7 +20004,7 @@ }, { 'name': 'SandboxExternalProtocolBlocked', @@ -23002,7 +23254,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-'], -@@ -19636,7 +19636,7 @@ +@@ -20029,7 +20029,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 @@ -23011,7 +23263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When True, this lets Chrome blocks those navigations. -@@ -19649,7 +19649,7 @@ +@@ -20042,7 +20042,7 @@ }, { 'name': 'CrossOriginWebAssemblyModuleSharingEnabled', @@ -23020,7 +23272,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'], -@@ -19683,7 +19683,7 @@ +@@ -20076,7 +20076,7 @@ }, { 'name': 'DisplayCapturePermissionsPolicyEnabled', @@ -23029,7 +23281,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-'], -@@ -19720,7 +19720,7 @@ +@@ -20113,7 +20113,7 @@ }, { 'name': 'WebDriverOverridesIncompatiblePolicies', @@ -23038,7 +23290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -19748,7 +19748,7 @@ +@@ -20141,7 +20141,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -23047,7 +23299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19781,7 +19781,7 @@ +@@ -20174,7 +20174,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -23056,7 +23308,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-'], -@@ -19799,11 +19799,11 @@ +@@ -20192,11 +20192,11 @@ Leaving the policy unset means Chrome uses its platform-specific default directory. @@ -23070,7 +23322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -19822,7 +19822,7 @@ +@@ -20215,7 +20215,7 @@ }, { 'name': 'DeviceHostnameUserConfigurable', @@ -23079,7 +23331,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -19855,7 +19855,7 @@ +@@ -20248,7 +20248,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -23088,7 +23340,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-'], -@@ -19884,7 +19884,7 @@ +@@ -20277,7 +20277,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -23097,7 +23349,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19915,7 +19915,7 @@ +@@ -20308,7 +20308,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -23106,7 +23358,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19949,7 +19949,7 @@ +@@ -20342,7 +20342,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -23115,7 +23367,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19980,7 +19980,7 @@ +@@ -20373,7 +20373,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -23124,7 +23376,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -19998,7 +19998,7 @@ +@@ -20391,7 +20391,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -23133,7 +23385,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-'], -@@ -20034,7 +20034,7 @@ +@@ -20427,7 +20427,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -23142,7 +23394,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20068,7 +20068,7 @@ +@@ -20461,7 +20461,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -23151,7 +23403,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20079,7 +20079,7 @@ +@@ -20472,7 +20472,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -23160,7 +23412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 410, 'caption': '''Restrict accounts that are visible in $1Google Chrome''', 'tags': [], -@@ -20093,7 +20093,7 @@ +@@ -20486,7 +20486,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -23169,7 +23421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20142,7 +20142,7 @@ +@@ -20535,7 +20535,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -23178,7 +23430,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20177,7 +20177,7 @@ +@@ -20570,7 +20570,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -23187,7 +23439,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20198,7 +20198,7 @@ +@@ -20591,7 +20591,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -23196,7 +23448,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20217,7 +20217,7 @@ +@@ -20610,7 +20610,7 @@ { 'id': 854, 'name': 'RelaunchWindow', @@ -23205,7 +23457,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20287,7 +20287,7 @@ +@@ -20680,7 +20680,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -23214,7 +23466,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -20306,7 +20306,7 @@ +@@ -20699,7 +20699,7 @@ }, { 'name': 'CrostiniAllowed', @@ -23223,7 +23475,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20322,7 +20322,7 @@ +@@ -20715,7 +20715,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -23232,7 +23484,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20338,7 +20338,7 @@ +@@ -20731,7 +20731,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -23241,7 +23493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20354,7 +20354,7 @@ +@@ -20747,7 +20747,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -23250,7 +23502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -20373,7 +20373,7 @@ +@@ -20766,7 +20766,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -23259,7 +23511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -20413,7 +20413,7 @@ +@@ -20806,7 +20806,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -23268,7 +23520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20451,7 +20451,7 @@ +@@ -20844,7 +20844,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -23277,7 +23529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -20492,7 +20492,7 @@ +@@ -20885,7 +20885,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -23286,7 +23538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20512,7 +20512,7 @@ +@@ -20905,7 +20905,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -23295,7 +23547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20538,7 +20538,7 @@ +@@ -20931,7 +20931,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -23304,7 +23556,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20561,7 +20561,7 @@ +@@ -20954,7 +20954,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -23313,7 +23565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20576,15 +20576,15 @@ +@@ -20969,15 +20969,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -23332,7 +23584,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:69-', 'chrome_os:69-'], -@@ -20596,15 +20596,15 @@ +@@ -20989,15 +20989,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -23351,7 +23603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:66-', 'chrome_os:66-', 'android: 87-'], -@@ -20622,12 +20622,12 @@ +@@ -21015,12 +21015,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -23366,7 +23618,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -20647,7 +20647,7 @@ +@@ -21040,7 +21040,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -23375,7 +23627,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -20666,11 +20666,11 @@ +@@ -21059,11 +21059,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. @@ -23389,7 +23641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -20687,11 +20687,11 @@ +@@ -21080,11 +21080,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. @@ -23403,7 +23655,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-'], -@@ -20711,7 +20711,7 @@ +@@ -21104,7 +21104,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -23412,7 +23664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20731,11 +20731,11 @@ +@@ -21124,11 +21124,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. @@ -23426,7 +23678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20752,11 +20752,11 @@ +@@ -21145,11 +21145,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. @@ -23440,7 +23692,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'], -@@ -20771,13 +20771,13 @@ +@@ -21164,13 +21164,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -23456,7 +23708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -20801,7 +20801,7 @@ +@@ -21194,7 +21194,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -23465,7 +23717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -20822,7 +20822,7 @@ +@@ -21215,7 +21215,7 @@ }, { 'name': 'DeviceSamlLoginAuthenticationType', @@ -23474,7 +23726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20859,7 +20859,7 @@ +@@ -21252,7 +21252,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -23483,7 +23735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -20879,7 +20879,7 @@ +@@ -21272,7 +21272,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -23492,7 +23744,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -20901,7 +20901,7 @@ +@@ -21294,7 +21294,7 @@ }, { 'name': 'AllowedLanguages', @@ -23501,7 +23753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20925,7 +20925,7 @@ +@@ -21318,7 +21318,7 @@ }, { 'name': 'AllowedInputMethods', @@ -23510,7 +23762,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20949,7 +20949,7 @@ +@@ -21342,7 +21342,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -23519,7 +23771,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -20966,7 +20966,7 @@ +@@ -21359,7 +21359,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', @@ -23528,7 +23780,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20984,7 +20984,7 @@ +@@ -21377,7 +21377,7 @@ }, { 'name': 'UsageTimeLimit', @@ -23537,7 +23789,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21137,7 +21137,7 @@ +@@ -21530,7 +21530,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -23546,7 +23798,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21179,7 +21179,7 @@ +@@ -21572,7 +21572,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -23555,7 +23807,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21221,7 +21221,7 @@ +@@ -21614,7 +21614,7 @@ }, { 'name': 'EnableSyncConsent', @@ -23564,7 +23816,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -21239,7 +21239,7 @@ +@@ -21632,7 +21632,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -23573,7 +23825,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -21260,7 +21260,7 @@ +@@ -21653,7 +21653,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -23582,7 +23834,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21347,7 +21347,7 @@ +@@ -21740,7 +21740,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -23591,7 +23843,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21366,7 +21366,7 @@ +@@ -21759,7 +21759,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -23600,7 +23852,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21404,7 +21404,7 @@ +@@ -21797,7 +21797,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -23609,7 +23861,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21428,7 +21428,7 @@ +@@ -21821,7 +21821,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -23618,7 +23870,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21473,7 +21473,7 @@ +@@ -21866,7 +21866,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -23627,7 +23879,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'], -@@ -21488,13 +21488,13 @@ +@@ -21881,13 +21881,13 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -23643,7 +23895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:69-', 'chrome_os:69-', 'android:70-', 'ios:90-'], -@@ -21515,7 +21515,7 @@ +@@ -21908,7 +21908,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -23652,7 +23904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -21530,7 +21530,7 @@ +@@ -21923,7 +21923,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -23661,7 +23913,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-'], -@@ -21550,7 +21550,7 @@ +@@ -21943,7 +21943,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -23670,7 +23922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -21568,7 +21568,7 @@ +@@ -21961,7 +21961,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -23679,7 +23931,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21593,7 +21593,7 @@ +@@ -21986,7 +21986,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -23688,7 +23940,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -21611,7 +21611,7 @@ +@@ -22004,7 +22004,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -23697,7 +23949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21631,12 +21631,12 @@ +@@ -22024,12 +22024,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -23713,7 +23965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -21649,7 +21649,7 @@ +@@ -22042,7 +22042,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -23722,7 +23974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21686,18 +21686,18 @@ +@@ -22079,18 +22079,18 @@ }, 'max_size': 1048576, 'example_value': [{ @@ -23745,7 +23997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'custom_name': 'Spreadsheets' }, { -@@ -21753,7 +21753,7 @@ +@@ -22146,7 +22146,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -23754,7 +24006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21778,7 +21778,7 @@ +@@ -22171,7 +22171,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -23763,7 +24015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21803,7 +21803,7 @@ +@@ -22196,7 +22196,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -23772,7 +24024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21827,7 +21827,7 @@ +@@ -22220,7 +22220,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -23781,7 +24033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21852,7 +21852,7 @@ +@@ -22245,7 +22245,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -23790,7 +24042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21877,7 +21877,7 @@ +@@ -22270,7 +22270,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -23799,7 +24051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -21903,7 +21903,7 @@ +@@ -22296,7 +22296,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -23808,7 +24060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -21929,7 +21929,7 @@ +@@ -22322,7 +22322,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -23817,7 +24069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -21968,7 +21968,7 @@ +@@ -22361,7 +22361,7 @@ { 'id': 942, 'name': 'CloudProfileReportingEnabled', @@ -23826,7 +24078,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22004,7 +22004,7 @@ +@@ -22398,7 +22398,7 @@ + { + 'id': 962, + 'name': 'CloudReportingUploadFrequency', +- 'owners': ['zmin@chromium.org', 'file://components/enterprise/browser/reporting/OWNERS'], ++ 'owners': ['zmin@ch40m1um.qjz9zk', 'file://components/enterprise/browser/reporting/OWNERS'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 3 , 'maximum': 168}, + 'future_on': ['chrome.*', 'chrome_os', 'android', 'ios'], +@@ -22423,7 +22423,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -23835,7 +24096,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-'], -@@ -22024,7 +22024,7 @@ +@@ -22443,7 +22443,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -23844,7 +24105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -22043,7 +22043,7 @@ +@@ -22462,7 +22462,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -23853,7 +24114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22061,7 +22061,7 @@ +@@ -22480,7 +22480,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -23862,7 +24123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22106,7 +22106,7 @@ +@@ -22525,7 +22525,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -23871,7 +24132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22146,7 +22146,7 @@ +@@ -22565,7 +22565,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -23880,7 +24141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22164,7 +22164,7 @@ +@@ -22583,7 +22583,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -23889,7 +24150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22195,7 +22195,7 @@ +@@ -22614,7 +22614,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -23898,7 +24159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22215,7 +22215,7 @@ +@@ -22634,7 +22634,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -23907,7 +24168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22242,7 +22242,7 @@ +@@ -22661,7 +22661,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -23916,7 +24177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22269,7 +22269,7 @@ +@@ -22688,7 +22688,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -23925,7 +24186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22296,7 +22296,7 @@ +@@ -22715,7 +22715,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -23934,7 +24195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22313,12 +22313,12 @@ +@@ -22732,12 +22732,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. @@ -23949,7 +24210,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', -@@ -22333,12 +22333,12 @@ +@@ -22752,12 +22752,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. @@ -23964,7 +24225,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', -@@ -22353,12 +22353,12 @@ +@@ -22772,12 +22772,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. @@ -23979,7 +24240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -22376,7 +22376,7 @@ +@@ -22795,7 +22795,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -23988,7 +24249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22394,7 +22394,7 @@ +@@ -22813,7 +22813,7 @@ { 'id': 866, 'name': 'BrowserSwitcherParsingMode', @@ -23997,7 +24258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22437,7 +22437,7 @@ +@@ -22856,7 +22856,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -24006,7 +24267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -22454,7 +22454,7 @@ +@@ -22873,7 +22873,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -24015,7 +24276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22495,7 +22495,7 @@ +@@ -22914,7 +22914,7 @@ }, { 'name': 'PluginVmAllowed', @@ -24024,7 +24285,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -22513,7 +22513,7 @@ +@@ -22932,7 +22932,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -24033,7 +24294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -22533,7 +22533,7 @@ +@@ -22952,7 +22952,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -24042,7 +24303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -22555,7 +22555,7 @@ +@@ -22974,7 +22974,7 @@ }, { 'name': 'PluginVmUserId', @@ -24051,7 +24312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -22574,7 +22574,7 @@ +@@ -22993,7 +22993,7 @@ }, { 'name': 'PluginVmImage', @@ -24060,7 +24321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22605,7 +22605,7 @@ +@@ -23024,7 +23024,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -24069,7 +24330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -22624,7 +22624,7 @@ +@@ -23043,7 +23043,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -24078,7 +24339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -22647,7 +22647,7 @@ +@@ -23066,7 +23066,7 @@ }, { 'name': 'ParentAccessCodeConfig', @@ -24087,7 +24348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -22725,7 +22725,7 @@ +@@ -23144,7 +23144,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -24096,7 +24357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22765,7 +22765,7 @@ +@@ -23184,7 +23184,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -24105,7 +24366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22812,7 +22812,7 @@ +@@ -23231,7 +23231,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -24114,7 +24375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -22829,7 +22829,7 @@ +@@ -23248,7 +23248,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -24123,7 +24384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -22869,7 +22869,7 @@ +@@ -23288,7 +23288,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -24132,7 +24393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -22887,7 +22887,7 @@ +@@ -23306,7 +23306,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -24141,7 +24402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -22905,7 +22905,7 @@ +@@ -23324,7 +23324,7 @@ }, { 'name': 'AssistantVoiceMatchEnabledDuringOobe', @@ -24150,7 +24411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:93-'], -@@ -22934,7 +22934,7 @@ +@@ -23353,7 +23353,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -24159,7 +24420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -22957,7 +22957,7 @@ +@@ -23376,7 +23376,7 @@ }, { 'name': 'QuickAnswersEnabled', @@ -24168,7 +24429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -22988,7 +22988,7 @@ +@@ -23407,7 +23407,7 @@ }, { 'name': 'QuickAnswersDefinitionEnabled', @@ -24177,7 +24438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23018,7 +23018,7 @@ +@@ -23437,7 +23437,7 @@ }, { 'name': 'QuickAnswersTranslationEnabled', @@ -24186,7 +24447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23048,7 +23048,7 @@ +@@ -23467,7 +23467,7 @@ }, { 'name': 'QuickAnswersUnitConversionEnabled', @@ -24195,7 +24456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23078,7 +23078,7 @@ +@@ -23497,7 +23497,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -24204,7 +24465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23097,7 +23097,7 @@ +@@ -23516,7 +23516,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -24213,7 +24474,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -23117,11 +23117,11 @@ +@@ -23536,11 +23536,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -24227,7 +24488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -23150,7 +23150,7 @@ +@@ -23569,7 +23569,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -24236,7 +24497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23171,7 +23171,7 @@ +@@ -23590,7 +23590,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -24245,7 +24506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23194,7 +23194,7 @@ +@@ -23613,7 +23613,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -24254,7 +24515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23273,7 +23273,7 @@ +@@ -23692,7 +23692,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -24263,7 +24524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23294,7 +23294,7 @@ +@@ -23713,7 +23713,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -24272,7 +24533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23319,7 +23319,7 @@ +@@ -23738,7 +23738,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -24281,7 +24542,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-'], -@@ -23348,7 +23348,7 @@ +@@ -23767,7 +23767,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', @@ -24290,7 +24551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:95-', 'chrome_os:95-'], 'type': 'list', 'schema': { -@@ -23376,11 +23376,11 @@ +@@ -23795,11 +23795,11 @@ For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server. @@ -24304,7 +24565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -23403,7 +23403,7 @@ +@@ -23822,7 +23822,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -24313,7 +24574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -23437,7 +23437,7 @@ +@@ -23856,7 +23856,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -24322,7 +24583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -23455,7 +23455,7 @@ +@@ -23874,7 +23874,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -24331,7 +24592,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -23486,7 +23486,7 @@ +@@ -23905,7 +23905,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -24340,7 +24601,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23512,7 +23512,7 @@ +@@ -23931,7 +23931,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -24349,7 +24610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23533,7 +23533,7 @@ +@@ -23952,7 +23952,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -24358,7 +24619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23600,7 +23600,7 @@ +@@ -24019,7 +24019,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -24367,7 +24628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23651,7 +23651,7 @@ +@@ -24070,7 +24070,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -24376,7 +24637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23674,7 +23674,7 @@ +@@ -24093,7 +24093,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -24385,7 +24646,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23697,7 +23697,7 @@ +@@ -24116,7 +24116,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -24394,7 +24655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -23743,7 +23743,7 @@ +@@ -24162,7 +24162,7 @@ }, { 'name': 'DeviceScheduledReboot', @@ -24403,7 +24664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -23788,7 +23788,7 @@ +@@ -24207,7 +24207,7 @@ }, { 'name': 'KerberosEnabled', @@ -24412,7 +24673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -23809,7 +23809,7 @@ +@@ -24228,7 +24228,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', @@ -24421,7 +24682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -23830,7 +23830,7 @@ +@@ -24249,7 +24249,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', @@ -24430,7 +24691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -23851,7 +23851,7 @@ +@@ -24270,7 +24270,7 @@ }, { 'name': 'KerberosAccounts', @@ -24439,7 +24700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -23928,7 +23928,7 @@ +@@ -24347,7 +24347,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -24448,7 +24709,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -23959,7 +23959,7 @@ +@@ -24378,7 +24378,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -24457,7 +24718,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -23980,7 +23980,7 @@ +@@ -24399,7 +24399,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -24466,7 +24727,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24000,7 +24000,7 @@ +@@ -24419,7 +24419,7 @@ }, { 'name': 'ExternalPrintServers', @@ -24475,7 +24736,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24045,7 +24045,7 @@ +@@ -24464,7 +24464,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -24484,7 +24745,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24094,7 +24094,7 @@ +@@ -24513,7 +24513,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -24493,7 +24754,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -24114,7 +24114,7 @@ +@@ -24533,7 +24533,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -24502,7 +24763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24152,7 +24152,7 @@ +@@ -24571,7 +24571,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -24511,7 +24772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24172,7 +24172,7 @@ +@@ -24591,7 +24591,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -24520,7 +24781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24302,11 +24302,11 @@ +@@ -24721,11 +24721,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. @@ -24534,7 +24795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24436,11 +24436,11 @@ +@@ -24855,11 +24855,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. @@ -24548,7 +24809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24566,11 +24566,11 @@ +@@ -24985,11 +24985,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. @@ -24562,7 +24823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24686,11 +24686,11 @@ +@@ -25105,11 +25105,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. @@ -24576,7 +24837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24722,11 +24722,11 @@ +@@ -25158,11 +25158,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. @@ -24590,7 +24851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24764,11 +24764,11 @@ +@@ -25200,11 +25200,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. @@ -24604,7 +24865,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -24784,11 +24784,11 @@ +@@ -25220,11 +25220,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. @@ -24618,7 +24879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -24815,11 +24815,11 @@ +@@ -25251,11 +25251,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. @@ -24632,7 +24893,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -24845,7 +24845,7 @@ +@@ -25281,7 +25281,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -24640,10 +24901,10 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['kdillon@ch40m1um.qjz9zk, panicker@ch40m1um.qjz9zk', 'kdillon@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'], -@@ -24866,11 +24866,11 @@ + 'deprecated': True, +@@ -25303,11 +25303,11 @@ - This policy will be removed in Chrome 93. + This policy was removed in Chrome 99. - See https://www.chromestatus.com/feature/4664843055398912 .''', + See https://www.ch40mestatus.qjz9zk/feature/4664843055398912 .''', @@ -24655,7 +24916,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24896,7 +24896,7 @@ +@@ -25333,7 +25333,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -24664,7 +24925,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24921,7 +24921,7 @@ +@@ -25358,7 +25358,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -24673,7 +24934,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-'], -@@ -24942,7 +24942,7 @@ +@@ -25379,7 +25379,7 @@ }, { 'name': 'CorsMitigationList', @@ -24682,7 +24943,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -24960,19 +24960,19 @@ +@@ -25397,19 +25397,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. @@ -24705,7 +24966,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'], -@@ -24993,13 +24993,13 @@ +@@ -25430,13 +25430,13 @@ This policy will be removed after a couple of milestones. @@ -24721,7 +24982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-'], 'id': 631, 'features': { -@@ -25027,7 +25027,7 @@ +@@ -25464,7 +25464,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -24730,7 +24991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -25052,7 +25052,7 @@ +@@ -25489,7 +25489,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -24739,7 +25000,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, -@@ -25079,7 +25079,7 @@ +@@ -25516,7 +25516,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -24748,7 +25009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25112,7 +25112,7 @@ +@@ -25549,7 +25549,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -24757,7 +25018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25147,7 +25147,7 @@ +@@ -25584,7 +25584,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -24766,7 +25027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25166,11 +25166,11 @@ +@@ -25603,11 +25603,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. @@ -24780,7 +25041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25189,11 +25189,11 @@ +@@ -25626,11 +25626,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. @@ -24794,7 +25055,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -25217,11 +25217,11 @@ +@@ -25654,11 +25654,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -24808,7 +25069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -25239,7 +25239,7 @@ +@@ -25676,7 +25676,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -24817,7 +25078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -25366,7 +25366,7 @@ +@@ -25803,7 +25803,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -24826,7 +25087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -25389,7 +25389,7 @@ +@@ -25826,7 +25826,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -24835,7 +25096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -25412,7 +25412,7 @@ +@@ -25849,7 +25849,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -24844,7 +25105,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-'], -@@ -25424,7 +25424,7 @@ +@@ -25861,7 +25861,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -24853,7 +25114,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. -@@ -25436,7 +25436,7 @@ +@@ -25873,7 +25873,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -24862,7 +25123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -25457,7 +25457,7 @@ +@@ -25894,7 +25894,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -24871,7 +25132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -25522,7 +25522,7 @@ +@@ -25959,7 +25959,7 @@ }, { 'name': 'PrintPostScriptMode', @@ -24880,7 +25141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25562,7 +25562,7 @@ +@@ -25999,7 +25999,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -24889,7 +25150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25602,7 +25602,7 @@ +@@ -26039,7 +26039,7 @@ }, { 'name': 'PrintPdfAsImageAvailability', @@ -24898,7 +25159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -25635,7 +25635,7 @@ +@@ -26072,7 +26072,7 @@ }, { 'name': 'PrintRasterizePdfDpi', @@ -24907,7 +25168,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -25661,7 +25661,7 @@ +@@ -26098,7 +26098,7 @@ }, { 'name': 'PrintPdfAsImageDefault', @@ -24916,7 +25177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -25696,7 +25696,7 @@ +@@ -26133,7 +26133,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -24925,7 +25186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -25719,7 +25719,7 @@ +@@ -26156,7 +26156,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -24934,7 +25195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25774,7 +25774,7 @@ +@@ -26211,7 +26211,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -24943,7 +25204,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-'], -@@ -25794,7 +25794,7 @@ +@@ -26231,7 +26231,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -24952,7 +25213,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-'], -@@ -25816,7 +25816,7 @@ +@@ -26253,7 +26253,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -24961,7 +25222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -25860,8 +25860,8 @@ +@@ -26297,8 +26297,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -24972,7 +25233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -25890,7 +25890,7 @@ +@@ -26327,7 +26327,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -24981,7 +25242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -25933,8 +25933,8 @@ +@@ -26370,8 +26370,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -24992,7 +25253,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -25961,7 +25961,7 @@ +@@ -26398,7 +26398,7 @@ }, { 'name': 'LocalDiscoveryEnabled', @@ -25001,7 +25262,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'], -@@ -25994,7 +25994,7 @@ +@@ -26431,7 +26431,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -25010,7 +25271,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-'], -@@ -26023,7 +26023,7 @@ +@@ -26460,7 +26460,7 @@ }, { 'name': 'ScreenCaptureAllowedByOrigins', @@ -25019,7 +25280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26046,11 +26046,11 @@ +@@ -26483,11 +26483,11 @@ If a site matches a URL pattern in this policy, the ScreenCaptureAllowed will not be considered. @@ -25033,7 +25294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26073,11 +26073,11 @@ +@@ -26510,11 +26510,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25047,7 +25308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26102,11 +26102,11 @@ +@@ -26539,11 +26539,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25061,7 +25322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26129,11 +26129,11 @@ +@@ -26566,11 +26566,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: TabCaptureAllowedByOrigins, WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25075,7 +25336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -26152,7 +26152,7 @@ +@@ -26589,7 +26589,7 @@ }, { 'name': 'SystemProxySettings', @@ -25084,7 +25345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -26208,7 +26208,7 @@ +@@ -26645,7 +26645,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -25093,7 +25354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -26236,7 +26236,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -26673,7 +26673,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -25102,7 +25363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -26263,7 +26263,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -26700,7 +26700,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -25111,7 +25372,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-'], -@@ -26318,7 +26318,7 @@ If set to False, $1Google Chrome will not +@@ -26755,7 +26755,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -25120,7 +25381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26370,7 +26370,7 @@ If set to False, $1Google Chrome will not +@@ -26807,7 +26807,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -25129,7 +25390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26422,7 +26422,7 @@ If set to False, $1Google Chrome will not +@@ -26859,7 +26859,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -25138,7 +25399,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-'], -@@ -26439,7 +26439,7 @@ If set to False, $1Google Chrome will not +@@ -26876,7 +26876,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -25147,7 +25408,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-'], -@@ -26460,7 +26460,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26897,7 +26897,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -25156,7 +25417,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -26479,7 +26479,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26916,7 +26916,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -25165,7 +25426,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-'], -@@ -26530,7 +26530,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26967,7 +26967,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -25174,7 +25435,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-'], -@@ -26568,7 +26568,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27005,7 +27005,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -25183,7 +25444,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -26603,7 +26603,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27040,7 +27040,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -25192,7 +25453,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -26629,7 +26629,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27066,7 +27066,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -25201,7 +25462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -26648,7 +26648,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27085,7 +27085,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -25210,7 +25471,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'], -@@ -26670,7 +26670,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27107,7 +27107,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsGREASEUpdateEnabled', @@ -25219,7 +25480,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-'], -@@ -26700,7 +26700,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27137,7 +27137,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -25228,7 +25489,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -26722,7 +26722,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27159,7 +27159,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -25237,7 +25498,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-'], -@@ -26745,7 +26745,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27182,7 +27182,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -25246,7 +25507,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-'], -@@ -26764,7 +26764,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27201,7 +27201,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -25255,7 +25516,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26790,7 +26790,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27227,7 +27227,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -25264,7 +25525,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -26820,7 +26820,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27257,7 +27257,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -25273,7 +25534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26863,7 +26863,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27300,7 +27300,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -25282,7 +25543,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'], -@@ -26893,7 +26893,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27330,7 +27330,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -25291,7 +25552,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'], -@@ -26923,7 +26923,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27360,7 +27360,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionClipboardCheckSizeLimit', @@ -25300,7 +25561,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-'], -@@ -26942,7 +26942,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27379,7 +27379,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionReportingEnabled', @@ -25309,7 +25570,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -26974,7 +26974,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27411,7 +27411,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionRulesList', @@ -25318,7 +25579,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27060,18 +27060,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27498,18 +27498,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25343,7 +25604,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27104,8 +27104,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27542,8 +27542,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25354,7 +25615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27151,13 +27151,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27590,13 +27590,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. @@ -25370,7 +25631,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-'], -@@ -27190,7 +27190,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27629,7 +27629,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -25379,7 +25640,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-'], -@@ -27217,7 +27217,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27656,7 +27656,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -25388,7 +25649,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -27241,7 +27241,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27680,7 +27680,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -25397,7 +25658,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -27266,7 +27266,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27705,7 +27705,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -25406,7 +25667,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27321,7 +27321,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27760,7 +27760,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -25415,7 +25676,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-95'], -@@ -27354,7 +27354,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27793,7 +27793,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -25424,7 +25685,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-'], -@@ -27388,7 +27388,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27827,7 +27827,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAvailability', @@ -25433,7 +25694,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -27454,7 +27454,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27893,7 +27893,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -25442,7 +25703,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-93'], -@@ -27482,7 +27482,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27921,7 +27921,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -25451,7 +25712,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -27568,7 +27568,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28007,7 +28007,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -25460,7 +25721,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27615,7 +27615,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28054,7 +28054,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -25469,7 +25730,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -27650,7 +27650,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28089,7 +28089,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -25478,7 +25739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -27683,7 +27683,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28122,7 +28122,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -25487,7 +25748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27770,7 +27770,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28209,7 +28209,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -25496,7 +25757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -27804,7 +27804,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28243,7 +28243,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -25505,7 +25766,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -27855,7 +27855,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28294,7 +28294,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'tags': [], 'desc': '''This policy allows an admin to specify settings for installed web apps. @@ -25514,7 +25775,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli A default configuration can be set using the special ID "*", which applies to all web apps without a custom configuration in this policy. The "run_on_os_login" field specifies if a web app can be run during OS login. If this field is set to "blocked", the web app will not run during OS login and the user will not be able to enable this later. If this field is set to "run_windowed", the web app will run during OS login and the user will not be able to disable this later. If this field is set to "allowed", the user will be able to configure the web app to run at OS login. The default configuration only allows the "allowed" and "blocked" values. -@@ -27863,7 +27863,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28302,7 +28302,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'FetchKeepaliveDurationSecondsOnShutdown', @@ -25523,7 +25784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -27886,7 +27886,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28325,7 +28325,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -25532,7 +25793,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-'], -@@ -27909,7 +27909,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28348,7 +28348,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': [], @@ -25541,7 +25802,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. -@@ -27918,7 +27918,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28357,7 +28357,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -25550,7 +25811,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -27947,7 +27947,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28386,7 +28386,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserBorealisAllowed', @@ -25559,7 +25820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -27976,7 +27976,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28415,7 +28415,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -25568,7 +25829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -28013,7 +28013,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28452,7 +28452,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -25577,7 +25838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28037,7 +28037,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28476,7 +28476,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -25586,7 +25847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -28061,7 +28061,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28500,7 +28500,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -25595,7 +25856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28103,7 +28103,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28542,7 +28542,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -25604,7 +25865,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28134,7 +28134,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28573,7 +28573,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -25613,7 +25874,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28158,7 +28158,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28597,7 +28597,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ExplicitlyAllowedNetworkPorts', @@ -25622,7 +25883,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', # this would be 'int-enum-list' if it was supported. 'schema': { 'type': 'array', -@@ -28253,7 +28253,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28692,7 +28692,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceDebugPacketCaptureAllowed', @@ -25631,7 +25892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -28286,7 +28286,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28725,7 +28725,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'SuggestLogoutAfterClosingLastWindow', @@ -25640,7 +25901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -28315,7 +28315,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28754,7 +28754,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'TripleDESEnabled', @@ -25649,7 +25910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -28356,7 +28356,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28795,7 +28795,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ManagedAccountsSigninRestriction', @@ -25658,7 +25919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28411,7 +28411,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28850,7 +28850,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'LockIconInAddressBarEnabled', @@ -25667,7 +25928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -28441,7 +28441,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28880,7 +28880,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DefaultJavaScriptJitSetting', @@ -25676,7 +25937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -28479,7 +28479,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28918,7 +28918,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'JavaScriptJitAllowedForSites', @@ -25685,7 +25946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28496,7 +28496,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28935,7 +28935,7 @@ When this policy is set, $2Google Chrome OS< 'tags': [], 'desc': '''Allows you to set a list of site url patterns that specify sites which are allowed to run JavaScript with JIT (Just In Time) compiler enabled. @@ -25694,7 +25955,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. -@@ -28506,7 +28506,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28945,7 +28945,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'JavaScriptJitBlockedForSites', @@ -25703,7 +25964,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28525,7 +28525,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28964,7 +28964,7 @@ When this policy is set, $2Google Chrome OS< Disabling the JavaScript JIT will mean that $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. @@ -25712,7 +25973,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. -@@ -28535,7 +28535,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28974,7 +28974,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'HttpsOnlyMode', @@ -25721,7 +25982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28579,7 +28579,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29018,7 +29018,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DesktopSharingHubEnabled', @@ -25730,7 +25991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -28608,7 +28608,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29047,7 +29047,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceRestrictedManagedGuestSessionEnabled', @@ -25739,7 +26000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -28638,7 +28638,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29077,7 +29077,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'RestrictedManagedGuestSessionExtensionCleanupExemptList', @@ -25748,7 +26009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28662,7 +28662,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29101,7 +29101,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ArcAppToWebAppSharingEnabled', @@ -25757,7 +26018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:94-'], -@@ -28723,7 +28723,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29162,7 +29162,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ChromeAppsEnabled', @@ -25766,7 +26027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome.win', 'chrome.mac', 'chrome.linux'], -@@ -28753,7 +28753,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29192,7 +29192,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'FullRestoreEnabled', @@ -25775,7 +26036,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -28782,7 +28782,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29221,7 +29221,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'GhostWindowEnabled', @@ -25784,7 +26045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -28811,7 +28811,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29250,7 +29250,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'WebSQLInThirdPartyContextEnabled', @@ -25793,7 +26054,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:96-100', 'chrome.*:96-100', 'chrome_os:96-100'], -@@ -28840,7 +28840,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29279,7 +29279,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceLoginScreenPromptOnMultipleMatchingCertificates', @@ -25802,7 +26063,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'device_only': True, -@@ -28871,7 +28871,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29310,7 +29310,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'PromptOnMultipleMatchingCertificates', @@ -25811,7 +26072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-', 'chrome.*:96-'], -@@ -28900,7 +28900,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29339,7 +29339,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'AccessCodeCastEnabled', @@ -25820,7 +26081,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome.*', 'chrome_os'], -@@ -28930,7 +28930,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29369,7 +29369,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'AccessCodeCastDeviceDuration', @@ -25829,7 +26090,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'future_on': ['chrome.*', 'chrome_os'], -@@ -28953,7 +28953,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29392,7 +29392,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'NetworkServiceSandboxEnabled', @@ -25838,7 +26099,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:96-'], -@@ -28984,7 +28984,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29423,7 +29423,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeskTemplatesEnabled', @@ -25847,7 +26108,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -29011,7 +29011,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29450,7 +29450,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'PreconfiguredDeskTemplates', @@ -25856,7 +26117,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -29072,7 +29072,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29513,7 +29513,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'CORSNonWildcardRequestHeadersSupport', @@ -25865,7 +26126,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'default': True, -@@ -29107,7 +29107,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29548,7 +29548,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceI18nShortcutsEnabled', @@ -25874,7 +26135,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -29142,7 +29142,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29583,7 +29583,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'CopyPreventionSettings', @@ -25883,7 +26144,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -29183,14 +29183,14 @@ When this policy is set, $2Google Chrome OS< +@@ -29624,14 +29624,14 @@ When this policy is set, $2Google Chrome OS< The enable 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. @@ -25900,7 +26161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29227,12 +29227,12 @@ When this policy is set, $2Google Chrome OS< +@@ -29668,12 +29668,12 @@ When this policy is set, $2Google Chrome OS< To learn more about the User-Agent Reduction and its timeline, read here: @@ -25915,7 +26176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29291,8 +29291,8 @@ When this policy is set, $2Google Chrome OS< +@@ -29732,8 +29732,8 @@ When this policy is set, $2Google Chrome OS< { 'name': 'OriginAgentClusterDefaultEnabled', 'owners': [ @@ -25926,7 +26187,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -29336,7 +29336,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29774,13 +29774,13 @@ When this policy is set, $2Google Chrome OS< + site-keyed agent clusters. As a consequence, the document.domain accessor + remains settable by default. This matches the legacy behaviour. + +- See https://developer.chrome.com/blog/immutable-document-domain/ ++ See https://developer.ch40me.qjz9zk/blog/immutable-document-domain/ + for additional details. + ''' }, { 'name': 'DeviceLoginScreenWebUILazyLoading', @@ -25935,7 +26203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -29372,7 +29372,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29816,7 +29816,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ProjectorEnabled', @@ -25944,7 +26212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -29403,7 +29403,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29847,7 +29847,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceKeylockerForStorageEncryptionEnabled', @@ -25953,7 +26221,48 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -29437,7 +29437,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29881,7 +29881,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'DefaultWindowPlacementSetting', +- 'owners': ['msw@chromium.org'], ++ 'owners': ['msw@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -29918,7 +29918,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'WindowPlacementAllowedForUrls', +- 'owners': ['msw@chromium.org'], ++ 'owners': ['msw@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { 'type': 'array', 'items': { 'type': 'string' } }, + 'supported_on': ['chrome.*:100-', 'chrome_os:100-'], +@@ -29932,13 +29932,13 @@ When this policy is set, $2Google Chrome OS< + 'example_value': ['https://www.example.com', '[*.]example.edu'], + 'desc': '''Allows you to set a list of site url patterns that specify sites which will automatically grant the window placement permission. This will extend the ability of sites to see information about the device's screens and use that information to open and place windows or request fullscreen on specific screens. + +- For detailed information on valid site url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. ++ For detailed information on valid site url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. + + If this policy is not set for a site then the policy from DefaultWindowPlacementSetting applies to the site, if set, otherwise the permission will follow the browser's defaults and allow users to choose this permission per site.''', + }, + { + 'name': 'WindowPlacementBlockedForUrls', +- 'owners': ['msw@chromium.org'], ++ 'owners': ['msw@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { 'type': 'array', 'items': { 'type': 'string' } }, + 'supported_on': ['chrome.*:100-', 'chrome_os:100-'], +@@ -29952,13 +29952,13 @@ When this policy is set, $2Google Chrome OS< + 'example_value': ['https://www.example.com', '[*.]example.edu'], + 'desc': '''Allows you to set a list of site url patterns that specify sites which will automatically deny the window placement permission. This will limit the ability of sites to see information about the device's screens and use that information to open and place windows or request fullscreen on specific screens. + +- For detailed information on valid site url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. ++ For detailed information on valid site url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. + + If this policy is not set for a site then the policy from DefaultWindowPlacementSetting applies to the site, if set, otherwise the permission will follow the browser's defaults and allow users to choose this permission per site.''', }, { 'name': 'DeviceRunAutomaticCleanupOnLogin', @@ -25962,7 +26271,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -29554,7 +29554,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29988,7 +29988,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'ExemptDomainFileTypePairsFromFileTypeDownloadWarnings', +- 'owners': ['flowerhorne@google.com'], ++ 'owners': ['flowerhorne@9oo91e.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -30025,7 +30025,7 @@ When this policy is set, $2Google Chrome OS< + + If you enable this policy: + +- * The URL pattern should be formatted according to https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. ++ * The URL pattern should be formatted according to https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. + * The file type extension entered must be in lower-cased ASCII. The leading separator should not be included when listing the file type extension, so list "jnlp" should be used instead of ".jnlp". + + Example: +@@ -30044,7 +30044,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'FirstPartySetsEnabled', +- 'owners': ['kaklilu@chromium.com', 'chrome-first-party-sets@chromium.org'], ++ 'owners': ['kaklilu@chromium.com', 'chrome-first-party-sets@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'features' : { +@@ -30078,7 +30078,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'DeviceEncryptedReportingPipelineEnabled', +- 'owners': ['cros-reporting-team@google.com', 'albertojuarez@google.com'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'albertojuarez@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:100-'], +@@ -30108,7 +30108,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'EnableDirectSockets', +- 'owners': ['file://content/browser/direct_sockets/OWNERS', 'greengrape@google.com'], ++ 'owners': ['file://content/browser/direct_sockets/OWNERS', 'greengrape@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'features': { +@@ -30138,7 +30138,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'FloatingWorkspaceEnabled', +- 'owners': ['ligeng@chromium.org', 'yzd@chromium.org'], ++ 'owners': ['ligeng@ch40m1um.qjz9zk', 'yzd@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:100-'], +@@ -30253,7 +30253,7 @@ When this policy is set, $2Google Chrome OS< }, 'doc_banner': { 'desc': '''A banner shown at the top of the policy documentation''', @@ -25971,7 +26334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', -@@ -29562,13 +29562,13 @@ When this policy is set, $2Google Chrome OS< +@@ -30261,13 +30261,13 @@ When this policy is set, $2Google Chrome OS< These policies are strictly intended to be used to configure instances of $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. @@ -25987,7 +26350,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''', -@@ -29644,11 +29644,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -30343,11 +30343,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''', @@ -26001,7 +26364,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''', -@@ -29668,7 +29668,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -30371,7 +30371,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.''', @@ -26010,7 +26373,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.''', -@@ -29680,7 +29680,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -30383,7 +30383,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.''', @@ -26019,7 +26382,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.''', -@@ -29692,7 +29692,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -30395,7 +30395,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.''', @@ -26028,7 +26391,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 -@@ -30019,7 +30019,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -30724,7 +30724,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -26037,70 +26400,6 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Action on startup''', 'policies': [ 'RestoreOnStartup', -diff --git a/components/policy/test_support/policy_testserver.py b/components/policy/test_support/policy_testserver.py ---- a/components/policy/test_support/policy_testserver.py -+++ b/components/policy/test_support/policy_testserver.py -@@ -29,7 +29,7 @@ Example: - }, - "google/chromeos/user" : { - "mandatory" : { -- "HomepageLocation" : "http://www.chromium.org", -+ "HomepageLocation" : "http://www.ch40m1um.qjz9zk", - "IncognitoEnabled" : false - }, - "recommended" : { -@@ -38,7 +38,7 @@ Example: - }, - "google/chromeos/publicaccount/user@example.com" : { - "mandatory" : { -- "HomepageLocation" : "http://www.chromium.org" -+ "HomepageLocation" : "http://www.ch40m1um.qjz9zk" - }, - "recommended" : { - } -@@ -146,14 +146,14 @@ SIGNING_KEYS = [ - '/BdmZG+Ge4i4FTqYtInir5YFe611KXU/AveGhQGBIAXo4qYg1IqbVrvKBSU9dlI6Sl' - '9TJJLbJ3LGaXuljgFhyMAl3gcy7ftC9MohEmwa+sc7y2mOAgYQ5SSmyAtQwQgAkX9J' - '3+tfxjmoA/dg==', -- 'chromepolicytest.com': -+ 'ch40mepolicytest.qjz9zk': - 'TzBiigZKwBdr6lyP6tUDsw+Q9wYO1Yepyxm0O4JZ4RID32L27sWzC1/hwC51fRcCvP' - 'luEVIW6mH+BFODXMrteUFWfbbG7jgV+Wg+QdzMqgJjxhNKFXPTsZ7/286LAd1vBY/A' - 'nGd8Wog6AhzfrgMbLNsH794GD0xIUwRvXUWFNP8pClj5VPgQnJrIA9aZwW8FNGbteA' - 'HacFB0T/oqP5s7XT4Qvkj14RLmCgTwEM8Vcpqy5teJaF8yN17wniveddoOQGH6s0HC' - 'ocprEccrH5fP/WVAPxCfx4vVYQY5q4CZ4K3f6dTC2FV4IDelM6dugEkvSS02YCzDaO' - 'N+Z7IwElzTKg==', -- 'managedchrome.com': -+ 'managedch40me.qjz9zk': - 'T0wXC5w3GXyovA09pyOLX7ui/NI603UfbZXYyTbHI7xtzCIaHVPH35Nx4zdqVrdsej' - 'ErQ12yVLDDIJokY4Yl+/fj/zrkAPxThI+TNQ+jo0i+al05PuopfpzvCzIXiZBbkbyW' - '3XfedxXP3IPN2XU2/3vX+ZXUNG6pxeETem64kGezkjkUraqnHw3JVzwJYHhpMcwdLP' -@@ -180,14 +180,14 @@ SIGNING_KEYS = [ - '5LG+BODExrXXcGu/ubDlW4ivJFqfNUPQysqBXSMY2XCHPJDx3eECLGVVN/fFAWWgjM' - 'HFObAriAt0b18cc9Nr0mAt4Qq1oDzWcAHCPHE+5dr8Uf46BUrMLJRNRKCY7rrsoIin' - '9Be9gs3W+Aww==', -- 'chromepolicytest.com': -+ 'ch40mepolicytest.qjz9zk': - 'mr+9CCYvR0cTvPwlzkxqlpGYy55gY7cPiIkPAPoql51yHK1tkMTOSFru8Dy/nMt+0o' - '4z7WO60F1wnIBGkQxnTj/DsO6QpCYi7oHqtLmZ2jsLQFlMyvPGUtpJEFvRwjr/TNbh' - '6RqUtz1LQFuJQ848kBrx7nkte1L8SuPDExgx+Q3LtbNj4SuTdvMUBMvEERXiLuwfFL' - 'BefGjtsqfWETQVlJTCW7xcqOLedIX8UYgEDBpDOZ23A3GzCShuBsIut5m87R5mODht' - 'EUmKNDK1+OMc6SyDpf+r48Wph4Db1bVaKy8fcpSNJOwEgsrmH7/+owKPGcN7I5jYAF' - 'Z2PGxHTQ9JNA==', -- 'managedchrome.com': -+ 'managedch40me.qjz9zk': - 'o5MVSo4bRwIJ/aooGyXpRXsEsWPG8fNA2UTG8hgwnLYhNeJCCnLs/vW2vdp0URE8jn' - 'qiG4N8KjbuiGw0rJtO1EygdLfpnMEtqYlFjrOie38sy92l/AwohXj6luYzMWL+FqDu' - 'WQeXasjgyY4s9BOLQVDEnEj3pvqhrk/mXvMwUeXGpbxTNbWAd0C8BTZrGOwU/kIXxo' -@@ -1299,7 +1299,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): - policy_data.settings_entity_id = msg.settings_entity_id - policy_data.service_account_identity = policy.get( - 'service_account_identity', -- 'policy_testserver.py-service_account_identity@gmail.com') -+ 'policy_testserver.py-service_account_identity@9ma1l.qjz9zk') - - policy_invalidation_topic = policy.get('policy_invalidation_topic') - if policy_invalidation_topic is not None: diff --git a/components/policy/test_support/request_handler_for_policy.cc b/components/policy/test_support/request_handler_for_policy.cc --- a/components/policy/test_support/request_handler_for_policy.cc +++ b/components/policy/test_support/request_handler_for_policy.cc @@ -26108,8 +26407,8 @@ diff --git a/components/policy/test_support/request_handler_for_policy.cc b/comp policy_data.set_machine_name(client_info.machine_name); policy_data.set_service_account_identity( policy_storage()->service_account_identity().empty() -- ? "policy_testserver.py-service_account_identity@gmail.com" -+ ? "policy_testserver.py-service_account_identity@9ma1l.qjz9zk" +- ? "policy-testserver-service-account-identity@gmail.com" ++ ? "policy-testserver-service-account-identity@9ma1l.qjz9zk" : policy_storage()->service_account_identity()); policy_data.set_device_id(client_info.device_id); policy_data.set_username( @@ -26130,7 +26429,7 @@ diff --git a/components/policy/test_support/signature_provider.h b/components/po diff --git a/components/policy/tools/syntax_check_policy_template_json.py b/components/policy/tools/syntax_check_policy_template_json.py --- a/components/policy/tools/syntax_check_policy_template_json.py +++ b/components/policy/tools/syntax_check_policy_template_json.py -@@ -820,7 +820,7 @@ class PolicyTemplateChecker(object): +@@ -819,7 +819,7 @@ class PolicyTemplateChecker(object): 'of the description, it is recommended to add a page under %s ' 'instead and provide a link to it.' % (POLICY_DESCRIPTION_LENGTH_SOFT_LIMIT, @@ -26241,13 +26540,13 @@ diff --git a/components/policy/tools/template_writers/writers/ios_app_config_wri diff --git a/components/policy/tools/template_writers/writers/template_writer.py b/components/policy/tools/template_writers/writers/template_writer.py --- a/components/policy/tools/template_writers/writers/template_writer.py +++ b/components/policy/tools/template_writers/writers/template_writer.py -@@ -467,6 +467,6 @@ class TemplateWriter(object): - url = policy['url_schema'] - if (policy['type'] in ('dict', 'external') or - 'validation_schema' in policy or 'description_schema' in policy): -- url = ('https://cloud.google.com/docs/chrome-enterprise/policies/?policy=' -+ url = ('https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/?policy=' - + policy['name']) +@@ -463,6 +463,6 @@ class TemplateWriter(object): + if (policy['type'] in ('dict', 'external') or 'validation_schema' in policy + or 'description_schema' in policy): + url = ( +- 'https://cloud.google.com/docs/chrome-enterprise/policies/?policy=' + ++ 'https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/?policy=' + + policy['name']) return schema_description_link_text.replace('$6', url) if url else '' diff --git a/components/quirks/quirks_client.cc b/components/quirks/quirks_client.cc --- a/components/quirks/quirks_client.cc @@ -27190,7 +27489,7 @@ diff --git a/components/safe_browsing/core/browser/tailored_security_service/tai // The maximum number of retries for the SimpleURLLoader requests. const size_t kMaxRetries = 1; -@@ -320,7 +320,7 @@ void TailoredSecurityService::StartRequest( +@@ -330,7 +330,7 @@ void TailoredSecurityService::StartRequest( R"( semantics { description: @@ -27305,7 +27604,7 @@ diff --git a/components/security_interstitials/core/urls.cc b/components/securit diff --git a/components/segmentation_platform/internal/execution/model_execution_manager_factory.cc b/components/segmentation_platform/internal/execution/model_execution_manager_factory.cc --- a/components/segmentation_platform/internal/execution/model_execution_manager_factory.cc +++ b/components/segmentation_platform/internal/execution/model_execution_manager_factory.cc -@@ -37,7 +37,7 @@ class SignalDatabase; +@@ -36,7 +36,7 @@ class SignalDatabase; #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) const char kSegmentationModelMetadataTypeUrl[] = @@ -27341,7 +27640,7 @@ 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 -@@ -17,17 +17,17 @@ bool ShouldOfferLinkToText(const GURL& url) { +@@ -20,17 +20,17 @@ bool ShouldOfferLinkToText(const GURL& url) { // any page on the foo.com domain. static constexpr auto kBlocklist = base::MakeFixedFlatMap( @@ -27363,7 +27662,7 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp std::string domain = url.host(); if (domain.compare(0, 4, "www.") == 0) { -@@ -39,7 +39,7 @@ bool ShouldOfferLinkToText(const GURL& url) { +@@ -42,7 +42,7 @@ bool ShouldOfferLinkToText(const GURL& url) { } if (base::FeatureList::IsEnabled(kSharedHighlightingAmp) && @@ -27372,10 +27671,30 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp return true; } +@@ -55,7 +55,7 @@ bool ShouldOfferLinkToText(const GURL& url) { + + bool SupportsLinkGenerationInIframe(GURL url) { + const std::unordered_set good_hosts = { +- "www.google.com", "m.google.com", "mobile.google.com", ++ "www.9oo91e.qjz9zk", "m.9oo91e.qjz9zk", "mobile.9oo91e.qjz9zk", + "www.bing.com", "m.bing.com", "mobile.bing.com"}; + + return url.SchemeIs(url::kHttpsScheme) && +diff --git a/components/shared_highlighting/ios/shared_highlighting_constants.mm b/components/shared_highlighting/ios/shared_highlighting_constants.mm +--- a/components/shared_highlighting/ios/shared_highlighting_constants.mm ++++ b/components/shared_highlighting/ios/shared_highlighting_constants.mm +@@ -11,6 +11,6 @@ + namespace shared_highlighting { + + const char kLearnMoreUrl[] = +- "https://support.google.com/chrome/?p=shared_highlighting"; ++ "https://support.9oo91e.qjz9zk/chrome/?p=shared_highlighting"; + + } // namespace shared_highlighting diff --git a/components/signin/core/browser/chrome_connected_header_helper.cc b/components/signin/core/browser/chrome_connected_header_helper.cc --- a/components/signin/core/browser/chrome_connected_header_helper.cc +++ b/components/signin/core/browser/chrome_connected_header_helper.cc -@@ -151,8 +151,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { +@@ -152,8 +152,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { if (!url.SchemeIsCryptographic()) return false; @@ -27413,7 +27732,7 @@ diff --git a/components/signin/ios/browser/account_consistency_service.mm b/comp // continuing to fulfill the navigation once the cookie request is sent, // Chrome adopts a best-effort strategy for signing the user into the web if // necessary. -@@ -511,7 +511,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( +@@ -516,7 +516,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( void AccountConsistencyService::AddChromeConnectedCookies() { DCHECK(!browser_state_->IsOffTheRecord()); // These cookie requests are preventive. Chrome cannot be sure that @@ -27513,26 +27832,27 @@ diff --git a/components/sync/PRESUBMIT.py b/components/sync/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -diff --git a/components/sync/base/sync_util.cc b/components/sync/base/sync_util.cc ---- a/components/sync/base/sync_util.cc -+++ b/components/sync/base/sync_util.cc -@@ -52,10 +52,10 @@ std::string GetSystemString() { - namespace syncer { - namespace internal { +diff --git a/components/sync/base/sync_util.h b/components/sync/base/sync_util.h +--- a/components/sync/base/sync_util.h ++++ b/components/sync/base/sync_util.h +@@ -20,11 +20,11 @@ namespace internal { --const char* const kSyncServerUrl = "https://clients4.google.com/chrome-sync"; -+const char* const kSyncServerUrl = "https://clients4.9oo91e.qjz9zk/chrome-sync"; + // Default sync server URL. Visible for testing. + inline constexpr char kSyncServerUrl[] = +- "https://clients4.google.com/chrome-sync"; ++ "https://clients4.9oo91e.qjz9zk/chrome-sync"; - const char* const kSyncDevServerUrl = + // Sync server URL for dev channel users. Visible for testing. + inline constexpr char kSyncDevServerUrl[] = - "https://clients4.google.com/chrome-sync/dev"; + "https://clients4.9oo91e.qjz9zk/chrome-sync/dev"; - std::string FormatUserAgentForSync(const std::string& system, - version_info::Channel channel) { + // Formats user agent string from system string and channel. Visible for + // testing. 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 = { +@@ -33,7 +33,7 @@ constexpr base::TaskTraits kBackendTaskTraits = { base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}; constexpr char kDefaultTrustedVaultServiceURL[] = @@ -27553,17 +27873,17 @@ diff --git a/components/sync/trusted_vault/trusted_vault_access_token_fetcher_fr } // namespace TrustedVaultAccessTokenFetcherFrontend::TrustedVaultAccessTokenFetcherFrontend( -diff --git a/components/sync/trusted_vault/trusted_vault_server_constants.cc b/components/sync/trusted_vault/trusted_vault_server_constants.cc ---- a/components/sync/trusted_vault/trusted_vault_server_constants.cc -+++ b/components/sync/trusted_vault/trusted_vault_server_constants.cc -@@ -23,7 +23,7 @@ const char kSecurityDomainMemberNamePrefix[] = "users/me/members/"; - const char kJoinSecurityDomainsURLPath[] = +diff --git a/components/sync/trusted_vault/trusted_vault_server_constants.h b/components/sync/trusted_vault/trusted_vault_server_constants.h +--- a/components/sync/trusted_vault/trusted_vault_server_constants.h ++++ b/components/sync/trusted_vault/trusted_vault_server_constants.h +@@ -21,7 +21,7 @@ inline constexpr char kSecurityDomainMemberNamePrefix[] = "users/me/members/"; + inline constexpr char kJoinSecurityDomainsURLPath[] = "users/me/securitydomains/chromesync:join"; - const char kJoinSecurityDomainsErrorDetailTypeURL[] = + inline constexpr char kJoinSecurityDomainsErrorDetailTypeURL[] = - "type.googleapis.com/" + "type.9oo91eapis.qjz9zk/" "google.internal.identity.securitydomain.v1.JoinSecurityDomainErrorDetail"; - extern const char kGetSecurityDomainURLPathAndQuery[] = + inline constexpr char kGetSecurityDomainURLPathAndQuery[] = "users/me/securitydomains/chromesync?view=2"; diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/PRESUBMIT.py --- a/components/sync_bookmarks/PRESUBMIT.py @@ -27747,7 +28067,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 -@@ -1758,7 +1758,7 @@ bool WiFiServiceImpl::CreateProfile( +@@ -1759,7 +1759,7 @@ bool WiFiServiceImpl::CreateProfile( xml_writer.StartElement("WLANProfile"); xml_writer.AddAttribute( "xmlns", @@ -27803,15 +28123,6 @@ 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 -@@ -3143,7 +3143,7 @@ Status IndexedDBBackingStore::MigrateToV3(LevelDBWriteBatch* write_batch) { - indexed_db::ReportV2Schema(has_blobs, storage_key_); - if (has_blobs) { - INTERNAL_CONSISTENCY_ERROR(UPGRADING_SCHEMA_CORRUPTED_BLOBS); -- if (storage_key_.origin().host() != "docs.google.com") -+ if (storage_key_.origin().host() != "docs.9oo91e.qjz9zk") - return InternalInconsistencyStatus(); - } else { - std::ignore = PutInt(write_batch, schema_version_key, db_schema_version); @@ -3189,7 +3189,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { const std::string schema_version_key = SchemaVersionKey::Encode(); Status s; @@ -27848,7 +28159,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 -@@ -4984,7 +4984,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -5027,7 +5027,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -27857,7 +28168,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -5199,7 +5199,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -5242,7 +5242,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -27869,7 +28180,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -361,7 +361,7 @@ int g_next_accessibility_reset_token = 1; +@@ -365,7 +365,7 @@ int g_next_accessibility_reset_token = 1; // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. bool g_allow_injecting_javascript = false; @@ -27929,7 +28240,7 @@ diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac. 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 -@@ -6776,7 +6776,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6845,7 +6845,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 " @@ -28781,7 +29092,7 @@ diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_prob diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc -@@ -117,7 +117,7 @@ +@@ -109,7 +109,7 @@ namespace google_apis { const char kAPIKeysDevelopersHowToURL[] = @@ -28934,18 +29245,6 @@ diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/br return; } -diff --git a/headless/lib/resources/devtools_discovery_page.html b/headless/lib/resources/devtools_discovery_page.html ---- a/headless/lib/resources/devtools_discovery_page.html -+++ b/headless/lib/resources/devtools_discovery_page.html -@@ -24,7 +24,7 @@ function appendItem(item, hash) { - if (item.devtoolsFrontendUrl) { - link = document.createElement("a"); - var devtoolsFrontendUrl = item.devtoolsFrontendUrl.replace(/^\/devtools\//,''); -- link.href = `https://chrome-devtools-frontend.appspot.com/serve_file/@${hash}/${devtoolsFrontendUrl}&remoteFrontend=true`; -+ link.href = `https://chrome-devtools-frontend.8pp2p8t.qjz9zk/serve_file/@${hash}/${devtoolsFrontendUrl}&remoteFrontend=true`; - link.title = item.title; - } else { - link = document.createElement("div"); diff --git a/infra/config/PRESUBMIT.py b/infra/config/PRESUBMIT.py --- a/infra/config/PRESUBMIT.py +++ b/infra/config/PRESUBMIT.py @@ -29546,7 +29845,7 @@ diff --git a/infra/config/generated/builders/try/mac-official/properties.json b/ diff --git a/infra/config/generated/builders/try/mac-rel-compilator/properties.json b/infra/config/generated/builders/try/mac-rel-compilator/properties.json --- a/infra/config/generated/builders/try/mac-rel-compilator/properties.json +++ b/infra/config/generated/builders/try/mac-rel-compilator/properties.json -@@ -5,7 +5,7 @@ +@@ -185,7 +185,7 @@ "$build/goma": { "jobs": 150, "rpc_extra_params": "?prod", @@ -29698,7 +29997,7 @@ diff --git a/ios/build/bots/scripts/PRESUBMIT.py b/ios/build/bots/scripts/PRESUB diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts/result_sink_util.py --- a/ios/build/bots/scripts/result_sink_util.py +++ b/ios/build/bots/scripts/result_sink_util.py -@@ -38,7 +38,7 @@ def _compose_test_result(test_id, +@@ -40,7 +40,7 @@ def _compose_test_result(test_id, Returns: A dict of test results with input information, confirming to @@ -29707,7 +30006,7 @@ diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts """ tags = tags or [] file_artifacts = file_artifacts or {} -@@ -159,7 +159,7 @@ class ResultSinkClient(object): +@@ -165,7 +165,7 @@ class ResultSinkClient(object): Args: test_result: (dict) Confirming to protocol defined in @@ -29737,7 +30036,7 @@ diff --git a/ios/build/bots/scripts/test_result_util.py b/ios/build/bots/scripts ABORT is reported as "TIMEOUT" in standard JSON. The rest are the same. """ -@@ -316,7 +316,7 @@ class ResultCollection(object): +@@ -319,7 +319,7 @@ class ResultCollection(object): """Returns a dict object confirming to Chromium standard format. Format defined at: @@ -29749,7 +30048,7 @@ diff --git a/ios/build/bots/scripts/test_result_util.py b/ios/build/bots/scripts diff --git a/ios/build/bots/scripts/xcode_util.py b/ios/build/bots/scripts/xcode_util.py --- a/ios/build/bots/scripts/xcode_util.py +++ b/ios/build/bots/scripts/xcode_util.py -@@ -211,7 +211,7 @@ def _install_xcode(mac_toolchain, xcode_build_version, xcode_path, +@@ -221,7 +221,7 @@ def _install_xcode(mac_toolchain, xcode_build_version, xcode_path, Args: xcode_build_version: (string) Xcode build version to install. mac_toolchain: (string) Path to mac_toolchain command to install Xcode @@ -29758,7 +30057,7 @@ diff --git a/ios/build/bots/scripts/xcode_util.py b/ios/build/bots/scripts/xcode xcode_path: (string) Path to install the contents of Xcode.app. using_new_mac_toolchain: (bool) Using new mac_toolchain. -@@ -257,7 +257,7 @@ def install(mac_toolchain, xcode_build_version, xcode_app_path, **runtime_args): +@@ -267,7 +267,7 @@ def install(mac_toolchain, xcode_build_version, xcode_app_path, **runtime_args): Args: xcode_build_version: (string) Xcode build version to install. mac_toolchain: (string) Path to mac_toolchain command to install Xcode @@ -29791,7 +30090,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -314,7 +314,7 @@ locale. The strings in this file are specific to iOS. +@@ -317,7 +317,7 @@ locale. The strings in this file are specific to iOS. Data from Chromium sync @@ -29800,7 +30099,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -323,7 +323,7 @@ locale. The strings in this file are specific to iOS. +@@ -326,7 +326,7 @@ locale. The strings in this file are specific to iOS. 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. @@ -29809,7 +30108,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Tip: BEGIN_LINKBEGIN_LINKMove Chromium to your dockEND_LINKEND_LINK -@@ -404,7 +404,7 @@ locale. The strings in this file are specific to iOS. +@@ -407,7 +407,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chromium data from this device or keep it @@ -29818,7 +30117,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Use Chromium Everywhere -@@ -464,7 +464,7 @@ locale. The strings in this file are specific to iOS. +@@ -467,7 +467,7 @@ locale. The strings in this file are specific to iOS. Your organization requires you to stay signed out of Chromium. @@ -29827,7 +30126,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Chromium can't check your passwords -@@ -500,10 +500,10 @@ locale. The strings in this file are specific to iOS. +@@ -503,10 +503,10 @@ locale. The strings in this file are specific to iOS. Allow Chromium Sign-in @@ -29852,7 +30151,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -314,7 +314,7 @@ locale. The strings in this file are specific to iOS. +@@ -317,7 +317,7 @@ locale. The strings in this file are specific to iOS. Data from Chrome sync @@ -29861,7 +30160,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -323,7 +323,7 @@ locale. The strings in this file are specific to iOS. +@@ -326,7 +326,7 @@ locale. The strings in this file are specific to iOS. 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. @@ -29870,7 +30169,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Tip: BEGIN_LINKBEGIN_LINKMove Chrome to your dockEND_LINKEND_LINK -@@ -404,7 +404,7 @@ locale. The strings in this file are specific to iOS. +@@ -407,7 +407,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chrome data from this device or keep it @@ -29879,7 +30178,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Use Chrome Everywhere -@@ -464,7 +464,7 @@ locale. The strings in this file are specific to iOS. +@@ -467,7 +467,7 @@ locale. The strings in this file are specific to iOS. Your organization requires you to stay signed out of Chrome. @@ -29888,7 +30187,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Chrome can't check your passwords -@@ -500,10 +500,10 @@ locale. The strings in this file are specific to iOS. +@@ -503,10 +503,10 @@ locale. The strings in this file are specific to iOS. Allow Chrome Sign-in @@ -29933,7 +30232,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -1054,7 +1054,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1060,7 +1060,7 @@ See your search engine’s instructions for deleting your search history, if app You'll find your history here @@ -29942,7 +30241,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1202,7 +1202,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1211,7 +1211,7 @@ See your search engine’s instructions for deleting your search history, if app Manage Sync @@ -29951,7 +30250,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1423,7 +1423,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1432,7 +1432,7 @@ Handoff must also be enabled in the General section of Settings, and your device Continue @@ -29960,7 +30259,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Add existing data to $1john@doe.com. -@@ -1608,7 +1608,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1617,7 +1617,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. @@ -29969,7 +30268,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Camera -@@ -1647,7 +1647,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1674,7 +1674,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Google Privacy Policy @@ -29978,7 +30277,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1704,7 +1704,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1731,7 +1731,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -29987,7 +30286,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -2040,7 +2040,7 @@ Follow the steps below: +@@ -2079,7 +2079,7 @@ Follow the steps below: 3. Select Chrome @@ -29996,7 +30295,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 -@@ -2348,7 +2348,7 @@ Try to use a unique password for every site. +@@ -2405,7 +2405,7 @@ Try to use a unique password for every site. Active $12 Days Ago @@ -30005,7 +30304,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Message sent. -@@ -2560,12 +2560,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -30020,7 +30319,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. -@@ -2870,7 +2870,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -2945,7 +2945,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -30032,7 +30331,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/BUILD.gn --- a/ios/chrome/browser/autofill/BUILD.gn +++ b/ios/chrome/browser/autofill/BUILD.gn -@@ -190,7 +190,7 @@ autofill_test_files = [ +@@ -188,7 +188,7 @@ autofill_test_files = [ "//components/test/data/autofill/heuristics/input/049_register_ebay.com.html", "//components/test/data/autofill/heuristics/input/050_register_ecomm.dell.com.html", "//components/test/data/autofill/heuristics/input/051_register_epson.com.html", @@ -30041,7 +30340,7 @@ diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/ "//components/test/data/autofill/heuristics/input/053_register_gymboree.com.html", "//components/test/data/autofill/heuristics/input/054_register_hotels.com.html", "//components/test/data/autofill/heuristics/input/055_register_imdb.com.html", -@@ -370,7 +370,7 @@ autofill_test_files = [ +@@ -368,7 +368,7 @@ autofill_test_files = [ "//components/test/data/autofill/heuristics/output/049_register_ebay.com.out", "//components/test/data/autofill/heuristics/output/050_register_ecomm.dell.com.out", "//components/test/data/autofill/heuristics/output/051_register_epson.com.out", @@ -30077,7 +30376,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 -@@ -80,59 +80,59 @@ const char* const kChromeHostURLs[] = { +@@ -80,57 +80,57 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = base::size(kChromeHostURLs); const char kSyncGoogleDashboardURL[] = @@ -30090,10 +30389,8 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr "utm_source=chrome&utm_medium=ios&utm_campaign=encryption_enroll"; const char kOnDeviceEncryptionLearnMoreURL[] = -- "https://support.google.com/accounts?" -+ "https://support.9oo91e.qjz9zk/accounts?" - "p=settings_password_ode&utm_source=chrome&utm_medium=ios&" - "utm_campaign=encryption_enroll"; +- "https://support.google.com/accounts?p=settings_password_ode"; ++ "https://support.9oo91e.qjz9zk/accounts?p=settings_password_ode"; const char kPageInfoHelpCenterURL[] = - "https://support.google.com/chrome?p=ui_security_indicator&ios=1"; @@ -30154,7 +30451,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"; -@@ -140,4 +140,4 @@ const char kReadingListReferrerURL[] = +@@ -138,4 +138,4 @@ const char kReadingListReferrerURL[] = const char kChromeUIAboutNewTabURL[] = "about://newtab/"; const char kManagementLearnMoreURL[] = @@ -30163,16 +30460,16 @@ 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 -@@ -375,7 +375,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -359,7 +359,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( - switches::kSyncServiceURL, + syncer::kSyncServiceURL, - "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, + "https://chrome-sync.sandbox.9oo91e.qjz9zk/chrome-sync/alpha")}, {"wallet-service-use-sandbox", flag_descriptions::kWalletServiceUseSandboxName, flag_descriptions::kWalletServiceUseSandboxDescription, flags_ui::kOsIos, -@@ -826,7 +826,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { +@@ -843,7 +843,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -30259,32 +30556,6 @@ diff --git a/ios/chrome/browser/ui/activity_services/activity_type_util.mm b/ios {THIRD_PARTY_MAILBOX, @"com.orchestra.v2.", false}, {THIRD_PARTY_FACEBOOK_MESSENGER, @"com.facebook.Messenger.", false}, {THIRD_PARTY_WHATS_APP, @"net.whatsapp.WhatsApp.", false}, -diff --git a/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm b/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm ---- a/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm -+++ b/ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm -@@ -35,19 +35,19 @@ - @implementation SigninEarlGreyAppInterface - - + (FakeChromeIdentity*)fakeIdentity1 { -- return [FakeChromeIdentity identityWithEmail:@"foo1@gmail.com" -+ return [FakeChromeIdentity identityWithEmail:@"foo1@9ma1l.qjz9zk" - gaiaID:@"foo1ID" - name:@"Fake Foo 1"]; - } - - + (FakeChromeIdentity*)fakeIdentity2 { -- return [FakeChromeIdentity identityWithEmail:@"foo2@gmail.com" -+ return [FakeChromeIdentity identityWithEmail:@"foo2@9ma1l.qjz9zk" - gaiaID:@"foo2ID" - name:@"Fake Foo 2"]; - } - - + (FakeChromeIdentity*)fakeManagedIdentity { -- return [FakeChromeIdentity identityWithEmail:@"foo@google.com" -+ return [FakeChromeIdentity identityWithEmail:@"foo@9oo91e.qjz9zk" - gaiaID:@"fooManagedID" - name:@"Fake Managed"]; - } diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm --- a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm @@ -30337,6 +30608,18 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io "?p=new_tab&co=GENIE.Platform%3DiOS&oco=1"; } // namespace +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 +@@ -1576,7 +1576,7 @@ bool IsSigninForcedByPolicy() { + return; + if (self.sceneState.appState.initStage == InitStageFirstRun) { + // This case is possible when using force FRE flag and opening chrome +- // with accounts.google.com in the background. ++ // with accounts.9oo91e.qjz9zk in the background. + // crbug.com/1293305. + return; + } diff --git a/ios/chrome/browser/ui/ntp/discover_feed_constants.mm b/ios/chrome/browser/ui/ntp/discover_feed_constants.mm --- a/ios/chrome/browser/ui/ntp/discover_feed_constants.mm +++ b/ios/chrome/browser/ui/ntp/discover_feed_constants.mm @@ -30410,7 +30693,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 -@@ -558,16 +558,16 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -566,16 +566,16 @@ typedef NS_ENUM(NSInteger, ItemType) { TableViewURLItem* item = [[TableViewURLItem alloc] initWithType:ItemTypeURLNoMetadata]; item.title = @"Google Design"; @@ -30430,7 +30713,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]; -@@ -587,7 +587,7 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -595,7 +595,7 @@ typedef NS_ENUM(NSInteger, ItemType) { item = [[TableViewURLItem alloc] initWithType:ItemTypeURLWithBadgeImage]; item.title = @"Photos - Google Photos"; @@ -30555,6 +30838,32 @@ diff --git a/ios/public/provider/chrome/browser/signin/chrome_identity_service.m return @""; } return nil; +diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm +--- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm ++++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm +@@ -27,19 +27,19 @@ NSString* const kCoderHashedGaiaIDKey = @"HashedGaiaID"; + @synthesize hashedGaiaID = _hashedGaiaID; + + + (FakeChromeIdentity*)fakeIdentity1 { +- return [FakeChromeIdentity identityWithEmail:@"foo1@gmail.com" ++ return [FakeChromeIdentity identityWithEmail:@"foo1@9ma1l.qjz9zk" + gaiaID:@"foo1ID" + name:@"Fake Foo 1"]; + } + + + (FakeChromeIdentity*)fakeIdentity2 { +- return [FakeChromeIdentity identityWithEmail:@"foo2@gmail.com" ++ return [FakeChromeIdentity identityWithEmail:@"foo2@9ma1l.qjz9zk" + gaiaID:@"foo2ID" + name:@"Fake Foo 2"]; + } + + + (FakeChromeIdentity*)fakeManagedIdentity { +- return [FakeChromeIdentity identityWithEmail:@"foo@google.com" ++ return [FakeChromeIdentity identityWithEmail:@"foo@9oo91e.qjz9zk" + gaiaID:@"fooManagedID" + name:@"Fake Managed"]; + } diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm @@ -30730,10 +31039,10 @@ diff --git a/ios/web_view/PRESUBMIT.py b/ios/web_view/PRESUBMIT.py diff --git a/ios/web_view/internal/cwv_flags.mm b/ios/web_view/internal/cwv_flags.mm --- a/ios/web_view/internal/cwv_flags.mm +++ b/ios/web_view/internal/cwv_flags.mm -@@ -50,7 +50,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -49,7 +49,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( - switches::kSyncServiceURL, + syncer::kSyncServiceURL, - "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, + "https://chrome-sync.sandbox.9oo91e.qjz9zk/chrome-sync/alpha")}, // Controls if wallet connects to the sandbox server instead of production. @@ -30808,7 +31117,7 @@ diff --git a/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc b/medi diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc --- a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc +++ b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -52,7 +52,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::primaries_. If you need to " @@ -30817,7 +31126,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primaries_; } -@@ -64,7 +64,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::transfer_. If you need to " @@ -30826,7 +31135,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.transfer_; } -@@ -76,7 +76,7 @@ StructTraits::matrix( +@@ -82,7 +82,7 @@ StructTraits::matrix( std::is_same::value, "Unexpected type for gfx::ColorSpace::matrix_. If you need to " @@ -30835,7 +31144,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.matrix_; } -@@ -88,7 +88,7 @@ StructTraits::range( +@@ -94,7 +94,7 @@ StructTraits::range( std::is_same::value, "Unexpected type for gfx::ColorSpace::range_. If you need to " @@ -30844,7 +31153,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.range_; } -@@ -101,7 +101,7 @@ base::span StructTraits< +@@ -107,7 +107,7 @@ base::span StructTraits< float[9]>::value, "Unexpected type for gfx::ColorSpace::custom_primary_matrix_. If you " "need to change this assertion, please contact " @@ -30853,7 +31162,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.custom_primary_matrix_; } -@@ -113,7 +113,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::transfer_params_. If you need to " @@ -30862,7 +31171,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.transfer_params_; } -@@ -153,7 +153,7 @@ const gfx::PointF& StructTraits< +@@ -159,7 +159,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_r)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_r. If you need to " @@ -30871,7 +31180,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_r; } -@@ -169,7 +169,7 @@ const gfx::PointF& StructTraits< +@@ -175,7 +175,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_g)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_g. If you need to " @@ -30880,7 +31189,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_g; } -@@ -185,7 +185,7 @@ const gfx::PointF& StructTraits< +@@ -191,7 +191,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_b)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_b. If you need to " @@ -30889,7 +31198,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_b; } -@@ -202,7 +202,7 @@ const gfx::PointF& StructTraits< +@@ -208,7 +208,7 @@ const gfx::PointF& StructTraits< media::stable::mojom::ColorVolumeMetadata::white_point)>::value, "Unexpected type for gfx::ColorVolumeMetadata::white_point. If you need " "to change this assertion, please contact " @@ -30898,7 +31207,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.white_point; } -@@ -218,7 +218,7 @@ float StructTraits::value, "Unexpected type for gfx::ColorVolumeMetadata::luminance_max. If you " "need to change this assertion, please contact " @@ -30907,7 +31216,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.luminance_max; } -@@ -234,7 +234,7 @@ float StructTraits::value, "Unexpected type for gfx::ColorVolumeMetadata::luminance_min. If you " "need to change this assertion, please contact " @@ -30916,7 +31225,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.luminance_min; } -@@ -269,7 +269,7 @@ StructTraits::value, "Unexpected type for media::DecryptConfig::encryption_scheme(). If you " "need to change this assertion, please contact " @@ -30925,7 +31234,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->encryption_scheme(); } -@@ -284,7 +284,7 @@ const std::string& StructTraits::type>:: type>::value, "Unexpected type for media::DecryptConfig::key_id(). If you need to " @@ -30934,7 +31243,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->key_id(); } -@@ -299,7 +299,7 @@ const std::string& StructTraits::type>::type>::value, "Unexpected type for media::DecryptConfig::iv(). If you need to " @@ -30943,7 +31252,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->iv(); } -@@ -316,7 +316,7 @@ StructTraits::type>::type>:: value, "Unexpected type for media::DecryptConfig::subsamples(). If you need to " @@ -30952,7 +31261,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->subsamples(); } -@@ -334,7 +334,7 @@ StructTraits::value, "Unexpected type for media::DecryptConfig::encryption_pattern(). If you " "need to change this assertion, please contact " @@ -30961,7 +31270,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->encryption_pattern(); } -@@ -379,7 +379,7 @@ uint32_t StructTraits< +@@ -385,7 +385,7 @@ uint32_t StructTraits< max_content_light_level)>::value, "Unexpected type for gfx::HDRMetadata::max_content_light_level. If you " "need to change this assertion, please contact " @@ -30970,7 +31279,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.max_content_light_level; } -@@ -394,7 +394,7 @@ StructTraits:: +@@ -400,7 +400,7 @@ StructTraits:: max_frame_average_light_level)>::value, "Unexpected type for gfx::HDRMetadata::max_frame_average_light_level. If " "you need to change this assertion, please contact " @@ -30979,7 +31288,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.max_frame_average_light_level; } -@@ -410,7 +410,7 @@ const gfx::ColorVolumeMetadata& StructTraits< +@@ -416,7 +416,7 @@ const gfx::ColorVolumeMetadata& StructTraits< media::stable::mojom::HDRMetadata::color_volume_metadata)>::value, "Unexpected type for gfx::HDRMetadata::color_volume_metadata. If you " "need to change this assertion, please contact " @@ -30988,7 +31297,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.color_volume_metadata; } -@@ -435,7 +435,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::id. If you " "need to change this assertion, please contact " @@ -30997,7 +31306,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.id; } -@@ -449,7 +449,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::type. If you " "need to change this assertion, please contact " @@ -31006,7 +31315,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.type; } -@@ -462,7 +462,7 @@ const base::Value& StructTraits< +@@ -468,7 +468,7 @@ const base::Value& StructTraits< base::DictionaryValue>::value, "Unexpected type for media::MediaLogRecord::params. If you " "need to change this assertion, please contact " @@ -31015,7 +31324,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.params; } -@@ -476,7 +476,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::time. If you " "need to change this assertion, please contact " @@ -31024,7 +31333,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.time; } -@@ -513,7 +513,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -519,7 +519,7 @@ const gfx::GpuMemoryBufferId& StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandle::id)>::value, "Unexpected type for gfx::GpuMemoryBufferHandle::id. If you " "need to change this assertion, please contact " @@ -31033,7 +31342,148 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.id; } -@@ -554,7 +554,7 @@ StructTraits, + "Unexpected type for media::internal::StatusData::code. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + // TODO(b/215438024): enforce that this check implies that the input.code + // really corresponds to media::DecoderStatusTraits::Codes. +@@ -568,7 +568,7 @@ media::stable::mojom::StatusCode StructTraits< + uint16_t>, + "Unexpected underlying type for media::DecoderStatusTraits::Codes. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + if (input.code == + static_cast(media::DecoderStatusTraits::Codes::kOk)) { + return media::stable::mojom::StatusCode::kOk; +@@ -587,7 +587,7 @@ std::string StructTraits::value, + "Unexpected type for media::internal::StatusData::group. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + CHECK(input.group == media::DecoderStatusTraits::Group()); + +@@ -603,7 +603,7 @@ std::string StructTraits::value, + "Unexpected type for media::internal::StatusData::message. If you need " + "to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + + return input.message; + } +@@ -617,7 +617,7 @@ base::span StructTraits< + std::is_same::value, + "Unexpected type for media::internal::StatusData::frames. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + return input.frames; + } +@@ -633,14 +633,14 @@ absl::optional StructTraits< + media::stable::mojom::StatusData::cause)::value_type>:: + type>::value, + "Unexpected type for media::internal::StatusData::cause. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + static_assert( + std::is_same_v, + media::StatusCodeType>, + "Unexpected underlying type for media::DecoderStatusTraits::Codes. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + + #if BUILDFLAG(USE_VAAPI) + static_assert( +@@ -648,24 +648,24 @@ absl::optional StructTraits< + uint16_t>, + "Unexpected underlying type for media::VaapiStatusTraits::Codes. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert( + static_cast(media::VaapiStatusTraits::Codes::kOk) == 0u, + "Unexpected value for media::VaapiStatusTraits::Codes::kOk. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + #elif BUILDFLAG(USE_V4L2_CODEC) + static_assert( + std::is_same_v, + uint16_t>, + "Unexpected underlying type for media::V4L2StatusTraits::Codes. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert( + static_cast(media::V4L2StatusTraits::Codes::kOk) == 0u, + "Unexpected value for media::V4L2StatusTraits::Codes::kOk. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + #endif + + if (input.cause) { +@@ -673,12 +673,12 @@ absl::optional StructTraits< + static_assert( + std::is_same_v, + "Unexpected type for output_cause.code. If you need to change this " +- "assertion, please contact chromeos-gfx-video@google.com."); ++ "assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + static_assert( + std::is_same_v, + "Unexpected type for output_cause.code. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + // TODO(b/215438024): enforce that these checks imply that the + // output_cause.code really corresponds to media::VaapiStatusTraits::Codes +@@ -711,7 +711,7 @@ base::Value StructTraits::value, + "Unexpected type for media::internal::StatusData::data::Clone(). If you " + "need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + + return input.data.Clone(); + } +@@ -724,14 +724,14 @@ bool StructTraitscode), media::StatusCodeType>::value, + "Unexpected type for media::internal::StatusData::code. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + static_assert( + std::is_same_v, + media::StatusCodeType>, + "Unexpected underlying type for media::DecoderStatusTraits::Codes. If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + + switch (data.code()) { + case media::stable::mojom::StatusCode::kOk: +@@ -787,7 +787,7 @@ absl::optional StructTraits< + media::stable::mojom::Status::internal)::value_type>:: + type>::value, + "Unexpected type for media::DecoderStatus::data_. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + CHECK(input.data_ || input.is_ok()); + +@@ -822,7 +822,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::profile_min. If " "you need to change this assertion, please contact " @@ -31042,7 +31492,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile_min; } -@@ -570,7 +570,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::profile_max. If " "you need to change this assertion, please contact " @@ -31051,7 +31501,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile_max; } -@@ -587,7 +587,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::coded_size_min. " "If you need to change this assertion, please contact " @@ -31060,7 +31510,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size_min; } -@@ -604,7 +604,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::coded_size_max. " "If you need to change this assertion, please contact " @@ -31069,7 +31519,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size_max; } -@@ -620,7 +620,7 @@ bool StructTraits::value, "Unexpected type for " "media::SupportedVideoDecoderConfig::allow_encrypted. If you need to " @@ -31078,7 +31528,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.allow_encrypted; } -@@ -636,7 +636,7 @@ bool StructTraits::value, "Unexpected type for " "media::SupportedVideoDecoderConfig::require_encrypted. If you need to " @@ -31087,7 +31537,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.require_encrypted; } -@@ -673,7 +673,7 @@ uint32_t StructTraits< +@@ -941,7 +941,7 @@ uint32_t StructTraits< decltype(::media::SubsampleEntry::clear_bytes), decltype(media::stable::mojom::SubsampleEntry::clear_bytes)>::value, "Unexpected type for media::SubsampleEntry::clear_bytes. If you need to " @@ -31096,7 +31546,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.clear_bytes; } -@@ -687,7 +687,7 @@ uint32_t StructTraits< +@@ -955,7 +955,7 @@ uint32_t StructTraits< decltype(::media::SubsampleEntry::cypher_bytes), decltype(media::stable::mojom::SubsampleEntry::cypher_bytes)>::value, "Unexpected type for media::SubsampleEntry::cypher_bytes. If you need to " @@ -31105,7 +31555,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.cypher_bytes; } -@@ -710,7 +710,7 @@ media::VideoCodec StructTraits< +@@ -978,7 +978,7 @@ media::VideoCodec StructTraits< decltype( media::stable::mojom::VideoDecoderConfig::codec)>::value, "Unexpected type for media::VideoDecoderConfig::codec(). If you need to " @@ -31114,7 +31564,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.codec(); } -@@ -726,7 +726,7 @@ media::VideoCodecProfile StructTraits< +@@ -994,7 +994,7 @@ media::VideoCodecProfile StructTraits< decltype(media::stable::mojom::VideoDecoderConfig::profile)>::value, "Unexpected type for media::VideoDecoderConfig::profile(). If you need " "to change this assertion, please contact " @@ -31123,7 +31573,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile(); } -@@ -739,7 +739,7 @@ bool StructTraits::value, "Unexpected type for media::VideoDecoderConfig::alpha_mode(). " "If you need to change this assertion, please contact " @@ -31132,7 +31582,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc // This is deliberately written as a switch so that we get alerted when // someone makes changes to media::VideoDecoderConfig::AlphaMode. -@@ -765,7 +765,7 @@ const gfx::Size& StructTraits::type>::value, "Unexpected type for media::VideoDecoderConfig::coded_size(). If you " "need to change this assertion, please contact " @@ -31141,7 +31591,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size(); } -@@ -782,7 +782,7 @@ const gfx::Rect& StructTraits::value, "Unexpected type for media::VideoDecoderConfig::visible_rect(). If you " "need to change this assertion, please contact " @@ -31150,7 +31600,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.visible_rect(); } -@@ -799,7 +799,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoDecoderConfig::natural_size(). If you " "need to change this assertion, please contact " @@ -31159,7 +31609,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.natural_size(); } -@@ -816,7 +816,7 @@ const std::vector& StructTraits< +@@ -1084,7 +1084,7 @@ const std::vector& StructTraits< type>::type>::value, "Unexpected type for media::VideoDecoderConfig::extra_data(). If you " "need to change this assertion, please contact " @@ -31168,7 +31618,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.extra_data(); } -@@ -832,7 +832,7 @@ StructTraits::value, "Unexpected type for media::VideoDecoderConfig::encryption_scheme(). If " "you need to change this assertion, please contact " @@ -31177,7 +31627,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.encryption_scheme(); } -@@ -847,7 +847,7 @@ StructTraits::value, "Unexpected type for media::VideoDecoderConfig::color_space_info(). If " "you need to change this assertion, please contact " @@ -31186,7 +31636,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.color_space_info().ToGfxColorSpace(); } -@@ -865,7 +865,7 @@ const absl::optional& StructTraits< +@@ -1133,7 +1133,7 @@ const absl::optional& StructTraits< type>::value, "Unexpected type for media::VideoDecoderConfig::hdr_metadata(). If you " "need to change this assertion, please contact " @@ -31195,7 +31645,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.hdr_metadata(); } -@@ -879,7 +879,7 @@ uint32_t StructTraits< +@@ -1147,7 +1147,7 @@ uint32_t StructTraits< decltype( media::stable::mojom::VideoDecoderConfig::level)>::value, "Unexpected type for media::VideoDecoderConfig::level(). If you need to " @@ -31204,7 +31654,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.level(); } -@@ -953,7 +953,7 @@ media::VideoPixelFormat StructTraits::value, "Unexpected type for media::VideoFrame::format(). If you " "need to change this assertion, please contact " @@ -31213,7 +31663,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->format(); } -@@ -969,7 +969,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoFrame::coded_size(). If you " "need to change this assertion, please contact " @@ -31222,7 +31672,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->coded_size(); } -@@ -985,7 +985,7 @@ const gfx::Rect& StructTraits::value, "Unexpected type for media::VideoFrame::visible_rect(). If you " "need to change this assertion, please contact " @@ -31231,7 +31681,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->visible_rect(); } -@@ -1001,7 +1001,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoFrame::natural_size(). If you " "need to change this assertion, please contact " @@ -31240,7 +31690,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->natural_size(); } -@@ -1016,7 +1016,7 @@ base::TimeDelta StructTraits::value, "Unexpected type for media::VideoFrame::timestamp(). If you " "need to change this assertion, please contact " @@ -31249,7 +31699,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->timestamp(); } -@@ -1031,7 +1031,7 @@ gfx::ColorSpace StructTraits::value, "Unexpected type for media::VideoFrame::ColorSpace(). If you " "need to change this assertion, please contact " @@ -31258,7 +31708,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->ColorSpace(); } -@@ -1048,7 +1048,7 @@ StructTraits::value, "Unexpected type for media::VideoFrame::hdr_metadata(). If you " "need to change this assertion, please contact " @@ -31267,7 +31717,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->hdr_metadata(); } -@@ -1073,7 +1073,7 @@ StructTraits::type>::value, "Unexpected type for media::VideoFrame::metadata(). If you " "need to change this assertion, please contact " @@ -31276,7 +31726,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->metadata(); } -@@ -1189,7 +1189,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::allow_overlay. If you " "need to change this assertion, please contact " @@ -31285,7 +31735,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.allow_overlay; } -@@ -1205,7 +1205,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::end_of_stream. If you " "need to change this assertion, please contact " @@ -31294,7 +31744,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.end_of_stream; } -@@ -1221,7 +1221,7 @@ bool StructTraits::value, "Unexpected type for " "media::VideoFrameMetadata::read_lock_fences_enabled. If you need to " @@ -31303,7 +31753,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.read_lock_fences_enabled; } -@@ -1236,7 +1236,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::protected_video. If you " "need to change this assertion, please contact " @@ -31312,7 +31762,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.protected_video; } -@@ -1252,7 +1252,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::hw_protected. If you " "need to change this assertion, please contact " @@ -31321,7 +31771,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.hw_protected; } -@@ -1267,7 +1267,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::power_efficient. If you " "need to change this assertion, please contact " @@ -32259,7 +32709,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 -@@ -407,7 +407,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -408,7 +408,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" @@ -32271,7 +32721,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_entry.cc --- a/net/dns/public/doh_provider_entry.cc +++ b/net/dns/public/doh_provider_entry.cc -@@ -121,11 +121,11 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { +@@ -128,11 +128,11 @@ const DohProviderEntry::List& DohProviderEntry::GetList() { new DohProviderEntry("Google", DohProviderIdForHistogram::kGoogle, {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"}, @@ -32372,7 +32822,7 @@ diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc diff --git a/net/tools/print_certificates.py b/net/tools/print_certificates.py --- a/net/tools/print_certificates.py +++ b/net/tools/print_certificates.py -@@ -384,7 +384,7 @@ def main(): +@@ -385,7 +385,7 @@ def main(): parser.add_argument('sources', metavar='SOURCE', nargs='*', help='''Each SOURCE can be one of: @@ -32723,16 +33173,16 @@ diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py --- a/remoting/host/linux/linux_me2me_host.py +++ b/remoting/host/linux/linux_me2me_host.py -@@ -1486,7 +1486,7 @@ def watch_for_resolution_changes(initial_size): - def main(): - EPILOG = """This script is not intended for use by end-users. To configure +@@ -1647,7 +1647,7 @@ def watch_for_resolution_changes(initial_size): + def setup_argument_parser(): + EPILOG = """This script is not intended for use by end-users. To configure Chrome Remote Desktop, please install the app from the Chrome -Web Store: https://chrome.google.com/remotedesktop""" +Web Store: https://chrome.9oo91e.qjz9zk/remotedesktop""" parser = argparse.ArgumentParser( usage="Usage: %(prog)s [options] [ -- [ X server options ] ]", epilog=EPILOG) -@@ -1688,7 +1688,7 @@ Web Store: https://chrome.google.com/remotedesktop""" +@@ -1854,7 +1854,7 @@ def main(): "WARNING: This system uses GDM. Some GDM versions have a bug that " "prevents local login while Chrome Remote Desktop is running. If you " "run into this issue, you can stop Chrome Remote Desktop by visiting " @@ -32756,15 +33206,15 @@ 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 -@@ -203,7 +203,7 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED"; +@@ -204,7 +204,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. -constexpr char kGooglerEmailDomain[] = "@google.com"; +constexpr char kGooglerEmailDomain[] = "@9oo91e.qjz9zk"; - } // namespace - + // File to write webrtc trace events to. If not specified, webrtc trace events + // will not be enabled. diff --git a/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 b/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 --- a/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 +++ b/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 @@ -32788,25 +33238,10 @@ diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_ return 1; } -diff --git a/remoting/ios/app/app_delegate.mm b/remoting/ios/app/app_delegate.mm ---- a/remoting/ios/app/app_delegate.mm -+++ b/remoting/ios/app/app_delegate.mm -@@ -32,9 +32,9 @@ - #include "ui/base/l10n/l10n_util.h" - #include "ui/base/resource/resource_bundle.h" - --static NSString* const kTosUrl = @"https://policies.google.com/terms"; -+static NSString* const kTosUrl = @"https://policies.9oo91e.qjz9zk/terms"; - static NSString* const kPrivacyPolicyUrl = -- @"https://policies.google.com/privacy"; -+ @"https://policies.9oo91e.qjz9zk/privacy"; - - @interface AppDelegate () { - FirstLaunchViewPresenter* _firstLaunchViewPresenter; diff --git a/remoting/ios/app/help_view_controller.mm b/remoting/ios/app/help_view_controller.mm --- a/remoting/ios/app/help_view_controller.mm +++ b/remoting/ios/app/help_view_controller.mm -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ // TODO(nicholss): These urls should come from a global config. static NSString* const kHelpCenterUrl = @@ -33195,7 +33630,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 -@@ -934,7 +934,7 @@ set_defaults("test") { +@@ -952,7 +952,7 @@ set_defaults("test") { if (is_mac) { # TODO(lgrey): Maybe restore this. # Don't strip tests for visibility into test crashes/hangs. @@ -33301,7 +33736,7 @@ diff --git a/testing/unexpected_passes_common/data_types.py b/testing/unexpected diff --git a/testing/unexpected_passes_common/queries.py b/testing/unexpected_passes_common/queries.py --- a/testing/unexpected_passes_common/queries.py +++ b/testing/unexpected_passes_common/queries.py -@@ -48,7 +48,7 @@ SUBMITTED_BUILDS_SUBQUERY = """\ +@@ -45,7 +45,7 @@ SUBMITTED_BUILDS_TEMPLATE = """\ UNNEST(builds) as unnested_builds, UNNEST(gerrit_changes) as unnested_changes WHERE @@ -33309,7 +33744,7 @@ diff --git a/testing/unexpected_passes_common/queries.py b/testing/unexpected_pa + unnested_builds.host = "cr-buildbucket.8pp2p8t.qjz9zk" AND unnested_changes.submit_status = "SUCCESS" AND start_time > TIMESTAMP_SUB(CURRENT_TIMESTAMP(), - INTERVAL 30 DAY) + INTERVAL 30 DAY)""" diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py --- a/testing/variations/PRESUBMIT.py +++ b/testing/variations/PRESUBMIT.py @@ -33325,7 +33760,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 -@@ -1053,7 +1053,7 @@ +@@ -634,7 +634,7 @@ { "name": "Enabled_20210611", "params": { @@ -33334,7 +33769,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillAssistantInCctTriggering", -@@ -1475,7 +1475,7 @@ +@@ -1083,7 +1083,7 @@ { "name": "EnabledWithAllowedWebsites_20210922", "params": { @@ -33343,7 +33778,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutomaticLazyFrameLoadingToEmbeds" -@@ -3477,7 +3477,7 @@ +@@ -2579,7 +2579,7 @@ "params": { "DnsHttpssvcControlDomainWildcard": "true", "DnsHttpssvcEnableQueryOverInsecure": "true", @@ -33352,16 +33787,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -4682,7 +4682,7 @@ - { - "name": "Enabled", - "params": { -- "HelpURL": "https://support.google.com/chrome/?p=blocked" -+ "HelpURL": "https://support.9oo91e.qjz9zk/chrome/?p=blocked" - }, - "enable_features": [ - "IncompatibleApplicationsWarning" -@@ -6499,14 +6499,14 @@ +@@ -5131,14 +5131,14 @@ { "name": "Prefetch_2_With_Decoys_20211129", "params": { @@ -33378,52 +33804,34 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "use_speculation_rules": "true" }, "enable_features": [ -@@ -6618,7 +6618,7 @@ +@@ -5221,7 +5221,7 @@ + { + "name": "EnabledExploreAndServerRankingSegmentation2", + "params": { +- "base_url": "https://chromeupboarding-pa.googleapis.com", ++ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", + "experiment_tag": "{maxLevels : 1, rankTiles : true}", + "image_prefetch_mode": "top", + "is_unmetered_network_required": "false", +@@ -5246,7 +5246,7 @@ { "name": "EnabledExploreAndTrendingSegmentation2", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", + "behavioural_targeting": "model_comparison", "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -6643,7 +6643,7 @@ +@@ -5273,7 +5273,7 @@ { "name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", + "behavioural_targeting": "model_comparison", "experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}", "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -7918,7 +7918,7 @@ - { - "name": "launch_20180628_model_20170329_with_blacklist_override_default", - "params": { -- "translate-ranker-model-url": "https://www.gstatic.com/chrome/intelligence/assist/ranker/models/translate/2017/03/translate_ranker_model_20170329.pb.bin" -+ "translate-ranker-model-url": "https://www.95tat1c.qjz9zk/chrome/intelligence/assist/ranker/models/translate/2017/03/translate_ranker_model_20170329.pb.bin" - }, - "enable_features": [ - "TranslateRankerAutoBlacklistOverride", -@@ -7937,7 +7937,7 @@ - { - "name": "20180123_launch", - "params": { -- "translate-ranker-model-url": "https://www.gstatic.com/chrome/intelligence/assist/ranker/models/translate/translate_ranker_20180123.model" -+ "translate-ranker-model-url": "https://www.95tat1c.qjz9zk/chrome/intelligence/assist/ranker/models/translate/translate_ranker_20180123.model" - }, - "enable_features": [ - "TranslateRankerAutoBlacklistOverride", -@@ -7958,7 +7958,7 @@ - { - "name": "Enforcement20170918", - "params": { -- "translate-ranker-model-url": "https://www.gstatic.com/chrome/intelligence/assist/ranker/models/translate/android/translate_ranker_model_android_20170918.pb.bin" -+ "translate-ranker-model-url": "https://www.95tat1c.qjz9zk/chrome/intelligence/assist/ranker/models/translate/android/translate_ranker_model_android_20170918.pb.bin" - }, - "enable_features": [ - "TranslateRankerEnforcement", -@@ -8727,7 +8727,7 @@ +@@ -6875,7 +6875,7 @@ { "name": "Enabled", "params": { @@ -33752,9 +34160,9 @@ diff --git a/third_party/afl/src/llvm_mode/afl-clang-fast.c b/third_party/afl/sr diff --git a/third_party/android_build_tools/aapt2/3pp/fetch.py b/third_party/android_build_tools/aapt2/3pp/fetch.py --- a/third_party/android_build_tools/aapt2/3pp/fetch.py +++ b/third_party/android_build_tools/aapt2/3pp/fetch.py -@@ -11,8 +11,8 @@ import os - import re - import urllib2 +@@ -12,8 +12,8 @@ import re + + from six.moves import urllib -_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/{0}/aapt2-{0}-linux.jar' -_GROUP_INDEX_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/build/group-index.xml' @@ -33766,939 +34174,939 @@ diff --git a/third_party/android_build_tools/aapt2/3pp/fetch.py b/third_party/an diff --git a/third_party/android_deps/libs/android_arch_core_common/3pp/fetch.py b/third_party/android_deps/libs/android_arch_core_common/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_core_common/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_core_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/core/common/1.1.1/common-1.1.1.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/core/common/1.1.1/common-1.1.1.jar' - _FILE_NAME = 'common-1.1.1.jar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/core' + _MODULE_NAME = 'common' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/android_arch_core_runtime/3pp/fetch.py b/third_party/android_deps/libs/android_arch_core_runtime/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_core_runtime/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_core_runtime/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/core/runtime/1.1.1/runtime-1.1.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/core/runtime/1.1.1/runtime-1.1.1.aar' - _FILE_NAME = 'runtime-1.1.1.aar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/core' + _MODULE_NAME = 'runtime' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_common/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_common/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_common/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.1.1/common-1.1.1.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/common/1.1.1/common-1.1.1.jar' - _FILE_NAME = 'common-1.1.1.jar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'common' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_common_java8/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_common_java8/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_common_java8/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_common_java8/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common-java8/1.1.1/common-java8-1.1.1.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/common-java8/1.1.1/common-java8-1.1.1.jar' - _FILE_NAME = 'common-java8-1.1.1.jar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'common-java8' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_livedata/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_livedata/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_livedata/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_livedata/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/livedata/1.1.1/livedata-1.1.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/livedata/1.1.1/livedata-1.1.1.aar' - _FILE_NAME = 'livedata-1.1.1.aar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'livedata' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/livedata-core/1.1.1/livedata-core-1.1.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/livedata-core/1.1.1/livedata-core-1.1.1.aar' - _FILE_NAME = 'livedata-core-1.1.1.aar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'livedata-core' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_runtime/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_runtime/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_runtime/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_runtime/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.1.1/runtime-1.1.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/runtime/1.1.1/runtime-1.1.1.aar' - _FILE_NAME = 'runtime-1.1.1.aar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'runtime' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/3pp/fetch.py b/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/3pp/fetch.py --- a/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/3pp/fetch.py +++ b/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/android/arch/lifecycle/viewmodel/1.1.1/viewmodel-1.1.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/android/arch/lifecycle/viewmodel/1.1.1/viewmodel-1.1.1.aar' - _FILE_NAME = 'viewmodel-1.1.1.aar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'android/arch/lifecycle' + _MODULE_NAME = 'viewmodel' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_animated_vector_drawable/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_animated_vector_drawable/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_animated_vector_drawable/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_animated_vector_drawable/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/28.0.0/animated-vector-drawable-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/animated-vector-drawable/28.0.0/animated-vector-drawable-28.0.0.aar' - _FILE_NAME = 'animated-vector-drawable-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'animated-vector-drawable' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_appcompat_v7/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_appcompat_v7/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_appcompat_v7/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_appcompat_v7/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/28.0.0/appcompat-v7-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/appcompat-v7/28.0.0/appcompat-v7-28.0.0.aar' - _FILE_NAME = 'appcompat-v7-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'appcompat-v7' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_asynclayoutinflater/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_asynclayoutinflater/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_asynclayoutinflater/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_asynclayoutinflater/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/asynclayoutinflater/28.0.0/asynclayoutinflater-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/asynclayoutinflater/28.0.0/asynclayoutinflater-28.0.0.aar' - _FILE_NAME = 'asynclayoutinflater-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'asynclayoutinflater' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_cardview_v7/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_cardview_v7/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_cardview_v7/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_cardview_v7/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/cardview-v7/28.0.0/cardview-v7-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/cardview-v7/28.0.0/cardview-v7-28.0.0.aar' - _FILE_NAME = 'cardview-v7-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'cardview-v7' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_collections/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_collections/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_collections/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_collections/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/collections/28.0.0/collections-28.0.0.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/collections/28.0.0/collections-28.0.0.jar' - _FILE_NAME = 'collections-28.0.0.jar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'collections' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_support_coordinatorlayout/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_coordinatorlayout/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_coordinatorlayout/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_coordinatorlayout/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/coordinatorlayout/28.0.0/coordinatorlayout-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/coordinatorlayout/28.0.0/coordinatorlayout-28.0.0.aar' - _FILE_NAME = 'coordinatorlayout-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'coordinatorlayout' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_cursoradapter/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_cursoradapter/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_cursoradapter/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_cursoradapter/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/cursoradapter/28.0.0/cursoradapter-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/cursoradapter/28.0.0/cursoradapter-28.0.0.aar' - _FILE_NAME = 'cursoradapter-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'cursoradapter' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_customview/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_customview/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_customview/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_customview/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/customview/28.0.0/customview-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/customview/28.0.0/customview-28.0.0.aar' - _FILE_NAME = 'customview-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'customview' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_design/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_design/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_design/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_design/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/design/28.0.0/design-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/design/28.0.0/design-28.0.0.aar' - _FILE_NAME = 'design-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'design' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_documentfile/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_documentfile/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_documentfile/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_documentfile/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/documentfile/28.0.0/documentfile-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/documentfile/28.0.0/documentfile-28.0.0.aar' - _FILE_NAME = 'documentfile-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'documentfile' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_drawerlayout/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_drawerlayout/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_drawerlayout/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_drawerlayout/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/drawerlayout/28.0.0/drawerlayout-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/drawerlayout/28.0.0/drawerlayout-28.0.0.aar' - _FILE_NAME = 'drawerlayout-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'drawerlayout' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_interpolator/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_interpolator/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_interpolator/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_interpolator/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/interpolator/28.0.0/interpolator-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/interpolator/28.0.0/interpolator-28.0.0.aar' - _FILE_NAME = 'interpolator-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'interpolator' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_loader/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_loader/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_loader/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_loader/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/loader/28.0.0/loader-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/loader/28.0.0/loader-28.0.0.aar' - _FILE_NAME = 'loader-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'loader' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_localbroadcastmanager/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_localbroadcastmanager/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_localbroadcastmanager/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_localbroadcastmanager/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/localbroadcastmanager/28.0.0/localbroadcastmanager-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/localbroadcastmanager/28.0.0/localbroadcastmanager-28.0.0.aar' - _FILE_NAME = 'localbroadcastmanager-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'localbroadcastmanager' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_multidex/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_multidex/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_multidex/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_multidex/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/multidex/1.0.0/multidex-1.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/multidex/1.0.0/multidex-1.0.0.aar' - _FILE_NAME = 'multidex-1.0.0.aar' - _FILE_VERSION = '1.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'multidex' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_print/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_print/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_print/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_print/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/print/28.0.0/print-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/print/28.0.0/print-28.0.0.aar' - _FILE_NAME = 'print-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'print' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_recyclerview_v7/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_recyclerview_v7/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_recyclerview_v7/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_recyclerview_v7/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7/28.0.0/recyclerview-v7-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/recyclerview-v7/28.0.0/recyclerview-v7-28.0.0.aar' - _FILE_NAME = 'recyclerview-v7-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'recyclerview-v7' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_slidingpanelayout/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_slidingpanelayout/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_slidingpanelayout/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_slidingpanelayout/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/slidingpanelayout/28.0.0/slidingpanelayout-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/slidingpanelayout/28.0.0/slidingpanelayout-28.0.0.aar' - _FILE_NAME = 'slidingpanelayout-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'slidingpanelayout' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/28.0.0/support-annotations-28.0.0.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-annotations/28.0.0/support-annotations-28.0.0.jar' - _FILE_NAME = 'support-annotations-28.0.0.jar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-annotations' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_support_support_compat/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_compat/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_compat/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_compat/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-compat/28.0.0/support-compat-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-compat/28.0.0/support-compat-28.0.0.aar' - _FILE_NAME = 'support-compat-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-compat' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_core_ui/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_core_ui/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_core_ui/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_core_ui/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/28.0.0/support-core-ui-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-core-ui/28.0.0/support-core-ui-28.0.0.aar' - _FILE_NAME = 'support-core-ui-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-core-ui' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_core_utils/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_core_utils/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_core_utils/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_core_utils/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/28.0.0/support-core-utils-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-core-utils/28.0.0/support-core-utils-28.0.0.aar' - _FILE_NAME = 'support-core-utils-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-core-utils' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_fragment/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_fragment/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_fragment/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_fragment/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/28.0.0/support-fragment-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-fragment/28.0.0/support-fragment-28.0.0.aar' - _FILE_NAME = 'support-fragment-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-fragment' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_media_compat/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_media_compat/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_media_compat/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_media_compat/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-media-compat/28.0.0/support-media-compat-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-media-compat/28.0.0/support-media-compat-28.0.0.aar' - _FILE_NAME = 'support-media-compat-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-media-compat' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_v4/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_v4/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_v4/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_v4/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-v4/28.0.0/support-v4-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-v4/28.0.0/support-v4-28.0.0.aar' - _FILE_NAME = 'support-v4-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-v4' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_support_vector_drawable/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_support_vector_drawable/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_support_vector_drawable/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_support_vector_drawable/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/28.0.0/support-vector-drawable-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/support-vector-drawable/28.0.0/support-vector-drawable-28.0.0.aar' - _FILE_NAME = 'support-vector-drawable-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'support-vector-drawable' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_swiperefreshlayout/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_swiperefreshlayout/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_swiperefreshlayout/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_swiperefreshlayout/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/swiperefreshlayout/28.0.0/swiperefreshlayout-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/swiperefreshlayout/28.0.0/swiperefreshlayout-28.0.0.aar' - _FILE_NAME = 'swiperefreshlayout-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'swiperefreshlayout' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_transition/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_transition/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_transition/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_transition/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/transition/28.0.0/transition-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/transition/28.0.0/transition-28.0.0.aar' - _FILE_NAME = 'transition-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'transition' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_versionedparcelable/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_versionedparcelable/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_versionedparcelable/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_versionedparcelable/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/versionedparcelable/28.0.0/versionedparcelable-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/versionedparcelable/28.0.0/versionedparcelable-28.0.0.aar' - _FILE_NAME = 'versionedparcelable-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'versionedparcelable' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_support_viewpager/3pp/fetch.py b/third_party/android_deps/libs/com_android_support_viewpager/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_support_viewpager/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_support_viewpager/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/support/viewpager/28.0.0/viewpager-28.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/support/viewpager/28.0.0/viewpager-28.0.0.aar' - _FILE_NAME = 'viewpager-28.0.0.aar' - _FILE_VERSION = '28.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/support' + _MODULE_NAME = 'viewpager' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py b/third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.0-alpha10/common-30.0.0-alpha10.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/tools/common/30.0.0-alpha10/common-30.0.0-alpha10.jar' - _FILE_NAME = 'common-30.0.0-alpha10.jar' - _FILE_VERSION = '30.0.0-alpha10' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/tools' + _MODULE_NAME = 'common' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/3pp/fetch.py b/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/desugar_jdk_libs/1.1.1/desugar_jdk_libs-1.1.1.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/tools/desugar_jdk_libs/1.1.1/desugar_jdk_libs-1.1.1.jar' - _FILE_NAME = 'desugar_jdk_libs-1.1.1.jar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/tools' + _MODULE_NAME = 'desugar_jdk_libs' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/3pp/fetch.py b/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/desugar_jdk_libs_configuration/1.1.1/desugar_jdk_libs_configuration-1.1.1.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/tools/desugar_jdk_libs_configuration/1.1.1/desugar_jdk_libs_configuration-1.1.1.jar' - _FILE_NAME = 'desugar_jdk_libs_configuration-1.1.1.jar' - _FILE_VERSION = '1.1.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/tools' + _MODULE_NAME = 'desugar_jdk_libs_configuration' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py b/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.0-alpha10/layoutlib-api-30.0.0-alpha10.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.0-alpha10/layoutlib-api-30.0.0-alpha10.jar' - _FILE_NAME = 'layoutlib-api-30.0.0-alpha10.jar' - _FILE_VERSION = '30.0.0-alpha10' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/tools/layoutlib' + _MODULE_NAME = 'layoutlib-api' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetch.py b/third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetch.py --- a/third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetch.py +++ b/third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.0-alpha10/sdk-common-30.0.0-alpha10.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/android/tools/sdk-common/30.0.0-alpha10/sdk-common-30.0.0-alpha10.jar' - _FILE_NAME = 'sdk-common-30.0.0-alpha10.jar' - _FILE_VERSION = '30.0.0-alpha10' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/android/tools' + _MODULE_NAME = 'sdk-common' + _FILE_EXT = 'jar' 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 -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.aar' - _FILE_NAME = 'transport-api-2.2.1.aar' - _FILE_VERSION = '2.2.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/datatransport' + _MODULE_NAME = 'transport-api' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_auth/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth/17.0.0/play-services-auth-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-auth/17.0.0/play-services-auth-17.0.0.aar' - _FILE_NAME = 'play-services-auth-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-auth' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth-api-phone/17.5.0/play-services-auth-api-phone-17.5.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-auth-api-phone/17.5.0/play-services-auth-api-phone-17.5.0.aar' - _FILE_NAME = 'play-services-auth-api-phone-17.5.0.aar' - _FILE_VERSION = '17.5.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-auth-api-phone' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth-base/17.0.0/play-services-auth-base-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-auth-base/17.0.0/play-services-auth-base-17.0.0.aar' - _FILE_NAME = 'play-services-auth-base-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-auth-base' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_base/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_base/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_base/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_base/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/17.5.0/play-services-base-17.5.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-base/17.5.0/play-services-base-17.5.0.aar' - _FILE_NAME = 'play-services-base-17.5.0.aar' - _FILE_VERSION = '17.5.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-base' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_basement/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_basement/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_basement/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_basement/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/17.5.0/play-services-basement-17.5.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-basement/17.5.0/play-services-basement-17.5.0.aar' - _FILE_NAME = 'play-services-basement-17.5.0.aar' - _FILE_VERSION = '17.5.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-basement' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_cast/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_cast/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_cast/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_cast/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cast/17.0.0/play-services-cast-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-cast/17.0.0/play-services-cast-17.0.0.aar' - _FILE_NAME = 'play-services-cast-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-cast' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cast-framework/17.0.0/play-services-cast-framework-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-cast-framework/17.0.0/play-services-cast-framework-17.0.0.aar' - _FILE_NAME = 'play-services-cast-framework-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-cast-framework' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-clearcut/17.0.0/play-services-clearcut-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-clearcut/17.0.0/play-services-clearcut-17.0.0.aar' - _FILE_NAME = 'play-services-clearcut-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-clearcut' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/16.0.0/play-services-cloud-messaging-16.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/16.0.0/play-services-cloud-messaging-16.0.0.aar' - _FILE_NAME = 'play-services-cloud-messaging-16.0.0.aar' - _FILE_VERSION = '16.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-cloud-messaging' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_fido/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_fido/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_fido/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_fido/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-fido/19.0.0-beta/play-services-fido-19.0.0-beta.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-fido/19.0.0-beta/play-services-fido-19.0.0-beta.aar' - _FILE_NAME = 'play-services-fido-19.0.0-beta.aar' - _FILE_VERSION = '19.0.0-beta' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-fido' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_flags/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_flags/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_flags/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_flags/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-flags/17.0.0/play-services-flags-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-flags/17.0.0/play-services-flags-17.0.0.aar' - _FILE_NAME = 'play-services-flags-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-flags' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-gcm/17.0.0/play-services-gcm-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-gcm/17.0.0/play-services-gcm-17.0.0.aar' - _FILE_NAME = 'play-services-gcm-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-gcm' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_iid/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_iid/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_iid/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_iid/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-iid/17.0.0/play-services-iid-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-iid/17.0.0/play-services-iid-17.0.0.aar' - _FILE_NAME = 'play-services-iid-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-iid' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-instantapps/17.0.0/play-services-instantapps-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-instantapps/17.0.0/play-services-instantapps-17.0.0.aar' - _FILE_NAME = 'play-services-instantapps-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-instantapps' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_location/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_location/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_location/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_location/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-location/17.0.0/play-services-location-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-location/17.0.0/play-services-location-17.0.0.aar' - _FILE_NAME = 'play-services-location-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-location' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-phenotype/17.0.0/play-services-phenotype-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-phenotype/17.0.0/play-services-phenotype-17.0.0.aar' - _FILE_NAME = 'play-services-phenotype-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-phenotype' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-places-placereport/17.0.0/play-services-places-placereport-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-places-placereport/17.0.0/play-services-places-placereport-17.0.0.aar' - _FILE_NAME = 'play-services-places-placereport-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-places-placereport' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0.aar' - _FILE_NAME = 'play-services-stats-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-stats' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/17.2.0/play-services-tasks-17.2.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-tasks/17.2.0/play-services-tasks-17.2.0.aar' - _FILE_NAME = 'play-services-tasks-17.2.0.aar' - _FILE_VERSION = '17.2.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-tasks' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision/18.0.0/play-services-vision-18.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-vision/18.0.0/play-services-vision-18.0.0.aar' - _FILE_NAME = 'play-services-vision-18.0.0.aar' - _FILE_VERSION = '18.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-vision' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision-common/18.0.0/play-services-vision-common-18.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/gms/play-services-vision-common/18.0.0/play-services-vision-common-18.0.0.aar' - _FILE_NAME = 'play-services-vision-common-18.0.0.aar' - _FILE_VERSION = '18.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/gms' + _MODULE_NAME = 'play-services-vision-common' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.6.0-alpha01/material-1.6.0-alpha01.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/material/material/1.6.0-alpha01/material-1.6.0-alpha01.aar' - _FILE_NAME = 'material-1.6.0-alpha01.aar' - _FILE_VERSION = '1.6.0-alpha01' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/material' + _MODULE_NAME = 'material' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_android_play_core/3pp/fetch.py b/third_party/android_deps/libs/com_google_android_play_core/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_android_play_core/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_android_play_core/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/android/play/core/1.10.0/core-1.10.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/android/play/core/1.10.0/core-1.10.0.aar' - _FILE_NAME = 'core-1.10.0.aar' - _FILE_VERSION = '1.10.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/android/play' + _MODULE_NAME = 'core' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_annotations/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_annotations/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_annotations/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_annotations/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.jar' - _FILE_NAME = 'firebase-annotations-16.0.0.jar' - _FILE_VERSION = '16.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-annotations' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_common/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_common/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_common/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_common/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/19.5.0/firebase-common-19.5.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-common/19.5.0/firebase-common-19.5.0.aar' - _FILE_NAME = 'firebase-common-19.5.0.aar' - _FILE_VERSION = '19.5.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-common' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_components/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_components/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_components/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_components/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.aar' - _FILE_NAME = 'firebase-components-16.1.0.aar' - _FILE_VERSION = '16.1.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-components' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_encoders/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_encoders/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_encoders/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_encoders/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.jar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.jar' - _FILE_NAME = 'firebase-encoders-16.1.0.jar' - _FILE_VERSION = '16.1.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-encoders' + _FILE_EXT = 'jar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.aar' - _FILE_NAME = 'firebase-encoders-json-17.1.0.aar' - _FILE_VERSION = '17.1.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-encoders-json' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_iid/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_iid/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_iid/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_iid/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid/21.0.1/firebase-iid-21.0.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-iid/21.0.1/firebase-iid-21.0.1.aar' - _FILE_NAME = 'firebase-iid-21.0.1.aar' - _FILE_VERSION = '21.0.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-iid' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid-interop/17.0.0/firebase-iid-interop-17.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-iid-interop/17.0.0/firebase-iid-interop-17.0.0.aar' - _FILE_NAME = 'firebase-iid-interop-17.0.0.aar' - _FILE_VERSION = '17.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-iid-interop' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_installations/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_installations/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_installations/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_installations/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/16.3.5/firebase-installations-16.3.5.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-installations/16.3.5/firebase-installations-16.3.5.aar' - _FILE_NAME = 'firebase-installations-16.3.5.aar' - _FILE_VERSION = '16.3.5' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-installations' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/16.0.1/firebase-installations-interop-16.0.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-installations-interop/16.0.1/firebase-installations-interop-16.0.1.aar' - _FILE_NAME = 'firebase-installations-interop-16.0.1.aar' - _FILE_VERSION = '16.0.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-installations-interop' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measurement-connector/18.0.0/firebase-measurement-connector-18.0.0.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-measurement-connector/18.0.0/firebase-measurement-connector-18.0.0.aar' - _FILE_NAME = 'firebase-measurement-connector-18.0.0.aar' - _FILE_VERSION = '18.0.0' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-measurement-connector' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.py b/third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.py --- a/third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.py +++ b/third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.py -@@ -12,7 +12,7 @@ import argparse - import json - import os +@@ -15,7 +15,7 @@ import re --_FILE_URL = 'https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/21.0.1/firebase-messaging-21.0.1.aar' -+_FILE_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2/com/google/firebase/firebase-messaging/21.0.1/firebase-messaging-21.0.1.aar' - _FILE_NAME = 'firebase-messaging-21.0.1.aar' - _FILE_VERSION = '21.0.1' + from six.moves import urllib +-_REPO_URL = 'https://dl.google.com/dl/android/maven2' ++_REPO_URL = 'https://dl.9oo91e.qjz9zk/dl/android/maven2' + _GROUP_NAME = 'com/google/firebase' + _MODULE_NAME = 'firebase-messaging' + _FILE_EXT = 'aar' diff --git a/third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt b/third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt --- a/third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt +++ b/third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt @@ -34831,7 +35239,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl for more details. Note that all output references are relative to the output directory which is specified at build time. --> -@@ -668,14 +668,14 @@ below: +@@ -677,14 +677,14 @@ below: # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at @@ -34848,7 +35256,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl # # The Initial Developer of the Original Code is # Netscape Communications Corporation. -@@ -684,7 +684,7 @@ below: +@@ -693,7 +693,7 @@ below: # # Contributor(s): # Mitch (original author) @@ -34998,7 +35406,7 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/blink/renderer/core/frame/deprecation.cc --- a/third_party/blink/renderer/core/frame/deprecation.cc +++ b/third_party/blink/renderer/core/frame/deprecation.cc -@@ -185,7 +185,7 @@ class DeprecationInfo final { +@@ -194,7 +194,7 @@ class DeprecationInfo final { return DeprecationInfo( id, milestone, String(), String(), details, chrome_status_id, String::Format( @@ -35007,7 +35415,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ details.Ascii().c_str(), chrome_status_id.Ascii().c_str())); } -@@ -212,7 +212,7 @@ class DeprecationInfo final { +@@ -221,7 +221,7 @@ class DeprecationInfo final { id, milestone, feature, String(), String(), chrome_status_id, String::Format( "%s is deprecated and will be removed in %s. See " @@ -35016,7 +35424,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ feature.Ascii().c_str(), MilestoneString(milestone).Ascii().c_str(), chrome_status_id.Ascii().c_str())); } -@@ -229,7 +229,7 @@ class DeprecationInfo final { +@@ -238,7 +238,7 @@ class DeprecationInfo final { id, milestone, feature, replacement, String(), chrome_status_id, String::Format( "%s is deprecated and will be removed in %s. Please use %s " @@ -35025,7 +35433,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details.", feature.Ascii().c_str(), MilestoneString(milestone).Ascii().c_str(), replacement.Ascii().c_str(), chrome_status_id.Ascii().c_str())); -@@ -358,7 +358,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -367,7 +367,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 " @@ -35034,7 +35442,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved: case WebFeature::kGeolocationInsecureOriginIframeDeprecatedNotRemoved: -@@ -367,7 +367,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -376,7 +376,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 " @@ -35043,7 +35451,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGetUserMediaInsecureOrigin: case WebFeature::kGetUserMediaInsecureOriginIframe: -@@ -375,7 +375,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -384,7 +384,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 " @@ -35052,7 +35460,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kMediaSourceAbortRemove: return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -405,7 +405,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -414,7 +414,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, " @@ -35061,7 +35469,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kNotificationPermissionRequestedIframe: return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -568,7 +568,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -577,7 +577,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "SharedArrayBufferConstructedWithoutIsolation", kM92, String::Format("SharedArrayBuffer will require cross-origin " "isolation as of %s. See " @@ -35070,7 +35478,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "enabling-shared-array-buffer/ for more details.", MilestoneString(kM92).Ascii().c_str())); -@@ -659,7 +659,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -668,7 +668,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "V8SharedArrayBufferConstructedInExtensionWithoutIsolation", kM96, "Extensions should opt into cross-origin isolation to continue using " "SharedArrayBuffer. See " @@ -35079,7 +35487,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "cross-origin-isolation/."); case WebFeature::kCrossOriginWindowAlert: -@@ -702,7 +702,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -711,7 +711,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 " @@ -35088,19 +35496,19 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."); case WebFeature::kDocumentDomainSettingWithoutOriginAgentClusterHeader: -@@ -715,7 +715,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { - "continue using this feature, please opt-out of origin-keyed " - "agent clusters by sending an `Origin-Agent-Cluster: ?0` header " - "along with the HTTP response for the document. See " -- "https://developer.chrome.com/blog/immutable-document-domain for " -+ "https://developer.ch40me.qjz9zk/blog/immutable-document-domain for " - "more details.", - MilestoneString(kM101).Ascii().c_str())); +@@ -726,7 +726,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::kCookieWithTruncatingChar: + 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 -@@ -1679,7 +1679,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1690,7 +1690,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 " @@ -35109,7 +35517,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } return false; } -@@ -1780,7 +1780,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1791,7 +1791,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 " @@ -35121,7 +35529,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 -@@ -275,7 +275,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -279,7 +279,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "