From 858e85b59b494cf24bbbe885ae8684dffbc1d7f9 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 25 Sep 2021 16:23:57 +0200 Subject: [PATCH] Release 93.0.4577.83 --- CHANGELOG.md | 6 + build/RELEASE | 2 +- build/bromite_patches_list.txt | 2 - build/chromium_patches_list.txt | 1 - .../AImageReader-CFI-crash-mitigations.patch | 14 +- build/patches/AV1-codec-support.patch | 32 +- .../Add-AllowUserCertificates-flag.patch | 34 +- ...dd-Alt-D-hotkey-to-focus-address-bar.patch | 2 +- .../Add-IsCleartextPermitted-flag.patch | 20 +- ...-allow-screenshots-in-Incognito-mode.patch | 12 +- .../Add-a-proxy-configuration-page.patch | 49 +- .../Add-an-always-incognito-mode.patch | 69 +- .../Add-bookmark-import-export-actions.patch | 166 +- ...dd-custom-tab-intents-privacy-option.patch | 4 +- build/patches/Add-exit-menu-item.patch | 10 +- ...g-for-omnibox-autocomplete-filtering.patch | 24 +- .../Add-flag-for-save-data-header.patch | 22 +- ...nfigure-maximum-connections-per-host.patch | 20 +- ...ontrol-video-playback-resume-feature.patch | 6 +- .../Add-flag-to-disable-IPv6-probes.patch | 12 +- build/patches/Add-flag-to-disable-WebGL.patch | 28 +- ...-to-disable-external-intent-requests.patch | 6 +- ...dd-history-support-in-incognito-mode.patch | 24 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 121 +- .../Add-menu-item-to-view-source.patch | 16 +- .../Add-option-to-force-tablet-UI.patch | 66 +- ...-to-not-persist-tabs-across-sessions.patch | 4 +- ...-support-for-ISupportHelpAndFeedback.patch | 16 +- build/patches/Add-vibration-flag.patch | 22 +- .../Allow-playing-audio-in-background.patch | 43 +- ...site-sign-in-without-account-sign-in.patch | 2 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 2 +- .../Automated-domain-substitution.patch | 6273 ++++++++--------- .../patches/Battery-API-return-nothing.patch | 2 +- ...Block-gateway-attacks-via-websockets.patch | 16 +- .../Block-qjz9zk-or-trk-requests.patch | 16 +- .../Bromite-AdBlockUpdaterService.patch | 98 +- ...webRTC-policy-to-not-use-any-address.patch | 2 +- ...Scan-Fix-builds-with-system-sysroots.patch | 38 - ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- build/patches/Disable-FLoC-by-default.patch | 25 - ...sts-for-single-word-Omnibar-searches.patch | 6 +- ...rrentBrowsingContextMedia-by-default.patch | 2 +- build/patches/Disable-UA-client-hint.patch | 6 +- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-feeds-support-by-default.patch | 25 +- ...Disable-fetching-of-all-field-trials.patch | 2 +- ...media-router-and-remoting-by-default.patch | 62 +- ...ble-metrics-collection-for-NTP-tiles.patch | 27 +- .../Disable-metrics-on-all-I-O-threads.patch | 4 +- ...-home-to-be-opened-in-CCT-by-default.patch | 4 +- ...-omission-of-URL-elements-in-Omnibox.patch | 5 +- .../patches/Disable-plugins-enumeration.patch | 2 +- build/patches/Disable-safe-browsing.patch | 539 +- ...arch-engine-DSE-automatic-permission.patch | 2 +- .../Disable-seed-based-field-trials.patch | 4 +- .../Disable-smart-selection-by-default.patch | 34 +- ...isable-some-signed-exchange-features.patch | 4 +- ...ble-support-for-RAR-files-inspection.patch | 8 +- .../Disable-text-fragments-by-default.patch | 16 +- ...Disable-the-DIAL-repeating-discovery.patch | 4 +- ...sable-third-party-cookies-by-default.patch | 2 +- .../Disable-unified-autoplay-feature.patch | 2 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 34 +- .../Do-not-hide-component-extensions.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 2 +- .../patches/DoH-secure-mode-by-default.patch | 2 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...e-darken-websites-checkbox-in-themes.patch | 4 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-network-isolation-features.patch | 2 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- .../Enable-user-agent-freeze-by-default.patch | 4 +- ...ing-against-incognito-mode-detection.patch | 2 +- .../patches/Hide-passwords-manager-link.patch | 4 +- ...e-enterprise-policies-for-secure-DNS.patch | 10 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 18 +- build/patches/JIT-less-toggle.patch | 2 +- build/patches/Logcat-crash-reports-UI.patch | 8 +- .../Make-all-favicon-requests-on-demand.patch | 6 +- .../patches/Modify-default-preferences.patch | 12 +- ...nt-settings-back-to-privacy-settings.patch | 17 +- .../Multiple-fingerprinting-mitigations.patch | 74 +- .../Never-send-any-crash-upload-data.patch | 2 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../Open-YouTube-links-in-Bromite.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 12 +- build/patches/Remove-SMS-integration.patch | 45 +- .../Remove-binary-blob-integrations.patch | 184 +- ...cklisted-URLs-upon-bookmark-creation.patch | 24 +- build/patches/Remove-help-menu-item.patch | 12 +- ...-offline-measurement-background-task.patch | 16 +- ...e-signin-and-data-saver-integrations.patch | 869 +-- ...weblayer-dependency-on-Play-Services.patch | 4 +- ...ce-DoH-probe-domain-with-RIPE-domain.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 208 +- .../Restore-Simplified-NTP-launch.patch | 61 +- ...emove-disable-pull-to-refresh-effect.patch | 10 +- ...vert-flags-remove-num-raster-threads.patch | 18 +- ...moval-of-an-option-to-block-autoplay.patch | 51 +- ...tings-for-cookies-javascript-and-ads.patch | 8 +- .../Skip-the-first-run-and-metrics.patch | 34 +- .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Timezone-customization.patch | 107 +- build/patches/Unexpire-tab-groups-flags.patch | 29 +- build/patches/Update-i18n-zh_CN-support.patch | 8 +- .../Use-4-tile-rows-never-show-logo.patch | 8 +- build/patches/User-agent-customization.patch | 70 +- ...ll-disable-autofill-download-manager.patch | 98 +- ...build-remove-calling-untrusted-hooks.patch | 10 +- ...fill-server-communication-by-default.patch | 2 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- ...t_run-deactivate-autoupdate-globally.patch | 11 +- build/patches/kill-Auth.patch | 8 +- .../kill-TOS-and-metrics-opt-out.patch | 4 +- build/patches/kill-Vision.patch | 2 +- ...pt-for-download-directory-by-default.patch | 2 +- ...g-of-translate-languages-from-server.patch | 4 +- .../ungoogled-chromium-Disable-Gaia.patch | 6 +- ...romium-Disable-Google-host-detection.patch | 24 +- ...hromium-Disable-Network-Time-Tracker.patch | 2 +- ...-chromium-Disable-domain-reliability.patch | 4 +- ...m-Disable-intranet-redirect-detector.patch | 2 +- ...gled-chromium-Disable-profile-avatar.patch | 6 +- ...romium-Disable-translate-integration.patch | 14 +- ...ed-chromium-Disable-untraceable-URLs.patch | 6 +- ...chromium-Disable-webRTC-log-uploader.patch | 4 +- .../updater-disable-updater-pings.patch | 4 +- 129 files changed, 5252 insertions(+), 5055 deletions(-) delete mode 100644 build/patches/DCScan-Fix-builds-with-system-sysroots.patch delete mode 100644 build/patches/Disable-FLoC-by-default.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 21099599..562ee3cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 93.0.4577.83 +* dropped patch for FLoC (already disabled by upstream) +* dropped patch for build with system sysroots +* disable tab groups by default (needs restart) +* added 'services/network/public/mojom' to ad blocker patch to avoid a build error + # 92.0.4515.176 * use upstream feature to prevent default search engine permissions grants * slightly improve error message for gateway attacks prevention error diff --git a/build/RELEASE b/build/RELEASE index 3e51e42c..8fcf05bc 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -92.0.4515.176 +93.0.4577.83 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 1df54774..7905bb9a 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -2,7 +2,6 @@ Disable-third-party-cookies-by-default.patch AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch -DCScan-Fix-builds-with-system-sysroots.patch Restore-classic-new-tab-page.patch Always-use-new-tab-page-for-default-home-page.patch Always-allow-partner-customisation.patch @@ -146,7 +145,6 @@ User-agent-customization.patch Add-AllowUserCertificates-flag.patch Add-IsCleartextPermitted-flag.patch Disable-RTCGetCurrentBrowsingContextMedia-by-default.patch -Disable-FLoC-by-default.patch Unexpire-tab-groups-flags.patch Add-flag-for-omnibox-autocomplete-filtering.patch Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 8604f65d..e24c8063 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -1,5 +1,4 @@ AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch -DCScan-Fix-builds-with-system-sysroots.patch Disable-feeds-support-by-default.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index f22a7ea3..adbc1eb8 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -45,7 +45,7 @@ diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_ // C++11 static local variable initialization is // thread-safe. @@ -30,8 +32,12 @@ AndroidImageReader& AndroidImageReader::GetInstance() { - return *instance; + return instance; } +void AndroidImageReader::DisableSupport() { @@ -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 -@@ -1922,7 +1922,7 @@ +@@ -2039,7 +2039,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], @@ -94,7 +94,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json -@@ -3188,6 +3188,22 @@ +@@ -3191,6 +3191,22 @@ "dont_delete_source_texture_for_egl_image" ] }, @@ -120,7 +120,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -50,6 +50,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { +@@ -51,6 +51,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { } // namespace #if defined(OS_ANDROID) @@ -205,7 +205,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ #include "base/android/scoped_hardware_buffer_fence_sync.h" #include "base/bind.h" #include "base/feature_list.h" -@@ -49,7 +50,15 @@ std::unique_ptr MakeCurrent( +@@ -50,7 +51,15 @@ std::unique_ptr MakeCurrent( } TextureOwner::Mode GetTextureOwnerMode() { @@ -225,7 +225,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 -@@ -627,6 +627,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -635,6 +635,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}; @@ -239,7 +239,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 -@@ -205,6 +205,7 @@ MEDIA_EXPORT extern const base::Feature kVp9kSVCHWDecoding; +@@ -208,6 +208,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays; MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 6796e294..161bfec0 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -24,7 +24,7 @@ Report AV1 as playable on Android diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn --- a/third_party/libaom/BUILD.gn +++ b/third_party/libaom/BUILD.gn -@@ -81,7 +81,7 @@ if (enable_libaom) { +@@ -82,7 +82,7 @@ if (enable_libaom) { sources += aom_dsp_encoder_asm_sse2_x86_64 sources += aom_dsp_encoder_asm_ssse3_x86_64 } @@ -33,7 +33,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn include_dirs = libaom_include_dirs } -@@ -192,7 +192,7 @@ if (enable_libaom) { +@@ -193,7 +193,7 @@ if (enable_libaom) { configs += [ "//build/config/compiler:no_chromium_code" ] if (current_cpu == "arm") { configs -= [ "//build/config/compiler:compiler_arm_fpu" ] @@ -42,7 +42,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn } configs += [ ":libaom_config" ] -@@ -242,6 +242,8 @@ if (enable_libaom) { +@@ -256,6 +256,8 @@ if (enable_libaom) { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] @@ -54,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -629,6 +629,11 @@ aom_mem_sources = [ +@@ -633,6 +633,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] @@ -75,9 +75,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h @@ -87,9 +87,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm @@ -99,9 +99,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h @@ -111,9 +111,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm @@ -123,9 +123,9 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h @@ -135,9 +135,9 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm @@ -147,9 +147,9 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h @@ -159,9 +159,9 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm @@ -171,9 +171,9 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h @@ -183,9 +183,9 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm @@ -195,9 +195,9 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ %define CONFIG_PARTITION_SEARCH_ORDER 0 -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 + %define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 - %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h @@ -207,9 +207,9 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RT_ML_PARTITIONING 0 -- 2.17.1 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index b65f6cf7..f362c75e 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 -@@ -211,6 +211,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -224,6 +224,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; -@@ -879,6 +880,8 @@ public abstract class ChromeActivity +@@ -968,6 +969,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -38,18 +38,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -65,6 +65,7 @@ public class ChromeCachedFlags { - - // clang-format off - List featuresToCache = Arrays.asList( -+ ChromeFeatureList.ALLOW_USER_CERTIFICATES, - ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, - ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, - ChromeFeatureList.APP_TO_WEB_ATTRIBUTION, +@@ -85,6 +85,7 @@ public class ChromeCachedFlags { + add(ChromeFeatureList.EARLY_LIBRARY_LOAD); + add(ChromeFeatureList.ELASTIC_OVERSCROLL); + add(ChromeFeatureList.IMMERSIVE_UI_MODE); ++ add(ChromeFeatureList.ALLOW_USER_CERTIFICATES); + add(ChromeFeatureList.INSTANT_START); + add(ChromeFeatureList.INTEREST_FEED_V2); + add(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH); 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 -@@ -2805,6 +2805,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2886,6 +2886,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) @@ -91,15 +91,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -127,6 +127,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -131,6 +131,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &feed::kFeedInteractiveRefresh, &feed::kInterestFeedContentSuggestions, - &feed::kInterestFeedNoticeCardAutoDismiss, &feed::kInterestFeedSpinnerAlwaysAnimate, + &kAllowUserCertificates, &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -351,6 +352,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -359,6 +360,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -123,18 +123,18 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -47,6 +47,7 @@ public class CachedFeatureFlags { +@@ -46,6 +46,7 @@ public class CachedFeatureFlags { */ private static Map sDefaults = new HashMap() { { + put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false); put(ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, true); put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false); - put(ChromeFeatureList.CHROME_STARTUP_DELEGATE, false); + put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -203,6 +203,7 @@ public abstract class ChromeFeatureList { +@@ -211,6 +211,7 @@ public abstract class ChromeFeatureList { } /* Alphabetical: */ 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 094c880d..d7d53e35 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 -@@ -147,6 +147,8 @@ public class KeyboardShortcuts { +@@ -156,6 +156,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 e9fe04bc..4aefd077 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 -@@ -7444,6 +7444,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7709,6 +7709,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( chrome::android::kBookmarksExportUseSaf)}, @@ -29,9 +29,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1404,6 +1404,10 @@ const char kHostedAppShimCreationName[] = - const char kHostedAppShimCreationDescription[] = - "Create app shims on Mac when creating a hosted app."; +@@ -1463,6 +1463,10 @@ const char kHttpsOnlyModeDescription[] = + "Adds a setting under chrome://settings/security to opt-in to HTTPS-Only " + "Mode."; +const char kIsCleartextPermittedName[] = "Allow cleartext traffic"; +const char kIsCleartextPermittedDescription[] = @@ -43,9 +43,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -825,6 +825,9 @@ extern const char kHostedAppQuitNotificationDescription[]; - extern const char kHostedAppShimCreationName[]; - extern const char kHostedAppShimCreationDescription[]; +@@ -847,6 +847,9 @@ extern const char kHostedAppShimCreationDescription[]; + extern const char kHttpsOnlyModeName[]; + extern const char kHttpsOnlyModeDescription[]; +extern const char kIsCleartextPermittedName[]; +extern const char kIsCleartextPermittedDescription[]; @@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -70,6 +70,9 @@ base::TimeDelta GetExtraTimeAbsolute() { +@@ -88,6 +88,9 @@ const base::FeatureParam kUseDnsHttpsSvcbExtraTimePercent{ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -69,7 +69,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -34,6 +34,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin; +@@ -37,6 +37,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin; // Enables TLS 1.3 early data. NET_EXPORT extern const base::Feature kEnableTLS13EarlyData; @@ -81,7 +81,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -211,6 +211,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -214,6 +214,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } #if defined(OS_ANDROID) diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index 57cb7b3e..cb27840b 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,7 +17,7 @@ See also: 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 -@@ -3174,6 +3174,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3288,6 +3288,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDeprecateLowUsageCodecsName, flag_descriptions::kDeprecateLowUsageCodecsDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, @@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -605,6 +605,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = +@@ -664,6 +664,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = "authenticator (if available) to verify card ownership when retrieving " "credit cards from Google Payments."; @@ -48,7 +48,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 -@@ -371,6 +371,9 @@ extern const char kEnableAutofillAddressSavePromptDescription[]; +@@ -402,6 +402,9 @@ extern const char kEnableAutofillAddressSavePromptDescription[]; extern const char kEnableAutofillCreditCardAblationExperimentDisplayName[]; extern const char kEnableAutofillCreditCardAblationExperimentDescription[]; @@ -61,7 +61,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl --- a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl +++ b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl -@@ -147,10 +147,6 @@ public abstract class ChromeSwitches {{ +@@ -141,10 +141,6 @@ public abstract class ChromeSwitches {{ /** Switch for enabling the Chrome Survey. Only works when UMA is accepted. */ public static final String CHROME_FORCE_ENABLE_SURVEY = "force-enable-chrome-survey"; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmp diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc -@@ -340,6 +340,9 @@ const char kHomePage[] = "homepage"; +@@ -348,6 +348,9 @@ const char kHomePage[] = "homepage"; // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; @@ -88,7 +88,7 @@ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h -@@ -114,6 +114,7 @@ extern const char kForceStackedTabStripLayout[]; +@@ -115,6 +115,7 @@ extern const char kForceStackedTabStripLayout[]; extern const char kHideCrashRestoreBubble[]; extern const char kHomePage[]; extern const char kIncognito[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index a9c61d7f..44cde2d9 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -23,7 +23,7 @@ for SimpleURLLoaders as well. chrome/browser/resources/proxy_config.js | 266 +++++++++++ chrome/browser/ui/BUILD.gn | 2 + .../webui/chrome_web_ui_controller_factory.cc | 3 + - chrome/browser/ui/webui/proxy_config_ui.cc | 417 ++++++++++++++++++ + chrome/browser/ui/webui/proxy_config_ui.cc | 416 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.h | 33 ++ chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 2 + @@ -33,7 +33,7 @@ for SimpleURLLoaders as well. .../proxy_config/proxy_config_dictionary.h | 7 +- net/proxy_resolution/proxy_config.cc | 52 ++- net/proxy_resolution/proxy_config.h | 3 + - 24 files changed, 996 insertions(+), 14 deletions(-) + 24 files changed, 995 insertions(+), 14 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js @@ -43,9 +43,9 @@ for SimpleURLLoaders as well. diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml +++ b/chrome/android/java/res/values/values.xml -@@ -29,6 +29,9 @@ - 0 - 1 +@@ -25,6 +25,9 @@ + + true + Proxy configuration + chrome://proxy @@ -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 -@@ -364,6 +364,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -363,6 +363,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 -@@ -101,6 +101,12 @@ +@@ -92,6 +92,12 @@ @@ -173,7 +173,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 -@@ -158,6 +158,8 @@ +@@ -160,6 +160,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -182,7 +182,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 -@@ -786,6 +788,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -902,6 +904,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { PluginsResourceService::RegisterPrefs(registry); #endif @@ -194,7 +194,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 -@@ -159,7 +159,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { SetValue( proxy_config::prefs::kProxy, std::make_unique(ProxyConfigDictionary::CreateFixedServers( @@ -627,7 +627,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 -@@ -256,6 +256,8 @@ static_library("ui") { +@@ -263,6 +263,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -647,7 +647,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" -@@ -600,6 +601,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -614,6 +615,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -660,7 +660,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/proxy_config_ui.cc -@@ -0,0 +1,417 @@ +@@ -0,0 +1,416 @@ +/* + This file is part of Bromite. + @@ -691,7 +691,6 @@ new file mode 100644 +#include "base/lazy_instance.h" +#include "base/macros.h" +#include "base/memory/ref_counted.h" -+#include "base/scoped_observer.h" +#include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" +#include "base/values.h" @@ -1128,15 +1127,15 @@ 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"; -@@ -336,6 +338,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { - kChromeUIMobileSetupHost, - kChromeUIMultiDeviceSetupHost, - kChromeUINetworkHost, -+ kChromeUIProxyConfigHost, - kChromeUIOobeHost, - kChromeUIOSCreditsHost, - kChromeUIOSSettingsHost, -@@ -553,6 +556,7 @@ const char* const kChromeHostURLs[] = { +@@ -344,6 +346,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { + kChromeUIMobileSetupHost, + kChromeUIMultiDeviceSetupHost, + kChromeUINetworkHost, ++ kChromeUIProxyConfigHost, + kChromeUIOobeHost, + kChromeUIOSCreditsHost, + kChromeUIOSSettingsHost, +@@ -567,6 +570,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1147,7 +1146,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 -@@ -120,6 +120,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -122,6 +122,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -1159,7 +1158,7 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc --- a/components/policy/core/browser/proxy_policy_handler.cc +++ b/components/policy/core/browser/proxy_policy_handler.cc -@@ -197,7 +197,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, +@@ -210,7 +210,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, bypass_list->GetAsString(&bypass_list_string); prefs->SetValue(proxy_config::prefs::kProxy, ProxyConfigDictionary::CreateFixedServers( diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 1fced4b0..d1ebab01 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -140,7 +140,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -58,6 +58,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; +@@ -56,6 +56,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; import org.chromium.base.task.PostTask; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -148,22 +148,22 @@ 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; -@@ -1736,8 +1737,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1886,6 +1887,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -205,10 +205,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; - import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; -@@ -408,6 +409,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { + import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; +@@ -409,6 +410,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -219,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -426,6 +431,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -427,6 +432,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -227,7 +227,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); } -@@ -450,7 +456,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -451,7 +457,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -274,7 +274,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 -@@ -48,6 +48,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; +@@ -50,6 +50,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.device.mojom.ScreenOrientationLockType; @@ -284,7 +284,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; -@@ -772,7 +775,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -727,7 +730,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -296,7 +296,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/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java -@@ -38,6 +38,9 @@ import org.chromium.ui.base.PageTransition; +@@ -34,6 +34,9 @@ import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; @@ -306,7 +306,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab /** * This class attempts to preload the tab if the url is known from the intent when the profile * is created. This is done to improve startup latency. -@@ -195,10 +198,15 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse +@@ -185,17 +188,22 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse Intent intent = mIntentSupplier.get(); GURL url = UrlFormatter.fixupUrl(getUrlFromIntent(intent)); @@ -322,9 +322,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab + isIncognito ? profile.getPrimaryOTRProfile(true /* createIfNeeded */) : profile, + false); - mLoadUrlParams = new LoadUrlParams(url.getValidSpecOrEmpty()); - String referrer = IntentHandler.getReferrerUrlIncludingExtraHeaders(intent); -@@ -212,7 +220,7 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse + mLoadUrlParams = mIntentHandler.createLoadUrlParamsForIntent(url.getSpec(), intent); + // Create a detached tab, but don't add it to the tab model yet. We'll do that // later if the loadUrlParams etc... match. mTab = TabBuilder.createLiveTab(false) @@ -347,7 +346,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -47,6 +47,10 @@ import org.chromium.url.GURL; +@@ -44,6 +44,10 @@ import org.chromium.url.GURL; import java.nio.ByteBuffer; @@ -358,7 +357,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** * This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ -@@ -77,6 +81,7 @@ public class ChromeTabCreator extends TabCreator { +@@ -74,6 +78,7 @@ public class ChromeTabCreator extends TabCreator { private final Activity mActivity; private final StartupTabPreloader mStartupTabPreloader; private final boolean mIncognito; @@ -366,7 +365,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome private WindowAndroid mNativeWindow; private TabModel mTabModel; -@@ -99,6 +104,10 @@ public class ChromeTabCreator extends TabCreator { +@@ -96,6 +101,10 @@ public class ChromeTabCreator extends TabCreator { mNativeWindow = nativeWindow; mTabDelegateFactorySupplier = tabDelegateFactory; mIncognito = incognito; @@ -377,7 +376,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mOverviewNTPCreator = overviewNTPCreator; mAsyncTabParamsManager = asyncTabParamsManager; mTabModelSelectorSupplier = tabModelSelectorSupplier; -@@ -262,6 +271,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -259,6 +268,8 @@ public class ChromeTabCreator extends TabCreator { if (creationState == TabCreationState.LIVE_IN_FOREGROUND && !openInForeground) { creationState = TabCreationState.LIVE_IN_BACKGROUND; } @@ -386,7 +385,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return tab; } finally { -@@ -296,6 +307,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -293,6 +304,8 @@ public class ChromeTabCreator extends TabCreator { @TabCreationState int creationState = openInForeground ? TabCreationState.LIVE_IN_FOREGROUND : TabCreationState.LIVE_IN_BACKGROUND; @@ -395,15 +394,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return true; } -@@ -339,7 +352,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -333,7 +346,6 @@ public class ChromeTabCreator extends TabCreator { // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome. - public Tab launchUrlFromExternalApp(String url, String referer, String headers, String appId, - boolean forceNewTab, Intent intent, long intentTimestamp) { + public Tab launchUrlFromExternalApp( + LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { - assert !mIncognito; + // Don't re-use tabs for intents from Chrome. Note that this can be spoofed so shouldn't be + // relied on for anything security sensitive. boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName()); - - if (forceNewTab && !isLaunchedFromChrome) { -@@ -453,6 +465,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -428,6 +440,8 @@ public class ChromeTabCreator extends TabCreator { .setSerializedCriticalPersistedTabData(serializedCriticalPersistedTabData) .build(); } @@ -449,7 +448,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java -@@ -27,6 +27,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras; +@@ -28,6 +28,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.components.browser_ui.widget.TintedDrawable; @@ -460,15 +459,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI * Stores info about a web app. */ @@ -41,6 +44,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider - private final @ActivityType int mActivityType; private final Intent mIntent; + private final ColorProviderImpl mColorProvider; + private boolean mIsIncognito = false; + /** * Returns the toolbar color to use if a custom color is not specified by the webapp. */ -@@ -63,6 +68,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -62,6 +67,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider mWebappExtras = webappExtras; mWebApkExtras = webApkExtras; mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP; @@ -479,7 +478,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI } @Override -@@ -155,6 +164,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -150,6 +159,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider return mWebApkExtras; } @@ -494,7 +493,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 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 -@@ -422,7 +422,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -433,7 +433,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -506,7 +505,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -908,6 +908,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -907,6 +907,13 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 86c329f3..47e096ef 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -11,13 +11,14 @@ Completely remove contacts picker permission from the file dialog .../org/chromium/base/ContentUriUtils.java | 32 ++ chrome/android/java/AndroidManifest.xml | 1 - .../res/menu/bookmark_action_bar_menu.xml | 14 + + .../browser/TabbedModeTabDelegateFactory.java | 5 +- .../browser/bookmarks/BookmarkActionBar.java | 12 + - .../browser/bookmarks/BookmarkActivity.java | 28 ++ + .../browser/bookmarks/BookmarkActivity.java | 30 ++ .../browser/bookmarks/BookmarkBridge.java | 277 +++++++++++++++++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../browser/bookmarks/BookmarkManager.java | 22 ++ .../browser/bookmarks/BookmarkPage.java | 8 +- - .../native_page/NativePageFactory.java | 2 +- + .../native_page/NativePageFactory.java | 11 +- chrome/browser/BUILD.gn | 11 +- chrome/browser/about_flags.cc | 6 + .../android/bookmarks/bookmark_bridge.cc | 284 ++++++++++++++++++ @@ -43,7 +44,7 @@ Completely remove contacts picker permission from the file dialog ui/shell_dialogs/select_file_dialog.h | 2 + .../select_file_dialog_android.cc | 6 + ui/shell_dialogs/select_file_dialog_android.h | 2 + - 37 files changed, 880 insertions(+), 23 deletions(-) + 38 files changed, 890 insertions(+), 29 deletions(-) diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc @@ -163,6 +164,35 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/ mShareDelegateSupplier; + private final Supplier mEphemeralTabCoordinatorSupplier; +@@ -72,7 +73,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { + + private NativePageFactory mNativePageFactory; + +- public TabbedModeTabDelegateFactory(Activity activity, ++ public TabbedModeTabDelegateFactory(ChromeActivity activity, + BrowserControlsVisibilityDelegate appBrowserControlsVisibilityDelegate, + Supplier shareDelegateSupplier, + Supplier ephemeralTabCoordinatorSupplier, diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java @@ -209,18 +239,19 @@ 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,10 @@ import org.chromium.chrome.browser.IntentHandler; +@@ -15,6 +15,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; +import org.chromium.ui.base.ActivityWindowAndroid; ++import org.chromium.ui.base.IntentRequestTracker; + +import org.chromium.ui.modaldialog.ModalDialogManager; +import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; /** * The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager} -@@ -24,6 +28,7 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -24,6 +29,7 @@ import org.chromium.components.embedder_support.util.UrlConstants; public class BookmarkActivity extends SnackbarActivity { private BookmarkManager mBookmarkManager; @@ -228,36 +259,39 @@ 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,6 +45,20 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -40,8 +46,23 @@ public class BookmarkActivity extends SnackbarActivity { if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL; mBookmarkManager.updateForUrl(url); setContentView(mBookmarkManager.getView()); + + final boolean listenToActivityState = true; -+ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState); -+ mWindowAndroid.restoreInstanceState(savedInstanceState); ++ IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this); ++ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, intentRequestTracker); ++ mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState); + mBookmarkManager.setWindow(mWindowAndroid, + new ModalDialogManager( + new AppModalPresenter(this), ModalDialogManager.ModalDialogType.APP)); -+ } -+ + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + -+ mWindowAndroid.saveInstanceState(outState); - } - ++ mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState); ++ } ++ @Override -@@ -56,6 +75,7 @@ public class BookmarkActivity extends SnackbarActivity { + protected void onDestroy() { + super.onDestroy(); +@@ -56,6 +77,7 @@ public class BookmarkActivity extends SnackbarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); -+ mWindowAndroid.onActivityResult(requestCode, resultCode, data); ++ mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data, mWindowAndroid); if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) { BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getStringExtra( INTENT_VISIT_BOOKMARK_ID)); -@@ -63,6 +83,14 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -63,6 +85,14 @@ public class BookmarkActivity extends SnackbarActivity { } } @@ -696,19 +730,63 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -101,7 +101,7 @@ public class NativePageFactory { +@@ -15,6 +15,7 @@ import org.chromium.base.jank_tracker.JankTracker; + import org.chromium.base.supplier.BooleanSupplier; + import org.chromium.base.supplier.DestroyableObservableSupplier; + import org.chromium.base.supplier.Supplier; ++import org.chromium.chrome.browser.app.ChromeActivity; + 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. + */ + public class NativePageFactory { +- private final Activity mActivity; ++ private final ChromeActivity mActivity; + private final BottomSheetController mBottomSheetController; + private final BrowserControlsManager mBrowserControlsManager; + private final Supplier mCurrentTabSupplier; +@@ -72,7 +73,7 @@ public class NativePageFactory { + + private NativePageBuilder mNativePageBuilder; + +- public NativePageFactory(@NonNull Activity activity, ++ public NativePageFactory(@NonNull ChromeActivity activity, + @NonNull BottomSheetController sheetController, + @NonNull BrowserControlsManager browserControlsManager, + @NonNull Supplier currentTabSupplier, +@@ -123,7 +124,7 @@ public class NativePageFactory { + + @VisibleForTesting + static class NativePageBuilder { +- private final Activity mActivity; ++ private final ChromeActivity mActivity; + private final BottomSheetController mBottomSheetController; + private final Supplier mUma; + private final BrowserControlsManager mBrowserControlsManager; +@@ -137,7 +138,7 @@ public class NativePageFactory { + private final JankTracker mJankTracker; + private final Supplier mToolbarSupplier; + +- public NativePageBuilder(Activity activity, Supplier uma, ++ public NativePageBuilder(ChromeActivity activity, Supplier uma, + BottomSheetController sheetController, + BrowserControlsManager browserControlsManager, Supplier currentTabSupplier, + Supplier snackbarManagerSupplier, +@@ -176,7 +177,7 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { - return new BookmarkPage(mActivity.getComponentName(), mActivity.getSnackbarManager(), - mActivity.getTabModelSelector().isIncognitoSelected(), -- new TabShim(tab, mActivity)); -+ new TabShim(tab, mActivity), mActivity); + return new BookmarkPage(mActivity.getComponentName(), mSnackbarManagerSupplier.get(), + mTabModelSelector.isIncognitoSelected(), +- new TabShim(tab, mBrowserControlsManager, mTabModelSelector)); ++ new TabShim(tab, mBrowserControlsManager, mTabModelSelector), mActivity); } protected NativePage buildDownloadsPage(Tab tab) { diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1839,6 +1839,13 @@ static_library("browser") { +@@ -1816,6 +1816,13 @@ static_library("browser") { "window_placement/window_placement_permission_context.h", ] @@ -722,7 +800,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2938,6 +2945,8 @@ static_library("browser") { +@@ -2922,6 +2929,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", @@ -731,7 +809,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", -@@ -3451,8 +3460,6 @@ static_library("browser") { +@@ -3446,8 +3455,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -743,9 +821,9 @@ 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 -@@ -7394,6 +7394,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kPlaybackSpeedButtonDescription, kOsAll, - FEATURE_VALUE_TYPE(media::kPlaybackSpeedButton)}, +@@ -7659,6 +7659,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kShareUsageRanking)}, + #endif + {"export-bookmarks-use-saf", + flag_descriptions::kBookmarksExportUseSafName, @@ -897,7 +975,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -542,6 +650,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -543,6 +651,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1177,7 +1255,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" -@@ -240,7 +241,12 @@ class Writer : public base::RefCountedThreadSafe { +@@ -230,7 +231,12 @@ class Writer : public base::RefCountedThreadSafe { // Opens the file, returning true on success. bool OpenFile() { int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE; @@ -1261,7 +1339,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 -@@ -5223,6 +5223,11 @@ const char kWebrtcPipeWireCapturerDescription[] = +@@ -5497,6 +5497,11 @@ const char kWebrtcPipeWireCapturerDescription[] = "capturing the desktop content on the Wayland display server."; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1276,7 +1354,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 -@@ -3073,6 +3073,9 @@ extern const char kWebrtcPipeWireCapturerName[]; +@@ -3207,6 +3207,9 @@ extern const char kWebrtcPipeWireCapturerName[]; extern const char kWebrtcPipeWireCapturerDescription[]; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1289,7 +1367,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 -@@ -151,6 +151,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -156,6 +156,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBackgroundThreadPool, &kBentoOffline, &kBookmarkBottomSheet, @@ -1297,9 +1375,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -760,6 +761,10 @@ const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", - const base::Feature kWebNotesStylize{"WebNotesStylize", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -774,6 +775,10 @@ const base::Feature kWebOtpCrossDeviceSimpleString{ + const base::Feature kWebApkInstallCompleteNotification{ + "WebApkInstallCompleteNotification", base::FEATURE_DISABLED_BY_DEFAULT}; +// disabled by default because of an issue on Android 6.0 +const base::Feature kBookmarksExportUseSaf{"BookmarksExportUseSaf", @@ -1311,7 +1389,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 -@@ -142,6 +142,7 @@ extern const base::Feature kToolbarMicIphAndroid; +@@ -140,6 +140,7 @@ extern const base::Feature kToolbarMicIphAndroid; extern const base::Feature kToolbarUseHardwareBitmapDraw; extern const base::Feature kTrustedWebActivityLocationDelegation; extern const base::Feature kTrustedWebActivityNewDisclosure; @@ -1322,10 +1400,10 @@ 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 -@@ -513,6 +513,7 @@ public abstract class ChromeFeatureList { - public static final String WEBNOTES_STYLIZE = "WebNotesStylize"; - public static final String WIPE_DATA_ON_CHILD_ACCOUNT_SIGNIN = "WipeDataOnChildAccountSignin"; +@@ -541,6 +541,7 @@ public abstract class ChromeFeatureList { + "WebApkInstallCompleteNotification"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; + public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; + public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf"; @NativeMethods @@ -1391,7 +1469,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 -@@ -117,6 +117,8 @@ public final class ChromePreferenceKeys { +@@ -121,6 +121,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"; @@ -1400,7 +1478,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1012,6 +1014,7 @@ public final class ChromePreferenceKeys { +@@ -1027,6 +1029,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1439,7 +1517,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 -@@ -408,6 +408,9 @@ static_library("common") { +@@ -412,6 +412,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1447,8 +1525,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn + "importer/imported_bookmark_entry.cc", + "importer/imported_bookmark_entry.h", ] - deps += [ "//components/embedder_support/android/common:url_constants" ] } else { + # Non-Android. diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -1461,7 +1539,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -186,6 +184,11 @@ static_library("utility") { +@@ -181,6 +179,11 @@ static_library("utility") { } } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index f7a62d8e..4c9184ce 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -286,6 +288,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -285,6 +287,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4225,6 +4225,13 @@ 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 90abceab..528eca5c 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -37,7 +37,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 -@@ -199,6 +199,8 @@ import java.lang.annotation.RetentionPolicy; +@@ -200,6 +200,8 @@ import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Locale; @@ -46,7 +46,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. -@@ -1947,6 +1949,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2317,6 +2318,11 @@ public abstract class ChromeActivity return true; } @@ -97,7 +97,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 -@@ -3085,6 +3085,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Turn on Request desktop site diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 531b961d..ff005343 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -6,16 +6,16 @@ Adds a flag that restricts whether search history, clipboard, bookmarks and internal chrome:// pages will be used for the autocomplete results. --- chrome/browser/about_flags.cc | 21 +++++++++++++++++++ - .../browser/autocomplete_controller.cc | 10 +++++++++ + .../browser/autocomplete_controller.cc | 11 ++++++++++ .../omnibox/browser/history_url_provider.cc | 3 +++ components/omnibox/browser/search_provider.cc | 4 ++++ - components/url_formatter/url_fixer.cc | 3 +++ - 5 files changed, 41 insertions(+) + components/url_formatter/url_fixer.cc | 4 ++++ + 5 files changed, 43 insertions(+) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -531,6 +531,22 @@ const FeatureEntry::FeatureVariation +@@ -507,6 +507,22 @@ const FeatureEntry::FeatureVariation }; #endif // OS_ANDROID @@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if defined(OS_ANDROID) const FeatureEntry::FeatureParam kHideDismissButton[] = { {"dismiss_button", "hide"}}; -@@ -4784,6 +4800,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4881,6 +4897,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -49,19 +49,20 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ defined(OS_CHROMEOS) - {"direct-manipulation-stylus", + {"webui-feedback", flag_descriptions::kWebuiFeedbackName, diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -15,6 +15,7 @@ +@@ -15,6 +15,8 @@ #include "base/bind.h" #include "base/check_op.h" ++#include "base/containers/contains.h" +#include "base/command_line.h" #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" -@@ -275,6 +276,15 @@ AutocompleteController::AutocompleteController( +@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteController( search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -101,7 +102,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ #include "base/feature_list.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -643,6 +644,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { @@ -114,15 +115,16 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -9,6 +9,7 @@ +@@ -9,6 +9,8 @@ #include #include "base/check_op.h" ++#include "base/containers/contains.h" +#include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/ranges/algorithm.h" -@@ -607,6 +608,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) { +@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) { FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index b866316c..0e2623d4 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 -@@ -4509,6 +4509,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4627,6 +4627,9 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if defined(OS_ANDROID) @@ -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 -@@ -1021,6 +1021,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1087,6 +1087,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; @@ -41,7 +41,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -576,6 +576,9 @@ extern const char kDiagnosticsAppDescription[]; +@@ -600,6 +600,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -71,28 +71,28 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -156,6 +156,10 @@ const base::FeatureParam - const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch", - base::FEATURE_DISABLED_BY_DEFAULT}; + "DisabledProviders", ""}; + // Disable special treatment on requests with keepalive set (see +// Enable save-data header seprately, without enabled data reduction service +const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader", + base::FEATURE_DISABLED_BY_DEFAULT}; + - // Controls whether a |request_initiator| that mismatches - // |request_initiator_origin_lock| leads to 1) failing the HTTP request and 2) - // calling mojo::ReportBadMessage (on desktop platforms, where NetworkService + // https://fetch.spec.whatwg.org/#request-keepalive-flag). This is introduced + // for investigation on the memory usage, and should not be enabled widely. + const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch", 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 @@ -60,6 +60,8 @@ extern const base::FeatureParam COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDisableKeepaliveFetch; - COMPONENT_EXPORT(NETWORK_CPP) + +extern const base::Feature kEnableSaveDataHeader; +COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kRequestInitiatorSiteLockEnfocement; - COMPONENT_EXPORT(NETWORK_CPP) + extern const base::Feature kTrustTokens; + -- 2.17.1 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 125f78bc..c54bf596 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 -@@ -882,6 +882,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -866,6 +866,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 == -@@ -3824,6 +3829,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3932,6 +3937,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 -@@ -1516,6 +1516,10 @@ const char kMediaHistoryDescription[] = +@@ -1571,6 +1571,10 @@ const char kMediaHistoryDescription[] = "Enables Media History which records data around media playbacks on " "websites."; @@ -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 -@@ -886,6 +886,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -905,6 +905,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; @@ -122,17 +122,17 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc @@ -20,6 +20,10 @@ + #include "net/socket/client_socket_handle.h" + #include "net/socket/client_socket_pool.h" #include "net/socket/connect_job.h" - #include "net/ssl/ssl_config.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#include "components/network_session_configurator/common/network_switches.h" + +#include "base/command_line.h" +#include "base/strings/string_number_conversions.h" - - namespace net { - -@@ -187,6 +191,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( + #include "net/ssl/ssl_config.h" + #include "third_party/abseil-cpp/absl/types/optional.h" + #include "url/gurl.h" +@@ -173,6 +177,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( int ClientSocketPoolManager::max_sockets_per_group( HttpNetworkSession::SocketPoolType pool_type) { DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); 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 16ebb5cb..38bef610 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 -@@ -2717,6 +2717,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2813,6 +2813,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 -@@ -1098,6 +1098,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1172,6 +1172,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 -@@ -628,6 +628,9 @@ extern const char kEnablePortalsDescription[]; +@@ -662,6 +662,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 6811e91c..8cb520f3 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 -@@ -4760,6 +4760,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4851,6 +4851,11 @@ const FeatureEntry kFeatureEntries[] = { #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || // defined(OS_CHROMEOS) @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3003,6 +3003,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -3150,6 +3150,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -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 -@@ -688,6 +688,9 @@ extern const char kEnableWasmSimdName[]; +@@ -722,6 +722,9 @@ extern const char kEnableWasmSimdName[]; extern const char kEnableWasmSimdDescription[]; extern const char kEnableWasmTieringName[]; @@ -101,7 +101,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 -@@ -95,6 +95,7 @@ +@@ -97,6 +97,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" -@@ -3366,8 +3367,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3362,8 +3363,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -128,7 +128,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 -@@ -40,6 +40,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -42,6 +42,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kThrottleDelayable{"ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index e5141d02..fb4b8c40 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,20 +11,20 @@ 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 -@@ -2765,6 +2765,9 @@ const FeatureEntry kFeatureEntries[] = { - {"clear-old-browsing-data", flag_descriptions::kClearOldBrowsingDataName, - flag_descriptions::kClearOldBrowsingDataDescription, kOsAndroid, - FEATURE_VALUE_TYPE(features::kClearOldBrowsingData)}, +@@ -2753,6 +2753,9 @@ const FeatureEntry::FeatureVariation kContinuousSearchFeatureVariations[] = { + // 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 + {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName, + flag_descriptions::kDisableWebGLDescription, kOsAll, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)}, - #endif // OS_ANDROID - #if BUILDFLAG(ENABLE_NACL) - {"enable-nacl", flag_descriptions::kNaclName, + // //tools/flags/generate_unexpire_flags.py. + #include "build/chromeos_buildflags.h" + #include "chrome/browser/unexpire_flags_gen.inc" 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 -@@ -583,6 +583,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; +@@ -642,6 +642,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; const char kEnableAudioFocusEnforcementDescription[] = "Enables enforcement of a single media session having audio focus at " "any one time. Requires #enable-media-session-service to be enabled too."; @@ -38,16 +38,16 @@ 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 -@@ -356,6 +356,9 @@ extern const char kDocumentTransitionDescription[]; - - extern const char kEnableAccessibilityObjectModelName[]; - extern const char kEnableAccessibilityObjectModelDescription[]; +@@ -356,6 +356,9 @@ extern const char kForceColorProfileSRGB[]; + extern const char kForceColorProfileP3[]; + extern const char kForceColorProfileColorSpin[]; + extern const char kForceColorProfileSCRGBLinear[]; +extern const char kDisableWebGLName[]; +extern const char kDisableWebGLDescription[]; + + extern const char kForceColorProfileHDR10[]; - extern const char kEnableAudioFocusEnforcementName[]; - extern const char kEnableAudioFocusEnforcementDescription[]; + extern const char kForceColorProfileName[]; -- 2.17.1 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 7360ea78..ab7fcbfb 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 -@@ -2708,6 +2708,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2807,6 +2807,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 -@@ -3119,6 +3119,12 @@ const char kIntentBlockExternalFormRedirectsNoGestureDescription[] = +@@ -3280,6 +3280,12 @@ const char kIntentBlockExternalFormRedirectsNoGestureDescription[] = "Require a user gesture that triggered a form submission in order to " "allow for redirecting to an external intent."; @@ -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 -@@ -1810,6 +1810,9 @@ extern const char kInstantStartDescription[]; +@@ -1883,6 +1883,9 @@ extern const char kInstantStartDescription[]; extern const char kIntentBlockExternalFormRedirectsNoGestureName[]; extern const char kIntentBlockExternalFormRedirectsNoGestureDescription[]; diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index b5245edc..aec7411c 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc -@@ -29,6 +29,9 @@ +@@ -27,6 +27,9 @@ #include "chrome/browser/android/feed/v2/feed_service_factory.h" #include "components/feed/core/v2/public/feed_api.h" #include "components/feed/core/v2/public/feed_service.h" @@ -96,7 +96,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" -@@ -277,6 +280,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -275,6 +278,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -110,7 +110,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return NULL; -@@ -284,6 +294,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -282,6 +292,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -135,7 +135,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor namespace history { struct HistoryAddPageArgs; -@@ -51,6 +53,8 @@ class HistoryTabHelper : public content::WebContentsObserver, +@@ -39,6 +41,8 @@ class HistoryTabHelper : public content::WebContentsObserver, force_eligibile_tab_for_testing_ = force; } @@ -147,7 +147,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor 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 -@@ -210,6 +210,8 @@ +@@ -213,6 +213,8 @@ #endif #if defined(OS_ANDROID) @@ -156,18 +156,18 @@ 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" -@@ -1083,6 +1085,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1197,6 +1199,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); + HistoryTabHelper::RegisterProfilePrefs(registry); feed::RegisterProfilePrefs(registry); - #else // defined(OS_ANDROID) + #else // defined(OS_ANDROID) AppShortcutManager::RegisterProfilePrefs(registry); 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 -@@ -933,6 +933,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -932,6 +932,12 @@ Your Google account may have other forms of browsing history like searches and a Opens links in incognito tabs when you click on new tab or on a link @@ -183,7 +183,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 -@@ -3159,6 +3159,11 @@ const char kLacrosAllowed[] = "lacros_allowed"; +@@ -3154,6 +3154,11 @@ const char kLacrosAllowed[] = "lacros_allowed"; const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -198,9 +198,9 @@ 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 -@@ -1147,6 +1147,10 @@ extern const char kPdfAnnotationsEnabled[]; - - extern const char kExplicitlyAllowedNetworkPorts[]; +@@ -1157,6 +1157,10 @@ extern const char kDeviceAttributesAllowedForOrigins[]; + extern const char kDesktopSharingHubEnabled[]; + #endif +#if defined(OS_ANDROID) +extern const char kIncognitoTabHistoryEnabled[]; 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 e57c2e55..1e6c5d29 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -9,7 +9,7 @@ Subject: Add menu item to bookmark all tabs .../browser/bookmarks/BookmarkUtils.java | 4 ++ .../android/bookmarks/bookmark_bridge.cc | 17 +++++ .../android/bookmarks/bookmark_bridge.h | 4 ++ - .../browser/bookmarks/bookmark_html_writer.cc | 10 +++ + .../browser/bookmarks/bookmark_html_writer.cc | 8 ++- .../bookmarks/chrome_bookmark_client.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- .../strings/android_chrome_strings.grd | 3 + @@ -23,7 +23,7 @@ Subject: Add menu item to bookmark all tabs components/bookmarks/browser/bookmark_node.cc | 13 ++++ components/bookmarks/browser/bookmark_node.h | 5 ++ components/bookmarks/browser/model_loader.cc | 3 +- - 20 files changed, 208 insertions(+), 14 deletions(-) + 20 files changed, 205 insertions(+), 15 deletions(-) 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 @@ -52,16 +52,16 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -70,6 +70,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; +@@ -68,6 +68,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; import org.chromium.chrome.browser.app.tabmodel.TabbedModeTabModelOrchestrator; +import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; + import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; - import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; -@@ -1959,6 +1961,8 @@ public class ChromeTabbedActivity extends ChromeActivity topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -243,7 +243,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -533,6 +534,9 @@ public class BookmarkUtils { +@@ -534,6 +535,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -311,22 +311,27 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc -@@ -212,6 +212,14 @@ class Writer : public base::RefCountedThreadSafe { +@@ -186,6 +186,8 @@ class Writer : public base::RefCountedThreadSafe { + roots->FindDictKey(BookmarkCodec::kOtherBookmarkFolderNameKey); + base::Value* mobile_folder_value = + roots->FindDictKey(BookmarkCodec::kMobileBookmarkFolderNameKey); ++ base::Value* tabs_collection_value = ++ roots->FindDictKey(BookmarkCodec::kTabsBookmarkFolderNameKey); + DCHECK(root_folder_value); + DCHECK(other_folder_value); + DCHECK(mobile_folder_value); +@@ -197,7 +199,9 @@ class Writer : public base::RefCountedThreadSafe { + !WriteNode(*static_cast(other_folder_value), + BookmarkNode::OTHER_NODE) || + !WriteNode(*static_cast(mobile_folder_value), +- BookmarkNode::MOBILE)) { ++ BookmarkNode::MOBILE) || ++ !WriteNode(*static_cast(tabs_collection_value), ++ BookmarkNode::TABS_COLLECTION)) { + NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes); return; } - -+ base::Value* tabs_collection_value = nullptr; -+ if (roots_d_value->Get(BookmarkCodec::kTabsBookmarkFolderNameKey, -+ &tabs_collection_value) && -+ tabs_collection_value->type() == base::Value::Type::DICTIONARY) { -+ WriteNode(*static_cast(tabs_collection_value), -+ BookmarkNode::TABS_COLLECTION); -+ } -+ - DecrementIndent(); - - Write(kFolderChildrenEnd); -@@ -484,6 +492,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { +@@ -464,6 +468,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { BookmarkModelFactory::GetForBrowserContext(profile_)->other_node()); ExtractUrls( BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); @@ -371,7 +376,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3155,6 +3155,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -407,7 +412,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 -@@ -32,6 +32,7 @@ const char BookmarkCodec::kRootFolderNameKey[] = "bookmark_bar"; +@@ -33,6 +33,7 @@ const char BookmarkCodec::kRootFolderNameKey[] = "bookmark_bar"; const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other"; // The value is left as 'synced' for historical reasons. const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced"; @@ -415,9 +420,9 @@ 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 @@ std::unique_ptr BookmarkCodec::Encode( - BookmarkModel* model, - const std::string& sync_metadata_str) { +@@ -62,7 +63,8 @@ BookmarkCodec::~BookmarkCodec() = default; + base::Value BookmarkCodec::Encode(BookmarkModel* model, + const 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(), @@ -425,7 +430,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar sync_metadata_str); } -@@ -70,6 +72,7 @@ std::unique_ptr BookmarkCodec::Encode( +@@ -70,6 +72,7 @@ base::Value BookmarkCodec::Encode( const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, @@ -433,14 +438,14 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const BookmarkNode::MetaInfoMap* model_meta_info_map, const std::string& sync_metadata_str) { ids_reassigned_ = false; -@@ -79,6 +82,7 @@ std::unique_ptr BookmarkCodec::Encode( - roots->Set(kRootFolderNameKey, EncodeNode(bookmark_bar_node)); - roots->Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node)); - roots->Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node)); -+ roots->Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node)); +@@ -79,6 +82,7 @@ base::Value BookmarkCodec::Encode( + roots.SetKey(kRootFolderNameKey, 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->Set(kMetaInfo, EncodeMetaInfo(*model_meta_info_map)); - auto main = std::make_unique(); + 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, BookmarkNode* bb_node, BookmarkNode* other_folder_node, @@ -474,28 +479,28 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar *max_id = maximum_id_ + 1; return success; } -@@ -173,6 +180,7 @@ std::unique_ptr BookmarkCodec::EncodeMetaInfo( +@@ -172,6 +179,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, + BookmarkNode* tabs_folder_node, const base::Value& value, std::string* sync_metadata_str) { - const base::DictionaryValue* d_value = nullptr; -@@ -212,6 +220,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, - DecodeNode(*root_folder_d_value, nullptr, bb_node); - DecodeNode(*other_folder_d_value, nullptr, other_folder_node); + 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); -+ const base::Value* tabs_folder_value; + const base::DictionaryValue* tabs_folder_d_value = nullptr; -+ if (roots_d_value->Get(kTabsBookmarkFolderNameKey, &tabs_folder_value) && -+ tabs_folder_value->GetAsDictionary(&tabs_folder_d_value)) ++ 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. -@@ -457,11 +471,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( +@@ -447,11 +461,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -513,15 +518,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 -@@ -50,6 +50,7 @@ class BookmarkCodec { - 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); +@@ -46,6 +46,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); -@@ -62,6 +63,7 @@ class BookmarkCodec { +@@ -58,6 +59,7 @@ class BookmarkCodec { BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -529,7 +534,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark int64_t* max_node_id, std::string* sync_metadata_str); -@@ -107,6 +109,7 @@ class BookmarkCodec { +@@ -103,6 +105,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[]; @@ -537,7 +542,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark // Possible values for kTypeKey. static const char kTypeURL[]; -@@ -124,6 +127,7 @@ class BookmarkCodec { +@@ -119,6 +122,7 @@ class BookmarkCodec { bool DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -545,7 +550,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark const base::Value& value, std::string* sync_metadata_str); -@@ -134,7 +138,8 @@ class BookmarkCodec { +@@ -130,7 +134,8 @@ class BookmarkCodec { // Reassigns bookmark IDs for all nodes. void ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -591,7 +596,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc -@@ -561,7 +561,7 @@ bool BookmarkModel::HasBookmarks() { +@@ -562,7 +562,7 @@ bool BookmarkModel::HasBookmarks() { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -600,7 +605,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) { -@@ -796,6 +796,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -802,6 +802,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { bookmark_bar_node_ = details->bb_node(); other_node_ = details->other_folder_node(); mobile_node_ = details->mobile_folder_node(); @@ -624,7 +629,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark bool is_root_node(const BookmarkNode* node) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return node == root_; -@@ -389,6 +395,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -391,6 +397,7 @@ class BookmarkModel : public BookmarkUndoProvider, BookmarkPermanentNode* bookmark_bar_node_ = nullptr; BookmarkPermanentNode* other_node_ = nullptr; BookmarkPermanentNode* mobile_node_ = nullptr; diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 809e566e..a8a2be40 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -41,24 +41,24 @@ 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 -@@ -1982,6 +1982,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2443,6 +2443,11 @@ public abstract class ChromeActivity return true; } + if (id == R.id.view_source_id) { -+ currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString())); ++ currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrl().getSpec())); + return true; + } + @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App + protected void updateViewSourceMenuItem( + Menu menu, Tab currentTab) { + MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id); -+ String url = currentTab.getUrlString(); ++ String url = currentTab.getUrl().getSpec(); + viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:")); + } + @@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -222,6 +222,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -214,6 +214,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat } updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible); @@ -110,7 +110,7 @@ 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 -@@ -293,6 +293,10 @@ CHAR_LIMIT guidelines: +@@ -299,6 +299,10 @@ CHAR_LIMIT guidelines: Sign-in verifications diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 039dbb76..2daec393 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -5,11 +5,11 @@ Subject: Add option to force tablet UI --- .../android/java/res/xml/accessibility_preferences.xml | 5 +++++ .../accessibility/settings/AccessibilitySettings.java | 10 ++++++++++ - .../chrome/browser/omnibox/LocationBarCoordinator.java | 2 +- - .../browser/toolbar/top/ToolbarControlContainer.java | 2 +- .../browser/preferences/ChromePreferenceKeys.java | 1 + .../preferences/LegacyChromePreferenceKeys.java | 1 + + .../chrome/browser/omnibox/LocationBarCoordinator.java | 2 +- .../ui/android/strings/android_chrome_strings.grd | 6 ++++++ + .../browser/toolbar/top/ToolbarControlContainer.java | 2 +- components/BUILD.gn | 4 ++-- ui/android/BUILD.gn | 2 ++ .../src/org/chromium/ui/base/DeviceFormFactor.java | 5 +++++ @@ -64,34 +64,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.READER_FOR_ACCESSIBILITY, (Boolean) newValue); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -341,7 +341,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse - // OmniboxSuggestionsDropdownEmbedder implementation - @Override - public boolean isTablet() { -- return DeviceFormFactor.isWindowOnTablet(mWindowAndroid); -+ return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout(); - } - - @Override -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -110,7 +110,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con - // On tablet, draw a fake tab strip and toolbar until the compositor is - // ready to draw the real tab strip. (On phone, the toolbar is made entirely - // of Android views, which are already initialized.) -- setBackgroundResource(R.drawable.toolbar_background); -+// setBackgroundResource(R.drawable.toolbar_background); - } - } - 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 -@@ -506,6 +506,7 @@ public final class ChromePreferenceKeys { +@@ -540,6 +540,7 @@ public final class ChromePreferenceKeys { public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -110,10 +86,22 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM, ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI, +diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java ++++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +@@ -346,7 +346,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse + // OmniboxSuggestionsDropdownEmbedder implementation + @Override + public boolean isTablet() { +- return DeviceFormFactor.isWindowOnTablet(mWindowAndroid); ++ return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout(); + } + + @Override 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 -@@ -1188,6 +1188,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1194,6 +1194,12 @@ Your Google account may have other forms of browsing history like searches and a Turn off @@ -126,21 +114,33 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro +diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java ++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +@@ -109,7 +109,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con + // On tablet, draw a fake tab strip and toolbar until the compositor is + // ready to draw the real tab strip. (On phone, the toolbar is made entirely + // of Android views, which are already initialized.) +- setBackgroundResource(R.drawable.toolbar_background); ++// setBackgroundResource(R.drawable.toolbar_background); + } + } + diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -525,7 +525,7 @@ test("components_unittests") { +@@ -539,7 +539,7 @@ test("components_unittests") { - # On LaCrOS, tests use ash-chrome as a window manager, thus the dependency. + # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. - if (!is_chromeos_lacros) { + if (!is_chromeos_lacros && !is_android) { assert_no_deps = [ "//chrome/*" ] } -@@ -772,7 +772,7 @@ if (!is_ios && !is_fuchsia) { +@@ -786,7 +786,7 @@ if (!is_ios) { - # On LaCrOS, tests use ash-chrome as a window manager, thus the dependency. + # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. - if (!is_chromeos_lacros) { + if (!is_chromeos_lacros && !is_android) { @@ -150,7 +150,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -364,6 +364,8 @@ android_library("ui_no_recycler_view_java") { +@@ -369,6 +369,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 4def9663..e85620ec 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 -@@ -1175,8 +1175,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index f576c637..d00fbc3e 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -3,14 +3,22 @@ Date: Mon, 17 May 2021 12:30:12 +0000 Subject: Add support for ISupportHelpAndFeedback --- - .../chrome/browser/settings/SettingsActivity.java | 10 +++++++--- - .../components/browser_ui/settings/SettingsUtils.java | 4 ++++ - 2 files changed, 11 insertions(+), 3 deletions(-) + .../chrome/browser/settings/SettingsActivity.java | 11 ++++++++--- + .../components/browser_ui/settings/SettingsUtils.java | 4 ++++ + 2 files changed, 12 insertions(+), 3 deletions(-) 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 -@@ -282,9 +282,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -58,6 +58,7 @@ 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.settings.FragmentSettingsLauncher; + import org.chromium.components.browser_ui.settings.SettingsLauncher; ++import org.chromium.components.browser_ui.settings.SettingsUtils; + import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; + import org.chromium.ui.UiUtils; + +@@ -257,9 +258,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-vibration-flag.patch b/build/patches/Add-vibration-flag.patch index 98bc2895..51b24b26 100644 --- a/build/patches/Add-vibration-flag.patch +++ b/build/patches/Add-vibration-flag.patch @@ -18,7 +18,7 @@ Subject: Add vibration 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 -@@ -6263,6 +6263,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6342,6 +6342,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNotificationsViaHelperApp)}, #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 -@@ -5019,6 +5019,9 @@ const char kDefaultMeetWebAppDescription[] = +@@ -5311,6 +5311,9 @@ const char kDefaultMeetWebAppDescription[] = "Enables the Meet web app to be installed by default."; #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 -@@ -2934,6 +2934,9 @@ extern const char kDefaultMeetWebAppName[]; +@@ -3080,6 +3080,9 @@ extern const char kDefaultMeetWebAppName[]; extern const char kDefaultMeetWebAppDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -102,6 +102,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if defined(OS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -69,7 +69,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -87,6 +87,9 @@ const base::Feature kBackForwardCache{"BackForwardCache", +@@ -103,6 +103,9 @@ const base::Feature kBackForwardCacheSameSiteForBots{ // BackForwardCacheMemoryControls is enabled only on Android to disable // BackForwardCache for lower memory devices due to memory limiations. #if defined(OS_ANDROID) @@ -82,7 +82,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -256,6 +256,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; +@@ -267,6 +267,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) @@ -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 -@@ -89,6 +89,7 @@ class WebRuntimeFeatures { +@@ -90,6 +90,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation( bool); BLINK_PLATFORM_EXPORT static void EnableCacheInlineScriptCode(bool); @@ -105,7 +105,7 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc -@@ -29,6 +29,7 @@ +@@ -30,6 +30,7 @@ #include "third_party/blink/renderer/core/frame/navigator.h" #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/platform/mojo/mojo_helper.h" @@ -113,7 +113,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c // Maximum number of entries in a vibration pattern. const unsigned kVibrationPatternLengthMax = 99; -@@ -142,6 +143,8 @@ bool VibrationController::vibrate(Navigator& navigator, +@@ -149,6 +150,8 @@ bool VibrationController::vibrate(Navigator& navigator, // reference to |window| or |navigator| was retained in another window. if (!navigator.DomWindow()) return false; @@ -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 -@@ -186,6 +186,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -190,6 +190,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 -@@ -1476,6 +1476,10 @@ +@@ -1527,6 +1527,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 384f359e..80bdf586 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -3,14 +3,27 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200 Subject: Allow playing audio in background --- - media/blink/webmediaplayer_impl.cc | 12 +++++++++++- - media/blink/webmediaplayer_impl.h | 2 ++ - 2 files changed, 13 insertions(+), 1 deletion(-) + .../public/platform/media/web_media_player_impl.h | 3 +++ + .../renderer/platform/media/web_media_player_impl.cc | 12 +++++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) -diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc ---- a/media/blink/webmediaplayer_impl.cc -+++ b/media/blink/webmediaplayer_impl.cc -@@ -1112,6 +1112,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +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 +@@ -159,6 +159,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 +@@ -1118,6 +1118,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -21,9 +34,9 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp +} + void WebMediaPlayerImpl::EnabledAudioTracksChanged( - const blink::WebVector& enabledTrackIds) { + const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3471,7 +3477,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3490,7 +3496,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. @@ -36,18 +49,6 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp return false; if (using_media_player_renderer_ && -diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h ---- a/media/blink/webmediaplayer_impl.h -+++ b/media/blink/webmediaplayer_impl.h -@@ -158,6 +158,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl - // True if the loaded media has a playable video/audio track. - 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 blink::WebVector& enabledTrackIds) -- 2.17.1 diff --git a/build/patches/Allow-website-sign-in-without-account-sign-in.patch b/build/patches/Allow-website-sign-in-without-account-sign-in.patch index a0996c77..b43a723a 100644 --- a/build/patches/Allow-website-sign-in-without-account-sign-in.patch +++ b/build/patches/Allow-website-sign-in-without-account-sign-in.patch @@ -10,7 +10,7 @@ Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -122,7 +122,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( +@@ -127,7 +127,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( #if BUILDFLAG(ENABLE_DICE_SUPPORT) registry->RegisterBooleanPref(kDiceMigrationCompletePref, false); #endif diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index c72e0b3e..8b906848 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -46,7 +46,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -450,7 +450,9 @@ double AudioContext::baseLatency() const { +@@ -458,7 +458,9 @@ double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index e417f34a..0caf870f 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -14,11 +14,14 @@ Subject: Automated domain substitution ash/ash_strings.grd | 10 +- ash/assistant/assistant_setup_controller.cc | 2 +- ash/assistant/util/deep_link_util.cc | 16 +- - .../scanning/resources/scanning_app.html | 2 +- - .../scanning/resources/scanning_app.js | 2 +- .../quick_answers_controller_impl.cc | 2 +- + .../quick_answers_ui_controller.cc | 2 +- ash/resources/PRESUBMIT.py | 4 +- ...pcie_peripheral_notification_controller.cc | 2 +- + .../diagnostics_ui/resources/network_card.js | 2 +- + .../resources/routine_section.js | 2 +- + .../scanning/resources/scanning_app.html | 2 +- + ash/webui/scanning/resources/scanning_app.js | 2 +- base/PRESUBMIT.py | 4 +- base/android/jni_generator/PRESUBMIT.py | 2 +- base/android/resource_exclusions.gni | 2 +- @@ -34,7 +37,6 @@ Subject: Automated domain substitution build/android/gyp/util/diff_utils.py | 4 +- build/android/gyp/util/protoresources.py | 2 +- .../android/incremental_install/installer.py | 2 +- - build/android/pylib/base/result_sink.py | 2 +- build/android/pylib/constants/__init__.py | 2 +- build/android/pylib/device_settings.py | 8 +- build/android/pylib/dex/dex_parser.py | 6 +- @@ -66,6 +68,7 @@ Subject: Automated domain substitution build/skia_gold_common/PRESUBMIT.py | 2 +- build/toolchain/cros_toolchain.gni | 2 +- .../lib/common/perf_tests_results_helper.py | 2 +- + build/util/lib/results/result_sink.py | 2 +- build/whitespace_file.txt | 2 +- buildtools/README.txt | 4 +- buildtools/clang_format/README.txt | 6 +- @@ -74,12 +77,11 @@ Subject: Automated domain substitution ...roid_chrome_autofill_assistant_strings.grd | 2 +- chrome/android/java/src/PRESUBMIT.py | 2 +- chrome/android/webapk/PRESUBMIT.py | 2 +- - .../manifest/bound_manifest_config.json | 12 +- - .../javatest_manifest_config_delta.json | 2 +- + .../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 | 242 +- + chrome/app/generated_resources.grd | 248 +- chrome/app/google_chrome_strings.grd | 14 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -96,10 +98,13 @@ Subject: Automated domain substitution .../browser/ash/assistant/assistant_util.cc | 4 +- .../ash/attestation/attestation_ca_client.cc | 8 +- .../backdrop_wallpaper_handlers.cc | 6 +- + chrome/browser/ash/borealis/borealis_util.cc | 2 +- .../ash/child_accounts/child_user_service.cc | 2 +- .../resources/web_time_limit_error_page.html | 2 +- chrome/browser/ash/crostini/crostini_util.cc | 2 +- .../customization/customization_document.cc | 2 +- + .../enhanced_network_tts_constants.cc | 2 +- + .../file_manager/file_manager_string_util.cc | 12 +- chrome/browser/ash/hats/hats_dialog.cc | 2 +- .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../ash/login/marketing_backend_connector.cc | 4 +- @@ -108,28 +113,27 @@ Subject: Automated domain substitution .../ash/plugin_vm/plugin_vm_diagnostics.cc | 4 +- .../plugin_vm/plugin_vm_license_checker.cc | 4 +- .../browser/ash/plugin_vm/plugin_vm_util.cc | 6 +- + .../account_status_check_fetcher.cc | 6 +- + .../powerwash_requirements_checker.cc | 2 +- .../autofill/autofill_gstatic_reader.cc | 4 +- .../browser_switcher_service.cc | 2 +- chrome/browser/buildflags.gni | 2 +- chrome/browser/cart/cart_discount_fetcher.cc | 2 +- .../cart/cart_discount_link_fetcher.cc | 2 +- - chrome/browser/cart/cart_service.cc | 8 +- + chrome/browser/cart/cart_service.cc | 26 +- .../cart_domain_cart_url_mapping.json | 2 +- .../resources/cart_domain_name_mapping.json | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../chromeos/android_sms/android_sms_urls.cc | 16 +- - .../file_manager/private_api_drive.cc | 2 +- .../file_manager/private_api_misc.cc | 2 +- - .../file_manager/file_manager_string_util.cc | 12 +- .../first_run/drive_first_run_controller.cc | 4 +- - .../input_method/assistive_suggester.cc | 12 +- + .../input_method/assistive_suggester.cc | 18 +- .../dns_latency_routine.cc | 2 +- .../dns_resolution_routine.cc | 2 +- .../network_diagnostics_util.cc | 14 +- .../video_conferencing_routine.cc | 4 +- - .../chromeos/policy/heartbeat_scheduler.cc | 4 +- - .../policy/powerwash_requirements_checker.cc | 2 +- - .../remote_commands/crd_host_delegate.cc | 6 +- + .../device_command_start_crd_session_job.cc | 6 +- + .../policy/uploading/heartbeat_scheduler.cc | 4 +- chrome/browser/chromeos/u2f_notification.cc | 2 +- .../protocol_handler_registry.cc | 4 +- .../data_reduction_proxy_chrome_settings.cc | 4 +- @@ -138,10 +142,13 @@ Subject: Automated domain substitution .../connectors/connectors_service.cc | 4 +- .../file_system/signin_dialog_delegate.cc | 2 +- .../extension_request_notification.cc | 4 +- + .../signals/context_info_fetcher.cc | 4 +- ...e_js_error_report_processor_nonchromeos.cc | 4 +- .../cryptotoken_private_api.cc | 6 +- + .../enterprise_platform_keys_api.cc | 2 +- .../identity_launch_web_auth_flow_function.cc | 2 +- .../chrome_management_api_delegate.cc | 2 +- + .../api/platform_keys/platform_keys_api.cc | 2 +- .../chrome_extension_browser_constants.cc | 2 +- .../extensions/external_pref_loader.cc | 2 +- chrome/browser/extensions/install_signer.cc | 2 +- @@ -149,12 +156,12 @@ Subject: Automated domain substitution .../updater/chrome_update_client_config.cc | 2 +- .../floc_remote_permission_service.cc | 2 +- .../feedback/feedback_uploader_chrome.cc | 2 +- - chrome/browser/flag_descriptions.cc | 4 +- + chrome/browser/flag_descriptions.cc | 6 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- .../lacros/lacros_startup_infobar_delegate.cc | 4 +- .../service_discovery_client_mac.mm | 4 +- - .../cast/cast_media_route_provider.cc | 4 +- + .../cast/cast_media_route_provider.cc | 6 +- .../dial/dial_media_route_provider.cc | 12 +- .../media/webrtc/webrtc_browsertest_common.cc | 2 +- .../media/webrtc/webrtc_event_log_uploader.cc | 2 +- @@ -164,11 +171,13 @@ Subject: Automated domain substitution .../instantmessaging/constants.h | 4 +- .../network_traversal_ice_config_fetcher.cc | 12 +- .../tachyon_ice_config_fetcher.cc | 12 +- + .../modules/drive/drive_service.cc | 8 +- .../notification_platform_bridge_mac.mm | 2 +- - ...uction_proxy_metrics_observer_test_utils.h | 2 +- ...rvice_worker_page_load_metrics_observer.cc | 2 +- .../performance_hints_features.cc | 2 +- ...ped_permission_infobar_delegate_android.cc | 2 +- + .../extension_key_permissions_service.cc | 2 +- + .../extension_platform_keys_service.cc | 2 +- .../policy/extension_force_install_mixin.cc | 2 +- chrome/browser/policy/policy_test_utils.h | 2 +- .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- @@ -176,6 +185,7 @@ Subject: Automated domain substitution .../push_messaging_constants.cc | 2 +- .../push_messaging_service_impl.cc | 2 +- chrome/browser/resources/PRESUBMIT.py | 2 +- + .../browser/resources/about_sys/about_sys.js | 2 +- .../resources/chromeos/about_os_credits.html | 6 +- .../magnifier/magnifier.js | 2 +- .../chromevox/background/command_handler.js | 6 +- @@ -184,6 +194,7 @@ Subject: Automated domain substitution .../chromevox_manifest.json.jinja2 | 8 +- .../common/tutorial/chromevox_tutorial.js | 6 +- .../accessibility/select_to_speak/options.css | 2 +- + .../select_to_speak/options.html | 2 +- .../select_to_speak/select_to_speak.js | 8 +- .../select_to_speak_manifest.json.jinja2 | 8 +- .../switch_access/switch_access.js | 2 +- @@ -252,6 +263,7 @@ Subject: Automated domain substitution .../channel_switcher_dialog.html | 2 +- .../chromeos/os_about_page/os_about_page.html | 2 +- .../app_management_page/icons.html | 2 +- + .../supported_links_item.html | 2 +- .../resources/settings/chromeos/os_icons.html | 2 +- .../os_people_page/users_add_user_dialog.js | 2 +- chrome/browser/resources/settings/icons.html | 2 +- @@ -261,7 +273,7 @@ Subject: Automated domain substitution .../chrome_cleaner/srt_field_trial_win.cc | 6 +- .../chrome_enterprise_url_lookup_service.cc | 2 +- .../chrome_password_protection_service.cc | 4 +- - .../binary_upload_service.cc | 6 +- + .../binary_upload_service.cc | 4 +- .../check_client_download_request_base.cc | 4 +- .../download_protection/download_feedback.cc | 2 +- .../ppapi_download_request.cc | 6 +- @@ -270,7 +282,7 @@ Subject: Automated domain substitution ...ings_reset_prompt_model_browsertest_win.cc | 2 +- .../background/ntp_background_service.cc | 6 +- .../search/background/ntp_backgrounds.cc | 10 +- - chrome/browser/search/drive/drive_service.cc | 10 +- + .../browser/share/default_ranking_android.cc | 8 +- .../remote_copy_message_handler.cc | 2 +- .../sharing/web_push/web_push_sender.cc | 4 +- chrome/browser/signin/signin_ui_util.cc | 2 +- @@ -279,16 +291,14 @@ Subject: Automated domain substitution .../subresource_redirect_util.cc | 2 +- .../child_accounts/family_info_fetcher.cc | 2 +- .../child_accounts/kids_management_api.cc | 2 +- - .../permission_request_creator_apiary.cc | 2 +- - .../kids_chrome_management_client.cc | 4 +- + .../kids_chrome_management_client.cc | 2 +- .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- .../browser/tracing/crash_service_uploader.cc | 2 +- - .../strings/android_chrome_strings.grd | 40 +- + .../strings/android_chrome_strings.grd | 36 +- .../arc/arc_app_reinstall_app_result.cc | 2 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- - .../search/files/item_suggest_cache.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- .../ui/app_list/search/omnibox_provider.cc | 2 +- .../ui/ash/ambient/ambient_client_impl.cc | 8 +- @@ -308,7 +318,7 @@ 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 | 12 +- + ...picker_bubble_view_browsertest_chromeos.cc | 30 +- .../ui/views/network_profile_bubble_view.cc | 2 +- .../ui/views/outdated_upgrade_bubble_view.cc | 2 +- .../plugin_vm/plugin_vm_installer_view.cc | 2 +- @@ -323,7 +333,7 @@ Subject: Automated domain substitution .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- .../ui/webui/new_tab_page/foo/foo_handler.cc | 12 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- - .../ui/webui/ntp/ntp_resource_cache.cc | 10 +- + .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- .../chromeos/parental_controls_handler.cc | 2 +- .../webui/settings/reset_settings_handler.cc | 2 +- .../settings_localized_strings_provider.cc | 2 +- @@ -419,11 +429,11 @@ Subject: Automated domain substitution chrome/installer/setup/eula/oem_zh-CN.html | 2 +- chrome/installer/setup/eula/oem_zh-TW.html | 2 +- .../setup/google_chrome_behaviors.cc | 2 +- + chrome/renderer/cart/commerce_hint_agent.cc | 2 +- chrome/renderer/media/flash_embed_rewrite.cc | 2 +- .../cart/cart_domain_cart_url_regex.json | 2 +- ...ip_add_to_cart_request_domain_mapping.json | 2 +- .../extensions/identity_custom_bindings.js | 2 +- - .../subresource_redirect_params.cc | 2 +- .../mac_notification_service_ns.mm | 2 +- .../speech/cloud_speech_recognition_client.cc | 2 +- chrome/tools/build/PRESUBMIT.py | 2 +- @@ -447,9 +457,8 @@ Subject: Automated domain substitution .../resources/js/lib/analytics.js | 14 +- .../camera_app_ui/resources/js/util.js | 2 +- .../resources/strings/camera_strings.grd | 2 +- - .../resources/routine_section.js | 2 +- chromeos/components/drivefs/drivefs_auth.cc | 2 +- - .../help_app_ui/help_app_untrusted_ui.cc | 2 +- + .../help_app_kids_magazine_untrusted_ui.cc | 2 +- .../media_app_ui/media_app_guest_ui.cc | 2 +- .../multidevice/stub_multidevice_util.cc | 2 +- ...untrusted_personalization_app_ui_config.cc | 2 +- @@ -475,7 +484,7 @@ Subject: Automated domain substitution .../printing/uri_fuzzer_seed_corpus/uri49.txt | 2 +- .../printing/uri_fuzzer_seed_corpus/uri5.txt | 2 +- .../assistant_manager_service_impl.cc | 2 +- - chromeos/services/assistant/service.cc | 4 +- + chromeos/services/assistant/service.cc | 2 +- .../device_sync/cryptauth_client_impl.cc | 8 +- chromeos/services/ime/constants.cc | 2 +- chromeos/timezone/timezone_request.cc | 2 +- @@ -506,6 +515,7 @@ Subject: Automated domain substitution .../data/log_list.json | 24 +- .../common/cloud_devices_urls.cc | 4 +- .../components_google_chrome_strings.grd | 2 +- + .../notes/core/server/notes_server_base.cc | 2 +- .../crash/core/app/crash_reporter_client.cc | 2 +- .../crash/core/browser/resources/crashes.js | 4 +- components/cronet/PRESUBMIT.py | 2 +- @@ -516,7 +526,6 @@ Subject: Automated domain substitution .../core/javascript/dom_distiller_viewer.js | 2 +- components/dom_distiller/core/viewer.cc | 6 +- .../domain_reliability/bake_in_configs.py | 286 +-- - .../domain_reliability/google_configs.cc | 380 ++-- components/drive/service/drive_api_service.cc | 6 +- .../error_page/common/localized_error.cc | 2 +- .../favicon/core/large_icon_service_impl.cc | 2 +- @@ -532,7 +541,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 | 2 +- + components/lens/lens_features.cc | 4 +- components/media_router/common/media_source.h | 2 +- .../metrics/net/net_metrics_log_uploader.cc | 2 +- components/metrics/url_constants.cc | 6 +- @@ -557,18 +566,16 @@ Subject: Automated domain substitution .../core/uma_page_load_metrics_observer.cc | 2 +- .../use_counter_page_load_metrics_observer.cc | 4 +- .../affiliation_fetcher.cc | 2 +- - .../change_password_url_service_impl.h | 2 +- ...password_requirements_spec_fetcher_impl.cc | 2 +- .../core/browser/hash_password_manager.cc | 2 +- .../leak_detection/leak_detection_request.h | 2 +- - .../leak_detection_request_utils.cc | 2 +- .../browser/leak_detection_dialog_utils.cc | 2 +- + .../browser/old_google_credentials_cleaner.cc | 8 +- .../password_generation_frame_helper.cc | 2 +- .../core/browser/password_hash_data.cc | 2 +- .../browser/password_manager_constants.cc | 4 +- .../core/browser/password_reuse_detector.cc | 2 +- .../browser/password_scripts_fetcher_impl.cc | 2 +- - .../core/browser/password_store.cc | 8 +- .../core/browser/password_sync_util.cc | 4 +- .../core/browser/password_ui_utils.cc | 2 +- .../core/browser/psl_matching_helper.cc | 6 +- @@ -577,16 +584,17 @@ Subject: Automated domain substitution .../payment_method_manifest_parser_fuzzer.cc | 2 +- components/payments/core/error_strings.cc | 2 +- components/payments/core/method_strings.cc | 6 +- + .../android/permissions_android_strings.grd | 4 +- + components/permissions/constants.cc | 2 +- .../permissions/permission_context_base.cc | 10 +- .../permissions/permission_request_manager.cc | 8 +- .../prediction_service_common.h | 2 +- .../core/browser/browser_policy_connector.cc | 10 +- components/policy/core/browser/url_util.cc | 4 +- .../core/common/policy_loader_common.cc | 2 +- - .../policy/resources/policy_templates.json | 2008 ++++++++--------- - .../policy/resources/webui/policy_base.js | 2 +- + .../policy/resources/policy_templates.json | 2046 ++++++++--------- .../policy/test_support/policy_testserver.py | 14 +- - .../policy/tools/generate_extension_admx.py | 2 +- + .../request_handler_for_policy.cc | 2 +- .../syntax_check_policy_template_json.py | 2 +- .../tools/template_writers/PRESUBMIT.py | 2 +- .../template_writers/writers/adm_writer.py | 4 +- @@ -648,11 +656,10 @@ Subject: Automated domain substitution components/resources/terms/terms_zh-CN.html | 4 +- components/resources/terms/terms_zh-TW.html | 4 +- .../browser/client_side_detection_service.cc | 2 +- - .../content/triggers/trigger_util.cc | 2 +- - .../browser/safe_browsing_token_fetcher.h | 2 +- - .../core/db/v4_protocol_manager_util.cc | 4 +- + .../content/browser/triggers/trigger_util.cc | 2 +- + .../browser/db/v4_protocol_manager_util.cc | 4 +- .../password_protection_service_base.cc | 6 +- - .../core/realtime/url_lookup_service.cc | 2 +- + .../browser/realtime/url_lookup_service.cc | 2 +- .../safe_search_url_checker_client.cc | 2 +- .../safe_search_api/stub_url_checker.cc | 2 +- components/safety_check/url_constants.cc | 2 +- @@ -661,7 +668,7 @@ Subject: Automated domain substitution .../core/safe_browsing_loud_error_ui.cc | 4 +- .../security_interstitials/core/urls.cc | 4 +- .../services/quarantine/quarantine_mac.mm | 2 +- - .../core/common/disabled_sites.cc | 8 +- + .../core/common/disabled_sites.cc | 10 +- .../browser/chrome_connected_header_helper.cc | 4 +- .../browser/account_consistency_service.mm | 12 +- .../signin/public/base/test_signin_client.cc | 2 +- @@ -669,10 +676,12 @@ Subject: Automated domain substitution .../browser/spelling_service_client.cc | 2 +- .../browser/subresource_filter_constants.h | 8 +- .../core/common/PRESUBMIT.py | 2 +- - .../suggestions/suggestions_service_impl.cc | 4 +- + .../common/subresource_redirect_features.cc | 2 +- components/sync/PRESUBMIT.py | 2 +- components/sync/base/sync_util.cc | 4 +- + .../standalone_trusted_vault_client.cc | 2 +- ...ted_vault_access_token_fetcher_frontend.cc | 2 +- + .../trusted_vault_server_constants.cc | 2 +- components/sync_bookmarks/PRESUBMIT.py | 2 +- components/sync_sessions/PRESUBMIT.py | 2 +- .../core/browser/translate_manager.cc | 2 +- @@ -701,7 +710,8 @@ Subject: Automated domain substitution .../speech/speech_recognition_engine.cc | 2 +- content/browser/speech/tts_mac.mm | 2 +- .../browser/web_contents/web_contents_impl.cc | 2 +- - .../browser/webauth/authenticator_common.cc | 8 +- + .../browser/webauth/authenticator_common.cc | 10 +- + content/browser/webauth/client_data_json.cc | 2 +- .../webrtc/resources/webrtc_internals.js | 2 +- .../zygote_host/zygote_host_impl_linux.cc | 2 +- content/renderer/PRESUBMIT.py | 2 +- @@ -727,13 +737,15 @@ Subject: Automated domain substitution extensions/common/extension_urls.cc | 10 +- extensions/common/manifest_constants.cc | 4 +- extensions/common/permissions/PRESUBMIT.py | 2 +- + .../resources/automation/PRESUBMIT.py | 2 +- extensions/strings/extensions_strings.grd | 4 +- + .../calendar/calendar_api_url_generator.cc | 2 +- google_apis/drive/drive_api_url_generator.cc | 4 +- google_apis/gaia/gaia_auth_fetcher.cc | 4 +- google_apis/gaia/gaia_auth_util.cc | 6 +- - google_apis/gaia/gaia_constants.cc | 66 +- + google_apis/gaia/gaia_constants.cc | 68 +- google_apis/gaia/gaia_oauth_client.cc | 6 +- - google_apis/gaia/gaia_urls.cc | 8 +- + google_apis/gaia/gaia_urls.cc | 10 +- google_apis/gcm/base/mcs_util.cc | 2 +- google_apis/gcm/engine/gservices_settings.cc | 6 +- google_apis/gcm/engine/mcs_client.cc | 2 +- @@ -767,7 +779,7 @@ Subject: Automated domain substitution ios/chrome/browser/autofill/BUILD.gn | 4 +- .../autofill/automation/automation_action.mm | 2 +- ...chrome_browser_state_removal_controller.mm | 2 +- - ios/chrome/browser/chrome_url_constants.cc | 26 +- + ios/chrome/browser/chrome_url_constants.cc | 30 +- .../breadcrumb_manager_tab_helper.mm | 4 +- ios/chrome/browser/flags/about_flags.mm | 4 +- ios/chrome/browser/omaha/omaha_service.mm | 2 +- @@ -895,7 +907,7 @@ Subject: Automated domain substitution .../ios/app/remoting_menu_view_controller.mm | 10 +- .../facade/remoting_oauth_authentication.mm | 2 +- remoting/protocol/fake_session.cc | 2 +- - remoting/resources/remoting_strings.grd | 6 +- + remoting/resources/remoting_strings.grd | 8 +- remoting/signaling/signaling_id_util.cc | 4 +- remoting/tools/build/remoting_localize.py | 6 +- remoting/tools/zip2msi.py | 2 +- @@ -925,8 +937,9 @@ Subject: Automated domain substitution testing/test_env.py | 8 +- testing/trigger_scripts/PRESUBMIT.py | 2 +- .../trigger_scripts/base_test_triggerer.py | 2 +- + .../unexpected_passes_common/data_types.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 22 +- + .../variations/fieldtrial_testing_config.json | 20 +- .../markdown/extensions/smarty.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- third_party/abseil-cpp/conanfile.py | 2 +- @@ -1015,6 +1028,7 @@ Subject: Automated domain substitution .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- + .../com_google_android_play_core/3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- @@ -1036,27 +1050,9 @@ Subject: Automated domain substitution .../public/mojom/web_feature/PRESUBMIT.py | 2 +- .../blink/public/strings/blink_strings.grd | 8 +- .../blink/renderer/bindings/PRESUBMIT.py | 2 +- - .../scripts/aggregate_generated_bindings.py | 2 +- .../bindings/scripts/blink_idl_lexer.py | 2 +- .../bindings/scripts/blink_idl_parser.py | 2 +- - .../bindings/scripts/code_generator_v8.py | 2 +- - .../scripts/compute_global_objects.py | 2 +- - .../compute_interfaces_info_individual.py | 2 +- - .../compute_interfaces_info_overall.py | 2 +- - .../scripts/generate_global_constructors.py | 2 +- - .../renderer/bindings/scripts/idl_compiler.py | 2 +- - .../bindings/scripts/idl_definitions.py | 2 +- - .../renderer/bindings/scripts/idl_reader.py | 4 +- - .../bindings/scripts/idl_validator.py | 2 +- - .../scripts/interface_dependency_resolver.py | 2 +- .../renderer/bindings/scripts/utilities.py | 2 +- - .../bindings/scripts/v8_attributes.py | 2 +- - .../bindings/scripts/v8_callback_function.py | 2 +- - .../bindings/scripts/v8_callback_interface.py | 2 +- - .../renderer/bindings/scripts/v8_interface.py | 2 +- - .../renderer/bindings/scripts/v8_methods.py | 2 +- - .../renderer/bindings/scripts/v8_types.py | 2 +- - .../renderer/bindings/scripts/v8_utilities.py | 2 +- .../build/scripts/update_css_ranking.py | 4 +- .../core/css/remote_font_face_source.cc | 2 +- .../renderer/core/dom/events/event_target.cc | 4 +- @@ -1071,17 +1067,17 @@ Subject: Automated domain substitution .../renderer/core/loader/frame_loader.cc | 4 +- .../core/loader/mixed_content_checker.cc | 2 +- .../core/loader/subresource_filter.cc | 2 +- - .../core/loader/subresource_redirect_util.cc | 2 +- .../script/document_write_intervention.cc | 6 +- .../core/xmlhttprequest/xml_http_request.cc | 2 +- .../modules/bluetooth/bluetooth_error.cc | 16 +- .../modules/clipboard/clipboard_promise.cc | 2 +- - .../credentials_container.cc | 4 +- + .../credentials_container.cc | 8 +- .../encryptedmedia/encrypted_media_utils.h | 2 +- .../modules/geolocation/geolocation.cc | 2 +- .../play_app_url_manifest.json | 2 +- .../modules/payments/payment_request.cc | 6 +- .../modules/payments/skip_to_gpay_utils.cc | 6 +- + .../peerconnection/rtc_peer_connection.cc | 2 +- .../modules/vibration/vibration_controller.cc | 4 +- .../modules/webaudio/audio_context.cc | 4 +- .../modules/webmidi/navigator_web_midi.cc | 2 +- @@ -1259,6 +1255,7 @@ Subject: Automated domain substitution third_party/mozilla/NSString+Utils.mm | 2 +- third_party/opus/src/doc/opus_in_isobmff.html | 2 +- third_party/opus/src/doc/release.txt | 6 +- + third_party/pefile_py3/pefile.py | 4 +- third_party/polymer/v1_0/PRESUBMIT.py | 2 +- .../iron-flex-layout/iron-flex-layout.html | 2 +- .../iron-icon/iron-icon.html | 2 +- @@ -1379,7 +1376,7 @@ Subject: Automated domain substitution .../open_my_editor/ext/background.js | 26 +- .../open_my_editor/ext/manifest.json | 6 +- tools/clang/scripts/build.py | 4 +- - tools/clang/scripts/include-analysis.html | 4 +- + tools/clang/scripts/include-analysis.html | 12 +- tools/clang/scripts/package.py | 2 +- tools/clang/scripts/update.py | 2 +- tools/code_coverage/coverage.py | 8 +- @@ -1415,6 +1412,7 @@ Subject: Automated domain substitution tools/licenses.py | 38 +- tools/linux/PRESUBMIT.py | 2 +- tools/mac/download_symbols.py | 4 +- + tools/mac/power/generate_scripts.py | 10 +- tools/mb/mb.py | 4 +- tools/mb/mb_config.pyl | 6 +- tools/md_browser/base.css | 4 +- @@ -1423,9 +1421,6 @@ Subject: Automated domain substitution tools/md_browser/gitiles_ext_blocks.py | 2 +- tools/md_browser/gitiles_smart_quotes.py | 2 +- tools/md_browser/md_browser.py | 2 +- - tools/memory_inspector/PRESUBMIT.py | 2 +- - .../memory_inspector/constants.py | 2 +- - .../frontends/www_content/index.html | 10 +- tools/metrics/actions/PRESUBMIT.py | 2 +- tools/metrics/common/models.py | 2 +- tools/metrics/histograms/PRESUBMIT.py | 2 +- @@ -1453,9 +1448,11 @@ Subject: Automated domain substitution tools/site_compare/utils/browser_iterate.py | 2 +- tools/style_variable_generator/PRESUBMIT.py | 2 +- tools/symsrc/source_index.py | 8 +- + tools/tracing/PRESUBMIT.py | 2 +- .../good_partial_annotation.txt | 2 +- .../auditor/traffic_annotation_auditor_ui.cc | 2 +- .../sample_traffic_annotation.cc | 2 +- + .../scripts/auditor/auditor.py | 4 +- .../scripts/update_annotations_doc.py | 4 +- .../scripts/update_annotations_sheet.py | 6 +- tools/typescript/PRESUBMIT.py | 2 +- @@ -1488,11 +1485,9 @@ Subject: Automated domain substitution ui/base/ime/character_composer_sequences.txt | 2 +- .../keycodes/keyboard_code_conversion_mac.mm | 2 +- ui/file_manager/audio_player/manifest.json | 2 +- - ui/file_manager/base/tools/PRESUBMIT.py | 2 +- - .../file_manager/common/js/mock_chrome.js | 4 +- + .../file_manager/common/js/mock_chrome.js | 6 +- .../foreground/elements/icons.html | 2 +- ui/file_manager/file_manager/manifest.json | 10 +- - ui/file_manager/gallery/manifest.json | 2 +- ui/file_manager/image_loader/piex/Makefile | 2 +- ui/file_manager/video_player/manifest.json | 2 +- ui/gl/gl_image_io_surface_egl.mm | 2 +- @@ -1504,13 +1499,12 @@ Subject: Automated domain substitution ui/views/PRESUBMIT.py | 2 +- ui/views/examples/webview_example.cc | 2 +- .../quick_unlock/pin_keyboard_icon.html | 2 +- - .../customize_themes/customize_themes.js | 2 +- ui/webui/resources/cr_elements/icons.html | 4 +- url/third_party/mozilla/LICENSE.txt | 4 +- weblayer/browser/default_search_engine.cc | 2 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1507 files changed, 4749 insertions(+), 4749 deletions(-) + 1501 files changed, 4613 insertions(+), 4613 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1605,7 +1599,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1029,7 +1029,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1019,7 +1019,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1614,7 +1608,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1188,9 +1188,9 @@ _KNOWN_ROBOTS = set( +@@ -1178,9 +1178,9 @@ _KNOWN_ROBOTS = set( 'wpt-autoroller', 'chrome-weblayer-builder') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1626,7 +1620,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) -@@ -1517,7 +1517,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1507,7 +1507,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' @@ -1635,7 +1629,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1728,7 +1728,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1718,7 +1718,7 @@ def CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1644,7 +1638,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -1943,7 +1943,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1933,7 +1933,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1653,7 +1647,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2052,7 +2052,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2042,7 +2042,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' @@ -1662,7 +1656,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2823,7 +2823,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2813,7 +2813,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. @@ -1671,7 +1665,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py # Go through the OWNERS files to check, filtering out rules that are already # present in that OWNERS file. -@@ -3124,7 +3124,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3114,7 +3114,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' @@ -1680,7 +1674,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3258,7 +3258,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3248,7 +3248,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1689,7 +1683,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3289,7 +3289,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3279,7 +3279,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' @@ -1698,7 +1692,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3313,7 +3313,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3303,7 +3303,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.' @@ -1707,7 +1701,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3333,7 +3333,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3323,7 +3323,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' @@ -1716,7 +1710,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3868,7 +3868,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -3858,7 +3858,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' @@ -1725,16 +1719,16 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from'))] return [] -@@ -4030,7 +4030,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4020,7 +4020,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/+/master/testing/' -+ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/testing/' +- '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) ) -@@ -4065,7 +4065,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4055,7 +4055,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 ' @@ -1743,7 +1737,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' 'FYI only and will not block your CL on the CQ.', image_paths)) return errors -@@ -4159,7 +4159,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4149,7 +4149,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', @@ -1752,7 +1746,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4427,7 +4427,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4418,7 +4418,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1761,7 +1755,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """ base_pattern = r'IPC_ENUM_TRAITS\(' inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -4679,9 +4679,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -4671,9 +4671,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' @@ -1773,7 +1767,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems))] return [] -@@ -4724,7 +4724,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4716,7 +4716,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1782,7 +1776,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5056,7 +5056,7 @@ def CheckStrings(input_api, output_api): +@@ -5048,7 +5048,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 ' @@ -1962,7 +1956,7 @@ diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_ diff --git a/ash/accelerators/accelerator_controller_impl.cc b/ash/accelerators/accelerator_controller_impl.cc --- a/ash/accelerators/accelerator_controller_impl.cc +++ b/ash/accelerators/accelerator_controller_impl.cc -@@ -127,7 +127,7 @@ const char kStartupNewShortcutNotificationId[] = +@@ -125,7 +125,7 @@ const char kStartupNewShortcutNotificationId[] = const char kTabletCountOfVolumeAdjustType[] = "Tablet.CountOfVolumeAdjustType"; const char kKeyboardShortcutHelpPageUrl[] = @@ -2004,7 +1998,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1254,7 +1254,7 @@ This file contains the strings for ash. +@@ -1272,7 +1272,7 @@ This file contains the strings for ash. Tap to configure @@ -2013,7 +2007,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -2773,7 +2773,7 @@ This file contains the strings for ash. +@@ -2817,7 +2817,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2022,7 +2016,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3113,7 +3113,7 @@ Here are some things you can try to get started. +@@ -3161,7 +3161,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2084,42 +2078,30 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link if (!IsWebDeepLinkType(type, params)) return absl::nullopt; -diff --git a/ash/content/scanning/resources/scanning_app.html b/ash/content/scanning/resources/scanning_app.html ---- a/ash/content/scanning/resources/scanning_app.html -+++ b/ash/content/scanning/resources/scanning_app.html -@@ -261,7 +261,7 @@ - [[i18n(toastMessageKey_)]] -

-diff --git a/ash/content/scanning/resources/scanning_app.js b/ash/content/scanning/resources/scanning_app.js ---- a/ash/content/scanning/resources/scanning_app.js -+++ b/ash/content/scanning/resources/scanning_app.js -@@ -41,7 +41,7 @@ import {ScanningBrowserProxy, ScanningBrowserProxyImpl, SelectedPath} from './sc - * URL for the Scanning help page. - * @const {string} - */ --const HELP_PAGE_LINK = 'http://support.google.com/chromebook?p=chrome_scanning'; -+const HELP_PAGE_LINK = 'http://support.9oo91e.qjz9zk/chromebook?p=chrome_scanning'; - - /** - * @fileoverview diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answers/quick_answers_controller_impl.cc --- a/ash/quick_answers/quick_answers_controller_impl.cc +++ b/ash/quick_answers/quick_answers_controller_impl.cc -@@ -25,7 +25,7 @@ using chromeos::quick_answers::ResultType; - constexpr char kAssistantRelatedInfoUrl[] = - "chrome://os-settings/googleAssistant"; +@@ -30,7 +30,7 @@ constexpr char kAssistantRelatedInfoUrl[] = + constexpr char kQuickAnswersSettingsUrl[] = + "chrome://os-settings/osSearch/search"; constexpr char kDogfoodUrl[] = - "https://goto.google.com/quick-answers-dogfood-bugs"; + "https://goto.9oo91e.qjz9zk/quick-answers-dogfood-bugs"; std::u16string IntentTypeToString(IntentType intent_type) { switch (intent_type) { +diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answers/quick_answers_ui_controller.cc +--- a/ash/quick_answers/quick_answers_ui_controller.cc ++++ b/ash/quick_answers/quick_answers_ui_controller.cc +@@ -29,7 +29,7 @@ namespace ash { + + namespace { + +-constexpr char kGoogleSearchUrlPrefix[] = "https://www.google.com/search?q="; ++constexpr char kGoogleSearchUrlPrefix[] = "https://www.9oo91e.qjz9zk/search?q="; + + constexpr char kFeedbackDescriptionTemplate[] = "#QuickAnswers\nQuery:%s\n"; + diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py --- a/ash/resources/PRESUBMIT.py +++ b/ash/resources/PRESUBMIT.py @@ -2138,7 +2120,7 @@ diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc --- a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc +++ b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc -@@ -30,7 +30,7 @@ namespace ash { +@@ -31,7 +31,7 @@ namespace ash { namespace { const char kNotifierPciePeripheral[] = "ash.pcie_peripheral"; const char kLearnMoreHelpUrl[] = @@ -2147,6 +2129,54 @@ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller. const int kNotificationsClicksThreshold = 3; const char kPciePeripheralLimitedPerformanceNotificationId[] = +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 +@@ -110,7 +110,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_'); + }, + + /** @protected */ +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 +@@ -330,7 +330,7 @@ Polymer({ + /** @protected */ + onLearnMoreClicked_() { + const baseSupportUrl = +- 'https://support.google.com/chromebook?p=diagnostics_'; ++ 'https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'; + assert(this.learnMoreLinkSection); + + window.open(baseSupportUrl + this.learnMoreLinkSection); +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 +@@ -256,7 +256,7 @@ + [[i18n(toastMessageKey_)]] + +diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/resources/scanning_app.js +--- a/ash/webui/scanning/resources/scanning_app.js ++++ b/ash/webui/scanning/resources/scanning_app.js +@@ -43,7 +43,7 @@ import {ScanningBrowserProxy, ScanningBrowserProxyImpl, SelectedPath} from './sc + * URL for the Scanning help page. + * @const {string} + */ +-const HELP_PAGE_LINK = 'http://support.google.com/chromebook?p=chrome_scanning'; ++const HELP_PAGE_LINK = 'http://support.9oo91e.qjz9zk/chromebook?p=chrome_scanning'; + + /** + * @fileoverview diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py --- a/base/PRESUBMIT.py +++ b/base/PRESUBMIT.py @@ -2159,7 +2189,7 @@ diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py for more details on the presubmit API built into depot_tools. """ -@@ -26,7 +26,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): +@@ -30,7 +30,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): if len(files): return [ output_api.PresubmitError( 'Objective-C interfaces or categories are forbidden in libbase. ' + @@ -2264,7 +2294,7 @@ diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py --- a/build/android/gradle/generate_gradle.py +++ b/build/android/gradle/generate_gradle.py -@@ -924,7 +924,7 @@ def main(): +@@ -921,7 +921,7 @@ def main(): logging.warning('Generated files will only appear once you\'ve built them.') logging.warning('Generated projects for Android Studio %s', channel) @@ -2300,16 +2330,16 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -377,7 +377,7 @@ def _OptimizeWithR8(options, - fail_on_output=options.warnings_as_errors) - except build_utils.CalledProcessError as err: - debugging_link = ('\n\nR8 failed. Please see {}.'.format( -- 'https://chromium.googlesource.com/chromium/src/+/HEAD/build/' -+ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/build/' - 'android/docs/java_optimization.md#Debugging-common-failures\n')) - raise build_utils.CalledProcessError(err.cwd, err.args, - err.output + debugging_link) -@@ -518,7 +518,7 @@ out/Release/apks/YourApk.apk > dex.txt +@@ -386,7 +386,7 @@ def _OptimizeWithR8(options, + # Python will print the original exception as well. + raise Exception( + 'R8 failed. Please see ' +- 'https://chromium.googlesource.com/chromium/src/+/HEAD/build/' ++ 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/build/' + 'android/docs/java_optimization.md#Debugging-common-failures') + logging.warning('Retrying R8 due to crbug/1231986') + +@@ -526,7 +526,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -2358,18 +2388,6 @@ diff --git a/build/android/incremental_install/installer.py b/build/android/incr To enable access: adb -s {0} shell settings put global {1} 0 -diff --git a/build/android/pylib/base/result_sink.py b/build/android/pylib/base/result_sink.py ---- a/build/android/pylib/base/result_sink.py -+++ b/build/android/pylib/base/result_sink.py -@@ -120,7 +120,7 @@ class ResultSinkClient(object): - 'name': test_id, - 'location': { - 'file_name': test_file, -- 'repo': 'https://chromium.googlesource.com/chromium/src', -+ 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', - } - } - diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py --- a/build/android/pylib/constants/__init__.py +++ b/build/android/pylib/constants/__init__.py @@ -2423,7 +2441,7 @@ diff --git a/build/android/pylib/dex/dex_parser.py b/build/android/pylib/dex/dex Args: string_length: The length of the decoded string. -@@ -341,7 +341,7 @@ class DexFile(object): +@@ -344,7 +344,7 @@ class DexFile(object): """Represents a single dex file. Parses and exposes access to dex file structure and contents, as described @@ -2446,7 +2464,7 @@ diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/ diff --git a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py --- a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py +++ b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py -@@ -668,7 +668,7 @@ def _EncodeMultipartFormData(fields, files): +@@ -671,7 +671,7 @@ def _EncodeMultipartFormData(fields, files): (content_type, body) ready for httplib.HTTP instance. Source: @@ -2458,25 +2476,25 @@ diff --git a/build/android/pylib/results/flakiness_dashboard/json_results_genera diff --git a/build/android/pylib/results/presentation/test_results_presentation.py b/build/android/pylib/results/presentation/test_results_presentation.py --- a/build/android/pylib/results/presentation/test_results_presentation.py +++ b/build/android/pylib/results/presentation/test_results_presentation.py -@@ -107,7 +107,7 @@ def flakiness_dashbord_link(test_name, suite_name): - url_args = urllib.urlencode([ - ('testType', suite_name), - ('tests', test_name)]) +@@ -110,7 +110,7 @@ def action_cell(action, data, html_class): + + def flakiness_dashbord_link(test_name, suite_name): + url_args = urlencode([('testType', suite_name), ('tests', test_name)]) - return ('https://test-results.appspot.com/' + return ('https://test-results.8pp2p8t.qjz9zk/' 'dashboards/flakiness_dashboard.html#%s' % url_args) -@@ -282,7 +282,7 @@ def feedback_url(result_details_link): +@@ -285,7 +285,7 @@ def feedback_url(result_details_link): url_args.append(('comment', 'Please check out: %s' % result_details_link)) - url_args = urllib.urlencode(url_args) + url_args = urlencode(url_args) # pylint: enable=redefined-variable-type - return 'https://bugs.chromium.org/p/chromium/issues/entry?%s' % url_args + return 'https://bugs.ch40m1um.qjz9zk/p/chromium/issues/entry?%s' % url_args def results_to_html(results_dict, cs_base_url, bucket, test_name, -@@ -425,7 +425,7 @@ def main(): +@@ -428,7 +428,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('--json-file', help='Path of json file.') parser.add_argument('--cs-base-url', help='Base url for code search.', @@ -2485,19 +2503,19 @@ diff --git a/build/android/pylib/results/presentation/test_results_presentation. parser.add_argument('--bucket', help='Google storage bucket.', required=True) parser.add_argument('--builder-name', help='Builder name.') parser.add_argument('--build-number', help='Build number.') -@@ -519,7 +519,7 @@ def main(): +@@ -522,7 +522,7 @@ def main(): args.bucket, builder_name, build_number) if ui_screenshot_set_link: - ui_catalog_url = 'https://chrome-ui-catalog.appspot.com/' + ui_catalog_url = 'https://chrome-ui-catalog.8pp2p8t.qjz9zk/' - ui_catalog_query = urllib.urlencode( - {'screenshot_source': ui_screenshot_set_link}) + ui_catalog_query = urlencode({'screenshot_source': ui_screenshot_set_link}) ui_screenshot_link = '%s?%s' % (ui_catalog_url, ui_catalog_query) + diff --git a/build/android/pylib/utils/google_storage_helper.py b/build/android/pylib/utils/google_storage_helper.py --- a/build/android/pylib/utils/google_storage_helper.py +++ b/build/android/pylib/utils/google_storage_helper.py -@@ -25,8 +25,8 @@ from devil.utils import cmd_helper +@@ -28,8 +28,8 @@ from devil.utils import cmd_helper _GSUTIL_PATH = os.path.join( host_paths.DIR_SOURCE_ROOT, 'third_party', 'catapult', 'third_party', 'gsutil', 'gsutil.py') @@ -2547,7 +2565,7 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py diff --git a/build/android/test_runner.py b/build/android/test_runner.py --- a/build/android/test_runner.py +++ b/build/android/test_runner.py -@@ -1043,7 +1043,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1049,7 +1049,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): result_html_string, _, _ = test_results_presentation.result_details( json_path=json_file.name, test_name=args.command, @@ -2607,7 +2625,7 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py --- a/build/chromeos/test_runner.py +++ b/build/chromeos/test_runner.py -@@ -923,7 +923,7 @@ def main(): +@@ -932,7 +932,7 @@ def main(): tast_test_parser = subparsers.add_parser( 'tast', help='Runs a device-side set of Tast tests. For more details, see: ' @@ -2619,7 +2637,7 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1707,7 +1707,7 @@ if (enable_java_templates) { +@@ -1710,7 +1710,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -2631,7 +2649,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni --- a/build/config/chromeos/args.gni +++ b/build/config/chromeos/args.gni -@@ -21,7 +21,7 @@ declare_args() { +@@ -21,8 +21,8 @@ declare_args() { # linux-chromeos, so some have compile-time asserts that intentionally fail # when this build flag is set. Build and run the tests for linux-chromeos # instead. @@ -2640,7 +2658,8 @@ diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni + # https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/chromeos_build_instructions.md + # https://chromium.9oo91esource.qjz9zk/chromiumos/docs/+/main/simple_chrome_workflow.md is_chromeos_device = false - } + + # Determines if we run the test in skylab, aka the CrOS labs. diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni --- a/build/config/chromeos/rules.gni +++ b/build/config/chromeos/rules.gni @@ -2653,7 +2672,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni template("generate_runner_script") { forward_variables_from(invoker, [ -@@ -365,7 +365,7 @@ template("tast_test") { +@@ -366,7 +366,7 @@ template("tast_test") { if (!defined(tast_attr_expr) && !defined(tast_tests)) { # The following expression filters out all non-critical tests. See the link # below for more details: @@ -2662,7 +2681,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni tast_attr_expr = "\"group:mainline\" && \"dep:chrome\"" if (defined(enable_tast_informational_tests) && -@@ -451,7 +451,7 @@ template("lacros_tast_tests") { +@@ -452,7 +452,7 @@ template("lacros_tast_tests") { # use it for testing. To support running lacros tast tests from Chromium CI, # a Var is added to support pointing the tast tests to use a specified # pre-deployed lacros-chrome. The location is decided by: @@ -2674,7 +2693,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -105,7 +105,7 @@ declare_args() { +@@ -109,7 +109,7 @@ declare_args() { # Technology (CET). If Windows version and hardware supports the feature and # it's enabled by OS then additional validation of return address will be # performed as mitigation against Return-oriented programming (ROP). @@ -2683,7 +2702,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler enable_cet_shadow_stack = target_cpu == "x64" } -@@ -216,7 +216,7 @@ declare_args() { +@@ -219,7 +219,7 @@ declare_args() { # results independent of the checkout and build directory names, which # in turn is important for goma compile hit rate. # Setting this to true may make it harder to debug binaries on Linux, see @@ -2695,7 +2714,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni --- a/build/config/nacl/rules.gni +++ b/build/config/nacl/rules.gni -@@ -40,7 +40,7 @@ template("generate_nmf") { +@@ -38,7 +38,7 @@ template("generate_nmf") { } # TODO(phosek): Remove this conditional once @@ -2767,7 +2786,7 @@ diff --git a/build/linux/install-chromeos-fonts.py b/build/linux/install-chromeo diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py --- a/build/linux/sysroot_scripts/install-sysroot.py +++ b/build/linux/sysroot_scripts/install-sysroot.py -@@ -38,7 +38,7 @@ except ImportError: +@@ -42,7 +42,7 @@ except ImportError: SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -2836,6 +2855,18 @@ diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib Args: measurement: A description of the quantity being measured, e.g. "vm_peak". +diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/result_sink.py +--- a/build/util/lib/results/result_sink.py ++++ b/build/util/lib/results/result_sink.py +@@ -120,7 +120,7 @@ class ResultSinkClient(object): + 'name': test_id, + 'location': { + 'file_name': test_file, +- 'repo': 'https://chromium.googlesource.com/chromium/src', ++ 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', + } + } + diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt --- a/build/whitespace_file.txt +++ b/build/whitespace_file.txt @@ -2955,10 +2986,10 @@ diff --git a/chrome/android/webapk/PRESUBMIT.py b/chrome/android/webapk/PRESUBMI for more details about the presubmit API built into depot_tools. This presubmit checks for three rules: -diff --git a/chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json b/chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json ---- a/chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json -+++ b/chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json -@@ -1,20 +1,20 @@ +diff --git a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json +--- a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json ++++ b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json +@@ -1,21 +1,21 @@ { - "scope_url": "https://pwa-directory.appspot.com/", + "scope_url": "https://pwa-directory.8pp2p8t.qjz9zk/", @@ -2970,33 +3001,14 @@ diff --git a/chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json "scope_url_path": "/" }, - "start_url": "https://pwa-directory.appspot.com/", -+ "start_url": "https://pwa-directory.8pp2p8t.qjz9zk/", - "display_mode": "standalone", - "orientation": "portrait", - "android_orientation": "unspecified", - "theme_color": "2147483648L", - "background_color": "2147483648L", - "background_color_xml": "#F8F9FA", - "icon_urls_and_icon_murmur2_hashes": "https://pwa-directory.appspot.com/icon1.png 0 https://pwa-directory.appspot.com/icon2.png 0", - "web_manifest_url": "https://pwa-directory.appspot.com/manifest.json", ++ "start_url": "https://pwa-directory.8pp2p8t.qjz9zk/", + "icon_urls_and_icon_murmur2_hashes": "https://pwa-directory.8pp2p8t.qjz9zk/icon1.png 0 https://pwa-directory.8pp2p8t.qjz9zk/icon2.png 0", + "web_manifest_url": "https://pwa-directory.8pp2p8t.qjz9zk/manifest.json", - "distributor": "browser", - "version_code": "1", - "version_name": "1.0", -@@ -25,7 +25,7 @@ - "share_template": [{ - "index": "0", - "title": "Share Text and Images", -- "action": "https://pwa-directory.appspot.com/share.html", -+ "action": "https://pwa-directory.8pp2p8t.qjz9zk/share.html", - "method": "POST", - "enctype": "multipart/form-data", - "param_title": "title", -diff --git a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json ---- a/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json -+++ b/chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json -@@ -5,7 +5,7 @@ + "bound_webapk": { + "runtime_host": "org.chromium.chrome.tests" + }, "share_template": [{ "index": "0", "title": "Share Text and Images", @@ -3046,7 +3058,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -@@ -16,7 +16,7 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api): +@@ -18,7 +18,7 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api): These kinds of strings prevent proper localization in some languages. For more information, see the following chromium-dev thread: @@ -3055,7 +3067,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py """ problems = [] -@@ -30,8 +30,8 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api): +@@ -32,8 +32,8 @@ def _CheckNoProductNameInGeneratedResources(input_api, output_api): return [output_api.PresubmitPromptWarning( "Don't use PRODUCT_NAME placeholders in string resources. Instead, add " "separate strings to google_chrome_strings.grd and " @@ -3109,7 +3121,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -764,10 +764,10 @@ Chromium is unable to recover your settings. +@@ -758,10 +758,10 @@ Chromium is unable to recover your settings. $1Elisa is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you. @@ -3125,7 +3137,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -397,16 +397,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -405,16 +405,16 @@ are declared in tools/grit/grit_rule.gni. Permission request expired @@ -3146,7 +3158,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -588,7 +588,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -596,7 +596,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3155,8 +3167,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -742,7 +742,7 @@ are declared in tools/grit/grit_rule.gni. - Search image with Google Lens +@@ -762,7 +762,7 @@ are declared in tools/grit/grit_rule.gni. + Search your screen with Google Lens - &Go to $1http://www.google.com/ @@ -3164,7 +3176,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -817,7 +817,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -837,7 +837,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3173,8 +3185,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -983,7 +983,7 @@ are declared in tools/grit/grit_rule.gni. - Search Image with Google Lens +@@ -1015,7 +1015,7 @@ are declared in tools/grit/grit_rule.gni. + Search Your Screen with Google Lens - &Go to $1http://www.google.com/ @@ -3182,7 +3194,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1199,7 +1199,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1231,7 +1231,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3191,7 +3203,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1324,7 +1324,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1368,7 +1368,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3200,7 +3212,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2707,10 +2707,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2805,10 +2805,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3213,7 +3225,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2719,7 +2719,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2817,7 +2817,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3222,7 +3234,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2731,28 +2731,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2829,28 +2829,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3258,7 +3270,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2773,19 +2773,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2871,19 +2871,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3283,7 +3295,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2797,7 +2797,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2895,7 +2895,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3292,7 +3304,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2806,7 +2806,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2904,7 +2904,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3301,7 +3313,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -2918,7 +2918,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3016,7 +3016,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3310,7 +3322,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3443,13 +3443,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3541,13 +3541,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3327,7 +3339,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3654,10 +3654,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3556,7 +3556,7 @@ are declared in tools/grit/grit_rule.gni. + Stop sharing + + +- View tab: $1meet.google.com ++ View tab: $1meet.9oo91e.qjz9zk + + + Switch to capturing tab +@@ -3762,16 +3762,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3337,10 +3358,18 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Background Page: $1http://www.google.com + Background Page: $1http://www.9oo91e.qjz9zk + + +- Back/Forward Cached Page: $1http://www.google.com ++ Back/Forward Cached Page: $1http://www.9oo91e.qjz9zk + + +- Incognito Back/Forward Cached Page: $1http://www.google.com ++ Incognito Back/Forward Cached Page: $1http://www.9oo91e.qjz9zk Plugin: $1Unknown Plugin -@@ -3666,7 +3666,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3780,7 +3780,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3349,7 +3378,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3702,16 +3702,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3816,22 +3816,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -3359,6 +3388,14 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Incognito Subframe: $1https://youtube.com/ + Incognito Subframe: $1https://y0u1ub3.qjz9zk/ + + +- Back/Forward Cached Subframe: $1http://www.google.com ++ Back/Forward Cached Subframe: $1http://www.9oo91e.qjz9zk + + +- Incognito Back/Forward Cached Subframe: $1http://www.google.com ++ Incognito Back/Forward Cached Subframe: $1http://www.9oo91e.qjz9zk - Portal: $1https://youtube.com/ @@ -3370,7 +3407,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -3912,13 +3912,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -4032,13 +4032,13 @@ are declared in tools/grit/grit_rule.gni. These items may be dangerous @@ -3386,7 +3423,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The app "$1Gmail" was automatically removed. -@@ -3930,10 +3930,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4050,10 +4050,10 @@ are declared in tools/grit/grit_rule.gni. @@ -3399,7 +3436,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4072,22 +4072,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4192,22 +4192,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3428,7 +3465,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4096,10 +4096,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4216,10 +4216,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3441,7 +3478,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4451,7 +4451,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4584,7 +4584,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3450,7 +3487,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4495,7 +4495,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4628,7 +4628,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3459,7 +3496,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -4788,7 +4788,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4921,7 +4921,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3468,7 +3505,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5031,7 +5031,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5167,7 +5167,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3477,7 +3514,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved in your Google Account so you can use them on any device -@@ -5358,7 +5358,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5494,7 +5494,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3486,7 +3523,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5369,7 +5369,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5505,7 +5505,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3495,7 +3532,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5379,7 +5379,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5515,7 +5515,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3504,7 +3541,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5388,16 +5388,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5524,16 +5524,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3524,7 +3561,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -5769,7 +5769,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5909,7 +5909,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> @@ -3533,20 +3570,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Top picks for you -@@ -5778,10 +5778,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5918,10 +5918,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? -- You're seeing this item based on your previous activity using Google services. You can see your data, delete it, and change your settings at <a href="https://myactivity.google.com/" target="_blank">myactivity.google.com</a>. -+ You're seeing this item based on your previous activity using Google services. You can see your data, delete it, and change your settings at <a href="https://myactivity.9oo91e.qjz9zk/" target="_blank">myactivity.9oo91e.qjz9zk</a>. +- You're seeing this item based on your previous activity using Google services. You can see your data, delete it, and change your settings at <a href="https://myactivity.google.com/" target="_blank">myactivity.google.com</a>. ++ You're seeing this item based on your previous activity using Google services. You can see your data, delete it, and change your settings at <a href="https://myactivity.9oo91e.qjz9zk/" target="_blank">myactivity.9oo91e.qjz9zk</a>. <br> <br> -- Learn about the data Google collects and why at <a href="https://policies.google.com/" target="_blank">policies.google.com</a>. -+ Learn about the data Google collects and why at <a href="https://policies.9oo91e.qjz9zk/" target="_blank">policies.9oo91e.qjz9zk</a>. +- Learn about the data Google collects and why at <a href="https://policies.google.com/" target="_blank">policies.google.com</a>. ++ Learn about the data Google collects and why at <a href="https://policies.9oo91e.qjz9zk/" target="_blank">policies.9oo91e.qjz9zk</a>. Close -@@ -6011,7 +6011,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6177,7 +6177,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3555,7 +3592,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6118,7 +6118,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6284,7 +6284,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 @@ -3564,7 +3601,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6218,7 +6218,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6384,7 +6384,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. @@ -3573,7 +3610,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6255,7 +6255,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6421,7 +6421,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. @@ -3582,7 +3619,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6419,7 +6419,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6585,7 +6585,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for %1$sexample.com @@ -3591,7 +3628,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6603,7 +6603,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6769,7 +6769,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -3600,7 +3637,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6613,7 +6613,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6779,7 +6779,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3609,7 +3646,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -6837,7 +6837,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7003,7 +7003,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -3618,7 +3655,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7151,31 +7151,31 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7332,31 +7332,31 @@ Keep your key file in a safe place. You will need it to create new versions of y $1html5rocks.com is sharing your screen. @@ -3655,7 +3692,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Hide -@@ -7203,7 +7203,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7384,7 +7384,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3664,7 +3701,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7211,10 +7211,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7392,10 +7392,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -3677,7 +3714,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8260,7 +8260,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8467,7 +8467,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Work @@ -3686,7 +3723,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8269,10 +8269,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8476,10 +8476,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -3699,7 +3736,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8297,13 +8297,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8504,13 +8504,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -3715,7 +3752,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8352,7 +8352,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8559,7 +8559,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -3724,7 +3761,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -8363,8 +8363,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8570,8 +8570,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -3735,7 +3772,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8389,7 +8389,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8596,7 +8596,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Date Modified @@ -3744,7 +3781,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8959,7 +8959,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9186,7 +9186,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3753,7 +3790,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9379,7 +9379,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9606,7 +9606,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3762,7 +3799,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -9419,7 +9419,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9649,7 +9649,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. @@ -3771,7 +3808,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 -@@ -9508,7 +9508,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9738,7 +9738,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3780,7 +3817,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9540,10 +9540,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9770,10 +9770,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3793,7 +3830,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9654,19 +9654,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9884,19 +9884,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -3816,7 +3853,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -9687,10 +9687,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9917,10 +9917,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3829,7 +3866,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -9727,7 +9727,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9957,7 +9957,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -3838,7 +3875,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -9754,7 +9754,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9984,7 +9984,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -3847,25 +3884,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9946,7 +9946,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10176,7 +10176,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. - $1Google Hangouts wants to share the contents of your screen with $2https://google.com. + $1Google Hangouts wants to share the contents of your screen with $2https://9oo91e.qjz9zk. - - Share audio -@@ -9977,7 +9977,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - Share this tab - - -- $1https://google.com is asking for permission to capture the contents of this tab. -+ $1https://9oo91e.qjz9zk is asking for permission to capture the contents of this tab. - - - Share audio -@@ -10011,7 +10011,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + + Share system audio +@@ -10210,7 +10210,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3874,7 +3902,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10083,8 +10083,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10282,8 +10282,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -3885,7 +3913,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10292,7 +10292,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10491,7 +10491,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3894,16 +3922,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -10386,7 +10386,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - No nearby devices found. - - -- $1www.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: -+ $1www.9oo91e.qjz9zk wants to scan for nearby Bluetooth devices. The following devices have been found: - - - Allow -@@ -10418,7 +10418,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10597,7 +10597,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3912,7 +3931,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -10458,7 +10458,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10637,7 +10637,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3921,7 +3940,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -10486,7 +10486,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10688,7 +10688,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3930,7 +3949,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -10610,7 +10610,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10812,7 +10812,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3939,7 +3958,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 -@@ -10785,13 +10785,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10999,13 +10999,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3955,7 +3974,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -10885,7 +10885,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11099,7 +11099,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3964,7 +3983,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -10900,7 +10900,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11114,7 +11114,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -3973,7 +3992,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10999,7 +10999,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11213,7 +11213,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3982,7 +4001,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -11015,7 +11015,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11229,7 +11229,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 @@ -3991,7 +4010,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. -@@ -11024,13 +11024,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11238,13 +11238,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4007,7 +4026,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -11238,7 +11238,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11496,7 +11496,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4059,7 +4078,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -772,10 +772,10 @@ Google Chrome is unable to recover your settings. +@@ -766,10 +766,10 @@ Google Chrome is unable to recover your settings. $1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you. @@ -4130,7 +4149,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -319,14 +319,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -324,14 +324,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -4147,18 +4166,18 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc - "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}}; + "https://performance-insights.8pp2p8t.qjz9zk/upload?tags=flags,TestingTeam"}}; - const FeatureEntry::Choice kPassiveListenersChoices[] = { + const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3713,7 +3713,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3854,7 +3854,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, - "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, + "https://chrome-sync.sandbox.9oo91e.qjz9zk/chrome-sync/alpha")}, #if !defined(OS_ANDROID) - {"load-media-router-component-extension", - flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -3958,7 +3958,7 @@ const FeatureEntry kFeatureEntries[] = { + {"media-router-cast-allow-all-ips", + flag_descriptions::kMediaRouterCastAllowAllIPsName, +@@ -4066,7 +4066,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4206,8 +4225,8 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/ diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc --- a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc -@@ -56,7 +56,7 @@ const char kMinimumIconSize = 64; - const uint64_t kMurmur2HashSeed = 0; +@@ -62,7 +62,7 @@ constexpr base::TimeDelta kMinterResponseTimeout = + base::TimeDelta::FromSeconds(60); constexpr char kWebApkServerUrl[] = - "https://webapk.googleapis.com/v1/webApks?key="; @@ -4254,7 +4273,7 @@ diff --git a/chrome/browser/ash/app_mode/fake_cws.cc b/chrome/browser/ash/app_mo diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc --- a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc -@@ -55,7 +55,7 @@ signin::ScopeSet GetAccessTokenScopes() { +@@ -57,7 +57,7 @@ signin::ScopeSet GetAccessTokenScopes() { } // namespace const char kAuthTokenExchangeEndPoint[] = @@ -4278,7 +4297,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc --- a/chrome/browser/ash/assistant/assistant_util.cc +++ b/chrome/browser/ash/assistant/assistant_util.cc -@@ -119,8 +119,8 @@ bool IsEmailDomainSupported(const Profile* profile) { +@@ -118,8 +118,8 @@ bool IsEmailDomainSupported(const Profile* profile) { const std::string email = GetUser(profile)->GetAccountId().GetUserEmail(); DCHECK(!email.empty()); @@ -4292,7 +4311,7 @@ diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/browser/ash/attestation/attestation_ca_client.cc --- a/chrome/browser/ash/attestation/attestation_ca_client.cc +++ b/chrome/browser/ash/attestation/attestation_ca_client.cc -@@ -31,15 +31,15 @@ const char kAttestationServerTest[] = "test"; +@@ -32,15 +32,15 @@ const char kAttestationServerTest[] = "test"; // Endpoints for the default Google Privacy CA operations. const char kDefaultEnrollRequestURL[] = @@ -4315,7 +4334,7 @@ diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/br diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc --- a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc +++ b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc -@@ -25,17 +25,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; +@@ -26,17 +26,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; // The url to download the proto of the complete list of wallpaper collections. constexpr char kBackdropCollectionsUrl[] = @@ -4336,10 +4355,22 @@ diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_h "image?rt=b"; // The label used to return exclusive content or filter unwanted images. +diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc +--- a/chrome/browser/ash/borealis/borealis_util.cc ++++ b/chrome/browser/ash/borealis/borealis_util.cc +@@ -22,7 +22,7 @@ const char kBorealisAppIdRegex[] = "([^/]+\\d+)"; + + // Base feedback form URL, without query parameters for prefilling. + static constexpr char kFeedbackUrl[] = +- "https://docs.google.com/forms/d/e/" ++ "https://docs.9oo91e.qjz9zk/forms/d/e/" + "1FAIpQLSfyI7K7xV3pKiQeJ-yZlep4XI8ZY9bbr7D33LY2jm4Zoda1cg/" + "viewform?usp=pp_url"; + diff --git a/chrome/browser/ash/child_accounts/child_user_service.cc b/chrome/browser/ash/child_accounts/child_user_service.cc --- a/chrome/browser/ash/child_accounts/child_user_service.cc +++ b/chrome/browser/ash/child_accounts/child_user_service.cc -@@ -21,7 +21,7 @@ const char ChildUserService::kFamilyLinkHelperAppPackageName[] = +@@ -61,7 +61,7 @@ const char ChildUserService::kFamilyLinkHelperAppPackageName[] = "com.google.android.apps.kids.familylinkhelper"; // static const char ChildUserService::kFamilyLinkHelperAppPlayStoreURL[] = @@ -4363,7 +4394,7 @@ diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc -@@ -62,7 +62,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -63,7 +63,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -4375,7 +4406,7 @@ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/c diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc -@@ -173,7 +173,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { +@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -4384,6 +4415,53 @@ diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome // A custom extensions::ExternalLoader that the ServicesCustomizationDocument // creates and uses to publish OEM default apps to the extensions system. +diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc +--- a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc ++++ b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc +@@ -10,7 +10,7 @@ namespace enhanced_network_tts { + const char kGoogApiKeyHeader[] = "X-Goog-Api-Key"; + + const char kReadAloudServerUrl[] = +- "https://readaloud.googleapis.com//v1:generateAudioDocStream"; ++ "https://readaloud.9oo91eapis.qjz9zk//v1:generateAudioDocStream"; + + const char kNetworkRequestUploadType[] = "application/json"; + +diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrome/browser/ash/file_manager/file_manager_string_util.cc +--- a/chrome/browser/ash/file_manager/file_manager_string_util.cc ++++ b/chrome/browser/ash/file_manager/file_manager_string_util.cc +@@ -27,25 +27,25 @@ namespace { + + // Location of the page to buy more storage for Google Drive. + const char kGoogleDriveBuyStorageUrl[] = +- "https://www.google.com/settings/storage"; ++ "https://www.9oo91e.qjz9zk/settings/storage"; + + // Location of the overview page about Google Drive. + const char kGoogleDriveOverviewUrl[] = +- "https://support.google.com/chromebook/?p=filemanager_drive"; ++ "https://support.9oo91e.qjz9zk/chromebook/?p=filemanager_drive"; + + // Location of Google Drive specific help. + const char kGoogleDriveHelpUrl[] = +- "https://support.google.com/chromebook/?p=filemanager_drivehelp"; ++ "https://support.9oo91e.qjz9zk/chromebook/?p=filemanager_drivehelp"; + + // Location of the help page about making Google Drive files available offline. + const char kGoogleDriveOfflineHelpUrl[] = +- "http://support.google.com/chromebook/?p=offline_files"; ++ "http://support.9oo91e.qjz9zk/chromebook/?p=offline_files"; + + // Location of Google Drive root. +-const char kGoogleDriveRootUrl[] = "https://drive.google.com"; ++const char kGoogleDriveRootUrl[] = "https://drive.9oo91e.qjz9zk"; + + // Printf format +-const char kHelpURLFormat[] = "https://support.google.com/chromebook/answer/%d"; ++const char kHelpURLFormat[] = "https://support.9oo91e.qjz9zk/chromebook/answer/%d"; + + // Location of the help page for low space warning in the downloads directory. + const int kDownloadsLowSpaceWarningHelpNumber = 1061547; 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 @@ -4411,7 +4489,7 @@ diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chr diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/browser/ash/login/marketing_backend_connector.cc --- a/chrome/browser/ash/login/marketing_backend_connector.cc +++ b/chrome/browser/ash/login/marketing_backend_connector.cc -@@ -31,10 +31,10 @@ namespace chromeos { +@@ -32,10 +32,10 @@ namespace chromeos { namespace { // The scope that will be used to access the ChromebookEmailService API. const char kChromebookOAuth2Scope[] = @@ -4427,7 +4505,7 @@ diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/br diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc --- a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc +++ b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc -@@ -72,7 +72,7 @@ const char kAcceptValue[] = +@@ -73,7 +73,7 @@ const char kAcceptValue[] = "Accept=text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"; const char kPasswordSyncTokenBaseEndPoint[] = @@ -4439,7 +4517,7 @@ diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chro diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc -@@ -37,7 +37,7 @@ namespace ash { +@@ -38,7 +38,7 @@ namespace ash { namespace { constexpr const char kGetAppListUrl[] = @@ -4472,7 +4550,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/brow diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc --- a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc -@@ -33,8 +33,8 @@ namespace plugin_vm { +@@ -34,8 +34,8 @@ namespace plugin_vm { namespace { constexpr char kValidationOAuth2Scope[] = @@ -4486,7 +4564,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc --- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc -@@ -127,7 +127,7 @@ void RemoveDriveDownloadDirectoryIfExists() { +@@ -110,7 +110,7 @@ void RemoveDriveDownloadDirectoryIfExists() { absl::optional GetIdFromDriveUrl(const GURL& url) { const std::string& spec = url.spec(); @@ -4495,7 +4573,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash if (base::StartsWith(spec, kOpenUrlBase, base::CompareCase::INSENSITIVE_ASCII)) { // e.g. https://drive.google.com/open?id=[ID] -@@ -139,9 +139,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { +@@ -122,9 +122,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { // These will match some invalid URLs, which is fine. const std::string kViewUrlPatternWithDomain = @@ -4507,6 +4585,42 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash if (base::MatchPattern(spec, kViewUrlPatternWithDomain) || base::MatchPattern(spec, kViewUrlPatternWithoutDomain)) { // e.g. https://drive.google.com/a/example.org/file/d/[ID]/view?usp=sharing +diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +--- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc ++++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +@@ -140,7 +140,7 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", + "execs.com", + "exemail.com.au", + "f-m.fm", +- "facebook.com", ++ "f8c3b00k.qjz9zk", + "fast-email.com", + "fast-mail.org", + "fastem.com", +@@ -179,9 +179,9 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", + "gardener.com", + "geologist.com", + "germanymail.com", +- "gmail.com", ++ "9ma1l.qjz9zk", + "gmx.com", +- "googlemail.com", ++ "9oo91email.qjz9zk", + "graduate.org", + "graphic-designer.com", + "greenmail.net", +diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc +--- a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc ++++ b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc +@@ -53,7 +53,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; + constexpr mc::SystemNotificationWarningLevel kNotificationLevel = + mc::SystemNotificationWarningLevel::NORMAL; + const char kNotificationLearnMoreLink[] = +- "https://support.google.com/chromebook?p=factory_reset"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=factory_reset"; + + std::u16string GetEnterpriseManager() { + policy::BrowserPolicyConnectorChromeOS* connector = diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc --- a/chrome/browser/autofill/autofill_gstatic_reader.cc +++ b/chrome/browser/autofill/autofill_gstatic_reader.cc @@ -4577,8 +4691,8 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv // Polulate and add some carts with fake data. double time_now = base::Time::Now().ToDoubleT(); cart_db::ChromeCartContentProto dummy_proto1; -- GURL dummy_url1 = GURL("https://www.google.com/"); -+ GURL dummy_url1 = GURL("https://www.9oo91e.qjz9zk/"); +- GURL dummy_url1 = GURL("https://shopping.google.com"); ++ GURL dummy_url1 = GURL("https://shopping.9oo91e.qjz9zk"); dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1)); dummy_proto1.set_merchant("Cart Foo"); dummy_proto1.set_merchant_cart_url(dummy_url1.spec()); @@ -4599,6 +4713,75 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); dummy_proto1.add_product_image_urls( - "https://encrypted-tbn1.gstatic.com/" ++ "https://encrypted-tbn1.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" + "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" + "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); +@@ -510,12 +510,12 @@ void CartService::AddCartsWithFakeData() { + l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, + u"20%")); + dummy_proto2.add_product_image_urls( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); + dummy_proto2.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); +@@ -533,7 +533,7 @@ void CartService::AddCartsWithFakeData() { + l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, + u"$50")); + dummy_proto3.add_product_image_urls( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); +@@ -548,12 +548,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( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); + dummy_proto4.add_product_image_urls( +- "https://encrypted-tbn1.gstatic.com/" ++ "https://encrypted-tbn1.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" + "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" + "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); +@@ -568,7 +568,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( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); +@@ -583,17 +583,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( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); + dummy_proto6.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); + dummy_proto6.add_product_image_urls( +- "https://encrypted-tbn1.gstatic.com/" + "https://encrypted-tbn1.95tat1c.qjz9zk/" "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" @@ -4680,22 +4863,10 @@ diff --git a/chrome/browser/chromeos/android_sms/android_sms_urls.cc b/chrome/br break; } return stream; -diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc ---- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc -+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc -@@ -858,7 +858,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGotDownloadUrl( - const CoreAccountId& account_id = - identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSignin); - std::vector scopes; -- scopes.emplace_back("https://www.googleapis.com/auth/drive.readonly"); -+ scopes.emplace_back("https://www.9oo91eapis.qjz9zk/auth/drive.readonly"); - - scoped_refptr url_loader_factory = - browser_context() 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 -@@ -82,7 +82,7 @@ namespace { +@@ -83,7 +83,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -4704,41 +4875,6 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc // Thresholds for mountCrostini() API. constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = -diff --git a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc ---- a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc -+++ b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc -@@ -27,25 +27,25 @@ namespace { - - // Location of the page to buy more storage for Google Drive. - const char kGoogleDriveBuyStorageUrl[] = -- "https://www.google.com/settings/storage"; -+ "https://www.9oo91e.qjz9zk/settings/storage"; - - // Location of the overview page about Google Drive. - const char kGoogleDriveOverviewUrl[] = -- "https://support.google.com/chromebook/?p=filemanager_drive"; -+ "https://support.9oo91e.qjz9zk/chromebook/?p=filemanager_drive"; - - // Location of Google Drive specific help. - const char kGoogleDriveHelpUrl[] = -- "https://support.google.com/chromebook/?p=filemanager_drivehelp"; -+ "https://support.9oo91e.qjz9zk/chromebook/?p=filemanager_drivehelp"; - - // Location of the help page about making Google Drive files available offline. - const char kGoogleDriveOfflineHelpUrl[] = -- "http://support.google.com/chromebook/?p=offline_files"; -+ "http://support.9oo91e.qjz9zk/chromebook/?p=offline_files"; - - // Location of Google Drive root. --const char kGoogleDriveRootUrl[] = "https://drive.google.com"; -+const char kGoogleDriveRootUrl[] = "https://drive.9oo91e.qjz9zk"; - - // Printf format --const char kHelpURLFormat[] = "https://support.google.com/chromebook/answer/%d"; -+const char kHelpURLFormat[] = "https://support.9oo91e.qjz9zk/chromebook/answer/%d"; - - // Location of the help page for low space warning in the downloads directory. - const int kDownloadsLowSpaceWarningHelpNumber = 1061547; diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc @@ -4763,7 +4899,7 @@ diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/c diff --git a/chrome/browser/chromeos/input_method/assistive_suggester.cc b/chrome/browser/chromeos/input_method/assistive_suggester.cc --- a/chrome/browser/chromeos/input_method/assistive_suggester.cc +++ b/chrome/browser/chromeos/input_method/assistive_suggester.cc -@@ -33,16 +33,16 @@ const char kMaxTextBeforeCursorLength = 50; +@@ -36,23 +36,23 @@ const char kMaxTextBeforeCursorLength = 50; const char* kAllowedDomainsForPersonalInfoSuggester[] = { "discord.com", "messenger.com", "web.whatsapp.com", @@ -4785,6 +4921,16 @@ diff --git a/chrome/browser/chromeos/input_method/assistive_suggester.cc b/chrom + "voice.9oo91e.qjz9zk", }; + const char* kAllowedDomainsForMultiWordSuggester[] = { + "discord.com", "messenger.com", "web.whatsapp.com", +- "web.skype.com", "duo.google.com", "hangouts.google.com", +- "chat.google.com", "messages.google.com", "web.telegram.org", +- "voice.google.com", ++ "web.skype.com", "duo.9oo91e.qjz9zk", "hangouts.9oo91e.qjz9zk", ++ "chat.9oo91e.qjz9zk", "messages.9oo91e.qjz9zk", "web.telegram.org", ++ "voice.9oo91e.qjz9zk", + }; + const char* kTestUrls[] = { diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc --- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc @@ -4863,9 +5009,27 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_ const base::TimeDelta kTimeoutAfterHostResolution = base::TimeDelta::FromSeconds(10); -diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc ---- a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc -+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc +diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_start_crd_session_job.cc +--- a/chrome/browser/chromeos/policy/remote_commands/device_command_start_crd_session_job.cc ++++ b/chrome/browser/chromeos/policy/remote_commands/device_command_start_crd_session_job.cc +@@ -33,11 +33,11 @@ namespace { + + // OAuth2 Token scopes + constexpr char kCloudDevicesOAuth2Scope[] = +- "https://www.googleapis.com/auth/clouddevices"; ++ "https://www.9oo91eapis.qjz9zk/auth/clouddevices"; + constexpr char kChromotingRemoteSupportOAuth2Scope[] = +- "https://www.googleapis.com/auth/chromoting.remote.support"; ++ "https://www.9oo91eapis.qjz9zk/auth/chromoting.remote.support"; + constexpr char kTachyonOAuth2Scope[] = +- "https://www.googleapis.com/auth/tachyon"; ++ "https://www.9oo91eapis.qjz9zk/auth/tachyon"; + + // Job parameters fields: + +diff --git a/chrome/browser/chromeos/policy/uploading/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/uploading/heartbeat_scheduler.cc +--- a/chrome/browser/chromeos/policy/uploading/heartbeat_scheduler.cc ++++ b/chrome/browser/chromeos/policy/uploading/heartbeat_scheduler.cc @@ -30,11 +30,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; // The default destination we send our GCM messages to. @@ -4880,36 +5044,6 @@ diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/brow // A bit mask, listening events of upstream notification. const char kUpstreamNotificationSignUpListeningEvents[] = -diff --git a/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc b/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc ---- a/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc -+++ b/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc -@@ -53,7 +53,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; - constexpr mc::SystemNotificationWarningLevel kNotificationLevel = - mc::SystemNotificationWarningLevel::NORMAL; - const char kNotificationLearnMoreLink[] = -- "https://support.google.com/chromebook?p=factory_reset"; -+ "https://support.9oo91e.qjz9zk/chromebook?p=factory_reset"; - - std::u16string GetEnterpriseManager() { - policy::BrowserPolicyConnectorChromeOS* connector = -diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc ---- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc -+++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc -@@ -36,11 +36,11 @@ namespace { - - // OAuth2 Token scopes - constexpr char kCloudDevicesOAuth2Scope[] = -- "https://www.googleapis.com/auth/clouddevices"; -+ "https://www.9oo91eapis.qjz9zk/auth/clouddevices"; - constexpr char kChromotingRemoteSupportOAuth2Scope[] = -- "https://www.googleapis.com/auth/chromoting.remote.support"; -+ "https://www.9oo91eapis.qjz9zk/auth/chromoting.remote.support"; - constexpr char kTachyonOAuth2Scope[] = -- "https://www.googleapis.com/auth/tachyon"; -+ "https://www.9oo91eapis.qjz9zk/auth/tachyon"; - - class DefaultNativeMessageHostFactory - : public CRDHostDelegate::NativeMessageHostFactory { diff --git a/chrome/browser/chromeos/u2f_notification.cc b/chrome/browser/chromeos/u2f_notification.cc --- a/chrome/browser/chromeos/u2f_notification.cc +++ b/chrome/browser/chromeos/u2f_notification.cc @@ -4942,7 +5076,7 @@ diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrom 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 -@@ -68,7 +68,7 @@ void DeletePreviewsOptOutDatabaseOnDBThread( +@@ -67,7 +67,7 @@ void DeletePreviewsOptOutDatabaseOnDBThread( } // Assume that any proxy host ending with this suffix is a Data Reduction Proxy. @@ -4951,7 +5085,7 @@ diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_set // Searches |proxy_list| for any Data Reduction Proxies, even if they don't // match a currently configured Data Reduction Proxy. -@@ -185,7 +185,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper( +@@ -184,7 +184,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". @@ -4988,7 +5122,7 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome/browser/enterprise/connectors/connectors_service.cc --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -138,7 +138,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -143,7 +143,7 @@ const char kServiceProviderConfig[] = R"({ "version": { "1": { "analysis": { @@ -4997,7 +5131,7 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome "supported_tags": [ { "name": "malware", -@@ -191,7 +191,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -196,7 +196,7 @@ const char kServiceProviderConfig[] = R"({ ] }, "reporting": { @@ -5009,7 +5143,7 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc --- a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +++ b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc -@@ -39,7 +39,7 @@ namespace { +@@ -45,7 +45,7 @@ const char kOAuthConsumerName[] = "file_system_signin_dialog"; // 4/ This URI is used by other native apps for the same purpose. // 5/ It is controlled by Google. bool IsOAuth2RedirectURI(const GURL& url) { @@ -5039,6 +5173,21 @@ diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_req // TODO(crbug.com/1187930): Eliminate the use of `gfx::kChromeIconGrey` and // instead retrieve the icon color via a ui::ColorProvider once message center // has been updated to use the ColorProvider infrastructure. +diff --git a/chrome/browser/enterprise/signals/context_info_fetcher.cc b/chrome/browser/enterprise/signals/context_info_fetcher.cc +--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc ++++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc +@@ -163,9 +163,9 @@ absl::optional ContextInfoFetcher::GetChromeCleanupEnabled() { + } + + bool ContextInfoFetcher::GetChromeRemoteDesktopAppBlocked() { +- return IsURLBlocked(GURL("https://remotedesktop.google.com"), ++ return IsURLBlocked(GURL("https://remotedesktop.9oo91e.qjz9zk"), + browser_context_) || +- IsURLBlocked(GURL("https://remotedesktop.corp.google.com"), ++ IsURLBlocked(GURL("https://remotedesktop.corp.9oo91e.qjz9zk"), + browser_context_); + } + diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc --- a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc @@ -5071,6 +5220,18 @@ diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_priva // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the // elements of |list| equals |hash|. +diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc ++++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +@@ -50,7 +50,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( + // implemented for secondary profiles in Lacros. + CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) + << "Attempted to use an incorrect profile. Please file a bug at " +- "https://bugs.chromium.org/ if this happens."; ++ "https://bugs.ch40m1um.qjz9zk/ if this happens."; + return chromeos::LacrosService::Get()->GetRemote().get(); + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) + diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc --- a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc +++ b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc @@ -5095,6 +5256,18 @@ diff --git a/chrome/browser/extensions/api/management/chrome_management_api_dele const char kChromeWebStoreReferrer[] = "&referrer=chrome_web_store"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) +diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +--- a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc ++++ b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +@@ -71,7 +71,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( + // implemented for secondary profiles in Lacros. + CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) + << "Attempted to use an incorrect profile. Please file a bug at " +- "https://bugs.chromium.org/ if this happens."; ++ "https://bugs.ch40m1um.qjz9zk/ if this happens."; + return chromeos::LacrosService::Get()->GetRemote().get(); + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) + diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/chrome/browser/extensions/chrome_extension_browser_constants.cc --- a/chrome/browser/extensions/chrome_extension_browser_constants.cc +++ b/chrome/browser/extensions/chrome_extension_browser_constants.cc @@ -5109,7 +5282,7 @@ diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/c diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc -@@ -333,7 +333,7 @@ void ExternalPrefLoader::LoadOnFileThread() { +@@ -330,7 +330,7 @@ void ExternalPrefLoader::LoadOnFileThread() { if (!prefs->DictEmpty()) LOG(WARNING) << "You are using an old-style extension deployment method " "(external_extensions.json), which will soon be " @@ -5157,7 +5330,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ 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 -@@ -23,7 +23,7 @@ namespace federated_learning { +@@ -24,7 +24,7 @@ namespace federated_learning { namespace { const char kQueryFlocPermissionUrl[] = @@ -5169,7 +5342,7 @@ diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc diff --git a/chrome/browser/feedback/feedback_uploader_chrome.cc b/chrome/browser/feedback/feedback_uploader_chrome.cc --- a/chrome/browser/feedback/feedback_uploader_chrome.cc +++ b/chrome/browser/feedback/feedback_uploader_chrome.cc -@@ -37,7 +37,7 @@ constexpr char kAuthenticationErrorLogMessage[] = +@@ -38,7 +38,7 @@ constexpr char kAuthenticationErrorLogMessage[] = constexpr char kConsumer[] = "feedback_uploader_chrome"; @@ -5181,7 +5354,7 @@ diff --git a/chrome/browser/feedback/feedback_uploader_chrome.cc b/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 -@@ -561,7 +561,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = +@@ -620,7 +620,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = "Detect target embedding domains as lookalikes."; const char kDetectTargetEmbeddingLookalikesDescription[] = "Shows a lookalike interstitial when navigating to target embedding domains" @@ -5190,15 +5363,24 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeviceDiscoveryNotificationsName[] = "Device Discovery Notifications"; -@@ -2185,7 +2185,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2282,7 +2282,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. " +- "See https://www.chromium.org/updates/ua-reduction for more info."; ++ "See https://www.ch40m1um.qjz9zk/updates/ua-reduction for more info."; + + const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; + const char kRestrictGamepadAccessDescription[] = +@@ -2299,7 +2299,7 @@ const char kIntensiveWakeUpThrottlingName[] = const char kIntensiveWakeUpThrottlingDescription[] = "When enabled, wake ups from DOM Timers are limited to 1 per minute in a " "page that has been hidden for 5 minutes. For additional details, see " - "https://www.chromestatus.com/feature/4718288976216064."; + "https://www.ch40mestatus.qjz9zk/feature/4718288976216064."; - const char kPrinterStatusName[] = "Show printer Status"; - const char kPrinterStatusDescription[] = + const char kSafetyTipName[] = + "Show Safety Tip UI when visiting low-reputation websites"; diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc --- a/chrome/browser/importer/edge_importer_browsertest_win.cc +++ b/chrome/browser/importer/edge_importer_browsertest_win.cc @@ -5355,14 +5537,16 @@ diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/ch 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 -@@ -31,8 +31,8 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider"; +@@ -31,9 +31,9 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider"; // List of origins allowed to use a PresentationRequest to initiate mirroring. - constexpr std::array kPresentationApiAllowlist = { + constexpr std::array kPresentationApiAllowlist = { - "https://docs.google.com", - "https://meet.google.com", +- "https://music.youtube.com", + "https://docs.9oo91e.qjz9zk", + "https://meet.9oo91e.qjz9zk", ++ "https://music.y0u1ub3.qjz9zk", }; // Returns a list of origins that are valid for |source_id|. An empty list @@ -5403,7 +5587,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/b diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -122,7 +122,7 @@ void OnURLLoadUploadProgress(uint64_t current, uint64_t total) { +@@ -123,7 +123,7 @@ void OnURLLoadUploadProgress(uint64_t current, uint64_t total) { } // namespace const char WebRtcEventLogUploaderImpl::kUploadURL[] = @@ -5415,7 +5599,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/b diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -466,7 +466,7 @@ void WebRtcLogUploader::UploadCompressedLog( +@@ -467,7 +467,7 @@ void WebRtcLogUploader::UploadCompressedLog( "Not implemented, it would be good to do so." })"); @@ -5439,7 +5623,7 @@ diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/ diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc --- a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc +++ b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc -@@ -32,7 +32,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace { // -------------------- Nearby Share Service v1 Endpoints -------------------- const char kDefaultNearbyShareV1HTTPHost[] = @@ -5448,7 +5632,7 @@ diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc b/ const char kNearbyShareV1Path[] = "v1/"; -@@ -44,7 +44,7 @@ const char kPageToken[] = "page_token"; +@@ -43,7 +43,7 @@ const char kPageToken[] = "page_token"; const char kSecretIds[] = "secret_ids"; const char kNearbyShareOAuth2Scope[] = @@ -5476,7 +5660,7 @@ diff --git a/chrome/browser/nearby_sharing/instantmessaging/constants.h b/chrome diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc --- a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ namespace { const char kNetworkTraversalIceConfigApiUrl[] = @@ -5485,7 +5669,7 @@ diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher. // Response with 2 ice server configs takes ~1KB. A loose upper bound of 16KB is // chosen to avoid breaking the flow in case the response has longer URLs in ice -@@ -79,11 +79,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader) { +@@ -81,11 +81,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader) { std::vector GetDefaultIceServers() { sharing::mojom::IceServerPtr ice_server(sharing::mojom::IceServer::New()); @@ -5505,7 +5689,7 @@ diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher. diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc --- a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc -@@ -32,7 +32,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { namespace tachyon_proto = nearbyshare::tachyon_proto; const char kIceConfigApiUrl[] = @@ -5514,7 +5698,7 @@ diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrom const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; -@@ -166,11 +166,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader, +@@ -167,11 +167,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader, std::vector GetDefaultIceServers() { sharing::mojom::IceServerPtr ice_server(sharing::mojom::IceServer::New()); @@ -5531,6 +5715,45 @@ diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrom std::vector default_servers; default_servers.push_back(std::move(ice_server)); +diff --git a/chrome/browser/new_tab_page/modules/drive/drive_service.cc b/chrome/browser/new_tab_page/modules/drive/drive_service.cc +--- a/chrome/browser/new_tab_page/modules/drive/drive_service.cc ++++ b/chrome/browser/new_tab_page/modules/drive/drive_service.cc +@@ -55,7 +55,7 @@ constexpr char kRequestBody[] = R"({ + })"; + // Maximum accepted size of an ItemSuggest response. 1MB. + constexpr int kMaxResponseSize = 1024 * 1024; +-const char server_url[] = "https://appsitemsuggest-pa.googleapis.com/v1/items"; ++const char server_url[] = "https://appsitemsuggest-pa.9oo91eapis.qjz9zk/v1/items"; + constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = + net::DefineNetworkTrafficAnnotation("drive_service", R"( + semantics { +@@ -97,7 +97,7 @@ constexpr char kFakeData[] = R"({ + "item": [ + { + "itemId": "foo", +- "url": "https://docs.google.com", ++ "url": "https://docs.9oo91e.qjz9zk", + "driveItem": { + "title": "foo doc", + "mimeType": "application/vnd.google-apps.document" +@@ -108,7 +108,7 @@ constexpr char kFakeData[] = R"({ + }, + { + "itemId": "bar", +- "url": "https://sheets.google.com", ++ "url": "https://sheets.9oo91e.qjz9zk", + "driveItem": { + "title": "bar sheet", + "mimeType": "application/vnd.google-apps.spreadsheet" +@@ -119,7 +119,7 @@ constexpr char kFakeData[] = R"({ + }, + { + "itemId": "baz", +- "url": "https://slides.google.com", ++ "url": "https://slides.9oo91e.qjz9zk", + "driveItem": { + "title": "baz slides", + "mimeType": "application/vnd.google-apps.presentation" diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm @@ -5543,18 +5766,6 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/ - (void)userNotificationCenter:(NSUserNotificationCenter*)center didRemoveDeliveredNotifications:(NSArray*)notifications { for (NSUserNotification* notification in notifications) { -diff --git a/chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_test_utils.h b/chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_test_utils.h ---- a/chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_test_utils.h -+++ b/chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_test_utils.h -@@ -22,7 +22,7 @@ - - namespace data_reduction_proxy { - --const char kDefaultTestUrl[] = "http://google.com"; -+const char kDefaultTestUrl[] = "http://9oo91e.qjz9zk"; - - page_load_metrics::mojom::ResourceDataUpdatePtr - CreateDataReductionProxyResource(bool was_cached, 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 @@ -5591,6 +5802,30 @@ diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_andr } // namespace +diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b/chrome/browser/platform_keys/extension_key_permissions_service.cc +--- a/chrome/browser/platform_keys/extension_key_permissions_service.cc ++++ b/chrome/browser/platform_keys/extension_key_permissions_service.cc +@@ -135,7 +135,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( + // implemented for secondary profiles in Lacros. + CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) + << "Attempted to use an incorrect profile. Please file a bug at " +- "https://bugs.chromium.org/ if this happens."; ++ "https://bugs.ch40m1um.qjz9zk/ if this happens."; + return chromeos::LacrosService::Get() + ->GetRemote() + .get(); +diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc +--- a/chrome/browser/platform_keys/extension_platform_keys_service.cc ++++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc +@@ -165,7 +165,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( + // implemented for secondary profiles in Lacros. + CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) + << "Attempted to use an incorrect profile. Please file a bug at " +- "https://bugs.chromium.org/ if this happens."; ++ "https://bugs.ch40m1um.qjz9zk/ if this happens."; + return chromeos::LacrosService::Get() + ->GetRemote() + .get(); diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/browser/policy/extension_force_install_mixin.cc --- a/chrome/browser/policy/extension_force_install_mixin.cc +++ b/chrome/browser/policy/extension_force_install_mixin.cc @@ -5693,6 +5928,18 @@ diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PR for more details about the presubmit API built into depot_tools. """ +diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/resources/about_sys/about_sys.js +--- a/chrome/browser/resources/about_sys/about_sys.js ++++ b/chrome/browser/resources/about_sys/about_sys.js +@@ -18,7 +18,7 @@ const MAX_FILE_SIZE = 10485760; + // + // Link to markdown doc with documentation for Chrome OS. + const CROS_MD_DOC_URL = +- 'https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/debugd/docs/log_entries.md'; ++ 'https://chromium.9oo91esource.qjz9zk/chromiumos/platform2/+/HEAD/debugd/docs/log_entries.md'; + // + + function getValueDivForButton(button) { diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html --- a/chrome/browser/resources/chromeos/about_os_credits.html +++ b/chrome/browser/resources/chromeos/about_os_credits.html @@ -5735,7 +5982,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1483,13 +1483,13 @@ CommandHandler.init = function() { +@@ -1525,13 +1525,13 @@ CommandHandler.init = function() { } }); @@ -5855,6 +6102,18 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt body { margin: 0 0 20px 0; +diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html +--- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html ++++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html +@@ -60,7 +60,7 @@ + + + +- ++ + + diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js @@ -5915,7 +6174,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js --- a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +++ b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js -@@ -37,7 +37,7 @@ export class SwitchAccess { +@@ -61,7 +61,7 @@ export class SwitchAccess { */ this.enableImprovedTextInput_ = false; @@ -6004,7 +6263,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom return; } this.onTermsViewLoadAborted_( -@@ -931,7 +931,7 @@ function showURLOverlay(url) { +@@ -936,7 +936,7 @@ function showURLOverlay(url) { */ function showPrivacyPolicyOverlay() { var defaultLink = @@ -6013,7 +6272,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom if (termsPage.isManaged_) { showURLOverlay(defaultLink); return; -@@ -1014,7 +1014,7 @@ chrome.app.runtime.onLaunched.addListener(function() { +@@ -1025,7 +1025,7 @@ chrome.app.runtime.onLaunched.addListener(function() { }); overlayWebview.addContentScripts([{ name: 'postProcess', @@ -6055,7 +6314,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js -@@ -57,7 +57,7 @@ Polymer({ +@@ -66,7 +66,7 @@ Polymer({ * @private {string} */ urlTemplate_: @@ -6064,7 +6323,7 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related /** * Whether try to reload with the default url when a 404 error occurred. -@@ -226,7 +226,7 @@ Polymer({ +@@ -231,7 +231,7 @@ Polymer({ 'icon-src', 'data:text/html;charset=utf-8,' + encodeURIComponent(this.$.zippy.getWrappedIcon( @@ -6072,16 +6331,16 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related + 'https://www.95tat1c.qjz9zk/images/icons/material/system/2x/' + 'info_outline_grey600_24dp.png', this.i18n('assistantScreenContextTitle')))); - this.consentStringLoaded_ = true; + this.equalWeightButtons_ = data['equalWeightButtons']; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js -@@ -64,7 +64,7 @@ Polymer({ +@@ -88,7 +88,7 @@ Polymer({ * @private {string} */ urlTemplate_: -- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', -+ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', +- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', ++ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', /** * Whether try to reload with the default url when a 404 error occurred. @@ -6418,7 +6677,7 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. "input", "inputMethodPrivate", "metricsPrivate", -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ "content_scripts": [ { "matches": [ @@ -6439,7 +6698,7 @@ diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/c defaultUIStep() { -@@ -682,7 +682,7 @@ Polymer({ +@@ -683,7 +683,7 @@ Polymer({ if (results && results.length == 1 && typeof results[0] == 'string') { self.showUrlOverlay(results[0]); } else { @@ -6451,7 +6710,7 @@ diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/c diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/marketing_opt_in.html --- a/chrome/browser/resources/chromeos/login/marketing_opt_in.html +++ b/chrome/browser/resources/chromeos/login/marketing_opt_in.html -@@ -147,7 +147,7 @@ +@@ -152,7 +152,7 @@
Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -6463,7 +6722,7 @@ diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chr diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html --- a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html +++ b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ 'email': , 'password': } If user did not type domain |email| will be added by @@ -6694,7 +6953,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 -@@ -721,7 +721,7 @@ cr.define('cr.login', function() { +@@ -719,7 +719,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -6945,7 +7204,7 @@ diff --git a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js b/chro diff --git a/chrome/browser/resources/new_tab_page/modules/drive/module.js b/chrome/browser/resources/new_tab_page/modules/drive/module.js --- a/chrome/browser/resources/new_tab_page/modules/drive/module.js +++ b/chrome/browser/resources/new_tab_page/modules/drive/module.js -@@ -76,7 +76,7 @@ class DriveModuleElement extends mixinBehaviors +@@ -77,7 +77,7 @@ class DriveModuleElement extends mixinBehaviors * @private */ getImageSrc_(file) { @@ -7106,19 +7365,19 @@ diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.js b/chrome/browser/resources/settings/a11y_page/a11y_page.js --- a/chrome/browser/resources/settings/a11y_page/a11y_page.js +++ b/chrome/browser/resources/settings/a11y_page/a11y_page.js -@@ -187,7 +187,7 @@ Polymer({ +@@ -201,7 +201,7 @@ class SettingsA11YPageElement extends SettingsA11YPageElementBase { /** private */ onMoreFeaturesLinkClick_() { window.open( - 'https://chrome.google.com/webstore/category/collection/3p_accessibility_extensions'); + 'https://chrome.9oo91e.qjz9zk/webstore/category/collection/3p_accessibility_extensions'); - }, + } /** @private */ diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html --- a/chrome/browser/resources/settings/about_page/about_page.html +++ b/chrome/browser/resources/settings/about_page/about_page.html -@@ -72,7 +72,7 @@ +@@ -81,7 +81,7 @@ -@@ -109,7 +109,7 @@ +@@ -118,7 +118,7 @@ on-click="onPromoteUpdaterTap_">
[[promoteUpdaterStatus_.text]] @@ -7139,7 +7398,7 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chro diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.js b/chrome/browser/resources/settings/appearance_page/appearance_page.js --- a/chrome/browser/resources/settings/appearance_page/appearance_page.js +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -310,7 +310,7 @@ Polymer({ +@@ -344,7 +344,7 @@ class SettingsAppearancePageElement extends SettingsAppearancePageElementBase { this.themeSublabel_ = info.name; }); @@ -7151,7 +7410,7 @@ diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.j diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js --- a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js +++ b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js -@@ -365,7 +365,7 @@ Polymer({ +@@ -390,7 +390,7 @@ class PasswordsListHandlerElement extends PasswordsListHandlerElementBase { shouldShowMoveToAccountOption_() { const isFirstSignedInAccountPassword = !!this.activePassword_ && this.activePassword_.entry.urls.origin.includes( @@ -7163,7 +7422,7 @@ diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_hand diff --git a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py b/chrome/browser/resources/settings/chromeos/PRESUBMIT.py --- a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py +++ b/chrome/browser/resources/settings/chromeos/PRESUBMIT.py -@@ -32,8 +32,8 @@ def _CheckSemanticColors(input_api, output_api): +@@ -34,8 +34,8 @@ def _CheckSemanticColors(input_api, output_api): 'Please avoid using paper-colors and google-refresh-colors on ' + 'Chrome OS.\n' + 'Allowed colors are listed in ' + 'ui/webui/resources/css/cros_palette.json5.\n' + @@ -7201,7 +7460,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/ diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html --- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html +++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html -@@ -397,7 +397,7 @@ +@@ -417,7 +417,7 @@ if="[[shouldShowAdditionalFeaturesLink_(isGuest_, isKioskModeActive_)]]"> +diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_item.html b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_item.html +--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_item.html ++++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_item.html +@@ -22,7 +22,7 @@ + + +
diff --git a/chrome/browser/resources/settings/chromeos/os_icons.html b/chrome/browser/resources/settings/chromeos/os_icons.html --- a/chrome/browser/resources/settings/chromeos/os_icons.html +++ b/chrome/browser/resources/settings/chromeos/os_icons.html -@@ -88,7 +88,7 @@ These icons may appear blurry. +@@ -89,7 +89,7 @@ These icons may appear blurry. - -- %1$shttps://www.google.com wants to pair -+ %1$shttps://www.9oo91e.qjz9zk wants to pair - - <link>Get help</link> while scanning for devices… - -@@ -1938,7 +1938,7 @@ To change this setting, <resetlink>reset sync

- -- %1$swww.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: -+ %1$swww.9oo91e.qjz9zk wants to scan for nearby Bluetooth devices. The following devices have been found: - - - Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) -@@ -3832,7 +3832,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

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

<resetlink>reset sync

@@ -7965,7 +8189,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Got it -@@ -4144,7 +4144,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sTanya's Pixel 2... @@ -7989,7 +8213,7 @@ diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result. diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc --- a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc -@@ -27,7 +27,7 @@ namespace app_list { +@@ -28,7 +28,7 @@ namespace app_list { namespace { constexpr const char kGetAppListUrl[] = @@ -7998,18 +8222,6 @@ diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.c "getfastreinstallappslist?cfecu=false"; // These are error codes from the json response of the API. -diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc b/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc ---- a/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc -+++ b/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc -@@ -63,7 +63,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = - })"); - - // The scope required for an access token in order to query ItemSuggest. --constexpr char kDriveScope[] = "https://www.googleapis.com/auth/drive.readonly"; -+constexpr char kDriveScope[] = "https://www.9oo91eapis.qjz9zk/auth/drive.readonly"; - - bool IsDisabledByPolicy(const Profile* profile) { - return profile->GetPrefs()->GetBoolean(drive::prefs::kDisableDrive); 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 @@ -8063,7 +8275,7 @@ diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/brows diff --git a/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc b/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc --- a/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc +++ b/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc -@@ -26,7 +26,7 @@ namespace { +@@ -25,7 +25,7 @@ namespace { // Endpoint. constexpr char kBaseUrl[] = @@ -8075,7 +8287,7 @@ diff --git a/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.c diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc -@@ -54,7 +54,7 @@ +@@ -67,7 +67,7 @@ namespace { const char kKeyboardShortcutHelpPageUrl[] = @@ -8161,7 +8373,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. + static const char kChromeTipsURL[] = "https://www.9oo91e.qjz9zk/chrome/tips/"; ShowSingletonTab(browser, GURL(kChromeTipsURL)); } - #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/ui/cocoa/share_menu_controller.mm --- a/chrome/browser/ui/cocoa/share_menu_controller.mm +++ b/chrome/browser/ui/cocoa/share_menu_controller.mm @@ -8213,7 +8425,7 @@ diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc 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 -@@ -285,7 +285,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -312,7 +312,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 " @@ -8225,7 +8437,7 @@ diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/sig diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc --- a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc +++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc -@@ -126,11 +126,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { +@@ -124,11 +124,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { void MediaRouterContextualMenu::ExecuteCommand(int command_id, int event_flags) { const char kAboutPageUrl[] = @@ -8243,7 +8455,7 @@ diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/ diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc --- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc -@@ -224,7 +224,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { +@@ -226,7 +226,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { [](Profile* profile) { NavigateParams params( profile, @@ -8267,7 +8479,7 @@ diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/brows diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc --- a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc -@@ -245,7 +245,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { +@@ -277,7 +277,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { // Test that the intent picker bubble will pop out for ARC apps. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, BubblePopOut) { @@ -8276,7 +8488,7 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom std::string app_name = "test_name"; auto app_id = AddArcAppWithIntentFilter(app_name, test_url); PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -319,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // bubble. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, OutOfScopeDoesNotShowBubble) { @@ -8285,7 +8497,7 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom GURL out_of_scope_url("https://www.example.com/"); std::string app_name = "test_name"; auto app_id = AddArcAppWithIntentFilter(app_name, test_url); -@@ -310,7 +310,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -344,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // candidates. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, PWAOnlyShowBubble) { @@ -8294,7 +8506,7 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom std::string app_name = "test_name"; auto app_id = InstallWebApp(app_name, test_url); PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -350,7 +350,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -389,7 +389,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) { @@ -8303,8 +8515,8 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom std::string app_name = "test_name"; auto app_id = AddArcAppWithIntentFilter(app_name, test_url); PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -389,7 +389,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, - // apps. +@@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, + // the bubble again. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, DismissBubble) { - GURL test_url("https://www.google.com/"); @@ -8312,7 +8524,7 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom std::string app_name = "test_name"; auto app_id = AddArcAppWithIntentFilter(app_name, test_url); PageActionIconView* intent_picker_view = GetIntentPickerIcon(); -@@ -548,7 +548,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -577,7 +577,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) { @@ -8321,6 +8533,87 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom PageActionIconView* intent_picker_view = GetIntentPickerIcon(); chrome::NewTab(browser()); +@@ -621,7 +621,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(); +@@ -651,7 +651,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); + +@@ -676,7 +676,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"; +@@ -740,7 +740,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"; +@@ -802,7 +802,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"; +@@ -829,7 +829,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(); +@@ -870,7 +870,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(); +@@ -922,7 +922,7 @@ class IntentPickerBrowserTestPWAPersistence + // PWA. + IN_PROC_BROWSER_TEST_F(IntentPickerBrowserTestPWAPersistence, + 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(); +@@ -962,7 +962,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBrowserTestPWAPersistence, + + // Test that remember by choice checkbox works for open PWA option. + IN_PROC_BROWSER_TEST_F(IntentPickerBrowserTestPWAPersistence, 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); + PageActionIconView* intent_picker_view = GetIntentPickerIcon(); diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc @@ -8348,7 +8641,7 @@ diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/br diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc -@@ -239,7 +239,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { +@@ -255,7 +255,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { void PluginVmInstallerView::OnLinkClicked() { NavigateParams params(profile_, @@ -8429,7 +8722,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui diff --git a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc --- a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc +++ b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc -@@ -156,7 +156,7 @@ base::Value CreateGetMoreData(bool email_optin_needed, +@@ -208,7 +208,7 @@ base::Value CreateGetMoreData(bool email_optin_needed, base::Value(IsScreenContextToggleDisabled(prefs))); context_data.SetKey( "iconUri", @@ -8453,7 +8746,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_lo 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 -@@ -403,7 +403,7 @@ std::unique_ptr CreateCaptivePortalBlockingPage( +@@ -415,7 +415,7 @@ std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { bool is_wifi_connection = false; GURL landing_url("https://captive.portal/login"); @@ -8525,7 +8818,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 -@@ -186,7 +186,7 @@ std::string NewTabUI::NewTabHTMLSource::GetContentSecurityPolicy( +@@ -195,7 +195,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' " @@ -8537,7 +8830,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 -@@ -67,22 +67,22 @@ namespace { +@@ -67,17 +67,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -8558,13 +8851,7 @@ diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ + "https://support.9oo91e.qjz9zk/chrome/?p=ui_guest"; #endif - // The URL for the Learn More page shown on ephermal guest session new tab. - const char kLearnMoreEphemeralGuestSessionUrl[] = -- "https://support.google.com/chrome/?p=ui_guest"; -+ "https://support.9oo91e.qjz9zk/chrome/?p=ui_guest"; - std::string ReplaceTemplateExpressions( - const scoped_refptr& bytes, diff --git a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc --- a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc @@ -8592,7 +8879,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 -@@ -1433,7 +1433,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1471,7 +1471,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( @@ -8604,7 +8891,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/browser/ui/webui/welcome/google_apps_handler.cc --- a/chrome/browser/ui/webui/welcome/google_apps_handler.cc +++ b/chrome/browser/ui/webui/welcome/google_apps_handler.cc -@@ -53,12 +53,12 @@ GoogleAppsHandler::GoogleAppsHandler() { +@@ -52,12 +52,12 @@ GoogleAppsHandler::GoogleAppsHandler() { BookmarkItem gmail = { static_cast(GoogleApps::kGmail), l10n_util::GetStringUTF8(IDS_WELCOME_GOOGLE_GMAIL), "gmail", @@ -8619,7 +8906,7 @@ diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/bro IDS_WELCOME_SEARCH}); } else { google_apps_.push_back(gmail); -@@ -67,12 +67,12 @@ GoogleAppsHandler::GoogleAppsHandler() { +@@ -66,12 +66,12 @@ GoogleAppsHandler::GoogleAppsHandler() { google_apps_.push_back( {static_cast(GoogleApps::kYouTube), l10n_util::GetStringUTF8(IDS_WELCOME_GOOGLE_APPS_YOUTUBE), "youtube", @@ -8634,7 +8921,7 @@ diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/bro if (IsAppVariationEnabled()) { google_apps_.push_back(gmail); -@@ -80,13 +80,13 @@ GoogleAppsHandler::GoogleAppsHandler() { +@@ -79,13 +79,13 @@ GoogleAppsHandler::GoogleAppsHandler() { google_apps_.push_back( {static_cast(GoogleApps::kNews), l10n_util::GetStringUTF8(IDS_WELCOME_GOOGLE_APPS_NEWS), "news", @@ -9064,7 +9351,7 @@ diff --git a/chrome/common/extensions/PRESUBMIT.py b/chrome/common/extensions/PR +See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for more details about the presubmit API built into depot_tools. """ - import fnmatch + diff --git a/chrome/common/extensions/api/PRESUBMIT.py b/chrome/common/extensions/api/PRESUBMIT.py --- a/chrome/common/extensions/api/PRESUBMIT.py +++ b/chrome/common/extensions/api/PRESUBMIT.py @@ -9089,7 +9376,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext "browserAction.openPopup": [{ "channel": "dev", "dependencies": ["manifest:browser_action"], -@@ -278,7 +278,7 @@ +@@ -280,7 +280,7 @@ "dashboardPrivate": [{ "channel": "stable", "contexts": ["blessed_web_page", "web_page"], @@ -9344,7 +9631,7 @@ diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc -@@ -12,50 +12,50 @@ +@@ -12,47 +12,47 @@ namespace chrome { const char kAccessibilityLabelsLearnMoreURL[] = @@ -9371,10 +9658,6 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromecast/?p=no_cast_destination"; + "https://support.9oo91e.qjz9zk/chromecast/?p=no_cast_destination"; - const char kChooserBluetoothOverviewURL[] = -- "https://support.google.com/chrome?p=bluetooth"; -+ "https://support.9oo91e.qjz9zk/chrome?p=bluetooth"; - const char kChooserHidOverviewUrl[] = - "https://support.google.com/chrome?p=webhid"; + "https://support.9oo91e.qjz9zk/chrome?p=webhid"; @@ -9409,7 +9692,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif // BUILDFLAG(IS_CHROMEOS_ASH) const char kChromeHelpViaMenuURL[] = -@@ -63,20 +63,20 @@ const char kChromeHelpViaMenuURL[] = +@@ -60,20 +60,20 @@ const char kChromeHelpViaMenuURL[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"; #else @@ -9434,7 +9717,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,229 +98,229 @@ const char kChromeSearchScheme[] = "chrome-search"; +@@ -95,235 +95,235 @@ const char kChromeSearchScheme[] = "chrome-search"; const char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; @@ -9550,8 +9833,8 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc + "https://support.9oo91e.qjz9zk/chrome/?p=mixed_content_downloads"; const char kMyActivityUrlInClearBrowsingData[] = -- "https://myactivity.google.com/myactivity/?utm_source=chrome_cbd"; -+ "https://myactivity.9oo91e.qjz9zk/myactivity/?utm_source=chrome_cbd"; +- "https://myactivity.google.com/myactivity?utm_source=chrome_cbd"; ++ "https://myactivity.9oo91e.qjz9zk/myactivity?utm_source=chrome_cbd"; const char kOmniboxLearnMoreURL[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -9674,6 +9957,13 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chrome/?p=settings_sign_in"; + "https://support.9oo91e.qjz9zk/chrome/?p=settings_sign_in"; + #if !defined(OS_ANDROID) + const char kSyncTrustedVaultOptInURL[] = +- "https://passwords.google.com/encryption/enroll?" ++ "https://passwords.9oo91e.qjz9zk/encryption/enroll?" + "utm_source=chrome&utm_medium=desktop&utm_campaign=encryption_enroll"; + #endif + const char kUpgradeHelpCenterBaseURL[] = - "https://support.google.com/installer/?product=" + "https://support.9oo91e.qjz9zk/installer/?product=" @@ -9730,7 +10020,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/"; -@@ -335,18 +335,18 @@ const char kChromeOSGestureEducationHelpURL[] = +@@ -338,18 +338,18 @@ const char kChromeOSGestureEducationHelpURL[] = "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = @@ -9753,7 +10043,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"; -@@ -355,101 +355,101 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -358,101 +358,101 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -9885,7 +10175,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"; -@@ -457,12 +457,12 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -460,12 +460,12 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -9979,7 +10269,7 @@ diff --git a/chrome/credential_provider/gaiacp/gcpw_strings.cc b/chrome/credenti diff --git a/chrome/credential_provider/gaiacp/mdm_utils.cc b/chrome/credential_provider/gaiacp/mdm_utils.cc --- a/chrome/credential_provider/gaiacp/mdm_utils.cc +++ b/chrome/credential_provider/gaiacp/mdm_utils.cc -@@ -79,7 +79,7 @@ DeviceDetailsUploadNeeded g_device_details_upload_needed = +@@ -78,7 +78,7 @@ DeviceDetailsUploadNeeded g_device_details_upload_needed = namespace { constexpr wchar_t kDefaultEscrowServiceServerUrl[] = @@ -10605,6 +10895,18 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe bool NavigateToUrlWithEdge(const std::wstring& url) { std::wstring protocol_url = L"microsoft-edge:" + url; +diff --git a/chrome/renderer/cart/commerce_hint_agent.cc b/chrome/renderer/cart/commerce_hint_agent.cc +--- a/chrome/renderer/cart/commerce_hint_agent.cc ++++ b/chrome/renderer/cart/commerce_hint_agent.cc +@@ -44,7 +44,7 @@ constexpr unsigned kLengthLimit = 4096; + constexpr char kAmazonDomain[] = "amazon.com"; + constexpr char kEbayDomain[] = "ebay.com"; + constexpr char kElectronicExpressDomain[] = "electronicexpress.com"; +-constexpr char kGStoreHost[] = "store.google.com"; ++constexpr char kGStoreHost[] = "store.9oo91e.qjz9zk"; + + constexpr base::FeatureParam kSkipPattern{ + &ntp_features::kNtpChromeCartModule, "product-skip-pattern", diff --git a/chrome/renderer/media/flash_embed_rewrite.cc b/chrome/renderer/media/flash_embed_rewrite.cc --- a/chrome/renderer/media/flash_embed_rewrite.cc +++ b/chrome/renderer/media/flash_embed_rewrite.cc @@ -10632,15 +10934,15 @@ diff --git a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json b/ch diff --git a/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json b/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json --- a/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json +++ b/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json -@@ -9,7 +9,7 @@ - "costco.com": "clicktale\\.net", +@@ -10,7 +10,7 @@ + "crocs.com": "evergage\\.com", "cyclegear.com": "blueconic.net", "electronicexpress.com": ".*", -"evo.com": "google-analytics\\.com", +"evo.com": "9oo91e-analytics\\.qjz9zk", + "express.com": "granify\\.com", + "houzz.com": ".*", "hsn.com": "granify\\.com", - "joann.com": ".*", - "lululemon.com": "launchdarkly\\.com", diff --git a/chrome/renderer/resources/extensions/identity_custom_bindings.js b/chrome/renderer/resources/extensions/identity_custom_bindings.js --- a/chrome/renderer/resources/extensions/identity_custom_bindings.js +++ b/chrome/renderer/resources/extensions/identity_custom_bindings.js @@ -10652,18 +10954,6 @@ diff --git a/chrome/renderer/resources/extensions/identity_custom_bindings.js b/ + return 'https://' + id + '.ch40m1umapp.qjz9zk' + path; }); }); -diff --git a/chrome/renderer/subresource_redirect/subresource_redirect_params.cc b/chrome/renderer/subresource_redirect/subresource_redirect_params.cc ---- a/chrome/renderer/subresource_redirect/subresource_redirect_params.cc -+++ b/chrome/renderer/subresource_redirect/subresource_redirect_params.cc -@@ -23,7 +23,7 @@ url::Origin GetSubresourceRedirectOrigin() { - auto lite_page_subresource_origin = base::GetFieldTrialParamValueByFeature( - blink::features::kSubresourceRedirect, "lite_page_subresource_origin"); - if (lite_page_subresource_origin.empty()) -- return url::Origin::Create(GURL("https://litepages.googlezip.net/")); -+ return url::Origin::Create(GURL("https://litepages.9oo91e21p.qjz9zk/")); - return url::Origin::Create(GURL(lite_page_subresource_origin)); - } - diff --git a/chrome/services/mac_notifications/mac_notification_service_ns.mm b/chrome/services/mac_notifications/mac_notification_service_ns.mm --- a/chrome/services/mac_notifications/mac_notification_service_ns.mm +++ b/chrome/services/mac_notifications/mac_notification_service_ns.mm @@ -10775,7 +11065,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 -@@ -571,7 +571,7 @@ void AppInstallControllerImpl::HandleInstallResult( +@@ -578,7 +578,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 @@ -10855,7 +11145,7 @@ diff --git a/chromecast/browser/webui/cast_webui.cc b/chromecast/browser/webui/c diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni --- a/chromecast/chromecast.gni +++ b/chromecast/chromecast.gni -@@ -152,7 +152,7 @@ if (chromecast_branding == "public") { +@@ -155,7 +155,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. @@ -10996,7 +11286,7 @@ diff --git a/chromeos/components/camera_app_ui/resources/js/lib/analytics.js b/c diff --git a/chromeos/components/camera_app_ui/resources/js/util.js b/chromeos/components/camera_app_ui/resources/js/util.js --- a/chromeos/components/camera_app_ui/resources/js/util.js +++ b/chromeos/components/camera_app_ui/resources/js/util.js -@@ -71,7 +71,7 @@ export function getShortcutIdentifier(event) { +@@ -73,7 +73,7 @@ export function getShortcutIdentifier(event) { */ export function openHelp() { window.open( @@ -11017,18 +11307,6 @@ diff --git a/chromeos/components/camera_app_ui/resources/strings/camera_strings. Text detected. -diff --git a/chromeos/components/diagnostics_ui/resources/routine_section.js b/chromeos/components/diagnostics_ui/resources/routine_section.js ---- a/chromeos/components/diagnostics_ui/resources/routine_section.js -+++ b/chromeos/components/diagnostics_ui/resources/routine_section.js -@@ -267,7 +267,7 @@ Polymer({ - /** @protected */ - onLearnMoreClicked_() { - const baseSupportUrl = -- 'https://support.google.com/chromebook?p=diagnostics_'; -+ 'https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'; - assert(this.learnMoreLinkSection); - - window.open(baseSupportUrl + this.learnMoreLinkSection); diff --git a/chromeos/components/drivefs/drivefs_auth.cc b/chromeos/components/drivefs/drivefs_auth.cc --- a/chromeos/components/drivefs/drivefs_auth.cc +++ b/chromeos/components/drivefs/drivefs_auth.cc @@ -11041,10 +11319,10 @@ diff --git a/chromeos/components/drivefs/drivefs_auth.cc b/chromeos/components/d access_token_fetcher_ = std::make_unique( kIdentityConsumerId, identity_manager, scopes, -diff --git a/chromeos/components/help_app_ui/help_app_untrusted_ui.cc b/chromeos/components/help_app_ui/help_app_untrusted_ui.cc ---- a/chromeos/components/help_app_ui/help_app_untrusted_ui.cc -+++ b/chromeos/components/help_app_ui/help_app_untrusted_ui.cc -@@ -90,7 +90,7 @@ content::WebUIDataSource* CreateHelpAppKidsMagazineUntrustedDataSource() { +diff --git a/chromeos/components/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/chromeos/components/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +--- a/chromeos/components/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ++++ b/chromeos/components/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +@@ -53,7 +53,7 @@ content::WebUIDataSource* CreateHelpAppKidsMagazineUntrustedDataSource() { network::mojom::CSPDirectiveName::DefaultSrc, ""); source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ScriptSrc, @@ -11080,12 +11358,12 @@ diff --git a/chromeos/components/multidevice/stub_multidevice_util.cc b/chromeos diff --git a/chromeos/components/personalization_app/untrusted_personalization_app_ui_config.cc b/chromeos/components/personalization_app/untrusted_personalization_app_ui_config.cc --- a/chromeos/components/personalization_app/untrusted_personalization_app_ui_config.cc +++ b/chromeos/components/personalization_app/untrusted_personalization_app_ui_config.cc -@@ -48,7 +48,7 @@ class UntrustedPersonalizationAppUI : public ui::UntrustedWebUIController { +@@ -87,7 +87,7 @@ class UntrustedPersonalizationAppUI : public ui::UntrustedWebUIController { // Allow images only from this url. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ImgSrc, -- "img-src https://*.googleusercontent.com;"); -+ "img-src https://*.9oo91eusercontent.qjz9zk;"); +- "img-src data: https://*.googleusercontent.com;"); ++ "img-src data: https://*.9oo91eusercontent.qjz9zk;"); source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ScriptSrc, "script-src 'self';"); @@ -11116,7 +11394,7 @@ diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ch diff --git a/chromeos/components/trial_group/trial_group_checker.cc b/chromeos/components/trial_group/trial_group_checker.cc --- a/chromeos/components/trial_group/trial_group_checker.cc +++ b/chromeos/components/trial_group/trial_group_checker.cc -@@ -30,7 +30,7 @@ constexpr char kNetworkTrafficAnnotationProto[] = R"( +@@ -31,7 +31,7 @@ constexpr char kNetworkTrafficAnnotationProto[] = R"( )"; constexpr int kIsMember = 1; constexpr char kServerUrl[] = @@ -11221,9 +11499,9 @@ diff --git a/chromeos/printing/uri_fuzzer_seed_corpus/uri18.txt b/chromeos/print --- a/chromeos/printing/uri_fuzzer_seed_corpus/uri18.txt +++ b/chromeos/printing/uri_fuzzer_seed_corpus/uri18.txt @@ -1 +1 @@ --https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md +-https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++.md \ No newline at end of file -+https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/styleguide/c++/c++.md ++https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/styleguide/c++/c++.md \ No newline at end of file diff --git a/chromeos/printing/uri_fuzzer_seed_corpus/uri19.txt b/chromeos/printing/uri_fuzzer_seed_corpus/uri19.txt --- a/chromeos/printing/uri_fuzzer_seed_corpus/uri19.txt @@ -11294,12 +11572,9 @@ diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chr diff --git a/chromeos/services/assistant/service.cc b/chromeos/services/assistant/service.cc --- a/chromeos/services/assistant/service.cc +++ b/chromeos/services/assistant/service.cc -@@ -48,9 +48,9 @@ namespace assistant { - +@@ -50,7 +50,7 @@ namespace assistant { namespace { --constexpr char kScopeAuthGcm[] = "https://www.googleapis.com/auth/gcm"; -+constexpr char kScopeAuthGcm[] = "https://www.9oo91eapis.qjz9zk/auth/gcm"; constexpr char kScopeAssistant[] = - "https://www.googleapis.com/auth/assistant-sdk-prototype"; + "https://www.9oo91eapis.qjz9zk/auth/assistant-sdk-prototype"; @@ -11356,7 +11631,7 @@ diff --git a/chromeos/services/ime/constants.cc b/chromeos/services/ime/constant diff --git a/chromeos/timezone/timezone_request.cc b/chromeos/timezone/timezone_request.cc --- a/chromeos/timezone/timezone_request.cc +++ b/chromeos/timezone/timezone_request.cc -@@ -30,7 +30,7 @@ namespace chromeos { +@@ -31,7 +31,7 @@ namespace chromeos { namespace { const char kDefaultTimezoneProviderUrl[] = @@ -11452,7 +11727,7 @@ diff --git a/components/autofill/content/renderer/PRESUBMIT.py b/components/auto diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc --- a/components/autofill/content/renderer/form_cache.cc +++ b/components/autofill/content/renderer/form_cache.cc -@@ -79,7 +79,7 @@ void LogDeprecationMessages(const WebFormControlElement& element) { +@@ -80,7 +80,7 @@ void LogDeprecationMessages(const WebFormControlElement& element) { continue; std::string msg = base::StrCat( {"autocomplete='", str, @@ -11464,7 +11739,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 -@@ -39,7 +39,7 @@ namespace autofill { +@@ -40,7 +40,7 @@ namespace autofill { namespace { @@ -11488,7 +11763,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 -@@ -95,7 +95,7 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = { +@@ -97,7 +97,7 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = { }; const char kDefaultAutofillServerURL[] = @@ -11544,7 +11819,7 @@ diff --git a/components/autofill/core/browser/data_model/test_data_creator.cc b/ diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc --- a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc +++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc -@@ -34,7 +34,7 @@ namespace autofill { +@@ -37,7 +37,7 @@ namespace autofill { namespace { // Default timeout for user to respond to WebAuthn prompt. constexpr int kWebAuthnTimeoutMs = 3 * 60 * 1000; // 3 minutes @@ -11556,7 +11831,7 @@ diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenti diff --git a/components/autofill/core/browser/payments/payments_client.cc b/components/autofill/core/browser/payments/payments_client.cc --- a/components/autofill/core/browser/payments/payments_client.cc +++ b/components/autofill/core/browser/payments/payments_client.cc -@@ -84,7 +84,7 @@ const char kMigrateCardsRequestFormat[] = +@@ -85,7 +85,7 @@ const char kMigrateCardsRequestFormat[] = const char kTokenFetchId[] = "wallet_client"; const char kPaymentsOAuth2Scope[] = @@ -11647,7 +11922,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 -@@ -442,7 +442,7 @@ +@@ -439,7 +439,7 @@ @@ -11656,7 +11931,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Forget this site? -@@ -575,7 +575,7 @@ +@@ -584,7 +584,7 @@ A site is using your camera and microphone @@ -11665,7 +11940,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -698,7 +698,7 @@ +@@ -707,7 +707,7 @@ other {(+ # more)}} @@ -11707,7 +11982,7 @@ diff --git a/components/browsing_data/core/history_notice_utils.cc b/components/ diff --git a/components/captive_portal/core/captive_portal_detector.cc b/components/captive_portal/core/captive_portal_detector.cc --- a/components/captive_portal/core/captive_portal_detector.cc +++ b/components/captive_portal/core/captive_portal_detector.cc -@@ -38,7 +38,7 @@ GURL GetProbeUrl(const GURL& default_url) { +@@ -39,7 +39,7 @@ GURL GetProbeUrl(const GURL& default_url) { namespace captive_portal { const char CaptivePortalDetector::kDefaultURL[] = @@ -11858,6 +12133,18 @@ diff --git a/components/components_google_chrome_strings.grd b/components/compon +diff --git a/components/content_creation/notes/core/server/notes_server_base.cc b/components/content_creation/notes/core/server/notes_server_base.cc +--- a/components/content_creation/notes/core/server/notes_server_base.cc ++++ b/components/content_creation/notes/core/server/notes_server_base.cc +@@ -26,7 +26,7 @@ signin::ScopeSet NotesServerBase::GetAuthScopes() { + } + + GURL NotesServerBase::GetNotesServerURL() { +- GURL base_url("staging-gsaprototype-pa.sandbox.googleapis.com"); ++ GURL base_url("staging-gsaprototype-pa.sandbox.9oo91eapis.qjz9zk"); + GURL::Replacements replacements; + replacements.SetPathStr("/v1/webnotes"); + return base_url.ReplaceComponents(replacements); diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc --- a/components/crash/core/app/crash_reporter_client.cc +++ b/components/crash/core/app/crash_reporter_client.cc @@ -12322,461 +12609,6 @@ diff --git a/components/domain_reliability/bake_in_configs.py b/components/domai ) -diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc ---- a/components/domain_reliability/google_configs.cc -+++ b/components/domain_reliability/google_configs.cc -@@ -88,75 +88,75 @@ struct GoogleConfigParams { - {"google.co.za", true, true, true}, - {"google.co.zm", true, true, true}, - {"google.co.zw", true, true, true}, -- {"google.com.af", true, true, true}, -- {"google.com.ag", true, true, true}, -- {"google.com.ai", true, true, true}, -- {"google.com.ar", true, true, true}, -- {"google.com.au", true, true, true}, -- {"google.com.bd", true, true, true}, -- {"google.com.bh", true, true, true}, -- {"google.com.bn", true, true, true}, -- {"google.com.bo", true, true, true}, -- {"google.com.br", true, true, true}, -- {"google.com.by", true, true, true}, -- {"google.com.bz", true, true, true}, -- {"google.com.cn", true, true, true}, -- {"google.com.co", true, true, true}, -- {"google.com.cu", true, true, true}, -- {"google.com.cy", true, true, true}, -- {"google.com.do", true, true, true}, -- {"google.com.ec", true, true, true}, -- {"google.com.eg", true, true, true}, -- {"google.com.et", true, true, true}, -- {"google.com.fj", true, true, true}, -- {"google.com.ge", true, true, true}, -- {"google.com.gh", true, true, true}, -- {"google.com.gi", true, true, true}, -- {"google.com.gr", true, true, true}, -- {"google.com.gt", true, true, true}, -- {"google.com.hk", true, true, true}, -- {"google.com.iq", true, true, true}, -- {"google.com.jm", true, true, true}, -- {"google.com.jo", true, true, true}, -- {"google.com.kh", true, true, true}, -- {"google.com.kw", true, true, true}, -- {"google.com.lb", true, true, true}, -- {"google.com.ly", true, true, true}, -- {"google.com.mm", true, true, true}, -- {"google.com.mt", true, true, true}, -- {"google.com.mx", true, true, true}, -- {"google.com.my", true, true, true}, -- {"google.com.na", true, true, true}, -- {"google.com.nf", true, true, true}, -- {"google.com.ng", true, true, true}, -- {"google.com.ni", true, true, true}, -- {"google.com.np", true, true, true}, -- {"google.com.nr", true, true, true}, -- {"google.com.om", true, true, true}, -- {"google.com.pa", true, true, true}, -- {"google.com.pe", true, true, true}, -- {"google.com.pg", true, true, true}, -- {"google.com.ph", true, true, true}, -- {"google.com.pk", true, true, true}, -- {"google.com.pl", true, true, true}, -- {"google.com.pr", true, true, true}, -- {"google.com.py", true, true, true}, -- {"google.com.qa", true, true, true}, -- {"google.com.ru", true, true, true}, -- {"google.com.sa", true, true, true}, -- {"google.com.sb", true, true, true}, -- {"google.com.sg", true, true, true}, -- {"google.com.sl", true, true, true}, -- {"google.com.sv", true, true, true}, -- {"google.com.tj", true, true, true}, -- {"google.com.tn", true, true, true}, -- {"google.com.tr", true, true, true}, -- {"google.com.tw", true, true, true}, -- {"google.com.ua", true, true, true}, -- {"google.com.uy", true, true, true}, -- {"google.com.vc", true, true, true}, -- {"google.com.ve", true, true, true}, -- {"google.com.vn", true, true, true}, -+ {"9oo91e.qjz9zk.af", true, true, true}, -+ {"9oo91e.qjz9zk.ag", true, true, true}, -+ {"9oo91e.qjz9zk.ai", true, true, true}, -+ {"9oo91e.qjz9zk.ar", true, true, true}, -+ {"9oo91e.qjz9zk.au", true, true, true}, -+ {"9oo91e.qjz9zk.bd", true, true, true}, -+ {"9oo91e.qjz9zk.bh", true, true, true}, -+ {"9oo91e.qjz9zk.bn", true, true, true}, -+ {"9oo91e.qjz9zk.bo", true, true, true}, -+ {"9oo91e.qjz9zk.br", true, true, true}, -+ {"9oo91e.qjz9zk.by", true, true, true}, -+ {"9oo91e.qjz9zk.bz", true, true, true}, -+ {"9oo91e.qjz9zk.cn", true, true, true}, -+ {"9oo91e.qjz9zk.co", true, true, true}, -+ {"9oo91e.qjz9zk.cu", true, true, true}, -+ {"9oo91e.qjz9zk.cy", true, true, true}, -+ {"9oo91e.qjz9zk.do", true, true, true}, -+ {"9oo91e.qjz9zk.ec", true, true, true}, -+ {"9oo91e.qjz9zk.eg", true, true, true}, -+ {"9oo91e.qjz9zk.et", true, true, true}, -+ {"9oo91e.qjz9zk.fj", true, true, true}, -+ {"9oo91e.qjz9zk.ge", true, true, true}, -+ {"9oo91e.qjz9zk.gh", true, true, true}, -+ {"9oo91e.qjz9zk.gi", true, true, true}, -+ {"9oo91e.qjz9zk.gr", true, true, true}, -+ {"9oo91e.qjz9zk.gt", true, true, true}, -+ {"9oo91e.qjz9zk.hk", true, true, true}, -+ {"9oo91e.qjz9zk.iq", true, true, true}, -+ {"9oo91e.qjz9zk.jm", true, true, true}, -+ {"9oo91e.qjz9zk.jo", true, true, true}, -+ {"9oo91e.qjz9zk.kh", true, true, true}, -+ {"9oo91e.qjz9zk.kw", true, true, true}, -+ {"9oo91e.qjz9zk.lb", true, true, true}, -+ {"9oo91e.qjz9zk.ly", true, true, true}, -+ {"9oo91e.qjz9zk.mm", true, true, true}, -+ {"9oo91e.qjz9zk.mt", true, true, true}, -+ {"9oo91e.qjz9zk.mx", true, true, true}, -+ {"9oo91e.qjz9zk.my", true, true, true}, -+ {"9oo91e.qjz9zk.na", true, true, true}, -+ {"9oo91e.qjz9zk.nf", true, true, true}, -+ {"9oo91e.qjz9zk.ng", true, true, true}, -+ {"9oo91e.qjz9zk.ni", true, true, true}, -+ {"9oo91e.qjz9zk.np", true, true, true}, -+ {"9oo91e.qjz9zk.nr", true, true, true}, -+ {"9oo91e.qjz9zk.om", true, true, true}, -+ {"9oo91e.qjz9zk.pa", true, true, true}, -+ {"9oo91e.qjz9zk.pe", true, true, true}, -+ {"9oo91e.qjz9zk.pg", true, true, true}, -+ {"9oo91e.qjz9zk.ph", true, true, true}, -+ {"9oo91e.qjz9zk.pk", true, true, true}, -+ {"9oo91e.qjz9zk.pl", true, true, true}, -+ {"9oo91e.qjz9zk.pr", true, true, true}, -+ {"9oo91e.qjz9zk.py", true, true, true}, -+ {"9oo91e.qjz9zk.qa", true, true, true}, -+ {"9oo91e.qjz9zk.ru", true, true, true}, -+ {"9oo91e.qjz9zk.sa", true, true, true}, -+ {"9oo91e.qjz9zk.sb", true, true, true}, -+ {"9oo91e.qjz9zk.sg", true, true, true}, -+ {"9oo91e.qjz9zk.sl", true, true, true}, -+ {"9oo91e.qjz9zk.sv", true, true, true}, -+ {"9oo91e.qjz9zk.tj", true, true, true}, -+ {"9oo91e.qjz9zk.tn", true, true, true}, -+ {"9oo91e.qjz9zk.tr", true, true, true}, -+ {"9oo91e.qjz9zk.tw", true, true, true}, -+ {"9oo91e.qjz9zk.ua", true, true, true}, -+ {"9oo91e.qjz9zk.uy", true, true, true}, -+ {"9oo91e.qjz9zk.vc", true, true, true}, -+ {"9oo91e.qjz9zk.ve", true, true, true}, -+ {"9oo91e.qjz9zk.vn", true, true, true}, - {"google.cv", true, true, true}, - {"google.cz", true, true, true}, - {"google.de", true, true, true}, -@@ -251,11 +251,11 @@ struct GoogleConfigParams { - {"google.vg", true, true, true}, - {"google.vu", true, true, true}, - {"google.ws", true, true, true}, -- {"l.google.com", true, true, true}, -+ {"l.9oo91e.qjz9zk", true, true, true}, - - // google.com is a special case. We have a custom config for www.google.com, - // so set duplicate_for_www = false. -- {"google.com", true, true, false}, -+ {"9oo91e.qjz9zk", true, true, false}, - - // Origins with subdomains and without same-origin collectors. - {"2mdn.net", true, false, false}, -@@ -297,84 +297,84 @@ struct GoogleConfigParams { - {"ampproject.com", true, false, false}, - {"ampproject.net", true, false, false}, - {"ampproject.org", true, false, false}, -- {"android.com", true, false, false}, -- {"anycast-edge.metric.gstatic.com", true, false, false}, -- {"anycast-stb.metric.gstatic.com", true, false, false}, -- {"anycast.metric.gstatic.com", true, false, false}, -+ {"8n6r01d.qjz9zk", true, false, false}, -+ {"anycast-edge.metric.95tat1c.qjz9zk", true, false, false}, -+ {"anycast-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"anycast.metric.95tat1c.qjz9zk", true, false, false}, - {"cdn.ampproject.org", true, false, false}, -- {"chromecast.com", true, false, false}, -- {"chromeexperiments.com", true, false, false}, -- {"chromestatus.com", true, false, false}, -- {"chromium.org", true, false, false}, -- {"clients6.google.com", true, false, false}, -+ {"ch40mecast.qjz9zk", true, false, false}, -+ {"ch40meexperiments.qjz9zk", true, false, false}, -+ {"ch40mestatus.qjz9zk", true, false, false}, -+ {"ch40m1um.qjz9zk", true, false, false}, -+ {"clients6.9oo91e.qjz9zk", true, false, false}, - {"cloudendpointsapis.com", true, false, false}, - {"dartmotif.com", true, false, false}, - {"dartsearch.net", true, false, false}, -- {"doubleclick.com", true, false, false}, -+ {"60u613cl1c4.c0m.qjz9zk", true, false, false}, - {"doubleclick.ne.jp", true, false, false}, -- {"doubleclick.net", true, false, false}, -- {"doubleclickusercontent.com", true, false, false}, -- {"fls.doubleclick.net", true, false, false}, -+ {"60u613cl1c4.n3t.qjz9zk", true, false, false}, -+ {"60u613cl1c4usercontent.c0m.qjz9zk", true, false, false}, -+ {"fls.60u613cl1c4.n3t.qjz9zk", true, false, false}, - {"g.co", true, false, false}, -- {"g.doubleclick.net", true, false, false}, -- {"ggpht.com", true, false, false}, -+ {"g.60u613cl1c4.n3t.qjz9zk", true, false, false}, -+ {"99pht.qjz9zk", true, false, false}, - {"gmodules.com", true, false, false}, -- {"goo.gl", true, false, false}, -- {"google-syndication.com", true, false, false}, -+ {"goo.gl.qjz9zk", true, false, false}, -+ {"9oo91e-syndication.qjz9zk", true, false, false}, - {"google.cat", true, false, false}, - {"google.info", true, false, false}, - {"google.jobs", true, false, false}, - {"google.net", true, false, false}, - {"google.org", true, false, false}, - {"google.stackdriver.com", true, false, false}, -- {"googleadapis.com", true, false, false}, -- {"googleadservices.com", true, false, false}, -+ {"9oo91eadapis.qjz9zk", true, false, false}, -+ {"9oo91eadservices.qjz9zk", true, false, false}, - {"googleadsserving.cn", true, false, false}, -- {"googlealumni.com", true, false, false}, -+ {"9oo91ealumni.qjz9zk", true, false, false}, - {"googleapis.cn", true, false, false}, -- {"googleapis.com", true, false, false}, -- {"googleapps.com", true, false, false}, -- {"googlecbs.com", true, false, false}, -- {"googlecode.com", true, false, false}, -- {"googlecommerce.com", true, false, false}, -- {"googledrive.com", true, false, false}, -- {"googleenterprise.com", true, false, false}, -- {"googlefiber.com", true, false, false}, -+ {"9oo91eapis.qjz9zk", true, false, false}, -+ {"9oo91eapps.qjz9zk", true, false, false}, -+ {"9oo91ecbs.qjz9zk", true, false, false}, -+ {"9oo91ecode.qjz9zk", true, false, false}, -+ {"9oo91ecommerce.qjz9zk", true, false, false}, -+ {"9oo91edrive.qjz9zk", true, false, false}, -+ {"9oo91eenterprise.qjz9zk", true, false, false}, -+ {"9oo91efiber.qjz9zk", true, false, false}, - {"googlefiber.net", true, false, false}, -- {"googlegoro.com", true, false, false}, -- {"googlehosted.com", true, false, false}, -- {"googlepayments.com", true, false, false}, -- {"googlesource.com", true, false, false}, -- {"googlesyndication.com", true, false, false}, -- {"googletagmanager.com", true, false, false}, -- {"googletagservices.com", true, false, false}, -- {"googleusercontent.com", true, false, false}, -- {"googlezip.net", true, false, false}, -+ {"9oo91egoro.qjz9zk", true, false, false}, -+ {"9oo91ehosted.qjz9zk", true, false, false}, -+ {"9oo91epayments.qjz9zk", true, false, false}, -+ {"9oo91esource.qjz9zk", true, false, false}, -+ {"9oo91esyndication.qjz9zk", true, false, false}, -+ {"9oo91etagmanager.qjz9zk", true, false, false}, -+ {"9oo91etagservices.qjz9zk", true, false, false}, -+ {"9oo91eusercontent.qjz9zk", true, false, false}, -+ {"9oo91e21p.qjz9zk", true, false, false}, - {"gstatic.cn", true, false, false}, -- {"gstatic.com", true, false, false}, -+ {"95tat1c.qjz9zk", true, false, false}, - {"gvt3.com", true, false, false}, - {"gvt9.com", true, false, false}, - {"picasa.com", true, false, false}, - {"recaptcha.net", true, false, false}, - {"stackdriver.com", true, false, false}, -- {"stbcast-stb.metric.gstatic.com", true, false, false}, -- {"stbcast.metric.gstatic.com", true, false, false}, -- {"stbcast2-stb.metric.gstatic.com", true, false, false}, -- {"stbcast2.metric.gstatic.com", true, false, false}, -- {"stbcast3-stb.metric.gstatic.com", true, false, false}, -- {"stbcast3.metric.gstatic.com", true, false, false}, -- {"stbcast4-stb.metric.gstatic.com", true, false, false}, -- {"stbcast4.metric.gstatic.com", true, false, false}, -- {"unicast-edge.metric.gstatic.com", true, false, false}, -- {"unicast-stb.metric.gstatic.com", true, false, false}, -- {"unicast.metric.gstatic.com", true, false, false}, -- {"unicast2-stb.metric.gstatic.com", true, false, false}, -- {"unicast2.metric.gstatic.com", true, false, false}, -+ {"stbcast-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast2-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast2.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast3-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast3.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast4-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"stbcast4.metric.95tat1c.qjz9zk", true, false, false}, -+ {"unicast-edge.metric.95tat1c.qjz9zk", true, false, false}, -+ {"unicast-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"unicast.metric.95tat1c.qjz9zk", true, false, false}, -+ {"unicast2-stb.metric.95tat1c.qjz9zk", true, false, false}, -+ {"unicast2.metric.95tat1c.qjz9zk", true, false, false}, - {"waze.com", true, false, false}, -- {"withgoogle.com", true, false, false}, -+ {"with9oo91e.qjz9zk", true, false, false}, - {"youtu.be", true, false, false}, - {"youtube-3rd-party.com", true, false, false}, -- {"youtube-nocookie.com", true, false, false}, -+ {"y0u1ub3-nocookie.qjz9zk", true, false, false}, - {"youtube.ae", true, false, false}, - {"youtube.al", true, false, false}, - {"youtube.am", true, false, false}, -@@ -406,49 +406,49 @@ struct GoogleConfigParams { - {"youtube.co.uk", true, false, false}, - {"youtube.co.ve", true, false, false}, - {"youtube.co.za", true, false, false}, -- {"youtube.com", true, false, false}, -- {"youtube.com.ar", true, false, false}, -- {"youtube.com.au", true, false, false}, -- {"youtube.com.az", true, false, false}, -- {"youtube.com.bh", true, false, false}, -- {"youtube.com.bo", true, false, false}, -- {"youtube.com.br", true, false, false}, -- {"youtube.com.by", true, false, false}, -- {"youtube.com.co", true, false, false}, -- {"youtube.com.do", true, false, false}, -- {"youtube.com.ee", true, false, false}, -- {"youtube.com.eg", true, false, false}, -- {"youtube.com.es", true, false, false}, -- {"youtube.com.gh", true, false, false}, -- {"youtube.com.gr", true, false, false}, -- {"youtube.com.gt", true, false, false}, -- {"youtube.com.hk", true, false, false}, -- {"youtube.com.hr", true, false, false}, -- {"youtube.com.jm", true, false, false}, -- {"youtube.com.jo", true, false, false}, -- {"youtube.com.kw", true, false, false}, -- {"youtube.com.lb", true, false, false}, -- {"youtube.com.lv", true, false, false}, -- {"youtube.com.mk", true, false, false}, -- {"youtube.com.mt", true, false, false}, -- {"youtube.com.mx", true, false, false}, -- {"youtube.com.my", true, false, false}, -- {"youtube.com.ng", true, false, false}, -- {"youtube.com.om", true, false, false}, -- {"youtube.com.pe", true, false, false}, -- {"youtube.com.ph", true, false, false}, -- {"youtube.com.pk", true, false, false}, -- {"youtube.com.pt", true, false, false}, -- {"youtube.com.qa", true, false, false}, -- {"youtube.com.ro", true, false, false}, -- {"youtube.com.sa", true, false, false}, -- {"youtube.com.sg", true, false, false}, -- {"youtube.com.tn", true, false, false}, -- {"youtube.com.tr", true, false, false}, -- {"youtube.com.tw", true, false, false}, -- {"youtube.com.ua", true, false, false}, -- {"youtube.com.uy", true, false, false}, -- {"youtube.com.ve", true, false, false}, -+ {"y0u1ub3.qjz9zk", true, false, false}, -+ {"y0u1ub3.qjz9zk.ar", true, false, false}, -+ {"y0u1ub3.qjz9zk.au", true, false, false}, -+ {"y0u1ub3.qjz9zk.az", true, false, false}, -+ {"y0u1ub3.qjz9zk.bh", true, false, false}, -+ {"y0u1ub3.qjz9zk.bo", true, false, false}, -+ {"y0u1ub3.qjz9zk.br", true, false, false}, -+ {"y0u1ub3.qjz9zk.by", true, false, false}, -+ {"y0u1ub3.qjz9zk.co", true, false, false}, -+ {"y0u1ub3.qjz9zk.do", true, false, false}, -+ {"y0u1ub3.qjz9zk.ee", true, false, false}, -+ {"y0u1ub3.qjz9zk.eg", true, false, false}, -+ {"y0u1ub3.qjz9zk.es", true, false, false}, -+ {"y0u1ub3.qjz9zk.gh", true, false, false}, -+ {"y0u1ub3.qjz9zk.gr", true, false, false}, -+ {"y0u1ub3.qjz9zk.gt", true, false, false}, -+ {"y0u1ub3.qjz9zk.hk", true, false, false}, -+ {"y0u1ub3.qjz9zk.hr", true, false, false}, -+ {"y0u1ub3.qjz9zk.jm", true, false, false}, -+ {"y0u1ub3.qjz9zk.jo", true, false, false}, -+ {"y0u1ub3.qjz9zk.kw", true, false, false}, -+ {"y0u1ub3.qjz9zk.lb", true, false, false}, -+ {"y0u1ub3.qjz9zk.lv", true, false, false}, -+ {"y0u1ub3.qjz9zk.mk", true, false, false}, -+ {"y0u1ub3.qjz9zk.mt", true, false, false}, -+ {"y0u1ub3.qjz9zk.mx", true, false, false}, -+ {"y0u1ub3.qjz9zk.my", true, false, false}, -+ {"y0u1ub3.qjz9zk.ng", true, false, false}, -+ {"y0u1ub3.qjz9zk.om", true, false, false}, -+ {"y0u1ub3.qjz9zk.pe", true, false, false}, -+ {"y0u1ub3.qjz9zk.ph", true, false, false}, -+ {"y0u1ub3.qjz9zk.pk", true, false, false}, -+ {"y0u1ub3.qjz9zk.pt", true, false, false}, -+ {"y0u1ub3.qjz9zk.qa", true, false, false}, -+ {"y0u1ub3.qjz9zk.ro", true, false, false}, -+ {"y0u1ub3.qjz9zk.sa", true, false, false}, -+ {"y0u1ub3.qjz9zk.sg", true, false, false}, -+ {"y0u1ub3.qjz9zk.tn", true, false, false}, -+ {"y0u1ub3.qjz9zk.tr", true, false, false}, -+ {"y0u1ub3.qjz9zk.tw", true, false, false}, -+ {"y0u1ub3.qjz9zk.ua", true, false, false}, -+ {"y0u1ub3.qjz9zk.uy", true, false, false}, -+ {"y0u1ub3.qjz9zk.ve", true, false, false}, - {"youtube.cz", true, false, false}, - {"youtube.de", true, false, false}, - {"youtube.dk", true, false, false}, -@@ -502,38 +502,38 @@ struct GoogleConfigParams { - {"youtube.ug", true, false, false}, - {"youtube.uy", true, false, false}, - {"youtube.vn", true, false, false}, -- {"youtubeeducation.com", true, false, false}, -- {"youtubemobilesupport.com", true, false, false}, -- {"ytimg.com", true, false, false}, -+ {"y0u1ub3education.qjz9zk", true, false, false}, -+ {"y0u1ub3mobilesupport.qjz9zk", true, false, false}, -+ {"yt1mg.qjz9zk", true, false, false}, - - // Origins without subdomains and with same-origin collectors. -- {"accounts.google.com", false, true, false}, -- {"apis.google.com", false, true, false}, -+ {"accounts.9oo91e.qjz9zk", false, true, false}, -+ {"apis.9oo91e.qjz9zk", false, true, false}, - {"app.google.stackdriver.com", false, true, false}, -- {"b.mail.google.com", false, true, false}, -- {"chatenabled.mail.google.com", false, true, false}, -- {"ddm.google.com", false, true, false}, -- {"gmail.com", false, true, false}, -- {"gmail.google.com", false, true, false}, -- {"mail-attachment.googleusercontent.com", false, true, false}, -- {"mail.google.com", false, true, false}, -- {"www.gmail.com", false, true, false}, -+ {"b.mail.9oo91e.qjz9zk", false, true, false}, -+ {"chatenabled.mail.9oo91e.qjz9zk", false, true, false}, -+ {"ddm.9oo91e.qjz9zk", false, true, false}, -+ {"9ma1l.qjz9zk", false, true, false}, -+ {"gmail.9oo91e.qjz9zk", false, true, false}, -+ {"mail-attachment.9oo91eusercontent.qjz9zk", false, true, false}, -+ {"mail.9oo91e.qjz9zk", false, true, false}, -+ {"www.9ma1l.qjz9zk", false, true, false}, - - // Origins without subdomains or same-origin collectors. -- {"ad.doubleclick.net", false, false, false}, -- {"drive.google.com", false, false, false}, -- {"redirector.googlevideo.com", false, false, false}, -+ {"ad.60u613cl1c4.n3t.qjz9zk", false, false, false}, -+ {"drive.9oo91e.qjz9zk", false, false, false}, -+ {"redirector.9oo91evideo.qjz9zk", false, false, false}, - }; - - const char* const kGoogleStandardCollectors[] = { - "https://beacons.gcp.gvt2.com/domainreliability/upload", -- "https://beacons.gvt2.com/domainreliability/upload", -- "https://beacons2.gvt2.com/domainreliability/upload", -- "https://beacons3.gvt2.com/domainreliability/upload", -- "https://beacons4.gvt2.com/domainreliability/upload", -- "https://beacons5.gvt2.com/domainreliability/upload", -- "https://beacons5.gvt3.com/domainreliability/upload", -- "https://clients2.google.com/domainreliability/upload", -+ "https://b3ac0n2.9vt2.qjz9zk/domainreliability/upload", -+ "https://b3ac0n22.9vt2.qjz9zk/domainreliability/upload", -+ "https://b3ac0n23.9vt2.qjz9zk/domainreliability/upload", -+ "https://b3ac0n24.9vt2.qjz9zk/domainreliability/upload", -+ "https://b3ac0n25.9vt2.qjz9zk/domainreliability/upload", -+ "https://b3ac0n25.9vt3.qjz9zk/domainreliability/upload", -+ "https://clients2.9oo91e.qjz9zk/domainreliability/upload", - }; - - const char* const kGoogleOriginSpecificCollectorPathString = diff --git a/components/drive/service/drive_api_service.cc b/components/drive/service/drive_api_service.cc --- a/components/drive/service/drive_api_service.cc +++ b/components/drive/service/drive_api_service.cc @@ -12857,9 +12689,9 @@ diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc --- a/components/feed/feed_feature_list.cc +++ b/components/feed/feed_feature_list.cc -@@ -60,7 +60,7 @@ const base::Feature kDiscoFeedEndpoint{"DiscoFeedEndpoint", - const base::Feature kXsurfaceMetricsReporting{ - "XsurfaceMetricsReporting", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -65,7 +65,7 @@ const base::Feature kReliabilityLogging{"FeedReliabilityLogging", + const base::Feature kFeedInteractiveRefresh{"FeedInteractiveRefresh", + base::FEATURE_DISABLED_BY_DEFAULT}; -const char kDefaultReferrerUrl[] = "https://www.google.com/"; +const char kDefaultReferrerUrl[] = "https://www.9oo91e.qjz9zk/"; @@ -12910,7 +12742,7 @@ diff --git a/components/gcm_driver/gcm_account_mapper.cc b/components/gcm_driver diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -87,7 +87,7 @@ const char kMessageTypeDeletedMessagesKey[] = "deleted_messages"; +@@ -86,7 +86,7 @@ const char kMessageTypeDeletedMessagesKey[] = "deleted_messages"; const char kMessageTypeKey[] = "message_type"; const char kMessageTypeSendErrorKey[] = "send_error"; const char kSubtypeKey[] = "subtype"; @@ -12922,7 +12754,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc diff --git a/components/history/core/browser/browsing_history_service.cc b/components/history/core/browser/browsing_history_service.cc --- a/components/history/core/browser/browsing_history_service.cc +++ b/components/history/core/browser/browsing_history_service.cc -@@ -281,7 +281,7 @@ void BrowsingHistoryService::QueryHistoryInternal( +@@ -282,7 +282,7 @@ void BrowsingHistoryService::QueryHistoryInternal( semantics { description: "If history sync is enabled, this downloads the synced " @@ -12931,7 +12763,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo trigger: "Synced history is downloaded when user opens the history " "page, searches on the history page, or scrolls down the " -@@ -404,7 +404,7 @@ void BrowsingHistoryService::RemoveVisits( +@@ -405,7 +405,7 @@ void BrowsingHistoryService::RemoveVisits( semantics { description: "If a user who syncs their browsing history deletes one or more " @@ -12943,7 +12775,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 -@@ -1198,7 +1198,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1220,7 +1220,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -12952,7 +12784,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 " -@@ -1240,7 +1240,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1262,7 +1262,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -12996,7 +12828,7 @@ diff --git a/components/history/core/browser/web_history_service.cc b/components diff --git a/components/invalidation/impl/per_user_topic_subscription_manager.cc b/components/invalidation/impl/per_user_topic_subscription_manager.cc --- a/components/invalidation/impl/per_user_topic_subscription_manager.cc +++ b/components/invalidation/impl/per_user_topic_subscription_manager.cc -@@ -45,7 +45,7 @@ const char kActiveRegistrationTokens[] = +@@ -44,7 +44,7 @@ const char kActiveRegistrationTokens[] = "invalidation.per_sender_active_registration_tokens"; const char kInvalidationRegistrationScope[] = @@ -13032,19 +12864,23 @@ 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 -@@ -18,7 +18,7 @@ constexpr base::FeatureParam kMaxPixels{&kLensStandalone, - "dimensions-max-pixels", 1000}; +@@ -41,10 +41,10 @@ constexpr base::FeatureParam kMaxPixelsForImageSearch{ + &kLensStandalone, "dimensions-max-pixels", 1000}; - constexpr base::FeatureParam kHomepageURL{ + constexpr base::FeatureParam kHomepageURLForImageSearch{ - &kLensStandalone, "lens-homepage-url", "https://lens.google.com/"}; + &kLensStandalone, "lens-homepage-url", "https://lens.9oo91e.qjz9zk/"}; - int GetMaxPixels() { - return kMaxPixels.Get(); + constexpr base::FeatureParam kHomepageURLForRegionSearch{ +- &kLensRegionSearch, "lens-homepage-url", "https://lens.google.com/"}; ++ &kLensRegionSearch, "lens-homepage-url", "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 --- a/components/media_router/common/media_source.h +++ b/components/media_router/common/media_source.h -@@ -21,7 +21,7 @@ constexpr char kRemotePlaybackPresentationUrlScheme[] = "remote-playback"; +@@ -22,7 +22,7 @@ constexpr char kRemotePlaybackPresentationUrlScheme[] = "remote-playback"; // URL prefix used by legacy Cast presentations. constexpr char kLegacyCastPresentationUrlPrefix[] = @@ -13056,7 +12892,7 @@ diff --git a/components/media_router/common/media_source.h b/components/media_ro diff --git a/components/metrics/net/net_metrics_log_uploader.cc b/components/metrics/net/net_metrics_log_uploader.cc --- a/components/metrics/net/net_metrics_log_uploader.cc +++ b/components/metrics/net/net_metrics_log_uploader.cc -@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( +@@ -57,7 +57,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( "Usage statistics contain information such as preferences, button " "clicks, and memory usage and do not include web page URLs or " "personal information. See more at " @@ -13121,8 +12957,8 @@ diff --git a/components/net_log/resources/net_export.html b/components/net_log/r logging once the issue has reproduced.

  • Existing log files can be shrunk using net/tools/truncate_net_log.py.
    • @@ -13138,7 +12974,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 -@@ -104,7 +104,7 @@ const char kPrefNetworkTime[] = "network"; +@@ -106,7 +106,7 @@ const char kPrefNetworkTime[] = "network"; // rough nature of the time service provided by this class.) const uint32_t kTimeServerMaxSkewSeconds = 10; @@ -13261,7 +13097,7 @@ diff --git a/components/offline_pages/core/prefetch/prefetch_server_urls.cc b/co 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 -@@ -262,7 +262,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { +@@ -268,7 +268,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { // Domain. "(?:https?://)?(?:" "spreadsheets|docs|drive|script|sites|jamboard" @@ -13270,7 +13106,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo "(?::[0-9]+)?\\/" // Port. "(?:\\S*)" // Non-whitespace chars. "(?:" -@@ -385,7 +385,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( +@@ -387,7 +387,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( template_url_service, &keyword_input); if (keyword_provider && IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) && @@ -13279,7 +13115,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo base::CompareCase::SENSITIVE)) { return false; } -@@ -941,7 +941,7 @@ ACMatchClassifications DocumentProvider::Classify( +@@ -874,7 +874,7 @@ ACMatchClassifications DocumentProvider::Classify( // static const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Early exit to avoid unnecessary and more involved checks. @@ -13288,7 +13124,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 -@@ -952,7 +952,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -885,7 +885,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; @@ -13297,7 +13133,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(); -@@ -969,5 +969,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -902,5 +902,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. @@ -13307,7 +13143,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo diff --git a/components/omnibox/browser/document_suggestions_service.cc b/components/omnibox/browser/document_suggestions_service.cc --- a/components/omnibox/browser/document_suggestions_service.cc +++ b/components/omnibox/browser/document_suggestions_service.cc -@@ -82,7 +82,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -99,7 +99,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( std::string endpoint = base::GetFieldTrialParamValueByFeature( omnibox::kDocumentProvider, "DocumentProviderEndpoint"); if (endpoint.empty()) @@ -13316,7 +13152,7 @@ diff --git a/components/omnibox/browser/document_suggestions_service.cc b/compon const GURL suggest_url = GURL(endpoint); DCHECK(suggest_url.is_valid()); -@@ -125,7 +125,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -143,7 +143,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( request.get()); // Create and fetch an OAuth2 token. @@ -13328,7 +13164,7 @@ diff --git a/components/omnibox/browser/document_suggestions_service.cc b/compon diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc --- a/components/omnibox/browser/zero_suggest_provider.cc +++ b/components/omnibox/browser/zero_suggest_provider.cc -@@ -92,7 +92,7 @@ void LogOmniboxZeroSuggestRequest( +@@ -91,7 +91,7 @@ void LogOmniboxZeroSuggestRequest( const int kDefaultZeroSuggestRelevance = 100; // Used for testing whether zero suggest is ever available. @@ -13355,7 +13191,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://docs.google.com/spreadsheets/u/0/create?usp=chrome_actions", + "url": "https://docs.9oo91e.qjz9zk/spreadsheets/u/0/create?usp=chrome_actions", - "description": "Create a new Google Sheet quickly (like sheet.new)\n", + "description": "Create a new Google Sheet quickly (like sheet.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET", "tags": "google" }, @@ -120,7 +120,7 @@ @@ -13364,7 +13200,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://docs.google.com/presentation/u/0/create?usp=chrome_actions", + "url": "https://docs.9oo91e.qjz9zk/presentation/u/0/create?usp=chrome_actions", - "description": "Create new Google Slides quickly (like slide.new)", + "description": "Create new Google Slides quickly (like slide.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE", "tags": "google" }, @@ -128,7 +128,7 @@ @@ -13373,7 +13209,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://calendar.google.com/calendar/u/0/r/eventedit?usp=chrome_actions", + "url": "https://calendar.9oo91e.qjz9zk/calendar/u/0/r/eventedit?usp=chrome_actions", - "description": "Create a new Google Calendar event quickly (like cal.new)", + "description": "Create a new Google Calendar event quickly (like cal.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT", "tags": "google" }, @@ -136,7 +136,7 @@ @@ -13382,7 +13218,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://sites.google.com/u/0/create?usp=chrome_actions", + "url": "https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions", - "description": "Create a new Google Site quickly (like site.new)", + "description": "Create a new Google Site quickly (like site.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE", "tags": "google" }, @@ -144,7 +144,7 @@ @@ -13391,7 +13227,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://keep.google.com/u/0/?usp=chrome_actions#NEWNOTE", + "url": "https://keep.9oo91e.qjz9zk/u/0/?usp=chrome_actions#NEWNOTE", - "description": "Create a new Google Keep note quickly (like keep.new)", + "description": "Create a new Google Keep note quickly (like keep.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE", "tags": "google" }, @@ -152,7 +152,7 @@ @@ -13400,7 +13236,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://docs.google.com/forms/u/0/create?usp=chrome_actions", + "url": "https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions", - "description": "Create a new Google Form quickly (like form.new)", + "description": "Create a new Google Form quickly (like form.new)\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_HINT\nIDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM", "tags": "google" }, @@ -160,7 +160,7 @@ @@ -13418,7 +13254,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://www.google.com/chrome/tips/", + "url": "https://www.9oo91e.qjz9zk/chrome/tips/", - "description": "Learn about new Chrome features", + "description": "Learn about new Chrome features\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_HINT\nIDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS", "tags": "" }, @@ -176,7 +176,7 @@ @@ -13427,7 +13263,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://myaccount.google.com/?utm_source=ga-chrome-actions&utm_medium=manageGA", + "url": "https://myaccount.9oo91e.qjz9zk/?utm_source=ga-chrome-actions&utm_medium=manageGA", - "description": "Manage your Google Account", + "description": "Manage your Google Account\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_HINT\nIDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT", "tags": "google" }, @@ -192,7 +192,7 @@ @@ -13436,9 +13272,9 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/componen "enabled": true, - "url": "https://myaccount.google.com/signinoptions/password?utm_source=ga-chrome-actions&utm_medium=changePW", + "url": "https://myaccount.9oo91e.qjz9zk/signinoptions/password?utm_source=ga-chrome-actions&utm_medium=changePW", - "description": "Change the password for your Google Account", + "description": "Change the password for your Google Account\n\nUser-facing strings for this Pedal:\nIDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_HINT\nIDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUGGESTION_CONTENTS\nIDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUFFIX\nIDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD", "tags": "google" - } + }, diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json b/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json --- a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json +++ b/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json @@ -13535,7 +13371,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json b/co diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/components/omnibox/resources/omnibox_pedal_concepts_en.json --- a/components/omnibox/resources/omnibox_pedal_concepts_en.json +++ b/components/omnibox/resources/omnibox_pedal_concepts_en.json -@@ -1117,7 +1117,7 @@ +@@ -1128,7 +1128,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google Doc quickly", "spoken_button_focus_announcement": "Create doc button, press Enter to create a new Google Doc quickly" }, @@ -13544,7 +13380,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 14, -@@ -1198,7 +1198,7 @@ +@@ -1209,7 +1209,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google Sheet quickly", "spoken_button_focus_announcement": "Create sheet button, press Enter to create a new Google Sheet quickly" }, @@ -13553,7 +13389,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 15, -@@ -1274,7 +1274,7 @@ +@@ -1285,7 +1285,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google presentation in Slides quickly", "spoken_button_focus_announcement": "Create presentation button, press Enter to create a new Google presentation in Slides quickly" }, @@ -13562,7 +13398,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 16, -@@ -1356,7 +1356,7 @@ +@@ -1367,7 +1367,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new event in Google Calendar quickly", "spoken_button_focus_announcement": "Create event button, press Enter to create a new event in Google Calendar quickly" }, @@ -13571,7 +13407,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 17, -@@ -1423,7 +1423,7 @@ +@@ -1434,7 +1434,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new site in Google Sites quickly", "spoken_button_focus_announcement": "Create site button, press Enter to create a new site in Google Sites quickly" }, @@ -13580,7 +13416,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 18, -@@ -1493,7 +1493,7 @@ +@@ -1504,7 +1504,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new note in Google Keep quickly", "spoken_button_focus_announcement": "Create note button, press Enter to create a new note in Google Keep quickly" }, @@ -13589,7 +13425,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 19, -@@ -1566,7 +1566,7 @@ +@@ -1577,7 +1577,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new form in Google Forms quickly", "spoken_button_focus_announcement": "Create form button, press Enter to create a new form in Google Forms quickly" }, @@ -13598,7 +13434,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 21, -@@ -1640,7 +1640,7 @@ +@@ -1651,7 +1651,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to learn about Chrome features", "spoken_button_focus_announcement": "See Chrome tips button, press Enter to learn about Chrome features" }, @@ -13607,7 +13443,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 22, -@@ -1692,7 +1692,7 @@ +@@ -1703,7 +1703,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to manage your info, privacy, and security in your Google Account", "spoken_button_focus_announcement": "Manage Google Account, press Enter to manage your info, privacy, and security in your Google Account" }, @@ -13616,15 +13452,15 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo }, { "id": 24, -@@ -1761,7 +1761,7 @@ +@@ -1772,7 +1772,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to change your Google Account password", "spoken_button_focus_announcement": "Change Google password button, press Enter to change your Google Account password" }, - "url": "https://myaccount.google.com/signinoptions/password?utm_source=ga-chrome-actions&utm_medium=changePW" + "url": "https://myaccount.9oo91e.qjz9zk/signinoptions/password?utm_source=ga-chrome-actions&utm_medium=changePW" - } - ], - "ignore_group": { + }, + { + "id": 26, diff --git a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc --- a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc +++ b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc @@ -13710,22 +13546,10 @@ diff --git a/components/password_manager/core/browser/android_affiliation/affili "key", google_apis::GetAPIKey()); } -diff --git a/components/password_manager/core/browser/change_password_url_service_impl.h b/components/password_manager/core/browser/change_password_url_service_impl.h ---- a/components/password_manager/core/browser/change_password_url_service_impl.h -+++ b/components/password_manager/core/browser/change_password_url_service_impl.h -@@ -55,7 +55,7 @@ class ChangePasswordUrlServiceImpl - GURL GetChangePasswordUrl(const GURL& url) override; - - static constexpr char kChangePasswordUrlOverrideUrl[] = -- "https://www.gstatic.com/chrome/password-manager/" -+ "https://www.95tat1c.qjz9zk/chrome/password-manager/" - "change_password_urls.json"; - - private: diff --git a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc --- a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc +++ b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc -@@ -85,7 +85,7 @@ std::string GetHashPrefix(const GURL& origin, size_t prefix_length) { +@@ -86,7 +86,7 @@ std::string GetHashPrefix(const GURL& origin, size_t prefix_length) { // that contains data for |hash_prefix|. GURL GetUrlForRequirementsSpec(int version, const std::string& hash_prefix) { return GURL(base::StringPrintf( @@ -13737,7 +13561,7 @@ diff --git a/components/password_manager/core/browser/generation/password_requir diff --git a/components/password_manager/core/browser/hash_password_manager.cc b/components/password_manager/core/browser/hash_password_manager.cc --- a/components/password_manager/core/browser/hash_password_manager.cc +++ b/components/password_manager/core/browser/hash_password_manager.cc -@@ -214,7 +214,7 @@ void HashPasswordManager::ClearAllNonGmailPasswordHash() { +@@ -213,7 +213,7 @@ void HashPasswordManager::ClearAllNonGmailPasswordHash() { std::string username = GetAndDecryptField(data, kUsernameFieldKey); std::string email = CanonicalizeUsername(username, /*is_gaia_account=*/true); @@ -13758,18 +13582,6 @@ diff --git a/components/password_manager/core/browser/leak_detection/leak_detect LeakDetectionRequest(); ~LeakDetectionRequest() override; -diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc ---- a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc -+++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc -@@ -26,7 +26,7 @@ namespace password_manager { - namespace { - - constexpr char kAPIScope[] = -- "https://www.googleapis.com/auth/identity.passwords.leak.check"; -+ "https://www.9oo91eapis.qjz9zk/auth/identity.passwords.leak.check"; - - // Returns a Google account that can be used for getting a token. - CoreAccountId GetAccountForRequest( diff --git a/components/password_manager/core/browser/leak_detection_dialog_utils.cc b/components/password_manager/core/browser/leak_detection_dialog_utils.cc --- a/components/password_manager/core/browser/leak_detection_dialog_utils.cc +++ b/components/password_manager/core/browser/leak_detection_dialog_utils.cc @@ -13782,6 +13594,24 @@ diff --git a/components/password_manager/core/browser/leak_detection_dialog_util CredentialLeakType CreateLeakType(IsSaved is_saved, IsReused is_reused, +diff --git a/components/password_manager/core/browser/old_google_credentials_cleaner.cc b/components/password_manager/core/browser/old_google_credentials_cleaner.cc +--- a/components/password_manager/core/browser/old_google_credentials_cleaner.cc ++++ b/components/password_manager/core/browser/old_google_credentials_cleaner.cc +@@ -40,10 +40,10 @@ void OldGoogleCredentialCleaner::OnGetPasswordStoreResults( + + auto IsOldGoogleForm = [&cutoff](const std::unique_ptr& form) { + return (form->scheme == PasswordForm::Scheme::kHtml && +- (form->signon_realm == "http://www.google.com" || +- form->signon_realm == "http://www.google.com/" || +- form->signon_realm == "https://www.google.com" || +- form->signon_realm == "https://www.google.com/")) && ++ (form->signon_realm == "http://www.9oo91e.qjz9zk" || ++ form->signon_realm == "http://www.9oo91e.qjz9zk/" || ++ form->signon_realm == "https://www.9oo91e.qjz9zk" || ++ form->signon_realm == "https://www.9oo91e.qjz9zk/")) && + form->date_created < cutoff; + }; + diff --git a/components/password_manager/core/browser/password_generation_frame_helper.cc b/components/password_manager/core/browser/password_generation_frame_helper.cc --- a/components/password_manager/core/browser/password_generation_frame_helper.cc +++ b/components/password_manager/core/browser/password_generation_frame_helper.cc @@ -13797,7 +13627,7 @@ diff --git a/components/password_manager/core/browser/password_generation_frame_ diff --git a/components/password_manager/core/browser/password_hash_data.cc b/components/password_manager/core/browser/password_hash_data.cc --- a/components/password_manager/core/browser/password_hash_data.cc +++ b/components/password_manager/core/browser/password_hash_data.cc -@@ -96,7 +96,7 @@ std::string CanonicalizeUsername(const std::string& username, +@@ -99,7 +99,7 @@ std::string CanonicalizeUsername(const std::string& username, username, "@", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (parts.size() != 2U) { if (is_gaia_account && parts.size() == 1U) @@ -13824,7 +13654,7 @@ diff --git a/components/password_manager/core/browser/password_manager_constants diff --git a/components/password_manager/core/browser/password_reuse_detector.cc b/components/password_manager/core/browser/password_reuse_detector.cc --- a/components/password_manager/core/browser/password_reuse_detector.cc +++ b/components/password_manager/core/browser/password_reuse_detector.cc -@@ -284,7 +284,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { +@@ -318,7 +318,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { *gaia_password_hash_data_list_, [](const PasswordHashData& data) { std::string email = CanonicalizeUsername(data.username, data.is_gaia_password); @@ -13836,7 +13666,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[] = @@ -13845,24 +13675,6 @@ diff --git a/components/password_manager/core/browser/password_scripts_fetcher_i constexpr base::FeatureParam kScriptsListUrlParam{ &features::kPasswordScriptsFetching, "custom_list_url", -diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc ---- a/components/password_manager/core/browser/password_store.cc -+++ b/components/password_manager/core/browser/password_store.cc -@@ -296,10 +296,10 @@ void PasswordStore::GetLogins(const FormDigest& form, - // TODO(mdm): actually delete them at some point, say M24 or so. - base::Time cutoff; // the null time - if (form.scheme == PasswordForm::Scheme::kHtml && -- (form.signon_realm == "http://www.google.com" || -- form.signon_realm == "http://www.google.com/" || -- form.signon_realm == "https://www.google.com" || -- form.signon_realm == "https://www.google.com/")) { -+ (form.signon_realm == "http://www.9oo91e.qjz9zk" || -+ form.signon_realm == "http://www.9oo91e.qjz9zk/" || -+ form.signon_realm == "https://www.9oo91e.qjz9zk" || -+ form.signon_realm == "https://www.9oo91e.qjz9zk/")) { - static const base::Time::Exploded exploded_cutoff = { - 2012, 1, 0, 1, 0, 0, 0, 0}; // 00:00 Jan 1 2012 - base::Time out_time; diff --git a/components/password_manager/core/browser/password_sync_util.cc b/components/password_manager/core/browser/password_sync_util.cc --- a/components/password_manager/core/browser/password_sync_util.cc +++ b/components/password_manager/core/browser/password_sync_util.cc @@ -13986,6 +13798,38 @@ diff --git a/components/payments/core/method_strings.cc b/components/payments/co const char kSecurePaymentConfirmation[] = "secure-payment-confirmation"; } // namespace methods +diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd +--- a/components/permissions/android/permissions_android_strings.grd ++++ b/components/permissions/android/permissions_android_strings.grd +@@ -220,7 +220,7 @@ + Connected Device + + +- %1$shttps://www.google.com wants to pair ++ %1$shttps://www.9oo91e.qjz9zk wants to pair + + No compatible devices found + +@@ -254,7 +254,7 @@ + + + +- %1$swww.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: ++ %1$swww.9oo91e.qjz9zk wants to scan for nearby Bluetooth devices. The following devices have been found: + + + Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) +diff --git a/components/permissions/constants.cc b/components/permissions/constants.cc +--- a/components/permissions/constants.cc ++++ b/components/permissions/constants.cc +@@ -7,6 +7,6 @@ + namespace permissions { + + const char kChooserBluetoothOverviewURL[] = +- "https://support.google.com/chrome?p=bluetooth"; ++ "https://support.9oo91e.qjz9zk/chrome?p=bluetooth"; + + } // namespace permissions diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc @@ -14141,7 +13985,7 @@ diff --git a/components/policy/core/common/policy_loader_common.cc b/components/ diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json -@@ -79,7 +79,7 @@ +@@ -78,7 +78,7 @@ # generating the comments for .proto files, paragraphs containing such tags # should not be line-wrapped (use one long line per paragraph instead) to allow # for correct re-flowing of the text. @@ -14150,7 +13994,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli # # See documentation in docs/enterprise/components/policy/resources/description_guidelines.md # for how product names should appear in tags to ensure consistency. -@@ -164,7 +164,7 @@ +@@ -163,7 +163,7 @@ # 'cloud_only' Set to True if the policy is forced or recommended to set from # Admin console only. This hides the policy from policy templates and Chrome # documentation in policy_templates.zip. The documentation will NOT be hidden @@ -14159,7 +14003,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. -@@ -427,7 +427,7 @@ +@@ -425,7 +425,7 @@ If you choose to auto detect the proxy server, all other options are ignored. For detailed examples, visit: @@ -14168,7 +14012,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. -@@ -596,7 +596,7 @@ +@@ -597,7 +597,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -14177,7 +14021,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. -@@ -611,7 +611,7 @@ +@@ -612,7 +612,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -14186,7 +14030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Allow $3Google Chrome Frame to handle the following content types''', 'desc': '''Allow $3Google Chrome Frame to handle the following content types.''', -@@ -1243,7 +1243,7 @@ +@@ -1251,7 +1251,7 @@ }, { 'name': 'HomepageLocation', @@ -14195,7 +14039,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-'], -@@ -1252,7 +1252,7 @@ +@@ -1260,7 +1260,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14204,7 +14048,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1269,7 +1269,7 @@ +@@ -1277,7 +1277,7 @@ }, { 'name': 'HomepageIsNewTabPage', @@ -14213,16 +14057,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], -@@ -1290,7 +1290,7 @@ +@@ -1298,7 +1298,7 @@ }, { 'name': 'NewTabPageLocation', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'okalitova@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'okalitova@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], -@@ -1298,7 +1298,7 @@ +@@ -1306,7 +1306,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14231,7 +14075,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1317,7 +1317,7 @@ +@@ -1325,7 +1325,7 @@ }, { 'name': 'DefaultBrowserSettingEnabled', @@ -14240,7 +14084,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-'], -@@ -1333,12 +1333,12 @@ +@@ -1341,12 +1341,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -14255,7 +14099,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:8-'], -@@ -1361,7 +1361,7 @@ +@@ -1369,7 +1369,7 @@ }, { 'name': 'AlternateErrorPagesEnabled', @@ -14264,7 +14108,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1384,7 +1384,7 @@ +@@ -1392,7 +1392,7 @@ }, { 'name': 'SearchSuggestEnabled', @@ -14273,7 +14117,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1408,7 +1408,7 @@ +@@ -1416,7 +1416,7 @@ }, { 'name': 'NativeWindowOcclusionEnabled', @@ -14282,7 +14126,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1436,7 +1436,7 @@ +@@ -1444,7 +1444,7 @@ }, { 'name': 'WindowOcclusionEnabled', @@ -14291,7 +14135,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1472,7 +1472,7 @@ +@@ -1480,7 +1480,7 @@ }, { 'name': 'DnsPrefetchingEnabled', @@ -14300,7 +14144,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'], -@@ -1498,7 +1498,7 @@ +@@ -1506,7 +1506,7 @@ }, { 'name': 'NetworkPredictionOptions', @@ -14309,7 +14153,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1538,7 +1538,7 @@ +@@ -1546,7 +1546,7 @@ }, { 'name': 'WPADQuickCheckEnabled', @@ -14318,16 +14162,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ], -@@ -1569,7 +1569,7 @@ +@@ -1577,7 +1577,7 @@ }, { 'name': 'DisableSpdy', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'bnc@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bnc@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'], -@@ -1594,7 +1594,7 @@ +@@ -1602,7 +1602,7 @@ }, { 'name': 'DisabledSchemes', @@ -14336,7 +14180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1621,7 +1621,7 @@ +@@ -1629,7 +1629,7 @@ }, { 'name': 'GloballyScopeHTTPAuthCacheEnabled', @@ -14345,7 +14189,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-'], -@@ -1645,7 +1645,7 @@ +@@ -1653,7 +1653,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -14354,7 +14198,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-'], -@@ -1676,7 +1676,7 @@ +@@ -1684,7 +1684,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -14363,7 +14207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1723,7 +1723,7 @@ +@@ -1731,7 +1731,7 @@ }, { 'name': 'Http09OnNonDefaultPortsEnabled', @@ -14372,7 +14216,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'], -@@ -1748,7 +1748,7 @@ +@@ -1756,7 +1756,7 @@ }, { 'name': 'JavascriptEnabled', @@ -14381,7 +14225,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-'], -@@ -1771,7 +1771,7 @@ +@@ -1779,7 +1779,7 @@ }, { 'name': 'IncognitoEnabled', @@ -14390,7 +14234,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-'], -@@ -1795,7 +1795,7 @@ +@@ -1803,7 +1803,7 @@ }, { 'name': 'IncognitoModeAvailability', @@ -14399,7 +14243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1848,7 +1848,7 @@ +@@ -1856,7 +1856,7 @@ }, { 'name': 'SavingBrowserHistoryDisabled', @@ -14408,7 +14252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1871,7 +1871,7 @@ +@@ -1879,7 +1879,7 @@ }, { 'name': 'AllowDeletingBrowserHistory', @@ -14417,7 +14261,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-'], -@@ -1889,7 +1889,7 @@ +@@ -1897,7 +1897,7 @@ }, { 'name': 'AllowDinosaurEasterEgg', @@ -14426,7 +14270,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-'], -@@ -1908,7 +1908,7 @@ +@@ -1916,7 +1916,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -14435,7 +14279,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'], -@@ -1931,7 +1931,7 @@ +@@ -1939,7 +1939,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -14444,7 +14288,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'], -@@ -1954,7 +1954,7 @@ +@@ -1962,7 +1962,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -14453,7 +14297,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-'], -@@ -1972,7 +1972,7 @@ +@@ -1980,7 +1980,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -14462,7 +14306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1998,7 +1998,7 @@ +@@ -2006,7 +2006,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -14471,7 +14315,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-'], -@@ -2017,7 +2017,7 @@ +@@ -2025,7 +2025,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -14480,7 +14324,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-'], -@@ -2035,7 +2035,7 @@ +@@ -2043,7 +2043,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -14489,7 +14333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2061,7 +2061,7 @@ +@@ -2069,7 +2069,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -14498,7 +14342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2084,7 +2084,7 @@ +@@ -2092,7 +2092,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -14507,7 +14351,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'], -@@ -2100,17 +2100,17 @@ +@@ -2108,17 +2108,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -14529,7 +14373,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2129,7 +2129,7 @@ +@@ -2137,7 +2137,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -14538,7 +14382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2148,7 +2148,7 @@ +@@ -2156,7 +2156,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -14547,7 +14391,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2170,7 +2170,7 @@ +@@ -2178,7 +2178,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -14556,7 +14400,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-'], -@@ -2189,7 +2189,7 @@ +@@ -2197,7 +2197,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -14565,7 +14409,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-'], -@@ -2210,7 +2210,7 @@ +@@ -2218,7 +2218,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -14574,7 +14418,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-'], -@@ -2229,7 +2229,7 @@ +@@ -2237,7 +2237,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -14583,7 +14427,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2251,7 +2251,7 @@ +@@ -2259,7 +2259,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -14592,7 +14436,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2271,7 +2271,7 @@ +@@ -2279,7 +2279,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -14601,7 +14445,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2289,7 +2289,7 @@ +@@ -2297,7 +2297,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -14610,7 +14454,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'], -@@ -2309,7 +2309,7 @@ +@@ -2317,7 +2317,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -14619,7 +14463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2329,7 +2329,7 @@ +@@ -2337,7 +2337,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -14628,7 +14472,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2349,7 +2349,7 @@ +@@ -2357,7 +2357,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', @@ -14637,7 +14481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2370,7 +2370,7 @@ +@@ -2378,7 +2378,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteAccessConnections', @@ -14646,7 +14490,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -2400,7 +2400,7 @@ +@@ -2408,7 +2408,7 @@ }, { 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', @@ -14655,7 +14499,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-'], -@@ -2420,7 +2420,7 @@ +@@ -2428,7 +2428,7 @@ }, { 'name': 'DeviceAllowMGSToStoreDisplayProperties', @@ -14664,7 +14508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -2447,7 +2447,7 @@ +@@ -2455,7 +2455,7 @@ }, { 'name': 'PrintingEnabled', @@ -14673,7 +14517,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2471,7 +2471,7 @@ +@@ -2479,7 +2479,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -14682,7 +14526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2489,7 +2489,7 @@ +@@ -2497,7 +2497,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -14691,7 +14535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2530,7 +2530,7 @@ +@@ -2538,7 +2538,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -14700,7 +14544,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2573,7 +2573,7 @@ +@@ -2581,7 +2581,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -14709,7 +14553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2614,7 +2614,7 @@ +@@ -2622,7 +2622,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -14718,7 +14562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2655,7 +2655,7 @@ +@@ -2663,7 +2663,7 @@ }, { 'name': 'PrintingColorDefault', @@ -14727,7 +14571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2690,7 +2690,7 @@ +@@ -2698,7 +2698,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -14736,7 +14580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2731,7 +2731,7 @@ +@@ -2739,7 +2739,7 @@ }, { 'name': 'PrintingPinDefault', @@ -14745,7 +14589,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2766,7 +2766,7 @@ +@@ -2774,7 +2774,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -14754,7 +14598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2801,7 +2801,7 @@ +@@ -2809,7 +2809,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -14763,7 +14607,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -2987,7 +2987,7 @@ +@@ -2995,7 +2995,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -14772,7 +14616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -3006,7 +3006,7 @@ +@@ -3014,7 +3014,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -14781,7 +14625,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-'], -@@ -3024,7 +3024,7 @@ +@@ -3032,7 +3032,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -14790,7 +14634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:84-', 'chrome_os:84-', 'android:84-', 'webview_android:84-'], -@@ -3042,7 +3042,7 @@ +@@ -3050,7 +3050,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -14799,7 +14643,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-'], -@@ -3064,7 +3064,7 @@ +@@ -3072,7 +3072,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -14808,7 +14652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3088,7 +3088,7 @@ +@@ -3096,7 +3096,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -14817,7 +14661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3109,7 +3109,7 @@ +@@ -3117,7 +3117,7 @@ }, { 'name': 'ForceSafeSearch', @@ -14826,7 +14670,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-'], -@@ -3133,7 +3133,7 @@ +@@ -3141,7 +3141,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -14835,7 +14679,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-'], -@@ -3152,7 +3152,7 @@ +@@ -3160,7 +3160,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -14844,7 +14688,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-'], -@@ -3177,7 +3177,7 @@ +@@ -3185,7 +3185,7 @@ }, { 'name': 'ForceYouTubeRestrict', @@ -14853,7 +14697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3221,7 +3221,7 @@ +@@ -3229,7 +3229,7 @@ }, { 'name': 'SafeBrowsingEnabled', @@ -14862,7 +14706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3246,7 +3246,7 @@ +@@ -3254,7 +3254,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. @@ -14871,7 +14715,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. -@@ -3254,7 +3254,7 @@ +@@ -3262,7 +3262,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -14880,7 +14724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3304,12 +3304,12 @@ +@@ -3312,12 +3312,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -14895,7 +14739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3337,7 +3337,7 @@ +@@ -3345,7 +3345,7 @@ }, { 'name': 'PasswordManagerEnabled', @@ -14904,7 +14748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3364,7 +3364,7 @@ +@@ -3372,7 +3372,7 @@ }, { 'name': 'PasswordManagerAllowShowPasswords', @@ -14913,7 +14757,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'], -@@ -3387,7 +3387,7 @@ +@@ -3395,7 +3395,7 @@ }, { 'name': 'PasswordLeakDetectionEnabled', @@ -14922,16 +14766,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3412,7 +3412,7 @@ +@@ -3420,7 +3420,7 @@ }, { 'name': 'AutoFillEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['file://components/autofill/OWNERS', 'sebsg@chromium.org'], ++ 'owners': ['file://components/autofill/OWNERS', 'sebsg@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3440,7 +3440,7 @@ +@@ -3448,7 +3448,7 @@ }, { 'name': 'AutofillAddressEnabled', @@ -14940,7 +14784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3464,7 +3464,7 @@ +@@ -3472,7 +3472,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -14949,7 +14793,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3488,7 +3488,7 @@ +@@ -3496,7 +3496,7 @@ }, { 'name': 'DisabledPlugins', @@ -14958,7 +14802,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3519,7 +3519,7 @@ +@@ -3527,7 +3527,7 @@ }, { 'name': 'EnabledPlugins', @@ -14967,7 +14811,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3550,7 +3550,7 @@ +@@ -3558,7 +3558,7 @@ }, { 'name': 'DisabledPluginsExceptions', @@ -14976,7 +14820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3583,7 +3583,7 @@ +@@ -3591,7 +3591,7 @@ }, { 'name': 'AlwaysOpenPdfExternally', @@ -14985,7 +14829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:55-'], -@@ -3601,7 +3601,7 @@ +@@ -3612,7 +3612,7 @@ }, { 'name': 'DisablePluginFinder', @@ -14994,7 +14838,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'], -@@ -3621,7 +3621,7 @@ +@@ -3632,7 +3632,7 @@ }, { 'name': 'SyncDisabled', @@ -15003,7 +14847,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-'], -@@ -3645,7 +3645,7 @@ +@@ -3656,7 +3656,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -15012,7 +14856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3666,7 +3666,7 @@ +@@ -3677,7 +3677,7 @@ }, { 'name': 'RoamingProfileSupportEnabled', @@ -15021,7 +14865,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-'], -@@ -3685,7 +3685,7 @@ +@@ -3696,7 +3696,7 @@ }, { 'name': 'RoamingProfileLocation', @@ -15030,7 +14874,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-'], -@@ -3701,7 +3701,7 @@ +@@ -3712,7 +3712,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. @@ -15039,7 +14883,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. -@@ -3710,7 +3710,7 @@ +@@ -3721,7 +3721,7 @@ }, { 'name': 'SigninAllowed', @@ -15048,7 +14892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -3731,7 +3731,7 @@ +@@ -3742,7 +3742,7 @@ }, { 'name': 'EnableDeprecatedWebBasedSignin', @@ -15057,7 +14901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-42'], -@@ -3754,7 +3754,7 @@ +@@ -3765,7 +3765,7 @@ }, { 'name': 'UserDataDir', @@ -15066,7 +14910,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-'], -@@ -3773,14 +3773,14 @@ +@@ -3784,14 +3784,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. @@ -15083,7 +14927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:13-'], -@@ -3796,12 +3796,12 @@ +@@ -3807,12 +3807,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. @@ -15098,7 +14942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-'], -@@ -3822,7 +3822,7 @@ +@@ -3833,7 +3833,7 @@ }, { 'name': 'MediaCacheSize', @@ -15107,7 +14951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-71'], -@@ -3844,7 +3844,7 @@ +@@ -3855,7 +3855,7 @@ }, { 'name': 'DownloadRestrictions', @@ -15116,7 +14960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3901,12 +3901,12 @@ +@@ -3912,12 +3912,12 @@ * No special restrictions means the downloads go through the usual security restrictions based on safety analysis results. @@ -15131,7 +14975,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-'], -@@ -3923,13 +3923,13 @@ +@@ -3934,13 +3934,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. @@ -15147,7 +14991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3956,7 +3956,7 @@ +@@ -3967,7 +3967,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -15156,7 +15000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3979,11 +3979,11 @@ +@@ -3990,11 +3990,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. @@ -15170,7 +15014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -4016,13 +4016,13 @@ +@@ -4027,13 +4027,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. @@ -15186,7 +15030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -4057,7 +4057,7 @@ +@@ -4068,7 +4068,7 @@ }, { 'name': 'ClearSiteDataOnExit', @@ -15195,7 +15039,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'], -@@ -4076,7 +4076,7 @@ +@@ -4087,7 +4087,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -15204,7 +15048,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4096,7 +4096,7 @@ +@@ -4107,7 +4107,7 @@ }, { 'name': 'ProxyMode', @@ -15213,7 +15057,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -4164,11 +4164,11 @@ +@@ -4175,11 +4175,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -15227,7 +15071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4224,7 +4224,7 @@ +@@ -4235,7 +4235,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: @@ -15236,7 +15080,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. -@@ -4233,7 +4233,7 @@ +@@ -4244,7 +4244,7 @@ }, { 'name': 'ProxyServer', @@ -15245,7 +15089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4256,12 +4256,12 @@ +@@ -4267,12 +4267,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -15260,7 +15104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4284,12 +4284,12 @@ +@@ -4295,12 +4295,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -15275,7 +15119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4312,13 +4312,13 @@ +@@ -4323,13 +4323,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -15291,9 +15135,9 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -4365,12 +4365,12 @@ - * fixed_server, the ProxyServer and ProxyBypassList fields are used. - * pac_script, the ProxyPacUrl and ProxyBypassList fields are used. +@@ -4378,12 +4378,12 @@ + * fixed_servers, the ProxyServer and ProxyBypassList fields are used. + * pac_script, the ProxyPacUrl, ProxyPacMandatory and ProxyBypassList fields are used. - Note: For more detailed examples, visit The Chromium Projects ( https://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett ).''', + Note: For more detailed examples, visit The Chromium Projects ( https://www.ch40m1um.qjz9zk/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett ).''', @@ -15306,7 +15150,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-'], -@@ -4400,7 +4400,7 @@ +@@ -4413,7 +4413,7 @@ }, { 'name': 'DisableAuthNegotiateCnameLookup', @@ -15315,7 +15159,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-'], -@@ -4418,7 +4418,7 @@ +@@ -4431,7 +4431,7 @@ }, { 'name': 'EnableAuthNegotiatePort', @@ -15324,7 +15168,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-'], -@@ -4436,7 +4436,7 @@ +@@ -4449,7 +4449,7 @@ }, { 'name': 'BasicAuthOverHttpEnabled', @@ -15333,7 +15177,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-'], -@@ -4467,7 +4467,7 @@ +@@ -4480,7 +4480,7 @@ }, { 'name': 'AuthServerWhitelist', @@ -15342,7 +15186,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-'], -@@ -4490,7 +4490,7 @@ +@@ -4503,7 +4503,7 @@ }, { 'name': 'AuthServerAllowlist', @@ -15351,7 +15195,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-'], -@@ -4510,7 +4510,7 @@ +@@ -4523,7 +4523,7 @@ }, { 'name': 'AuthNegotiateDelegateWhitelist', @@ -15360,7 +15204,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-'], -@@ -4531,7 +4531,7 @@ +@@ -4544,7 +4544,7 @@ }, { 'name': 'AuthNegotiateDelegateAllowlist', @@ -15369,7 +15213,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-'], -@@ -4549,7 +4549,7 @@ +@@ -4562,7 +4562,7 @@ }, { 'name': 'AuthNegotiateDelegateByKdcPolicy', @@ -15378,16 +15222,16 @@ 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-'], -@@ -4569,7 +4569,7 @@ +@@ -4582,7 +4582,7 @@ }, { 'name': 'BrowserLabsEnabled', -- 'owners': ['elainechien@chromium.org', 'robliao@chromium.org'], -+ 'owners': ['elainechien@ch40m1um.qjz9zk', 'robliao@ch40m1um.qjz9zk'], +- 'owners': ['elainechien@chromium.org', 'labs-on-chrome@google.com'], ++ 'owners': ['elainechien@ch40m1um.qjz9zk', 'labs-on-chrome@9oo91e.qjz9zk'], 'type': 'main', 'schema' : {'type': 'boolean'}, - 'supported_on': ['chrome.*:89-'], -@@ -4601,7 +4601,7 @@ + 'supported_on': ['chrome.*:89-', 'chrome_os:93-'], +@@ -4613,7 +4613,7 @@ }, { 'name': 'GSSAPILibraryName', @@ -15396,7 +15240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.linux:9-'], -@@ -4619,7 +4619,7 @@ +@@ -4631,7 +4631,7 @@ }, { 'name': 'AuthAndroidNegotiateAccountType', @@ -15405,7 +15249,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-'], -@@ -4631,13 +4631,13 @@ +@@ -4643,13 +4643,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -15421,7 +15265,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-'], -@@ -4657,7 +4657,7 @@ +@@ -4669,7 +4669,7 @@ }, { 'name': 'NtlmV2Enabled', @@ -15430,52 +15274,52 @@ 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-'], -@@ -4688,7 +4688,7 @@ +@@ -4700,7 +4700,7 @@ }, { 'name': 'ExtensionInstallBlacklist', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['lazyboy@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['lazyboy@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4714,7 +4714,7 @@ +@@ -4726,7 +4726,7 @@ { 'name': 'ExtensionInstallBlocklist', -- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], +- 'owners': ['lazyboy@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['lazyboy@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4738,7 +4738,7 @@ +@@ -4750,7 +4750,7 @@ }, { 'name': 'ExtensionInstallAllowlist', -- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], +- 'owners': ['rdevlin.cronin@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['rdevlin.cronin@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4762,7 +4762,7 @@ +@@ -4774,7 +4774,7 @@ }, { 'name': 'ExtensionInstallWhitelist', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['rdevlin.cronin@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['rdevlin.cronin@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4785,7 +4785,7 @@ +@@ -4797,7 +4797,7 @@ }, { 'name': 'ExtensionInstallForcelist', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['karandeepb@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['karandeepb@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4796,7 +4796,7 @@ +@@ -4808,7 +4808,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -15484,7 +15328,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'], -@@ -4812,15 +4812,15 @@ +@@ -4824,15 +4824,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. @@ -15498,12 +15342,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'ExtensionInstallSources', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['dbertoni@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['dbertoni@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4838,14 +4838,14 @@ +@@ -4850,14 +4850,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. @@ -15520,25 +15364,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -4866,7 +4866,7 @@ +@@ -4878,7 +4878,7 @@ }, { 'name': 'ExtensionAllowedTypes', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['benwells@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['benwells@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -4919,7 +4919,7 @@ +@@ -4931,7 +4931,7 @@ }, { 'name': 'ExtensionSettings', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['finnur@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['finnur@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'dict', 'schema': { 'type': 'object', -@@ -5014,7 +5014,7 @@ +@@ -5026,7 +5026,7 @@ }, }, }, @@ -15547,7 +15391,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -5071,13 +5071,13 @@ +@@ -5083,13 +5083,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. @@ -15558,12 +15402,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'BlockExternalExtensions', -- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], +- 'owners': ['reillyg@chromium.org', 'file://extensions/OWNERS'], ++ 'owners': ['reillyg@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-'], -@@ -5095,12 +5095,12 @@ +@@ -5107,12 +5107,12 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -15578,7 +15422,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-'], -@@ -5119,7 +5119,7 @@ +@@ -5131,7 +5131,7 @@ }, { 'name': 'DeveloperToolsDisabled', @@ -15587,7 +15431,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-'], -@@ -5145,7 +5145,7 @@ +@@ -5157,7 +5157,7 @@ }, { 'name': 'DeveloperToolsAvailability', @@ -15596,7 +15440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5217,7 +5217,7 @@ +@@ -5260,7 +5260,7 @@ }, { 'name': 'RestoreOnStartup', @@ -15605,7 +15449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5260,7 +5260,7 @@ +@@ -5303,7 +5303,7 @@ }, { 'name': 'RestoreOnStartupURLs', @@ -15614,7 +15458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5272,7 +5272,7 @@ +@@ -5315,7 +5315,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -15623,7 +15467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -5284,7 +5284,7 @@ +@@ -5327,7 +5327,7 @@ }, { 'name': 'BlockThirdPartyCookies', @@ -15632,7 +15476,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-'], -@@ -5318,7 +5318,7 @@ +@@ -5361,7 +5361,7 @@ }, { 'name': 'DefaultSearchProviderEnabled', @@ -15641,7 +15485,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -5343,7 +5343,7 @@ +@@ -5387,7 +5387,7 @@ }, { 'name': 'DefaultSearchProviderContextMenuAccessAllowed', @@ -15650,7 +15494,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-'], -@@ -5365,7 +5365,7 @@ +@@ -5410,7 +5410,7 @@ }, { 'name': 'DefaultSearchProviderName', @@ -15659,7 +15503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5388,7 +5388,7 @@ +@@ -5434,7 +5434,7 @@ }, { 'name': 'DefaultSearchProviderKeyword', @@ -15668,7 +15512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5411,7 +5411,7 @@ +@@ -5458,7 +5458,7 @@ }, { 'name': 'DefaultSearchProviderSearchURL', @@ -15677,7 +15521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5434,7 +5434,7 @@ +@@ -5482,7 +5482,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURL', @@ -15686,7 +15530,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5457,7 +5457,7 @@ +@@ -5506,7 +5506,7 @@ }, { 'name': 'DefaultSearchProviderInstantURL', @@ -15695,7 +15539,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'], -@@ -5480,7 +5480,7 @@ +@@ -5530,7 +5530,7 @@ }, { 'name': 'DefaultSearchProviderIconURL', @@ -15704,7 +15548,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5503,7 +5503,7 @@ +@@ -5554,7 +5554,7 @@ }, { 'name': 'DefaultSearchProviderEncodings', @@ -15713,7 +15557,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5529,7 +5529,7 @@ +@@ -5581,7 +5581,7 @@ }, { 'name': 'DefaultSearchProviderAlternateURLs', @@ -15722,7 +15566,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5555,7 +5555,7 @@ +@@ -5608,7 +5608,7 @@ }, { 'name': 'DefaultSearchProviderSearchTermsReplacementKey', @@ -15731,7 +15575,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'], -@@ -5576,7 +5576,7 @@ +@@ -5630,7 +5630,7 @@ }, { 'name': 'DefaultSearchProviderImageURL', @@ -15740,7 +15584,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5599,7 +5599,7 @@ +@@ -5654,7 +5654,7 @@ }, { 'name': 'DefaultSearchProviderNewTabURL', @@ -15749,7 +15593,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5622,7 +5622,7 @@ +@@ -5678,7 +5678,7 @@ }, { 'name': 'DefaultSearchProviderSearchURLPostParams', @@ -15758,7 +15602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5645,7 +5645,7 @@ +@@ -5702,7 +5702,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURLPostParams', @@ -15767,7 +15611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5668,7 +5668,7 @@ +@@ -5726,7 +5726,7 @@ }, { 'name': 'DefaultSearchProviderInstantURLPostParams', @@ -15776,7 +15620,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'], -@@ -5689,7 +5689,7 @@ +@@ -5748,7 +5748,7 @@ }, { 'name': 'DefaultSearchProviderImageURLPostParams', @@ -15785,34 +15629,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -5712,7 +5712,7 @@ +@@ -5772,7 +5772,7 @@ }, { 'name': 'DefaultCookiesSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['dullweber@google.com', 'file://components/content_settings/OWNERS'], ++ 'owners': ['dullweber@9oo91e.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5756,7 +5756,7 @@ +@@ -5816,7 +5816,7 @@ }, { 'name': 'DefaultImagesSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5789,7 +5789,7 @@ +@@ -5849,7 +5849,7 @@ }, { 'name': 'DefaultJavaScriptSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5822,7 +5822,7 @@ +@@ -5882,7 +5882,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -15821,52 +15665,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5863,7 +5863,7 @@ +@@ -5923,7 +5923,7 @@ }, { 'name': 'DefaultPopupsSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5901,7 +5901,7 @@ +@@ -5961,7 +5961,7 @@ }, { 'name': 'DefaultNotificationsSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5939,7 +5939,7 @@ +@@ -5999,7 +5999,7 @@ }, { 'name': 'DefaultGeolocationSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5978,7 +5978,7 @@ +@@ -6038,7 +6038,7 @@ }, { 'name': 'DefaultMediaStreamSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6012,7 +6012,7 @@ +@@ -6072,7 +6072,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6046,7 +6046,7 @@ +@@ -6106,7 +6106,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -15875,7 +15719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6080,7 +6080,7 @@ +@@ -6140,7 +6140,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -15884,7 +15728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6114,7 +6114,7 @@ +@@ -6174,7 +6174,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -15893,7 +15737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6148,7 +6148,7 @@ +@@ -6208,7 +6208,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -15902,7 +15746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6180,7 +6180,7 @@ +@@ -6240,7 +6240,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -15911,7 +15755,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.''', -@@ -6197,7 +6197,7 @@ +@@ -6257,7 +6257,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -15920,7 +15764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6230,7 +6230,7 @@ +@@ -6290,7 +6290,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -15929,7 +15773,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.''', -@@ -6245,7 +6245,7 @@ +@@ -6305,7 +6305,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -15938,7 +15782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6266,11 +6266,11 @@ +@@ -6326,11 +6326,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15952,7 +15796,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6291,11 +6291,11 @@ +@@ -6351,11 +6351,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15966,7 +15810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6329,7 +6329,7 @@ +@@ -6389,7 +6389,7 @@ }, { 'name': 'SerialAskForUrls', @@ -15975,7 +15819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6352,11 +6352,11 @@ +@@ -6412,11 +6412,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15989,7 +15833,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6379,11 +6379,11 @@ +@@ -6439,11 +6439,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -16003,7 +15847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6406,7 +6406,7 @@ +@@ -6466,7 +6466,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -16012,7 +15856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6460,7 +6460,7 @@ +@@ -6520,7 +6520,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -16021,7 +15865,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6494,7 +6494,7 @@ +@@ -6554,7 +6554,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -16030,7 +15874,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6517,11 +6517,11 @@ +@@ -6577,11 +6577,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -16044,7 +15888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6544,11 +6544,11 @@ +@@ -6604,11 +6604,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -16058,7 +15902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6582,7 +6582,7 @@ +@@ -6642,7 +6642,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -16067,7 +15911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6616,7 +6616,7 @@ +@@ -6676,7 +6676,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -16076,7 +15920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6637,11 +6637,11 @@ +@@ -6697,11 +6697,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -16090,7 +15934,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6662,11 +6662,11 @@ +@@ -6722,11 +6722,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -16104,7 +15948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6687,11 +6687,11 @@ +@@ -6747,11 +6747,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -16118,7 +15962,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6712,11 +6712,11 @@ +@@ -6772,11 +6772,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -16127,12 +15971,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AutoSelectCertificateForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6776,7 +6776,7 @@ +@@ -6836,7 +6836,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -16141,7 +15985,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6831,11 +6831,11 @@ +@@ -6891,11 +6891,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -16150,12 +15994,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['dullweber@google.com', 'file://components/content_settings/OWNERS'], ++ 'owners': ['dullweber@9oo91e.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6860,11 +6860,11 @@ +@@ -6920,11 +6920,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. @@ -16164,12 +16008,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['dullweber@google.com', 'file://components/content_settings/OWNERS'], ++ 'owners': ['dullweber@9oo91e.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6889,11 +6889,11 @@ +@@ -6949,11 +6949,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -16178,12 +16022,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesSessionOnlyForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['dullweber@google.com', 'file://components/content_settings/OWNERS'], ++ 'owners': ['dullweber@9oo91e.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6918,11 +6918,11 @@ +@@ -6978,11 +6978,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -16192,12 +16036,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'ImagesAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6941,13 +6941,13 @@ +@@ -7001,13 +7001,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16208,12 +16052,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'ImagesBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6966,13 +6966,13 @@ +@@ -7026,13 +7026,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16224,12 +16068,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'JavaScriptAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -6991,11 +6991,11 @@ +@@ -7051,11 +7051,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16238,12 +16082,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'JavaScriptBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7014,11 +7014,11 @@ +@@ -7074,11 +7074,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16252,12 +16096,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'KeygenAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7038,11 +7038,11 @@ +@@ -7098,11 +7098,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. @@ -16266,12 +16110,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'KeygenBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/content_settings/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/content_settings/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7062,11 +7062,11 @@ +@@ -7122,11 +7122,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. @@ -16285,7 +16129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7098,13 +7098,13 @@ +@@ -7158,13 +7158,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], 'deprecated': True, @@ -16301,16 +16145,19 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7123,7 +7123,7 @@ +@@ -7183,17 +7183,17 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], - 'desc': '''Cookies set for domains matching these patterns will revert to legacy SameSite behavior. Reverting to legacy behavior causes cookies that don't specify a SameSite attribute to be treated as if they were "SameSite=None", removes the requirement for "SameSite=None" cookies to carry the "Secure" attribute, and skips the scheme comparison when evaluating if two sites are same-site. See https://www.chromium.org/administrators/policy-list-3/cookie-legacy-samesite-policies for full description. + 'desc': '''Cookies set for domains matching these patterns will revert to legacy SameSite behavior. Reverting to legacy behavior causes cookies that don't specify a SameSite attribute to be treated as if they were "SameSite=None", removes the requirement for "SameSite=None" cookies to carry the "Secure" attribute, and skips the scheme comparison when evaluating if two sites are same-site. See https://www.ch40m1um.qjz9zk/administrators/policy-list-3/cookie-legacy-samesite-policies for full description. - For cookies on domains not covered by the patterns specified here, or for all cookies if this policy is not set, the global default value will be used either from the LegacySameSiteCookieBehaviorEnabled policy, if it is set, or the user's personal configuration otherwise. + For cookies on domains not covered by the patterns specified here, or for all cookies if this policy is not set, the global default value will be the user's personal configuration. -@@ -7131,7 +7131,7 @@ +- For detailed information on valid patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. ++ For detailed information on valid patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. + + Note that patterns you list here are treated as domains, not URLs, so you should not specify a scheme or port.''', }, { 'name': 'LensCameraAssistedSearchEnabled', @@ -16319,7 +16166,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -7159,9 +7159,9 @@ +@@ -7221,9 +7221,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -16332,7 +16179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -7188,7 +7188,7 @@ +@@ -7250,7 +7250,7 @@ 2) Its IP address is private and the other is public. In the future, depending on spec evolution, this policy might apply to all cross-origin requests directed at private IPs or localhost. @@ -16341,7 +16188,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When this policy is either not set or set to false, the default behavior for requests from insecure contexts to more-private network endpoints will depend on the user's personal configuration for the BlockInsecurePrivateNetworkRequests feature, which may be set by a field trial or on the command line. -@@ -7197,9 +7197,9 @@ +@@ -7259,9 +7259,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -16354,7 +16201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -7228,11 +7228,11 @@ +@@ -7290,11 +7290,11 @@ Note that this policy only affects insecure origins, so secure origins (e.g. https://example.com) included in this list will be ignored. @@ -16363,12 +16210,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PluginsAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7252,11 +7252,11 @@ +@@ -7314,11 +7314,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16377,12 +16224,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PluginsBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7276,11 +7276,11 @@ +@@ -7338,11 +7338,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16391,12 +16238,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PopupsAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7304,11 +7304,11 @@ +@@ -7366,11 +7366,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16405,12 +16252,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'RegisteredProtocolHandlers', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://chrome/browser/custom_handlers/OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://chrome/browser/custom_handlers/OWNERS'], 'type': 'dict', 'schema': { 'type': 'array', -@@ -7338,7 +7338,7 @@ +@@ -7400,7 +7400,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -16419,16 +16266,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -7349,7 +7349,7 @@ +@@ -7411,7 +7411,7 @@ }, { 'name': 'PopupsBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7373,11 +7373,11 @@ +@@ -7435,11 +7435,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -16437,28 +16284,28 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'NotificationsAllowedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7396,11 +7396,11 @@ +@@ -7458,11 +7458,11 @@ - Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. + Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. - For detailed information on valid url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', + For detailed information on valid url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', }, { 'name': 'NotificationsBlockedForUrls', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['engedy@chromium.org', 'file://components/permissions/PERMISSIONS_OWNERS'], ++ 'owners': ['engedy@ch40m1um.qjz9zk', 'file://components/permissions/PERMISSIONS_OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -7419,11 +7419,11 @@ +@@ -7481,11 +7481,11 @@ - Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. + Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. - For detailed information on valid url patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', + For detailed information on valid url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy.''', @@ -16470,7 +16317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7444,7 +7444,7 @@ +@@ -7506,7 +7506,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. @@ -16479,7 +16326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -7469,11 +7469,11 @@ +@@ -7531,11 +7531,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. @@ -16493,7 +16340,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7501,7 +7501,7 @@ +@@ -7563,7 +7563,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -16502,7 +16349,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7526,7 +7526,7 @@ +@@ -7588,7 +7588,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -16511,7 +16358,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7554,7 +7554,7 @@ +@@ -7616,7 +7616,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -16520,7 +16367,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7579,7 +7579,7 @@ +@@ -7641,7 +7641,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -16529,7 +16376,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -7597,7 +7597,7 @@ +@@ -7659,7 +7659,7 @@ }, { 'name': 'Disable3DAPIs', @@ -16538,7 +16385,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-'], -@@ -7615,7 +7615,7 @@ +@@ -7677,7 +7677,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -16547,7 +16394,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-'], -@@ -7635,7 +7635,7 @@ +@@ -7697,7 +7697,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -16556,7 +16403,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-'], -@@ -7654,7 +7654,7 @@ +@@ -7716,7 +7716,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -16565,7 +16412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7686,7 +7686,7 @@ +@@ -7748,7 +7748,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -16574,7 +16421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7705,11 +7705,11 @@ +@@ -7767,11 +7767,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -16588,7 +16435,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7728,11 +7728,11 @@ +@@ -7790,11 +7790,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -16602,7 +16449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -7750,7 +7750,7 @@ +@@ -7812,7 +7812,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -16611,7 +16458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -7772,7 +7772,7 @@ +@@ -7834,7 +7834,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -16620,7 +16467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7793,7 +7793,7 @@ +@@ -7855,7 +7855,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -16629,7 +16476,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -7814,7 +7814,7 @@ +@@ -7876,7 +7876,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -16638,7 +16485,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7868,7 +7868,7 @@ +@@ -7930,7 +7930,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -16647,7 +16494,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -7893,7 +7893,7 @@ +@@ -7955,7 +7955,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -16656,7 +16503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -7913,7 +7913,7 @@ +@@ -7975,7 +7975,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -16665,7 +16512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7949,7 +7949,7 @@ +@@ -8011,7 +8011,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -16674,7 +16521,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-'], -@@ -7965,7 +7965,7 @@ +@@ -8027,7 +8027,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -16683,7 +16530,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-'], -@@ -7994,11 +7994,11 @@ +@@ -8056,11 +8056,11 @@ This policy will be removed in $1Google Chrome version 95. @@ -16697,7 +16544,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'], -@@ -8026,7 +8026,7 @@ +@@ -8088,7 +8088,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -16706,7 +16553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -8046,7 +8046,7 @@ +@@ -8108,7 +8108,7 @@ }, { 'name': 'TranslateEnabled', @@ -16715,7 +16562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -8070,7 +8070,7 @@ +@@ -8132,7 +8132,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -16724,7 +16571,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'], -@@ -8089,7 +8089,7 @@ +@@ -8151,7 +8151,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -16733,7 +16580,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'], -@@ -8108,7 +8108,7 @@ +@@ -8170,7 +8170,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -16742,7 +16589,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'], -@@ -8131,7 +8131,7 @@ +@@ -8193,7 +8193,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -16751,7 +16598,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-'], -@@ -8150,7 +8150,7 @@ +@@ -8212,7 +8212,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -16760,7 +16607,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -8173,7 +8173,7 @@ +@@ -8235,7 +8235,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -16769,7 +16616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -8206,7 +8206,7 @@ +@@ -8268,7 +8268,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -16778,7 +16625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -8235,7 +8235,7 @@ +@@ -8297,7 +8297,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -16787,7 +16634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -8256,7 +8256,7 @@ +@@ -8318,7 +8318,7 @@ }, { 'name': 'GCFUserDataDir', @@ -16796,7 +16643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -8272,14 +8272,14 @@ +@@ -8334,14 +8334,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -16813,7 +16660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -8300,7 +8300,7 @@ +@@ -8362,7 +8362,7 @@ }, { 'name': 'ImportBookmarks', @@ -16822,7 +16669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8321,7 +8321,7 @@ +@@ -8383,7 +8383,7 @@ }, { 'name': 'ImportHistory', @@ -16831,7 +16678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8342,7 +8342,7 @@ +@@ -8404,7 +8404,7 @@ }, { 'name': 'ImportHomepage', @@ -16840,7 +16687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8361,7 +8361,7 @@ +@@ -8423,7 +8423,7 @@ }, { 'name': 'ImportSearchEngine', @@ -16849,7 +16696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8381,7 +8381,7 @@ +@@ -8443,7 +8443,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -16858,7 +16705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8401,7 +8401,7 @@ +@@ -8463,7 +8463,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -16867,7 +16714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -8421,7 +8421,7 @@ +@@ -8483,7 +8483,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -16876,7 +16723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -8440,7 +8440,7 @@ +@@ -8502,7 +8502,7 @@ }, { 'name': 'HideWebStorePromo', @@ -16885,7 +16732,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'], -@@ -8458,7 +8458,7 @@ +@@ -8520,7 +8520,7 @@ }, { 'name': 'URLBlacklist', @@ -16894,7 +16741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8481,7 +8481,7 @@ +@@ -8543,7 +8543,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -16903,16 +16750,16 @@ 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. -@@ -8490,7 +8490,7 @@ +@@ -8552,7 +8552,7 @@ }, { 'name': 'URLWhitelist', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -8513,7 +8513,7 @@ +@@ -8575,7 +8575,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -16921,16 +16768,16 @@ 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:". -@@ -8524,7 +8524,7 @@ +@@ -8586,7 +8586,7 @@ }, { 'name': 'URLBlocklist', -- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -8545,7 +8545,7 @@ +@@ -8607,7 +8607,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -16939,16 +16786,16 @@ 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. -@@ -8556,7 +8556,7 @@ +@@ -8618,7 +8618,7 @@ }, { 'name': 'URLAllowlist', -- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -8577,7 +8577,7 @@ +@@ -8639,7 +8639,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -16957,7 +16804,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:". -@@ -8590,7 +8590,7 @@ +@@ -8652,7 +8652,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -16966,7 +16813,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-'], -@@ -8610,7 +8610,7 @@ +@@ -8672,7 +8672,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -16975,7 +16822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8638,7 +8638,7 @@ +@@ -8700,7 +8700,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -16984,7 +16831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -8706,7 +8706,7 @@ +@@ -8768,7 +8768,7 @@ }, { 'name': 'CloudUserPolicyMerge', @@ -16993,7 +16840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:92-'], -@@ -8739,7 +8739,7 @@ +@@ -8801,7 +8801,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -17002,12 +16849,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8768,10 +8768,10 @@ +@@ -8830,10 +8830,10 @@ }, { 'name': 'OpenNetworkConfiguration', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['pmarko@chromium.org', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['pmarko@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', @@ -17015,12 +16862,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -8786,10 +8786,10 @@ +@@ -8848,10 +8848,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', -- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], +- 'owners': ['pmarko@chromium.org', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['pmarko@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', @@ -17028,52 +16875,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -8804,7 +8804,7 @@ +@@ -8866,7 +8866,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', -- 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/authpolicy/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/authpolicy/OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8851,7 +8851,7 @@ +@@ -8913,7 +8913,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', -- 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/authpolicy/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/authpolicy/OWNERS'], 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8894,7 +8894,7 @@ +@@ -8956,7 +8956,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', -- 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/authpolicy/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/authpolicy/OWNERS'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:66-'], -@@ -8917,7 +8917,7 @@ +@@ -8979,7 +8979,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', -- 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/authpolicy/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/authpolicy/OWNERS'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -8940,7 +8940,7 @@ +@@ -9002,7 +9002,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', -- 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/authpolicy/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/authpolicy/OWNERS'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -8963,7 +8963,7 @@ +@@ -9025,7 +9025,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -17082,7 +16929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -8983,7 +8983,7 @@ +@@ -9045,7 +9045,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -17091,7 +16938,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'], -@@ -9000,7 +9000,7 @@ +@@ -9062,7 +9062,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -17100,7 +16947,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'], -@@ -9017,7 +9017,7 @@ +@@ -9079,7 +9079,7 @@ }, { 'name': 'DisablePrintPreview', @@ -17109,7 +16956,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -9035,7 +9035,7 @@ +@@ -9097,7 +9097,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -17118,7 +16965,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-'], -@@ -9054,7 +9054,7 @@ +@@ -9116,7 +9116,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -17127,7 +16974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -9095,7 +9095,7 @@ +@@ -9157,7 +9157,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -17136,7 +16983,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'], -@@ -9114,7 +9114,7 @@ +@@ -9176,7 +9176,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -17145,7 +16992,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-'], -@@ -9134,7 +9134,7 @@ +@@ -9196,7 +9196,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -17154,7 +17001,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-'], -@@ -9163,7 +9163,7 @@ +@@ -9225,7 +9225,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -17163,7 +17010,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'], -@@ -9184,7 +9184,7 @@ +@@ -9246,7 +9246,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -17172,7 +17019,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'], -@@ -9205,7 +9205,7 @@ +@@ -9267,7 +9267,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -17181,7 +17028,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'], -@@ -9228,7 +9228,7 @@ +@@ -9290,7 +9290,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -17190,7 +17037,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-'], -@@ -9253,7 +9253,7 @@ +@@ -9315,7 +9315,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -17199,7 +17046,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -9275,7 +9275,7 @@ +@@ -9337,7 +9337,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -17208,7 +17055,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-'], -@@ -9300,7 +9300,7 @@ +@@ -9362,7 +9362,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -17217,7 +17064,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-'], -@@ -9324,7 +9324,7 @@ +@@ -9386,7 +9386,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -17226,7 +17073,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -9357,7 +9357,7 @@ +@@ -9419,7 +9419,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -17235,7 +17082,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -9390,7 +9390,7 @@ +@@ -9452,7 +9452,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -17244,277 +17091,313 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9430,7 +9430,7 @@ +@@ -9492,7 +9492,7 @@ }, { 'name': 'ReportDeviceVersionInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9450,7 +9450,7 @@ +@@ -9512,7 +9512,7 @@ }, { 'name': 'ReportDeviceActivityTimes', -- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9470,7 +9470,7 @@ +@@ -9532,7 +9532,7 @@ + }, + { + 'name': 'ReportDeviceAudioStatus', +- 'owners': ['cros-reporting-team@google.com', 'tylergarrett@google.com'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'tylergarrett@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -9563,7 +9563,7 @@ }, { 'name': 'ReportDeviceBootMode', -- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9490,7 +9490,7 @@ +@@ -9583,7 +9583,7 @@ }, { 'name': 'ReportDeviceLocation', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -9510,7 +9510,7 @@ +@@ -9603,7 +9603,7 @@ + }, + { + 'name': 'ReportDeviceNetworkConfiguration', +- 'owners': ['tylergarrett@google.com', 'cros-reporting-team@google.com'], ++ 'owners': ['tylergarrett@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -9635,7 +9635,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -9530,7 +9530,7 @@ +@@ -9655,7 +9655,7 @@ }, { - 'name': 'ReportDeviceUsers', -- 'owners': ['stepco@chromium.org', 'poromov@chromium.org'], -+ 'owners': ['stepco@ch40m1um.qjz9zk', 'poromov@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:32-'], -@@ -9550,7 +9550,7 @@ - }, - { - 'name': 'ReportDeviceHardwareStatus', -- 'owners': ['antrim@chromium.org'], -+ 'owners': ['antrim@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:42-'], -@@ -9570,7 +9570,7 @@ - }, - { - 'name': 'ReportDeviceSessionStatus', -- 'owners': ['antrim@chromium.org'], -+ 'owners': ['antrim@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:42-'], -@@ -9590,7 +9590,7 @@ - }, - { - 'name': 'ReportDeviceGraphicsStatus', -- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:81-'], -@@ -9613,7 +9613,7 @@ - }, - { - 'name': 'ReportDeviceCrashReportInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:83-'], -@@ -9636,7 +9636,7 @@ - }, - { - 'name': 'ReportDeviceOsUpdateStatus', -- 'owners': ['anqing@chromium.org'], -+ 'owners': ['anqing@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:79-'], -@@ -9658,7 +9658,7 @@ - }, - { - 'name': 'ReportDevicePowerStatus', -- 'owners': ['antrim@chromium.org'], -+ 'owners': ['antrim@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:73-'], -@@ -9678,7 +9678,7 @@ - }, - { - 'name': 'ReportDeviceStorageStatus', -- 'owners': ['antrim@chromium.org'], -+ 'owners': ['antrim@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:73-'], -@@ -9698,7 +9698,7 @@ - }, - { - 'name': 'ReportDeviceBoardStatus', -- 'owners': ['antrim@chromium.org'], -+ 'owners': ['antrim@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:73-'], -@@ -9718,7 +9718,7 @@ - }, - { - 'name': 'ReportDeviceCpuInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:81-'], -@@ -9740,7 +9740,7 @@ - }, - { - 'name': 'ReportDeviceTimezoneInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:83-'], -@@ -9761,7 +9761,7 @@ - }, - { - 'name': 'ReportDeviceMemoryInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:83-'], -@@ -9782,7 +9782,7 @@ - }, - { - 'name': 'ReportDeviceBacklightInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:83-'], -@@ -9803,7 +9803,7 @@ - }, - { - 'name': 'ReportDeviceAppInfo', -- 'owners': ['mattme@google.com', 'file://components/policy/resources/OWNERS'], -+ 'owners': ['mattme@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:85-'], -@@ -9824,7 +9824,7 @@ - }, - { - 'name': 'ReportDeviceBluetoothInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:85-'], -@@ -9845,7 +9845,7 @@ - }, - { - 'name': 'ReportDeviceFanInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:85-'], -@@ -9866,7 +9866,7 @@ - }, - { - 'name': 'ReportDeviceVpdInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:85-'], -@@ -9888,7 +9888,7 @@ - }, - { - 'name': 'ReportDeviceSystemInfo', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:86-'], -@@ -9909,7 +9909,7 @@ - }, - { - 'name': 'ReportDevicePrintJobs', -- 'owners': ['mattme@google.com', 'file://components/policy/resources/OWNERS'], -+ 'owners': ['mattme@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], + 'name': 'ReportDeviceNetworkStatus', +- 'owners': ['tylergarrett@google.com', 'cros-reporting-team@google.com'], ++ 'owners': ['tylergarrett@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -9941,7 +9941,7 @@ +@@ -9687,7 +9687,7 @@ + }, + { + 'name': 'ReportDeviceUsers', +- 'owners': ['stepco@chromium.org', 'cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['stepco@ch40m1um.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:32-'], +@@ -9707,7 +9707,7 @@ + }, + { + 'name': 'ReportDeviceHardwareStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'antrim@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:42-'], +@@ -9727,7 +9727,7 @@ + }, + { + 'name': 'ReportDeviceSessionStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'antrim@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:42-'], +@@ -9747,7 +9747,7 @@ + }, + { + 'name': 'ReportDeviceGraphicsStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -9770,7 +9770,7 @@ + }, + { + 'name': 'ReportDeviceCrashReportInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9793,7 +9793,7 @@ + }, + { + 'name': 'ReportDeviceOsUpdateStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'anqing@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:79-'], +@@ -9815,7 +9815,7 @@ + }, + { + 'name': 'ReportDevicePowerStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'antrim@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:73-'], +@@ -9835,7 +9835,7 @@ + }, + { + 'name': 'ReportDeviceStorageStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'antrim@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:73-'], +@@ -9855,7 +9855,7 @@ + }, + { + 'name': 'ReportDeviceBoardStatus', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'antrim@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'antrim@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:73-'], +@@ -9875,7 +9875,7 @@ + }, + { + 'name': 'ReportDeviceCpuInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -9897,7 +9897,7 @@ + }, + { + 'name': 'ReportDeviceTimezoneInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9918,7 +9918,7 @@ + }, + { + 'name': 'ReportDeviceMemoryInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9939,7 +9939,7 @@ + }, + { + 'name': 'ReportDeviceBacklightInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9960,7 +9960,7 @@ + }, + { + 'name': 'ReportDeviceAppInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'mattme@google.com'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'mattme@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -9981,7 +9981,7 @@ + }, + { + 'name': 'ReportDeviceBluetoothInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -10002,7 +10002,7 @@ + }, + { + 'name': 'ReportDeviceFanInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -10023,7 +10023,7 @@ + }, + { + 'name': 'ReportDeviceVpdInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -10045,7 +10045,7 @@ + }, + { + 'name': 'ReportDeviceSystemInfo', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:86-'], +@@ -10066,7 +10066,7 @@ + }, + { + 'name': 'ReportDevicePrintJobs', +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'mattme@google.com'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'mattme@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -10098,7 +10098,7 @@ + }, + { + 'name': 'ReportDeviceLoginLogout', +- 'owners': ['anasr@google.com', 'cros-reporting-team@google.com'], ++ 'owners': ['anasr@9oo91e.qjz9zk', 'cros-reporting-team@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -10130,7 +10130,7 @@ }, { 'name': 'ReportUploadFrequency', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'supported_on': ['chrome_os:42-'], -@@ -9961,7 +9961,7 @@ +@@ -10150,7 +10150,7 @@ }, { 'name': 'ReportArcStatusEnabled', -- 'owners': ['phweiss@chromium.org'], -+ 'owners': ['phweiss@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'phweiss@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'phweiss@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -9980,7 +9980,7 @@ +@@ -10169,7 +10169,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', -- 'owners': ['aoldemeier@chromium.org', 'okalitova@chromium.org'], -+ 'owners': ['aoldemeier@ch40m1um.qjz9zk', 'okalitova@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'aoldemeier@chromium.org', 'okalitova@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'aoldemeier@ch40m1um.qjz9zk', 'okalitova@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -9999,7 +9999,7 @@ +@@ -10188,7 +10188,7 @@ }, { 'name': 'HeartbeatEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -10019,7 +10019,7 @@ +@@ -10208,7 +10208,7 @@ }, { 'name': 'HeartbeatFrequency', -- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 30000 }, 'supported_on': ['chrome_os:43-'], -@@ -10039,7 +10039,7 @@ +@@ -10228,7 +10228,7 @@ }, { 'name': 'LogUploadEnabled', -- 'owners': ['poromov@chromium.org', 'pbond@chromium.org'], -+ 'owners': ['poromov@ch40m1um.qjz9zk', 'pbond@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'pbond@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'pbond@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -10059,7 +10059,7 @@ +@@ -10248,7 +10248,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -17523,7 +17406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10072,11 +10072,11 @@ +@@ -10261,11 +10261,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -17537,7 +17420,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. -@@ -10087,7 +10087,7 @@ +@@ -10276,7 +10276,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -17546,7 +17429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10099,11 +10099,11 @@ +@@ -10288,11 +10288,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -17560,7 +17443,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.''', -@@ -10111,7 +10111,7 @@ +@@ -10300,7 +10300,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -17569,7 +17452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10130,7 +10130,7 @@ +@@ -10319,7 +10319,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -17578,7 +17461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10148,7 +10148,7 @@ +@@ -10337,7 +10337,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -17587,7 +17470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10168,7 +10168,7 @@ +@@ -10357,7 +10357,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -17596,16 +17479,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10186,7 +10186,7 @@ +@@ -10375,7 +10375,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], +- 'owners': ['cros-reporting-team@google.com', 'lbaraz@chromium.org', 'zmin@chromium.org'], ++ 'owners': ['cros-reporting-team@9oo91e.qjz9zk', 'lbaraz@ch40m1um.qjz9zk', 'zmin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -10208,7 +10208,7 @@ +@@ -10397,7 +10397,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -17614,7 +17497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10246,7 +10246,7 @@ +@@ -10435,7 +10435,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -17623,16 +17506,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10264,7 +10264,7 @@ +@@ -10453,7 +10453,7 @@ }, { 'name': 'DeviceReleaseLtsTag', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['vsavu@google.com', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['vsavu@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -10280,7 +10280,7 @@ +@@ -10469,7 +10469,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -17641,7 +17524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10325,7 +10325,7 @@ +@@ -10514,7 +10514,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -17650,7 +17533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10341,7 +10341,7 @@ +@@ -10530,7 +10530,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -17659,7 +17542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10353,7 +10353,7 @@ +@@ -10542,7 +10542,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -17668,7 +17551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -10363,7 +10363,7 @@ +@@ -10552,7 +10552,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -17677,7 +17560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10384,7 +10384,7 @@ +@@ -10573,7 +10573,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -17686,7 +17569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10405,7 +10405,7 @@ +@@ -10594,7 +10594,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -17695,7 +17578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -10424,7 +10424,7 @@ +@@ -10613,7 +10613,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -17704,7 +17587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10445,7 +10445,7 @@ +@@ -10634,7 +10634,7 @@ }, { 'name': 'DeviceAppPack', @@ -17713,7 +17596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10457,7 +10457,7 @@ +@@ -10646,7 +10646,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -17722,7 +17605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -10469,7 +10469,7 @@ +@@ -10658,7 +10658,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -17731,7 +17614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10489,7 +10489,7 @@ +@@ -10678,7 +10678,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -17740,7 +17623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -10510,7 +10510,7 @@ +@@ -10699,7 +10699,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -17749,7 +17632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10538,7 +10538,7 @@ +@@ -10727,7 +10727,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -17758,7 +17641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10577,7 +10577,7 @@ +@@ -10766,7 +10766,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -17767,7 +17650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -10602,7 +10602,7 @@ +@@ -10791,7 +10791,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -17776,7 +17659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -10618,7 +10618,7 @@ +@@ -10807,7 +10807,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -17785,7 +17668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10639,7 +10639,7 @@ +@@ -10828,7 +10828,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -17794,7 +17677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -10659,7 +10659,7 @@ +@@ -10848,7 +10848,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -17803,7 +17686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10681,7 +10681,7 @@ +@@ -10870,7 +10870,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -17812,7 +17695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -10700,7 +10700,7 @@ +@@ -10889,7 +10889,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -17821,7 +17704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -10721,7 +10721,7 @@ +@@ -10910,7 +10910,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -17830,7 +17713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -10740,7 +10740,7 @@ +@@ -10929,7 +10929,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -17839,7 +17722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -10759,7 +10759,7 @@ +@@ -10948,7 +10948,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -17848,7 +17731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -10773,7 +10773,7 @@ +@@ -10962,7 +10962,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. @@ -17857,7 +17740,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". -@@ -10781,7 +10781,7 @@ +@@ -10970,7 +10970,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -17866,7 +17749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -10800,7 +10800,7 @@ +@@ -10989,7 +10989,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', @@ -17875,7 +17758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -10824,7 +10824,7 @@ +@@ -11013,7 +11013,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -17884,7 +17767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -10848,7 +10848,7 @@ +@@ -11037,7 +11037,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -17893,7 +17776,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-'], -@@ -10869,7 +10869,7 @@ +@@ -11058,7 +11058,7 @@ }, { 'name': 'DriveDisabled', @@ -17902,7 +17785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10888,7 +10888,7 @@ +@@ -11077,7 +11077,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -17911,7 +17794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10907,7 +10907,7 @@ +@@ -11096,7 +11096,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -17920,7 +17803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10919,20 +10919,20 @@ +@@ -11108,20 +11108,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17944,7 +17827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -10952,7 +10952,7 @@ +@@ -11141,7 +11141,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -17953,7 +17836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -10973,11 +10973,11 @@ +@@ -11162,11 +11162,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -17967,7 +17850,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'], -@@ -10994,11 +10994,11 @@ +@@ -11183,11 +11183,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. @@ -17981,7 +17864,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-'], -@@ -11034,7 +11034,7 @@ +@@ -11223,7 +11223,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -17990,7 +17873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -11052,7 +11052,7 @@ +@@ -11241,7 +11241,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -17999,7 +17882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -11070,7 +11070,7 @@ +@@ -11259,7 +11259,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -18008,7 +17891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -11090,7 +11090,7 @@ +@@ -11279,7 +11279,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -18017,7 +17900,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-'], -@@ -11111,7 +11111,7 @@ +@@ -11300,7 +11300,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -18026,7 +17909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11128,11 +11128,11 @@ +@@ -11317,11 +11317,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 @@ -18040,7 +17923,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-'], -@@ -11152,7 +11152,7 @@ +@@ -11341,7 +11341,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -18049,7 +17932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11169,11 +11169,11 @@ +@@ -11358,11 +11358,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 @@ -18063,7 +17946,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-'], -@@ -11189,7 +11189,7 @@ +@@ -11378,7 +11378,7 @@ }, { 'name': 'SystemTimezone', @@ -18072,7 +17955,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -11209,7 +11209,7 @@ +@@ -11398,7 +11398,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -18081,7 +17964,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -11231,7 +11231,7 @@ +@@ -11420,7 +11420,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -18090,7 +17973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -11253,7 +11253,7 @@ +@@ -11442,7 +11442,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -18099,7 +17982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -11271,7 +11271,7 @@ +@@ -11460,7 +11460,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -18108,7 +17991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -11297,7 +11297,7 @@ +@@ -11486,7 +11486,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -18117,7 +18000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11352,7 +11352,7 @@ +@@ -11541,7 +11541,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -18126,7 +18009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -11380,7 +11380,7 @@ +@@ -11569,7 +11569,7 @@ }, { 'name': 'AdditionalDnsQueryTypesEnabled', @@ -18135,7 +18018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -11417,7 +11417,7 @@ +@@ -11606,7 +11606,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -18144,7 +18027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11454,7 +11454,7 @@ +@@ -11643,7 +11643,7 @@ }, { 'name': 'ShelfAlignment', @@ -18153,7 +18036,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", -@@ -11509,7 +11509,7 @@ +@@ -11698,7 +11698,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -18162,7 +18045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -11589,7 +11589,7 @@ +@@ -11778,7 +11778,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -18171,7 +18054,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11631,7 +11631,7 @@ +@@ -11820,7 +11820,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -18180,7 +18063,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -11651,7 +11651,7 @@ +@@ -11840,7 +11840,7 @@ }, { 'name': 'UserDisplayName', @@ -18189,7 +18072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -11673,7 +11673,7 @@ +@@ -11862,7 +11862,7 @@ }, { 'name': 'SessionLengthLimit', @@ -18198,7 +18081,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -11695,7 +11695,7 @@ +@@ -11884,7 +11884,7 @@ }, { 'name': 'FullscreenAllowed', @@ -18207,7 +18090,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-'], -@@ -11716,7 +11716,7 @@ +@@ -11905,7 +11905,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -18216,7 +18099,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -11747,7 +11747,7 @@ +@@ -11936,7 +11936,7 @@ }, { 'name': 'ScreenDimDelayAC', @@ -18225,7 +18108,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11778,7 +11778,7 @@ +@@ -11967,7 +11967,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -18234,7 +18117,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11809,7 +11809,7 @@ +@@ -11998,7 +11998,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -18243,7 +18126,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11842,7 +11842,7 @@ +@@ -12031,7 +12031,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -18252,7 +18135,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11873,7 +11873,7 @@ +@@ -12062,7 +12062,7 @@ }, { 'name': 'IdleDelayAC', @@ -18261,7 +18144,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11902,7 +11902,7 @@ +@@ -12091,7 +12091,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -18270,7 +18153,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11933,7 +11933,7 @@ +@@ -12122,7 +12122,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -18279,7 +18162,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11964,7 +11964,7 @@ +@@ -12153,7 +12153,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -18288,7 +18171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11997,7 +11997,7 @@ +@@ -12186,7 +12186,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -18297,7 +18180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -12028,7 +12028,7 @@ +@@ -12217,7 +12217,7 @@ }, { 'name': 'IdleDelayBattery', @@ -18306,7 +18189,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -12057,7 +12057,7 @@ +@@ -12246,7 +12246,7 @@ }, { 'name': 'IdleAction', @@ -18315,7 +18198,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12104,7 +12104,7 @@ +@@ -12293,7 +12293,7 @@ }, { 'name': 'IdleActionAC', @@ -18324,7 +18207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12153,7 +12153,7 @@ +@@ -12342,7 +12342,7 @@ }, { 'name': 'IdleActionBattery', @@ -18333,7 +18216,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12202,7 +12202,7 @@ +@@ -12391,7 +12391,7 @@ }, { 'name': 'LidCloseAction', @@ -18342,7 +18225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12247,7 +12247,7 @@ +@@ -12436,7 +12436,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -18351,7 +18234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12265,7 +12265,7 @@ +@@ -12454,7 +12454,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -18360,7 +18243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12284,7 +12284,7 @@ +@@ -12473,7 +12473,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -18369,7 +18252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -12301,7 +12301,7 @@ +@@ -12490,7 +12490,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -18378,7 +18261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -12321,7 +12321,7 @@ +@@ -12510,7 +12510,7 @@ }, { 'name': 'AllowWakeLocks', @@ -18387,7 +18270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -12350,7 +12350,7 @@ +@@ -12539,7 +12539,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -18396,7 +18279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12379,7 +12379,7 @@ +@@ -12568,7 +12568,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -18405,7 +18288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -12399,7 +12399,7 @@ +@@ -12588,7 +12588,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -18414,7 +18297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -12417,7 +12417,7 @@ +@@ -12606,7 +12606,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -18423,7 +18306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12521,7 +12521,7 @@ +@@ -12710,7 +12710,7 @@ }, { 'name': 'ScreenLockDelays', @@ -18432,7 +18315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12558,7 +12558,7 @@ +@@ -12747,7 +12747,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -18441,7 +18324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12646,7 +12646,7 @@ +@@ -12835,7 +12835,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -18450,7 +18333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12675,7 +12675,7 @@ +@@ -12864,7 +12864,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -18459,7 +18342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12695,7 +12695,7 @@ +@@ -12884,7 +12884,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', @@ -18468,7 +18351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -12716,7 +12716,7 @@ +@@ -12905,7 +12905,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -18477,7 +18360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -12737,7 +12737,7 @@ +@@ -12926,7 +12926,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -18486,7 +18369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12756,7 +12756,7 @@ +@@ -12945,7 +12945,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -18495,7 +18378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12775,7 +12775,7 @@ +@@ -12964,7 +12964,7 @@ }, { 'name': 'HighContrastEnabled', @@ -18504,7 +18387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12794,7 +12794,7 @@ +@@ -12983,7 +12983,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -18513,7 +18396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12819,7 +12819,7 @@ +@@ -13008,7 +13008,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -18522,7 +18405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12844,7 +12844,7 @@ +@@ -13033,7 +13033,7 @@ }, { 'name': 'VirtualKeyboardEnabled', @@ -18531,7 +18414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -12863,7 +12863,7 @@ +@@ -13052,7 +13052,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -18540,7 +18423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12915,7 +12915,7 @@ +@@ -13104,7 +13104,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -18549,7 +18432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -12934,7 +12934,7 @@ +@@ -13123,7 +13123,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -18558,7 +18441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -12959,7 +12959,7 @@ +@@ -13148,7 +13148,7 @@ }, { 'name': 'DictationEnabled', @@ -18567,7 +18450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12984,7 +12984,7 @@ +@@ -13173,7 +13173,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -18576,7 +18459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13011,7 +13011,7 @@ +@@ -13200,7 +13200,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -18585,7 +18468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13038,7 +13038,7 @@ +@@ -13227,7 +13227,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -18594,7 +18477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13065,7 +13065,7 @@ +@@ -13254,7 +13254,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -18603,7 +18486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13092,7 +13092,7 @@ +@@ -13281,7 +13281,7 @@ }, { 'name': 'AutoclickEnabled', @@ -18612,7 +18495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13119,7 +13119,7 @@ +@@ -13308,7 +13308,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -18621,7 +18504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -13138,7 +13138,7 @@ +@@ -13327,7 +13327,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -18630,7 +18513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13177,7 +13177,7 @@ +@@ -13366,7 +13366,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -18639,7 +18522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13199,7 +13199,7 @@ +@@ -13388,7 +13388,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -18648,7 +18531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13224,7 +13224,7 @@ +@@ -13413,7 +13413,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', @@ -18657,7 +18540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13246,7 +13246,7 @@ +@@ -13435,7 +13435,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -18666,7 +18549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13271,7 +13271,7 @@ +@@ -13460,7 +13460,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -18675,7 +18558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13293,7 +13293,7 @@ +@@ -13482,7 +13482,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -18684,7 +18567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13318,7 +13318,7 @@ +@@ -13507,7 +13507,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -18693,7 +18576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -13343,7 +13343,7 @@ +@@ -13532,7 +13532,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -18702,7 +18585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13368,7 +13368,7 @@ +@@ -13557,7 +13557,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -18711,7 +18594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -13393,7 +13393,7 @@ +@@ -13582,7 +13582,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -18720,7 +18603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -13418,7 +13418,7 @@ +@@ -13607,7 +13607,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -18729,7 +18612,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-'], -@@ -13444,7 +13444,7 @@ +@@ -13633,7 +13633,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -18738,7 +18621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13488,7 +13488,7 @@ +@@ -13677,7 +13677,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -18747,7 +18630,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13535,7 +13535,7 @@ +@@ -13724,7 +13724,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -18756,7 +18639,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13560,7 +13560,7 @@ +@@ -13749,7 +13749,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -18765,7 +18648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13585,7 +13585,7 @@ +@@ -13774,7 +13774,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -18774,7 +18657,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13610,7 +13610,7 @@ +@@ -13799,7 +13799,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -18783,7 +18666,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13635,7 +13635,7 @@ +@@ -13824,7 +13824,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -18792,7 +18675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13662,7 +13662,7 @@ +@@ -13851,7 +13851,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -18801,7 +18684,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13689,7 +13689,7 @@ +@@ -13878,7 +13878,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -18810,7 +18693,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13714,7 +13714,7 @@ +@@ -13903,7 +13903,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -18819,7 +18702,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13741,7 +13741,7 @@ +@@ -13930,7 +13930,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -18828,7 +18711,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-'], -@@ -13761,7 +13761,7 @@ +@@ -13950,7 +13950,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -18837,7 +18720,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13783,7 +13783,7 @@ +@@ -13972,7 +13972,7 @@ }, { 'name': 'UptimeLimit', @@ -18846,7 +18729,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -13804,7 +13804,7 @@ +@@ -13993,7 +13993,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -18855,7 +18738,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13828,7 +13828,7 @@ +@@ -14017,7 +14017,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -18864,7 +18747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -13849,7 +13849,7 @@ +@@ -14038,7 +14038,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -18873,7 +18756,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -13870,7 +13870,7 @@ +@@ -14059,7 +14059,7 @@ }, { 'name': 'ChromeVariations', @@ -18882,7 +18765,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13907,7 +13907,7 @@ +@@ -14096,7 +14096,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -18891,7 +18774,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. -@@ -13917,7 +13917,7 @@ +@@ -14106,7 +14106,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -18900,7 +18783,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13952,7 +13952,7 @@ +@@ -14141,7 +14141,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google Chrome OS device. @@ -18909,52 +18792,52 @@ 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. -@@ -13962,7 +13962,7 @@ +@@ -14151,7 +14151,7 @@ }, { 'name': 'AttestationEnabledForDevice', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['emaxx@chromium.org', 'file://chrome/browser/ash/attestation/OWNERS'], ++ 'owners': ['emaxx@ch40m1um.qjz9zk', 'file://chrome/browser/ash/attestation/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -13981,7 +13981,7 @@ +@@ -14170,7 +14170,7 @@ }, { 'name': 'AttestationEnabledForUser', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['emaxx@chromium.org', 'file://chrome/browser/ash/attestation/OWNERS'], ++ 'owners': ['emaxx@ch40m1um.qjz9zk', 'file://chrome/browser/ash/attestation/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -13999,7 +13999,7 @@ +@@ -14188,7 +14188,7 @@ }, { 'name': 'AttestationExtensionAllowlist', -- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], +- 'owners': ['emaxx@chromium.org', 'file://chrome/browser/extensions/api/enterprise_platform_keys/OWNERS'], ++ 'owners': ['emaxx@ch40m1um.qjz9zk', 'file://chrome/browser/extensions/api/enterprise_platform_keys/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -14020,7 +14020,7 @@ +@@ -14209,7 +14209,7 @@ }, { 'name': 'AttestationExtensionWhitelist', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['emaxx@chromium.org', 'file://chrome/browser/extensions/api/enterprise_platform_keys/OWNERS'], ++ 'owners': ['emaxx@ch40m1um.qjz9zk', 'file://chrome/browser/extensions/api/enterprise_platform_keys/OWNERS'], 'type': 'list', 'schema': { 'type': 'array', -@@ -14044,7 +14044,7 @@ +@@ -14233,7 +14233,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['emaxx@chromium.org', 'file://chrome/browser/ash/attestation/OWNERS'], ++ 'owners': ['emaxx@ch40m1um.qjz9zk', 'file://chrome/browser/ash/attestation/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -14063,7 +14063,7 @@ +@@ -14252,7 +14252,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -18963,7 +18846,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.''', -@@ -14079,7 +14079,7 @@ +@@ -14268,7 +14268,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -18972,7 +18855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14102,7 +14102,7 @@ +@@ -14291,7 +14291,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -18981,7 +18864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14125,7 +14125,7 @@ +@@ -14314,7 +14314,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', @@ -18990,7 +18873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14144,7 +14144,7 @@ +@@ -14333,7 +14333,7 @@ }, { 'name': 'ManagedBookmarks', @@ -18999,7 +18882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -14177,20 +14177,20 @@ +@@ -14366,20 +14366,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -19024,7 +18907,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -14198,13 +14198,13 @@ +@@ -14387,13 +14387,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -19040,7 +18923,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:31-'], -@@ -14222,7 +14222,7 @@ +@@ -14411,7 +14411,7 @@ }, { 'name': 'UserAvatarImage', @@ -19049,7 +18932,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -14259,7 +14259,7 @@ +@@ -14448,7 +14448,7 @@ }, { 'name': 'WallpaperImage', @@ -19058,7 +18941,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -14294,7 +14294,7 @@ +@@ -14483,7 +14483,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -19067,7 +18950,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -14333,7 +14333,7 @@ +@@ -14522,7 +14522,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -19076,7 +18959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -14359,7 +14359,7 @@ +@@ -14548,7 +14548,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -19085,7 +18968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -14380,7 +14380,7 @@ +@@ -14569,7 +14569,7 @@ }, { 'name': 'SessionLocales', @@ -19094,7 +18977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14408,7 +14408,7 @@ +@@ -14597,7 +14597,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -19103,7 +18986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:38-'], -@@ -14426,7 +14426,7 @@ +@@ -14615,7 +14615,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -19112,7 +18995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -14444,7 +14444,7 @@ +@@ -14633,7 +14633,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -19121,7 +19004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -14462,7 +14462,7 @@ +@@ -14651,7 +14651,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -19130,7 +19013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -14483,7 +14483,7 @@ +@@ -14672,7 +14672,7 @@ }, { 'name': 'BrowserSignin', @@ -19139,7 +19022,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14522,13 +14522,13 @@ +@@ -14711,13 +14711,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. @@ -19155,7 +19038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14586,7 +14586,7 @@ +@@ -14775,7 +14775,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -19164,7 +19047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14631,7 +14631,7 @@ +@@ -14820,7 +14820,7 @@ }, { 'name': 'SSLVersionMax', @@ -19173,7 +19056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14709,7 +14709,7 @@ +@@ -14898,7 +14898,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -19182,7 +19065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14732,11 +14732,11 @@ +@@ -14921,11 +14921,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. @@ -19196,7 +19079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14769,7 +14769,7 @@ +@@ -14958,7 +14958,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -19205,7 +19088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14796,7 +14796,7 @@ +@@ -14985,7 +14985,7 @@ }, { 'name': 'RC4Enabled', @@ -19214,7 +19097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -14821,7 +14821,7 @@ +@@ -15010,7 +15010,7 @@ }, { 'name': 'DHEEnabled', @@ -19223,7 +19106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -14848,7 +14848,7 @@ +@@ -15037,7 +15037,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -19232,7 +19115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -14879,7 +14879,7 @@ +@@ -15068,7 +15068,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -19241,7 +19124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -14897,7 +14897,7 @@ +@@ -15086,7 +15086,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -19250,7 +19133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -14916,7 +14916,7 @@ +@@ -15105,7 +15105,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -19259,7 +19142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -14934,7 +14934,7 @@ +@@ -15123,7 +15123,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -19268,7 +19151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -14952,7 +14952,7 @@ +@@ -15141,7 +15141,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -19277,7 +19160,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-'], -@@ -14970,7 +14970,7 @@ +@@ -15159,7 +15159,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -19286,12 +19169,30 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14991,11 +14991,11 @@ +@@ -15180,11 +15180,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. - For detailed information on valid input patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy. This policy only matches based on origin, so any path in the URL pattern is ignored.''', + For detailed information on valid input patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy. This policy only matches based on origin, so any path in the URL pattern is ignored.''', + }, + { + 'name': 'DeviceAttributesAllowedForOrigins', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -15195,7 +15195,7 @@ + 'dynamic_refresh': True, + 'per_profile': True, + }, +- 'example_value': ['https://www.google.com', 'https://www.example.com'], ++ 'example_value': ['https://www.9oo91e.qjz9zk', 'https://www.example.com'], + 'id': 865, + 'caption': '''Allow origins to query for device attributes''', + 'tags': [], +@@ -15205,7 +15205,7 @@ }, { 'name': 'QuicAllowed', @@ -19300,16 +19201,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:43-', 'chrome_os:43-'], -@@ -15013,7 +15013,7 @@ +@@ -15223,7 +15223,7 @@ }, { 'name': 'KeyPermissions', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['pmarko@chromium.org', 'miersh@google.com', 'omorsi@google.com'], ++ 'owners': ['pmarko@ch40m1um.qjz9zk', 'miersh@9oo91e.qjz9zk', 'omorsi@9oo91e.qjz9zk'], 'type': 'dict', 'schema': { 'type': 'object', -@@ -15056,7 +15056,7 @@ +@@ -15266,7 +15266,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -19318,7 +19219,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -15075,7 +15075,7 @@ +@@ -15285,7 +15285,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -19327,7 +19228,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -15093,7 +15093,7 @@ +@@ -15303,7 +15303,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -19336,7 +19237,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -15112,7 +15112,7 @@ +@@ -15322,7 +15322,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -19345,7 +19246,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15157,7 +15157,7 @@ +@@ -15367,7 +15367,7 @@ }, { 'name': 'ArcEnabled', @@ -19354,7 +19255,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -15175,7 +15175,7 @@ +@@ -15385,7 +15385,7 @@ }, { 'name': 'ArcPolicy', @@ -19363,7 +19264,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -15235,7 +15235,7 @@ +@@ -15445,7 +15445,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -19372,7 +19273,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -15257,7 +15257,7 @@ +@@ -15467,7 +15467,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -19381,25 +19282,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15293,7 +15293,7 @@ +@@ -15503,7 +15503,7 @@ }, { 'name': 'UsbDetachableWhitelist', -- 'owners': ['vpalatin@chromium.org', 'poromov@chromium.org'], -+ 'owners': ['vpalatin@ch40m1um.qjz9zk', 'poromov@ch40m1um.qjz9zk'], +- 'owners': ['vpalatin@chromium.org', 'hendrich@chromium.org'], ++ 'owners': ['vpalatin@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -15334,7 +15334,7 @@ +@@ -15544,7 +15544,7 @@ }, { 'name': 'UsbDetachableAllowlist', -- 'owners': ['file://components/policy/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['vpalatin@chromium.org', 'hendrich@chromium.org'], ++ 'owners': ['vpalatin@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -15371,7 +15371,7 @@ +@@ -15581,7 +15581,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -19408,7 +19309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -15391,7 +15391,7 @@ +@@ -15601,7 +15601,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -19417,7 +19318,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. -@@ -15409,7 +15409,7 @@ +@@ -15619,7 +15619,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -19426,7 +19327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -15443,7 +15443,7 @@ +@@ -15653,7 +15653,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -19435,7 +19336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15497,7 +15497,7 @@ +@@ -15707,7 +15707,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -19444,7 +19345,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. -@@ -15515,7 +15515,7 @@ +@@ -15725,7 +15725,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -19453,7 +19354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -15553,7 +15553,7 @@ +@@ -15763,7 +15763,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -19462,7 +19363,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.''', -@@ -15588,7 +15588,7 @@ +@@ -15798,7 +15798,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -19471,7 +19372,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. -@@ -15607,7 +15607,7 @@ +@@ -15817,7 +15817,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -19480,7 +19381,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. -@@ -15626,7 +15626,7 @@ +@@ -15836,7 +15836,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -19489,7 +19390,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. -@@ -15671,7 +15671,7 @@ +@@ -15881,7 +15881,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -19498,7 +19399,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15695,7 +15695,7 @@ +@@ -15905,7 +15905,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -19507,7 +19408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15706,7 +15706,7 @@ +@@ -15916,7 +15916,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -19516,7 +19417,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'], -@@ -15719,13 +15719,13 @@ +@@ -15929,13 +15929,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -19533,7 +19434,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. -@@ -15743,7 +15743,7 @@ +@@ -15953,7 +15953,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -19542,7 +19443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15776,7 +15776,7 @@ +@@ -15986,7 +15986,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -19551,7 +19452,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-'], -@@ -15785,7 +15785,7 @@ +@@ -15995,7 +15995,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -19560,7 +19461,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'], -@@ -15795,11 +15795,11 @@ +@@ -16005,11 +16005,11 @@ Users cannot change or override this setting. @@ -19574,34 +19475,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' ], -@@ -15834,7 +15834,7 @@ - }, - { - 'name': 'EnableMediaRouter', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:52-', 'chrome_os:52-', 'android:52-'], -@@ -15852,7 +15852,7 @@ - }, - { - 'name': 'ShowCastIconInToolbar', -- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], -@@ -15872,7 +15872,7 @@ - }, - { - 'name': 'MediaRouterCastAllowAllIPs', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:67-', 'chrome_os:67-'], -@@ -15892,7 +15892,7 @@ +@@ -16102,7 +16102,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -19610,7 +19484,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -15910,7 +15910,7 @@ +@@ -16120,7 +16120,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -19619,7 +19493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -15928,7 +15928,7 @@ +@@ -16138,7 +16138,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -19627,8 +19501,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['treib@ch40m1um.qjz9zk', 'carlosk@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['android:54-'], -@@ -15960,7 +15960,7 @@ + 'supported_on': ['android:54-','ios:93-'], +@@ -16169,7 +16169,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -19637,7 +19511,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-'], -@@ -15991,7 +15991,7 @@ +@@ -16200,7 +16200,7 @@ }, { 'name': 'NTPCardsVisible', @@ -19646,7 +19520,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-'], -@@ -16030,7 +16030,7 @@ +@@ -16239,7 +16239,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -19655,7 +19529,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-'], -@@ -16048,7 +16048,7 @@ +@@ -16257,7 +16257,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -19664,7 +19538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16070,7 +16070,7 @@ +@@ -16279,7 +16279,7 @@ }, { 'name': 'WebRestrictionsAuthority', @@ -19673,7 +19547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 341, 'type': 'string', 'schema' : { 'type': 'string' }, -@@ -16086,7 +16086,7 @@ +@@ -16295,7 +16295,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -19682,12 +19556,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-', 'chrome_os:54-'], -@@ -16102,11 +16102,11 @@ +@@ -16311,12 +16311,12 @@ - If set to False, updates to components are disabled. However, some components are exempt from this policy: updates to any component that does not contain executable code, or does not significantly alter the behavior of the browser, or is critical for its security will not be disabled. + If set to disabled, updates to components are disabled. However, some components are exempt from this policy: updates to any component that does not contain executable code, or does not significantly alter the behavior of the browser, or is critical for its security will not be disabled. Examples of such components include the certificate revocation lists and Safe Browsing data. -- See https://developers.google.com/safe-browsing for more info on Safe Browsing.''', -+ See https://developers.9oo91e.qjz9zk/safe-browsing for more info on Safe Browsing.''', +- See https://developers.google.com/safe-browsing for more info on Safe Browsing. ++ See https://developers.9oo91e.qjz9zk/safe-browsing for more info on Safe Browsing. + Please note that setting this policy to disabled can potentially prevent the $1Google Chrome developers from providing critical security fixes in a timely manner and is thus not recommended.''', }, { 'name': 'NativePrinters', @@ -19696,7 +19571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16130,7 +16130,7 @@ +@@ -16340,7 +16340,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -19705,7 +19580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -16186,7 +16186,7 @@ +@@ -16396,7 +16396,7 @@ }, { 'name': 'Printers', @@ -19714,7 +19589,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16210,7 +16210,7 @@ +@@ -16420,7 +16420,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -19723,7 +19598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -16263,7 +16263,7 @@ +@@ -16473,7 +16473,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -19732,7 +19607,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -16296,7 +16296,7 @@ +@@ -16506,7 +16506,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -19741,7 +19616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -16326,7 +16326,7 @@ +@@ -16536,7 +16536,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -19750,7 +19625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-'], 'type': 'int-enum', -@@ -16374,7 +16374,7 @@ +@@ -16584,7 +16584,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -19759,7 +19634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -16419,7 +16419,7 @@ +@@ -16629,7 +16629,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -19768,7 +19643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 384, 'type': 'list', -@@ -16441,7 +16441,7 @@ +@@ -16651,7 +16651,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -19777,7 +19652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -16460,7 +16460,7 @@ +@@ -16670,7 +16670,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -19786,7 +19661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 385, 'type': 'list', -@@ -16482,7 +16482,7 @@ +@@ -16692,7 +16692,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -19795,7 +19670,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -16501,7 +16501,7 @@ +@@ -16711,7 +16711,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -19804,7 +19679,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -16539,7 +16539,7 @@ +@@ -16749,7 +16749,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -19813,7 +19688,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-'], -@@ -16587,7 +16587,7 @@ +@@ -16797,7 +16797,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -19822,7 +19697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 388, -@@ -16609,7 +16609,7 @@ +@@ -16819,7 +16819,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -19831,7 +19706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 389, -@@ -16632,7 +16632,7 @@ +@@ -16842,7 +16842,7 @@ }, { 'name': 'DevicePrinters', @@ -19840,7 +19715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -16667,7 +16667,7 @@ +@@ -16877,7 +16877,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -19849,7 +19724,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -16712,7 +16712,7 @@ +@@ -16922,7 +16922,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -19858,7 +19733,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -16731,7 +16731,7 @@ +@@ -16941,7 +16941,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -19867,7 +19742,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -16751,7 +16751,7 @@ +@@ -16961,7 +16961,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -19876,7 +19751,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -16804,7 +16804,7 @@ +@@ -17014,7 +17014,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -19885,7 +19760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -16830,7 +16830,7 @@ +@@ -17040,7 +17040,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -19894,7 +19769,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -16914,7 +16914,7 @@ +@@ -17124,7 +17124,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -19903,7 +19778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -16938,7 +16938,7 @@ +@@ -17148,7 +17148,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', @@ -19912,7 +19787,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16976,7 +16976,7 @@ +@@ -17186,7 +17186,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', @@ -19921,7 +19796,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17017,7 +17017,7 @@ +@@ -17227,7 +17227,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -19930,7 +19805,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17060,7 +17060,7 @@ +@@ -17270,7 +17270,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -19939,7 +19814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -17078,7 +17078,7 @@ +@@ -17288,7 +17288,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -19948,7 +19823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -17096,7 +17096,7 @@ +@@ -17306,7 +17306,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -19957,7 +19832,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -17114,7 +17114,7 @@ +@@ -17324,7 +17324,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -19966,7 +19841,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -17147,7 +17147,7 @@ +@@ -17357,7 +17357,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -19975,7 +19850,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17168,7 +17168,7 @@ +@@ -17378,7 +17378,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -19984,7 +19859,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17189,7 +17189,7 @@ +@@ -17399,7 +17399,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -19993,7 +19868,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -17212,7 +17212,7 @@ +@@ -17422,7 +17422,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -20002,7 +19877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -17233,7 +17233,7 @@ +@@ -17443,7 +17443,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -20011,7 +19886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17256,7 +17256,7 @@ +@@ -17466,7 +17466,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -20020,7 +19895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -17277,7 +17277,7 @@ +@@ -17487,7 +17487,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -20029,43 +19904,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -17298,7 +17298,7 @@ +@@ -17508,7 +17508,7 @@ }, { 'name': 'PhoneHubAllowed', -- 'owners': ['khorimoto@google.com', 'vecore@chromium.org', 'better-together-dev@google.com'], -+ 'owners': ['khorimoto@9oo91e.qjz9zk', 'vecore@ch40m1um.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], +- 'owners': ['khorimoto@google.com', 'danlee@google.com', 'better-together-dev@google.com'], ++ 'owners': ['khorimoto@9oo91e.qjz9zk', 'danlee@9oo91e.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17319,7 +17319,7 @@ +@@ -17529,7 +17529,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', -- 'owners': ['khorimoto@google.com', 'vecore@chromium.org', 'better-together-dev@google.com'], -+ 'owners': ['khorimoto@9oo91e.qjz9zk', 'vecore@ch40m1um.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], +- 'owners': ['khorimoto@google.com', 'danlee@google.com', 'better-together-dev@google.com'], ++ 'owners': ['khorimoto@9oo91e.qjz9zk', 'danlee@9oo91e.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17339,7 +17339,7 @@ +@@ -17549,7 +17549,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', -- 'owners': ['khorimoto@google.com', 'vecore@chromium.org', 'better-together-dev@google.com'], -+ 'owners': ['khorimoto@9oo91e.qjz9zk', 'vecore@ch40m1um.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], +- 'owners': ['khorimoto@google.com', 'danlee@google.com', 'better-together-dev@google.com'], ++ 'owners': ['khorimoto@9oo91e.qjz9zk', 'danlee@9oo91e.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17359,7 +17359,7 @@ +@@ -17569,7 +17569,7 @@ }, { 'name': 'NearbyShareAllowed', -- 'owners': ['vecore@google.com', 'hansberry@chromium.org', 'better-together-dev@google.com'], -+ 'owners': ['vecore@9oo91e.qjz9zk', 'hansberry@ch40m1um.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], +- 'owners': ['danlee@google.com', 'hansberry@chromium.org', 'better-together-dev@google.com'], ++ 'owners': ['danlee@9oo91e.qjz9zk', 'hansberry@ch40m1um.qjz9zk', 'better-together-dev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -17380,7 +17380,7 @@ +@@ -17590,7 +17590,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -20074,7 +19949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -17412,7 +17412,7 @@ +@@ -17621,7 +17621,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -20083,7 +19958,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -17441,7 +17441,7 @@ +@@ -17650,7 +17650,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -20092,7 +19967,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17484,7 +17484,7 @@ +@@ -17693,7 +17693,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -20101,7 +19976,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -17516,7 +17516,7 @@ +@@ -17725,7 +17725,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -20110,7 +19985,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17562,7 +17562,7 @@ +@@ -17771,7 +17771,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -20119,7 +19994,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17618,7 +17618,7 @@ +@@ -17827,7 +17827,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -20128,7 +20003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -17655,7 +17655,7 @@ +@@ -17864,7 +17864,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -20137,7 +20012,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17685,7 +17685,7 @@ +@@ -17894,7 +17894,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -20146,7 +20021,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17712,7 +17712,7 @@ +@@ -17921,7 +17921,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -20155,7 +20030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -17732,7 +17732,7 @@ +@@ -17941,7 +17941,7 @@ }, { 'name': 'CastReceiverName', @@ -20164,7 +20039,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -17752,7 +17752,7 @@ +@@ -17961,7 +17961,7 @@ }, { 'name': 'DeviceOffHours', @@ -20173,7 +20048,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17835,7 +17835,7 @@ +@@ -18044,7 +18044,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -20182,7 +20057,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -17859,7 +17859,7 @@ +@@ -18068,7 +18068,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -20191,7 +20066,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-'], -@@ -17877,7 +17877,7 @@ +@@ -18086,7 +18086,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -20200,7 +20075,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -17895,7 +17895,7 @@ +@@ -18104,7 +18104,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -20209,7 +20084,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17947,7 +17947,7 @@ +@@ -18156,7 +18156,7 @@ }, { 'name': 'IsolateOrigins', @@ -20218,7 +20093,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-'], -@@ -17968,7 +17968,7 @@ +@@ -18177,7 +18177,7 @@ }, { 'name': 'SitePerProcess', @@ -20227,7 +20102,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-'], -@@ -17989,7 +17989,7 @@ +@@ -18198,7 +18198,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -20236,7 +20111,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -18012,7 +18012,7 @@ +@@ -18221,7 +18221,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -20245,7 +20120,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -18033,7 +18033,7 @@ +@@ -18242,7 +18242,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -20254,7 +20129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -18056,7 +18056,7 @@ +@@ -18265,7 +18265,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -20263,7 +20138,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -18079,7 +18079,7 @@ +@@ -18288,7 +18288,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -20272,12 +20147,15 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:91-', 'chrome_os:91-'], -@@ -18108,11 +18108,11 @@ +@@ -18317,14 +18317,14 @@ isolated context. Chrome will require cross-origin isolation when using SharedArrayBuffers from Chrome 91 onward (2021-05-25) for Web Compatibility reasons. Additional details can be found on: -- https://developer.chrome.com/blog/enabling-shared-array-buffer/.''', -+ https://developer.ch40me.qjz9zk/blog/enabling-shared-array-buffer/.''', +- https://developer.chrome.com/blog/enabling-shared-array-buffer/. ++ https://developer.ch40me.qjz9zk/blog/enabling-shared-array-buffer/. + When set to True, sites can use SharedArrayBuffer with no restrictions. + When set to False or not set, sites can only use SharedArrayBuffers when + cross-origin isolated.''', }, { 'name': 'WebDriverOverridesIncompatiblePolicies', @@ -20286,7 +20164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -18142,7 +18142,7 @@ +@@ -18354,7 +18354,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -20295,7 +20173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18189,7 +18189,7 @@ +@@ -18401,7 +18401,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -20304,7 +20182,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-'], -@@ -18207,11 +18207,11 @@ +@@ -18419,11 +18419,11 @@ Leaving the policy unset means Chrome uses its platform-specific default directory. @@ -20318,7 +20196,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -18230,7 +18230,7 @@ +@@ -18442,7 +18442,7 @@ + }, + { + 'name': 'DeviceHostnameUserConfigurable', +- 'owners': ['khorimoto@google.com', 'cros-connectivity@google.com'], ++ 'owners': ['khorimoto@9oo91e.qjz9zk', 'cros-connectivity@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -18475,7 +18475,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -20327,7 +20214,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-'], -@@ -18259,7 +18259,7 @@ +@@ -18504,7 +18504,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -20336,7 +20223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18290,7 +18290,7 @@ +@@ -18535,7 +18535,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -20345,7 +20232,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18324,7 +18324,7 @@ +@@ -18569,7 +18569,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -20354,7 +20241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18355,7 +18355,7 @@ +@@ -18600,7 +18600,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -20363,7 +20250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -18375,7 +18375,7 @@ +@@ -18620,7 +18620,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -20372,7 +20259,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-'], -@@ -18411,7 +18411,7 @@ +@@ -18656,7 +18656,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -20381,7 +20268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18445,7 +18445,7 @@ +@@ -18690,7 +18690,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -20390,7 +20277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18456,7 +18456,7 @@ +@@ -18701,7 +18701,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -20399,7 +20286,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': [], -@@ -18470,7 +18470,7 @@ +@@ -18715,7 +18715,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -20408,7 +20295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18519,7 +18519,7 @@ +@@ -18764,7 +18764,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -20417,7 +20304,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18554,7 +18554,7 @@ +@@ -18799,7 +18799,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -20426,7 +20313,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18575,7 +18575,7 @@ +@@ -18820,7 +18820,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -20435,7 +20322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18594,7 +18594,7 @@ +@@ -18839,7 +18839,7 @@ { 'id': 854, 'name': 'RelaunchWindow', @@ -20444,7 +20331,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18664,7 +18664,7 @@ +@@ -18909,7 +18909,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -20453,7 +20340,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -18683,7 +18683,7 @@ +@@ -18928,7 +18928,7 @@ }, { 'name': 'CrostiniAllowed', @@ -20462,7 +20349,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -18699,7 +18699,7 @@ +@@ -18944,7 +18944,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -20471,7 +20358,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -18715,7 +18715,7 @@ +@@ -18960,7 +18960,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -20480,7 +20367,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -18731,7 +18731,7 @@ +@@ -18976,7 +18976,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -20489,7 +20376,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -18750,7 +18750,7 @@ +@@ -18995,7 +18995,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -20498,7 +20385,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -18790,7 +18790,7 @@ +@@ -19035,7 +19035,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -20507,7 +20394,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18828,7 +18828,7 @@ +@@ -19073,7 +19073,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -20516,7 +20403,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -18869,7 +18869,7 @@ +@@ -19114,7 +19114,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -20525,7 +20412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -18889,7 +18889,7 @@ +@@ -19134,7 +19134,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -20534,7 +20421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18915,7 +18915,7 @@ +@@ -19160,7 +19160,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -20543,7 +20430,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18938,7 +18938,7 @@ +@@ -19183,7 +19183,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -20552,7 +20439,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18953,15 +18953,15 @@ +@@ -19198,15 +19198,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -20571,7 +20458,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-'], -@@ -18973,15 +18973,15 @@ +@@ -19218,15 +19218,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -20590,7 +20477,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-'], -@@ -18999,12 +18999,12 @@ +@@ -19244,12 +19244,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -20605,7 +20492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -19024,7 +19024,7 @@ +@@ -19269,7 +19269,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -20614,7 +20501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -19043,11 +19043,11 @@ +@@ -19288,11 +19288,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. @@ -20628,7 +20515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -19064,11 +19064,11 @@ +@@ -19309,11 +19309,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. @@ -20642,7 +20529,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-'], -@@ -19088,7 +19088,7 @@ +@@ -19333,7 +19333,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -20651,7 +20538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19108,11 +19108,11 @@ +@@ -19353,11 +19353,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. @@ -20665,7 +20552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19129,11 +19129,11 @@ +@@ -19374,11 +19374,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. @@ -20679,7 +20566,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'], -@@ -19148,13 +19148,13 @@ +@@ -19393,13 +19393,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -20695,7 +20582,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -19178,7 +19178,7 @@ +@@ -19423,7 +19423,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -20704,7 +20591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -19199,7 +19199,7 @@ +@@ -19444,7 +19444,7 @@ }, { 'name': 'DeviceSamlLoginAuthenticationType', @@ -20713,7 +20600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19236,7 +19236,7 @@ +@@ -19481,7 +19481,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -20722,7 +20609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -19256,7 +19256,7 @@ +@@ -19501,7 +19501,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -20731,16 +20618,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -19278,7 +19278,7 @@ +@@ -19523,7 +19523,7 @@ }, { 'name': 'AllowedLanguages', -- 'owners': ['hendrich@chromium.org', 'file://components/policy/resources/OWNERS', 'poromov@chromium.org'], -+ 'owners': ['hendrich@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], +- 'owners': ['hendrich@chromium.org', 'pmarko@chromium.org'], ++ 'owners': ['hendrich@ch40m1um.qjz9zk', 'pmarko@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -19302,7 +19302,7 @@ +@@ -19547,7 +19547,7 @@ }, { 'name': 'AllowedInputMethods', @@ -20749,7 +20636,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19326,7 +19326,7 @@ +@@ -19571,7 +19571,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -20758,16 +20645,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -19343,7 +19343,7 @@ +@@ -19588,7 +19588,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], +- 'owners': ['swapnilgupta@google.com', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['swapnilgupta@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -19361,7 +19361,7 @@ +@@ -19606,7 +19606,7 @@ }, { 'name': 'UsageTimeLimit', @@ -20776,7 +20663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19514,7 +19514,7 @@ +@@ -19759,7 +19759,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -20785,7 +20672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19556,7 +19556,7 @@ +@@ -19801,7 +19801,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -20794,7 +20681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19598,7 +19598,7 @@ +@@ -19843,7 +19843,7 @@ }, { 'name': 'EnableSyncConsent', @@ -20803,7 +20690,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -19616,7 +19616,7 @@ +@@ -19861,7 +19861,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -20812,7 +20699,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -19637,7 +19637,7 @@ +@@ -19882,7 +19882,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -20821,7 +20708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19724,7 +19724,7 @@ +@@ -19969,7 +19969,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -20830,7 +20717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -19743,7 +19743,7 @@ +@@ -19988,7 +19988,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -20839,7 +20726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19781,7 +19781,7 @@ +@@ -20026,7 +20026,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -20848,7 +20735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19805,7 +19805,7 @@ +@@ -20050,7 +20050,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -20857,7 +20744,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19850,7 +19850,7 @@ +@@ -20095,7 +20095,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -20866,7 +20753,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'], -@@ -19865,13 +19865,13 @@ +@@ -20110,13 +20110,13 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -20882,7 +20769,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-'], -@@ -19892,7 +19892,7 @@ +@@ -20137,7 +20137,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -20891,7 +20778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19907,7 +19907,7 @@ +@@ -20152,7 +20152,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -20900,7 +20787,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-'], -@@ -19927,7 +19927,7 @@ +@@ -20172,7 +20172,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -20909,16 +20796,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19945,7 +19945,7 @@ +@@ -20190,7 +20190,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', -- 'owners': ['nharper@chromium.org', 'rsleevi@chromium.org'], -+ 'owners': ['nharper@ch40m1um.qjz9zk', 'rsleevi@ch40m1um.qjz9zk'], +- 'owners': ['rsleevi@chromium.org'], ++ 'owners': ['rsleevi@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -19970,7 +19970,7 @@ +@@ -20215,7 +20215,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -20927,7 +20814,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19988,7 +19988,7 @@ +@@ -20233,7 +20233,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -20936,7 +20823,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -20008,12 +20008,12 @@ +@@ -20253,12 +20253,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -20952,7 +20839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -20026,7 +20026,7 @@ +@@ -20271,7 +20271,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -20961,7 +20848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -20053,14 +20053,14 @@ +@@ -20298,14 +20298,14 @@ 'per_profile': True, }, 'example_value': [{ @@ -20979,7 +20866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'fallback_app_name': 'Editor' }], -@@ -20093,7 +20093,7 @@ +@@ -20338,7 +20338,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -20988,7 +20875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20118,7 +20118,7 @@ +@@ -20363,7 +20363,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -20997,7 +20884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20143,7 +20143,7 @@ +@@ -20388,7 +20388,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -21006,7 +20893,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20167,7 +20167,7 @@ +@@ -20412,7 +20412,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -21015,7 +20902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20192,7 +20192,7 @@ +@@ -20437,7 +20437,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -21024,7 +20911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20217,7 +20217,7 @@ +@@ -20462,7 +20462,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -21033,7 +20920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20243,7 +20243,7 @@ +@@ -20488,7 +20488,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -21042,7 +20929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -20269,7 +20269,7 @@ +@@ -20514,7 +20514,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -21051,7 +20938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -20296,7 +20296,7 @@ +@@ -20541,7 +20541,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -21060,7 +20947,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-'], -@@ -20316,7 +20316,7 @@ +@@ -20561,7 +20561,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -21069,7 +20956,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -20335,7 +20335,7 @@ +@@ -20580,7 +20580,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -21078,7 +20965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -20353,7 +20353,7 @@ +@@ -20598,7 +20598,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -21087,7 +20974,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -20398,7 +20398,7 @@ +@@ -20643,7 +20643,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -21096,7 +20983,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20438,7 +20438,7 @@ +@@ -20683,7 +20683,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -21105,7 +20992,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -20456,7 +20456,7 @@ +@@ -20701,7 +20701,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -21114,7 +21001,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20487,7 +20487,7 @@ +@@ -20732,7 +20732,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -21123,7 +21010,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -20507,7 +20507,7 @@ +@@ -20752,7 +20752,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -21132,7 +21019,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20534,7 +20534,7 @@ +@@ -20779,7 +20779,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -21141,7 +21028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20561,7 +20561,7 @@ +@@ -20806,7 +20806,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -21150,7 +21037,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20588,7 +20588,7 @@ +@@ -20833,7 +20833,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -21159,7 +21046,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -20605,12 +20605,12 @@ +@@ -20850,12 +20850,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. @@ -21174,7 +21061,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', -@@ -20625,12 +20625,12 @@ +@@ -20870,12 +20870,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. @@ -21189,7 +21076,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', -@@ -20645,12 +20645,12 @@ +@@ -20890,12 +20890,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. @@ -21204,7 +21091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -20668,7 +20668,7 @@ +@@ -20913,7 +20913,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -21213,7 +21100,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -20686,7 +20686,7 @@ +@@ -20931,7 +20931,7 @@ + { + 'id': 866, + 'name': 'BrowserSwitcherParsingMode', +- 'owners': ['nicolaso@chromium.org', 'pastarmovj@chromium.org'], ++ 'owners': ['nicolaso@ch40m1um.qjz9zk', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -20974,7 +20974,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -21222,7 +21118,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -20703,7 +20703,7 @@ +@@ -20991,7 +20991,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -21231,7 +21127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20744,7 +20744,7 @@ +@@ -21032,7 +21032,7 @@ }, { 'name': 'PluginVmAllowed', @@ -21240,7 +21136,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -20762,7 +20762,7 @@ +@@ -21050,7 +21050,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -21249,7 +21145,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -20782,7 +20782,7 @@ +@@ -21070,7 +21070,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -21258,7 +21154,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20801,7 +20801,7 @@ +@@ -21092,7 +21092,7 @@ }, { 'name': 'PluginVmUserId', @@ -21267,7 +21163,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20820,7 +20820,7 @@ +@@ -21111,7 +21111,7 @@ }, { 'name': 'PluginVmImage', @@ -21276,7 +21172,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20851,7 +20851,7 @@ +@@ -21142,7 +21142,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -21285,7 +21181,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20870,7 +20870,7 @@ +@@ -21161,7 +21161,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -21294,7 +21190,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20893,7 +20893,7 @@ +@@ -21184,7 +21184,7 @@ }, { 'name': 'ParentAccessCodeConfig', @@ -21303,7 +21199,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -20971,7 +20971,7 @@ +@@ -21262,7 +21262,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -21312,7 +21208,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21011,7 +21011,7 @@ +@@ -21302,7 +21302,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -21321,7 +21217,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21058,7 +21058,7 @@ +@@ -21349,7 +21349,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -21330,7 +21226,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -21075,7 +21075,7 @@ +@@ -21366,7 +21366,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -21339,7 +21235,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -21115,7 +21115,7 @@ +@@ -21406,7 +21406,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -21348,7 +21244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21133,7 +21133,7 @@ +@@ -21424,7 +21424,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -21357,7 +21253,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21151,7 +21151,7 @@ +@@ -21442,7 +21442,7 @@ + }, + { + 'name': 'AssistantVoiceMatchEnabledDuringOobe', +- 'owners': ['raleksandrov@google.com', 'cros-oac@google.com'], ++ 'owners': ['raleksandrov@9oo91e.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:93-'], +@@ -21471,7 +21471,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -21366,7 +21271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -21174,7 +21174,7 @@ +@@ -21494,7 +21494,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -21375,7 +21280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21193,7 +21193,7 @@ +@@ -21513,7 +21513,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -21384,7 +21289,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -21213,11 +21213,11 @@ +@@ -21533,11 +21533,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -21398,7 +21303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21246,7 +21246,7 @@ +@@ -21566,7 +21566,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -21407,7 +21312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21267,7 +21267,7 @@ +@@ -21587,7 +21587,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -21416,7 +21321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21290,7 +21290,7 @@ +@@ -21610,7 +21610,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -21425,7 +21330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21369,7 +21369,7 @@ +@@ -21689,7 +21689,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -21434,7 +21339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21390,7 +21390,7 @@ +@@ -21710,7 +21710,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -21443,7 +21348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21415,7 +21415,7 @@ +@@ -21735,7 +21735,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -21452,7 +21357,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-'], -@@ -21444,7 +21444,7 @@ +@@ -21764,7 +21764,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', @@ -21461,7 +21366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'future_on': ['chrome.*', 'chrome_os'], 'type': 'list', 'schema': { -@@ -21472,11 +21472,11 @@ +@@ -21792,11 +21792,11 @@ For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server. @@ -21475,16 +21380,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -21499,7 +21499,7 @@ +@@ -21819,7 +21819,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', -- 'owners': ['olsen@chromium.org', 'rsorokin@chromium.org'], -+ 'owners': ['olsen@ch40m1um.qjz9zk', 'rsorokin@ch40m1um.qjz9zk'], +- 'owners': ['mslus@chromium.org', 'rsorokin@chromium.org'], ++ 'owners': ['mslus@ch40m1um.qjz9zk', 'rsorokin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -21532,7 +21532,7 @@ +@@ -21854,7 +21854,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -21493,7 +21398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21551,7 +21551,7 @@ +@@ -21873,7 +21873,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -21502,7 +21407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -21582,7 +21582,7 @@ +@@ -21904,7 +21904,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -21511,7 +21416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21609,7 +21609,7 @@ +@@ -21931,7 +21931,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -21520,7 +21425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21630,7 +21630,7 @@ +@@ -21952,7 +21952,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -21529,7 +21434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21697,7 +21697,7 @@ +@@ -22019,7 +22019,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -21538,7 +21443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21748,7 +21748,7 @@ +@@ -22070,7 +22070,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -21547,7 +21452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21771,7 +21771,7 @@ +@@ -22093,7 +22093,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -21556,7 +21461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21794,7 +21794,7 @@ +@@ -22116,7 +22116,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -21565,43 +21470,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -21840,7 +21840,7 @@ +@@ -22162,7 +22162,7 @@ + }, + { + 'name': 'DeviceScheduledReboot', +- 'owners': ['sanjaperisic@chromium.org'], ++ 'owners': ['sanjaperisic@ch40m1um.qjz9zk'], + 'device_only': True, + 'type': 'dict', + 'schema': { +@@ -22207,7 +22207,7 @@ }, { 'name': 'KerberosEnabled', -- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'fsandrade@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21861,7 +21861,7 @@ +@@ -22228,7 +22228,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', -- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21882,7 +21882,7 @@ +@@ -22249,7 +22249,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', -- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21903,7 +21903,7 @@ +@@ -22270,7 +22270,7 @@ }, { 'name': 'KerberosAccounts', -- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['fsandrade@chromium.org', 'file://chrome/browser/ash/kerberos/OWNERS'], ++ 'owners': ['fsandrade@ch40m1um.qjz9zk', 'file://chrome/browser/ash/kerberos/OWNERS'], 'type': 'dict', 'schema': { 'type': 'array', -@@ -21980,7 +21980,7 @@ +@@ -22347,7 +22347,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -21610,7 +21524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -22011,7 +22011,7 @@ +@@ -22378,7 +22378,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -21619,7 +21533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -22032,7 +22032,7 @@ +@@ -22399,7 +22399,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -21628,7 +21542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22052,7 +22052,7 @@ +@@ -22419,7 +22419,7 @@ }, { 'name': 'ExternalPrintServers', @@ -21637,7 +21551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -22097,7 +22097,7 @@ +@@ -22464,7 +22464,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -21646,7 +21560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -22146,7 +22146,7 @@ +@@ -22513,7 +22513,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -21655,7 +21569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -22166,7 +22166,7 @@ +@@ -22533,7 +22533,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -21664,7 +21578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22204,7 +22204,7 @@ +@@ -22571,7 +22571,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -21673,7 +21587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22224,7 +22224,7 @@ +@@ -22591,7 +22591,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -21682,7 +21596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22359,7 +22359,7 @@ +@@ -22726,7 +22726,7 @@ }, { 'name': 'OnFileAttachedEnterpriseConnector', @@ -21691,7 +21605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22494,7 +22494,7 @@ +@@ -22861,7 +22861,7 @@ }, { 'name': 'OnBulkDataEntryEnterpriseConnector', @@ -21700,7 +21614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22625,7 +22625,7 @@ +@@ -22992,7 +22992,7 @@ }, { 'name': 'OnSecurityEventEnterpriseConnector', @@ -21709,7 +21623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22662,7 +22662,7 @@ +@@ -23029,7 +23029,7 @@ }, { 'name': 'EnterpriseRealTimeUrlCheckMode', @@ -21718,7 +21632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22704,7 +22704,7 @@ +@@ -23071,7 +23071,7 @@ }, { 'name': 'RendererCodeIntegrityEnabled', @@ -21727,7 +21641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -22720,11 +22720,11 @@ +@@ -23087,11 +23087,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. @@ -21736,12 +21650,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'HSTSPolicyBypassList', -- 'owners': ['nharper@chromium.org', 'rsleevi@chromium.org'], -+ 'owners': ['nharper@ch40m1um.qjz9zk', 'rsleevi@ch40m1um.qjz9zk'], +- 'owners': ['asymmetric@chromium.org', 'rsleevi@chromium.org'], ++ 'owners': ['asymmetric@ch40m1um.qjz9zk', 'rsleevi@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -22750,7 +22750,7 @@ +@@ -23117,7 +23117,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -21750,7 +21664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'], -@@ -22771,11 +22771,11 @@ +@@ -23138,11 +23138,11 @@ This policy will be removed in Chrome 93. @@ -21764,7 +21678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -22801,7 +22801,7 @@ +@@ -23168,7 +23168,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -21773,7 +21687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22826,7 +22826,7 @@ +@@ -23193,7 +23193,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -21782,7 +21696,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-'], -@@ -22847,7 +22847,7 @@ +@@ -23214,7 +23214,7 @@ }, { 'name': 'CorsMitigationList', @@ -21791,7 +21705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22865,19 +22865,19 @@ +@@ -23232,19 +23232,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. @@ -21814,7 +21728,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'], -@@ -22898,13 +22898,13 @@ +@@ -23265,13 +23265,13 @@ This policy will be removed after a couple of milestones. @@ -21830,7 +21744,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-'], 'id': 631, 'features': { -@@ -22932,7 +22932,7 @@ +@@ -23299,7 +23299,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -21839,7 +21753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -22957,7 +22957,7 @@ +@@ -23324,7 +23324,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -21848,7 +21762,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, -@@ -22984,7 +22984,7 @@ +@@ -23351,7 +23351,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -21857,7 +21771,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -23017,7 +23017,7 @@ +@@ -23384,7 +23384,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -21866,7 +21780,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23052,7 +23052,7 @@ +@@ -23419,7 +23419,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -21875,7 +21789,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23071,11 +23071,11 @@ +@@ -23438,11 +23438,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. @@ -21889,7 +21803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -23094,11 +23094,11 @@ +@@ -23461,11 +23461,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. @@ -21903,7 +21817,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -23122,11 +23122,11 @@ +@@ -23489,11 +23489,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -21917,7 +21831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -23144,7 +23144,7 @@ +@@ -23511,7 +23511,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -21926,7 +21840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23271,7 +23271,7 @@ +@@ -23638,7 +23638,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -21935,7 +21849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23294,7 +23294,7 @@ +@@ -23661,7 +23661,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -21944,7 +21858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23317,7 +23317,7 @@ +@@ -23684,7 +23684,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -21953,7 +21867,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-'], -@@ -23329,7 +23329,7 @@ +@@ -23696,7 +23696,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -21962,7 +21876,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. -@@ -23341,7 +23341,7 @@ +@@ -23708,7 +23708,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -21971,7 +21885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -23362,7 +23362,7 @@ +@@ -23729,7 +23729,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -21980,7 +21894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -23427,7 +23427,7 @@ +@@ -23794,7 +23794,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -21989,7 +21903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23467,7 +23467,7 @@ +@@ -23834,7 +23834,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -21998,7 +21912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23490,7 +23490,7 @@ +@@ -23857,7 +23857,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -22007,7 +21921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23545,7 +23545,7 @@ +@@ -23912,7 +23912,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -22016,7 +21930,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-'], -@@ -23565,7 +23565,7 @@ +@@ -23932,7 +23932,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -22025,7 +21939,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-'], -@@ -23587,7 +23587,7 @@ +@@ -23954,7 +23954,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -22034,7 +21948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -23631,8 +23631,8 @@ +@@ -23998,8 +23998,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -22045,7 +21959,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -23661,7 +23661,7 @@ +@@ -24028,7 +24028,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -22054,7 +21968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -23704,8 +23704,8 @@ +@@ -24071,8 +24071,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -22065,7 +21979,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -23732,7 +23732,7 @@ +@@ -24099,7 +24099,7 @@ }, { 'name': 'LocalDiscoveryEnabled', @@ -22074,7 +21988,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'], -@@ -23765,7 +23765,7 @@ +@@ -24132,7 +24132,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -22083,7 +21997,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-'], -@@ -23787,7 +23787,7 @@ +@@ -24154,7 +24154,7 @@ }, { 'name': 'AdvancedProtectionDeepScanningEnabled', @@ -22092,7 +22006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -23806,7 +23806,7 @@ +@@ -24173,7 +24173,7 @@ }, { 'name': 'SystemProxySettings', @@ -22101,7 +22015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -23862,7 +23862,7 @@ +@@ -24229,7 +24229,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -22110,7 +22024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -23890,7 +23890,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -24257,7 +24257,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -22119,7 +22033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -23917,7 +23917,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -24284,7 +24284,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -22128,7 +22042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-'], -@@ -23972,7 +23972,7 @@ If set to False, $1Google Chrome will not +@@ -24339,7 +24339,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -22137,7 +22051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24024,7 +24024,7 @@ If set to False, $1Google Chrome will not +@@ -24391,7 +24391,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -22146,7 +22060,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24076,7 +24076,7 @@ If set to False, $1Google Chrome will not +@@ -24443,7 +24443,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -22155,7 +22069,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-'], -@@ -24093,7 +24093,7 @@ If set to False, $1Google Chrome will not +@@ -24460,7 +24460,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -22164,7 +22078,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-'], -@@ -24114,7 +24114,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24481,7 +24481,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -22173,7 +22087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -24133,7 +24133,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24500,7 +24500,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -22182,7 +22096,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-'], -@@ -24184,7 +24184,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24551,7 +24551,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -22191,7 +22105,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-'], -@@ -24222,7 +24222,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24589,7 +24589,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -22200,7 +22114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -24257,7 +24257,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24624,7 +24624,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -22209,7 +22123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -24283,7 +24283,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24650,7 +24650,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -22218,7 +22132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -24302,7 +24302,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24669,7 +24669,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -22227,7 +22141,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-', 'android:84-'], -@@ -24325,7 +24325,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24693,7 +24693,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -22236,7 +22150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -24347,7 +24347,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24715,7 +24715,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -22245,7 +22159,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-'], -@@ -24370,7 +24370,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24738,7 +24738,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -22254,7 +22168,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-'], -@@ -24389,7 +24389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24757,7 +24757,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -22263,7 +22177,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -24415,7 +24415,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24783,7 +24783,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -22272,7 +22186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -24445,7 +24445,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24813,7 +24813,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -22281,7 +22195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24488,7 +24488,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24856,7 +24856,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -22290,7 +22204,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'], -@@ -24518,7 +24518,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24886,7 +24886,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -22299,25 +22213,34 @@ 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'], -@@ -24547,7 +24547,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24915,7 +24915,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'DataLeakPreventionClipboardCheckSizeLimit', +- 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' , 'minimum' : 0 }, + 'supported_on': ['chrome_os:93-'], +@@ -24934,7 +24934,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionReportingEnabled', -- 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'jkopanski@google.com'], -+ 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'jkopanski@9oo91e.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'jkopanski@google.com'], ++ 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'jkopanski@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -24579,7 +24579,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24966,7 +24966,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionRulesList', -- 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'ayaelattar@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'ayaelattar@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'ayaelattar@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/policy/dlp/OWNERS', 'ayaelattar@ch40m1um.qjz9zk'], 'type': 'dict', 'schema': { 'type': 'array', -@@ -24665,18 +24665,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25052,18 +25052,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -22342,7 +22265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -24709,8 +24709,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25096,8 +25096,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -22353,7 +22276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -24756,13 +24756,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25143,13 +25143,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. @@ -22369,7 +22292,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-'], -@@ -24795,7 +24795,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25182,7 +25182,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -22378,7 +22301,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-'], -@@ -24822,7 +24822,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25209,7 +25209,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -22387,7 +22310,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24846,7 +24846,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25233,7 +25233,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -22396,7 +22319,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -24871,7 +24871,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25258,7 +25258,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -22405,7 +22328,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24927,7 +24927,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25314,7 +25314,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -22414,7 +22337,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-'], -@@ -24959,7 +24959,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25346,7 +25346,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -22422,8 +22345,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['asumaneev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - # TODO(crbug.com/1179280): remove chrome.linux support once -@@ -24995,7 +24995,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + 'supported_on': ['chrome.linux:91-92', 'chrome_os:91-'], +@@ -25380,7 +25380,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAvailability', @@ -22432,7 +22355,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -25061,7 +25061,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25446,7 +25446,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -22441,7 +22364,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -25092,7 +25092,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25477,7 +25477,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -22450,7 +22373,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -25179,7 +25179,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25564,7 +25564,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -22459,7 +22382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25226,7 +25226,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25611,7 +25611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -22468,7 +22391,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -25261,7 +25261,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25646,7 +25646,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -22477,7 +22400,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -25294,7 +25294,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25679,7 +25679,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -22486,7 +22409,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25381,7 +25381,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25766,7 +25766,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -22495,7 +22418,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -25415,7 +25415,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25800,7 +25800,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -22504,7 +22427,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -25473,7 +25473,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25858,7 +25858,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'FetchKeepaliveDurationSecondsOnShutdown', @@ -22513,7 +22436,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -25496,7 +25496,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25881,7 +25881,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -22522,7 +22445,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-'], -@@ -25519,7 +25519,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25904,7 +25904,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': [], @@ -22531,7 +22454,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. -@@ -25528,7 +25528,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25913,7 +25913,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -22540,7 +22463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25557,7 +25557,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25942,7 +25942,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserBorealisAllowed', @@ -22549,7 +22472,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25586,7 +25586,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25971,7 +25971,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -22558,7 +22481,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -25623,7 +25623,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26008,7 +26008,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -22567,7 +22490,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25647,7 +25647,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26032,7 +26032,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -22576,7 +22499,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -25671,7 +25671,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26056,7 +26056,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -22585,7 +22508,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -25713,7 +25713,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26098,7 +26098,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -22594,7 +22517,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25744,7 +25744,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -26129,7 +26129,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -22603,7 +22526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25768,7 +25768,7 @@ When this policy is set, $2Google Chrome OS< +@@ -26153,7 +26153,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ExplicitlyAllowedNetworkPorts', @@ -22612,7 +22535,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', -@@ -25837,7 +25837,7 @@ When this policy is set, $2Google Chrome OS< +@@ -26248,7 +26248,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'DeviceDebugPacketCaptureAllowed', @@ -22621,7 +22544,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -25870,7 +25870,7 @@ When this policy is set, $2Google Chrome OS< +@@ -26281,7 +26281,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'SuggestLogoutAfterClosingLastWindow', @@ -22630,7 +22553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -25899,7 +25899,7 @@ When this policy is set, $2Google Chrome OS< +@@ -26310,7 +26310,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'TripleDESEnabled', @@ -22639,7 +22562,97 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -26029,7 +26029,7 @@ When this policy is set, $2Google Chrome OS< +@@ -26350,7 +26350,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'ManagedAccountsSigninRestriction', +- 'owners': ['ydago@chromium.org', 'pastarmovj@chromium.org'], ++ 'owners': ['ydago@ch40m1um.qjz9zk', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -26407,7 +26407,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'LockIconInAddressBarEnabled', +- 'owners': ['meacer@chromium.org', 'trusty-transport@chromium.org'], ++ 'owners': ['meacer@ch40m1um.qjz9zk', 'trusty-transport@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'items': [ +@@ -26437,7 +26437,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'DefaultJavaScriptJitSetting', +- 'owners': ['wfh@chromium.org', 'nasko@chromium.org'], ++ 'owners': ['wfh@ch40m1um.qjz9zk', 'nasko@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -26475,7 +26475,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'JavaScriptJitAllowedForSites', +- 'owners': ['wfh@chromium.org', 'nasko@chromium.org'], ++ 'owners': ['wfh@ch40m1um.qjz9zk', 'nasko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -26492,7 +26492,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. + +- For detailed information on valid site 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 site url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy. + + 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. + +@@ -26502,7 +26502,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'JavaScriptJitBlockedForSites', +- 'owners': ['wfh@chromium.org', 'nasko@chromium.org'], ++ 'owners': ['wfh@ch40m1um.qjz9zk', 'nasko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -26521,7 +26521,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. + +- 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. + + 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. + +@@ -26531,7 +26531,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'HttpsOnlyMode', +- 'owners': ['cthomp@chromium.org', 'trusty-transport@chromium.org'], ++ 'owners': ['cthomp@ch40m1um.qjz9zk', 'trusty-transport@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -26575,7 +26575,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'DesktopSharingHubEnabled', +- 'owners': ['kristipark@chromium.org', 'jeffreycohen@chromium.org', 'file://components/send_tab_to_self/OWNERS'], ++ 'owners': ['kristipark@ch40m1um.qjz9zk', 'jeffreycohen@ch40m1um.qjz9zk', 'file://components/send_tab_to_self/OWNERS'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'items': [ +@@ -26604,7 +26604,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'RestrictedManagedGuestSessionEnabled', +- 'owners': ['mpetrisor@chromium.org', 'hendrich@chromium.org'], ++ 'owners': ['mpetrisor@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -26720,7 +26720,7 @@ When this policy is set, $2Google Chrome OS< }, 'doc_banner': { 'desc': '''A banner shown at the top of the policy documentation''', @@ -22648,7 +22661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', -@@ -26037,13 +26037,13 @@ When this policy is set, $2Google Chrome OS< +@@ -26728,13 +26728,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. @@ -22664,7 +22677,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''', -@@ -26115,11 +26115,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26806,11 +26806,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''', @@ -22678,7 +22691,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''', -@@ -26139,7 +26139,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26830,7 +26830,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.''', @@ -22687,7 +22700,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.''', -@@ -26151,7 +26151,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26842,7 +26842,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.''', @@ -22696,7 +22709,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.''', -@@ -26163,7 +26163,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26854,7 +26854,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.''', @@ -22705,7 +22718,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 -@@ -26467,7 +26467,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -27164,7 +27164,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -22714,18 +22727,6 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Action on startup''', 'policies': [ 'RestoreOnStartup', -diff --git a/components/policy/resources/webui/policy_base.js b/components/policy/resources/webui/policy_base.js ---- a/components/policy/resources/webui/policy_base.js -+++ b/components/policy/resources/webui/policy_base.js -@@ -608,7 +608,7 @@ export class Page { - name, - link: knownPolicyNames === policyNames.chrome.policyNames && - knownPolicyNamesSet.has(name) ? -- `https://cloud.google.com/docs/chrome-enterprise/policies/?policy=${ -+ `https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/?policy=${ - name}` : - undefined, - }, 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 @@ -22747,7 +22748,7 @@ diff --git a/components/policy/test_support/policy_testserver.py b/components/po }, "recommended" : { } -@@ -153,14 +153,14 @@ SIGNING_KEYS = [ +@@ -151,14 +151,14 @@ SIGNING_KEYS = [ '/BdmZG+Ge4i4FTqYtInir5YFe611KXU/AveGhQGBIAXo4qYg1IqbVrvKBSU9dlI6Sl' '9TJJLbJ3LGaXuljgFhyMAl3gcy7ftC9MohEmwa+sc7y2mOAgYQ5SSmyAtQwQgAkX9J' '3+tfxjmoA/dg==', @@ -22764,7 +22765,7 @@ diff --git a/components/policy/test_support/policy_testserver.py b/components/po 'T0wXC5w3GXyovA09pyOLX7ui/NI603UfbZXYyTbHI7xtzCIaHVPH35Nx4zdqVrdsej' 'ErQ12yVLDDIJokY4Yl+/fj/zrkAPxThI+TNQ+jo0i+al05PuopfpzvCzIXiZBbkbyW' '3XfedxXP3IPN2XU2/3vX+ZXUNG6pxeETem64kGezkjkUraqnHw3JVzwJYHhpMcwdLP' -@@ -187,14 +187,14 @@ SIGNING_KEYS = [ +@@ -185,14 +185,14 @@ SIGNING_KEYS = [ '5LG+BODExrXXcGu/ubDlW4ivJFqfNUPQysqBXSMY2XCHPJDx3eECLGVVN/fFAWWgjM' 'HFObAriAt0b18cc9Nr0mAt4Qq1oDzWcAHCPHE+5dr8Uf46BUrMLJRNRKCY7rrsoIin' '9Be9gs3W+Aww==', @@ -22781,7 +22782,7 @@ diff --git a/components/policy/test_support/policy_testserver.py b/components/po 'o5MVSo4bRwIJ/aooGyXpRXsEsWPG8fNA2UTG8hgwnLYhNeJCCnLs/vW2vdp0URE8jn' 'qiG4N8KjbuiGw0rJtO1EygdLfpnMEtqYlFjrOie38sy92l/AwohXj6luYzMWL+FqDu' 'WQeXasjgyY4s9BOLQVDEnEj3pvqhrk/mXvMwUeXGpbxTNbWAd0C8BTZrGOwU/kIXxo' -@@ -1215,7 +1215,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): +@@ -1211,7 +1211,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): policy_data.settings_entity_id = msg.settings_entity_id policy_data.service_account_identity = policy.get( 'service_account_identity', @@ -22790,18 +22791,18 @@ diff --git a/components/policy/test_support/policy_testserver.py b/components/po policy_invalidation_topic = policy.get('policy_invalidation_topic') if policy_invalidation_topic is not None: -diff --git a/components/policy/tools/generate_extension_admx.py b/components/policy/tools/generate_extension_admx.py ---- a/components/policy/tools/generate_extension_admx.py -+++ b/components/policy/tools/generate_extension_admx.py -@@ -15,7 +15,7 @@ generate_extension_admx.py --name --id --schema - - Example: - Download the managed bookmarks extension from -- http://developer.chrome.com/extensions/examples/extensions/managed_bookmarks.zip -+ http://developer.ch40me.qjz9zk/extensions/examples/extensions/managed_bookmarks.zip - to obtain the schema.json file. - - generate_extension_admx.py --name 'Managed Bookmarks' +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 +@@ -98,7 +98,7 @@ bool RequestHandlerForPolicy::ProcessCloudPolicy( + 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_storage()->service_account_identity()); + policy_data.set_device_id(client_info.device_id); + policy_data.SerializeToString(fetch_response->mutable_policy_data()); 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 @@ -22871,7 +22872,7 @@ diff --git a/components/policy/tools/template_writers/writers/doc_writer.py b/co - No HTML and body tags. - Restricted set of element attributes: for example no 'class'. Because of the latter the output is styled using the 'style' -@@ -229,25 +229,25 @@ class DocWriter(xml_formatted_writer.XMLFormattedWriter): +@@ -232,25 +232,25 @@ class DocWriter(xml_formatted_writer.XMLFormattedWriter):
    Windows (Windows clients):
    Software\Policies\Chromium\URLAllowlist\0 = "www.example.com" @@ -22927,7 +22928,7 @@ diff --git a/components/policy/tools/template_writers/writers/template_writer.py diff --git a/components/quirks/quirks_client.cc b/components/quirks/quirks_client.cc --- a/components/quirks/quirks_client.cc +++ b/components/quirks/quirks_client.cc -@@ -23,7 +23,7 @@ namespace quirks { +@@ -25,7 +25,7 @@ namespace quirks { namespace { const char kQuirksUrlFormat[] = @@ -23780,9 +23781,9 @@ diff --git a/components/safe_browsing/content/browser/client_side_detection_serv struct ClientSideDetectionService::ClientPhishingReportInfo { std::unique_ptr loader; -diff --git a/components/safe_browsing/content/triggers/trigger_util.cc b/components/safe_browsing/content/triggers/trigger_util.cc ---- a/components/safe_browsing/content/triggers/trigger_util.cc -+++ b/components/safe_browsing/content/triggers/trigger_util.cc +diff --git a/components/safe_browsing/content/browser/triggers/trigger_util.cc b/components/safe_browsing/content/browser/triggers/trigger_util.cc +--- a/components/safe_browsing/content/browser/triggers/trigger_util.cc ++++ b/components/safe_browsing/content/browser/triggers/trigger_util.cc @@ -34,7 +34,7 @@ bool DetectGoogleAd(content::RenderFrameHost* render_frame_host, } @@ -23792,21 +23793,9 @@ diff --git a/components/safe_browsing/content/triggers/trigger_util.cc b/compone base::CompareCase::SENSITIVE) && base::StartsWith(frame_url.path_piece(), "/safeframe", base::CompareCase::SENSITIVE); -diff --git a/components/safe_browsing/core/browser/safe_browsing_token_fetcher.h b/components/safe_browsing/core/browser/safe_browsing_token_fetcher.h ---- a/components/safe_browsing/core/browser/safe_browsing_token_fetcher.h -+++ b/components/safe_browsing/core/browser/safe_browsing_token_fetcher.h -@@ -10,7 +10,7 @@ - namespace safe_browsing { - - constexpr char kAPIScope[] = -- "https://www.googleapis.com/auth/chrome-safe-browsing"; -+ "https://www.9oo91eapis.qjz9zk/auth/chrome-safe-browsing"; - - // This interface is used to fetch access tokens for communcations with Safe - // Browsing. It asynchronously returns an access token for the current account -diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/db/v4_protocol_manager_util.cc ---- a/components/safe_browsing/core/db/v4_protocol_manager_util.cc -+++ b/components/safe_browsing/core/db/v4_protocol_manager_util.cc +diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc ++++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc @@ -29,7 +29,7 @@ namespace safe_browsing { // Can be overriden by tests. const char* g_sbv4_url_prefix_for_testing = nullptr; @@ -23825,10 +23814,10 @@ diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/comp std::string Unescape(const std::string& url) { std::string unescaped_str(url); -diff --git a/components/safe_browsing/core/password_protection/password_protection_service_base.cc b/components/safe_browsing/core/password_protection/password_protection_service_base.cc ---- a/components/safe_browsing/core/password_protection/password_protection_service_base.cc -+++ b/components/safe_browsing/core/password_protection/password_protection_service_base.cc -@@ -39,7 +39,7 @@ namespace { +diff --git a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.cc b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.cc +--- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.cc ++++ b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.cc +@@ -38,7 +38,7 @@ namespace { // Keys for storing password protection verdict into a DictionaryValue. const int kRequestTimeoutMs = 10000; const char kPasswordProtectionRequestUrl[] = @@ -23837,7 +23826,7 @@ diff --git a/components/safe_browsing/core/password_protection/password_protecti } // namespace -@@ -63,8 +63,8 @@ PasswordProtectionServiceBase::PasswordProtectionServiceBase( +@@ -61,8 +61,8 @@ PasswordProtectionServiceBase::PasswordProtectionServiceBase( if (history_service) history_service_observation_.Observe(history_service); @@ -23848,9 +23837,9 @@ diff --git a/components/safe_browsing/core/password_protection/password_protecti "yahoo.com", "adobe.com", "amazon.com", "linkedin.com"}; } -diff --git a/components/safe_browsing/core/realtime/url_lookup_service.cc b/components/safe_browsing/core/realtime/url_lookup_service.cc ---- a/components/safe_browsing/core/realtime/url_lookup_service.cc -+++ b/components/safe_browsing/core/realtime/url_lookup_service.cc +diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc ++++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc @@ -134,7 +134,7 @@ void RealTimeUrlLookupService::Shutdown() { GURL RealTimeUrlLookupService::GetRealTimeLookupUrl() const { @@ -23863,7 +23852,7 @@ diff --git a/components/safe_browsing/core/realtime/url_lookup_service.cc b/comp diff --git a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc --- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc +++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc -@@ -29,7 +29,7 @@ namespace safe_search_api { +@@ -28,7 +28,7 @@ namespace safe_search_api { namespace { const char kSafeSearchApiUrl[] = @@ -23875,7 +23864,7 @@ diff --git a/components/safe_search_api/safe_search/safe_search_url_checker_clie diff --git a/components/safe_search_api/stub_url_checker.cc b/components/safe_search_api/stub_url_checker.cc --- a/components/safe_search_api/stub_url_checker.cc +++ b/components/safe_search_api/stub_url_checker.cc -@@ -20,7 +20,7 @@ namespace safe_search_api { +@@ -21,7 +21,7 @@ namespace safe_search_api { namespace { constexpr char kSafeSearchApiUrl[] = @@ -23966,31 +23955,41 @@ 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 -@@ -19,16 +19,16 @@ bool ShouldOfferLinkToText(const GURL& url) { - // against the RE stored in the value. For example, {"foo.com", ".*"} means +@@ -18,17 +18,17 @@ bool ShouldOfferLinkToText(const GURL& url) { // any page on the foo.com domain. - const static std::map kBlocklist = { -- {"facebook.com", ".*"}, -+ {"f8c3b00k.qjz9zk", ".*"}, - // TODO(crbug.com/1157981): special case this to cover other Google TLDs -- {"google.com", "^\\/amp\\/.*"}, -+ {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, - {"instagram.com", ".*"}, -- {"mail.google.com", ".*"}, -+ {"mail.9oo91e.qjz9zk", ".*"}, - {"outlook.live.com", ".*"}, - {"reddit.com", ".*"}, - {"twitter.com", ".*"}, - {"web.whatsapp.com", ".*"}, -- {"youtube.com", ".*"}, -+ {"y0u1ub3.qjz9zk", ".*"}, + static constexpr auto kBlocklist = + base::MakeFixedFlatMap( +- {{"facebook.com", ".*"}, ++ {{"f8c3b00k.qjz9zk", ".*"}, + // TODO(crbug.com/1157981): special case this to cover other Google + // TLDs +- {"google.com", "^\\/amp\\/.*"}, ++ {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, + {"instagram.com", ".*"}, +- {"mail.google.com", ".*"}, ++ {"mail.9oo91e.qjz9zk", ".*"}, + {"outlook.live.com", ".*"}, + {"reddit.com", ".*"}, + {"twitter.com", ".*"}, + {"web.whatsapp.com", ".*"}, +- {"youtube.com", ".*"}}); ++ {"y0u1ub3.qjz9zk", ".*"}}); - }; + std::string domain = url.host(); + if (domain.compare(0, 4, "www.") == 0) { +@@ -40,7 +40,7 @@ bool ShouldOfferLinkToText(const GURL& url) { + } + + if (base::FeatureList::IsEnabled(kSharedHighlightingAmp) && +- domain.compare("google.com") == 0) { ++ domain.compare("9oo91e.qjz9zk") == 0) { + return true; + } 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 -@@ -149,8 +149,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { +@@ -150,8 +150,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { if (!url.SchemeIsCryptographic()) return false; @@ -24028,7 +24027,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. -@@ -475,7 +475,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( +@@ -526,7 +526,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( void AccountConsistencyService::AddChromeConnectedCookies() { DCHECK(!browser_state_->IsOffTheRecord()); // These cookie requests are preventive. Chrome cannot be sure that @@ -24052,7 +24051,7 @@ diff --git a/components/signin/public/base/test_signin_client.cc b/components/si diff --git a/components/signin/public/identity_manager/access_token_fetcher.cc b/components/signin/public/identity_manager/access_token_fetcher.cc --- a/components/signin/public/identity_manager/access_token_fetcher.cc +++ b/components/signin/public/identity_manager/access_token_fetcher.cc -@@ -129,7 +129,7 @@ void AccessTokenFetcher::VerifyScopeAccess() { +@@ -135,7 +135,7 @@ void AccessTokenFetcher::VerifyScopeAccess() { DCHECK(!GetPrivilegedOAuth2Scopes().count(scope)) << base::StringPrintf( "You are attempting to access a privileged scope '%s' without the " "required access, please file a bug for access at " @@ -24064,7 +24063,7 @@ diff --git a/components/signin/public/identity_manager/access_token_fetcher.cc b diff --git a/components/spellcheck/browser/spelling_service_client.cc b/components/spellcheck/browser/spelling_service_client.cc --- a/components/spellcheck/browser/spelling_service_client.cc +++ b/components/spellcheck/browser/spelling_service_client.cc -@@ -38,7 +38,7 @@ namespace { +@@ -39,7 +39,7 @@ namespace { // The REST endpoint for requesting spell checking and sending user feedback. const char kSpellingServiceRestURL[] = @@ -24116,27 +24115,18 @@ diff --git a/components/subresource_filter/core/common/PRESUBMIT.py b/components for more details about the presubmit API built into depot_tools. """ -diff --git a/components/suggestions/suggestions_service_impl.cc b/components/suggestions/suggestions_service_impl.cc ---- a/components/suggestions/suggestions_service_impl.cc -+++ b/components/suggestions/suggestions_service_impl.cc -@@ -68,7 +68,7 @@ const net::BackoffEntry::Policy kBlocklistBackoffPolicy = { - /*entry_lifetime_ms=*/-1, - /*always_use_initial_delay=*/true}; +diff --git a/components/subresource_redirect/common/subresource_redirect_features.cc b/components/subresource_redirect/common/subresource_redirect_features.cc +--- a/components/subresource_redirect/common/subresource_redirect_features.cc ++++ b/components/subresource_redirect/common/subresource_redirect_features.cc +@@ -22,7 +22,7 @@ namespace { + constexpr int kDefaultLowMemoryThresholdMb = 1900; --const char kDefaultGoogleBaseURL[] = "https://www.google.com/"; -+const char kDefaultGoogleBaseURL[] = "https://www.9oo91e.qjz9zk/"; + // The default origin for the LitePages. +-constexpr char kDefaultLitePageOrigin[] = "https://litepages.googlezip.net/"; ++constexpr char kDefaultLitePageOrigin[] = "https://litepages.9oo91e21p.qjz9zk/"; - GURL GetGoogleBaseURL() { - GURL url(google_util::CommandLineGoogleBaseURL()); -@@ -96,7 +96,7 @@ const char kDeviceType[] = "1"; - #endif - - const char kFaviconURL[] = -- "https://s2.googleusercontent.com/s2/favicons?domain_url=%s&alt=s&sz=32"; -+ "https://s2.9oo91eusercontent.qjz9zk/s2/favicons?domain_url=%s&alt=s&sz=32"; - - // The default expiry timeout is 168 hours. - const int64_t kDefaultExpiryUsec = 168 * base::Time::kMicrosecondsPerHour; + bool IsSubresourceRedirectEnabled() { + return base::FeatureList::IsEnabled(blink::features::kSubresourceRedirect); diff --git a/components/sync/PRESUBMIT.py b/components/sync/PRESUBMIT.py --- a/components/sync/PRESUBMIT.py +++ b/components/sync/PRESUBMIT.py @@ -24165,6 +24155,18 @@ diff --git a/components/sync/base/sync_util.cc b/components/sync/base/sync_util. std::string FormatUserAgentForSync(const std::string& system, version_info::Channel channel) { +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 +@@ -33,7 +33,7 @@ constexpr base::TaskTraits kBackendTaskTraits = { + base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}; + + constexpr char kDefaultTrustedVaultServiceURL[] = +- "https://securitydomain-pa.googleapis.com/v1/"; ++ "https://securitydomain-pa.9oo91eapis.qjz9zk/v1/"; + + GURL ExtractTrustedVaultServiceURLFromCommandLine() { + std::string string_url = diff --git a/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc b/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc --- a/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc +++ b/components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc @@ -24177,6 +24179,18 @@ 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[] = + "users/me/securitydomains/chromesync:join"; + const char kJoinSecurityDomainsErrorDetailTypeURL[] = +- "type.googleapis.com/" ++ "type.9oo91eapis.qjz9zk/" + "google.internal.identity.securitydomain.v1.JoinSecurityDomainErrorDetail"; + extern const char kGetSecurityDomainURLPathAndQuery[] = + "users/me/securitydomains/chromesync?view=2"; diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/PRESUBMIT.py --- a/components/sync_bookmarks/PRESUBMIT.py +++ b/components/sync_bookmarks/PRESUBMIT.py @@ -24321,7 +24335,7 @@ diff --git a/components/variations/proto/PRESUBMIT.py b/components/variations/pr +See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for more details on the presubmit API built into depot_tools. """ - + USE_PYTHON3 = True diff --git a/components/variations/variations_url_constants.cc b/components/variations/variations_url_constants.cc --- a/components/variations/variations_url_constants.cc +++ b/components/variations/variations_url_constants.cc @@ -24384,7 +24398,7 @@ diff --git a/content/app/resources/README.txt b/content/app/resources/README.txt diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -@@ -752,7 +752,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -750,7 +750,7 @@ void ExtractUnderlines(NSAttributedString* string, // TODO(suzhe): We should send mouse events to the input method first if it // wants to handle them. But it won't work without implementing method // - (NSUInteger)characterIndexForPoint:. @@ -24408,33 +24422,33 @@ diff --git a/content/browser/conversions/PRESUBMIT.py b/content/browser/conversi 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 -@@ -3141,7 +3141,7 @@ Status IndexedDBBackingStore::MigrateToV3(LevelDBWriteBatch* write_batch) { - indexed_db::ReportV2Schema(has_blobs, origin_); +@@ -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 (origin_.host() != "docs.google.com") -+ if (origin_.host() != "docs.9oo91e.qjz9zk") +- if (storage_key_.origin().host() != "docs.google.com") ++ if (storage_key_.origin().host() != "docs.9oo91e.qjz9zk") return InternalInconsistencyStatus(); } else { ignore_result(PutInt(write_batch, schema_version_key, db_schema_version)); -@@ -3187,7 +3187,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { +@@ -3189,7 +3189,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { const std::string schema_version_key = SchemaVersionKey::Encode(); Status s; -- if (origin_.host() != "docs.google.com") { -+ if (origin_.host() != "docs.9oo91e.qjz9zk") { +- if (storage_key_.origin().host() != "docs.google.com") { ++ if (storage_key_.origin().host() != "docs.9oo91e.qjz9zk") { s = ValidateBlobFiles(db_.get()); if (!s.ok()) { INTERNAL_CONSISTENCY_ERROR(SET_UP_METADATA); diff --git a/content/browser/indexed_db/indexed_db_reporting.cc b/content/browser/indexed_db/indexed_db_reporting.cc --- a/content/browser/indexed_db/indexed_db_reporting.cc +++ b/content/browser/indexed_db/indexed_db_reporting.cc -@@ -19,7 +19,7 @@ namespace indexed_db { - namespace { +@@ -20,7 +20,7 @@ namespace { - std::string OriginToCustomHistogramSuffix(const url::Origin& origin) { -- if (origin.host() == "docs.google.com") -+ if (origin.host() == "docs.9oo91e.qjz9zk") + std::string StorageKeyToCustomHistogramSuffix( + const blink::StorageKey& storage_key) { +- if (storage_key.origin().host() == "docs.google.com") ++ if (storage_key.origin().host() == "docs.9oo91e.qjz9zk") return ".Docs"; return std::string(); } @@ -24453,7 +24467,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 -@@ -4347,7 +4347,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -4611,7 +4611,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -24462,7 +24476,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4375,7 +4375,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { +@@ -4639,7 +4639,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { const char* console_message = "Subresource requests using legacy protocols (like `ftp:`) are blocked. " "Please deliver web-accessible resources over modern protocols like " @@ -24471,7 +24485,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4607,7 +4607,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -4855,7 +4855,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -24483,14 +24497,14 @@ 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 -@@ -370,7 +370,7 @@ int g_next_accessibility_reset_token = 1; +@@ -396,7 +396,7 @@ int g_next_accessibility_reset_token = 1; // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. bool g_allow_injecting_javascript = false; -const char kDotGoogleDotCom[] = ".google.com"; +const char kDotGoogleDotCom[] = ".9oo91e.qjz9zk"; - typedef std::unordered_map ProcessAppIdExtension(std::string appid, - // special-case AppIDs. Firefox also does this: - // https://groups.google.com/forum/#!msg/mozilla.dev.platform/Uiu3fwnA2xw/201ynAiPAQAJ - const GURL kGstatic1 = -- GURL("https://www.gstatic.com/securitykey/origins.json"); -+ GURL("https://www.95tat1c.qjz9zk/securitykey/origins.json"); - const GURL kGstatic2 = -- GURL("https://www.gstatic.com/securitykey/a/google.com/origins.json"); -+ GURL("https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json"); - DCHECK(kGstatic1.is_valid() && kGstatic2.is_valid()); +@@ -88,9 +88,9 @@ enum class RequestExtension { + namespace { -- if (origin.DomainIs("google.com") && !appid_url.has_ref() && -+ if (origin.DomainIs("9oo91e.qjz9zk") && !appid_url.has_ref() && - (appid_url.EqualsIgnoringRef(kGstatic1) || - appid_url.EqualsIgnoringRef(kGstatic2))) { + constexpr char kGstaticAppId[] = +- "https://www.gstatic.com/securitykey/origins.json"; ++ "https://www.95tat1c.qjz9zk/securitykey/origins.json"; + constexpr char kGstaticCorpAppId[] = +- "https://www.gstatic.com/securitykey/a/google.com/origins.json"; ++ "https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json"; + + WebAuthenticationDelegate* GetWebAuthenticationDelegate() { + return GetContentClient()->browser()->GetWebAuthenticationDelegate(); +@@ -181,7 +181,7 @@ absl::optional ProcessAppIdExtension( + const GURL gstatic_appid(kGstaticAppId); + const GURL gstatic_corp_appid(kGstaticCorpAppId); + DCHECK(gstatic_appid.is_valid() && gstatic_corp_appid.is_valid()); +- if (caller_origin.DomainIs("google.com") && !appid_url.has_ref() && ++ if (caller_origin.DomainIs("9oo91e.qjz9zk") && !appid_url.has_ref() && + (appid_url.EqualsIgnoringRef(gstatic_appid) || + appid_url.EqualsIgnoringRef(gstatic_corp_appid))) { return appid; -@@ -712,7 +712,7 @@ std::string SerializeWebAuthnCollectedClientDataToJson( +@@ -204,8 +204,8 @@ absl::optional MakeCredentialU2fAppIdOverride( + return options->relying_party.id; + } + if (options->google_legacy_app_id_support && +- options->relying_party.id == "google.com") { +- if (caller_origin.DomainIs("login.corp.google.com")) { ++ options->relying_party.id == "9oo91e.qjz9zk") { ++ if (caller_origin.DomainIs("login.corp.9oo91e.qjz9zk")) { + return kGstaticCorpAppId; + } + return kGstaticAppId; +diff --git a/content/browser/webauth/client_data_json.cc b/content/browser/webauth/client_data_json.cc +--- a/content/browser/webauth/client_data_json.cc ++++ b/content/browser/webauth/client_data_json.cc +@@ -143,7 +143,7 @@ std::string BuildClientDataJson( ret.append(R"(,"other_keys_can_be_added_here":")"); ret.append( "do not compare clientDataJSON against a template. See " @@ -24652,7 +24685,7 @@ diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/re diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -404,17 +404,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -412,17 +412,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -24676,7 +24709,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -433,7 +433,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -441,7 +441,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -24688,7 +24721,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -87,7 +87,7 @@ GURL GetStartupURL() { +@@ -95,7 +95,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -24712,7 +24745,7 @@ diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_li diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm -@@ -50,7 +50,7 @@ extern "C" { +@@ -49,7 +49,7 @@ extern "C" { // Using this API has the same effect as turning Bluetooth on or off using the // macOS System Preferences [4], and will effect all adapters. // @@ -24979,7 +25012,7 @@ diff --git a/extensions/common/extension_urls.cc b/extensions/common/extension_u diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc -@@ -490,10 +490,10 @@ const char kInvalidManifest[] = "Manifest file is invalid"; +@@ -488,10 +488,10 @@ const char kInvalidManifest[] = "Manifest file is invalid"; const char kInvalidManifestKey[] = "Invalid value for '*'."; const char kInvalidManifestVersionMissingKey[] = "Missing 'manifest_version' key. Its value must be an integer *. " @@ -25003,7 +25036,19 @@ diff --git a/extensions/common/permissions/PRESUBMIT.py b/extensions/common/perm +See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for more details on the presubmit API built into depot_tools. """ - import sys + +diff --git a/extensions/renderer/resources/automation/PRESUBMIT.py b/extensions/renderer/resources/automation/PRESUBMIT.py +--- a/extensions/renderer/resources/automation/PRESUBMIT.py ++++ b/extensions/renderer/resources/automation/PRESUBMIT.py +@@ -4,7 +4,7 @@ + + """Presubmit script for files in extensions/renderer/resources/automation. + +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts + for more details about the presubmit API built into depot_tools. + """ + diff --git a/extensions/strings/extensions_strings.grd b/extensions/strings/extensions_strings.grd --- a/extensions/strings/extensions_strings.grd +++ b/extensions/strings/extensions_strings.grd @@ -25018,6 +25063,18 @@ diff --git a/extensions/strings/extensions_strings.grd b/extensions/strings/exte IDS_EXTENSION_PROMPT_WARNING_* messages appear on the extension details page along with other permissions. IDS_*PERMISSIONS_PROMPT* messages +diff --git a/google_apis/calendar/calendar_api_url_generator.cc b/google_apis/calendar/calendar_api_url_generator.cc +--- a/google_apis/calendar/calendar_api_url_generator.cc ++++ b/google_apis/calendar/calendar_api_url_generator.cc +@@ -34,7 +34,7 @@ CalendarApiUrlGenerator::~CalendarApiUrlGenerator() = default; + // TODO(https://crbug.com/1222483): get this from GaiaUrls class instead. + // The same for the DriveApiUrlGenerator. + const char CalendarApiUrlGenerator::kBaseUrlForProduction[] = +- "https://www.googleapis.com"; ++ "https://www.9oo91eapis.qjz9zk"; + + GURL CalendarApiUrlGenerator::GetCalendarEventListUrl( + const base::Time& start_time, diff --git a/google_apis/drive/drive_api_url_generator.cc b/google_apis/drive/drive_api_url_generator.cc --- a/google_apis/drive/drive_api_url_generator.cc +++ b/google_apis/drive/drive_api_url_generator.cc @@ -25037,7 +25094,7 @@ diff --git a/google_apis/drive/drive_api_url_generator.cc b/google_apis/drive/dr diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -627,7 +627,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, +@@ -626,7 +626,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, // know what sessions already exist in the browser. The fetcher needs to be // created such that it sends the cookies with the request, which is // different from all other requests the fetcher can make. @@ -25046,7 +25103,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ std::string query = MakeMergeSessionQuery(uber_token, external_cc_result, continue_url, source_); net::NetworkTrafficAnnotationTag traffic_annotation = -@@ -779,7 +779,7 @@ void GaiaAuthFetcher::StartListAccounts() { +@@ -778,7 +778,7 @@ void GaiaAuthFetcher::StartListAccounts() { })"); CreateAndStartGaiaFetcher( " ", // To force an HTTP POST. @@ -25074,7 +25131,7 @@ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_uti diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc -@@ -25,119 +25,119 @@ const char kSyncService[] = "chromiumsync"; +@@ -25,125 +25,125 @@ const char kSyncService[] = "chromiumsync"; const char kRemotingService[] = "chromoting"; // OAuth scopes. @@ -25199,6 +25256,8 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant // OAuth2 scope for access to Drive. -const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive"; +const char kDriveOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/drive"; + + // The scope required for an access token in order to query ItemSuggest. const char kDriveReadOnlyOAuth2Scope[] = - "https://www.googleapis.com/auth/drive.readonly"; + "https://www.9oo91eapis.qjz9zk/auth/drive.readonly"; @@ -25225,12 +25284,17 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant - "https://www.googleapis.com/auth/chromewebstore.readonly"; + "https://www.9oo91eapis.qjz9zk/auth/chromewebstore.readonly"; + // OAuth2 scope for access to Account Capabilities API. + const char kAccountCapabilitiesOAuth2Scope[] = +- "https://www.googleapis.com/auth/account.capabilities"; ++ "https://www.9oo91eapis.qjz9zk/auth/account.capabilities"; + // Used to mint uber auth tokens when needed. const char kGaiaSid[] = "sid"; diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc -@@ -169,7 +169,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( +@@ -180,7 +180,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( trigger: "This request is triggered when a Chrome service requires an " "access token and a refresh token (e.g. Cloud Print, Chrome Remote " @@ -25239,7 +25303,7 @@ diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth "/OAuth2 for more information about the Google implementation of " "the OAuth 2.0 protocol." data: -@@ -320,9 +320,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, +@@ -334,9 +334,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, "The response is a dictionary of response values. The provided " "access token may have any scope, and basic results will be " "returned: issued_to, audience, scope, expires_in, access_type. In " @@ -25254,7 +25318,7 @@ diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc -@@ -23,11 +23,11 @@ +@@ -24,13 +24,13 @@ namespace { // Gaia service constants @@ -25267,6 +25331,9 @@ diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc const char kDefaultOAuthAccountManagerBaseUrl[] = - "https://oauthaccountmanager.googleapis.com"; + "https://oauthaccountmanager.9oo91eapis.qjz9zk"; + const char kDefaultAccountCapabilitiesBaseUrl[] = +- "https://accountcapabilities-pa.googleapis.com"; ++ "https://accountcapabilities-pa.9oo91eapis.qjz9zk"; // API calls from accounts.google.com const char kClientLoginUrlSuffix[] = "ClientLogin"; @@ -25328,7 +25395,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 -@@ -110,7 +110,7 @@ +@@ -115,7 +115,7 @@ namespace google_apis { const char kAPIKeysDevelopersHowToURL[] = @@ -25412,7 +25479,7 @@ diff --git a/gpu/command_buffer/PRESUBMIT.py b/gpu/command_buffer/PRESUBMIT.py diff --git a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm b/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm --- a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm +++ b/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm -@@ -163,7 +163,7 @@ class SharedImageRepresentationDawnIOSurface +@@ -164,7 +164,7 @@ class SharedImageRepresentationDawnIOSurface WGPUTexture texture_ = nullptr; WGPUTextureFormat wgpu_format_; @@ -25506,14 +25573,14 @@ diff --git a/infra/config/PRESUBMIT.py b/infra/config/PRESUBMIT.py """ @@ -134,7 +134,7 @@ def CheckOutagesConfigOnCommit(input_api, output_api): - '{} with a reason.') - .format(_IGNORE_OUTAGE_FOOTER), + 'but you still wish to land it, please add the footer ' + '{} with a reason.').format(_IGNORE_OUTAGE_FOOTER), ('For more information on outages configuration, ' -- 'see https://chromium.googlesource.com/chromium/src/+/refs/heads/master/infra/config/outages'), -+ 'see https://chromium.9oo91esource.qjz9zk/chromium/src/+/refs/heads/master/infra/config/outages'), +- 'see https://chromium.googlesource.com/chromium/src/+/HEAD/infra/config/outages' ++ 'see https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/infra/config/outages' + ), ])), ] - diff --git a/infra/config/scripts/PRESUBMIT.py b/infra/config/scripts/PRESUBMIT.py --- a/infra/config/scripts/PRESUBMIT.py +++ b/infra/config/scripts/PRESUBMIT.py @@ -25565,8 +25632,8 @@ diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts Returns: A dict of test results with input information, confirming to -- https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/test_result.proto -+ https://source.ch40m1um.qjz9zk/chromium/infra/infra/+/master:go/src/go.ch40m1um.qjz9zk/luci/resultdb/sink/proto/v1/test_result.proto +- https://source.chromium.org/chromium/infra/infra/+/main:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/test_result.proto ++ https://source.ch40m1um.qjz9zk/chromium/infra/infra/+/main:go/src/go.ch40m1um.qjz9zk/luci/resultdb/sink/proto/v1/test_result.proto """ assert status in VALID_STATUSES, ( '%s is not a valid status (one in %s) for ResultSink.' % @@ -25574,8 +25641,8 @@ diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts Args: test_result: (dict) Confirming to protocol defined in -- https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/test_result.proto -+ https://source.ch40m1um.qjz9zk/chromium/infra/infra/+/master:go/src/go.ch40m1um.qjz9zk/luci/resultdb/sink/proto/v1/test_result.proto +- https://source.chromium.org/chromium/infra/infra/+/main:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/test_result.proto ++ https://source.ch40m1um.qjz9zk/chromium/infra/infra/+/main:go/src/go.ch40m1um.qjz9zk/luci/resultdb/sink/proto/v1/test_result.proto """ res = self._session.post( url=self.url, @@ -25586,8 +25653,8 @@ diff --git a/ios/build/bots/scripts/standard_json_util.py b/ios/build/bots/scrip def __init__(self, **kwargs): """Module for storing the results in standard JSON format. -- https://chromium.googlesource.com/chromium/src/+/master/docs/testing/json_test_results_format.md -+ https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/testing/json_test_results_format.md +- https://chromium.googlesource.com/chromium/src/+/main/docs/testing/json_test_results_format.md ++ https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/testing/json_test_results_format.md """ self.tests = OrderedDict() @@ -25636,7 +25703,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -290,7 +290,7 @@ locale. The strings in this file are specific to iOS. +@@ -299,7 +299,7 @@ locale. The strings in this file are specific to iOS. Data from Chromium sync @@ -25645,7 +25712,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -299,7 +299,7 @@ locale. The strings in this file are specific to iOS. +@@ -308,7 +308,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. @@ -25654,7 +25721,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 -@@ -377,7 +377,7 @@ locale. The strings in this file are specific to iOS. +@@ -380,7 +380,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chromium data from this device or keep it @@ -25675,7 +25742,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -290,7 +290,7 @@ locale. The strings in this file are specific to iOS. +@@ -299,7 +299,7 @@ locale. The strings in this file are specific to iOS. Data from Chrome sync @@ -25684,7 +25751,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -299,7 +299,7 @@ locale. The strings in this file are specific to iOS. +@@ -308,7 +308,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. @@ -25693,7 +25760,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 -@@ -377,7 +377,7 @@ locale. The strings in this file are specific to iOS. +@@ -380,7 +380,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chrome data from this device or keep it @@ -25714,16 +25781,16 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Bandwidth -@@ -550,7 +550,7 @@ locale. The strings in this file are specific to iOS. +@@ -547,7 +547,7 @@ locale. The strings in this file are specific to iOS. You won't be signed out of your Google Account. - You won't be signed out of your Google Account. Your Google Account may have other forms of browsing history at BEGIN_LINKhistory.google.comEND_LINK. + You won't be signed out of your Google Account. Your Google Account may have other forms of browsing history at BEGIN_LINKhistory.9oo91e.qjz9zkEND_LINK. - - This clears synced data from all devices. Saved site settings will not be deleted and may reflect your browsing habits. BEGIN_LINKLearn moreEND_LINK -@@ -561,8 +561,8 @@ locale. The strings in this file are specific to iOS. + + BEGIN_LINKSearch historyEND_LINK and BEGIN_LINKother forms of activityEND_LINK may be saved in your Google Account when you’re signed in. You can delete them anytime. +@@ -579,8 +579,8 @@ See your search engine’s instructions for deleting your search history, if app Ok, got it @@ -25734,7 +25801,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -733,7 +733,7 @@ locale. The strings in this file are specific to iOS. +@@ -751,7 +751,7 @@ See your search engine’s instructions for deleting your search history, if app By signing out, your bookmarks, history, passwords, and other Chrome data will no longer be synced to your Google Account. @@ -25743,7 +25810,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios This will sign you out, turn off sync, and clear all Chrome data from this device. Your synced data will remain in your Google Account. -@@ -988,7 +988,7 @@ Because your account is managed by $1google.com$1google.com @@ -25752,7 +25819,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1142,7 +1142,7 @@ Because your account is managed by $1google.com$1google.com @@ -25761,7 +25828,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1363,7 +1363,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1396,7 +1396,7 @@ Handoff must also be enabled in the General section of Settings, and your device Continue @@ -25770,7 +25837,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Add existing data to $1john@doe.com. -@@ -1575,7 +1575,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1608,7 +1608,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Privacy Notice @@ -25779,7 +25846,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1626,7 +1626,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1659,7 +1659,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -25788,7 +25855,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -1874,7 +1874,7 @@ Follow the steps below: +@@ -1931,7 +1931,7 @@ Follow the steps below: Turned off by your organization. @@ -25797,7 +25864,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Check Passwords -@@ -2358,12 +2358,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -25812,7 +25879,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. -@@ -2630,7 +2630,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -2683,7 +2683,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -25833,7 +25900,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", -@@ -366,7 +366,7 @@ autofill_test_files = [ +@@ -367,7 +367,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", @@ -25857,7 +25924,7 @@ diff --git a/ios/chrome/browser/autofill/automation/automation_action.mm b/ios/c diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm --- a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm +++ b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm -@@ -38,7 +38,7 @@ ChromeBrowserStateRemovalController* g_chrome_browser_state_removal_helper = +@@ -40,7 +40,7 @@ ChromeBrowserStateRemovalController* g_chrome_browser_state_removal_helper = NSString* const kPathToBrowserStateToKeepKey = @"PathToBrowserStateToKeep"; NSString* const kHasBrowserStateBeenRemovedKey = @"HasBrowserStateBeenRemoved"; @@ -25869,7 +25936,7 @@ diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_contr diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc -@@ -82,41 +82,41 @@ const char* const kChromeHostURLs[] = { +@@ -79,47 +79,47 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = base::size(kChromeHostURLs); const char kSyncGoogleDashboardURL[] = @@ -25906,6 +25973,14 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr - "https://history.google.com/history/?utm_source=chrome_cbd"; + "https://history.9oo91e.qjz9zk/history/?utm_source=chrome_cbd"; + const char kClearBrowsingDataDSEMyActivityUrlInFooterURL[] = +- "https://myactivity.google.com/myactivity?utm_source=chrome_cbd"; ++ "https://myactivity.9oo91e.qjz9zk/myactivity?utm_source=chrome_cbd"; + + const char kClearBrowsingDataDSESearchUrlInFooterURL[] = +- "https://myactivity.google.com/product/search?utm_source=chrome_cbd"; ++ "https://myactivity.9oo91e.qjz9zk/product/search?utm_source=chrome_cbd"; + const char kClearBrowsingDataMyActivityUrlInDialogURL[] = - "https://history.google.com/history/?utm_source=chrome_n"; + "https://history.9oo91e.qjz9zk/history/?utm_source=chrome_n"; @@ -25923,7 +25998,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"; -@@ -124,4 +124,4 @@ const char kReadingListReferrerURL[] = +@@ -127,4 +127,4 @@ const char kReadingListReferrerURL[] = const char kChromeUIAboutNewTabURL[] = "about://newtab/"; const char kManagementLearnMoreURL[] = @@ -25947,7 +26022,7 @@ diff --git a/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_ 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 -@@ -382,7 +382,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -397,7 +397,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -25956,7 +26031,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ {"wallet-service-use-sandbox", flag_descriptions::kWalletServiceUseSandboxName, flag_descriptions::kWalletServiceUseSandboxDescription, flags_ui::kOsIos, -@@ -811,7 +811,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { +@@ -864,7 +864,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -25968,7 +26043,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ diff --git a/ios/chrome/browser/omaha/omaha_service.mm b/ios/chrome/browser/omaha/omaha_service.mm --- a/ios/chrome/browser/omaha/omaha_service.mm +++ b/ios/chrome/browser/omaha/omaha_service.mm -@@ -199,7 +199,7 @@ class XmlWrapper : public OmahaXmlWriter { +@@ -200,7 +200,7 @@ class XmlWrapper : public OmahaXmlWriter { // // // @@ -25989,7 +26064,7 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios std::u16string GenerateKeywordFromNavigationItem( const web::NavigationItem* item) { // Don't autogenerate keywords for pages that are the result of form -@@ -155,7 +155,7 @@ void SearchEngineTabHelper::OnJsMessage(const base::DictionaryValue& message, +@@ -155,7 +155,7 @@ void SearchEngineTabHelper::OnJsMessage(const base::Value& message, // Creates a new TemplateURL by OSDD. The TemplateURL will be added to // TemplateURLService by TemplateURLFecther. This code is based on: @@ -26129,7 +26204,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io diff --git a/ios/chrome/browser/ui/ntp/incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito_view.mm --- a/ios/chrome/browser/ui/ntp/incognito_view.mm +++ b/ios/chrome/browser/ui/ntp/incognito_view.mm -@@ -43,7 +43,7 @@ const CGFloat kLayoutGuideMinHeight = 12.0; +@@ -42,7 +42,7 @@ const CGFloat kLayoutGuideMinHeight = 12.0; // The URL for the the Learn More page shown on incognito new tab. // Taken from ntp_resource_cache.cc. const char kLearnMoreIncognitoUrl[] = @@ -26165,7 +26240,7 @@ diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm b/ios/ diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chrome/browser/ui/settings/settings_app_interface.mm --- a/ios/chrome/browser/ui/settings/settings_app_interface.mm +++ b/ios/chrome/browser/ui/settings/settings_app_interface.mm -@@ -123,7 +123,7 @@ bool HostToLocalHostRewrite(GURL* url, web::BrowserState* browser_state) { +@@ -111,7 +111,7 @@ bool HostToLocalHostRewrite(GURL* url, web::BrowserState* browser_state) { ios::TemplateURLServiceFactory::GetForBrowserState( chrome_test_util::GetOriginalBrowserState()); @@ -26269,7 +26344,7 @@ diff --git a/ios/public/provider/chrome/browser/omaha/test_omaha_service_provide diff --git a/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm b/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm --- a/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm +++ b/ios/public/provider/chrome/browser/signin/chrome_identity_service.mm -@@ -108,13 +108,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( +@@ -228,13 +228,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( NSString* ChromeIdentityService::GetCachedHostedDomainForIdentity( ChromeIdentity* identity) { @@ -26300,15 +26375,14 @@ diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_serv diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm -@@ -10,7 +10,7 @@ +@@ -10,6 +10,6 @@ namespace ios { -NSString* const kManagedIdentityEmailSuffix = @"@google.com"; +NSString* const kManagedIdentityEmailSuffix = @"@9oo91e.qjz9zk"; - NSString* const kMinorModeIdentityEmailSuffix = @"@minor-mode"; - + } // namespace ios diff --git a/ios/showcase/alert/sc_alert_coordinator.mm b/ios/showcase/alert/sc_alert_coordinator.mm --- a/ios/showcase/alert/sc_alert_coordinator.mm +++ b/ios/showcase/alert/sc_alert_coordinator.mm @@ -26420,7 +26494,7 @@ diff --git a/ios/testing/data/http_server_files/window_open.html b/ios/testing/d diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm --- a/ios/web/navigation/navigation_manager_impl.mm +++ b/ios/web/navigation/navigation_manager_impl.mm -@@ -874,10 +874,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, +@@ -875,10 +875,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, // Reload with ORIGINAL_REQUEST_URL type should reload with the original // request url of the pending item, or last committed item if the pending item // doesn't exist. The reason is that a server side redirect may change the @@ -26473,7 +26547,7 @@ diff --git a/ios/web_view/internal/cwv_flags.mm b/ios/web_view/internal/cwv_flag diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_web_view.mm --- a/ios/web_view/internal/cwv_web_view.mm +++ b/ios/web_view/internal/cwv_web_view.mm -@@ -819,7 +819,7 @@ BOOL gChromeLongPressAndForceTouchHandlingEnabled = YES; +@@ -818,7 +818,7 @@ BOOL gChromeLongPressAndForceTouchHandlingEnabled = YES; // e.g., triggered by JavaScript "window.open()" function. In that case, if // |self| is not created by the WKWebViewConfiguration provided by WebKit's // delegate method @@ -26524,7 +26598,7 @@ diff --git a/media/PRESUBMIT.py b/media/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -@@ -144,7 +144,7 @@ def _CheckForHistogramOffByOne(input_api, output_api): +@@ -146,7 +146,7 @@ def _CheckForHistogramOffByOne(input_api, output_api): ' - The max value (3rd argument) should be an enum value equal to the\n' ' last valid value, e.g. FOO_MAX = LAST_VALID_FOO.\n' ' - 1 must be added to that max value.\n' @@ -27269,8 +27343,8 @@ diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/index.html b/nati

    Note: the C++ source code of this demo is available in webports. The terminal interface is rendered in HTML/CSS using the hterm library. @@ -27474,7 +27548,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 -@@ -384,7 +384,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -383,7 +383,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" @@ -27557,7 +27631,7 @@ diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc -@@ -2189,10 +2189,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2197,10 +2197,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -27575,7 +27649,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc -@@ -3023,7 +3023,7 @@ void SpdySession::RecordProtocolErrorHistogram( +@@ -3034,7 +3034,7 @@ void SpdySession::RecordProtocolErrorHistogram( SpdyProtocolErrorDetails details) { UMA_HISTOGRAM_ENUMERATION("Net.SpdySessionErrorDetails2", details, NUM_SPDY_PROTOCOL_ERROR_DETAILS); @@ -27825,7 +27899,7 @@ diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc diff --git a/printing/print_settings_initializer_win.cc b/printing/print_settings_initializer_win.cc --- a/printing/print_settings_initializer_win.cc +++ b/printing/print_settings_initializer_win.cc -@@ -89,7 +89,7 @@ bool IsPrinterPostScript(HDC hdc, int* level) { +@@ -90,7 +90,7 @@ bool IsPrinterPostScript(HDC hdc, int* level) { bool IsPrinterXPS(HDC hdc) { static constexpr char kXPSDriver[] = @@ -27849,7 +27923,7 @@ diff --git a/remoting/base/breakpad_mac.mm b/remoting/base/breakpad_mac.mm diff --git a/remoting/base/chromium_url_request.cc b/remoting/base/chromium_url_request.cc --- a/remoting/base/chromium_url_request.cc +++ b/remoting/base/chromium_url_request.cc -@@ -34,7 +34,7 @@ ChromiumUrlRequest::ChromiumUrlRequest( +@@ -36,7 +36,7 @@ ChromiumUrlRequest::ChromiumUrlRequest( resource_request_->url = GURL(url); resource_request_->method = request_type; resource_request_->credentials_mode = network::mojom::CredentialsMode::kOmit; @@ -27905,7 +27979,7 @@ diff --git a/remoting/host/it2me/com.google.chrome.remote_assistance-firefox.jso diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_constants.cc --- a/remoting/host/it2me/it2me_constants.cc +++ b/remoting/host/it2me/it2me_constants.cc -@@ -18,7 +18,7 @@ const char kConnectMessage[] = "connect"; +@@ -13,7 +13,7 @@ const char kConnectMessage[] = "connect"; const char kUserName[] = "userName"; const char kAuthServiceWithToken[] = "authServiceWithToken"; const char kLocalJid[] = "localJid"; @@ -27917,7 +27991,7 @@ diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py --- a/remoting/host/linux/linux_me2me_host.py +++ b/remoting/host/linux/linux_me2me_host.py -@@ -1503,7 +1503,7 @@ def watch_for_resolution_changes(initial_size): +@@ -1485,7 +1485,7 @@ def watch_for_resolution_changes(initial_size): def main(): EPILOG = """This script is not intended for use by end-users. To configure Chrome Remote Desktop, please install the app from the Chrome @@ -27926,7 +28000,7 @@ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux parser = argparse.ArgumentParser( usage="Usage: %(prog)s [options] [ -- [ X server options ] ]", epilog=EPILOG) -@@ -1705,7 +1705,7 @@ Web Store: https://chrome.google.com/remotedesktop""" +@@ -1687,7 +1687,7 @@ Web Store: https://chrome.google.com/remotedesktop""" "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 " @@ -28026,7 +28100,7 @@ diff --git a/remoting/ios/app/remoting_menu_view_controller.mm b/remoting/ios/ap +++ b/remoting/ios/app/remoting_menu_view_controller.mm @@ -34,17 +34,17 @@ namespace { // To use these scopes in a debug build, your development account will need to - // be whitelisted. + // be allowlisted. const char kChromotingAuthScopeValues[] = - "https://www.googleapis.com/auth/chromoting.directory " - "https://www.googleapis.com/auth/tachyon " @@ -28101,6 +28175,15 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti $1My Linux desktop (offline) +@@ -901,7 +901,7 @@ If '$3org.chromium.chromoting.me2me.sh + + +- Failed to open $1http://google.com on the client. ++ Failed to open $1http://9oo91e.qjz9zk on the client. + + + Chrome Remote Desktop cannot determine the browser to open URLs locally. Please choose it from the list below. diff --git a/remoting/signaling/signaling_id_util.cc b/remoting/signaling/signaling_id_util.cc --- a/remoting/signaling/signaling_id_util.cc +++ b/remoting/signaling/signaling_id_util.cc @@ -28151,7 +28234,7 @@ diff --git a/remoting/tools/zip2msi.py b/remoting/tools/zip2msi.py diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc -@@ -293,7 +293,7 @@ void PingRlzServer(std::string url, +@@ -295,7 +295,7 @@ void PingRlzServer(std::string url, "1- Non-unique cohort tag of when Chromium was installed.\n" "2- Unique machine id on desktop platforms.\n" "3- Whether Google is the default omnibox search.\n" @@ -28175,7 +28258,7 @@ diff --git a/sandbox/features.gni b/sandbox/features.gni diff --git a/sandbox/linux/services/libc_interceptor.cc b/sandbox/linux/services/libc_interceptor.cc --- a/sandbox/linux/services/libc_interceptor.cc +++ b/sandbox/linux/services/libc_interceptor.cc -@@ -199,7 +199,7 @@ static void InitLibcLocaltimeFunctionsImpl() { +@@ -209,7 +209,7 @@ static void InitLibcLocaltimeFunctionsImpl() { LOG(ERROR) << "Your system is broken: dlsym doesn't work! This has been " "reported to be caused by Nvidia's libGL. You should expect" " time related functions to misbehave. " @@ -28223,7 +28306,7 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win. diff --git a/services/device/geolocation/network_location_request.cc b/services/device/geolocation/network_location_request.cc --- a/services/device/geolocation/network_location_request.cc +++ b/services/device/geolocation/network_location_request.cc -@@ -34,7 +34,7 @@ namespace device { +@@ -36,7 +36,7 @@ namespace device { namespace { const char kNetworkLocationBaseUrl[] = @@ -28351,10 +28434,10 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html absl::Status Type for returning detailed errors. -status.h --Approved for use inside a wrapper type. Use abseil_string_conversions.h to convert to and from absl::string_view so the wrapper can expose base::StringPiece. Use absl::Cord directly as minimally necessary to interface; do not expose in the wrapper type API.
    +-Approved for use inside a wrapper type. Use abseil_string_conversions.h to convert to and from absl::string_view so the wrapper can expose base::StringPiece. Use absl::Cord directly as minimally necessary to interface; do not expose in the wrapper type API.
    -Discussion thread +status.h -+Approved for use inside a wrapper type. Use abseil_string_conversions.h to convert to and from absl::string_view so the wrapper can expose base::StringPiece. Use absl::Cord directly as minimally necessary to interface; do not expose in the wrapper type API.
    ++Approved for use inside a wrapper type. Use abseil_string_conversions.h to convert to and from absl::string_view so the wrapper can expose base::StringPiece. Use absl::Cord directly as minimally necessary to interface; do not expose in the wrapper type API.
    +Discussion thread @@ -28544,7 +28627,7 @@ diff --git a/testing/scripts/PRESUBMIT.py b/testing/scripts/PRESUBMIT.py diff --git a/testing/scripts/common.py b/testing/scripts/common.py --- a/testing/scripts/common.py +++ b/testing/scripts/common.py -@@ -205,7 +205,7 @@ def get_gtest_summary_passes(output): +@@ -251,7 +251,7 @@ def get_gtest_summary_passes(output): Only partially parses the format. This code is based on code in tools/build, specifically @@ -28589,7 +28672,7 @@ diff --git a/testing/scripts/run_performance_tests.py b/testing/scripts/run_perf diff --git a/testing/test_env.py b/testing/test_env.py --- a/testing/test_env.py +++ b/testing/test_env.py -@@ -185,7 +185,7 @@ def run_command_with_output(argv, stdoutfile, env=None, cwd=None): +@@ -178,7 +178,7 @@ def run_command_with_output(argv, stdoutfile, env=None, cwd=None): """Run command and stream its stdout/stderr to the console & |stdoutfile|. Also forward_signals to obey @@ -28598,7 +28681,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -212,7 +212,7 @@ def run_command(argv, env=None, cwd=None, log=True): +@@ -205,7 +205,7 @@ def run_command(argv, env=None, cwd=None, log=True): """Run command and stream its stdout/stderr both to stdout. Also forward_signals to obey @@ -28607,7 +28690,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -228,7 +228,7 @@ def run_command_output_to_handle(argv, file_handle, env=None, cwd=None): +@@ -221,7 +221,7 @@ def run_command_output_to_handle(argv, file_handle, env=None, cwd=None): """Run command and stream its stdout/stderr both to |file_handle|. Also forward_signals to obey @@ -28616,7 +28699,7 @@ diff --git a/testing/test_env.py b/testing/test_env.py Returns: integer returncode of the subprocess. -@@ -268,7 +268,7 @@ def forward_signals(procs): +@@ -261,7 +261,7 @@ def forward_signals(procs): """Forwards unix's SIGTERM or win's CTRL_BREAK_EVENT to the given processes. This plays nicely with swarming's timeout handling. See also @@ -28628,8 +28711,8 @@ diff --git a/testing/test_env.py b/testing/test_env.py diff --git a/testing/trigger_scripts/PRESUBMIT.py b/testing/trigger_scripts/PRESUBMIT.py --- a/testing/trigger_scripts/PRESUBMIT.py +++ b/testing/trigger_scripts/PRESUBMIT.py -@@ -4,7 +4,7 @@ - +@@ -3,7 +3,7 @@ + # found in the LICENSE file. """Top-level presubmit script for testing/trigger_scripts. -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts @@ -28640,15 +28723,27 @@ diff --git a/testing/trigger_scripts/PRESUBMIT.py b/testing/trigger_scripts/PRES diff --git a/testing/trigger_scripts/base_test_triggerer.py b/testing/trigger_scripts/base_test_triggerer.py --- a/testing/trigger_scripts/base_test_triggerer.py +++ b/testing/trigger_scripts/base_test_triggerer.py -@@ -143,7 +143,7 @@ class BaseTestTriggerer(object): - # swarming to its own object to make trigger logic more clear. - def query_swarming(self, api, query_args, verbose, - limit='0', -- server='chromium-swarm.appspot.com'): -+ server='chromium-swarm.8pp2p8t.qjz9zk'): - try: - temp_file = self.make_temp_file(prefix='base_trigger_dimensions', - suffix='.json') +@@ -154,7 +154,7 @@ class BaseTestTriggerer(object): + query_args, + verbose, + limit='0', +- server='chromium-swarm.appspot.com'): ++ server='chromium-swarm.8pp2p8t.qjz9zk'): + try: + temp_file = self.make_temp_file(prefix='base_trigger_dimensions', + suffix='.json') +diff --git a/testing/unexpected_passes_common/data_types.py b/testing/unexpected_passes_common/data_types.py +--- a/testing/unexpected_passes_common/data_types.py ++++ b/testing/unexpected_passes_common/data_types.py +@@ -151,7 +151,7 @@ class BuildStats(object): + + + def BuildLinkFromBuildId(build_id): +- return 'http://ci.chromium.org/b/%s' % build_id ++ return 'http://ci.ch40m1um.qjz9zk/b/%s' % build_id + + + # These explicit overrides could likely be replaced by using regular dicts with diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py --- a/testing/variations/PRESUBMIT.py +++ b/testing/variations/PRESUBMIT.py @@ -28664,7 +28759,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 -@@ -866,7 +866,7 @@ +@@ -893,7 +893,7 @@ { "name": "API_Enabled", "params": { @@ -28673,7 +28768,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillServerCommunication", -@@ -3122,7 +3122,7 @@ +@@ -3115,7 +3115,7 @@ "params": { "DnsHttpssvcControlDomainWildcard": "true", "DnsHttpssvcEnableQueryOverInsecure": "true", @@ -28682,7 +28777,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -4226,7 +4226,7 @@ +@@ -4405,7 +4405,7 @@ { "name": "Enabled", "params": { @@ -28691,7 +28786,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "IncompatibleApplicationsWarning" -@@ -6193,12 +6193,12 @@ +@@ -6412,12 +6412,12 @@ { "name": "Enabled_Prefetch_Prefetch1_NSP6_Small_20210301", "params": { @@ -28706,25 +28801,16 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "IsolatePrerenders", -@@ -6430,7 +6430,7 @@ +@@ -6666,7 +6666,7 @@ { - "name": "EnabledExploreAndTrendingSegmentation1", + "name": "EnabledExploreSegmentation2", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", + "experiment_tag": "{maxLevels : 1}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -6455,7 +6455,7 @@ - { - "name": "EnabledStitchAndTrending", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{enableTrending: true, maxTrendingQueries: 8}", - "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -7877,7 +7877,7 @@ +@@ -8197,7 +8197,7 @@ { "name": "launch_20180628_model_20170329_with_blacklist_override_default", "params": { @@ -28733,7 +28819,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -7896,7 +7896,7 @@ +@@ -8216,7 +8216,7 @@ { "name": "20180123_launch", "params": { @@ -28742,7 +28828,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -7917,7 +7917,7 @@ +@@ -8237,7 +8237,7 @@ { "name": "Enforcement20170918", "params": { @@ -28751,7 +28837,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerEnforcement", -@@ -8507,7 +8507,7 @@ +@@ -9022,7 +9022,7 @@ { "name": "Enabled", "params": { @@ -28806,7 +28892,7 @@ diff --git a/third_party/abseil-cpp/generate_def_files.py b/third_party/abseil-c -https://chromium.googlesource.com/chromium/src.git/+/main/docs/win_cross.md. +https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/main/docs/win_cross.md. If you are on Windows, you may need to tweak this script to run, e.g. by - changing "gn" to "gn.bat", changing "llvm-nm-9" to the name of your copy of + changing "gn" to "gn.bat", changing "llvm-nm" to the name of your copy of llvm-nm, etc. diff --git a/third_party/abseil-cpp/roll_abseil.py b/third_party/abseil-cpp/roll_abseil.py --- a/third_party/abseil-cpp/roll_abseil.py @@ -29852,10 +29938,22 @@ diff --git a/third_party/android_deps/libs/com_google_android_material_material/ import json import os --_FILE_URL = 'https://maven.google.com/com/google/android/material/material/1.2.0-alpha06/material-1.2.0-alpha06.aar' -+_FILE_URL = 'https://maven.9oo91e.qjz9zk/com/google/android/material/material/1.2.0-alpha06/material-1.2.0-alpha06.aar' - _FILE_NAME = 'material-1.2.0-alpha06.aar' - _FILE_VERSION = '1.2.0-alpha06' +-_FILE_URL = 'https://maven.google.com/com/google/android/material/material/1.4.0-rc01/material-1.4.0-rc01.aar' ++_FILE_URL = 'https://maven.9oo91e.qjz9zk/com/google/android/material/material/1.4.0-rc01/material-1.4.0-rc01.aar' + _FILE_NAME = 'material-1.4.0-rc01.aar' + _FILE_VERSION = '1.4.0-rc01' + +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 + +-_FILE_URL = 'https://maven.google.com/com/google/android/play/core/1.10.0/core-1.10.0.aar' ++_FILE_URL = 'https://maven.9oo91e.qjz9zk/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' 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 @@ -30028,7 +30126,7 @@ diff --git a/third_party/blink/PRESUBMIT.py b/third_party/blink/PRESUBMIT.py for more details about the presubmit API built into gcl. """ -@@ -242,7 +242,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -247,7 +247,7 @@ def CheckChangeOnCommit(input_api, output_api): input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -30109,7 +30207,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. --> -@@ -1138,14 +1138,14 @@ below: +@@ -1141,14 +1141,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 @@ -30126,7 +30224,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. -@@ -1154,7 +1154,7 @@ below: +@@ -1157,7 +1157,7 @@ below: # # Contributor(s): # Mitch (original author) @@ -30147,18 +30245,6 @@ diff --git a/third_party/blink/renderer/bindings/PRESUBMIT.py b/third_party/blin for more details about the presubmit API built into gcl. """ -diff --git a/third_party/blink/renderer/bindings/scripts/aggregate_generated_bindings.py b/third_party/blink/renderer/bindings/scripts/aggregate_generated_bindings.py ---- a/third_party/blink/renderer/bindings/scripts/aggregate_generated_bindings.py -+++ b/third_party/blink/renderer/bindings/scripts/aggregate_generated_bindings.py -@@ -43,7 +43,7 @@ Usage: - IDL_FILES_LIST is a text file containing the IDL file paths - OUTPUT_FILE is the filename of output file. - -- Design doc: http://www.chromium.org/developers/design-documents/idl-build -+ Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build - """ - - from __future__ import print_function diff --git a/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py b/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py --- a/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py +++ b/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py @@ -30183,135 +30269,6 @@ diff --git a/third_party/blink/renderer/bindings/scripts/blink_idl_parser.py b/t """ # Disable check for line length and Member as Function due to how grammar rules -diff --git a/third_party/blink/renderer/bindings/scripts/code_generator_v8.py b/third_party/blink/renderer/bindings/scripts/code_generator_v8.py ---- a/third_party/blink/renderer/bindings/scripts/code_generator_v8.py -+++ b/third_party/blink/renderer/bindings/scripts/code_generator_v8.py -@@ -41,7 +41,7 @@ cache *reading* is safe. - Input: An object of class IdlDefinitions, containing an IDL interface X - Output: V8X.h and V8X.cpp - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - import os -diff --git a/third_party/blink/renderer/bindings/scripts/compute_global_objects.py b/third_party/blink/renderer/bindings/scripts/compute_global_objects.py ---- a/third_party/blink/renderer/bindings/scripts/compute_global_objects.py -+++ b/third_party/blink/renderer/bindings/scripts/compute_global_objects.py -@@ -8,7 +8,7 @@ - Global objects are defined by interfaces with [Global] on - their definition: http://heycam.github.io/webidl/#Global - --Design document: http://www.chromium.org/developers/design-documents/idl-build -+Design document: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build - """ - - # pylint: disable=relative-import -diff --git a/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_individual.py b/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_individual.py ---- a/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_individual.py -+++ b/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_individual.py -@@ -37,7 +37,7 @@ This distinction is so that individual interface info can be computed - separately for each component (avoiding duplicated reading of individual - files), then consolidated using *only* the info visible to a given component. - --Design doc: http://www.chromium.org/developers/design-documents/idl-build -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build - """ - - from collections import defaultdict -diff --git a/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_overall.py b/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_overall.py ---- a/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_overall.py -+++ b/third_party/blink/renderer/bindings/scripts/compute_interfaces_info_overall.py -@@ -77,7 +77,7 @@ Note that all of these are stable information, unlikely to change without - moving or deleting files (hence requiring a full rebuild anyway) or significant - code changes (for inherited extended attributes). - --Design doc: http://www.chromium.org/developers/design-documents/idl-build -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build - """ - - # pylint: disable=relative-import -diff --git a/third_party/blink/renderer/bindings/scripts/generate_global_constructors.py b/third_party/blink/renderer/bindings/scripts/generate_global_constructors.py ---- a/third_party/blink/renderer/bindings/scripts/generate_global_constructors.py -+++ b/third_party/blink/renderer/bindings/scripts/generate_global_constructors.py -@@ -13,7 +13,7 @@ For reference on global objects, see: - http://heycam.github.io/webidl/#Global - http://heycam.github.io/webidl/#Exposed - --Design document: http://www.chromium.org/developers/design-documents/idl-build -+Design document: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build - """ - - # pylint: disable=relative-import -diff --git a/third_party/blink/renderer/bindings/scripts/idl_compiler.py b/third_party/blink/renderer/bindings/scripts/idl_compiler.py ---- a/third_party/blink/renderer/bindings/scripts/idl_compiler.py -+++ b/third_party/blink/renderer/bindings/scripts/idl_compiler.py -@@ -28,7 +28,7 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - """Compile an .idl file to Blink V8 bindings (.h and .cpp files). - --Design doc: https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/bindings/IDLCompiler.md -+Design doc: https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/third_party/blink/renderer/bindings/IDLCompiler.md - """ - - import abc -diff --git a/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/third_party/blink/renderer/bindings/scripts/idl_definitions.py ---- a/third_party/blink/renderer/bindings/scripts/idl_definitions.py -+++ b/third_party/blink/renderer/bindings/scripts/idl_definitions.py -@@ -57,7 +57,7 @@ TypedObject :: Object with one or more attributes that is a type. - - IdlArgument is 'picklable', as it is stored in interfaces_info. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - import abc -diff --git a/third_party/blink/renderer/bindings/scripts/idl_reader.py b/third_party/blink/renderer/bindings/scripts/idl_reader.py ---- a/third_party/blink/renderer/bindings/scripts/idl_reader.py -+++ b/third_party/blink/renderer/bindings/scripts/idl_reader.py -@@ -28,7 +28,7 @@ - """Read an IDL file or complete IDL interface, producing an IdlDefinitions object. - - Design doc: --http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Front-end -+http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler#TOC-Front-end - """ - - import os -@@ -138,7 +138,7 @@ IDL ATTRIBUTE ERROR in file: - If you want to add a new IDL extended attribute, please add it to: - %s - and add an explanation to the Blink IDL documentation at: -- http://www.chromium.org/blink/webidl/blink-idl-extended-attributes -+ http://www.ch40m1um.qjz9zk/blink/webidl/blink-idl-extended-attributes - """ % (idl_filename, str(error), EXTENDED_ATTRIBUTES_RELATIVE_PATH)) - - return definitions -diff --git a/third_party/blink/renderer/bindings/scripts/idl_validator.py b/third_party/blink/renderer/bindings/scripts/idl_validator.py ---- a/third_party/blink/renderer/bindings/scripts/idl_validator.py -+++ b/third_party/blink/renderer/bindings/scripts/idl_validator.py -@@ -27,7 +27,7 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - """Validate extended attributes. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Extended-attribute-validation -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler#TOC-Extended-attribute-validation - """ - - import os.path -diff --git a/third_party/blink/renderer/bindings/scripts/interface_dependency_resolver.py b/third_party/blink/renderer/bindings/scripts/interface_dependency_resolver.py ---- a/third_party/blink/renderer/bindings/scripts/interface_dependency_resolver.py -+++ b/third_party/blink/renderer/bindings/scripts/interface_dependency_resolver.py -@@ -32,7 +32,7 @@ includes), reads the dependency files, and merges them to the IdlDefinitions - for the main IDL file, producing an IdlDefinitions object representing the - entire interface. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Dependency-resolution -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler#TOC-Dependency-resolution - """ - - import os.path diff --git a/third_party/blink/renderer/bindings/scripts/utilities.py b/third_party/blink/renderer/bindings/scripts/utilities.py --- a/third_party/blink/renderer/bindings/scripts/utilities.py +++ b/third_party/blink/renderer/bindings/scripts/utilities.py @@ -30323,90 +30280,6 @@ diff --git a/third_party/blink/renderer/bindings/scripts/utilities.py b/third_pa +Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-build """ - import os -diff --git a/third_party/blink/renderer/bindings/scripts/v8_attributes.py b/third_party/blink/renderer/bindings/scripts/v8_attributes.py ---- a/third_party/blink/renderer/bindings/scripts/v8_attributes.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_attributes.py -@@ -31,7 +31,7 @@ - - Extends IdlType with property |constructor_type_name|. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - import os -diff --git a/third_party/blink/renderer/bindings/scripts/v8_callback_function.py b/third_party/blink/renderer/bindings/scripts/v8_callback_function.py ---- a/third_party/blink/renderer/bindings/scripts/v8_callback_function.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_callback_function.py -@@ -3,7 +3,7 @@ - # found in the LICENSE file. - """Generate template values for a callback function. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - from v8_globals import includes -diff --git a/third_party/blink/renderer/bindings/scripts/v8_callback_interface.py b/third_party/blink/renderer/bindings/scripts/v8_callback_interface.py ---- a/third_party/blink/renderer/bindings/scripts/v8_callback_interface.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_callback_interface.py -@@ -27,7 +27,7 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - """Generate template values for a callback interface. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - from idl_types import IdlTypeBase -diff --git a/third_party/blink/renderer/bindings/scripts/v8_interface.py b/third_party/blink/renderer/bindings/scripts/v8_interface.py ---- a/third_party/blink/renderer/bindings/scripts/v8_interface.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_interface.py -@@ -30,7 +30,7 @@ - # pylint: disable=relative-import - """Generate template values for an interface. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - import os - import sys -diff --git a/third_party/blink/renderer/bindings/scripts/v8_methods.py b/third_party/blink/renderer/bindings/scripts/v8_methods.py ---- a/third_party/blink/renderer/bindings/scripts/v8_methods.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_methods.py -@@ -30,7 +30,7 @@ - Extends IdlArgument with property |default_cpp_value|. - Extends IdlTypeBase and IdlUnionType with property |union_arguments|. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - import os -diff --git a/third_party/blink/renderer/bindings/scripts/v8_types.py b/third_party/blink/renderer/bindings/scripts/v8_types.py ---- a/third_party/blink/renderer/bindings/scripts/v8_types.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_types.py -@@ -35,7 +35,7 @@ class methods. - Spec: - http://www.w3.org/TR/WebIDL/#es-type-mapping - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - - import posixpath -diff --git a/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/third_party/blink/renderer/bindings/scripts/v8_utilities.py ---- a/third_party/blink/renderer/bindings/scripts/v8_utilities.py -+++ b/third_party/blink/renderer/bindings/scripts/v8_utilities.py -@@ -27,7 +27,7 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - """Functions shared by various parts of the code generator. - --Design doc: http://www.chromium.org/developers/design-documents/idl-compiler -+Design doc: http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler - """ - import os diff --git a/third_party/blink/renderer/build/scripts/update_css_ranking.py b/third_party/blink/renderer/build/scripts/update_css_ranking.py --- a/third_party/blink/renderer/build/scripts/update_css_ranking.py @@ -30444,7 +30317,7 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -402,7 +402,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -365,7 +365,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Registering mousewheel event as passive due to " "smoothscroll.js usage. The smoothscroll.js library is " "buggy, no longer necessary and degrades performance. See " @@ -30453,7 +30326,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ } return; } -@@ -432,7 +432,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -379,7 +379,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Added non-passive event listener to a scroll-blocking '%s' event. " "Consider marking event handler as 'passive' to make the page more " "responsive. See " @@ -30685,10 +30558,10 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "(January, 2019). Dropping support for Plan B is targeted for " - "M93. See https://www.chromestatus.com/feature/5823036655665152 " + "M93. See https://www.ch40mestatus.qjz9zk/feature/5823036655665152 " - "for more details."}; - - case WebFeature::kRTCPeerConnectionSdpSemanticsPlanBWithReverseOriginTrial: -@@ -606,7 +606,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { + "for more details, including the possibility of registering for " + "a Deprecation Trial in order to extend the Plan B deprecation " + "deadline for a limited amount of time."}; +@@ -608,7 +608,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "leakage. To mitigate these risks, Chrome deprecates requests to " "non-public subresources when initiated from non-secure " "contexts, and will start blocking them in Chrome 92 (July " @@ -30700,7 +30573,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1914,7 +1914,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1706,7 +1706,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 " @@ -30709,7 +30582,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } return false; } -@@ -2015,7 +2015,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1807,7 +1807,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 " @@ -30721,7 +30594,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 -@@ -262,7 +262,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -263,7 +263,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "