From e5771ef891cf01dd5aeaaec5e092841929a9a541 Mon Sep 17 00:00:00 2001 From: zhmars <18466397+zhmars@users.noreply.github.com> Date: Tue, 20 Jul 2021 23:42:41 +0800 Subject: [PATCH 1/3] Update zh_CN translations (#1282) --- build/patches/Update-i18n-zh_CN-support.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index 42b5c608..5b8d591c 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -4,10 +4,10 @@ Subject: Update i18n zh_CN support --- .../resources/generated_resources_zh-CN.xtb | 4 ++- - .../android_chrome_strings_zh-CN.xtb | 33 ++++++++++++++++++- - .../translations/browser_ui_strings_zh-CN.xtb | 15 ++++++++- + .../android_chrome_strings_zh-CN.xtb | 35 ++++++++++++++++++- + .../translations/browser_ui_strings_zh-CN.xtb | 15 +++++++- .../strings/components_strings_zh-CN.xtb | 5 ++- - 4 files changed, 53 insertions(+), 4 deletions(-) + 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb --- a/chrome/app/resources/generated_resources_zh-CN.xtb @@ -24,21 +24,23 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1264,4 +1264,35 @@ +@@ -1264,4 +1264,37 @@ 关闭所有标签页 常规 动态卡片上的菜单已关闭 - \ No newline at end of file +关于 Bromite ++禁用 JIT ++以牺牲性能（避免将 JavaScript 编译成 native code）为代价提高安全性（需要重启浏览器） +用户代理 -+自定义用户代理 ++用户代理 +通过菜单切换当前行为 +应用到所有标签页（粘滞模式） +仅应用到当前标签页 +自定义 +默认 -+输入自定义用户代理 ++输入用户代理 +移动版网站 +桌面版网站 +启用 Viewport 元标签解析 @@ -49,7 +51,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin +当您点击新标签页或链接时，在无痕式标签页打开链接 +退出时关闭所有打开的标签页 +浏览会话期间不保存标签页 -+广告拦截设置 ++广告拦截 +编辑过滤规则地址 +过滤规则地址 +访问帮助页面 From 2251acbca8218619186c410d91f95b553be989d5 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 23 Jul 2021 12:50:01 +0200 Subject: [PATCH 2/3] Release 92.0.4515.103 --- CHANGELOG.md | 5 + README.md | 2 +- build/RELEASE | 2 +- build/bromite_patches_list.txt | 9 +- build/chromium_patches_list.txt | 1 + .../AImageReader-CFI-crash-mitigations.patch | 32 +- build/patches/AV1-codec-support.patch | 24 +- .../Add-AllowUserCertificates-flag.patch | 42 +- .../Add-IsCleartextPermitted-flag.patch | 8 +- ...-allow-screenshots-in-Incognito-mode.patch | 12 +- .../Add-a-proxy-configuration-page.patch | 48 +- .../Add-an-always-incognito-mode.patch | 70 +- .../Add-bookmark-import-export-actions.patch | 150 +- ...dd-custom-tab-intents-privacy-option.patch | 12 +- build/patches/Add-exit-menu-item.patch | 24 +- ...g-for-omnibox-autocomplete-filtering.patch | 4 +- .../Add-flag-for-save-data-header.patch | 6 +- ...nfigure-maximum-connections-per-host.patch | 10 +- ...ontrol-video-playback-resume-feature.patch | 12 +- .../Add-flag-to-disable-IPv6-probes.patch | 12 +- build/patches/Add-flag-to-disable-WebGL.patch | 18 +- ...-to-disable-external-intent-requests.patch | 6 +- ...dd-history-support-in-incognito-mode.patch | 30 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 84 +- .../Add-menu-item-to-view-source.patch | 25 +- .../Add-option-to-force-tablet-UI.patch | 25 +- ...-to-not-persist-tabs-across-sessions.patch | 12 +- ...-support-for-ISupportHelpAndFeedback.patch | 2 +- build/patches/Add-vibration-flag.patch | 22 +- .../Allow-playing-audio-in-background.patch | 6 +- ...site-sign-in-without-account-sign-in.patch | 2 +- ...c-dns-flag-regardless-of-SDK-version.patch | 2 +- ...e-new-tab-page-for-default-home-page.patch | 2 +- .../Automated-domain-substitution.patch | 4209 ++++++++++------- ...Block-gateway-attacks-via-websockets.patch | 20 +- .../Block-qjz9zk-or-trk-requests.patch | 26 +- .../Bromite-AdBlockUpdaterService.patch | 118 +- ...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 | 2 +- ...sts-for-single-word-Omnibar-searches.patch | 4 +- ...rrentBrowsingContextMedia-by-default.patch | 2 +- build/patches/Disable-UA-client-hint.patch | 23 + build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-feeds-support-by-default.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 2 +- ...media-router-and-remoting-by-default.patch | 12 +- ...ble-metrics-collection-for-NTP-tiles.patch | 12 +- .../Disable-metrics-on-all-I-O-threads.patch | 2 +- ...-home-to-be-opened-in-CCT-by-default.patch | 2 +- ...-omission-of-URL-elements-in-Omnibox.patch | 2 +- .../patches/Disable-plugins-enumeration.patch | 2 +- build/patches/Disable-safe-browsing.patch | 421 +- .../Disable-seed-based-field-trials.patch | 4 +- .../Disable-smart-selection-by-default.patch | 28 +- ...isable-some-signed-exchange-features.patch | 4 +- .../Disable-text-fragments-by-default.patch | 30 +- ...sable-third-party-cookies-by-default.patch | 2 +- .../Disable-unified-autoplay-feature.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 19 +- ...tifications-to-default-search-engine.patch | 8 +- .../Do-not-hide-component-extensions.patch | 2 +- ...ore-download-location-prompt-setting.patch | 24 +- .../Do-not-store-passwords-by-default.patch | 2 +- .../patches/DoH-secure-mode-by-default.patch | 2 +- ...nalFormRedirectsNoGesture-by-default.patch | 14 +- ...-SPPI-for-devices-with-enough-memory.patch | 4 +- ...e-darken-websites-checkbox-in-themes.patch | 4 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 4 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 18 +- build/patches/JIT-less-toggle.patch | 6 +- build/patches/Logcat-crash-reports-UI.patch | 2 +- .../patches/Modify-default-preferences.patch | 71 +- ...nt-settings-back-to-privacy-settings.patch | 24 +- .../Multiple-fingerprinting-mitigations.patch | 70 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../Open-YouTube-links-in-Bromite.patch | 15 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 14 +- build/patches/Remove-SMS-integration.patch | 21 +- .../Remove-binary-blob-integrations.patch | 294 +- ...cklisted-URLs-upon-bookmark-creation.patch | 10 +- build/patches/Remove-help-menu-item.patch | 6 +- ...-offline-measurement-background-task.patch | 2 +- ...e-signin-and-data-saver-integrations.patch | 579 +-- ...ce-DoH-probe-domain-with-RIPE-domain.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 44 +- .../Restore-Simplified-NTP-launch.patch | 28 +- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...vert-flags-remove-num-raster-threads.patch | 24 +- ...moval-of-an-option-to-block-autoplay.patch | 30 +- ...tings-for-cookies-javascript-and-ads.patch | 8 +- .../Skip-the-first-run-and-metrics.patch | 11 +- .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Timezone-customization.patch | 34 +- build/patches/Unexpire-tab-groups-flags.patch | 4 +- build/patches/Update-i18n-zh_CN-support.patch | 8 +- .../Use-4-tile-rows-never-show-logo.patch | 2 +- build/patches/User-agent-customization.patch | 155 +- ...n-to-play-protected-media-by-default.patch | 32 +- ...ll-disable-autofill-download-manager.patch | 23 +- ...sable-warning-about-missing-API-keys.patch | 8 +- ...build-remove-calling-untrusted-hooks.patch | 58 +- build/patches/disable-AdsBlockedInfoBar.patch | 52 +- .../disable-WebView-variations-support.patch | 4 +- ...fill-server-communication-by-default.patch | 2 +- .../disable-background-sync-by-default.patch | 2 +- ...disable-browser-autologin-by-default.patch | 2 +- ...nsors-access-site-setting-by-default.patch | 2 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- build/patches/kill-Auth.patch | 51 +- .../kill-Location-fall-back-to-system.patch | 2 +- .../kill-TOS-and-metrics-opt-out.patch | 28 +- build/patches/kill-Vision.patch | 2 +- ...rce-text-x-suse-ymp-to-be-downloaded.patch | 24 + ...nH264-enable-ARM-ARM64-optimizations.patch | 2 +- ...efs-disable-signinallowed-by-default.patch | 2 +- ...romium-Disable-Google-host-detection.patch | 39 +- ...-chromium-Disable-domain-reliability.patch | 680 +-- ...gled-chromium-Disable-profile-avatar.patch | 6 +- ...romium-Disable-translate-integration.patch | 20 +- ...ed-chromium-Disable-untraceable-URLs.patch | 6 +- 123 files changed, 4216 insertions(+), 4110 deletions(-) create mode 100644 build/patches/DCScan-Fix-builds-with-system-sysroots.patch create mode 100644 build/patches/Disable-UA-client-hint.patch create mode 100644 build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 258adbe8..450b4e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 92.0.4515.103 +* disable User Agent client hints +* fix builds with system sysroots +* force text/x-suse-ymp to be downloaded + # 91.0.4472.158 * added x64 releases diff --git a/README.md b/README.md index e1f75140..0525e677 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ New flags: * `#save-data-header`, disabled by default * `#export-bookmarks-use-saf`, disabled by default * `#allow-user-certificates`, disabled by default -* `#cleartext-permitted`, enabled by default +* `#cleartext-permitted`, enabled by default, can be used to disable all cleartext-HTTP traffic * `#omnibox-autocomplete-filtering`, can be used to restrict omnibox autocomplete results * `#disable-external-intent-requests` diff --git a/build/RELEASE b/build/RELEASE index 871326fe..10deef23 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -91.0.4472.158 +92.0.4515.103 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 1a3c6ae8..5e889ea6 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -1,4 +1,8 @@ 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 @@ -36,10 +40,7 @@ Disable-update-scheduler.patch Add-English-only-search-engine.patch Add-DuckDuckGo-Lite-search-engine.patch openH264-enable-ARM-ARM64-optimizations.patch -Switch-to-fstack-protector-strong.patch -Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch build-remove-calling-untrusted-hooks.patch -AV1-codec-support.patch Inject-scripts-for-AMP-tracking-ads-and-video.patch Allow-playing-audio-in-background.patch Add-flag-to-control-video-playback-resume-feature.patch @@ -155,4 +156,6 @@ Add-support-for-ISupportHelpAndFeedback.patch JIT-less-toggle.patch API-level-21-prevent-crash-on-download.patch Add-vibration-flag.patch +mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +Disable-UA-client-hint.patch Automated-domain-substitution.patch diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index e24c8063..8604f65d 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -1,4 +1,5 @@ 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 9ad3fe70..f22a7ea3 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -82,11 +82,11 @@ 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 -@@ -1940,7 +1940,7 @@ +@@ -1922,7 +1922,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], -- "expiry_milestone": 90 +- "expiry_milestone": 95 + "expiry_milestone": -1 }, { @@ -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 -@@ -3206,6 +3206,22 @@ +@@ -3188,6 +3188,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 -@@ -49,6 +49,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { +@@ -50,6 +50,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { } // namespace #if defined(OS_ANDROID) @@ -146,7 +146,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -112,6 +112,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -114,6 +114,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !defined(OS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -156,7 +156,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -317,6 +320,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -319,6 +322,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = kGpuFeatureStatusBlocklisted; } @@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt --- a/gpu/config/gpu_workaround_list.txt +++ b/gpu/config/gpu_workaround_list.txt -@@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap +@@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush disable_accelerated_av1_decode @@ -182,7 +182,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -502,6 +502,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -503,6 +503,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } @@ -226,27 +226,27 @@ 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", + // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled. const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; - +// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD) +const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput", + base::FEATURE_ENABLED_BY_DEFAULT}; + - // Prevents using SurfaceLayer for videos. This is meant to be used by embedders - // that cannot support SurfaceLayer at the moment. - const base::Feature kDisableSurfaceLayerForVideo{ + + // Enable picture in picture web api for android. + const base::Feature kPictureInPictureAPI{"PictureInPictureAPI", 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 kMediaControlsExpandGesture; +@@ -205,6 +205,7 @@ MEDIA_EXPORT extern const base::Feature kVp9kSVCHWDecoding; + MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays; + MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; ++MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; -+MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput; - MEDIA_EXPORT extern const base::Feature kDisableSurfaceLayerForVideo; MEDIA_EXPORT extern const base::Feature kCanPlayHls; - MEDIA_EXPORT extern const base::Feature kPictureInPictureAPI; -- 2.17.1 diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 2de62aef..6796e294 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -69,7 +69,7 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm -@@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -81,7 +81,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -93,7 +93,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a 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 -@@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -105,7 +105,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -117,7 +117,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h 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 -@@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -129,7 +129,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -141,7 +141,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th 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 -@@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -153,7 +153,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -165,7 +165,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ 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 -@@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -177,7 +177,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -189,7 +189,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h 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 -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ %define CONFIG_OPTICAL_FLOW_API 0 %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -201,7 +201,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ 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 -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index f7600229..142764f4 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 -@@ -209,6 +209,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -211,6 +211,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; -@@ -877,6 +878,8 @@ public abstract class ChromeActivity +@@ -879,6 +880,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -43,13 +43,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom // clang-format off List featuresToCache = Arrays.asList( + ChromeFeatureList.ALLOW_USER_CERTIFICATES, - ChromeFeatureList.ADAPTIVE_BUTTON_IN_TOP_TOOLBAR, - ChromeFeatureList.ANDROID_MANAGED_BY_MENU_ITEM, ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, + ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, + ChromeFeatureList.APP_TO_WEB_ATTRIBUTION, 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 -@@ -2743,6 +2743,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2805,6 +2805,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) @@ -91,17 +91,17 @@ 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* kFeaturesExposedToJava[] = { - &feed::kWebFeed, - &feed::kXsurfaceMetricsReporting, - &history::kHideFromApi3Transitions, +@@ -127,6 +127,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &feed::kInterestFeedContentSuggestions, + &feed::kInterestFeedNoticeCardAutoDismiss, + &feed::kInterestFeedSpinnerAlwaysAnimate, + &kAllowUserCertificates, - &kAddToHomescreenIPH, - &kAllowNewIncognitoTabIntents, - &kAllowRemoteContextForNotifications, -@@ -334,6 +335,9 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { - - // Alphabetical: + &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, + &feed::kInterestFeedV2, + &feed::kInterestFeedV2Autoplay, +@@ -350,6 +351,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomization{ + "AdaptiveButtonInTopToolbarCustomization", + base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kAllowUserCertificates = { + "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -118,8 +118,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser +extern const base::Feature kAllowUserCertificates; // Alphabetical: - extern const base::Feature kAddToHomescreenIPH; - extern const base::Feature kAllowNewIncognitoTabIntents; + extern const base::Feature kAdaptiveButtonInTopToolbar; + extern const base::Feature kAdaptiveButtonInTopToolbarCustomization; 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 @@ -128,9 +128,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f private static Map sDefaults = new HashMap() { { + put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false); - put(ChromeFeatureList.ADAPTIVE_BUTTON_IN_TOP_TOOLBAR, false); - put(ChromeFeatureList.ANDROID_MANAGED_BY_MENU_ITEM, true); put(ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, true); + put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false); + put(ChromeFeatureList.CHROME_STARTUP_DELEGATE, 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 @@ -140,8 +140,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; - public static final String ADD_TO_HOMESCREEN_IPH = "AddToHomescreenIPH"; - public static final String ALLOW_NEW_INCOGNITO_TAB_INTENTS = "AllowNewIncognitoTabIntents"; + public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION = + "AdaptiveButtonInTopToolbarCustomization"; diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 7178db04..e9fe04bc 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 -@@ -7358,6 +7358,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7444,6 +7444,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( chrome::android::kBookmarksExportUseSaf)}, @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1384,6 +1384,10 @@ const char kHostedAppShimCreationName[] = +@@ -1404,6 +1404,10 @@ const char kHostedAppShimCreationName[] = const char kHostedAppShimCreationDescription[] = "Create app shims on Mac when creating a hosted app."; @@ -43,7 +43,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -814,6 +814,9 @@ extern const char kHostedAppQuitNotificationDescription[]; +@@ -825,6 +825,9 @@ extern const char kHostedAppQuitNotificationDescription[]; extern const char kHostedAppShimCreationName[]; extern const char kHostedAppShimCreationDescription[]; @@ -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 -@@ -201,6 +201,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -211,6 +211,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 abb31ac8..57cb7b3e 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 -@@ -3099,6 +3099,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3174,6 +3174,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 -@@ -611,6 +611,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = +@@ -605,6 +605,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 -@@ -372,6 +372,9 @@ extern const char kEnableAutofillAddressSavePromptDescription[]; +@@ -371,6 +371,9 @@ extern const char kEnableAutofillAddressSavePromptDescription[]; extern const char kEnableAutofillCreditCardAblationExperimentDisplayName[]; extern const char kEnableAutofillCreditCardAblationExperimentDescription[]; @@ -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 -@@ -335,6 +335,9 @@ const char kHomePage[] = "homepage"; +@@ -340,6 +340,9 @@ const char kHomePage[] = "homepage"; // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; @@ -88,8 +88,8 @@ 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 -@@ -113,6 +113,7 @@ extern const char kForceFirstRun[]; - extern const char kForceStackedTabStripLayout[]; +@@ -114,6 +114,7 @@ extern const char kForceStackedTabStripLayout[]; + extern const char kHideCrashRestoreBubble[]; extern const char kHomePage[]; extern const char kIncognito[]; +extern const char kEnableIncognitoSnapshotsInAndroidRecents[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 04b01157..a9c61d7f 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -19,8 +19,8 @@ for SimpleURLLoaders as well. chrome/browser/prefs/browser_prefs.cc | 4 + .../prefs/chrome_command_line_pref_store.cc | 2 +- chrome/browser/resources/proxy_config.css | 61 +++ - chrome/browser/resources/proxy_config.html | 80 ++++ - chrome/browser/resources/proxy_config.js | 263 +++++++++++ + chrome/browser/resources/proxy_config.html | 79 ++++ + 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 ++++++++++++++++++ @@ -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, 994 insertions(+), 14 deletions(-) + 24 files changed, 996 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 @@ -70,7 +70,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -53,6 +53,7 @@ public class PrivacySettings +@@ -52,6 +52,7 @@ public class PrivacySettings private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; @@ -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 -@@ -350,6 +350,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -364,6 +364,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -93,8 +93,8 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -88,6 +88,12 @@ - +@@ -101,6 +101,12 @@ + + @@ -104,8 +104,8 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou + + - - + + diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -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 -@@ -155,6 +155,8 @@ +@@ -158,6 +158,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 -@@ -744,6 +746,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -786,6 +788,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { PluginsResourceService::RegisterPrefs(registry); #endif @@ -273,7 +273,7 @@ diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resourc new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/proxy_config.html -@@ -0,0 +1,80 @@ +@@ -0,0 +1,79 @@ + + + @@ -289,8 +289,7 @@ new file mode 100644 + + + -+ -+ ++ + + +Proxy configuration @@ -358,7 +357,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/proxy_config.js -@@ -0,0 +1,263 @@ +@@ -0,0 +1,266 @@ +/* + This file is part of Bromite. + @@ -376,6 +375,8 @@ new file mode 100644 + along with Bromite. If not, see . +*/ + ++import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; ++ +/** + * Main entry point called once the page has loaded. + */ @@ -433,7 +434,8 @@ new file mode 100644 + chrome.send('enableNotifyUIWithState'); + } + -+ cr.addSingletonGetter(ProxyConfigView); ++ addSingletonGetter(ProxyConfigView); ++ window.ProxyConfigView = ProxyConfigView; + + ProxyConfigView.prototype = { + /** @@ -625,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 -@@ -255,6 +255,8 @@ static_library("ui") { +@@ -256,6 +256,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -637,7 +639,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -51,6 +51,7 @@ +@@ -52,6 +52,7 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy/policy_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" @@ -645,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" -@@ -573,6 +574,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -600,6 +601,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1117,7 +1119,7 @@ new file mode 100644 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -33,6 +33,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -34,6 +34,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -1126,7 +1128,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -335,6 +337,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -336,6 +338,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1134,7 +1136,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -551,6 +554,7 @@ const char* const kChromeHostURLs[] = { +@@ -553,6 +556,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1157,7 +1159,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 -@@ -200,7 +200,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, +@@ -197,7 +197,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 ff22c963..0ba82308 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -13,7 +13,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c .../chrome/browser/ChromeTabbedActivity.java | 6 +- .../chrome/browser/app/ChromeActivity.java | 4 + .../AppMenuPropertiesDelegateImpl.java | 6 ++ - .../ChromeContextMenuPopulator.java | 9 ++- + .../ChromeContextMenuPopulator.java | 8 +- .../CustomTabActivityLifecycleUmaTracker.java | 25 ------ .../CustomTabIntentDataProvider.java | 5 +- .../browser/init/StartupTabPreloader.java | 14 +++- @@ -23,7 +23,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c .../webapps/WebappIntentDataProvider.java | 14 ++++ .../flags/android/chrome_feature_list.cc | 2 +- .../strings/android_chrome_strings.grd | 7 ++ - 16 files changed, 171 insertions(+), 34 deletions(-) + 16 files changed, 170 insertions(+), 34 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni @@ -36,7 +36,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java + "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java", "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", - "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java", + "java/src/org/chromium/chrome/browser/ActivityUtils.java", diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -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 -@@ -57,6 +57,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; +@@ -58,6 +58,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,7 +148,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1695,8 +1696,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1766,6 +1767,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -359,6 +359,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -363,6 +363,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -196,21 +196,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App + // We have to iterate all menu items since same menu item ID may be associated with more // than one menu items. - boolean isMenuGroupTabsVisible = TabUiFeatureUtilities.isTabGroupsAndroidEnabled() + boolean isMenuGroupTabsVisible = TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -30,7 +30,9 @@ import org.chromium.base.Callback; - import org.chromium.base.ContextUtils; +@@ -31,6 +31,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.supplier.Supplier; -+import org.chromium.base.ContextUtils; 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; - import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator.ContextMenuUma.Action; -@@ -336,6 +338,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -408,6 +409,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -221,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -354,6 +360,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -426,6 +431,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -229,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)); } -@@ -376,7 +383,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -450,7 +456,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -308,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, Destroyable +@@ -195,10 +198,15 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse Intent intent = mIntentSupplier.get(); GURL url = UrlFormatter.fixupUrl(getUrlFromIntent(intent)); @@ -326,7 +324,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab mLoadUrlParams = new LoadUrlParams(url.getValidSpecOrEmpty()); String referrer = IntentHandler.getReferrerUrlIncludingExtraHeaders(intent); -@@ -212,7 +220,7 @@ public class StartupTabPreloader implements ProfileManager.Observer, Destroyable +@@ -212,7 +220,7 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse // 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) @@ -338,7 +336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -42,6 +42,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -41,6 +41,7 @@ import org.chromium.ui.text.SpanApplier; */ public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener { @@ -349,9 +347,9 @@ 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 -@@ -43,6 +43,10 @@ import org.chromium.ui.base.PageTransition; - import org.chromium.ui.base.WindowAndroid; - import org.chromium.url.GURL; +@@ -47,6 +47,10 @@ import org.chromium.url.GURL; + + import java.nio.ByteBuffer; +import org.chromium.base.ContextUtils; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; @@ -360,7 +358,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}. */ -@@ -71,6 +75,7 @@ public class ChromeTabCreator extends TabCreator { +@@ -77,6 +81,7 @@ public class ChromeTabCreator extends TabCreator { private final Activity mActivity; private final StartupTabPreloader mStartupTabPreloader; private final boolean mIncognito; @@ -368,7 +366,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome private WindowAndroid mNativeWindow; private TabModel mTabModel; -@@ -93,6 +98,10 @@ public class ChromeTabCreator extends TabCreator { +@@ -99,6 +104,10 @@ public class ChromeTabCreator extends TabCreator { mNativeWindow = nativeWindow; mTabDelegateFactorySupplier = tabDelegateFactory; mIncognito = incognito; @@ -379,7 +377,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mOverviewNTPCreator = overviewNTPCreator; mAsyncTabParamsManager = asyncTabParamsManager; mTabModelSelectorSupplier = tabModelSelectorSupplier; -@@ -255,6 +264,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -262,6 +271,8 @@ public class ChromeTabCreator extends TabCreator { if (creationState == TabCreationState.LIVE_IN_FOREGROUND && !openInForeground) { creationState = TabCreationState.LIVE_IN_BACKGROUND; } @@ -388,7 +386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return tab; } finally { -@@ -289,6 +300,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -296,6 +307,8 @@ public class ChromeTabCreator extends TabCreator { @TabCreationState int creationState = openInForeground ? TabCreationState.LIVE_IN_FOREGROUND : TabCreationState.LIVE_IN_BACKGROUND; @@ -397,7 +395,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return true; } -@@ -332,7 +345,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -339,7 +352,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) { @@ -405,7 +403,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName()); if (forceNewTab && !isLaunchedFromChrome) { -@@ -446,6 +458,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -453,6 +465,8 @@ public class ChromeTabCreator extends TabCreator { .setSerializedCriticalPersistedTabData(serializedCriticalPersistedTabData) .build(); } @@ -434,7 +432,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -@@ -686,6 +689,13 @@ public class TabPersistentStore { +@@ -687,6 +690,13 @@ public class TabPersistentStore { } } } @@ -451,7 +449,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 -@@ -21,6 +21,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras; +@@ -27,6 +27,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.components.browser_ui.widget.TintedDrawable; @@ -461,7 +459,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI /** * Stores info about a web app. */ -@@ -34,6 +37,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -41,6 +44,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider private final @ActivityType int mActivityType; private final Intent mIntent; @@ -470,7 +468,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI /** * Returns the toolbar color to use if a custom color is not specified by the webapp. */ -@@ -53,6 +58,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -63,6 +68,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider mWebappExtras = webappExtras; mWebApkExtras = webApkExtras; mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP; @@ -481,7 +479,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI } @Override -@@ -140,6 +149,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -155,6 +164,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider return mWebApkExtras; } @@ -496,7 +494,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 -@@ -408,7 +408,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -421,7 +421,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -508,9 +506,9 @@ 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 -@@ -893,6 +893,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -908,6 +908,13 @@ Your Google account may have other forms of browsing history like searches and a - Clears history from all signed-in devices. + 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 7e9006e2..8a19a944 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -18,13 +18,13 @@ Completely remove contacts picker permission from the file dialog .../browser/bookmarks/BookmarkManager.java | 22 ++ .../browser/bookmarks/BookmarkPage.java | 8 +- .../native_page/NativePageFactory.java | 2 +- - chrome/browser/BUILD.gn | 6 +- + chrome/browser/BUILD.gn | 11 +- chrome/browser/about_flags.cc | 6 + .../android/bookmarks/bookmark_bridge.cc | 284 ++++++++++++++++++ .../android/bookmarks/bookmark_bridge.h | 28 +- .../browser/bookmarks/bookmark_html_writer.cc | 8 +- - .../dialogs/DownloadLocationCustomView.java | 7 +- - .../DownloadLocationDialogCoordinator.java | 10 +- + .../dialogs/DownloadLocationCustomView.java | 8 +- + .../DownloadLocationDialogCoordinator.java | 8 +- chrome/browser/flag_descriptions.cc | 5 + chrome/browser/flag_descriptions.h | 3 + .../flags/android/chrome_feature_list.cc | 5 + @@ -43,7 +43,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, 876 insertions(+), 23 deletions(-) + 37 files changed, 880 insertions(+), 23 deletions(-) diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc @@ -131,10 +131,10 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -38,7 +38,6 @@ by a child template that "extends" this file. - {% endif %} - +@@ -56,7 +56,6 @@ by a child template that "extends" this file. + {% endif %} + - @@ -696,7 +696,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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 -@@ -100,7 +100,7 @@ public class NativePageFactory { +@@ -101,7 +101,7 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { return new BookmarkPage(mActivity.getComponentName(), mActivity.getSnackbarManager(), mActivity.getTabModelSelector().isIncognitoSelected(), @@ -708,16 +708,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1823,6 +1823,8 @@ static_library("browser") { - "webapps/chrome_webapps_client.h", - "window_placement/window_placement_permission_context.cc", +@@ -1839,6 +1839,13 @@ static_library("browser") { "window_placement/window_placement_permission_context.h", -+ "importer/profile_writer.cc", -+ "importer/profile_writer.h", ] ++ if (is_android) { ++ sources += [ ++ "importer/profile_writer.cc", ++ "importer/profile_writer.h", ++ ] ++ } ++ configs += [ -@@ -2914,6 +2916,8 @@ static_library("browser") { + "//build/config/compiler:wexit_time_destructors", + "//build/config:precompiled_headers", +@@ -2938,6 +2945,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", @@ -726,7 +731,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", -@@ -3415,8 +3419,6 @@ static_library("browser") { +@@ -3451,8 +3460,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -738,9 +743,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 -@@ -7308,6 +7308,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kDesktopPWAsAppIconShortcutsMenuUI)}, - #endif +@@ -7394,6 +7394,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kPlaybackSpeedButtonDescription, kOsAll, + FEATURE_VALUE_TYPE(media::kPlaybackSpeedButton)}, + {"export-bookmarks-use-saf", + flag_descriptions::kBookmarksExportUseSafName, @@ -754,7 +759,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc --- a/chrome/browser/android/bookmarks/bookmark_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc -@@ -38,6 +38,7 @@ +@@ -39,6 +39,7 @@ #include "components/bookmarks/common/android/bookmark_type.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" @@ -762,7 +767,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse #include "components/dom_distiller/core/url_utils.h" #include "components/prefs/pref_service.h" #include "components/query_parser/query_parser.h" -@@ -47,6 +48,24 @@ +@@ -48,6 +49,24 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -787,7 +792,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF16ToJavaString; -@@ -63,8 +82,93 @@ using bookmarks::BookmarkNode; +@@ -64,8 +83,93 @@ using bookmarks::BookmarkNode; using bookmarks::BookmarkType; using content::BrowserThread; @@ -881,7 +886,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse const int kInvalidId = -1; class BookmarkTitleComparer { -@@ -149,6 +253,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -152,6 +256,10 @@ BookmarkBridge::~BookmarkBridge() { if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this); @@ -892,7 +897,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -539,6 +647,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -542,6 +650,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -912,7 +917,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse + //NOTE: extension and description are not used on Android, thus not set + ui::SelectFileDialog::FileTypeInfo file_type_info; + -+ const std::vector v_accept_types = { base::UTF8ToUTF16("text/html") }; ++ const std::vector v_accept_types = { u"text/html" }; + + // Android needs the original MIME types and an additional capture value. + std::pair, bool> accept_types = @@ -1035,7 +1040,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse + favicon_base::FaviconUsageDataList favicons; + + bookmark_html_reader::ImportBookmarksFile( -+ base::Callback(), ++ base::RepeatingCallback(), + base::BindRepeating(internal::CanImportURL), + contents, + &bookmarks, @@ -1046,7 +1051,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse + + if (!bookmarks.empty()) { + // adding bookmarks will begin extensive changes to the model -+ writer->AddBookmarksWithModel(bookmark_model_, bookmarks, base::ASCIIToUTF16("Imported")); ++ writer->AddBookmarksWithModel(bookmark_model_, bookmarks, u"Imported"); + } + if (!search_engines.empty()) { + TemplateURLService::OwnedTemplateURLVector owned_template_urls; @@ -1079,7 +1084,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser --- a/chrome/browser/android/bookmarks/bookmark_bridge.h +++ b/chrome/browser/android/bookmarks/bookmark_bridge.h @@ -17,6 +17,7 @@ - #include "base/scoped_observer.h" + #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" +#include "chrome/browser/bookmarks/bookmark_html_writer.h" @@ -1153,7 +1158,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser // This is owned by profile. @@ -332,6 +355,9 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, // Observes the profile destruction and creation. - ScopedObserver profile_observer_{this}; + base::ScopedObservation profile_observation_{this}; + const std::string FileSelectedImpl(const base::FilePath& path); + void FileSelectedImplOnUIThread(const base::FilePath& path, @@ -1189,7 +1194,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java -@@ -49,7 +49,7 @@ public class DownloadLocationCustomView +@@ -46,7 +46,7 @@ public class DownloadLocationCustomView private TextView mFileSize; private Spinner mFileLocation; private TextView mLocationAvailableSpace; @@ -1198,15 +1203,16 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse private @DownloadLocationDialogType int mDialogType; private long mTotalBytes; -@@ -71,6 +71,7 @@ public class DownloadLocationCustomView +@@ -68,7 +68,7 @@ public class DownloadLocationCustomView mDontShowAgain = findViewById(R.id.show_again_checkbox); } -+ public - void initialize(@DownloadLocationDialogType int dialogType, File suggestedPath, long totalBytes, - CharSequence title) { +- void initialize(@DownloadLocationDialogType int dialogType, long totalBytes) { ++ public void initialize(@DownloadLocationDialogType int dialogType, long totalBytes) { + // TODO(xingliu): Remove this function, currently used by smart suggestion. mDialogType = dialogType; -@@ -131,7 +132,7 @@ public class DownloadLocationCustomView + mTotalBytes = totalBytes; +@@ -117,7 +117,7 @@ public class DownloadLocationCustomView * @return The text that the user inputted as the name of the file. */ @Nullable @@ -1215,7 +1221,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse if (mFileName == null || mFileName.getText() == null) return null; return mFileName.getText().toString(); } -@@ -140,7 +141,7 @@ public class DownloadLocationCustomView +@@ -126,7 +126,7 @@ public class DownloadLocationCustomView * @return The file path based on what the user selected as the location of the file. */ @Nullable @@ -1227,25 +1233,23 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java -@@ -34,13 +34,13 @@ import java.util.ArrayList; +@@ -36,12 +36,12 @@ import java.util.ArrayList; public class DownloadLocationDialogCoordinator implements ModalDialogProperties.Controller { @NonNull private DownloadLocationDialogController mController; - private PropertyModel mDialogModel; ++ protected PropertyModel mDialogModel; + private PropertyModel mDownloadLocationDialogModel; + private PropertyModelChangeProcessor + mPropertyModelChangeProcessor; - private DownloadLocationCustomView mCustomView; - private ModalDialogManager mModalDialogManager; -+ protected PropertyModel mDialogModel; + protected DownloadLocationCustomView mCustomView; + protected ModalDialogManager mModalDialogManager; private long mTotalBytes; private @DownloadLocationDialogType int mDialogType; private String mSuggestedPath; -- private Context mContext; -+ protected Context mContext; - - /** - * Initializes the download location dialog. -@@ -119,7 +119,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. +@@ -127,7 +127,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. * Called after retrieved the download directory options. * @param dirs An list of available download directories. */ @@ -1257,7 +1261,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 -@@ -5222,6 +5222,11 @@ const char kWebrtcPipeWireCapturerDescription[] = +@@ -5223,6 +5223,11 @@ const char kWebrtcPipeWireCapturerDescription[] = "capturing the desktop content on the Wayland display server."; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1272,7 +1276,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 -@@ -3063,6 +3063,9 @@ extern const char kWebrtcPipeWireCapturerName[]; +@@ -3073,6 +3073,9 @@ extern const char kWebrtcPipeWireCapturerName[]; extern const char kWebrtcPipeWireCapturerDescription[]; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1285,7 +1289,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 -@@ -142,6 +142,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -151,6 +151,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBackgroundThreadPool, &kBentoOffline, &kBookmarkBottomSheet, @@ -1293,9 +1297,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -746,6 +747,10 @@ const base::Feature kVoiceButtonInTopToolbar{"VoiceButtonInTopToolbar", - const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", - base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -759,6 +760,10 @@ const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", + const base::Feature kWebNotesStylize{"WebNotesStylize", + base::FEATURE_DISABLED_BY_DEFAULT}; +// disabled by default because of an issue on Android 6.0 +const base::Feature kBookmarksExportUseSaf{"BookmarksExportUseSaf", @@ -1307,20 +1311,20 @@ 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 -@@ -157,6 +157,7 @@ extern const base::Feature kVoiceSearchAudioCapturePolicy; - extern const base::Feature kVoiceButtonInTopToolbar; - extern const base::Feature kVrBrowsingFeedback; - extern const base::Feature kPrefetchNotificationSchedulingIntegration; +@@ -142,6 +142,7 @@ extern const base::Feature kToolbarMicIphAndroid; + extern const base::Feature kToolbarUseHardwareBitmapDraw; + extern const base::Feature kTrustedWebActivityLocationDelegation; + extern const base::Feature kTrustedWebActivityNewDisclosure; +extern const base::Feature kBookmarksExportUseSaf; - - } // namespace android - } // namespace chrome + extern const base::Feature kTrustedWebActivityPostMessage; + extern const base::Feature kTrustedWebActivityQualityEnforcement; + extern const base::Feature kTrustedWebActivityQualityEnforcementForced; diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -500,6 +500,7 @@ public abstract class ChromeFeatureList { - public static final String WEB_AUTH_PHONE_SUPPORT = "WebAuthenticationPhoneSupport"; - public static final String WEB_FEED = "WebFeed"; +@@ -512,6 +512,7 @@ public abstract class ChromeFeatureList { + public static final String WEBNOTES_STYLIZE = "WebNotesStylize"; + public static final String WIPE_DATA_ON_CHILD_ACCOUNT_SIGNIN = "WipeDataOnChildAccountSignin"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; + public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf"; @@ -1364,15 +1368,15 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h --- a/chrome/browser/importer/profile_writer.h +++ b/chrome/browser/importer/profile_writer.h -@@ -12,6 +12,7 @@ +@@ -11,6 +11,7 @@ + #include "base/macros.h" #include "base/memory/ref_counted.h" - #include "base/time/time.h" #include "build/build_config.h" +#include "components/bookmarks/browser/bookmark_model.h" #include "components/favicon_base/favicon_usage_data.h" #include "components/history/core/browser/history_types.h" #include "components/search_engines/template_url_service.h" -@@ -69,6 +70,11 @@ class ProfileWriter : public base::RefCountedThreadSafe { +@@ -68,6 +69,11 @@ class ProfileWriter : public base::RefCountedThreadSafe { virtual void AddBookmarks(const std::vector& bookmarks, const std::u16string& top_level_folder_name); @@ -1387,7 +1391,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 -@@ -109,6 +109,8 @@ public final class ChromePreferenceKeys { +@@ -117,6 +117,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"; @@ -1396,7 +1400,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -976,6 +978,7 @@ public final class ChromePreferenceKeys { +@@ -1012,6 +1014,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1407,8 +1411,8 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -242,6 +242,24 @@ CHAR-LIMIT guidelines: - +@@ -242,6 +242,24 @@ CHAR_LIMIT guidelines: + Sites + @@ -1429,13 +1433,13 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + + Choose another file + - + Virtual Reality diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -404,6 +404,9 @@ static_library("common") { +@@ -408,6 +408,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1457,7 +1461,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", -@@ -179,6 +177,11 @@ static_library("utility") { +@@ -186,6 +184,11 @@ static_library("utility") { } } @@ -1635,7 +1639,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -792,6 +800,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -812,6 +820,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mFileTypes.size(); } @@ -1650,7 +1654,7 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st --- a/ui/android/java/strings/android_ui_strings.grd +++ b/ui/android/java/strings/android_ui_strings.grd @@ -174,6 +174,9 @@ - + Failed to open selected file + @@ -1658,11 +1662,11 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st + - + diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h -@@ -203,6 +203,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog +@@ -202,6 +202,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog void* params); bool HasMultipleFileTypeChoices(); diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index bd886f9c..f7a62d8e 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.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/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -57,6 +57,8 @@ import java.lang.annotation.Retention; +@@ -59,6 +59,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; @@ -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. -@@ -278,6 +280,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -286,6 +288,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -48,6 +48,7 @@ public class PrivacySettings +@@ -47,6 +47,7 @@ public class PrivacySettings private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; @@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private ManagedPreferenceDelegate mManagedPreferenceDelegate; -@@ -106,6 +107,10 @@ public class PrivacySettings +@@ -105,6 +106,10 @@ public class PrivacySettings } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled( (boolean) newValue); @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -129,6 +134,11 @@ public class PrivacySettings +@@ -128,6 +133,11 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -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 -@@ -4143,6 +4143,13 @@ Data from your Incognito session will only be cleared from Chrome when you <resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 020ff2ba..90abceab 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -14,7 +14,7 @@ Corrected Exit functionality diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -118,6 +118,9 @@ +@@ -121,6 +121,9 @@ android:icon="@drawable/gm_filled_cardboard_24" /> @@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -144,6 +147,9 @@ +@@ -147,6 +150,9 @@ @@ -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 -@@ -195,6 +195,8 @@ import java.lang.annotation.RetentionPolicy; +@@ -199,6 +199,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. -@@ -1900,6 +1902,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2197,6 +2198,11 @@ public abstract class ChromeActivity return true; } @@ -97,15 +97,15 @@ 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 -@@ -3022,6 +3022,9 @@ Data from your Incognito session will only be cleared from Chrome when you - Settings +@@ -3085,6 +3085,9 @@ To change this setting, <resetlink>reset sync

+ Turn on Request desktop site + + Exit + - - Close all tabs + + Appearance -- 2.17.1 diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 5b19b5de..531b961d 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -15,7 +15,7 @@ and internal chrome:// pages will be used for the autocomplete results. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -503,6 +503,22 @@ const FeatureEntry::FeatureVariation kAdaptiveButtonInTopToolbarVariations[] = { +@@ -531,6 +531,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"}}; -@@ -4769,6 +4785,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4784,6 +4800,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 45d3f47b..b866316c 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 -@@ -4482,6 +4482,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4509,6 +4509,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 -@@ -998,6 +998,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1021,6 +1021,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 -@@ -565,6 +565,9 @@ extern const char kDiagnosticsAppDescription[]; +@@ -576,6 +576,9 @@ extern const char kDiagnosticsAppDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; 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 5966fe3d..125f78bc 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 -@@ -835,6 +835,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -882,6 +882,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 == -@@ -3736,6 +3741,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3824,6 +3829,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 -@@ -1482,6 +1482,10 @@ const char kMediaHistoryDescription[] = +@@ -1516,6 +1516,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 -@@ -869,6 +869,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -886,6 +886,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; @@ -122,9 +122,9 @@ 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_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" 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 5899efd8..16ebb5cb 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 -@@ -2652,6 +2652,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2717,6 +2717,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebRtcRemoteEventLogName, flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)}, @@ -27,9 +27,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 -@@ -1069,6 +1069,11 @@ const char kEnablePciguardUiDescription[] = - "Enable toggling Pciguard settings through the Settings App. By default, " - "this flag is enabled."; +@@ -1098,6 +1098,11 @@ const char kEnablePenetratingImageSelectionDescription[] = + "Enables image options to be surfaced in the context menu for nodes " + "covered by transparent overlays."; +const char kResumeBackgroundVideoName[] = "Resume background video."; +const char kResumeBackgroundVideoDescription[] = @@ -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 -@@ -611,6 +611,9 @@ extern const char kEnablePortalsDescription[]; +@@ -628,6 +628,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -55,7 +55,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -246,11 +246,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -255,11 +255,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 23ec5428..6811e91c 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 -@@ -4741,6 +4741,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4760,6 +4760,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 -@@ -2977,6 +2977,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -3003,6 +3003,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -45,8 +45,8 @@ 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 -@@ -674,6 +674,9 @@ extern const char kEnableWasmThreadsName[]; - extern const char kEnableWasmThreadsDescription[]; +@@ -688,6 +688,9 @@ extern const char kEnableWasmSimdName[]; + extern const char kEnableWasmSimdDescription[]; extern const char kEnableWasmTieringName[]; +extern const char kIPv6ProbingName[]; @@ -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 -@@ -94,6 +94,7 @@ +@@ -95,6 +95,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" -@@ -3339,8 +3340,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3366,8 +3367,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index fd9f40d5..e5141d02 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 -@@ -2605,6 +2605,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kAccelerated2dCanvasName, - flag_descriptions::kAccelerated2dCanvasDescription, kOsAll, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, +@@ -2765,6 +2765,9 @@ const FeatureEntry kFeatureEntries[] = { + {"clear-old-browsing-data", flag_descriptions::kClearOldBrowsingDataName, + flag_descriptions::kClearOldBrowsingDataDescription, kOsAndroid, + FEATURE_VALUE_TYPE(features::kClearOldBrowsingData)}, + {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName, + flag_descriptions::kDisableWebGLDescription, kOsAll, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)}, - {"composited-layer-borders", flag_descriptions::kCompositedLayerBordersName, - flag_descriptions::kCompositedLayerBordersDescription, kOsAll, - SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)}, + #endif // OS_ANDROID + #if BUILDFLAG(ENABLE_NACL) + {"enable-nacl", flag_descriptions::kNaclName, 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 -@@ -584,6 +584,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; +@@ -583,6 +583,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,7 +38,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 -@@ -357,6 +357,9 @@ extern const char kDocumentTransitionDescription[]; +@@ -356,6 +356,9 @@ extern const char kDocumentTransitionDescription[]; extern const char kEnableAccessibilityObjectModelName[]; extern const char kEnableAccessibilityObjectModelDescription[]; 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 b1d34cb3..7360ea78 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 -@@ -2652,6 +2652,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2708,6 +2708,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 -@@ -3099,6 +3099,12 @@ const char kIntentBlockExternalFormRedirectsNoGestureDescription[] = +@@ -3119,6 +3119,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 -@@ -1804,6 +1804,9 @@ extern const char kInstantStartDescription[]; +@@ -1810,6 +1810,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 f759a8dd..b5245edc 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -31,7 +31,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -40,12 +40,15 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -39,12 +39,15 @@ import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; @@ -47,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; private static final String PREF_SECURE_DNS = "secure_dns"; -@@ -100,6 +103,11 @@ public class PrivacySettings +@@ -99,6 +102,11 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updateSummaries(); } -@@ -120,6 +128,9 @@ public class PrivacySettings +@@ -119,6 +127,9 @@ public class PrivacySettings SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue); sharedPreferencesEditor.apply(); @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -170,6 +181,13 @@ public class PrivacySettings +@@ -169,6 +180,13 @@ public class PrivacySettings (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); closeTabsOnExitPref.setOnPreferenceChangeListener(this); closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -86,17 +86,17 @@ 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 -@@ -27,6 +27,9 @@ - #if defined(OS_ANDROID) - #include "chrome/browser/android/background_tab_manager.h" - #include "components/feed/feed_feature_list.h" +@@ -29,6 +29,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" +#include "chrome/common/pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -251,6 +254,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -277,6 +280,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; -@@ -258,6 +268,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -284,6 +294,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -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 -@@ -207,6 +207,8 @@ +@@ -210,6 +210,8 @@ #endif #if defined(OS_ANDROID) @@ -156,7 +156,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" -@@ -1037,6 +1039,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1083,6 +1085,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -167,7 +167,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -917,6 +917,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -933,6 +933,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 -@@ -3181,6 +3181,11 @@ const char kLacrosAllowed[] = "lacros_allowed"; +@@ -3159,6 +3159,11 @@ const char kLacrosAllowed[] = "lacros_allowed"; const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -198,7 +198,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1149,6 +1149,10 @@ extern const char kPdfAnnotationsEnabled[]; +@@ -1147,6 +1147,10 @@ extern const char kPdfAnnotationsEnabled[]; extern const char kExplicitlyAllowedNetworkPorts[]; 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 88dae56b..e57c2e55 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -3,31 +3,32 @@ Date: Thu, 18 Feb 2021 21:22:52 +0100 Subject: Add menu item to bookmark all tabs --- - chrome/android/java/res/menu/main_menu.xml | 7 +++ - .../chrome/browser/ChromeTabbedActivity.java | 26 ++++++++ - .../browser/bookmarks/BookmarkBridge.java | 61 +++++++++++++++++++ + chrome/android/java/res/menu/main_menu.xml | 7 ++ + .../chrome/browser/ChromeTabbedActivity.java | 26 +++++++ + .../browser/bookmarks/BookmarkBridge.java | 71 +++++++++++++++++-- .../browser/bookmarks/BookmarkUtils.java | 4 ++ - .../android/bookmarks/bookmark_bridge.cc | 17 ++++++ + .../android/bookmarks/bookmark_bridge.cc | 17 +++++ .../android/bookmarks/bookmark_bridge.h | 4 ++ .../browser/bookmarks/bookmark_html_writer.cc | 10 +++ .../bookmarks/chrome_bookmark_client.cc | 2 + + .../dialogs/DownloadLocationCustomView.java | 4 +- .../strings/android_chrome_strings.grd | 3 + components/bookmark_bar_strings.grdp | 6 ++ - .../bookmarks/browser/bookmark_codec.cc | 24 ++++++-- - components/bookmarks/browser/bookmark_codec.h | 7 ++- + .../bookmarks/browser/bookmark_codec.cc | 24 +++++-- + components/bookmarks/browser/bookmark_codec.h | 7 +- .../browser/bookmark_load_details.cc | 4 ++ .../bookmarks/browser/bookmark_load_details.h | 2 + .../bookmarks/browser/bookmark_model.cc | 3 +- - components/bookmarks/browser/bookmark_model.h | 7 +++ + components/bookmarks/browser/bookmark_model.h | 7 ++ components/bookmarks/browser/bookmark_node.cc | 13 ++++ components/bookmarks/browser/bookmark_node.h | 5 ++ components/bookmarks/browser/model_loader.cc | 3 +- - 19 files changed, 201 insertions(+), 7 deletions(-) + 20 files changed, 208 insertions(+), 14 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 +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -58,6 +58,10 @@ +@@ -61,6 +61,10 @@ @@ -38,7 +39,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -141,6 +145,9 @@ +@@ -144,6 +148,9 @@ @@ -51,7 +52,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 -@@ -69,6 +69,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; +@@ -70,6 +70,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; @@ -60,7 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; -@@ -1912,6 +1914,8 @@ public class ChromeTabbedActivity extends ChromeActivitybookmark_bar_node()->children()) { if (node->is_folder()) top_level_folders.push_back(node.get()); -@@ -459,6 +464,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -462,6 +467,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -255,7 +276,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -513,6 +519,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -516,6 +522,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -326,17 +347,38 @@ diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser } return false; +diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +--- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java ++++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +@@ -75,7 +75,7 @@ public class DownloadLocationCustomView + mDirectoryAdapter.update(); + } + +- void setTitle(CharSequence title) { ++ public void setTitle(CharSequence title) { + mTitle.setText(title); + } + +@@ -83,7 +83,7 @@ public class DownloadLocationCustomView + mSubtitleView.setText(subtitle); + } + +- void setFileName(CharSequence fileName) { ++ public void setFileName(CharSequence fileName) { + mFileName.setText(fileName); + } + 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 @@ Data from your Incognito session will only be cleared from Chrome when you +@@ -3155,6 +3155,9 @@ To change this setting, <resetlink>reset sync

Track prices + + Bookmark all tabs + - + Get image descriptions diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_strings.grdp @@ -549,7 +591,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 -@@ -560,7 +560,7 @@ bool BookmarkModel::HasBookmarks() { +@@ -561,7 +561,7 @@ bool BookmarkModel::HasBookmarks() { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -558,7 +600,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) { -@@ -795,6 +795,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -796,6 +796,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(); diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 74012b1d..809e566e 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -9,8 +9,8 @@ Subject: Add menu item to view source .../chrome/browser/app/ChromeActivity.java | 5 +++++ .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++ .../CustomTabAppMenuPropertiesDelegate.java | 1 + - .../ui/android/strings/android_chrome_strings.grd | 3 +++ - 7 files changed, 31 insertions(+) + .../ui/android/strings/android_chrome_strings.grd | 4 ++++ + 7 files changed, 32 insertions(+) diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml --- a/chrome/android/java/res/menu/custom_tabs_menu.xml @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -82,6 +82,9 @@ +@@ -85,6 +85,9 @@ @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1935,6 +1935,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2333,6 +2333,11 @@ public abstract class ChromeActivity return true; } @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -344,6 +344,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -348,6 +348,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App // Only display reader mode settings menu option if the current page is in reader mode. menu.findItem(R.id.reader_mode_prefs_id).setVisible(shouldShowReaderModePrefs(currentTab)); -@@ -755,6 +756,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -787,6 +788,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } } @@ -110,15 +110,16 @@ 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 -@@ -344,6 +344,9 @@ CHAR-LIMIT guidelines: - - Other Google services +@@ -293,6 +293,10 @@ CHAR_LIMIT guidelines: + Sign-in verifications + + + View source + - - Google services ++ + + Unsupported -- 2.17.1 diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 0fb8d017..039dbb76 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -5,6 +5,7 @@ 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 + @@ -12,7 +13,7 @@ Subject: Add option to force tablet UI components/BUILD.gn | 4 ++-- ui/android/BUILD.gn | 2 ++ .../src/org/chromium/ui/base/DeviceFormFactor.java | 5 +++++ - 9 files changed, 33 insertions(+), 3 deletions(-) + 10 files changed, 34 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/android/java/res/xml/accessibility_preferences.xml --- a/chrome/android/java/res/xml/accessibility_preferences.xml @@ -63,6 +64,18 @@ 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 @@ -78,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/Too 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 -@@ -493,6 +493,7 @@ public final class ChromePreferenceKeys { +@@ -506,6 +506,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"; @@ -100,7 +113,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1169,6 +1169,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1188,6 +1188,12 @@ Your Google account may have other forms of browsing history like searches and a Turn off @@ -112,11 +125,11 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + - + diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -514,7 +514,7 @@ test("components_unittests") { +@@ -525,7 +525,7 @@ test("components_unittests") { # On LaCrOS, tests use ash-chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. @@ -125,7 +138,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] } -@@ -761,7 +761,7 @@ if (!is_ios && !is_fuchsia) { +@@ -772,7 +772,7 @@ if (!is_ios && !is_fuchsia) { # On LaCrOS, tests use ash-chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. 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 aff11218..4def9663 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 -@@ -1144,8 +1144,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 361ad2e4..f576c637 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -10,7 +10,7 @@ Subject: Add support for ISupportHelpAndFeedback diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -281,9 +281,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -282,9 +282,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 cdc1db88..43bf1e2a 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 -@@ -6296,6 +6296,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6263,6 +6263,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNotificationsViaHelperApp)}, #endif @@ -32,9 +32,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 -@@ -5004,6 +5004,9 @@ const char kWifiSyncAndroidDescription[] = - - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -5019,6 +5019,9 @@ const char kDefaultMeetWebAppDescription[] = + "Enables the Meet web app to be installed by default."; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +const char kEnableVibrationName[] = "Vibration"; +const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed."; @@ -45,9 +45,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 -@@ -2921,6 +2921,9 @@ extern const char kWifiSyncAndroidDescription[]; - - #endif // #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -2934,6 +2934,9 @@ extern const char kDefaultMeetWebAppName[]; + extern const char kDefaultMeetWebAppDescription[]; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +extern const char kEnableVibrationName[]; +extern const char kEnableVibrationDescription[]; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -100,6 +100,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -102,6 +102,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if defined(OS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -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 -@@ -222,6 +222,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; +@@ -256,6 +256,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) @@ -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 -@@ -183,6 +183,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -186,6 +186,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 -@@ -1432,6 +1432,10 @@ +@@ -1476,6 +1476,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 886c2b78..384f359e 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background 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 -@@ -1104,6 +1104,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1112,6 +1112,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3463,7 +3469,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3471,7 +3477,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. @@ -39,7 +39,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp 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 -@@ -150,6 +150,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -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; 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 a375d6e7..a0996c77 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 -@@ -118,7 +118,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( +@@ -122,7 +122,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( #if BUILDFLAG(ENABLE_DICE_SUPPORT) registry->RegisterBooleanPref(kDiceMigrationCompletePref, false); #endif diff --git a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch index 16f596ff..71c81ff4 100644 --- a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch +++ b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc --- a/components/cronet/url_request_context_config.cc +++ b/components/cronet/url_request_context_config.cc -@@ -583,7 +583,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -591,7 +591,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index 40ec28f5..5261b089 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -10,7 +10,7 @@ Ignore any partner-provided home page. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java -@@ -147,9 +147,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat +@@ -146,9 +146,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat * if the homepage button is force enabled via flag. */ public static String getDefaultHomepageUri() { diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index c555c040..de3867fe 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -9,6 +9,7 @@ Subject: Automated domain substitution android_webview/tools/record_netlog.py | 6 +- .../tools/remove_preinstalled_webview.py | 2 +- android_webview/tools/update_cts.py | 4 +- + .../accelerator_controller_impl.cc | 2 +- ash/app_list/PRESUBMIT.py | 2 +- ash/ash_strings.grd | 10 +- ash/assistant/assistant_setup_controller.cc | 2 +- @@ -78,7 +79,7 @@ Subject: Automated domain substitution .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 14 +- - chrome/app/generated_resources.grd | 244 +- + chrome/app/generated_resources.grd | 242 +- chrome/app/google_chrome_strings.grd | 14 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -86,6 +87,7 @@ Subject: Automated domain substitution .../browser/android/explore_sites/url_util.cc | 2 +- .../explore_sites/url_util_experimental.cc | 2 +- chrome/browser/android/vr/PRESUBMIT.py | 2 +- + .../app_service/webapk/webapk_install_task.cc | 2 +- .../digital_goods_factory_impl.cc | 2 +- .../apps/platform_apps/install_chrome_app.cc | 2 +- chrome/browser/ash/app_mode/fake_cws.cc | 2 +- @@ -94,38 +96,40 @@ Subject: Automated domain substitution .../browser/ash/assistant/assistant_util.cc | 4 +- .../ash/attestation/attestation_ca_client.cc | 8 +- .../backdrop_wallpaper_handlers.cc | 6 +- + .../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 +- + chrome/browser/ash/hats/hats_dialog.cc | 2 +- .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../ash/login/marketing_backend_connector.cc | 4 +- .../login/saml/password_sync_token_fetcher.cc | 2 +- .../recommend_apps_fetcher_impl.cc | 2 +- + .../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 +- .../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 +- .../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 +- - .../child_accounts/child_user_service.cc | 2 +- - .../resources/web_time_limit_error_page.html | 2 +- - .../chromeos/crostini/crostini_util.cc | 2 +- - .../customization/customization_document.cc | 2 +- .../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 +- - chrome/browser/chromeos/hats/hats_dialog.cc | 2 +- .../input_method/assistive_suggester.cc | 12 +- .../dns_latency_routine.cc | 2 +- .../dns_resolution_routine.cc | 2 +- - .../http_firewall_routine.cc | 6 +- .../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 | 10 +- + .../remote_commands/crd_host_delegate.cc | 6 +- chrome/browser/chromeos/u2f_notification.cc | 2 +- .../protocol_handler_registry.cc | 4 +- .../data_reduction_proxy_chrome_settings.cc | 4 +- @@ -148,6 +152,7 @@ Subject: Automated domain substitution chrome/browser/flag_descriptions.cc | 4 +- .../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 +- .../dial/dial_media_route_provider.cc | 12 +- @@ -157,6 +162,8 @@ Subject: Automated domain substitution .../nacl_host/nacl_infobar_delegate.cc | 2 +- .../client/nearby_share_client_impl.cc | 4 +- .../instantmessaging/constants.h | 4 +- + .../network_traversal_ice_config_fetcher.cc | 12 +- + .../tachyon_ice_config_fetcher.cc | 12 +- .../notification_platform_bridge_mac.mm | 2 +- ...uction_proxy_metrics_observer_test_utils.h | 2 +- ...rvice_worker_page_load_metrics_observer.cc | 2 +- @@ -201,7 +208,7 @@ Subject: Automated domain substitution .../zip_archiver/unpacker-test/README.txt | 2 +- .../zip_archiver/unpacker-test/cpp/Makefile | 2 +- .../browser/resources/cryptotoken/enroller.js | 2 +- - .../default_apps/external_extensions.json | 6 +- + .../default_apps/external_extensions.json | 14 +- .../discards/graph_doc_template.html | 2 +- chrome/browser/resources/downloads/icons.html | 2 +- .../resources/feedback/js/feedback_util.js | 10 +- @@ -252,7 +259,7 @@ Subject: Automated domain substitution .../resources/webstore_app/manifest.json | 4 +- .../certificate_reporting_service.cc | 2 +- .../chrome_cleaner/srt_field_trial_win.cc | 6 +- - .../chrome_enterprise_url_lookup_service.cc | 4 +- + .../chrome_enterprise_url_lookup_service.cc | 2 +- .../chrome_password_protection_service.cc | 4 +- .../binary_upload_service.cc | 6 +- .../check_client_download_request_base.cc | 4 +- @@ -263,10 +270,9 @@ 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 | 4 +- - .../sharing/shared_clipboard/feature_flags.cc | 2 +- + chrome/browser/search/drive/drive_service.cc | 10 +- + .../remote_copy_message_handler.cc | 2 +- .../sharing/web_push/web_push_sender.cc | 4 +- - .../sharing/webrtc/ice_config_fetcher.cc | 12 +- chrome/browser/signin/signin_ui_util.cc | 2 +- .../browser/ssl/connection_help_tab_helper.cc | 2 +- chrome/browser/ssl/sct_reporting_service.cc | 2 +- @@ -279,7 +285,7 @@ Subject: Automated domain substitution .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- .../browser/tracing/crash_service_uploader.cc | 2 +- - .../strings/android_chrome_strings.grd | 38 +- + .../strings/android_chrome_strings.grd | 40 +- .../arc/arc_app_reinstall_app_result.cc | 2 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../search/files/item_suggest_cache.cc | 2 +- @@ -303,7 +309,6 @@ Subject: Automated domain substitution .../app_dialog/app_uninstall_dialog_view.cc | 2 +- .../ui/views/hats/hats_next_web_dialog.cc | 2 +- ...picker_bubble_view_browsertest_chromeos.cc | 12 +- - .../media_router/cast_dialog_sink_button.cc | 2 +- .../ui/views/network_profile_bubble_view.cc | 2 +- .../ui/views/outdated_upgrade_bubble_view.cc | 2 +- .../plugin_vm/plugin_vm_installer_view.cc | 2 +- @@ -315,8 +320,8 @@ Subject: Automated domain substitution .../assistant_optin/assistant_optin_utils.cc | 2 +- .../edu_coexistence_login_handler_chromeos.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- + .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- .../ui/webui/new_tab_page/foo/foo_handler.cc | 12 +- - .../ui/webui/new_tab_page/new_tab_page_ui.cc | 4 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- .../ui/webui/ntp/ntp_resource_cache.cc | 10 +- .../chromeos/parental_controls_handler.cc | 2 +- @@ -327,8 +332,10 @@ Subject: Automated domain substitution chrome/browser/vr/PRESUBMIT.py | 2 +- .../preinstalled_web_apps/gmail.cc | 6 +- .../preinstalled_web_apps/google_calendar.cc | 6 +- + .../preinstalled_web_apps/google_chat.cc | 2 +- .../preinstalled_web_apps/google_docs.cc | 6 +- .../preinstalled_web_apps/google_drive.cc | 6 +- + .../preinstalled_web_apps/google_meet.cc | 2 +- .../preinstalled_web_apps/google_sheets.cc | 6 +- .../preinstalled_web_apps/google_slides.cc | 6 +- .../preinstalled_web_apps/youtube.cc | 6 +- @@ -360,7 +367,7 @@ Subject: Automated domain substitution chrome/common/extensions/api/windows.json | 2 +- .../extensions/chrome_extensions_client.cc | 4 +- chrome/common/google_url_loader_throttle.cc | 4 +- - chrome/common/url_constants.cc | 236 +- + chrome/common/url_constants.cc | 240 +- .../gaiacp/associated_user_validator.cc | 2 +- .../gaiacp/gaia_credential_base.cc | 8 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- @@ -414,6 +421,7 @@ Subject: Automated domain substitution .../setup/google_chrome_behaviors.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 +- @@ -434,15 +442,17 @@ Subject: Automated domain substitution chromecast/common/extensions_api/tabs.json | 4 +- chromecast/common/extensions_api/windows.json | 2 +- chromecast/crash/linux/minidump_uploader.cc | 2 +- - chromecast/net/connectivity_checker_impl.cc | 4 +- + chromecast/net/connectivity_checker_impl.h | 4 +- .../components/camera_app_ui/camera_app_ui.cc | 2 +- .../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 +- .../media_app_ui/media_app_guest_ui.cc | 2 +- .../multidevice/stub_multidevice_util.cc | 2 +- + ...untrusted_personalization_app_ui_config.cc | 2 +- chromeos/components/phonehub/url_constants.cc | 2 +- .../translation_result_loader.cc | 2 +- .../trial_group/trial_group_checker.cc | 2 +- @@ -493,7 +503,7 @@ Subject: Automated domain substitution .../core/counters/history_counter.cc | 2 +- .../core/history_notice_utils.cc | 4 +- .../core/captive_portal_detector.cc | 2 +- - .../data/log_list.json | 28 +- + .../data/log_list.json | 24 +- .../common/cloud_devices_urls.cc | 4 +- .../components_google_chrome_strings.grd | 2 +- .../crash/core/app/crash_reporter_client.cc | 2 +- @@ -506,6 +516,7 @@ 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 +- @@ -572,7 +583,7 @@ Subject: Automated domain substitution .../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 | 1992 ++++++++--------- + .../policy/resources/policy_templates.json | 2008 ++++++++--------- .../policy/resources/webui/policy_base.js | 2 +- .../policy/test_support/policy_testserver.py | 14 +- .../policy/tools/generate_extension_admx.py | 2 +- @@ -652,7 +663,7 @@ Subject: Automated domain substitution .../services/quarantine/quarantine_mac.mm | 2 +- .../core/common/disabled_sites.cc | 8 +- .../browser/chrome_connected_header_helper.cc | 4 +- - .../browser/account_consistency_service.mm | 14 +- + .../browser/account_consistency_service.mm | 12 +- .../signin/public/base/test_signin_client.cc | 2 +- .../identity_manager/access_token_fetcher.cc | 2 +- .../browser/spelling_service_client.cc | 2 +- @@ -686,14 +697,13 @@ Subject: Automated domain substitution .../renderer_host/render_frame_host_impl.cc | 2 +- content/browser/resources/PRESUBMIT.py | 2 +- content/browser/resources/gpu/info_view.js | 2 +- - .../resources/media/media_internals.html | 2 +- .../service_worker/service_worker_metrics.cc | 8 +- .../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 +- + .../webrtc/resources/webrtc_internals.js | 2 +- .../zygote_host/zygote_host_impl_linux.cc | 2 +- - content/public/PRESUBMIT.py | 4 +- content/renderer/PRESUBMIT.py | 2 +- .../pepper/pepper_media_device_manager.cc | 2 +- content/renderer/render_thread_impl.cc | 14 +- @@ -715,7 +725,7 @@ Subject: Automated domain substitution .../common/api/extensions_manifest_types.json | 6 +- extensions/common/csp_validator.cc | 2 +- extensions/common/extension_urls.cc | 10 +- - extensions/common/manifest_constants.cc | 2 +- + extensions/common/manifest_constants.cc | 4 +- extensions/common/permissions/PRESUBMIT.py | 2 +- extensions/strings/extensions_strings.grd | 4 +- google_apis/drive/drive_api_url_generator.cc | 4 +- @@ -748,9 +758,8 @@ Subject: Automated domain substitution ios/README.txt | 2 +- ios/build/bots/scripts/PRESUBMIT.py | 2 +- ios/build/bots/scripts/result_sink_util.py | 4 +- - ios/build/bots/scripts/run.py | 2 +- ios/build/bots/scripts/standard_json_util.py | 2 +- - ios/build/bots/scripts/xcode_util.py | 2 +- + ios/build/bots/scripts/xcode_util.py | 4 +- ios/build/chrome_build.gni | 2 +- .../app/strings/ios_chromium_strings.grd | 8 +- .../app/strings/ios_google_chrome_strings.grd | 8 +- @@ -761,14 +770,13 @@ Subject: Automated domain substitution ios/chrome/browser/chrome_url_constants.cc | 26 +- .../breadcrumb_manager_tab_helper.mm | 4 +- ios/chrome/browser/flags/about_flags.mm | 4 +- - .../omnibox_geolocation_controller.mm | 2 +- ios/chrome/browser/omaha/omaha_service.mm | 2 +- .../search_engine_tab_helper.mm | 8 +- ios/chrome/browser/u2f/u2f_controller.mm | 4 +- .../activity_services/activity_type_util.mm | 2 +- .../signin_earl_grey_app_interface.mm | 6 +- .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- - .../content_suggestions_app_interface.mm | 4 +- + .../new_tab_page_app_interface.mm | 4 +- .../content_suggestions/ntp_home_mediator.mm | 8 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- @@ -790,6 +798,7 @@ Subject: Automated domain substitution .../http_server_files/simple_signup_form.html | 2 +- .../data/http_server_files/window_open.html | 2 +- ios/web/navigation/navigation_manager_impl.mm | 6 +- + .../web_state/ui/wk_content_rule_list_util.mm | 2 +- ios/web_view/PRESUBMIT.py | 2 +- ios/web_view/internal/cwv_flags.mm | 2 +- ios/web_view/internal/cwv_web_view.mm | 2 +- @@ -844,7 +853,6 @@ Subject: Automated domain substitution native_client_sdk/src/tools/fix_manifest.py | 2 +- native_client_sdk/src/web/manifest.html | 6 +- net/base/network_change_notifier_mac.mm | 2 +- - net/base/url_util.cc | 4 +- .../http_security_header_047.txt | Bin 166 -> 169 bytes net/dns/dns_test_util.h | 12 +- net/dns/dns_transaction.cc | 2 +- @@ -899,7 +907,7 @@ Subject: Automated domain substitution sandbox/policy/win/sandbox_win.cc | 2 +- .../geolocation/network_location_request.cc | 2 +- .../image_annotation_service.h | 4 +- - styleguide/c++/c++11.html | 40 +- + styleguide/c++/c++11.html | 42 +- styleguide/c++/chromium-cpp/main.py | 2 +- testing/PRESUBMIT.py | 2 +- .../java/AndroidManifest.xml.jinja2 | 4 +- @@ -1054,16 +1062,16 @@ Subject: Automated domain substitution .../renderer/core/dom/events/event_target.cc | 4 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- - .../blink/renderer/core/frame/deprecation.cc | 46 +- + .../blink/renderer/core/frame/deprecation.cc | 48 +- .../blink/renderer/core/frame/local_frame.cc | 4 +- .../renderer/core/html/html_iframe_element.cc | 2 +- - .../renderer/core/html/html_link_element.cc | 4 +- .../core/html/media/autoplay_policy.cc | 4 +- .../core/html/media/html_media_element.cc | 4 +- .../core/html/portal/html_portal_element.cc | 4 +- .../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 +- @@ -1102,7 +1110,6 @@ Subject: Automated domain substitution .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- - third_party/blink/tools/move_blink_source.py | 2 +- .../print_stale_test_expectations_entries.py | 2 +- third_party/boringssl/roll_boringssl.py | 2 +- .../closure/bin/build/depstree.py | 2 +- @@ -1483,9 +1490,7 @@ Subject: Automated domain substitution ui/file_manager/audio_player/manifest.json | 2 +- ui/file_manager/base/tools/PRESUBMIT.py | 2 +- .../file_manager/common/js/mock_chrome.js | 4 +- - .../cws_widget/cws_widget_container.js | 4 +- .../foreground/elements/icons.html | 2 +- - .../foreground/js/web_store_utils.js | 4 +- ui/file_manager/file_manager/manifest.json | 10 +- ui/file_manager/gallery/manifest.json | 2 +- ui/file_manager/image_loader/piex/Makefile | 2 +- @@ -1505,7 +1510,7 @@ Subject: Automated domain substitution weblayer/browser/default_search_engine.cc | 2 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1502 files changed, 4540 insertions(+), 4540 deletions(-) + 1507 files changed, 4749 insertions(+), 4749 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1519,7 +1524,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ PRESUBMIT_VERSION = '2.0.0' -@@ -191,7 +191,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -195,7 +195,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -1528,7 +1533,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -200,7 +200,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -204,7 +204,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -1537,7 +1542,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -209,7 +209,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -213,7 +213,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -1546,7 +1551,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -218,7 +218,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -222,7 +222,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -1555,7 +1560,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -227,7 +227,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -231,7 +231,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -1564,7 +1569,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -236,7 +236,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -240,7 +240,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -1573,7 +1578,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -245,7 +245,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -249,7 +249,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -1582,7 +1587,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -254,7 +254,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -258,7 +258,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -1591,7 +1596,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -520,7 +520,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -487,7 +487,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1600,7 +1605,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1188,7 +1188,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1029,7 +1029,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1609,16 +1614,19 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1343,7 +1343,7 @@ _KNOWN_ROBOTS = set( +@@ -1188,9 +1188,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') - ) | set('%s@skia-corp.google.com.iam.gserviceaccount.com' % s + ) | set('%s@skia-corp.9oo91e.qjz9zk.iam.gserviceaccount.com' % s - for s in ('chromium-internal-autoroll',)) + for s in ('chromium-internal-autoroll',) +- ) | set('%s@owners-cleanup-prod.google.com.iam.gserviceaccount.com' % s ++ ) | set('%s@owners-cleanup-prod.9oo91e.qjz9zk.iam.gserviceaccount.com' % s + for s in ('swarming-tasks',)) -@@ -1670,7 +1670,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1517,7 +1517,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' @@ -1627,7 +1635,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1881,7 +1881,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1728,7 +1728,7 @@ def CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1636,7 +1644,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -2066,7 +2066,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1943,7 +1943,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1645,7 +1653,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2175,7 +2175,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2052,7 +2052,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' @@ -1654,7 +1662,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2947,7 +2947,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2823,7 +2823,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. @@ -1663,7 +1671,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. -@@ -3248,7 +3248,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3124,7 +3124,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' @@ -1672,7 +1680,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3382,7 +3382,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3258,7 +3258,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1681,7 +1689,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3413,7 +3413,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3289,7 +3289,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' @@ -1690,7 +1698,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3437,7 +3437,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3313,7 +3313,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.' @@ -1699,7 +1707,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3457,7 +3457,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3333,7 +3333,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' @@ -1708,7 +1716,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3992,7 +3992,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -3868,7 +3868,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' @@ -1717,7 +1725,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from'))] return [] -@@ -4154,7 +4154,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4030,7 +4030,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 ' @@ -1726,7 +1734,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4189,7 +4189,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4065,7 +4065,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 ' @@ -1735,7 +1743,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 -@@ -4283,7 +4283,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4159,7 +4159,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', @@ -1744,7 +1752,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4500,7 +4500,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4427,7 +4427,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1753,16 +1761,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) -@@ -4752,7 +4752,7 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): - 'chrome.bluetoothLowEnergy', - 'chrome.bluetoothSocket', - 'chrome.browser', -- 'chrome.commands', -+ 'ch40me.qjz9zkmands', - 'chrome.contextMenus', - 'chrome.documentScan', - 'chrome.events', -@@ -4801,9 +4801,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -4679,9 +4679,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' @@ -1774,7 +1773,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems))] return [] -@@ -4870,7 +4870,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4724,7 +4724,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1783,7 +1782,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5202,7 +5202,7 @@ def CheckStrings(input_api, output_api): +@@ -5056,7 +5056,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 ' @@ -1892,8 +1891,8 @@ diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/too case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow these steps as a final check: --https://chromium.googlesource.com/chromium/src/+/master/tools/metrics/histograms/README.md#flag-histograms -+https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/tools/metrics/histograms/README.md#flag-histograms +-https://chromium.googlesource.com/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms ++https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms If any labels were generated incorrectly, please edit this script and change KNOWN_MISTAKES. @@ -1936,7 +1935,7 @@ diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webv logging.error('Did you start the emulator with "-writable-system?"\n' - 'See https://chromium.googlesource.com/chromium/src/+/' + 'See https://chromium.9oo91esource.qjz9zk/chromium/src/+/' - 'master/docs/android_emulator.md#writable-system-partition' + 'main/docs/android_emulator.md#writable-system-partition' '\n') raise diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_cts.py @@ -1960,6 +1959,18 @@ diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_ versions. Please create a new branch, then edit the +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[] = + const char kTabletCountOfVolumeAdjustType[] = "Tablet.CountOfVolumeAdjustType"; + + const char kKeyboardShortcutHelpPageUrl[] = +- "https://support.google.com/chromebook/answer/183101"; ++ "https://support.9oo91e.qjz9zk/chromebook/answer/183101"; + const char kHighContrastToggleAccelNotificationId[] = + "chrome://settings/accessibility/highcontrast"; + const char kDockedMagnifierToggleAccelNotificationId[] = diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py --- a/ash/app_list/PRESUBMIT.py +++ b/ash/app_list/PRESUBMIT.py @@ -1975,7 +1986,7 @@ diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -651,7 +651,7 @@ This file contains the strings for ash. +@@ -656,7 +656,7 @@ This file contains the strings for ash. @@ -1984,7 +1995,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1028,7 +1028,7 @@ This file contains the strings for ash. +@@ -1033,7 +1033,7 @@ This file contains the strings for ash. Supervised user @@ -1993,7 +2004,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1249,7 +1249,7 @@ This file contains the strings for ash. +@@ -1254,7 +1254,7 @@ This file contains the strings for ash. Tap to configure @@ -2002,7 +2013,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -2752,7 +2752,7 @@ This file contains the strings for ash. +@@ -2773,7 +2773,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2011,7 +2022,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3075,7 +3075,7 @@ Here are some things you can try to get started. +@@ -3113,7 +3113,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2035,7 +2046,7 @@ diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assista diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link_util.cc --- a/ash/assistant/util/deep_link_util.cc +++ b/ash/assistant/util/deep_link_util.cc -@@ -421,21 +421,21 @@ base::Optional GetAssistantUrl( +@@ -395,21 +395,21 @@ absl::optional GetAssistantUrl( case DeepLinkType::kLists: { const auto& type = GetDeepLinkParam(params, DeepLinkParam::kType); top_level_url = @@ -2064,7 +2075,7 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link break; default: NOTREACHED(); -@@ -486,7 +486,7 @@ base::Optional GetWebUrl( +@@ -460,7 +460,7 @@ absl::optional GetWebUrl( DeepLinkType type, const std::map& params) { static constexpr char kAssistantSettingsWebUrl[] = @@ -2072,11 +2083,11 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link + "https://assistant.9oo91e.qjz9zk/settings/mainpage"; if (!IsWebDeepLinkType(type, params)) - return base::nullopt; + 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 -@@ -260,7 +260,7 @@ +@@ -261,7 +261,7 @@ [[i18n(toastMessageKey_)]]

dex.txt +@@ -518,7 +518,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See --https://chromium.googlesource.com/chromium/src.git/+/master/docs/ui/android/bytecode_rewriting.md. -+https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/master/docs/ui/android/bytecode_rewriting.md. +-https://chromium.googlesource.com/chromium/src.git/+/main/docs/ui/android/bytecode_rewriting.md. ++https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/main/docs/ui/android/bytecode_rewriting.md. """ elif had_unfiltered_items: # Left only with empty headings. All indented items filtered out. diff --git a/build/android/gyp/util/diff_utils.py b/build/android/gyp/util/diff_utils.py --- a/build/android/gyp/util/diff_utils.py +++ b/build/android/gyp/util/diff_utils.py -@@ -102,10 +102,10 @@ def CheckExpectations(actual_data, options, custom_msg=''): +@@ -100,10 +100,10 @@ def CheckExpectations(actual_data, options, custom_msg=''): else: fail_msg = """ Expectations need updating: @@ -2338,7 +2349,7 @@ diff --git a/build/android/gyp/util/protoresources.py b/build/android/gyp/util/p diff --git a/build/android/incremental_install/installer.py b/build/android/incremental_install/installer.py --- a/build/android/incremental_install/installer.py +++ b/build/android/incremental_install/installer.py -@@ -245,7 +245,7 @@ def Install(device, install_json, apk=None, enable_device_cache=False, +@@ -246,7 +246,7 @@ def Install(device, install_json, apk=None, enable_device_cache=False, if apis_allowed.strip() not in '01': msg = """\ Cannot use incremental installs on Android P+ without first enabling access to @@ -2350,7 +2361,7 @@ diff --git a/build/android/incremental_install/installer.py b/build/android/incr 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 -@@ -127,7 +127,7 @@ class ResultSinkClient(object): +@@ -120,7 +120,7 @@ class ResultSinkClient(object): 'name': test_id, 'location': { 'file_name': test_file, @@ -2362,7 +2373,7 @@ diff --git a/build/android/pylib/base/result_sink.py b/build/android/pylib/base/ 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 -@@ -126,7 +126,7 @@ BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, +@@ -127,7 +127,7 @@ BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, os.environ.get('CHROMIUM_OUT_DIR', 'out'), 'bad_devices.json') @@ -2374,7 +2385,7 @@ diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/con diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py --- a/build/android/pylib/device_settings.py +++ b/build/android/pylib/device_settings.py -@@ -17,9 +17,9 @@ def ConfigureContentSettings(device, desired_settings): +@@ -19,9 +19,9 @@ def ConfigureContentSettings(device, desired_settings): """Configures device content setings from a list. Many settings are documented at: @@ -2387,7 +2398,7 @@ diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device Many others are undocumented. -@@ -162,7 +162,7 @@ DETERMINISTIC_DEVICE_SETTINGS = [ +@@ -164,7 +164,7 @@ DETERMINISTIC_DEVICE_SETTINGS = [ ]), ('settings/secure', [ ('allowed_geolocation_origins', @@ -2424,7 +2435,7 @@ diff --git a/build/android/pylib/dex/dex_parser.py b/build/android/pylib/dex/dex diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/build/android/pylib/local/device/local_device_monkey_test_run.py --- a/build/android/pylib/local/device/local_device_monkey_test_run.py +++ b/build/android/pylib/local/device/local_device_monkey_test_run.py -@@ -121,6 +121,6 @@ class LocalDeviceMonkeyTestRun(local_device_test_run.LocalDeviceTestRun): +@@ -123,6 +123,6 @@ class LocalDeviceMonkeyTestRun(local_device_test_run.LocalDeviceTestRun): # Kill the monkey test process on the device. If you manually # interrupt the test run, this will prevent the monkey test from # continuing to run. @@ -2456,7 +2467,7 @@ diff --git a/build/android/pylib/results/presentation/test_results_presentation. 'dashboards/flakiness_dashboard.html#%s' % url_args) -@@ -280,7 +280,7 @@ def feedback_url(result_details_link): +@@ -282,7 +282,7 @@ def feedback_url(result_details_link): url_args.append(('comment', 'Please check out: %s' % result_details_link)) url_args = urllib.urlencode(url_args) # pylint: enable=redefined-variable-type @@ -2465,7 +2476,7 @@ diff --git a/build/android/pylib/results/presentation/test_results_presentation. def results_to_html(results_dict, cs_base_url, bucket, test_name, -@@ -423,7 +423,7 @@ def main(): +@@ -425,7 +425,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.', @@ -2474,7 +2485,7 @@ 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.') -@@ -517,7 +517,7 @@ def main(): +@@ -519,7 +519,7 @@ def main(): args.bucket, builder_name, build_number) if ui_screenshot_set_link: @@ -2536,7 +2547,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 -@@ -1034,7 +1034,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1043,7 +1043,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, @@ -2596,19 +2607,19 @@ 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 -@@ -911,7 +911,7 @@ def main(): +@@ -923,7 +923,7 @@ def main(): tast_test_parser = subparsers.add_parser( 'tast', help='Runs a device-side set of Tast tests. For more details, see: ' -- 'https://chromium.googlesource.com/chromiumos/platform/tast/+/master/docs/running_tests.md' -+ 'https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/master/docs/running_tests.md' +- 'https://chromium.googlesource.com/chromiumos/platform/tast/+/main/docs/running_tests.md' ++ 'https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/main/docs/running_tests.md' ) tast_test_parser.set_defaults(func=device_test) tast_test_parser.add_argument( diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1710,7 +1710,7 @@ if (enable_java_templates) { +@@ -1707,7 +1707,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -2624,17 +2635,17 @@ diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni # 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. -- # https://chromium.googlesource.com/chromium/src/+/master/docs/chromeos_build_instructions.md -- # https://chromium.googlesource.com/chromiumos/docs/+/master/simple_chrome_workflow.md -+ # https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/chromeos_build_instructions.md -+ # https://chromium.9oo91esource.qjz9zk/chromiumos/docs/+/master/simple_chrome_workflow.md +- # https://chromium.googlesource.com/chromium/src/+/main/docs/chromeos_build_instructions.md +- # https://chromium.googlesource.com/chromiumos/docs/+/main/simple_chrome_workflow.md ++ # 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 } 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 -@@ -118,7 +118,7 @@ if (is_chromeos_device && cros_sdk_version != "") { - # overriding the board to test the built binary. +@@ -124,7 +124,7 @@ if (cros_sdk_version != "") { + # (e.g. amd64-generic), but tests on a different board (e.g. eve). # tast_vars: A list of "key=value" runtime variable pairs to pass to invoke # the Tast tests. For more details, please see: -# https://chromium.googlesource.com/chromiumos/platform/tast/+/HEAD/docs/writing_tests.md#Runtime-variables @@ -2642,24 +2653,24 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni template("generate_runner_script") { forward_variables_from(invoker, [ -@@ -340,7 +340,7 @@ template("tast_test") { +@@ -365,7 +365,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: -- # https://chromium.googlesource.com/chromiumos/platform/tast/+/master/docs/test_attributes.md -+ # https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/master/docs/test_attributes.md +- # https://chromium.googlesource.com/chromiumos/platform/tast/+/main/docs/test_attributes.md ++ # https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/main/docs/test_attributes.md tast_attr_expr = "\"group:mainline\" && \"dep:chrome\"" if (defined(enable_tast_informational_tests) && -@@ -421,7 +421,7 @@ template("lacros_tast_test") { +@@ -451,7 +451,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: -- # https://source.chromium.org/chromium/chromium/src/+/master:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 -+ # https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/master:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 +- # https://source.chromium.org/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 ++ # https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 tast_vars = [ "lacrosDeployedBinary=/usr/local/lacros-chrome" ] - # Lacros tast tests may have different test expectations based on whether + data_deps = [ 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 @@ -2667,8 +2678,8 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler # 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). -- # https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md#cet-shadow-stack -+ # https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/design/sandbox.md#cet-shadow-stack +- # https://chromium.googlesource.com/chromium/src/+/main/docs/design/sandbox.md#cet-shadow-stack ++ # https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/design/sandbox.md#cet-shadow-stack enable_cet_shadow_stack = target_cpu == "x64" } @@ -2676,8 +2687,8 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler # 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 --# https://chromium.googlesource.com/chromium/src/+/master/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir -+# https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir +-# https://chromium.googlesource.com/chromium/src/+/main/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir ++# https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir # It's not clear if the crash server will correctly handle dSYMs with relative # paths, so we disable this feature for official benefit. The main benefit is # deterministic builds to reduce compile times, so this is less relevant for @@ -2736,8 +2747,8 @@ diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py """Create test results data to write to JSON test results file. The JSON data format is defined in -- 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 """ results = { @@ -2865,8 +2876,8 @@ diff --git a/buildtools/clang_format/README.txt b/buildtools/clang_format/README downloaded from Google Storage by gclient runhooks for the current platform. For a walkthrough on how to maintain these binaries: -- https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang_format_binaries.md -+ https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/updating_clang_format_binaries.md +- https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang_format_binaries.md ++ https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/updating_clang_format_binaries.md To upload a file: python ~/depot_tools/upload_to_google_storage.py -b chromium-clang-format @@ -3058,7 +3069,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd -@@ -326,7 +326,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> +@@ -331,7 +331,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> To send a number from here to your Android phone, sign in to Chromium on both devices. @@ -3067,7 +3078,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Make sure you are signed in to Chromium on your $1Pixel XL and then try sending again. -@@ -572,7 +572,7 @@ Chromium is unable to recover your settings. +@@ -582,7 +582,7 @@ Chromium is unable to recover your settings. @@ -3076,7 +3087,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -667,10 +667,10 @@ Chromium is unable to recover your settings. +@@ -686,10 +686,10 @@ Chromium is unable to recover your settings. You're signed in to Chromium! @@ -3089,7 +3100,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate. -@@ -720,7 +720,7 @@ Chromium is unable to recover your settings. +@@ -739,7 +739,7 @@ Chromium is unable to recover your settings. @@ -3098,7 +3109,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -745,10 +745,10 @@ Chromium is unable to recover your settings. +@@ -764,10 +764,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. @@ -3114,7 +3125,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 -@@ -392,16 +392,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -397,16 +397,16 @@ are declared in tools/grit/grit_rule.gni. Permission request expired @@ -3135,7 +3146,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -583,7 +583,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -588,7 +588,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3144,7 +3155,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -737,7 +737,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -742,7 +742,7 @@ are declared in tools/grit/grit_rule.gni. Search image with Google Lens @@ -3153,7 +3164,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -812,7 +812,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -817,7 +817,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3162,7 +3173,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -978,7 +978,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -983,7 +983,7 @@ are declared in tools/grit/grit_rule.gni. Search Image with Google Lens @@ -3171,16 +3182,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1194,7 +1194,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1199,7 +1199,7 @@ are declared in tools/grit/grit_rule.gni. - Move window to $1User name ($2john@google.com) + Move window to $1User name ($2john@9oo91e.qjz9zk) - - Move window to desk -@@ -1319,7 +1319,7 @@ are declared in tools/grit/grit_rule.gni. + + +@@ -1324,7 +1324,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3189,7 +3200,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2690,10 +2690,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2707,10 +2707,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3202,7 +3213,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2702,7 +2702,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2719,7 +2719,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3211,7 +3222,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2714,28 +2714,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2731,28 +2731,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3247,7 +3258,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2756,19 +2756,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2773,19 +2773,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3272,7 +3283,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2780,7 +2780,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2797,7 +2797,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3281,7 +3292,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2789,7 +2789,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2806,7 +2806,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3290,7 +3301,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -2901,7 +2901,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2918,7 +2918,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3299,7 +3310,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3431,13 +3431,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3443,13 +3443,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3316,7 +3327,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3642,10 +3642,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3654,10 +3654,10 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3329,7 +3340,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3654,7 +3654,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3666,7 +3666,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3338,14 +3349,14 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3690,16 +3690,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3702,16 +3702,16 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps - Subframe: $1https://youtube.com/ + Subframe: $1https://y0u1ub3.qjz9zk/ - + - Incognito Subframe: $1https://youtube.com/ + Incognito Subframe: $1https://y0u1ub3.qjz9zk/ @@ -3353,13 +3364,13 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Portal: $1https://youtube.com/ + Portal: $1https://y0u1ub3.qjz9zk/ - + - Incognito Portal: $1https://youtube.com/ + Incognito Portal: $1https://y0u1ub3.qjz9zk/ App: $1com.android.systemui -@@ -3900,13 +3900,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3912,13 +3912,13 @@ are declared in tools/grit/grit_rule.gni. These items may be dangerous @@ -3375,20 +3386,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The app "$1Gmail" was automatically removed. -@@ -3918,10 +3918,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3930,10 +3930,10 @@ are declared in tools/grit/grit_rule.gni. - + - $1http://www.google.com wants to communicate with the app "$2Gmail" + $1http://www.9oo91e.qjz9zk wants to communicate with the app "$2Gmail" - + - $1http://www.google.com wants to communicate with the extension "$2Gmail Checker" + $1http://www.9oo91e.qjz9zk wants to communicate with the extension "$2Gmail Checker" It can: -@@ -4060,22 +4060,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4072,22 +4072,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3417,7 +3428,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4084,10 +4084,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4096,10 +4096,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3430,7 +3441,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4436,7 +4436,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4451,7 +4451,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3439,7 +3450,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4480,7 +4480,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4495,7 +4495,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3448,7 +3459,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -4773,7 +4773,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4788,7 +4788,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3457,7 +3468,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5016,7 +5016,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5031,7 +5031,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3466,7 +3477,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 -@@ -5331,7 +5331,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5358,7 +5358,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3475,7 +3486,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5342,7 +5342,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5369,7 +5369,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3484,7 +3495,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5352,7 +5352,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5379,7 +5379,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3493,7 +3504,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5361,16 +5361,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5388,16 +5388,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3513,20 +3524,29 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -5736,10 +5736,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5769,7 +5769,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> +- Learn about the data Google Drive collects and why <a href="https://support.google.com/drive/answer/2450387" target="_blank">here</a>. ++ Learn about the data Google Drive collects and why <a href="https://support.9oo91e.qjz9zk/drive/answer/2450387" target="_blank">here</a>. + + + 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 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="$1" 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="$1" target="_blank">myactivity.9oo91e.qjz9zk</a>. - - -- Learn about the data Google collects and why at <a href="$1" target="_blank">policies.google.com</a>. -+ Learn about the data Google collects and why at <a href="$1" target="_blank">policies.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>. Close -@@ -5966,7 +5966,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6011,7 +6011,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3535,7 +3555,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6070,7 +6070,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6118,7 +6118,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 @@ -3544,7 +3564,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6173,7 +6173,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6218,7 +6218,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. @@ -3553,7 +3573,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6210,7 +6210,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6255,7 +6255,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. @@ -3562,16 +3582,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6374,7 +6374,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6419,7 +6419,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 - + - Passwords are saved in your Google Account (%1$suser@gmail.com) so you can use them on any device + Passwords are saved in your Google Account (%1$suser@9ma1l.qjz9zk) so you can use them on any device -@@ -6558,7 +6558,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6603,7 +6603,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -3580,7 +3600,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6568,7 +6568,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6613,7 +6613,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3589,7 +3609,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -6792,7 +6792,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6837,7 +6837,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -3598,7 +3618,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7100,31 +7100,31 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7151,31 +7151,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. @@ -3635,7 +3655,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Hide -@@ -7152,7 +7152,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7203,7 +7203,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3644,7 +3664,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7160,10 +7160,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7211,10 +7211,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -3657,7 +3677,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8201,7 +8201,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8260,7 +8260,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Work @@ -3666,7 +3686,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8210,10 +8210,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8269,10 +8269,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -3679,7 +3699,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8238,13 +8238,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8297,13 +8297,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -3695,7 +3715,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8293,7 +8293,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8352,7 +8352,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -3704,7 +3724,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -8304,8 +8304,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8363,8 +8363,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -3715,7 +3735,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8330,7 +8330,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8389,7 +8389,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Date Modified @@ -3724,16 +3744,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8481,7 +8481,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - -- Signed in as $1foo@gmail.com. -+ Signed in as $1foo@9ma1l.qjz9zk. - - - On - sync everything -@@ -8923,7 +8923,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8959,7 +8959,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3742,7 +3753,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9340,7 +9340,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9379,7 +9379,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3751,7 +3762,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -9380,7 +9380,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9419,7 +9419,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. @@ -3760,7 +3771,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 -@@ -9469,7 +9469,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9508,7 +9508,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3769,7 +3780,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9501,10 +9501,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9540,10 +9540,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3782,7 +3793,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9615,19 +9615,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9654,19 +9654,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -3805,7 +3816,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -9651,10 +9651,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9687,10 +9687,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3818,7 +3829,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -9691,7 +9691,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9727,7 +9727,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -3827,7 +3838,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -9718,7 +9718,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9754,7 +9754,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -3836,7 +3847,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9937,7 +9937,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9946,7 +9946,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. @@ -3845,7 +3856,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share audio -@@ -9971,7 +9971,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9977,7 +9977,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Share this tab @@ -3854,7 +3865,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share audio -@@ -10005,7 +10005,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10011,7 +10011,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3863,7 +3874,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10077,8 +10077,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10083,8 +10083,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -3874,7 +3885,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10286,7 +10286,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10292,7 +10292,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3883,25 +3894,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -10327,7 +10327,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - -- $1www.google.com wants to pair -+ $1www.9oo91e.qjz9zk wants to pair - - - "$1Chrome Extension Name" wants to pair -@@ -10373,7 +10373,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - -- $1www.google.com wants to connect -+ $1www.9oo91e.qjz9zk wants to connect - - - "$1Chrome Extension Name" wants to connect -@@ -10413,7 +10413,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10386,7 +10386,7 @@ Please help our engineers fix this problem. Tell us what happened right before y No nearby devices found. @@ -3910,7 +3903,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -10445,7 +10445,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10418,7 +10418,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3919,7 +3912,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -10470,7 +10470,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10458,7 +10458,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3928,7 +3921,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -10488,7 +10488,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10486,7 +10486,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3937,7 +3930,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -10612,7 +10612,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10610,7 +10610,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3946,7 +3939,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 -@@ -10787,13 +10787,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10785,13 +10785,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3962,16 +3955,25 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -10893,7 +10893,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10885,7 +10885,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - -- accounts.google.com$1 sent a notification to your phone. Tap Yes to confirm it's you. Didn't get it?$2 -+ accounts.9oo91e.qjz9zk$1 sent a notification to your phone. Tap Yes to confirm it's you. Didn't get it?$2 + +- accounts.google.com$1 sent a notification to your phone. To confirm it's you, follow the steps there. ++ accounts.9oo91e.qjz9zk$1 sent a notification to your phone. To confirm it's you, follow the steps there. - + Didn't get it? -@@ -11004,7 +11004,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10900,7 +10900,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + Security key request + + +- accounts.google.com$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. ++ accounts.9oo91e.qjz9zk$1 sent a notification to your phone. To confirm it's you, tap the “Verify with this phone$2” notification and follow the steps. + + + +@@ -10999,7 +10999,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3980,7 +3982,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -11020,7 +11020,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11015,7 +11015,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 @@ -3989,7 +3991,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. -@@ -11029,13 +11029,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11024,13 +11024,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4005,7 +4007,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -11232,7 +11232,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11238,7 +11238,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4017,7 +4019,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd -@@ -332,7 +332,7 @@ chromium_strings.grd. --> +@@ -337,7 +337,7 @@ chromium_strings.grd. --> To send a number from here to your Android phone, sign in to Chrome on both devices. @@ -4026,7 +4028,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Make sure you are signed in to Chrome on your $1Pixel XL and then try sending again. -@@ -580,7 +580,7 @@ Google Chrome is unable to recover your settings. +@@ -590,7 +590,7 @@ Google Chrome is unable to recover your settings. @@ -4035,7 +4037,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -675,10 +675,10 @@ Google Chrome is unable to recover your settings. +@@ -694,10 +694,10 @@ Google Chrome is unable to recover your settings. You're signed in to Chrome! @@ -4048,7 +4050,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate. -@@ -728,7 +728,7 @@ Google Chrome is unable to recover your settings. +@@ -747,7 +747,7 @@ Google Chrome is unable to recover your settings. @@ -4057,7 +4059,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -753,10 +753,10 @@ Google Chrome is unable to recover your settings. +@@ -772,10 +772,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. @@ -4120,8 +4122,8 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts +See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for more details about the presubmit API built into depot_tools, and see --https://chromium.googlesource.com/chromium/src/+/master/styleguide/web/web.md -+https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/styleguide/web/web.md +-https://chromium.googlesource.com/chromium/src/+/main/styleguide/web/web.md ++https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/styleguide/web/web.md for the rules we're checking against here. """ @@ -4147,7 +4149,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3614,7 +3614,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3713,7 +3713,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -4156,7 +4158,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"load-media-router-component-extension", flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -3870,7 +3870,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3958,7 +3958,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4201,6 +4203,18 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/ for more details about the presubmit API built into depot_tools. """ +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; + + constexpr char kWebApkServerUrl[] = +- "https://webapk.googleapis.com/v1/webApks?key="; ++ "https://webapk.9oo91eapis.qjz9zk/v1/webApks?key="; + + constexpr net::NetworkTrafficAnnotationTag kWebApksTrafficAnnotation = + net::DefineNetworkTrafficAnnotation("webapk_minter_install_request", diff --git a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc --- a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc +++ b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc @@ -4264,7 +4278,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 -@@ -118,8 +118,8 @@ bool IsEmailDomainSupported(const Profile* profile) { +@@ -119,8 +119,8 @@ bool IsEmailDomainSupported(const Profile* profile) { const std::string email = GetUser(profile)->GetAccountId().GetUserEmail(); DCHECK(!email.empty()); @@ -4322,10 +4336,70 @@ 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/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[] = + "com.google.android.apps.kids.familylinkhelper"; + // static + const char ChildUserService::kFamilyLinkHelperAppPlayStoreURL[] = +- "https://play.google.com/store/apps/" ++ "https://play.9oo91e.qjz9zk/store/apps/" + "details?id=com.google.android.apps.kids.familylinkhelper"; + + ChildUserService::TestApi::TestApi(ChildUserService* service) +diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +--- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html ++++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +@@ -5,7 +5,7 @@ + + $i18n{blockPageTitle} +- ++ + + + +diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc +--- a/chrome/browser/ash/crostini/crostini_util.cc ++++ b/chrome/browser/ash/crostini/crostini_util.cc +@@ -62,7 +62,7 @@ const char kCrostiniDefaultVmName[] = "termina"; + const char kCrostiniDefaultContainerName[] = "penguin"; + const char kCrostiniDefaultUsername[] = "emperor"; + const char kCrostiniDefaultImageServerUrl[] = +- "https://storage.googleapis.com/cros-containers/%d"; ++ "https://storage.9oo91eapis.qjz9zk/cros-containers/%d"; + const char kCrostiniStretchImageAlias[] = "debian/stretch"; + const char kCrostiniBusterImageAlias[] = "debian/buster"; + const char kCrostiniDlcName[] = "termina-dlc"; +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) { + + // Template URL where to fetch OEM services customization manifest from. + const char ServicesCustomizationDocument::kManifestUrl[] = +- "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; ++ "https://ssl.95tat1c.qjz9zk/chrome/chromeos-customization/%s.json"; + + // 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/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 +@@ -38,7 +38,7 @@ const int kDefaultWidth = 384; + const int kDefaultHeight = 428; + + constexpr char kCrOSHaTSURL[] = +- "https://storage.googleapis.com/chromeos-hats-web-stable/index.html"; ++ "https://storage.9oo91eapis.qjz9zk/chromeos-hats-web-stable/index.html"; + + // Keyword used to join the separate device info elements into a single string + // to be used as site context. diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc -@@ -19,7 +19,7 @@ const char kKeyPsk[] = "psk"; +@@ -18,7 +18,7 @@ const char kKeyPsk[] = "psk"; const char kKeySerializedBeaconSeeds[] = "serializedBeaconSeeds"; const char kKeyUnlockKey[] = "unlockKey"; const char kKeyLabelPrefix[] = "easy-unlock-"; @@ -4353,7 +4427,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 -@@ -71,7 +71,7 @@ const char kAcceptValue[] = +@@ -72,7 +72,7 @@ const char kAcceptValue[] = "Accept=text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"; const char kPasswordSyncTokenBaseEndPoint[] = @@ -4365,7 +4439,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 -@@ -38,7 +38,7 @@ namespace chromeos { +@@ -37,7 +37,7 @@ namespace ash { namespace { constexpr const char kGetAppListUrl[] = @@ -4374,6 +4448,27 @@ diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetc constexpr int kResponseErrorNotEnoughApps = 5; +diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc +--- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc ++++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc +@@ -107,7 +107,7 @@ class PluginVmDiagnostics : public base::RefCounted { + entry.SetFail( + IDS_VM_STATUS_PAGE_EPHEMERAL_PROFILE_EXPLANATION, + /*learn_more_link=*/ +- GURL("https://support.google.com/chromebook?p=ephemeral_mode")); ++ GURL("https://support.9oo91e.qjz9zk/chromebook?p=ephemeral_mode")); + break; + case ProfileSupported::kErrorNotSupported: + entry.SetFail(IDS_VM_STATUS_PAGE_UNSUPPORTED_PROFILE_EXPLANATION); +@@ -212,7 +212,7 @@ class PluginVmDiagnostics : public base::RefCounted { + l10n_util::GetStringUTF16(IDS_PLUGIN_VM_APP_NAME)), + /*learn_more_link=*/ + GURL( +- "https://support.google.com/chromebook?p=parallels_setup")); ++ "https://support.9oo91e.qjz9zk/chromebook?p=parallels_setup")); + } else { + // Everything is good. Do nothing. + } 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 @@ -4392,7 +4487,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash --- 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() { - base::Optional GetIdFromDriveUrl(const GURL& url) { + absl::optional GetIdFromDriveUrl(const GURL& url) { const std::string& spec = url.spec(); - const std::string kOpenUrlBase = "https://drive.google.com/open?"; @@ -4400,7 +4495,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 @@ base::Optional GetIdFromDriveUrl(const GURL& url) { +@@ -139,9 +139,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { // These will match some invalid URLs, which is fine. const std::string kViewUrlPatternWithDomain = @@ -4442,7 +4537,7 @@ diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrom diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni --- a/chrome/browser/buildflags.gni +++ b/chrome/browser/buildflags.gni -@@ -15,7 +15,7 @@ declare_args() { +@@ -16,7 +16,7 @@ declare_args() { # TODO(crbug.com/1054060) enable_chromium_updater = false @@ -4451,10 +4546,34 @@ diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni # across the board. Until then, this buildflag allows some platforms to use # app_session_service and some not. enable_app_session_service = +diff --git a/chrome/browser/cart/cart_discount_fetcher.cc b/chrome/browser/cart/cart_discount_fetcher.cc +--- a/chrome/browser/cart/cart_discount_fetcher.cc ++++ b/chrome/browser/cart/cart_discount_fetcher.cc +@@ -26,7 +26,7 @@ const char kPostMethod[] = "POST"; + const char kContentType[] = "application/json; charset=UTF-8"; + + const char kFetchDiscountsEndpoint[] = +- "https://memex-pa.googleapis.com/v1/shopping/cart/discounts"; ++ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounts"; + const int64_t kTimeoutMs = 30000; + + struct DiscountInfo { +diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/cart/cart_discount_link_fetcher.cc +--- a/chrome/browser/cart/cart_discount_link_fetcher.cc ++++ b/chrome/browser/cart/cart_discount_link_fetcher.cc +@@ -22,7 +22,7 @@ const char kPostMethod[] = "POST"; + const char kContentType[] = "application/json; charset=UTF-8"; + + const char kFetchDiscountLinkEndpoint[] = +- "https://memex-pa.googleapis.com/v1/shopping/cart/discounted"; ++ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounted"; + const int64_t kTimeoutMs = 30000; + } // namespace + diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc --- a/chrome/browser/cart/cart_service.cc +++ b/chrome/browser/cart/cart_service.cc -@@ -255,7 +255,7 @@ void CartService::AddCartsWithFakeData() { +@@ -449,7 +449,7 @@ void CartService::AddCartsWithFakeData() { // Polulate and add some carts with fake data. double time_now = base::Time::Now().ToDoubleT(); cart_db::ChromeCartContentProto dummy_proto1; @@ -4463,7 +4582,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv 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()); -@@ -264,17 +264,17 @@ void CartService::AddCartsWithFakeData() { +@@ -458,17 +458,17 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"15%")); dummy_proto1.add_product_image_urls( @@ -4487,7 +4606,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv diff --git a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json --- a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json +++ b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ "lululemon.com": "https://shop.lululemon.com/shop/mybag", "lulus.com": "https://www.lulus.com/checkout/bag", "macys.com": "https://www.macys.com/my-bag", @@ -4499,7 +4618,7 @@ diff --git a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json b/c diff --git a/chrome/browser/cart/resources/cart_domain_name_mapping.json b/chrome/browser/cart/resources/cart_domain_name_mapping.json --- a/chrome/browser/cart/resources/cart_domain_name_mapping.json +++ b/chrome/browser/cart/resources/cart_domain_name_mapping.json -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ "lululemon.com": "lululemon", "lulus.com": "Lulus", "macys.com": "Macy's", @@ -4561,54 +4680,6 @@ diff --git a/chrome/browser/chromeos/android_sms/android_sms_urls.cc b/chrome/br break; } return stream; -diff --git a/chrome/browser/chromeos/child_accounts/child_user_service.cc b/chrome/browser/chromeos/child_accounts/child_user_service.cc ---- a/chrome/browser/chromeos/child_accounts/child_user_service.cc -+++ b/chrome/browser/chromeos/child_accounts/child_user_service.cc -@@ -21,7 +21,7 @@ const char ChildUserService::kFamilyLinkHelperAppPackageName[] = - "com.google.android.apps.kids.familylinkhelper"; - // static - const char ChildUserService::kFamilyLinkHelperAppPlayStoreURL[] = -- "https://play.google.com/store/apps/" -+ "https://play.9oo91e.qjz9zk/store/apps/" - "details?id=com.google.android.apps.kids.familylinkhelper"; - - ChildUserService::TestApi::TestApi(ChildUserService* service) -diff --git a/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html b/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html ---- a/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -+++ b/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -@@ -5,7 +5,7 @@ - - $i18n{blockPageTitle} -- -+ - - - -diff --git a/chrome/browser/chromeos/crostini/crostini_util.cc b/chrome/browser/chromeos/crostini/crostini_util.cc ---- a/chrome/browser/chromeos/crostini/crostini_util.cc -+++ b/chrome/browser/chromeos/crostini/crostini_util.cc -@@ -64,7 +64,7 @@ const char kCrostiniDefaultUsername[] = "emperor"; - // Generated using crx_file::id_util::GenerateId("LinuxAppsFolder") - const char kCrostiniFolderId[] = "ddolnhmblagmcagkedkbfejapapdimlk"; - const char kCrostiniDefaultImageServerUrl[] = -- "https://storage.googleapis.com/cros-containers/%d"; -+ "https://storage.9oo91eapis.qjz9zk/cros-containers/%d"; - const char kCrostiniStretchImageAlias[] = "debian/stretch"; - const char kCrostiniBusterImageAlias[] = "debian/buster"; - const char kCrostiniDlcName[] = "termina-dlc"; -diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc ---- a/chrome/browser/chromeos/customization/customization_document.cc -+++ b/chrome/browser/chromeos/customization/customization_document.cc -@@ -172,7 +172,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { - - // Template URL where to fetch OEM services customization manifest from. - const char ServicesCustomizationDocument::kManifestUrl[] = -- "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; -+ "https://ssl.95tat1c.qjz9zk/chrome/chromeos-customization/%s.json"; - - // A custom extensions::ExternalLoader that the ServicesCustomizationDocument - // creates and uses to publish OEM default apps to the extensions system. 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 @@ -4620,11 +4691,11 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.c + scopes.emplace_back("https://www.9oo91eapis.qjz9zk/auth/drive.readonly"); scoped_refptr url_loader_factory = - content::BrowserContext::GetDefaultStoragePartition(browser_context()) + 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 -@@ -81,7 +81,7 @@ namespace { +@@ -82,7 +82,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -4636,7 +4707,7 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc 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 -@@ -28,25 +28,25 @@ namespace { +@@ -27,25 +27,25 @@ namespace { // Location of the page to buy more storage for Google Drive. const char kGoogleDriveBuyStorageUrl[] = @@ -4671,7 +4742,7 @@ diff --git a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc b/ 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 -@@ -59,7 +59,7 @@ int kWebContentsTimeoutSeconds = 15; +@@ -60,7 +60,7 @@ int kWebContentsTimeoutSeconds = 15; // Google Drive enable offline endpoint. const char kDriveOfflineEndpointUrl[] = @@ -4680,7 +4751,7 @@ diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/c // Google Drive app id. const char kDriveHostedAppId[] = "apdfllckaahabafndbhieahigkjlhalf"; -@@ -69,7 +69,7 @@ const char kDriveOfflineNotificationId[] = "chrome://drive/enable-offline"; +@@ -70,7 +70,7 @@ const char kDriveOfflineNotificationId[] = "chrome://drive/enable-offline"; // The URL of the support page opened when the notification button is clicked. const char kDriveOfflineSupportUrl[] = @@ -4689,22 +4760,10 @@ diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/c } // namespace -diff --git a/chrome/browser/chromeos/hats/hats_dialog.cc b/chrome/browser/chromeos/hats/hats_dialog.cc ---- a/chrome/browser/chromeos/hats/hats_dialog.cc -+++ b/chrome/browser/chromeos/hats/hats_dialog.cc -@@ -39,7 +39,7 @@ const int kDefaultWidth = 340; - const int kDefaultHeight = 260; - - constexpr char kCrOSHaTSURL[] = -- "https://storage.googleapis.com/chromeos-hats-web-stable/index.html"; -+ "https://storage.9oo91eapis.qjz9zk/chromeos-hats-web-stable/index.html"; - - // Keyword used to join the separate device info elements into a single string - // to be used as site context. 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 -@@ -28,16 +28,16 @@ const char kMaxTextBeforeCursorLength = 50; +@@ -33,16 +33,16 @@ const char kMaxTextBeforeCursorLength = 50; const char* kAllowedDomainsForPersonalInfoSuggester[] = { "discord.com", "messenger.com", "web.whatsapp.com", @@ -4751,29 +4810,6 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_rout constexpr int kHttpPort = 80; // For an explanation of error codes, see "net/base/net_error_list.h". constexpr int kRetryResponseCodes[] = {net::ERR_TIMED_OUT, -diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc -@@ -41,7 +41,7 @@ constexpr int kTotalAdditionalHostsToQuery = 3; - // The length of a random eight letter prefix obtained by the characters from - // |kPossibleChars|. - constexpr int kHostPrefixLength = 8; --constexpr char kHostSuffix[] = "-ccd-testing-v4.metric.gstatic.com"; -+constexpr char kHostSuffix[] = "-ccd-testing-v4.metric.95tat1c.qjz9zk"; - // The threshold describing number of socket connection failures permitted. E.g. - // If connections to 10 sockets are attempted, any more than two failures would - // result in a problem. -@@ -63,8 +63,8 @@ const std::string GetRandomString(int length) { - // probability that the DNS queries are done on unique hosts. - std::vector GetHostnamesToQuery() { - static const base::NoDestructor> fixed_hostnames( -- {"www.google.com", "mail.google.com", "drive.google.com", -- "accounts.google.com", "plus.google.com", "groups.google.com"}); -+ {"www.9oo91e.qjz9zk", "mail.9oo91e.qjz9zk", "drive.9oo91e.qjz9zk", -+ "accounts.9oo91e.qjz9zk", "plus.9oo91e.qjz9zk", "groups.9oo91e.qjz9zk"}); - std::vector hostnames_to_query(fixed_hostnames->begin(), - fixed_hostnames->end()); - for (int i = 0; i < kTotalAdditionalHostsToQuery; i++) { diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc b/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc --- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc +++ b/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc @@ -4830,7 +4866,7 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_ 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 -@@ -29,11 +29,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; +@@ -30,11 +30,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; // The default destination we send our GCM messages to. const char kHeartbeatGCMDestinationID[] = "1013309121859"; @@ -4847,7 +4883,7 @@ diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/brow 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 -@@ -54,7 +54,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; +@@ -53,7 +53,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; constexpr mc::SystemNotificationWarningLevel kNotificationLevel = mc::SystemNotificationWarningLevel::NORMAL; const char kNotificationLearnMoreLink[] = @@ -4859,18 +4895,7 @@ diff --git a/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc b/ 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 -@@ -57,8 +57,8 @@ constexpr char kCRDConnectSuppressNotifications[] = "suppressNotifications"; - constexpr char kCRDTerminateUponInput[] = "terminateUponInput"; - - // Connect message parameter values: --constexpr char kCRDConnectXMPPServerValue[] = "talk.google.com:443"; --constexpr char kCRDConnectDirectoryBotValue[] = "remoting@bot.talk.google.com"; -+constexpr char kCRDConnectXMPPServerValue[] = "talk.9oo91e.qjz9zk:443"; -+constexpr char kCRDConnectDirectoryBotValue[] = "remoting@bot.talk.9oo91e.qjz9zk"; - - // CRD host states we care about: - constexpr char kCRDStateKey[] = "state"; -@@ -78,11 +78,11 @@ constexpr char kCRDConnectClientKey[] = "client"; +@@ -36,11 +36,11 @@ namespace { // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -4883,8 +4908,8 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc - "https://www.googleapis.com/auth/tachyon"; + "https://www.9oo91eapis.qjz9zk/auth/tachyon"; - } // namespace - + 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 @@ -4900,7 +4925,7 @@ diff --git a/chrome/browser/chromeos/u2f_notification.cc b/chrome/browser/chrome diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -291,11 +291,11 @@ void ProtocolHandlerRegistry::InstallDefaultsForChromeOS() { +@@ -222,11 +222,11 @@ void ProtocolHandlerRegistry::InstallDefaultsForChromeOS() { AddPredefinedHandler( ProtocolHandler::CreateProtocolHandler( "mailto", @@ -5085,7 +5110,7 @@ diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/ --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -333,7 +333,7 @@ void ExternalPrefLoader::LoadOnFileThread() { - if (!prefs->empty()) + if (!prefs->DictEmpty()) LOG(WARNING) << "You are using an old-style extension deployment method " "(external_extensions.json), which will soon be " - "deprecated. (see http://developer.chrome.com/" @@ -5156,7 +5181,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 -@@ -562,7 +562,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = +@@ -561,7 +561,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = "Detect target embedding domains as lookalikes."; const char kDetectTargetEmbeddingLookalikesDescription[] = "Shows a lookalike interstitial when navigating to target embedding domains" @@ -5165,7 +5190,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeviceDiscoveryNotificationsName[] = "Device Discovery Notifications"; -@@ -2155,7 +2155,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2185,7 +2185,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 " @@ -5291,6 +5316,21 @@ diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/bro struct BadBinaryData { const char* data; +diff --git a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc +--- a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc ++++ b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc +@@ -27,9 +27,9 @@ + namespace { + + constexpr base::StringPiece kLearnMoreURLPublic( +- "https://support.google.com/chromebook?p=chromeos-dev"); ++ "https://support.9oo91e.qjz9zk/chromebook?p=chromeos-dev"); + constexpr base::StringPiece kLearnMoreURLGoogleInternal( +- "https://goto.google.com/lacros-learn-more"); ++ "https://goto.9oo91e.qjz9zk/lacros-learn-more"); + + // Returns the single main profile, or nullptr if none is found. + Profile* GetMainProfile() { diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm --- a/chrome/browser/local_discovery/service_discovery_client_mac.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -5329,7 +5369,7 @@ diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provide diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc -@@ -688,12 +688,12 @@ std::vector DialMediaRouteProvider::GetOrigins( +@@ -695,12 +695,12 @@ std::vector DialMediaRouteProvider::GetOrigins( base::flat_map>> origin_allowlist( {{"YouTube", @@ -5387,7 +5427,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -@@ -32,7 +32,7 @@ std::u16string NaClInfoBarDelegate::GetLinkText() const { +@@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetLinkText() const { } GURL NaClInfoBarDelegate::GetLinkURL() const { @@ -5433,6 +5473,64 @@ diff --git a/chrome/browser/nearby_sharing/instantmessaging/constants.h b/chrome // Template for optional OAuth2 authorization HTTP header. const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; +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 @@ + namespace { + + const char kNetworkTraversalIceConfigApiUrl[] = +- "https://networktraversal.googleapis.com/v1alpha/iceconfig?key="; ++ "https://networktraversal.9oo91eapis.qjz9zk/v1alpha/iceconfig?key="; + + // 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) { + + std::vector GetDefaultIceServers() { + sharing::mojom::IceServerPtr ice_server(sharing::mojom::IceServer::New()); +- ice_server->urls.emplace_back("stun:stun.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun1.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun2.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun3.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun4.l.google.com:19302"); ++ ice_server->urls.emplace_back("stun:stun.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun1.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun2.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun3.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun4.l.9oo91e.qjz9zk:19302"); + + std::vector default_servers; + default_servers.push_back(std::move(ice_server)); +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 { + namespace tachyon_proto = nearbyshare::tachyon_proto; + + const char kIceConfigApiUrl[] = +- "https://instantmessaging-pa.googleapis.com/v1/peertopeer:geticeserver"; ++ "https://instantmessaging-pa.9oo91eapis.qjz9zk/v1/peertopeer:geticeserver"; + + const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; + +@@ -166,11 +166,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader, + + std::vector GetDefaultIceServers() { + sharing::mojom::IceServerPtr ice_server(sharing::mojom::IceServer::New()); +- ice_server->urls.emplace_back("stun:stun.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun1.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun2.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun3.l.google.com:19302"); +- ice_server->urls.emplace_back("stun:stun4.l.google.com:19302"); ++ ice_server->urls.emplace_back("stun:stun.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun1.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun2.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun3.l.9oo91e.qjz9zk:19302"); ++ ice_server->urls.emplace_back("stun:stun4.l.9oo91e.qjz9zk:19302"); + + std::vector default_servers; + default_servers.push_back(std::move(ice_server)); 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 @@ -5484,7 +5582,7 @@ diff --git a/chrome/browser/performance_hints/performance_hints_features.cc b/ch diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc -@@ -31,7 +31,7 @@ using QuietUiReason = +@@ -30,7 +30,7 @@ using QuietUiReason = permissions::PermissionUiSelector::QuietUiReason; // The URL for when the user clicks the "Learn more" link. constexpr char kNotificationsHelpUrl[] = @@ -5608,8 +5706,8 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br + Licensing for Chromium OS Package Owners

If you need to change styles, fonts, layout, etc of chrome://os_credits page, --edit chromite/licensing/about_credits.tmpl. -+edit chromite/licensing/about_credits.tmpl. +-edit chromite/licensing/about_credits.tmpl. ++edit chromite/licensing/about_credits.tmpl. The template is used to generate a device-dependent about_os_credits.html when a CrOS image is built.

@@ -5637,7 +5735,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1480,13 +1480,13 @@ CommandHandler.init = function() { +@@ -1483,13 +1483,13 @@ CommandHandler.init = function() { } }); @@ -5726,7 +5824,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js --- a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +++ b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js -@@ -685,15 +685,15 @@ Polymer({ +@@ -705,15 +705,15 @@ Polymer({ { msgId: 'next_command_reference', link: @@ -6353,7 +6451,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 -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@
Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -6417,8 +6515,8 @@ diff --git a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/README part of browser_tests, files under this directory should be removed. If you want to run tests under this diretory, see: --https://chromium.googlesource.com/apps/unpacker/+/master/README.md -+https://chromium.9oo91esource.qjz9zk/apps/unpacker/+/master/README.md +-https://chromium.googlesource.com/apps/unpacker/+/main/README.md ++https://chromium.9oo91esource.qjz9zk/apps/unpacker/+/main/README.md diff --git a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile b/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile --- a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile @@ -6427,15 +6525,15 @@ diff --git a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Ma # manually. # -disable-setuid-sandbox is optional, but otherwise it is necessary to set up # the sandbox for development. See --# https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox_development.md -+# https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox_development.md +-# https://chromium.googlesource.com/chromium/src/+/main/docs/linux/suid_sandbox_development.md ++# https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/linux/suid_sandbox_development.md .PHONY: tests_run tests_run: check_for_chrome all $(TEST_PAGE) $(RUN_PY) -C $(CURDIR) -P $(TEST_PAGE_CONFIG) \ diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js --- a/chrome/browser/resources/cryptotoken/enroller.js +++ b/chrome/browser/resources/cryptotoken/enroller.js -@@ -853,7 +853,7 @@ Enroller.prototype.sendEnrollRequestToHelper_ = function() { +@@ -860,7 +860,7 @@ Enroller.prototype.sendEnrollRequestToHelper_ = function() { }; const googleCorpAppId = @@ -6447,7 +6545,31 @@ diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/r diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json -@@ -27,17 +27,17 @@ +@@ -3,37 +3,37 @@ + { + // YouTube + "blpcfgokakmgnkcojhhkbfbldkacnbeo" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx", ++ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", + "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsNonGSuite" + }, + // GMail + "pjkljhegncpnkpknbcohdijeoejaedia" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx", ++ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", + "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" + }, + // Google Drive + "apdfllckaahabafndbhieahigkjlhalf" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx", ++ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", + "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" + }, + // Google Docs + "aohghmighlieiainnegkcijnfilokake" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx", ++ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", + "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" }, // Google Sheets "aapocclcgogkmnckokdopfmhonfmgoek" : { @@ -6572,7 +6694,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 -@@ -678,7 +678,7 @@ cr.define('cr.login', function() { +@@ -721,7 +721,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -6811,7 +6933,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js diff --git a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js b/chrome/browser/resources/new_tab_page/doodle_share_dialog.js --- a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js +++ b/chrome/browser/resources/new_tab_page/doodle_share_dialog.js -@@ -44,7 +44,7 @@ class DoodleShareDialogElement extends PolymerElement { +@@ -51,7 +51,7 @@ class DoodleShareDialogElement extends mixinBehaviors /** @private */ onFacebookClick_() { @@ -6823,19 +6945,19 @@ 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 -@@ -60,7 +60,7 @@ class DriveModuleElement extends mixinBehaviors +@@ -76,7 +76,7 @@ class DriveModuleElement extends mixinBehaviors * @private */ getImageSrc_(file) { -- return 'https://drive-thirdparty.googleusercontent.com/16/type/' + -+ return 'https://drive-thirdparty.9oo91eusercontent.qjz9zk/16/type/' + +- return 'https://drive-thirdparty.googleusercontent.com/32/type/' + ++ return 'https://drive-thirdparty.9oo91eusercontent.qjz9zk/32/type/' + file.mimeType; } diff --git a/chrome/browser/resources/new_tab_page/voice_search_overlay.js b/chrome/browser/resources/new_tab_page/voice_search_overlay.js --- a/chrome/browser/resources/new_tab_page/voice_search_overlay.js +++ b/chrome/browser/resources/new_tab_page/voice_search_overlay.js -@@ -176,7 +176,7 @@ class VoiceSearchOverlayElement extends PolymerElement { +@@ -218,7 +218,7 @@ class VoiceSearchOverlayElement extends mixinBehaviors helpUrl_: { type: String, readOnly: true, @@ -6872,8 +6994,8 @@ diff --git a/chrome/browser/resources/omnibox/omnibox_output.js b/chrome/browser ['duplicates'], OutputTextProperty), new Column( ['pi'], -- 'https://source.chromium.org/chromium/chromium/src/+/master:components/omnibox/browser/omnibox_pedal_concepts.h;l=19;drc=c741e070dbfcc33b2369e7a5131be87c7b21bb99', -+ 'https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/master:components/omnibox/browser/omnibox_pedal_concepts.h;l=19;drc=c741e070dbfcc33b2369e7a5131be87c7b21bb99', +- 'https://source.chromium.org/chromium/chromium/src/+/main:components/omnibox/browser/omnibox_pedal_concepts.h;l=19;drc=c741e070dbfcc33b2369e7a5131be87c7b21bb99', ++ 'https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/main:components/omnibox/browser/omnibox_pedal_concepts.h;l=19;drc=c741e070dbfcc33b2369e7a5131be87c7b21bb99', 'pedalId', false, 'Pedal ID\nThe ID of attached Pedal, or zero if none.', ['pedalId'], OutputTextProperty), new Column( @@ -6958,7 +7080,7 @@ diff --git a/chrome/browser/resources/print_preview/ui/icons.html b/chrome/brows diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resources/proxy_config.html --- a/chrome/browser/resources/proxy_config.html +++ b/chrome/browser/resources/proxy_config.html -@@ -50,17 +50,17 @@ +@@ -49,17 +49,17 @@

@@ -7079,7 +7201,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 -@@ -382,7 +382,7 @@ +@@ -397,7 +397,7 @@ if="[[shouldShowAdditionalFeaturesLink_(isGuest_, isKioskModeActive_)]]"> kRemoteCopyAllowedOrigins = { - &kRemoteCopyReceiver, "RemoteCopyAllowedOrigins", -- "https://googleusercontent.com"}; -+ "https://9oo91eusercontent.qjz9zk"}; + namespace { + +-constexpr char kRemoteCopyAllowedOrigin[] = "https://googleusercontent.com"; ++constexpr char kRemoteCopyAllowedOrigin[] = "https://9oo91eusercontent.qjz9zk"; + + constexpr size_t kMaxImageDownloadSize = 5 * 1024 * 1024; - const base::Feature kRemoteCopyImageNotification{ - "RemoteCopyImageNotification", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/sharing/web_push/web_push_sender.cc b/chrome/browser/sharing/web_push/web_push_sender.cc --- a/chrome/browser/sharing/web_push/web_push_sender.cc +++ b/chrome/browser/sharing/web_push/web_push_sender.cc @@ -7498,35 +7644,6 @@ diff --git a/chrome/browser/sharing/web_push/web_push_sender.cc b/chrome/browser // HTTP header constants. const char kTTL[] = "TTL"; -diff --git a/chrome/browser/sharing/webrtc/ice_config_fetcher.cc b/chrome/browser/sharing/webrtc/ice_config_fetcher.cc ---- a/chrome/browser/sharing/webrtc/ice_config_fetcher.cc -+++ b/chrome/browser/sharing/webrtc/ice_config_fetcher.cc -@@ -16,7 +16,7 @@ - - namespace { - const char kIceConfigApiUrl[] = -- "https://networktraversal.googleapis.com/v1alpha/iceconfig?key="; -+ "https://networktraversal.9oo91eapis.qjz9zk/v1alpha/iceconfig?key="; - - // 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 -@@ -75,11 +75,11 @@ bool IsLoaderSuccessful(const network::SimpleURLLoader* loader) { - - std::vector GetDefaultIceServers() { - sharing::mojom::IceServerPtr ice_server(sharing::mojom::IceServer::New()); -- ice_server->urls.emplace_back("stun:stun.l.google.com:19302"); -- ice_server->urls.emplace_back("stun:stun1.l.google.com:19302"); -- ice_server->urls.emplace_back("stun:stun2.l.google.com:19302"); -- ice_server->urls.emplace_back("stun:stun3.l.google.com:19302"); -- ice_server->urls.emplace_back("stun:stun4.l.google.com:19302"); -+ ice_server->urls.emplace_back("stun:stun.l.9oo91e.qjz9zk:19302"); -+ ice_server->urls.emplace_back("stun:stun1.l.9oo91e.qjz9zk:19302"); -+ ice_server->urls.emplace_back("stun:stun2.l.9oo91e.qjz9zk:19302"); -+ ice_server->urls.emplace_back("stun:stun3.l.9oo91e.qjz9zk:19302"); -+ ice_server->urls.emplace_back("stun:stun4.l.9oo91e.qjz9zk:19302"); - - std::vector default_servers; - default_servers.push_back(std::move(ice_server)); diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc @@ -7642,7 +7759,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -85,7 +85,7 @@ namespace { +@@ -86,7 +86,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = @@ -7703,9 +7820,9 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro - Ok: http://www.chromium.org/developers/design-documents/ui-localization + Ok: http://www.ch40m1um.qjz9zk/developers/design-documents/ui-localization - CHAR-LIMIT guidelines: + CHAR_LIMIT guidelines: Certain strings need character limits to prevent a long translation from breaking the UI. -@@ -892,7 +892,7 @@ Privacy Sandbox is still in active development and is available in selected regi +@@ -908,7 +908,7 @@ Privacy Sandbox trials are still in active development and are available in sele Choose another provider @@ -7714,7 +7831,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This setting is disabled on managed browsers -@@ -929,7 +929,7 @@ Privacy Sandbox is still in active development and is available in selected regi +@@ -945,7 +945,7 @@ Privacy Sandbox trials are still in active development and are available in sele The selected data has been removed from Chrome and your synced devices. @@ -7723,7 +7840,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cached images and files -@@ -966,10 +966,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -982,10 +982,10 @@ Your Google account may have other forms of browsing history like searches and a Record history even in incognito mode @@ -7731,12 +7848,12 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <link>myactivity.9oo91e.qjz9zk</link>. -- Clears history from all signed-in devices. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. -+ Clears history from all signed-in devices. Your Google Account may have other forms of browsing history at <link>myactivity.9oo91e.qjz9zk</link>. +- Clears history from all synced devices. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. ++ Clears history from all synced devices. Your Google Account may have other forms of browsing history at <link>myactivity.9oo91e.qjz9zk</link>. To clear <link1>search</link1> or other forms of history, visit <link2>My Google Activity</link2> -@@ -1032,7 +1032,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1051,7 +1051,7 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -7745,7 +7862,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Blocked site -@@ -1442,7 +1442,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1464,7 +1464,7 @@ Your Google account may have other forms of browsing history like searches and a In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <link>Learn more</link> @@ -7754,7 +7871,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Turn on Lite mode -@@ -1629,10 +1629,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1648,10 +1648,10 @@ Your Google account may have other forms of browsing history like searches and a Waiting for details of parents. @@ -7767,7 +7884,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Content -@@ -1691,22 +1691,22 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1710,22 +1710,22 @@ Your Google account may have other forms of browsing history like searches and a Google Terms of Service @@ -7794,7 +7911,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -1723,7 +1723,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1742,7 +1742,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -7803,7 +7920,16 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -1868,7 +1868,7 @@ To change this setting, <resetlink>reset sync

<learnmore>sync passphrase</learnmore> on %1$sSept 1, 2012. Enter it to start sync. + + +- Signed in as %1$sfoo@gmail.com. ++ Signed in as %1$sfoo@9ma1l.qjz9zk. + + + This field cannot be blank +@@ -1890,7 +1890,7 @@ To change this setting, <resetlink>reset sync

@@ -7812,7 +7938,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro <link>Get help</link> while scanning for devices… -@@ -1913,7 +1913,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -7821,7 +7947,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) -@@ -3758,7 +3758,7 @@ Data from your Incognito session will only be cleared from Chrome when you <resetlink>reset sync

@@ -7830,7 +7956,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro No compatible devices found -@@ -3797,7 +3797,7 @@ Data from your Incognito session will only be cleared from Chrome when you <resetlink>reset sync

@@ -7839,7 +7965,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Got it -@@ -4061,7 +4061,7 @@ Data from your Incognito session will only be cleared from Chrome when you <resetlink>reset sync

%1$sTanya's Pixel 2... @@ -7863,7 +7989,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 -@@ -28,7 +28,7 @@ namespace app_list { +@@ -27,7 +27,7 @@ namespace app_list { namespace { constexpr const char kGetAppListUrl[] = @@ -7875,7 +8001,7 @@ diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.c diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.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 -@@ -62,7 +62,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = +@@ -63,7 +63,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = })"); // The scope required for an access token in order to query ItemSuggest. @@ -7887,7 +8013,7 @@ diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.cc b/chr 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 -@@ -79,7 +79,7 @@ class ItemSuggestCache { +@@ -101,7 +101,7 @@ class ItemSuggestCache { // The url of the service that fetches descriptions given image pixels. static constexpr base::FeatureParam kServerUrl{ &kExperiment, "server_url", @@ -7899,7 +8025,7 @@ diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chro diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc --- a/chrome/browser/ui/app_list/search/omnibox_provider.cc +++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc -@@ -25,7 +25,7 @@ namespace { +@@ -28,7 +28,7 @@ namespace { bool IsDriveUrl(const GURL& url) { // Returns true if the |url| points to a Drive Web host. const std::string& host = url.host(); @@ -7949,15 +8075,15 @@ 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 -@@ -48,7 +48,7 @@ +@@ -54,7 +54,7 @@ namespace { const char kKeyboardShortcutHelpPageUrl[] = - "https://support.google.com/chromebook/answer/183101"; + "https://support.9oo91e.qjz9zk/chromebook/answer/183101"; - content::WebContents* GetActiveWebContentsForNativeBrowserWindow( - gfx::NativeWindow window) { + // Browser tests are always started with --disable-logging-redirect, so we need + // independent option here. diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/browser/ui/ash/in_session_auth_dialog_client.cc --- a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc +++ b/chrome/browser/ui/ash/in_session_auth_dialog_client.cc @@ -7985,7 +8111,7 @@ diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_browser_client_im diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h -@@ -18,7 +18,7 @@ class NavigationHandle; +@@ -17,7 +17,7 @@ class NavigationHandle; constexpr char kBlockTabUnderFormatMessage[] = "Chrome stopped this site from navigating to %s, see " @@ -8027,7 +8153,7 @@ diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrom diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -280,7 +280,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { +@@ -274,7 +274,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) void ShowChromeTips(Browser* browser) { @@ -8039,7 +8165,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. 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 -@@ -98,7 +98,7 @@ bool CanShare() { +@@ -99,7 +99,7 @@ bool CanShare() { // URLs in the pasteboard. This URL will not actually be shared to, just used // to fetch sharing services that can handle the NSURL type. NSArray* services = [NSSharingService @@ -8063,7 +8189,7 @@ diff --git a/chrome/browser/ui/commander/open_url_command_source.cc b/chrome/bro diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc b/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc --- a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc +++ b/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc -@@ -38,7 +38,7 @@ std::u16string InstallationErrorInfoBarDelegate::GetLinkText() const { +@@ -39,7 +39,7 @@ std::u16string InstallationErrorInfoBarDelegate::GetLinkText() const { } GURL InstallationErrorInfoBarDelegate::GetLinkURL() const { @@ -8075,19 +8201,19 @@ diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc --- a/chrome/browser/ui/managed_ui.cc +++ b/chrome/browser/ui/managed_ui.cc -@@ -57,7 +57,7 @@ base::Optional GetEnterpriseAccountDomain(Profile* profile) { +@@ -57,7 +57,7 @@ absl::optional GetEnterpriseAccountDomain(Profile* profile) { const std::string domain = enterprise_util::GetDomainFromEmail(profile->GetProfileUserName()); // Heuristic for most common consumer Google domains -- these are not managed. - if (domain.empty() || domain == "gmail.com" || domain == "googlemail.com") + if (domain.empty() || domain == "9ma1l.qjz9zk" || domain == "9oo91email.qjz9zk") - return base::nullopt; + return absl::nullopt; return domain; } 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 -@@ -284,7 +284,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -285,7 +285,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 " @@ -8099,7 +8225,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 -@@ -122,11 +122,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { +@@ -126,11 +126,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { void MediaRouterContextualMenu::ExecuteCommand(int command_id, int event_flags) { const char kAboutPageUrl[] = @@ -8117,7 +8243,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 -@@ -230,7 +230,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { +@@ -224,7 +224,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { [](Profile* profile) { NavigateParams params( profile, @@ -8141,7 +8267,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 -@@ -243,7 +243,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { +@@ -245,7 +245,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { // Test that the intent picker bubble will pop out for ARC apps. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, BubblePopOut) { @@ -8150,7 +8276,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(); -@@ -283,7 +283,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // bubble. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, OutOfScopeDoesNotShowBubble) { @@ -8159,7 +8285,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); -@@ -308,7 +308,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -310,7 +310,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // candidates. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, PWAOnlyShowBubble) { @@ -8168,7 +8294,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(); -@@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -350,7 +350,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) { @@ -8177,7 +8303,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(); -@@ -387,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -389,7 +389,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // apps. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, DismissBubble) { @@ -8186,7 +8312,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(); -@@ -544,7 +544,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -548,7 +548,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) { @@ -8195,18 +8321,6 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom PageActionIconView* intent_picker_view = GetIntentPickerIcon(); chrome::NewTab(browser()); -diff --git a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc ---- a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc -+++ b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc -@@ -155,7 +155,7 @@ base::Optional FindTabWithUrlPrefix(TabStripModel* tabs, - // showing the start page of Google Meet. - void ShowMeetTab(Profile* profile, - const base::Optional& meeting_id) { -- const GURL origin("https://meet.google.com"); -+ const GURL origin("https://meet.9oo91e.qjz9zk"); - const std::string path = meeting_id ? "/" + *meeting_id : std::string(); - - const auto& browsers = *BrowserList::GetInstance(); 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 @@ -8282,7 +8396,7 @@ diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRES diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc -@@ -70,7 +70,7 @@ void AutofillCacheResetter::ResetCache(Callback callback) { +@@ -69,7 +69,7 @@ void AutofillCacheResetter::ResetCache(Callback callback) { content::BrowsingDataFilterBuilder::Create( content::BrowsingDataFilterBuilder::Mode::kDelete); filter_builder->AddOrigin( @@ -8348,6 +8462,24 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b // Not initialized to a default value, since non-empty wifi_ssid is // considered a wifi connection, even if is_wifi_connection is false. std::string wifi_ssid; +diff --git a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc b/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc +--- a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc ++++ b/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc +@@ -107,12 +107,12 @@ CastFeedbackUI::CastFeedbackUI(content::WebUI* web_ui) + "formDescription", + l10n_util::GetStringFUTF8( + IDS_MEDIA_ROUTER_FEEDBACK_FORM_DESCRIPTION, +- u"https://support.google.com/chromecast?p=troubleshoot_chromecast")); ++ u"https://support.9oo91e.qjz9zk/chromecast?p=troubleshoot_chromecast")); + source->AddString( + "setupVisibilityQuestion", + l10n_util::GetStringFUTF8( + IDS_MEDIA_ROUTER_FEEDBACK_SETUP_VISIBILITY_QUESTION, +- u"https://support.google.com/chromecast?p=set_up_chromecast")); ++ u"https://support.9oo91e.qjz9zk/chromecast?p=set_up_chromecast")); + + // Supply media router log data to UI. + MediaRouter* const router = diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc --- a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc @@ -8390,23 +8522,6 @@ diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/br "fUx750lchxFJb3f37v_-" "4iJPzcTKtJbd5LDRO7S9Xy7nkPzh7HFU61tN36j4Diaa9Yk3K7kWshRwmqcrulnhbeJrRp" "In79PjHN-N=w170-h85-p-k-no-nd-mv"}}); -diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc ---- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -@@ -267,11 +267,11 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource( - source->AddString( - "modulesTasksInfo1", - l10n_util::GetStringFUTF16(IDS_NTP_MODULES_SHOPPING_TASKS_INFO_1, -- u"https://myactivity.google.com/")); -+ u"https://myactivity.9oo91e.qjz9zk/")); - source->AddString( - "modulesTasksInfo2", - l10n_util::GetStringFUTF16(IDS_NTP_MODULES_SHOPPING_TASKS_INFO_2, -- u"https://policies.google.com/")); -+ u"https://policies.9oo91e.qjz9zk/")); - - // Register images that are purposefully not inlined in the HTML and instead - // are set in Javascript. 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 @@ -8422,7 +8537,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 -@@ -68,22 +68,22 @@ namespace { +@@ -67,22 +67,22 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -8477,7 +8592,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 -@@ -1429,7 +1429,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1433,7 +1433,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( @@ -8605,6 +8720,18 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calend info->display_mode = DisplayMode::kStandalone; info->icon_bitmaps.any = LoadBundledIcons( {IDR_PREINSTALLED_WEB_APPS_GOOGLE_CALENDAR_ICON_192_PNG}); +diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc +--- a/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc ++++ b/chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc +@@ -11,7 +11,7 @@ namespace web_app { + ExternalInstallOptions GetConfigForGoogleChat() { + ExternalInstallOptions options( + /*install_url=*/GURL( +- "https://mail.google.com/chat/download?usp=chrome_default"), ++ "https://mail.9oo91e.qjz9zk/chat/download?usp=chrome_default"), + /*user_display_mode=*/DisplayMode::kStandalone, + /*install_source=*/ExternalInstallSource::kExternalDefault); + diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc @@ -8651,6 +8778,18 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_drive. info->display_mode = DisplayMode::kStandalone; info->icon_bitmaps.any = LoadBundledIcons({IDR_PREINSTALLED_WEB_APPS_GOOGLE_DRIVE_ICON_192_PNG}); +diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc +--- a/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc ++++ b/chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc +@@ -11,7 +11,7 @@ namespace web_app { + ExternalInstallOptions GetConfigForGoogleMeet() { + ExternalInstallOptions options( + /*install_url=*/GURL( +- "https://meet.google.com/download/webapp?usp=chrome_default"), ++ "https://meet.9oo91e.qjz9zk/download/webapp?usp=chrome_default"), + /*user_display_mode=*/DisplayMode::kStandalone, + /*install_source=*/ExternalInstallSource::kExternalDefault); + diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc @@ -8723,7 +8862,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc -@@ -54,7 +54,7 @@ namespace { +@@ -55,7 +55,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -8735,8 +8874,8 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -372,7 +372,7 @@ void ChromeAuthenticatorRequestDelegate::RegisterActionCallbacks( - bool ChromeAuthenticatorRequestDelegate::ShouldPermitIndividualAttestation( +@@ -211,7 +211,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( + content::BrowserContext* browser_context, const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = - "https://www.gstatic.com/securitykey/a/google.com/origins.json"; @@ -8744,7 +8883,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ // If the RP ID is actually the Google corp App ID (because the request is // actually a U2F request originating from cryptotoken), or is listed in the -@@ -678,11 +678,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -757,11 +757,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( // everything to QR-code or sync-based pairing, we don't want use of the // extension to spread without consideration. Therefore it's limited to // origins that are already depending on it and test sites. @@ -8950,7 +9089,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext "browserAction.openPopup": [{ "channel": "dev", "dependencies": ["manifest:browser_action"], -@@ -282,7 +282,7 @@ +@@ -278,7 +278,7 @@ "dashboardPrivate": [{ "channel": "stable", "contexts": ["blessed_web_page", "web_page"], @@ -9103,7 +9242,7 @@ diff --git a/chrome/common/extensions/api/privacy.json b/chrome/common/extension diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/api/tabs.json --- a/chrome/common/extensions/api/tabs.json +++ b/chrome/common/extensions/api/tabs.json -@@ -351,7 +351,7 @@ +@@ -355,7 +355,7 @@ "url": { "type": "string", "optional": true, @@ -9112,7 +9251,7 @@ diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/a }, "active": { "type": "boolean", -@@ -806,7 +806,7 @@ +@@ -810,7 +810,7 @@ { "type": "string", "name": "language", @@ -9184,7 +9323,7 @@ diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/commo diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_url_loader_throttle.cc --- a/chrome/common/google_url_loader_throttle.cc +++ b/chrome/common/google_url_loader_throttle.cc -@@ -86,7 +86,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( +@@ -84,7 +84,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -9193,7 +9332,7 @@ diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_ request->cors_exempt_headers.SetHeader( safe_search_util::kGoogleAppsAllowedDomains, dynamic_params_.allowed_domains_for_apps); -@@ -149,7 +149,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( +@@ -138,7 +138,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -9295,7 +9434,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,223 +98,223 @@ const char kChromeSearchScheme[] = "chrome-search"; +@@ -98,229 +98,229 @@ const char kChromeSearchScheme[] = "chrome-search"; const char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; @@ -9376,6 +9515,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://myaccount.google.com/activitycontrols/search"; + "https://myaccount.9oo91e.qjz9zk/activitycontrols/search"; + const char kGoogleAccountLanguagesURL[] = +- "https://myaccount.google.com/language"; ++ "https://myaccount.9oo91e.qjz9zk/language"; + -const char kGoogleAccountURL[] = "https://myaccount.google.com"; +const char kGoogleAccountURL[] = "https://myaccount.9oo91e.qjz9zk"; @@ -9494,6 +9637,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chrome/?p=safety_tip"; + "https://support.9oo91e.qjz9zk/chrome/?p=safety_tip"; + const char kSearchHistoryUrlInClearBrowsingData[] = +- "https://myactivity.google.com/product/search?utm_source=chrome_cbd"; ++ "https://myactivity.9oo91e.qjz9zk/product/search?utm_source=chrome_cbd"; + const char kSeeMoreSecurityTipsURL[] = - "https://support.google.com/accounts/answer/32040"; + "https://support.9oo91e.qjz9zk/accounts/answer/32040"; @@ -9583,7 +9730,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/"; -@@ -329,18 +329,18 @@ const char kChromeOSGestureEducationHelpURL[] = +@@ -335,18 +335,18 @@ const char kChromeOSGestureEducationHelpURL[] = "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = @@ -9606,7 +9753,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"; -@@ -349,101 +349,101 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -355,101 +355,101 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -9738,7 +9885,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"; -@@ -451,12 +451,12 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -457,12 +457,12 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -10482,6 +10629,18 @@ diff --git a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json b/ch "midwayusa.com": "^https://(www|ads).midwayusa.com/cart/?$", "neimanmarcus.com": "^https://www.neimanmarcus.com/checkout/cart.jsp/?$", "newegg.com": "^https://secure.newegg.com/shop/cart/?$", +diff --git a/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", + "cyclegear.com": "blueconic.net", + "electronicexpress.com": ".*", +-"evo.com": "google-analytics\\.com", ++"evo.com": "9oo91e-analytics\\.qjz9zk", + "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 @@ -10520,7 +10679,7 @@ diff --git a/chrome/services/mac_notifications/mac_notification_service_ns.mm b/ diff --git a/chrome/services/speech/cloud_speech_recognition_client.cc b/chrome/services/speech/cloud_speech_recognition_client.cc --- a/chrome/services/speech/cloud_speech_recognition_client.cc +++ b/chrome/services/speech/cloud_speech_recognition_client.cc -@@ -32,7 +32,7 @@ constexpr base::TimeDelta kMaximumPauseDuration = +@@ -33,7 +33,7 @@ constexpr base::TimeDelta kMaximumPauseDuration = base::TimeDelta::FromSeconds(28); constexpr char kWebServiceBaseUrl[] = @@ -10696,7 +10855,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 -@@ -157,7 +157,7 @@ if (chromecast_branding == "public") { +@@ -152,7 +152,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. @@ -10762,23 +10921,23 @@ diff --git a/chromecast/crash/linux/minidump_uploader.cc b/chromecast/crash/linu const char kVirtualChannel[] = "virtual-channel"; -diff --git a/chromecast/net/connectivity_checker_impl.cc b/chromecast/net/connectivity_checker_impl.cc ---- a/chromecast/net/connectivity_checker_impl.cc -+++ b/chromecast/net/connectivity_checker_impl.cc -@@ -47,11 +47,11 @@ const unsigned int kRequestTimeoutInSeconds = 3; +diff --git a/chromecast/net/connectivity_checker_impl.h b/chromecast/net/connectivity_checker_impl.h +--- a/chromecast/net/connectivity_checker_impl.h ++++ b/chromecast/net/connectivity_checker_impl.h +@@ -36,11 +36,11 @@ namespace chromecast { - // Default url for connectivity checking. - const char kDefaultConnectivityCheckUrl[] = + // Default (HTTPS) url for connectivity checking. + constexpr char kDefaultConnectivityCheckUrl[] = - "https://connectivitycheck.gstatic.com/generate_204"; + "https://connectivitycheck.95tat1c.qjz9zk/generate_204"; - // Http url for connectivity checking. - const char kHttpConnectivityCheckUrl[] = + // HTTP url for connectivity checking. + constexpr char kHttpConnectivityCheckUrl[] = - "http://connectivitycheck.gstatic.com/generate_204"; + "http://connectivitycheck.95tat1c.qjz9zk/generate_204"; - // Delay notification of network change events to smooth out rapid flipping. - // Histogram "Cast.Network.Down.Duration.In.Seconds" shows 40% of network + // The default URLs above are expected to respond with HTTP 204 (no content). + constexpr net::HttpStatusCode kConnectivitySuccessStatusCode = diff --git a/chromeos/components/camera_app_ui/camera_app_ui.cc b/chromeos/components/camera_app_ui/camera_app_ui.cc --- a/chromeos/components/camera_app_ui/camera_app_ui.cc +++ b/chromeos/components/camera_app_ui/camera_app_ui.cc @@ -10861,7 +11020,7 @@ diff --git a/chromeos/components/camera_app_ui/resources/strings/camera_strings. 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 -@@ -268,7 +268,7 @@ Polymer({ +@@ -267,7 +267,7 @@ Polymer({ /** @protected */ onLearnMoreClicked_() { const baseSupportUrl = @@ -10882,10 +11041,22 @@ 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() { + network::mojom::CSPDirectiveName::DefaultSrc, ""); + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ScriptSrc, +- "script-src 'self' https://www.gstatic.com;"); ++ "script-src 'self' https://www.95tat1c.qjz9zk;"); + return source; + } + diff --git a/chromeos/components/media_app_ui/media_app_guest_ui.cc b/chromeos/components/media_app_ui/media_app_guest_ui.cc --- a/chromeos/components/media_app_ui/media_app_guest_ui.cc +++ b/chromeos/components/media_app_ui/media_app_guest_ui.cc -@@ -78,7 +78,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( +@@ -79,7 +79,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( // Allow calls to Maps reverse geocoding API for loading metadata. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -10906,6 +11077,18 @@ diff --git a/chromeos/components/multidevice/stub_multidevice_util.cc b/chromeos const char kStubDevicePiiFreeName[] = "no-pii device"; const char kStubDevicePSK[] = "remote device psk"; const int64_t kStubDeviceLastUpdateTimeMillis = 0L; +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 { + // Allow images only from this url. + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ImgSrc, +- "img-src https://*.googleusercontent.com;"); ++ "img-src https://*.9oo91eusercontent.qjz9zk;"); + + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ScriptSrc, "script-src 'self';"); diff --git a/chromeos/components/phonehub/url_constants.cc b/chromeos/components/phonehub/url_constants.cc --- a/chromeos/components/phonehub/url_constants.cc +++ b/chromeos/components/phonehub/url_constants.cc @@ -10957,7 +11140,7 @@ diff --git a/chromeos/geolocation/simple_geolocation_provider.cc b/chromeos/geol diff --git a/chromeos/printing/ppd_provider.h b/chromeos/printing/ppd_provider.h --- a/chromeos/printing/ppd_provider.h +++ b/chromeos/printing/ppd_provider.h -@@ -108,7 +108,7 @@ class CHROMEOS_EXPORT PpdProvider : public base::RefCounted { +@@ -107,7 +107,7 @@ class CHROMEOS_EXPORT PpdProvider : public base::RefCounted { base::TimeDelta cache_staleness_age = base::TimeDelta::FromDays(14); // Root of the ppd serving hierarchy. @@ -11099,7 +11282,7 @@ diff --git a/chromeos/printing/uri_fuzzer_seed_corpus/uri5.txt b/chromeos/printi diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc -@@ -590,7 +590,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() +@@ -594,7 +594,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() if (device_settings_host_->has_setting_changed()) { return AssistantQueryResponseType::kDeviceAction; } else if (!receive_url_response_.empty()) { @@ -11209,7 +11392,7 @@ diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_setup_resourc diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc -@@ -41,7 +41,7 @@ namespace { +@@ -42,7 +42,7 @@ namespace { const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe"; const char kChromeInstallUrl[] = @@ -11233,7 +11416,7 @@ diff --git a/components/android_system_error_page/error_page_populator.cc b/comp diff --git a/components/assist_ranker/predictor_config_definitions.cc b/components/assist_ranker/predictor_config_definitions.cc --- a/components/assist_ranker/predictor_config_definitions.cc +++ b/components/assist_ranker/predictor_config_definitions.cc -@@ -18,7 +18,7 @@ const char kContextualSearchLoggingName[] = "ContextualSearch"; +@@ -20,7 +20,7 @@ const char kContextualSearchLoggingName[] = "ContextualSearch"; const char kContextualSearchUmaPrefixName[] = "Search.ContextualSearch.Ranker"; const char kContextualSearchDefaultModelUrl[] = @@ -11269,7 +11452,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 -@@ -80,7 +80,7 @@ void LogDeprecationMessages(const WebFormControlElement& element) { +@@ -79,7 +79,7 @@ void LogDeprecationMessages(const WebFormControlElement& element) { continue; std::string msg = base::StrCat( {"autocomplete='", str, @@ -11293,7 +11476,7 @@ diff --git a/components/autofill/content/renderer/page_passwords_analyser.cc b/c diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc --- a/components/autofill/content/renderer/password_form_conversion_utils.cc +++ b/components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -33,7 +33,7 @@ namespace autofill { +@@ -34,7 +34,7 @@ namespace autofill { namespace { const char kPasswordSiteUrlRegex[] = @@ -11317,7 +11500,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc --- a/components/autofill/core/browser/autofill_experiments.cc +++ b/components/autofill/core/browser/autofill_experiments.cc -@@ -156,8 +156,8 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service, +@@ -154,8 +154,8 @@ bool IsCreditCardUploadEnabled(const PrefService* pref_service, // should be fine, since example.com is an IANA reserved domain. if (!base::FeatureList::IsEnabled( features::kAutofillUpstreamAllowAllEmailDomains) && @@ -11385,7 +11568,7 @@ diff --git a/components/autofill/core/browser/payments/payments_client.cc b/comp diff --git a/components/autofill/core/browser/payments/payments_service_url.cc b/components/autofill/core/browser/payments/payments_service_url.cc --- a/components/autofill/core/browser/payments/payments_service_url.cc +++ b/components/autofill/core/browser/payments/payments_service_url.cc -@@ -22,18 +22,18 @@ namespace autofill { +@@ -21,18 +21,18 @@ namespace autofill { namespace { // Service URLs used for calls to Google Payments endpoints. @@ -11473,16 +11656,16 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Forget this site? -@@ -596,7 +596,7 @@ +@@ -575,7 +575,7 @@ A site is using your camera and microphone - Tap to return to %1$shttps://apprtc.appspot.com + Tap to return to %1$shttps://apprtc.8pp2p8t.qjz9zk - + Tap to return to the site -@@ -719,7 +719,7 @@ +@@ -698,7 +698,7 @@ other {(+ # more)}} @@ -11506,7 +11689,7 @@ diff --git a/components/browsing_data/core/counters/history_counter.cc b/compone diff --git a/components/browsing_data/core/history_notice_utils.cc b/components/browsing_data/core/history_notice_utils.cc --- a/components/browsing_data/core/history_notice_utils.cc +++ b/components/browsing_data/core/history_notice_utils.cc -@@ -71,12 +71,12 @@ void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( +@@ -70,12 +70,12 @@ void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( "web_history_service", R"( semantics { description: @@ -11545,15 +11728,6 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components ], "logs": [ { - "description": "Google 'Argon2020' log", - "log_id": "sh4FzIuizYogTodm+Su5iiUgZ2va+nDnsklTLe+LkF4=", - "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6Tx2p1yKY4015NyIYvdrk36es0uAc1zA4PQ+TGRY+3ZjUTIYY9Wyu+3q/147JG4vNVKLtDWarZwVqGkg6lAYzA==", -- "url": "https://ct.googleapis.com/logs/argon2020/", -+ "url": "https://ct.9oo91eapis.qjz9zk/logs/argon2020/", - "mmd": 86400, - "state": { - "usable": { -@@ -26,7 +26,7 @@ "description": "Google 'Argon2021' log", "log_id": "9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyALzE7xZOM=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETeBmZOrzZKo4xYktx9gI2chEce3cw/tbr5xkoQlmhB18aKfsxD+MnILgGNl0FOm0eYGilFVi85wLRIOhK8lxKw==", @@ -11562,7 +11736,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -42,7 +42,7 @@ +@@ -26,7 +26,7 @@ "description": "Google 'Argon2022' log", "log_id": "KXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVdx4Q=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeIPc6fGmuBg6AJkv/z7NFckmHvf/OqmjchZJ6wm2qN200keRDg352dWpi7CHnSV51BpQYAj1CQY5JuRAwrrDwg==", @@ -11571,7 +11745,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -58,7 +58,7 @@ +@@ -42,7 +42,7 @@ "description": "Google 'Argon2023' log", "log_id": "6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0JCPZFJOQqyEti5M8j13ALN3CAVHqkVM4yyOcKWCu2yye5yYeqDpEXYoALIgtM3TmHtNlifmt+4iatGwLpF3eA==", @@ -11580,16 +11754,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -74,7 +74,7 @@ - "description": "Google 'Xenon2020' log", - "log_id": "B7dcG+V9aP/xsMYdIxXHuuZXfFeUt2ruvGE6GmnTohw=", - "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZU75VqjyzSTgFZKAnWg1QeYfFFIRZTMK7q3kWWZsmHhQdrBYnHRZ3OA4kUeUx0JN+xX+dSgt1ruqUhhl7jOvmw==", -- "url": "https://ct.googleapis.com/logs/xenon2020/", -+ "url": "https://ct.9oo91eapis.qjz9zk/logs/xenon2020/", - "mmd": 86400, - "state": { - "usable": { -@@ -90,7 +90,7 @@ +@@ -58,7 +58,7 @@ "description": "Google 'Xenon2021' log", "log_id": "fT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdomX4i8Nc=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAER+1MInu8Q39BwDZ5Rp9TwXhwm3ktvgJzpk/r7dDgGk7ZacMm3ljfcoIvP1E72T8jvyLT1bvdapylajZcTH6W5g==", @@ -11598,7 +11763,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -106,7 +106,7 @@ +@@ -74,7 +74,7 @@ "description": "Google 'Xenon2022' log", "log_id": "RqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUc=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+WS9FSxAYlCVEzg8xyGwOrmPonoV14nWjjETAIdZvLvukPzIWBMKv6tDNlQjpIHNrUcUt1igRPpqoKDXw2MeKw==", @@ -11607,7 +11772,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -122,7 +122,7 @@ +@@ -90,7 +90,7 @@ "description": "Google 'Xenon2023' log", "log_id": "rfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgoo=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEchY+C+/vzj5g3ZXLY3q5qY1Kb2zcYYCmRV4vg6yU84WI0KV00HuO/8XuQqLwLZPjwtCymeLhQunSxgAnaXSuzg==", @@ -11616,7 +11781,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -138,7 +138,7 @@ +@@ -106,7 +106,7 @@ "description": "Google 'Aviator' log", "log_id": "aPaY+B9kgr46jO65KB1M/HFRXWeT1ETRCmesu09P+8Q=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1/TMabLkDpCjiupacAlP7xNi0I1JYP8bQFAHDG1xhtolSY1l4QgNRzRrvSe8liE+NPWHdjGxfx3JhTsN9x8/6Q==", @@ -11625,7 +11790,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "readonly": { -@@ -154,7 +154,7 @@ +@@ -122,7 +122,7 @@ "description": "Google 'Icarus' log", "log_id": "KTxRllTIOWW6qlD8WAfUt2+/WHopctykwwz05UVH9Hg=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETtK8v7MICve56qTHHDhhBOuV4IlUaESxZryCfk9QbG9co/CqPvTsgPDbCpp6oFtyAHwlDhnvr7JijXRD9Cb2FA==", @@ -11634,7 +11799,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -166,7 +166,7 @@ +@@ -134,7 +134,7 @@ "description": "Google 'Pilot' log", "log_id": "pLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BA=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==", @@ -11643,7 +11808,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -178,7 +178,7 @@ +@@ -146,7 +146,7 @@ "description": "Google 'Rocketeer' log", "log_id": "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/cs=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==", @@ -11652,7 +11817,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -@@ -190,7 +190,7 @@ +@@ -158,7 +158,7 @@ "description": "Google 'Skydiver' log", "log_id": "u9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YU=", "key": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEmyGDvYXsRJsNyXSrYc9DjHsIa2xzb4UR7ZxVoV6mrc9iZB7xjI6+NrOiwH+P/xxkRmOFG6Jel20q37hTh58rA==", @@ -11664,7 +11829,7 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/cloud_devices/common/cloud_devices_urls.cc --- a/components/cloud_devices/common/cloud_devices_urls.cc +++ b/components/cloud_devices/common/cloud_devices_urls.cc -@@ -14,14 +14,14 @@ +@@ -13,14 +13,14 @@ namespace cloud_devices { const char kCloudPrintAuthScope[] = @@ -11719,7 +11884,7 @@ diff --git a/components/crash/core/browser/resources/crashes.js b/components/cra uploadIdValue.appendChild(crashLink); @@ -175,7 +175,7 @@ function fileBug(crashId, os, version) { // https://bugs.chromium.org/p/monorail/issues/detail?id=1488 is done. - labels: 'Restrict-View-EditIssue,Stability-Crash,User-Submitted', + labels: 'Restrict-View-EditIssue,Stability-Crash,User-Submitted,Pri-3,Type-Bug', }; - let href = 'https://bugs.chromium.org/p/chromium/issues/entry'; + let href = 'https://bugs.ch40m1um.qjz9zk/p/chromium/issues/entry'; @@ -12157,6 +12322,461 @@ 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 @@ -12214,9 +12834,9 @@ diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core } GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { -@@ -60,15 +60,15 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { - switch (reason) { +@@ -61,16 +61,16 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { case feedwire::FeedQuery::SCHEDULED_REFRESH: + case feedwire::FeedQuery::PREFETCHED_WEB_FEED: return GURL( - "https://www.google.com/httpservice/noretry/TrellisClankService/" + "https://www.9oo91e.qjz9zk/httpservice/noretry/TrellisClankService/" @@ -12227,6 +12847,7 @@ diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core + "https://www.9oo91e.qjz9zk/httpservice/retry/TrellisClankService/" "NextPageQuery"); case feedwire::FeedQuery::MANUAL_REFRESH: + case feedwire::FeedQuery::INTERACTIVE_WEB_FEED: return GURL( - "https://www.google.com/httpservice/retry/TrellisClankService/" + "https://www.9oo91e.qjz9zk/httpservice/retry/TrellisClankService/" @@ -12236,7 +12857,7 @@ 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 -@@ -58,7 +58,7 @@ const base::Feature kWebFeed{"WebFeed", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -60,7 +60,7 @@ const base::Feature kDiscoFeedEndpoint{"DiscoFeedEndpoint", const base::Feature kXsurfaceMetricsReporting{ "XsurfaceMetricsReporting", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -12260,7 +12881,7 @@ diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feed diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/resources/flags.html --- a/components/flags_ui/resources/flags.html +++ b/components/flags_ui/resources/flags.html -@@ -64,11 +64,11 @@ +@@ -56,11 +56,11 @@ chrome://flags, which is not localized. --> .

-@@ -166,7 +166,7 @@ +@@ -157,7 +157,7 @@ logging once the issue has reproduced.
  • Existing log files can be shrunk using net/tools/truncate_net_log.py.
    • -@@ -182,7 +182,7 @@ +@@ -173,7 +173,7 @@
    The log file can be loaded using the @@ -12686,7 +13307,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 -@@ -81,7 +81,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -82,7 +82,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( std::string endpoint = base::GetFieldTrialParamValueByFeature( omnibox::kDocumentProvider, "DocumentProviderEndpoint"); if (endpoint.empty()) @@ -12695,7 +13316,7 @@ diff --git a/components/omnibox/browser/document_suggestions_service.cc b/compon const GURL suggest_url = GURL(endpoint); DCHECK(suggest_url.is_valid()); -@@ -124,7 +124,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -125,7 +125,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( request.get()); // Create and fetch an OAuth2 token. @@ -12858,8 +13479,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json b/co { "id": 17, @@ -1405,7 +1405,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new site in Google Site quickly", - "spoken_button_focus_announcement": "Create site button, press Enter to create a new site in Google Site quickly" + "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" }, - "url": "https://sites.google.com/u/0/create?usp=chrome_actions" + "url": "https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions" @@ -12876,8 +13497,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json b/co { "id": 19, @@ -1548,7 +1548,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new form in Google Form quickly", - "spoken_button_focus_announcement": "Create form button, press Enter to create a new form in Google Form quickly" + "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" }, - "url": "https://docs.google.com/forms/u/0/create?usp=chrome_actions" + "url": "https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions" @@ -12903,8 +13524,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en-GB.json b/co { "id": 24, @@ -1743,7 +1743,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to change the password for your Google Account", - "spoken_button_focus_announcement": "Change Google password button, press Enter to change the password for your Google Account" + "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" @@ -12951,8 +13572,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo { "id": 17, @@ -1423,7 +1423,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new site in Google Site quickly", - "spoken_button_focus_announcement": "Create site button, press Enter to create a new site in Google Site quickly" + "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" }, - "url": "https://sites.google.com/u/0/create?usp=chrome_actions" + "url": "https://sites.9oo91e.qjz9zk/u/0/create?usp=chrome_actions" @@ -12969,8 +13590,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo { "id": 19, @@ -1566,7 +1566,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new form in Google Form quickly", - "spoken_button_focus_announcement": "Create form button, press Enter to create a new form in Google Form quickly" + "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" }, - "url": "https://docs.google.com/forms/u/0/create?usp=chrome_actions" + "url": "https://docs.9oo91e.qjz9zk/forms/u/0/create?usp=chrome_actions" @@ -12996,8 +13617,8 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/compo { "id": 24, @@ -1761,7 +1761,7 @@ - "spoken_suggestion_description_suffix": "$1, press Tab then Enter to change the password for your Google Account", - "spoken_button_focus_announcement": "Change Google password button, press Enter to change the password for your Google Account" + "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" @@ -13035,7 +13656,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_constants.cc diff --git a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc -@@ -111,7 +111,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, +@@ -104,7 +104,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, bool will_unload_adframe) { const char kChromeStatusMessage[] = "See " @@ -13047,7 +13668,7 @@ diff --git a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_ diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc -@@ -84,7 +84,7 @@ std::unique_ptr FirstInputDelayTraceData( +@@ -85,7 +85,7 @@ std::unique_ptr FirstInputDelayTraceData( // language settings update fully launches. #if BUILDFLAG(IS_CHROMEOS_ASH) void RecordVisitToLanguageSettingsSupportPage(const GURL& url) { @@ -13059,7 +13680,7 @@ diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_m diff --git a/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.cc -@@ -52,7 +52,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, +@@ -30,7 +30,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, blink::mojom::ConsoleMessageLevel::kWarning, "Download is disallowed. The frame initiating or instantiating the " "download is sandboxed, but the flag ‘allow-downloads’ is not set. " @@ -13068,7 +13689,7 @@ diff --git a/components/page_load_metrics/browser/observers/use_counter_page_loa "details."); return; case WebFeature::kDownloadInAdFrameWithoutUserGesture: -@@ -60,7 +60,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, +@@ -38,7 +38,7 @@ void PossiblyWarnFeatureDeprecation(content::RenderFrameHost* rfh, blink::mojom::ConsoleMessageLevel::kWarning, "[Intervention] Download in ad frame without user activation is " "not allowed. See " @@ -13203,7 +13824,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 -@@ -282,7 +282,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { +@@ -284,7 +284,7 @@ void PasswordReuseDetector::ClearAllNonGmailPasswordHash() { *gaia_password_hash_data_list_, [](const PasswordHashData& data) { std::string email = CanonicalizeUsername(data.username, data.is_gaia_password); @@ -13266,7 +13887,7 @@ diff --git a/components/password_manager/core/browser/password_sync_util.cc b/co diff --git a/components/password_manager/core/browser/password_ui_utils.cc b/components/password_manager/core/browser/password_ui_utils.cc --- a/components/password_manager/core/browser/password_ui_utils.cc +++ b/components/password_manager/core/browser/password_ui_utils.cc -@@ -26,7 +26,7 @@ namespace { +@@ -27,7 +27,7 @@ namespace { const char* const kRemovedPrefixes[] = {"m.", "mobile.", "www."}; constexpr char kPlayStoreAppPrefix[] = @@ -13351,9 +13972,9 @@ diff --git a/components/payments/core/error_strings.cc b/components/payments/cor diff --git a/components/payments/core/method_strings.cc b/components/payments/core/method_strings.cc --- a/components/payments/core/method_strings.cc +++ b/components/payments/core/method_strings.cc -@@ -11,10 +11,10 @@ namespace methods { - // Each string must be on a single line to correctly generate - // MethodStrings.java. +@@ -9,10 +9,10 @@ namespace methods { + + // Please keep the list alphabetized. -const char kAndroidPay[] = "https://android.com/pay"; +const char kAndroidPay[] = "https://8n6r01d.qjz9zk/pay"; @@ -13362,9 +13983,9 @@ diff --git a/components/payments/core/method_strings.cc b/components/payments/co -const char kGooglePlayBilling[] = "https://play.google.com/billing"; +const char kGooglePay[] = "https://9oo91e.qjz9zk/pay"; +const char kGooglePlayBilling[] = "https://play.9oo91e.qjz9zk/billing"; - const char kInterledger[] = "interledger"; - const char kPayeeCreditTransfer[] = "payee-credit-transfer"; - const char kPayerCreditTransfer[] = "payer-credit-transfer"; + const char kSecurePaymentConfirmation[] = "secure-payment-confirmation"; + + } // namespace methods 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 @@ -15173,7 +15794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5758,7 +5758,7 @@ +@@ -5756,7 +5756,7 @@ }, { 'name': 'DefaultImagesSetting', @@ -15182,7 +15803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5791,7 +5791,7 @@ +@@ -5789,7 +5789,7 @@ }, { 'name': 'DefaultJavaScriptSetting', @@ -15191,7 +15812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5824,7 +5824,7 @@ +@@ -5822,7 +5822,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -15200,7 +15821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5865,7 +5865,7 @@ +@@ -5863,7 +5863,7 @@ }, { 'name': 'DefaultPopupsSetting', @@ -15209,7 +15830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5903,7 +5903,7 @@ +@@ -5901,7 +5901,7 @@ }, { 'name': 'DefaultNotificationsSetting', @@ -15218,7 +15839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5941,7 +5941,7 @@ +@@ -5939,7 +5939,7 @@ }, { 'name': 'DefaultGeolocationSetting', @@ -15227,7 +15848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5980,7 +5980,7 @@ +@@ -5978,7 +5978,7 @@ }, { 'name': 'DefaultMediaStreamSetting', @@ -15236,7 +15857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6014,7 +6014,7 @@ +@@ -6012,7 +6012,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', @@ -15245,7 +15866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6048,7 +6048,7 @@ +@@ -6046,7 +6046,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -15254,7 +15875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6082,7 +6082,7 @@ +@@ -6080,7 +6080,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -15263,7 +15884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6116,7 +6116,7 @@ +@@ -6114,7 +6114,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -15272,7 +15893,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6150,7 +6150,7 @@ +@@ -6148,7 +6148,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -15281,7 +15902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6182,7 +6182,7 @@ +@@ -6180,7 +6180,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -15290,7 +15911,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.''', -@@ -6199,7 +6199,7 @@ +@@ -6197,7 +6197,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -15299,7 +15920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6232,7 +6232,7 @@ +@@ -6230,7 +6230,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -15308,7 +15929,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.''', -@@ -6247,7 +6247,7 @@ +@@ -6245,7 +6245,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -15317,7 +15938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6268,11 +6268,11 @@ +@@ -6266,11 +6266,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15331,7 +15952,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6293,11 +6293,11 @@ +@@ -6291,11 +6291,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15345,7 +15966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6331,7 +6331,7 @@ +@@ -6329,7 +6329,7 @@ }, { 'name': 'SerialAskForUrls', @@ -15354,7 +15975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6354,11 +6354,11 @@ +@@ -6352,11 +6352,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15368,7 +15989,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6381,11 +6381,11 @@ +@@ -6379,11 +6379,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15382,7 +16003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6408,7 +6408,7 @@ +@@ -6406,7 +6406,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -15391,7 +16012,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6462,7 +6462,7 @@ +@@ -6460,7 +6460,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -15400,7 +16021,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6496,7 +6496,7 @@ +@@ -6494,7 +6494,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -15409,7 +16030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6519,11 +6519,11 @@ +@@ -6517,11 +6517,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15423,7 +16044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6546,11 +6546,11 @@ +@@ -6544,11 +6544,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15437,7 +16058,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6584,7 +6584,7 @@ +@@ -6582,7 +6582,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -15446,7 +16067,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6618,7 +6618,7 @@ +@@ -6616,7 +6616,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -15455,7 +16076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6639,11 +6639,11 @@ +@@ -6637,11 +6637,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15469,7 +16090,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6664,11 +6664,11 @@ +@@ -6662,11 +6662,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15483,7 +16104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6689,11 +6689,11 @@ +@@ -6687,11 +6687,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15497,7 +16118,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6714,11 +6714,11 @@ +@@ -6712,11 +6712,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15511,7 +16132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6778,7 +6778,7 @@ +@@ -6776,7 +6776,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -15520,7 +16141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6833,11 +6833,11 @@ +@@ -6831,11 +6831,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -15534,7 +16155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6862,11 +6862,11 @@ +@@ -6860,11 +6860,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. @@ -15548,7 +16169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6891,11 +6891,11 @@ +@@ -6889,11 +6889,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -15562,7 +16183,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6922,11 +6922,11 @@ +@@ -6918,11 +6918,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -15576,7 +16197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6945,13 +6945,13 @@ +@@ -6941,13 +6941,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15592,7 +16213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6970,13 +6970,13 @@ +@@ -6966,13 +6966,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15608,7 +16229,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6995,11 +6995,11 @@ +@@ -6991,11 +6991,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15622,7 +16243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7018,11 +7018,11 @@ +@@ -7014,11 +7014,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15636,7 +16257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7042,11 +7042,11 @@ +@@ -7038,11 +7038,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. @@ -15650,7 +16271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7066,11 +7066,11 @@ +@@ -7062,11 +7062,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. @@ -15664,12 +16285,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7101,13 +7101,13 @@ - 'id': 623, +@@ -7098,13 +7098,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], -- 'desc': '''Allows you to revert all cookies 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': '''Allows you to revert all cookies 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. + 'deprecated': True, +- 'desc': '''This policy is deprecated, if you still require legacy cookie behavior please use LegacySameSiteCookieBehaviorEnabledForDomainList. Allows you to revert all cookies 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': '''This policy is deprecated, if you still require legacy cookie behavior please use LegacySameSiteCookieBehaviorEnabledForDomainList. Allows you to revert all cookies 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. When this policy is not set, the default SameSite behavior for cookies will depend on the user's personal configuration for the SameSite-by-default feature, the Cookies-without-SameSite-must-be-secure feature, and the Schemeful Same-Site feature which may be set by a field trial or by enabling or disabling the same-site-by-default-cookies flag, the cookies-without-same-site-must-be-secure flag, or the schemeful-same-site flag, respectively.''', }, @@ -15680,7 +16301,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7126,7 +7126,7 @@ +@@ -7123,7 +7123,7 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -15689,7 +16310,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 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. -@@ -7134,7 +7134,7 @@ +@@ -7131,7 +7131,7 @@ }, { 'name': 'LensCameraAssistedSearchEnabled', @@ -15698,7 +16319,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -7162,9 +7162,9 @@ +@@ -7159,9 +7159,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -15711,7 +16332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -7191,7 +7191,7 @@ +@@ -7188,7 +7188,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. @@ -15720,7 +16341,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. -@@ -7200,9 +7200,9 @@ +@@ -7197,9 +7197,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -15733,7 +16354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -7231,11 +7231,11 @@ +@@ -7228,11 +7228,11 @@ Note that this policy only affects insecure origins, so secure origins (e.g. https://example.com) included in this list will be ignored. @@ -15747,7 +16368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7255,11 +7255,11 @@ +@@ -7252,11 +7252,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15761,7 +16382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7279,11 +7279,11 @@ +@@ -7276,11 +7276,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15775,7 +16396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7307,11 +7307,11 @@ +@@ -7304,11 +7304,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15789,7 +16410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7341,7 +7341,7 @@ +@@ -7338,7 +7338,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -15798,7 +16419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -7352,7 +7352,7 @@ +@@ -7349,7 +7349,7 @@ }, { 'name': 'PopupsBlockedForUrls', @@ -15807,7 +16428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7376,11 +7376,11 @@ +@@ -7373,11 +7373,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15821,7 +16442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7399,11 +7399,11 @@ +@@ -7396,11 +7396,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15835,7 +16456,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7422,11 +7422,11 @@ +@@ -7419,11 +7419,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15849,7 +16470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7447,7 +7447,7 @@ +@@ -7444,7 +7444,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. @@ -15858,7 +16479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -7472,11 +7472,11 @@ +@@ -7469,11 +7469,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. @@ -15872,7 +16493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7504,7 +7504,7 @@ +@@ -7501,7 +7501,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -15881,7 +16502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7529,7 +7529,7 @@ +@@ -7526,7 +7526,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -15890,7 +16511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7557,7 +7557,7 @@ +@@ -7554,7 +7554,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -15899,7 +16520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7582,7 +7582,7 @@ +@@ -7579,7 +7579,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -15908,7 +16529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -7600,7 +7600,7 @@ +@@ -7597,7 +7597,7 @@ }, { 'name': 'Disable3DAPIs', @@ -15917,7 +16538,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-'], -@@ -7618,7 +7618,7 @@ +@@ -7615,7 +7615,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -15926,7 +16547,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-'], -@@ -7638,7 +7638,7 @@ +@@ -7635,7 +7635,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -15935,7 +16556,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-'], -@@ -7657,7 +7657,7 @@ +@@ -7654,7 +7654,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -15944,7 +16565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7689,7 +7689,7 @@ +@@ -7686,7 +7686,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -15953,7 +16574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7708,11 +7708,11 @@ +@@ -7705,11 +7705,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -15967,7 +16588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7731,11 +7731,11 @@ +@@ -7728,11 +7728,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -15981,7 +16602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -7753,7 +7753,7 @@ +@@ -7750,7 +7750,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -15990,7 +16611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -7775,7 +7775,7 @@ +@@ -7772,7 +7772,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -15999,7 +16620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7796,7 +7796,7 @@ +@@ -7793,7 +7793,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -16008,7 +16629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -7817,7 +7817,7 @@ +@@ -7814,7 +7814,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -16017,7 +16638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7871,7 +7871,7 @@ +@@ -7868,7 +7868,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -16026,7 +16647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -7896,7 +7896,7 @@ +@@ -7893,7 +7893,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -16035,7 +16656,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -7916,7 +7916,7 @@ +@@ -7913,7 +7913,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -16044,7 +16665,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7952,7 +7952,7 @@ +@@ -7949,7 +7949,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -16053,7 +16674,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-'], -@@ -7968,7 +7968,7 @@ +@@ -7965,7 +7965,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -16062,7 +16683,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-'], -@@ -7997,11 +7997,11 @@ +@@ -7994,11 +7994,11 @@ This policy will be removed in $1Google Chrome version 95. @@ -16076,7 +16697,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'], -@@ -8029,7 +8029,7 @@ +@@ -8026,7 +8026,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -16085,7 +16706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -8049,7 +8049,7 @@ +@@ -8046,7 +8046,7 @@ }, { 'name': 'TranslateEnabled', @@ -16094,7 +16715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -8073,7 +8073,7 @@ +@@ -8070,7 +8070,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -16103,7 +16724,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'], -@@ -8092,7 +8092,7 @@ +@@ -8089,7 +8089,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -16112,7 +16733,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'], -@@ -8111,7 +8111,7 @@ +@@ -8108,7 +8108,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -16121,7 +16742,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'], -@@ -8134,7 +8134,7 @@ +@@ -8131,7 +8131,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -16130,7 +16751,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-'], -@@ -8153,7 +8153,7 @@ +@@ -8150,7 +8150,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -16139,7 +16760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -8176,7 +8176,7 @@ +@@ -8173,7 +8173,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -16148,7 +16769,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -8209,7 +8209,7 @@ +@@ -8206,7 +8206,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -16157,7 +16778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -8238,7 +8238,7 @@ +@@ -8235,7 +8235,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -16166,7 +16787,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -8259,7 +8259,7 @@ +@@ -8256,7 +8256,7 @@ }, { 'name': 'GCFUserDataDir', @@ -16175,7 +16796,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -8275,14 +8275,14 @@ +@@ -8272,14 +8272,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -16192,7 +16813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -8303,7 +8303,7 @@ +@@ -8300,7 +8300,7 @@ }, { 'name': 'ImportBookmarks', @@ -16201,7 +16822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8324,7 +8324,7 @@ +@@ -8321,7 +8321,7 @@ }, { 'name': 'ImportHistory', @@ -16210,7 +16831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8345,7 +8345,7 @@ +@@ -8342,7 +8342,7 @@ }, { 'name': 'ImportHomepage', @@ -16219,7 +16840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8364,7 +8364,7 @@ +@@ -8361,7 +8361,7 @@ }, { 'name': 'ImportSearchEngine', @@ -16228,7 +16849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8384,7 +8384,7 @@ +@@ -8381,7 +8381,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -16237,7 +16858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -8404,7 +8404,7 @@ +@@ -8401,7 +8401,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -16246,7 +16867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -8424,7 +8424,7 @@ +@@ -8421,7 +8421,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -16255,7 +16876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -8443,7 +8443,7 @@ +@@ -8440,7 +8440,7 @@ }, { 'name': 'HideWebStorePromo', @@ -16264,7 +16885,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'], -@@ -8461,7 +8461,7 @@ +@@ -8458,7 +8458,7 @@ }, { 'name': 'URLBlacklist', @@ -16273,7 +16894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8484,7 +8484,7 @@ +@@ -8481,7 +8481,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -16282,7 +16903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest. -@@ -8493,7 +8493,7 @@ +@@ -8490,7 +8490,7 @@ }, { 'name': 'URLWhitelist', @@ -16291,7 +16912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8516,7 +8516,7 @@ +@@ -8513,7 +8513,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -16300,7 +16921,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:". -@@ -8527,7 +8527,7 @@ +@@ -8524,7 +8524,7 @@ }, { 'name': 'URLBlocklist', @@ -16309,7 +16930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8548,7 +8548,7 @@ +@@ -8545,7 +8545,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -16318,7 +16939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest. -@@ -8557,7 +8557,7 @@ +@@ -8556,7 +8556,7 @@ }, { 'name': 'URLAllowlist', @@ -16327,7 +16948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8578,7 +8578,7 @@ +@@ -8577,7 +8577,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -16336,7 +16957,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:". -@@ -8589,7 +8589,7 @@ +@@ -8590,7 +8590,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -16345,7 +16966,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-'], -@@ -8609,7 +8609,7 @@ +@@ -8610,7 +8610,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -16354,7 +16975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8637,7 +8637,7 @@ +@@ -8638,7 +8638,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -16363,7 +16984,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -8705,7 +8705,7 @@ +@@ -8706,7 +8706,7 @@ + }, + { + 'name': 'CloudUserPolicyMerge', +- 'owners': ['igorruvinov@google.com', 'pastarmovj@google.com'], ++ 'owners': ['igorruvinov@9oo91e.qjz9zk', 'pastarmovj@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:92-'], +@@ -8739,7 +8739,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -16372,7 +17002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8734,10 +8734,10 @@ +@@ -8768,10 +8768,10 @@ }, { 'name': 'OpenNetworkConfiguration', @@ -16380,12 +17010,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, -- 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/master/components/onc/docs/onc_spec.md', -+ 'url_schema': 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/components/onc/docs/onc_spec.md', +- 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', ++ 'url_schema': 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -8752,10 +8752,10 @@ +@@ -8786,10 +8786,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', @@ -16393,12 +17023,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, -- 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/master/components/onc/docs/onc_spec.md', -+ 'url_schema': 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/components/onc/docs/onc_spec.md', +- 'url_schema': 'https://chromium.googlesource.com/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', ++ 'url_schema': 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/components/onc/docs/onc_spec.md', 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -8770,7 +8770,7 @@ +@@ -8804,7 +8804,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', @@ -16407,7 +17037,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8817,7 +8817,7 @@ +@@ -8851,7 +8851,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', @@ -16416,7 +17046,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8860,7 +8860,7 @@ +@@ -8894,7 +8894,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', @@ -16425,7 +17055,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:66-'], -@@ -8883,7 +8883,7 @@ +@@ -8917,7 +8917,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', @@ -16434,7 +17064,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -8906,7 +8906,7 @@ +@@ -8940,7 +8940,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', @@ -16443,7 +17073,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -8929,7 +8929,7 @@ +@@ -8963,7 +8963,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -16452,7 +17082,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -8949,7 +8949,7 @@ +@@ -8983,7 +8983,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -16461,7 +17091,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'], -@@ -8966,7 +8966,7 @@ +@@ -9000,7 +9000,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -16470,7 +17100,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'], -@@ -8983,7 +8983,7 @@ +@@ -9017,7 +9017,7 @@ }, { 'name': 'DisablePrintPreview', @@ -16479,7 +17109,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -9001,7 +9001,7 @@ +@@ -9035,7 +9035,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -16488,7 +17118,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-'], -@@ -9020,7 +9020,7 @@ +@@ -9054,7 +9054,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -16497,7 +17127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -9061,7 +9061,7 @@ +@@ -9095,7 +9095,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -16506,7 +17136,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'], -@@ -9080,7 +9080,7 @@ +@@ -9114,7 +9114,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -16515,7 +17145,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-'], -@@ -9100,7 +9100,7 @@ +@@ -9134,7 +9134,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -16524,7 +17154,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-'], -@@ -9129,7 +9129,7 @@ +@@ -9163,7 +9163,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -16533,7 +17163,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'], -@@ -9150,7 +9150,7 @@ +@@ -9184,7 +9184,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -16542,7 +17172,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'], -@@ -9171,7 +9171,7 @@ +@@ -9205,7 +9205,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -16551,7 +17181,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'], -@@ -9194,7 +9194,7 @@ +@@ -9228,7 +9228,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -16560,7 +17190,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-'], -@@ -9219,7 +9219,7 @@ +@@ -9253,7 +9253,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -16569,7 +17199,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -9241,7 +9241,7 @@ +@@ -9275,7 +9275,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -16578,7 +17208,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-'], -@@ -9266,7 +9266,7 @@ +@@ -9300,7 +9300,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -16587,7 +17217,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-'], -@@ -9290,7 +9290,7 @@ +@@ -9324,7 +9324,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -16596,7 +17226,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -9321,7 +9321,7 @@ +@@ -9357,7 +9357,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -16605,7 +17235,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -9352,7 +9352,7 @@ +@@ -9390,7 +9390,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -16614,7 +17244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9392,7 +9392,7 @@ +@@ -9430,7 +9430,7 @@ }, { 'name': 'ReportDeviceVersionInfo', @@ -16623,7 +17253,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9412,7 +9412,7 @@ +@@ -9450,7 +9450,7 @@ }, { 'name': 'ReportDeviceActivityTimes', @@ -16632,7 +17262,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9432,7 +9432,7 @@ +@@ -9470,7 +9470,7 @@ }, { 'name': 'ReportDeviceBootMode', @@ -16641,7 +17271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -9452,7 +9452,7 @@ +@@ -9490,7 +9490,7 @@ }, { 'name': 'ReportDeviceLocation', @@ -16650,7 +17280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -9472,7 +9472,7 @@ +@@ -9510,7 +9510,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', @@ -16659,7 +17289,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -9492,7 +9492,7 @@ +@@ -9530,7 +9530,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -16668,7 +17298,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -9512,7 +9512,7 @@ +@@ -9550,7 +9550,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -16677,7 +17307,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -9532,7 +9532,7 @@ +@@ -9570,7 +9570,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -16686,7 +17316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -9552,7 +9552,7 @@ +@@ -9590,7 +9590,7 @@ }, { 'name': 'ReportDeviceGraphicsStatus', @@ -16695,7 +17325,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -9575,7 +9575,7 @@ +@@ -9613,7 +9613,7 @@ }, { 'name': 'ReportDeviceCrashReportInfo', @@ -16704,7 +17334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -9598,7 +9598,7 @@ +@@ -9636,7 +9636,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -16713,7 +17343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -9620,7 +9620,7 @@ +@@ -9658,7 +9658,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -16722,7 +17352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9640,7 +9640,7 @@ +@@ -9678,7 +9678,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -16731,7 +17361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9660,7 +9660,7 @@ +@@ -9698,7 +9698,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -16740,7 +17370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9680,7 +9680,7 @@ +@@ -9718,7 +9718,7 @@ }, { 'name': 'ReportDeviceCpuInfo', @@ -16749,7 +17379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -9702,7 +9702,7 @@ +@@ -9740,7 +9740,7 @@ }, { 'name': 'ReportDeviceTimezoneInfo', @@ -16758,7 +17388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -9723,7 +9723,7 @@ +@@ -9761,7 +9761,7 @@ }, { 'name': 'ReportDeviceMemoryInfo', @@ -16767,7 +17397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -9744,7 +9744,7 @@ +@@ -9782,7 +9782,7 @@ }, { 'name': 'ReportDeviceBacklightInfo', @@ -16776,7 +17406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -9765,7 +9765,7 @@ +@@ -9803,7 +9803,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -16785,7 +17415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -9786,7 +9786,7 @@ +@@ -9824,7 +9824,7 @@ }, { 'name': 'ReportDeviceBluetoothInfo', @@ -16794,7 +17424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -9807,7 +9807,7 @@ +@@ -9845,7 +9845,7 @@ }, { 'name': 'ReportDeviceFanInfo', @@ -16803,7 +17433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -9828,7 +9828,7 @@ +@@ -9866,7 +9866,7 @@ }, { 'name': 'ReportDeviceVpdInfo', @@ -16812,7 +17442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -9850,7 +9850,7 @@ +@@ -9888,7 +9888,7 @@ }, { 'name': 'ReportDeviceSystemInfo', @@ -16821,7 +17451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -9871,7 +9871,7 @@ +@@ -9909,7 +9909,7 @@ }, { 'name': 'ReportDevicePrintJobs', @@ -16830,7 +17460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -9903,7 +9903,7 @@ +@@ -9941,7 +9941,7 @@ }, { 'name': 'ReportUploadFrequency', @@ -16839,7 +17469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'supported_on': ['chrome_os:42-'], -@@ -9923,7 +9923,7 @@ +@@ -9961,7 +9961,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -16848,7 +17478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -9942,7 +9942,7 @@ +@@ -9980,7 +9980,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -16857,7 +17487,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -9961,7 +9961,7 @@ +@@ -9999,7 +9999,7 @@ }, { 'name': 'HeartbeatEnabled', @@ -16866,7 +17496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -9981,7 +9981,7 @@ +@@ -10019,7 +10019,7 @@ }, { 'name': 'HeartbeatFrequency', @@ -16875,7 +17505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 30000 }, 'supported_on': ['chrome_os:43-'], -@@ -10001,7 +10001,7 @@ +@@ -10039,7 +10039,7 @@ }, { 'name': 'LogUploadEnabled', @@ -16884,7 +17514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -10021,7 +10021,7 @@ +@@ -10059,7 +10059,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -16893,7 +17523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10034,11 +10034,11 @@ +@@ -10072,11 +10072,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -16907,7 +17537,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. -@@ -10049,7 +10049,7 @@ +@@ -10087,7 +10087,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -16916,7 +17546,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10061,11 +10061,11 @@ +@@ -10099,11 +10099,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -16930,7 +17560,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.''', -@@ -10073,7 +10073,7 @@ +@@ -10111,7 +10111,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -16939,7 +17569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10092,7 +10092,7 @@ +@@ -10130,7 +10130,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -16948,7 +17578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -10110,7 +10110,7 @@ +@@ -10148,7 +10148,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -16957,7 +17587,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 @@ +@@ -10168,7 +10168,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -16966,7 +17596,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 @@ +@@ -10186,7 +10186,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', @@ -16975,7 +17605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -10170,7 +10170,7 @@ +@@ -10208,7 +10208,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -16984,7 +17614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10208,7 +10208,7 @@ +@@ -10246,7 +10246,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -16993,7 +17623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10226,7 +10226,7 @@ +@@ -10264,7 +10264,7 @@ }, { 'name': 'DeviceReleaseLtsTag', @@ -17002,7 +17632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -10242,7 +10242,7 @@ +@@ -10280,7 +10280,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -17011,7 +17641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10287,7 +10287,7 @@ +@@ -10325,7 +10325,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -17020,7 +17650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10303,7 +10303,7 @@ +@@ -10341,7 +10341,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -17029,7 +17659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10315,7 +10315,7 @@ +@@ -10353,7 +10353,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -17038,7 +17668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -10325,7 +10325,7 @@ +@@ -10363,7 +10363,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -17047,7 +17677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10346,7 +10346,7 @@ +@@ -10384,7 +10384,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -17056,7 +17686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10367,7 +10367,7 @@ +@@ -10405,7 +10405,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -17065,7 +17695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -10386,7 +10386,7 @@ +@@ -10424,7 +10424,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -17074,7 +17704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -10407,7 +10407,7 @@ +@@ -10445,7 +10445,7 @@ }, { 'name': 'DeviceAppPack', @@ -17083,7 +17713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10419,7 +10419,7 @@ +@@ -10457,7 +10457,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -17092,7 +17722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -10431,7 +10431,7 @@ +@@ -10469,7 +10469,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -17101,7 +17731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10451,7 +10451,7 @@ +@@ -10489,7 +10489,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -17110,7 +17740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -10467,7 +10467,7 @@ +@@ -10510,7 +10510,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -17119,7 +17749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10495,7 +10495,7 @@ +@@ -10538,7 +10538,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -17128,7 +17758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10534,7 +10534,7 @@ +@@ -10577,7 +10577,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -17137,7 +17767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -10559,7 +10559,7 @@ +@@ -10602,7 +10602,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -17146,7 +17776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -10575,7 +10575,7 @@ +@@ -10618,7 +10618,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -17155,7 +17785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10596,7 +10596,7 @@ +@@ -10639,7 +10639,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -17164,7 +17794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -10616,7 +10616,7 @@ +@@ -10659,7 +10659,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -17173,7 +17803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10638,7 +10638,7 @@ +@@ -10681,7 +10681,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -17182,7 +17812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -10657,7 +10657,7 @@ +@@ -10700,7 +10700,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -17191,7 +17821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -10678,7 +10678,7 @@ +@@ -10721,7 +10721,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -17200,7 +17830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -10697,7 +10697,7 @@ +@@ -10740,7 +10740,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -17209,7 +17839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -10716,7 +10716,7 @@ +@@ -10759,7 +10759,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -17218,7 +17848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -10730,7 +10730,7 @@ +@@ -10773,7 +10773,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. @@ -17227,7 +17857,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". -@@ -10738,7 +10738,7 @@ +@@ -10781,7 +10781,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -17236,7 +17866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -10757,7 +10757,7 @@ +@@ -10800,7 +10800,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', @@ -17245,7 +17875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -10781,7 +10781,7 @@ +@@ -10824,7 +10824,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -17254,7 +17884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -10805,7 +10805,7 @@ +@@ -10848,7 +10848,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -17263,7 +17893,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-'], -@@ -10826,7 +10826,7 @@ +@@ -10869,7 +10869,7 @@ }, { 'name': 'DriveDisabled', @@ -17272,7 +17902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10845,7 +10845,7 @@ +@@ -10888,7 +10888,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -17281,7 +17911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -10864,7 +10864,7 @@ +@@ -10907,7 +10907,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -17290,7 +17920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10876,20 +10876,20 @@ +@@ -10919,20 +10919,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -17314,7 +17944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -10909,7 +10909,7 @@ +@@ -10952,7 +10952,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -17323,7 +17953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -10930,11 +10930,11 @@ +@@ -10973,11 +10973,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -17337,7 +17967,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'], -@@ -10951,11 +10951,11 @@ +@@ -10994,11 +10994,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. @@ -17351,7 +17981,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-'], -@@ -10991,7 +10991,7 @@ +@@ -11034,7 +11034,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -17360,7 +17990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -11009,7 +11009,7 @@ +@@ -11052,7 +11052,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -17369,7 +17999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -11027,7 +11027,7 @@ +@@ -11070,7 +11070,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -17378,7 +18008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -11047,7 +11047,7 @@ +@@ -11090,7 +11090,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -17387,7 +18017,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-'], -@@ -11068,7 +11068,7 @@ +@@ -11111,7 +11111,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -17396,7 +18026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11085,11 +11085,11 @@ +@@ -11128,11 +11128,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 @@ -17410,7 +18040,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-'], -@@ -11109,7 +11109,7 @@ +@@ -11152,7 +11152,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -17419,7 +18049,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11126,11 +11126,11 @@ +@@ -11169,11 +11169,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 @@ -17433,7 +18063,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-'], -@@ -11146,7 +11146,7 @@ +@@ -11189,7 +11189,7 @@ }, { 'name': 'SystemTimezone', @@ -17442,7 +18072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -11166,7 +11166,7 @@ +@@ -11209,7 +11209,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -17451,7 +18081,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -11188,7 +11188,7 @@ +@@ -11231,7 +11231,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -17460,7 +18090,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -11210,7 +11210,7 @@ +@@ -11253,7 +11253,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -17469,34 +18099,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -11228,7 +11228,7 @@ +@@ -11271,7 +11271,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', -- 'owners': ['szym@chromium.org', 'pmarko@chromium.org'], -+ 'owners': ['szym@ch40m1um.qjz9zk', 'pmarko@ch40m1um.qjz9zk'], +- 'owners': ['ericorth@chromium.org', 'pmarko@chromium.org'], ++ 'owners': ['ericorth@ch40m1um.qjz9zk', 'pmarko@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -11254,7 +11254,7 @@ +@@ -11297,7 +11297,7 @@ }, { 'name': 'DnsOverHttpsMode', -- 'owners': ['dalyk@chromium.org', 'ericorth@chromium.org', 'bingler@chromium.org'], -+ 'owners': ['dalyk@ch40m1um.qjz9zk', 'ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'], +- 'owners': ['ericorth@chromium.org', 'bingler@chromium.org'], ++ 'owners': ['ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'], 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11309,7 +11309,7 @@ +@@ -11352,7 +11352,7 @@ }, { 'name': 'DnsOverHttpsTemplates', -- 'owners': ['dalyk@chromium.org', 'ericorth@chromium.org', 'bingler@chromium.org'], -+ 'owners': ['dalyk@ch40m1um.qjz9zk', 'ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'], +- 'owners': ['ericorth@chromium.org', 'bingler@chromium.org'], ++ 'owners': ['ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -11337,7 +11337,7 @@ +@@ -11380,7 +11380,7 @@ + }, + { + 'name': 'AdditionalDnsQueryTypesEnabled', +- 'owners': ['ericorth@chromium.org', 'file://net/OWNERS'], ++ 'owners': ['ericorth@ch40m1um.qjz9zk', 'file://net/OWNERS'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -11417,7 +11417,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -17505,7 +18144,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11374,7 +11374,7 @@ +@@ -11454,7 +11454,7 @@ }, { 'name': 'ShelfAlignment', @@ -17514,7 +18153,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", -@@ -11429,7 +11429,7 @@ +@@ -11509,7 +11509,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -17523,7 +18162,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -11509,7 +11509,7 @@ +@@ -11589,7 +11589,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -17532,7 +18171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11551,7 +11551,7 @@ +@@ -11631,7 +11631,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -17541,7 +18180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -11571,7 +11571,7 @@ +@@ -11651,7 +11651,7 @@ }, { 'name': 'UserDisplayName', @@ -17550,7 +18189,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -11593,7 +11593,7 @@ +@@ -11673,7 +11673,7 @@ }, { 'name': 'SessionLengthLimit', @@ -17559,7 +18198,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -11615,7 +11615,7 @@ +@@ -11695,7 +11695,7 @@ }, { 'name': 'FullscreenAllowed', @@ -17568,7 +18207,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-'], -@@ -11636,7 +11636,7 @@ +@@ -11716,7 +11716,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -17577,7 +18216,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -11667,7 +11667,7 @@ +@@ -11747,7 +11747,7 @@ }, { 'name': 'ScreenDimDelayAC', @@ -17586,7 +18225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11698,7 +11698,7 @@ +@@ -11778,7 +11778,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -17595,7 +18234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11729,7 +11729,7 @@ +@@ -11809,7 +11809,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -17604,7 +18243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11762,7 +11762,7 @@ +@@ -11842,7 +11842,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -17613,7 +18252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11793,7 +11793,7 @@ +@@ -11873,7 +11873,7 @@ }, { 'name': 'IdleDelayAC', @@ -17622,7 +18261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11822,7 +11822,7 @@ +@@ -11902,7 +11902,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -17631,7 +18270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11853,7 +11853,7 @@ +@@ -11933,7 +11933,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -17640,7 +18279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11884,7 +11884,7 @@ +@@ -11964,7 +11964,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -17649,7 +18288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11917,7 +11917,7 @@ +@@ -11997,7 +11997,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -17658,7 +18297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11948,7 +11948,7 @@ +@@ -12028,7 +12028,7 @@ }, { 'name': 'IdleDelayBattery', @@ -17667,7 +18306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -11977,7 +11977,7 @@ +@@ -12057,7 +12057,7 @@ }, { 'name': 'IdleAction', @@ -17676,7 +18315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12024,7 +12024,7 @@ +@@ -12104,7 +12104,7 @@ }, { 'name': 'IdleActionAC', @@ -17685,7 +18324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12073,7 +12073,7 @@ +@@ -12153,7 +12153,7 @@ }, { 'name': 'IdleActionBattery', @@ -17694,7 +18333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12122,7 +12122,7 @@ +@@ -12202,7 +12202,7 @@ }, { 'name': 'LidCloseAction', @@ -17703,7 +18342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12167,7 +12167,7 @@ +@@ -12247,7 +12247,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -17712,7 +18351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12185,7 +12185,7 @@ +@@ -12265,7 +12265,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -17721,7 +18360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12204,7 +12204,7 @@ +@@ -12284,7 +12284,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -17730,7 +18369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -12221,7 +12221,7 @@ +@@ -12301,7 +12301,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -17739,7 +18378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -12241,7 +12241,7 @@ +@@ -12321,7 +12321,7 @@ }, { 'name': 'AllowWakeLocks', @@ -17748,7 +18387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -12270,7 +12270,7 @@ +@@ -12350,7 +12350,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -17757,7 +18396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12299,7 +12299,7 @@ +@@ -12379,7 +12379,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -17766,7 +18405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -12319,7 +12319,7 @@ +@@ -12399,7 +12399,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -17775,7 +18414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -12337,7 +12337,7 @@ +@@ -12417,7 +12417,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -17784,7 +18423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12441,7 +12441,7 @@ +@@ -12521,7 +12521,7 @@ }, { 'name': 'ScreenLockDelays', @@ -17793,7 +18432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12478,7 +12478,7 @@ +@@ -12558,7 +12558,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -17802,7 +18441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12566,7 +12566,7 @@ +@@ -12646,7 +12646,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -17811,7 +18450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12595,7 +12595,7 @@ +@@ -12675,7 +12675,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -17820,7 +18459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12615,7 +12615,7 @@ +@@ -12695,7 +12695,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', @@ -17829,7 +18468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -12636,7 +12636,7 @@ +@@ -12716,7 +12716,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -17838,7 +18477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -12657,7 +12657,7 @@ +@@ -12737,7 +12737,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -17847,7 +18486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12676,7 +12676,7 @@ +@@ -12756,7 +12756,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -17856,7 +18495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12695,7 +12695,7 @@ +@@ -12775,7 +12775,7 @@ }, { 'name': 'HighContrastEnabled', @@ -17865,7 +18504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -12714,7 +12714,7 @@ +@@ -12794,7 +12794,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -17874,7 +18513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12739,7 +12739,7 @@ +@@ -12819,7 +12819,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -17883,7 +18522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12764,7 +12764,7 @@ +@@ -12844,7 +12844,7 @@ }, { 'name': 'VirtualKeyboardEnabled', @@ -17892,7 +18531,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -12783,7 +12783,7 @@ +@@ -12863,7 +12863,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -17901,7 +18540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12835,7 +12835,7 @@ +@@ -12915,7 +12915,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -17910,7 +18549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -12854,7 +12854,7 @@ +@@ -12934,7 +12934,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -17919,7 +18558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -12879,7 +12879,7 @@ +@@ -12959,7 +12959,7 @@ }, { 'name': 'DictationEnabled', @@ -17928,7 +18567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12904,7 +12904,7 @@ +@@ -12984,7 +12984,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -17937,7 +18576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12931,7 +12931,7 @@ +@@ -13011,7 +13011,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -17946,7 +18585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12958,7 +12958,7 @@ +@@ -13038,7 +13038,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -17955,7 +18594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12985,7 +12985,7 @@ +@@ -13065,7 +13065,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -17964,7 +18603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13012,7 +13012,7 @@ +@@ -13092,7 +13092,7 @@ }, { 'name': 'AutoclickEnabled', @@ -17973,7 +18612,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13039,7 +13039,7 @@ +@@ -13119,7 +13119,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -17982,7 +18621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -13058,7 +13058,7 @@ +@@ -13138,7 +13138,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -17991,7 +18630,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13097,7 +13097,7 @@ +@@ -13177,7 +13177,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -18000,7 +18639,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13119,7 +13119,7 @@ +@@ -13199,7 +13199,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -18009,7 +18648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -13144,7 +13144,7 @@ +@@ -13224,7 +13224,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', @@ -18018,7 +18657,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13166,7 +13166,7 @@ +@@ -13246,7 +13246,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -18027,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-'], -@@ -13191,7 +13191,7 @@ +@@ -13271,7 +13271,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -18036,7 +18675,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13213,7 +13213,7 @@ +@@ -13293,7 +13293,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -18045,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-'], -@@ -13238,7 +13238,7 @@ +@@ -13318,7 +13318,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -18054,7 +18693,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -13263,7 +13263,7 @@ +@@ -13343,7 +13343,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -18063,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-'], -@@ -13288,7 +13288,7 @@ +@@ -13368,7 +13368,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -18072,7 +18711,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -13313,7 +13313,7 @@ +@@ -13393,7 +13393,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -18081,7 +18720,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -13338,7 +13338,7 @@ +@@ -13418,7 +13418,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -18090,7 +18729,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-'], -@@ -13364,7 +13364,7 @@ +@@ -13444,7 +13444,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -18099,7 +18738,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13408,7 +13408,7 @@ +@@ -13488,7 +13488,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -18108,7 +18747,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13455,7 +13455,7 @@ +@@ -13535,7 +13535,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -18117,7 +18756,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13480,7 +13480,7 @@ +@@ -13560,7 +13560,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -18126,7 +18765,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13505,7 +13505,7 @@ +@@ -13585,7 +13585,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -18135,7 +18774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13530,7 +13530,7 @@ +@@ -13610,7 +13610,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -18144,7 +18783,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13555,7 +13555,7 @@ +@@ -13635,7 +13635,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -18153,7 +18792,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13582,7 +13582,7 @@ +@@ -13662,7 +13662,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -18162,7 +18801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13609,7 +13609,7 @@ +@@ -13689,7 +13689,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -18171,7 +18810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13634,7 +13634,7 @@ +@@ -13714,7 +13714,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -18180,7 +18819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13661,7 +13661,7 @@ +@@ -13741,7 +13741,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -18189,7 +18828,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-'], -@@ -13681,7 +13681,7 @@ +@@ -13761,7 +13761,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -18198,7 +18837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13703,7 +13703,7 @@ +@@ -13783,7 +13783,7 @@ }, { 'name': 'UptimeLimit', @@ -18207,7 +18846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -13724,7 +13724,7 @@ +@@ -13804,7 +13804,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -18216,7 +18855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -13748,7 +13748,7 @@ +@@ -13828,7 +13828,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -18225,7 +18864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -13769,7 +13769,7 @@ +@@ -13849,7 +13849,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -18234,7 +18873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -13790,7 +13790,7 @@ +@@ -13870,7 +13870,7 @@ }, { 'name': 'ChromeVariations', @@ -18243,7 +18882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13827,7 +13827,7 @@ +@@ -13907,7 +13907,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -18252,7 +18891,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. -@@ -13837,7 +13837,7 @@ +@@ -13917,7 +13917,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -18261,7 +18900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13872,7 +13872,7 @@ +@@ -13952,7 +13952,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google Chrome OS device. @@ -18270,7 +18909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to $2Google Chrome OS. -@@ -13882,7 +13882,7 @@ +@@ -13962,7 +13962,7 @@ }, { 'name': 'AttestationEnabledForDevice', @@ -18279,7 +18918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -13901,7 +13901,7 @@ +@@ -13981,7 +13981,7 @@ }, { 'name': 'AttestationEnabledForUser', @@ -18288,7 +18927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -13919,7 +13919,7 @@ +@@ -13999,7 +13999,7 @@ }, { 'name': 'AttestationExtensionAllowlist', @@ -18297,7 +18936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13940,7 +13940,7 @@ +@@ -14020,7 +14020,7 @@ }, { 'name': 'AttestationExtensionWhitelist', @@ -18306,7 +18945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13964,7 +13964,7 @@ +@@ -14044,7 +14044,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', @@ -18315,7 +18954,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -13983,7 +13983,7 @@ +@@ -14063,7 +14063,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -18324,7 +18963,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.''', -@@ -13999,7 +13999,7 @@ +@@ -14079,7 +14079,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -18333,7 +18972,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14022,7 +14022,7 @@ +@@ -14102,7 +14102,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -18342,7 +18981,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14045,7 +14045,7 @@ +@@ -14125,7 +14125,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', @@ -18351,7 +18990,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -14064,7 +14064,7 @@ +@@ -14144,7 +14144,7 @@ }, { 'name': 'ManagedBookmarks', @@ -18360,7 +18999,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -14097,20 +14097,20 @@ +@@ -14177,20 +14177,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -18385,7 +19024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -14118,13 +14118,13 @@ +@@ -14198,13 +14198,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -18401,7 +19040,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:31-'], -@@ -14142,7 +14142,7 @@ +@@ -14222,7 +14222,7 @@ }, { 'name': 'UserAvatarImage', @@ -18410,7 +19049,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -14179,7 +14179,7 @@ +@@ -14259,7 +14259,7 @@ }, { 'name': 'WallpaperImage', @@ -18419,7 +19058,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -14214,7 +14214,7 @@ +@@ -14294,7 +14294,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -18428,7 +19067,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -14253,7 +14253,7 @@ +@@ -14333,7 +14333,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -18437,7 +19076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -14279,7 +14279,7 @@ +@@ -14359,7 +14359,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -18446,7 +19085,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -14300,7 +14300,7 @@ +@@ -14380,7 +14380,7 @@ }, { 'name': 'SessionLocales', @@ -18455,7 +19094,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14328,7 +14328,7 @@ +@@ -14408,7 +14408,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -18464,7 +19103,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:38-'], -@@ -14346,7 +14346,7 @@ +@@ -14426,7 +14426,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -18473,7 +19112,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -14364,7 +14364,7 @@ +@@ -14444,7 +14444,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -18482,7 +19121,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -14382,7 +14382,7 @@ +@@ -14462,7 +14462,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -18491,7 +19130,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -14403,7 +14403,7 @@ +@@ -14483,7 +14483,7 @@ }, { 'name': 'BrowserSignin', @@ -18500,7 +19139,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14442,13 +14442,13 @@ +@@ -14522,13 +14522,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. @@ -18516,7 +19155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14496,7 +14496,7 @@ +@@ -14586,7 +14586,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -18525,7 +19164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14541,7 +14541,7 @@ +@@ -14631,7 +14631,7 @@ }, { 'name': 'SSLVersionMax', @@ -18534,7 +19173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -14619,7 +14619,7 @@ +@@ -14709,7 +14709,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -18543,7 +19182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14642,11 +14642,11 @@ +@@ -14732,11 +14732,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. @@ -18557,7 +19196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14679,7 +14679,7 @@ +@@ -14769,7 +14769,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -18566,7 +19205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14706,7 +14706,7 @@ +@@ -14796,7 +14796,7 @@ }, { 'name': 'RC4Enabled', @@ -18575,7 +19214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -14731,7 +14731,7 @@ +@@ -14821,7 +14821,7 @@ }, { 'name': 'DHEEnabled', @@ -18584,7 +19223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -14758,7 +14758,7 @@ +@@ -14848,7 +14848,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -18593,7 +19232,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -14789,7 +14789,7 @@ +@@ -14879,7 +14879,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -18602,7 +19241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -14807,7 +14807,7 @@ +@@ -14897,7 +14897,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -18611,7 +19250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -14826,7 +14826,7 @@ +@@ -14916,7 +14916,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -18620,7 +19259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -14844,7 +14844,7 @@ +@@ -14934,7 +14934,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -18629,7 +19268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -14862,7 +14862,7 @@ +@@ -14952,7 +14952,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -18638,7 +19277,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-'], -@@ -14880,7 +14880,7 @@ +@@ -14970,7 +14970,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -18647,7 +19286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14901,11 +14901,11 @@ +@@ -14991,11 +14991,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. @@ -18661,7 +19300,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:43-', 'chrome_os:43-'], -@@ -14923,7 +14923,7 @@ +@@ -15013,7 +15013,7 @@ }, { 'name': 'KeyPermissions', @@ -18670,7 +19309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14966,7 +14966,7 @@ +@@ -15056,7 +15056,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -18679,7 +19318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -14985,7 +14985,7 @@ +@@ -15075,7 +15075,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -18688,7 +19327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -15003,7 +15003,7 @@ +@@ -15093,7 +15093,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -18697,7 +19336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -15022,7 +15022,7 @@ +@@ -15112,7 +15112,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -18706,7 +19345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15067,7 +15067,7 @@ +@@ -15157,7 +15157,7 @@ }, { 'name': 'ArcEnabled', @@ -18715,7 +19354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -15085,7 +15085,7 @@ +@@ -15175,7 +15175,7 @@ }, { 'name': 'ArcPolicy', @@ -18724,7 +19363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -15145,7 +15145,7 @@ +@@ -15235,7 +15235,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -18733,7 +19372,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -15167,7 +15167,7 @@ +@@ -15257,7 +15257,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -18742,7 +19381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15203,7 +15203,7 @@ +@@ -15293,7 +15293,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -18751,7 +19390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15244,7 +15244,7 @@ +@@ -15334,7 +15334,7 @@ }, { 'name': 'UsbDetachableAllowlist', @@ -18760,7 +19399,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15281,7 +15281,7 @@ +@@ -15371,7 +15371,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -18769,7 +19408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -15301,7 +15301,7 @@ +@@ -15391,7 +15391,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -18778,7 +19417,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. -@@ -15319,7 +15319,7 @@ +@@ -15409,7 +15409,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -18787,7 +19426,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -15353,7 +15353,7 @@ +@@ -15443,7 +15443,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -18796,7 +19435,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15407,7 +15407,7 @@ +@@ -15497,7 +15497,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -18805,7 +19444,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. -@@ -15425,7 +15425,7 @@ +@@ -15515,7 +15515,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -18814,7 +19453,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -15463,7 +15463,7 @@ +@@ -15553,7 +15553,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -18823,7 +19462,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.''', -@@ -15498,7 +15498,7 @@ +@@ -15588,7 +15588,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -18832,7 +19471,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. -@@ -15517,7 +15517,7 @@ +@@ -15607,7 +15607,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -18841,7 +19480,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. -@@ -15536,7 +15536,7 @@ +@@ -15626,7 +15626,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -18850,7 +19489,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. -@@ -15581,7 +15581,7 @@ +@@ -15671,7 +15671,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -18859,7 +19498,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15605,7 +15605,7 @@ +@@ -15695,7 +15695,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -18868,7 +19507,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15616,7 +15616,7 @@ +@@ -15706,7 +15706,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -18877,7 +19516,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'], -@@ -15629,13 +15629,13 @@ +@@ -15719,13 +15719,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -18894,7 +19533,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. -@@ -15653,7 +15653,7 @@ +@@ -15743,7 +15743,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -18903,7 +19542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15686,7 +15686,7 @@ +@@ -15776,7 +15776,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -18912,16 +19551,16 @@ 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-'], -@@ -15695,7 +15695,7 @@ +@@ -15785,7 +15785,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, - 'example_value': 'managedchrome.com,example.com', + 'example_value': 'managedch40me.qjz9zk,example.com', 'id': 331, - 'caption': '''Define domains allowed to access G Suite''', + 'caption': '''Define domains allowed to access Google Workspace''', 'tags': ['filtering'], -@@ -15705,11 +15705,11 @@ +@@ -15795,11 +15795,11 @@ Users cannot change or override this setting. @@ -18935,7 +19574,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' ], -@@ -15744,7 +15744,7 @@ +@@ -15834,7 +15834,7 @@ }, { 'name': 'EnableMediaRouter', @@ -18944,7 +19583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:52-', 'chrome_os:52-', 'android:52-'], -@@ -15762,7 +15762,7 @@ +@@ -15852,7 +15852,7 @@ }, { 'name': 'ShowCastIconInToolbar', @@ -18953,7 +19592,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], -@@ -15782,7 +15782,7 @@ +@@ -15872,7 +15872,7 @@ }, { 'name': 'MediaRouterCastAllowAllIPs', @@ -18962,7 +19601,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:67-', 'chrome_os:67-'], -@@ -15802,7 +15802,7 @@ +@@ -15892,7 +15892,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -18971,7 +19610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -15820,7 +15820,7 @@ +@@ -15910,7 +15910,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -18980,7 +19619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -15838,7 +15838,7 @@ +@@ -15928,7 +15928,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -18989,7 +19628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-'], -@@ -15869,7 +15869,7 @@ +@@ -15960,7 +15960,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -18998,7 +19637,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-'], -@@ -15900,7 +15900,7 @@ +@@ -15991,7 +15991,7 @@ }, { 'name': 'NTPCardsVisible', @@ -19007,7 +19646,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-'], -@@ -15939,7 +15939,7 @@ +@@ -16030,7 +16030,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -19016,7 +19655,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-'], -@@ -15957,7 +15957,7 @@ +@@ -16048,7 +16048,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -19025,7 +19664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15979,7 +15979,7 @@ +@@ -16070,7 +16070,7 @@ }, { 'name': 'WebRestrictionsAuthority', @@ -19034,7 +19673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 341, 'type': 'string', 'schema' : { 'type': 'string' }, -@@ -15995,7 +15995,7 @@ +@@ -16086,7 +16086,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -19043,7 +19682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-', 'chrome_os:54-'], -@@ -16011,11 +16011,11 @@ +@@ -16102,11 +16102,11 @@ 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. Examples of such components include the certificate revocation lists and Safe Browsing data. @@ -19057,7 +19696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16039,7 +16039,7 @@ +@@ -16130,7 +16130,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -19066,7 +19705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -16095,7 +16095,7 @@ +@@ -16186,7 +16186,7 @@ }, { 'name': 'Printers', @@ -19075,7 +19714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16119,7 +16119,7 @@ +@@ -16210,7 +16210,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -19084,7 +19723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -16172,7 +16172,7 @@ +@@ -16263,7 +16263,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -19093,7 +19732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -16205,7 +16205,7 @@ +@@ -16296,7 +16296,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -19102,7 +19741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -16235,7 +16235,7 @@ +@@ -16326,7 +16326,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -19111,7 +19750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-'], 'type': 'int-enum', -@@ -16283,7 +16283,7 @@ +@@ -16374,7 +16374,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -19120,7 +19759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -16328,7 +16328,7 @@ +@@ -16419,7 +16419,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -19129,7 +19768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 384, 'type': 'list', -@@ -16350,7 +16350,7 @@ +@@ -16441,7 +16441,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -19138,7 +19777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -16369,7 +16369,7 @@ +@@ -16460,7 +16460,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -19147,7 +19786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-'], 'id': 385, 'type': 'list', -@@ -16391,7 +16391,7 @@ +@@ -16482,7 +16482,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -19156,7 +19795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -16410,7 +16410,7 @@ +@@ -16501,7 +16501,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -19165,7 +19804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -16448,7 +16448,7 @@ +@@ -16539,7 +16539,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -19174,7 +19813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-'], -@@ -16496,7 +16496,7 @@ +@@ -16587,7 +16587,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -19183,7 +19822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 388, -@@ -16518,7 +16518,7 @@ +@@ -16609,7 +16609,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -19192,7 +19831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 389, -@@ -16541,7 +16541,7 @@ +@@ -16632,7 +16632,7 @@ }, { 'name': 'DevicePrinters', @@ -19201,7 +19840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -16576,7 +16576,7 @@ +@@ -16667,7 +16667,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -19210,7 +19849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -16621,7 +16621,7 @@ +@@ -16712,7 +16712,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -19219,7 +19858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -16640,7 +16640,7 @@ +@@ -16731,7 +16731,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -19228,7 +19867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -16660,7 +16660,7 @@ +@@ -16751,7 +16751,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -19237,7 +19876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -16713,7 +16713,7 @@ +@@ -16804,7 +16804,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -19246,7 +19885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -16739,7 +16739,7 @@ +@@ -16830,7 +16830,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -19255,7 +19894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -16823,7 +16823,7 @@ +@@ -16914,7 +16914,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -19264,7 +19903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -16847,7 +16847,7 @@ +@@ -16938,7 +16938,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', @@ -19273,7 +19912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16885,7 +16885,7 @@ +@@ -16976,7 +16976,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', @@ -19282,7 +19921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16926,7 +16926,7 @@ +@@ -17017,7 +17017,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -19291,7 +19930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16969,7 +16969,7 @@ +@@ -17060,7 +17060,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -19300,7 +19939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -16987,7 +16987,7 @@ +@@ -17078,7 +17078,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -19309,7 +19948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -17005,7 +17005,7 @@ +@@ -17096,7 +17096,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -19318,7 +19957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -17023,7 +17023,7 @@ +@@ -17114,7 +17114,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -19327,7 +19966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -17056,7 +17056,7 @@ +@@ -17147,7 +17147,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -19336,7 +19975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17077,7 +17077,7 @@ +@@ -17168,7 +17168,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -19345,7 +19984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17098,7 +17098,7 @@ +@@ -17189,7 +17189,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -19354,7 +19993,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -17121,7 +17121,7 @@ +@@ -17212,7 +17212,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -19363,7 +20002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -17142,7 +17142,7 @@ +@@ -17233,7 +17233,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -19372,7 +20011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17165,7 +17165,7 @@ +@@ -17256,7 +17256,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -19381,7 +20020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -17186,7 +17186,7 @@ +@@ -17277,7 +17277,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -19390,7 +20029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -17207,7 +17207,7 @@ +@@ -17298,7 +17298,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -19399,7 +20038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17228,7 +17228,7 @@ +@@ -17319,7 +17319,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -19408,7 +20047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17248,7 +17248,7 @@ +@@ -17339,7 +17339,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -19417,7 +20056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -17268,7 +17268,7 @@ +@@ -17359,7 +17359,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -19426,7 +20065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -17289,7 +17289,7 @@ +@@ -17380,7 +17380,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -19435,7 +20074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -17321,7 +17321,7 @@ +@@ -17412,7 +17412,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -19444,7 +20083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -17350,7 +17350,7 @@ +@@ -17441,7 +17441,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -19453,7 +20092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17393,7 +17393,7 @@ +@@ -17484,7 +17484,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -19462,7 +20101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -17425,7 +17425,7 @@ +@@ -17516,7 +17516,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -19471,7 +20110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17471,7 +17471,7 @@ +@@ -17562,7 +17562,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -19480,7 +20119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17527,7 +17527,7 @@ +@@ -17618,7 +17618,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -19489,7 +20128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -17564,7 +17564,7 @@ +@@ -17655,7 +17655,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -19498,7 +20137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17594,7 +17594,7 @@ +@@ -17685,7 +17685,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -19507,7 +20146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17621,7 +17621,7 @@ +@@ -17712,7 +17712,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -19516,7 +20155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -17641,7 +17641,7 @@ +@@ -17732,7 +17732,7 @@ }, { 'name': 'CastReceiverName', @@ -19525,7 +20164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -17661,7 +17661,7 @@ +@@ -17752,7 +17752,7 @@ }, { 'name': 'DeviceOffHours', @@ -19534,7 +20173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17744,7 +17744,7 @@ +@@ -17835,7 +17835,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -19543,7 +20182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -17768,7 +17768,7 @@ +@@ -17859,7 +17859,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -19551,8 +20190,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['macourteau@ch40m1um.qjz9zk', 'zmin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean'}, - 'supported_on': ['chrome.*:64-', 'chrome_os:64-'], -@@ -17786,7 +17786,7 @@ + 'supported_on': ['chrome.*:64-', 'chrome_os:64-', 'android:92-'], +@@ -17877,7 +17877,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -19561,7 +20200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -17804,7 +17804,7 @@ +@@ -17895,7 +17895,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -19570,7 +20209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17856,7 +17856,7 @@ +@@ -17947,7 +17947,7 @@ }, { 'name': 'IsolateOrigins', @@ -19579,7 +20218,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-'], -@@ -17877,7 +17877,7 @@ +@@ -17968,7 +17968,7 @@ }, { 'name': 'SitePerProcess', @@ -19588,7 +20227,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-'], -@@ -17898,7 +17898,7 @@ +@@ -17989,7 +17989,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -19597,7 +20236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -17921,7 +17921,7 @@ +@@ -18012,7 +18012,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -19606,7 +20245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -17942,7 +17942,7 @@ +@@ -18033,7 +18033,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -19615,7 +20254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -17965,7 +17965,7 @@ +@@ -18056,7 +18056,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -19624,7 +20263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -17988,7 +17988,7 @@ +@@ -18079,7 +18079,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -19633,7 +20272,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-'], -@@ -18017,11 +18017,11 @@ +@@ -18108,11 +18108,11 @@ 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: @@ -19647,7 +20286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -18051,7 +18051,7 @@ +@@ -18142,7 +18142,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -19656,7 +20295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18098,7 +18098,7 @@ +@@ -18189,7 +18189,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -19665,7 +20304,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-'], -@@ -18116,11 +18116,11 @@ +@@ -18207,11 +18207,11 @@ Leaving the policy unset means Chrome uses its platform-specific default directory. @@ -19679,7 +20318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -18139,7 +18139,7 @@ +@@ -18230,7 +18230,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -19688,7 +20327,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-'], -@@ -18168,7 +18168,7 @@ +@@ -18259,7 +18259,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -19697,7 +20336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18199,7 +18199,7 @@ +@@ -18290,7 +18290,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -19706,7 +20345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18233,7 +18233,7 @@ +@@ -18324,7 +18324,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -19715,7 +20354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18264,7 +18264,7 @@ +@@ -18355,7 +18355,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -19724,7 +20363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -18284,7 +18284,7 @@ +@@ -18375,7 +18375,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -19733,7 +20372,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-'], -@@ -18320,7 +18320,7 @@ +@@ -18411,7 +18411,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -19742,7 +20381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18354,7 +18354,7 @@ +@@ -18445,7 +18445,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -19751,7 +20390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18365,7 +18365,7 @@ +@@ -18456,7 +18456,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -19760,7 +20399,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': [], -@@ -18379,7 +18379,7 @@ +@@ -18470,7 +18470,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -19769,7 +20408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18428,7 +18428,7 @@ +@@ -18519,7 +18519,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -19778,7 +20417,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18463,7 +18463,7 @@ +@@ -18554,7 +18554,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -19787,7 +20426,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18484,7 +18484,7 @@ +@@ -18575,7 +18575,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -19796,7 +20435,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -18502,7 +18502,7 @@ +@@ -18594,7 +18594,7 @@ + { + 'id': 854, + 'name': 'RelaunchWindow', +- 'owners': ['snijhara@google.com', 'file://chrome/browser/upgrade_detector/OWNERS'], ++ 'owners': ['snijhara@9oo91e.qjz9zk', 'file://chrome/browser/upgrade_detector/OWNERS'], + 'tags': [], + 'features': { + 'dynamic_refresh': True, +@@ -18664,7 +18664,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -19805,7 +20453,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -18521,7 +18521,7 @@ +@@ -18683,7 +18683,7 @@ }, { 'name': 'CrostiniAllowed', @@ -19814,7 +20462,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -18537,7 +18537,7 @@ +@@ -18699,7 +18699,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -19823,7 +20471,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -18553,7 +18553,7 @@ +@@ -18715,7 +18715,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -19832,7 +20480,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -18569,7 +18569,7 @@ +@@ -18731,7 +18731,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -19841,7 +20489,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -18588,7 +18588,7 @@ +@@ -18750,7 +18750,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -19850,7 +20498,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -18628,7 +18628,7 @@ +@@ -18790,7 +18790,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -19859,7 +20507,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18666,7 +18666,7 @@ +@@ -18828,7 +18828,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -19868,7 +20516,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -18707,7 +18707,7 @@ +@@ -18869,7 +18869,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -19877,7 +20525,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -18727,7 +18727,7 @@ +@@ -18889,7 +18889,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -19886,7 +20534,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18753,7 +18753,7 @@ +@@ -18915,7 +18915,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -19895,7 +20543,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18776,7 +18776,7 @@ +@@ -18938,7 +18938,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -19904,7 +20552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18791,15 +18791,15 @@ +@@ -18953,15 +18953,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -19923,7 +20571,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-'], -@@ -18811,15 +18811,15 @@ +@@ -18973,15 +18973,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -19942,7 +20590,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-'], -@@ -18837,12 +18837,12 @@ +@@ -18999,12 +18999,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -19957,7 +20605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -18862,7 +18862,7 @@ +@@ -19024,7 +19024,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -19966,7 +20614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -18880,11 +18880,11 @@ +@@ -19043,11 +19043,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. @@ -19980,7 +20628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -18901,11 +18901,11 @@ +@@ -19064,11 +19064,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. @@ -19994,7 +20642,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-'], -@@ -18925,7 +18925,7 @@ +@@ -19088,7 +19088,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -20003,7 +20651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18945,11 +18945,11 @@ +@@ -19108,11 +19108,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. @@ -20017,7 +20665,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18966,11 +18966,11 @@ +@@ -19129,11 +19129,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. @@ -20031,7 +20679,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'], -@@ -18985,13 +18985,13 @@ +@@ -19148,13 +19148,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -20047,7 +20695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -19015,7 +19015,7 @@ +@@ -19178,7 +19178,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -20056,7 +20704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -19036,7 +19036,7 @@ +@@ -19199,7 +19199,7 @@ }, { 'name': 'DeviceSamlLoginAuthenticationType', @@ -20065,7 +20713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19073,7 +19073,7 @@ +@@ -19236,7 +19236,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -20074,7 +20722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -19093,7 +19093,7 @@ +@@ -19256,7 +19256,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -20083,7 +20731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -19115,7 +19115,7 @@ +@@ -19278,7 +19278,7 @@ }, { 'name': 'AllowedLanguages', @@ -20092,7 +20740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19139,7 +19139,7 @@ +@@ -19302,7 +19302,7 @@ }, { 'name': 'AllowedInputMethods', @@ -20101,7 +20749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19163,7 +19163,7 @@ +@@ -19326,7 +19326,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -20110,7 +20758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -19180,7 +19180,7 @@ +@@ -19343,7 +19343,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', @@ -20119,7 +20767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -19198,7 +19198,7 @@ +@@ -19361,7 +19361,7 @@ }, { 'name': 'UsageTimeLimit', @@ -20128,7 +20776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19367,7 +19367,7 @@ +@@ -19514,7 +19514,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -20137,7 +20785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19409,7 +19409,7 @@ +@@ -19556,7 +19556,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -20146,7 +20794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19451,7 +19451,7 @@ +@@ -19598,7 +19598,7 @@ }, { 'name': 'EnableSyncConsent', @@ -20155,7 +20803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -19469,7 +19469,7 @@ +@@ -19616,7 +19616,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -20164,7 +20812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -19490,7 +19490,7 @@ +@@ -19637,7 +19637,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -20173,7 +20821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19577,7 +19577,7 @@ +@@ -19724,7 +19724,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -20182,7 +20830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -19596,7 +19596,7 @@ +@@ -19743,7 +19743,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -20191,7 +20839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19634,7 +19634,7 @@ +@@ -19781,7 +19781,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -20200,7 +20848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19658,7 +19658,7 @@ +@@ -19805,7 +19805,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -20209,7 +20857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19703,7 +19703,7 @@ +@@ -19850,7 +19850,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -20218,7 +20866,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'], -@@ -19718,13 +19718,13 @@ +@@ -19865,13 +19865,13 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -20234,7 +20882,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-'], -@@ -19745,7 +19745,7 @@ +@@ -19892,7 +19892,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -20243,7 +20891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19760,7 +19760,7 @@ +@@ -19907,7 +19907,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -20252,7 +20900,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-'], -@@ -19780,7 +19780,7 @@ +@@ -19927,7 +19927,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -20261,7 +20909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19798,7 +19798,7 @@ +@@ -19945,7 +19945,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -20270,7 +20918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19823,7 +19823,7 @@ +@@ -19970,7 +19970,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -20279,7 +20927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19841,7 +19841,7 @@ +@@ -19988,7 +19988,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -20288,7 +20936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19861,12 +19861,12 @@ +@@ -20008,12 +20008,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -20304,7 +20952,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -19879,7 +19879,7 @@ +@@ -20026,7 +20026,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -20313,7 +20961,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19906,14 +19906,14 @@ +@@ -20053,14 +20053,14 @@ 'per_profile': True, }, 'example_value': [{ @@ -20331,7 +20979,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'fallback_app_name': 'Editor' }], -@@ -19946,7 +19946,7 @@ +@@ -20093,7 +20093,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -20340,7 +20988,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19971,7 +19971,7 @@ +@@ -20118,7 +20118,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -20349,7 +20997,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19996,7 +19996,7 @@ +@@ -20143,7 +20143,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -20358,7 +21006,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20020,7 +20020,7 @@ +@@ -20167,7 +20167,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -20367,7 +21015,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20045,7 +20045,7 @@ +@@ -20192,7 +20192,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -20376,7 +21024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20070,7 +20070,7 @@ +@@ -20217,7 +20217,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -20385,7 +21033,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -20096,7 +20096,7 @@ +@@ -20243,7 +20243,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -20394,7 +21042,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -20122,7 +20122,7 @@ +@@ -20269,7 +20269,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -20403,7 +21051,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -20148,7 +20148,7 @@ +@@ -20296,7 +20296,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -20412,7 +21060,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-'], -@@ -20168,7 +20168,7 @@ +@@ -20316,7 +20316,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -20421,7 +21069,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -20187,7 +20187,7 @@ +@@ -20335,7 +20335,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -20430,7 +21078,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -20205,7 +20205,7 @@ +@@ -20353,7 +20353,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -20439,7 +21087,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -20250,7 +20250,7 @@ +@@ -20398,7 +20398,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -20448,7 +21096,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20290,7 +20290,7 @@ +@@ -20438,7 +20438,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -20457,7 +21105,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -20308,7 +20308,7 @@ +@@ -20456,7 +20456,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -20466,7 +21114,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20339,7 +20339,7 @@ +@@ -20487,7 +20487,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -20475,7 +21123,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -20359,7 +20359,7 @@ +@@ -20507,7 +20507,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -20484,7 +21132,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20386,7 +20386,7 @@ +@@ -20534,7 +20534,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -20493,7 +21141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20413,7 +20413,7 @@ +@@ -20561,7 +20561,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -20502,7 +21150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20440,7 +20440,7 @@ +@@ -20588,7 +20588,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -20511,7 +21159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -20457,12 +20457,12 @@ +@@ -20605,12 +20605,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. @@ -20526,7 +21174,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', -@@ -20477,12 +20477,12 @@ +@@ -20625,12 +20625,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. @@ -20541,7 +21189,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', -@@ -20497,12 +20497,12 @@ +@@ -20645,12 +20645,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. @@ -20556,7 +21204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -20520,7 +20520,7 @@ +@@ -20668,7 +20668,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -20565,7 +21213,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -20538,7 +20538,7 @@ +@@ -20686,7 +20686,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -20574,7 +21222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -20555,7 +20555,7 @@ +@@ -20703,7 +20703,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -20583,7 +21231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20596,7 +20596,7 @@ +@@ -20744,7 +20744,7 @@ }, { 'name': 'PluginVmAllowed', @@ -20592,7 +21240,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -20614,7 +20614,7 @@ +@@ -20762,7 +20762,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -20601,7 +21249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -20634,7 +20634,7 @@ +@@ -20782,7 +20782,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -20610,7 +21258,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20653,7 +20653,7 @@ +@@ -20801,7 +20801,7 @@ }, { 'name': 'PluginVmUserId', @@ -20619,7 +21267,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20672,7 +20672,7 @@ +@@ -20820,7 +20820,7 @@ }, { 'name': 'PluginVmImage', @@ -20628,7 +21276,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20703,7 +20703,7 @@ +@@ -20851,7 +20851,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -20637,7 +21285,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20722,7 +20722,7 @@ +@@ -20870,7 +20870,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -20646,16 +21294,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20745,7 +20745,7 @@ +@@ -20893,7 +20893,7 @@ }, { 'name': 'ParentAccessCodeConfig', -- 'owners': ['file://chrome/browser/chromeos/child_accounts/OWNERS', 'agawronska@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/child_accounts/OWNERS', 'agawronska@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/child_accounts/OWNERS', 'agawronska@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/child_accounts/OWNERS', 'agawronska@ch40m1um.qjz9zk'], 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -20823,7 +20823,7 @@ +@@ -20971,7 +20971,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -20664,7 +21312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20863,7 +20863,7 @@ +@@ -21011,7 +21011,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -20673,7 +21321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20910,7 +20910,7 @@ +@@ -21058,7 +21058,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -20682,7 +21330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -20927,7 +20927,7 @@ +@@ -21075,7 +21075,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -20691,7 +21339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -20967,7 +20967,7 @@ +@@ -21115,7 +21115,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -20700,7 +21348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20985,7 +20985,7 @@ +@@ -21133,7 +21133,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -20709,7 +21357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21003,7 +21003,7 @@ +@@ -21151,7 +21151,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -20718,7 +21366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -21026,7 +21026,7 @@ +@@ -21174,7 +21174,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -20727,7 +21375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -21045,7 +21045,7 @@ +@@ -21193,7 +21193,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -20736,7 +21384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -21065,11 +21065,11 @@ +@@ -21213,11 +21213,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -20750,7 +21398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21098,7 +21098,7 @@ +@@ -21246,7 +21246,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -20759,7 +21407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21119,7 +21119,7 @@ +@@ -21267,7 +21267,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -20768,7 +21416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21142,7 +21142,7 @@ +@@ -21290,7 +21290,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -20777,7 +21425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21221,7 +21221,7 @@ +@@ -21369,7 +21369,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -20786,7 +21434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21242,7 +21242,7 @@ +@@ -21390,7 +21390,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -20795,7 +21443,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 @@ +@@ -21415,7 +21415,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -20804,18 +21452,18 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:75-', 'chrome_os:75-'], -@@ -21296,7 +21296,7 @@ +@@ -21444,7 +21444,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', - 'owners': ['rodmartin@google.com', 'rogerta@chromium.org', 'mad@chromium.org'], + 'owners': ['rodmartin@9oo91e.qjz9zk', 'rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk'], - 'future_on': ['chrome.*'], + 'future_on': ['chrome.*', 'chrome_os'], 'type': 'list', 'schema': { -@@ -21322,11 +21322,11 @@ +@@ -21472,11 +21472,11 @@ - Note: Wildcards, *, are allowed. + For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server. - For detailed information on valid URL patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''', + For detailed information on valid URL patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''', @@ -20827,7 +21475,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -21349,7 +21349,7 @@ +@@ -21499,7 +21499,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -20836,7 +21484,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -21382,7 +21382,7 @@ +@@ -21532,7 +21532,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -20845,7 +21493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21401,7 +21401,7 @@ +@@ -21551,7 +21551,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -20854,7 +21502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -21432,7 +21432,7 @@ +@@ -21582,7 +21582,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -20863,7 +21511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21459,7 +21459,7 @@ +@@ -21609,7 +21609,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -20872,7 +21520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -21480,7 +21480,7 @@ +@@ -21630,7 +21630,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -20881,7 +21529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21547,7 +21547,7 @@ +@@ -21697,7 +21697,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -20890,7 +21538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21598,7 +21598,7 @@ +@@ -21748,7 +21748,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -20899,7 +21547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21621,7 +21621,7 @@ +@@ -21771,7 +21771,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -20908,7 +21556,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21644,7 +21644,7 @@ +@@ -21794,7 +21794,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -20917,43 +21565,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -21690,7 +21690,7 @@ +@@ -21840,7 +21840,7 @@ }, { 'name': 'KerberosEnabled', -- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'fsandrade@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'fsandrade@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21711,7 +21711,7 @@ +@@ -21861,7 +21861,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', -- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21732,7 +21732,7 @@ +@@ -21882,7 +21882,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', -- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -21753,7 +21753,7 @@ +@@ -21903,7 +21903,7 @@ }, { 'name': 'KerberosAccounts', -- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], -+ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], +- 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], 'type': 'dict', 'schema': { 'type': 'array', -@@ -21830,7 +21830,7 @@ +@@ -21980,7 +21980,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -20962,7 +21610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -21861,7 +21861,7 @@ +@@ -22011,7 +22011,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -20971,7 +21619,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -21882,7 +21882,7 @@ +@@ -22032,7 +22032,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -20980,7 +21628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -21902,7 +21902,7 @@ +@@ -22052,7 +22052,7 @@ }, { 'name': 'ExternalPrintServers', @@ -20989,7 +21637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21947,7 +21947,7 @@ +@@ -22097,7 +22097,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -20998,7 +21646,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21996,7 +21996,7 @@ +@@ -22146,7 +22146,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -21007,7 +21655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -22016,7 +22016,7 @@ +@@ -22166,7 +22166,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -21016,7 +21664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22054,7 +22054,7 @@ +@@ -22204,7 +22204,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -21025,7 +21673,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22074,7 +22074,7 @@ +@@ -22224,7 +22224,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -21034,7 +21682,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22209,7 +22209,7 @@ +@@ -22359,7 +22359,7 @@ }, { 'name': 'OnFileAttachedEnterpriseConnector', @@ -21043,7 +21691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22344,7 +22344,7 @@ +@@ -22494,7 +22494,7 @@ }, { 'name': 'OnBulkDataEntryEnterpriseConnector', @@ -21052,7 +21700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22475,7 +22475,7 @@ +@@ -22625,7 +22625,7 @@ }, { 'name': 'OnSecurityEventEnterpriseConnector', @@ -21061,7 +21709,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22512,7 +22512,7 @@ +@@ -22662,7 +22662,7 @@ }, { 'name': 'EnterpriseRealTimeUrlCheckMode', @@ -21070,7 +21718,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22554,7 +22554,7 @@ +@@ -22704,7 +22704,7 @@ }, { 'name': 'RendererCodeIntegrityEnabled', @@ -21079,12 +21727,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -22570,11 +22570,11 @@ +@@ -22720,11 +22720,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. -- Note: Read more about Process mitigation policies ( https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md#Process-mitigation-policies ).''', -+ Note: Read more about Process mitigation policies ( https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/design/sandbox.md#Process-mitigation-policies ).''', +- Note: Read more about Process mitigation policies ( https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox.md#Process-mitigation-policies ).''', ++ Note: Read more about Process mitigation policies ( https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/docs/design/sandbox.md#Process-mitigation-policies ).''', }, { 'name': 'HSTSPolicyBypassList', @@ -21093,7 +21741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22600,7 +22600,7 @@ +@@ -22750,7 +22750,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -21102,7 +21750,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-'], -@@ -22621,11 +22621,11 @@ +@@ -22771,11 +22771,11 @@ This policy will be removed in Chrome 93. @@ -21116,7 +21764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -22651,7 +22651,7 @@ +@@ -22801,7 +22801,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -21125,7 +21773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22676,7 +22676,7 @@ +@@ -22826,7 +22826,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -21134,7 +21782,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-'], -@@ -22697,7 +22697,7 @@ +@@ -22847,7 +22847,7 @@ }, { 'name': 'CorsMitigationList', @@ -21143,7 +21791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22715,19 +22715,19 @@ +@@ -22865,19 +22865,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. @@ -21166,7 +21814,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'], -@@ -22748,13 +22748,13 @@ +@@ -22898,13 +22898,13 @@ This policy will be removed after a couple of milestones. @@ -21182,7 +21830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-'], 'id': 631, 'features': { -@@ -22782,7 +22782,7 @@ +@@ -22932,7 +22932,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -21191,7 +21839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -22807,7 +22807,7 @@ +@@ -22957,7 +22957,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -21200,7 +21848,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, -@@ -22834,7 +22834,7 @@ +@@ -22984,7 +22984,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -21209,7 +21857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22867,7 +22867,7 @@ +@@ -23017,7 +23017,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -21218,7 +21866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22902,7 +22902,7 @@ +@@ -23052,7 +23052,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -21227,7 +21875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22921,11 +22921,11 @@ +@@ -23071,11 +23071,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. @@ -21241,7 +21889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22944,11 +22944,11 @@ +@@ -23094,11 +23094,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. @@ -21255,7 +21903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -22972,11 +22972,11 @@ +@@ -23122,11 +23122,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -21269,7 +21917,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -22994,7 +22994,7 @@ +@@ -23144,7 +23144,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -21278,7 +21926,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23121,7 +23121,7 @@ +@@ -23271,7 +23271,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -21287,7 +21935,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23144,7 +23144,7 @@ +@@ -23294,7 +23294,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -21296,7 +21944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -23167,7 +23167,7 @@ +@@ -23317,7 +23317,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -21305,7 +21953,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-'], -@@ -23179,7 +23179,7 @@ +@@ -23329,7 +23329,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -21314,7 +21962,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. -@@ -23191,7 +23191,7 @@ +@@ -23341,7 +23341,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -21323,7 +21971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -23212,7 +23212,7 @@ +@@ -23362,7 +23362,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -21332,7 +21980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -23277,7 +23277,7 @@ +@@ -23427,7 +23427,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -21341,7 +21989,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23317,7 +23317,7 @@ +@@ -23467,7 +23467,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -21350,7 +21998,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23340,7 +23340,7 @@ +@@ -23490,7 +23490,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -21359,7 +22007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23395,7 +23395,7 @@ +@@ -23545,7 +23545,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -21368,7 +22016,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-'], -@@ -23415,7 +23415,7 @@ +@@ -23565,7 +23565,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -21377,7 +22025,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-'], -@@ -23437,7 +23437,7 @@ +@@ -23587,7 +23587,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -21386,7 +22034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -23481,8 +23481,8 @@ +@@ -23631,8 +23631,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -21397,7 +22045,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -23511,7 +23511,7 @@ +@@ -23661,7 +23661,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -21406,7 +22054,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -23554,8 +23554,8 @@ +@@ -23704,8 +23704,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -21417,7 +22065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -23582,7 +23582,7 @@ +@@ -23732,7 +23732,7 @@ }, { 'name': 'LocalDiscoveryEnabled', @@ -21426,7 +22074,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'], -@@ -23615,7 +23615,7 @@ +@@ -23765,7 +23765,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -21435,7 +22083,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-'], -@@ -23637,7 +23637,7 @@ +@@ -23787,7 +23787,7 @@ }, { 'name': 'AdvancedProtectionDeepScanningEnabled', @@ -21444,7 +22092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -23656,7 +23656,7 @@ +@@ -23806,7 +23806,7 @@ }, { 'name': 'SystemProxySettings', @@ -21453,7 +22101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -23712,7 +23712,7 @@ +@@ -23862,7 +23862,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -21462,7 +22110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -23740,7 +23740,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -23890,7 +23890,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -21471,7 +22119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -23767,7 +23767,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -23917,7 +23917,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -21480,7 +22128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-'], -@@ -23822,7 +23822,7 @@ If set to False, $1Google Chrome will not +@@ -23972,7 +23972,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -21489,7 +22137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -23874,7 +23874,7 @@ If set to False, $1Google Chrome will not +@@ -24024,7 +24024,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -21498,7 +22146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -23926,7 +23926,7 @@ If set to False, $1Google Chrome will not +@@ -24076,7 +24076,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -21507,7 +22155,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-'], -@@ -23943,7 +23943,7 @@ If set to False, $1Google Chrome will not +@@ -24093,7 +24093,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -21516,7 +22164,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-'], -@@ -23964,7 +23964,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24114,7 +24114,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -21525,7 +22173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -23983,7 +23983,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24133,7 +24133,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -21534,7 +22182,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-'], -@@ -24034,7 +24034,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24184,7 +24184,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -21543,7 +22191,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-'], -@@ -24072,7 +24072,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24222,7 +24222,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -21552,7 +22200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -24107,7 +24107,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24257,7 +24257,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -21561,7 +22209,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 +@@ -24283,7 +24283,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -21570,7 +22218,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -24152,7 +24152,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24302,7 +24302,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -21579,7 +22227,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-'], -@@ -24175,7 +24175,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24325,7 +24325,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -21588,7 +22236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -24197,7 +24197,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24347,7 +24347,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -21597,7 +22245,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-'], -@@ -24220,7 +24220,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24370,7 +24370,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -21606,7 +22254,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-'], -@@ -24239,7 +24239,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24389,7 +24389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -21615,7 +22263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -24265,7 +24265,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24415,7 +24415,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -21624,7 +22272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -24295,7 +24295,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24445,7 +24445,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -21633,7 +22281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24338,7 +24338,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24488,7 +24488,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -21642,7 +22290,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'], -@@ -24368,7 +24368,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24518,7 +24518,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -21651,7 +22299,16 @@ 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'], -@@ -24397,7 +24397,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24547,7 +24547,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'], + '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 }, { 'name': 'DataLeakPreventionRulesList', @@ -21660,7 +22317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24482,18 +24482,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24665,18 +24665,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -21685,7 +22342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -24526,8 +24526,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24709,8 +24709,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -21696,7 +22353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -24572,13 +24572,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24756,13 +24756,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. @@ -21712,7 +22369,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-'], -@@ -24611,7 +24611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24795,7 +24795,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -21721,7 +22378,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-'], -@@ -24638,7 +24638,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24822,7 +24822,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -21730,7 +22387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24662,7 +24662,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24846,7 +24846,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -21739,7 +22396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -24687,7 +24687,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24871,7 +24871,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -21748,7 +22405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24741,7 +24741,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24927,7 +24927,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -21757,7 +22414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-'], -@@ -24773,7 +24773,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24959,7 +24959,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -21766,7 +22423,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, # TODO(crbug.com/1179280): remove chrome.linux support once -@@ -24809,7 +24809,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24995,7 +24995,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'LacrosAvailability', +- 'owners': ['asumaneev@google.com'], ++ 'owners': ['asumaneev@9oo91e.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -25061,7 +25061,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -21775,7 +22441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -24840,7 +24840,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25092,7 +25092,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -21784,7 +22450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -24929,7 +24929,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25179,7 +25179,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -21793,7 +22459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24976,7 +24976,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25226,7 +25226,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -21802,7 +22468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -25011,7 +25011,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25261,7 +25261,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -21811,7 +22477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -25044,7 +25044,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25294,7 +25294,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -21820,7 +22486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25131,7 +25131,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25381,7 +25381,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -21829,7 +22495,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -25165,7 +25165,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25415,7 +25415,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -21838,7 +22504,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -25223,7 +25223,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25473,7 +25473,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'FetchKeepaliveDurationSecondsOnShutdown', @@ -21847,7 +22513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -25246,7 +25246,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25496,7 +25496,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -21856,7 +22522,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-'], -@@ -25269,7 +25269,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25519,7 +25519,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': [], @@ -21865,7 +22531,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. -@@ -25278,7 +25278,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25528,7 +25528,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -21874,7 +22540,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25307,7 +25307,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25557,7 +25557,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserBorealisAllowed', @@ -21883,7 +22549,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25336,7 +25336,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25586,7 +25586,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -21892,7 +22558,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -25373,7 +25373,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25623,7 +25623,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -21901,7 +22567,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25397,7 +25397,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25647,7 +25647,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -21910,7 +22576,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -25421,7 +25421,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25671,7 +25671,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -21919,7 +22585,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -25463,7 +25463,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25713,7 +25713,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -21928,7 +22594,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -25494,7 +25494,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -25744,7 +25744,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -21937,7 +22603,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25518,7 +25518,7 @@ When this policy is set, $2Google Chrome OS< +@@ -25768,7 +25768,7 @@ When this policy is set, $2Google Chrome OS< }, { 'name': 'ExplicitlyAllowedNetworkPorts', @@ -21946,7 +22612,34 @@ 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', -@@ -25656,7 +25656,7 @@ When this policy is set, $2Google Chrome OS< +@@ -25837,7 +25837,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'DeviceDebugPacketCaptureAllowed', +- 'owners': ['iremuguz@google.com', 'pmarko@chromium.org', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['iremuguz@9oo91e.qjz9zk', 'pmarko@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:92-'], +@@ -25870,7 +25870,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'SuggestLogoutAfterClosingLastWindow', +- 'owners': ['mpetrisor@chromium.org', 'hendrich@chromium.org'], ++ 'owners': ['mpetrisor@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:92-'], +@@ -25899,7 +25899,7 @@ When this policy is set, $2Google Chrome OS< + }, + { + 'name': 'TripleDESEnabled', +- 'owners': ['file://net/ssl/OWNERS', 'davidben@chromium.org'], ++ 'owners': ['file://net/ssl/OWNERS', 'davidben@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -26029,7 +26029,7 @@ When this policy is set, $2Google Chrome OS< }, 'doc_banner': { 'desc': '''A banner shown at the top of the policy documentation''', @@ -21955,7 +22648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', -@@ -25664,13 +25664,13 @@ When this policy is set, $2Google Chrome OS< +@@ -26037,13 +26037,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. @@ -21971,7 +22664,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''', -@@ -25742,11 +25742,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26115,11 +26115,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''', @@ -21985,7 +22678,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''', -@@ -25766,7 +25766,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26139,7 +26139,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.''', @@ -21994,7 +22687,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.''', -@@ -25778,7 +25778,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26151,7 +26151,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.''', @@ -22003,7 +22696,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.''', -@@ -25790,7 +25790,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26163,7 +26163,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.''', @@ -22012,7 +22705,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 -@@ -26093,7 +26093,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -26467,7 +26467,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -22024,7 +22717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 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 -@@ -612,7 +612,7 @@ export class Page { +@@ -608,7 +608,7 @@ export class Page { name, link: knownPolicyNames === policyNames.chrome.policyNames && knownPolicyNamesSet.has(name) ? @@ -23078,15 +23771,15 @@ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/ diff --git a/components/safe_browsing/content/browser/client_side_detection_service.cc b/components/safe_browsing/content/browser/client_side_detection_service.cc --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -59,7 +59,7 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; +@@ -60,7 +60,7 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = - "https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; + "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/phishing"; - constexpr char kAuthHeaderBearer[] = "Bearer "; - + 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 @@ -23158,7 +23851,7 @@ diff --git a/components/safe_browsing/core/password_protection/password_protecti 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 -@@ -129,7 +129,7 @@ void RealTimeUrlLookupService::Shutdown() { +@@ -134,7 +134,7 @@ void RealTimeUrlLookupService::Shutdown() { GURL RealTimeUrlLookupService::GetRealTimeLookupUrl() const { return GURL( @@ -23297,7 +23990,7 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp 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 -@@ -148,8 +148,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { +@@ -149,8 +149,8 @@ bool ChromeConnectedHeaderHelper::IsDriveOrigin(const GURL& url) { if (!url.SchemeIsCryptographic()) return false; @@ -23324,7 +24017,7 @@ diff --git a/components/signin/ios/browser/account_consistency_service.mm b/comp // Returns the registered, organization-identifying host, but no subdomains, // from the given GURL. Returns an empty string if the GURL is invalid. -@@ -176,8 +176,8 @@ AccountConsistencyService::AccountConsistencyHandler::ShouldAllowRequest( +@@ -172,8 +172,8 @@ AccountConsistencyService::AccountConsistencyHandler::ShouldAllowRequest( if (base::FeatureList::IsEnabled(signin::kRestoreGaiaCookiesOnUserAction) && signin::IsUrlEligibleForMirrorCookie(url) && identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin)) { @@ -23335,16 +24028,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. -@@ -209,7 +209,7 @@ void AccountConsistencyService::AccountConsistencyHandler::ShouldAllowResponse( - - // Chrome monitors GAIA cookies when navigating to Google associated domains - // to ensure that signed-in users remain signed-in to their Google services on -- // the web. This includes redirects to accounts.google.com. -+ // the web. This includes redirects to accounts.9oo91e.qjz9zk. - if (google_util::IsGoogleAssociatedDomainUrl(url)) { - // TODO(crbug.com/1131027): Disable GAIA cookie restore on Google URLs that - // may display cookie consent in the content area that conflict with the -@@ -566,7 +566,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( +@@ -475,7 +475,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( void AccountConsistencyService::AddChromeConnectedCookies() { DCHECK(!browser_state_->IsOffTheRecord()); // These cookie requests are preventive. Chrome cannot be sure that @@ -23368,7 +24052,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 -@@ -128,7 +128,7 @@ void AccessTokenFetcher::VerifyScopeAccess() { +@@ -129,7 +129,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 " @@ -23520,19 +24204,19 @@ diff --git a/components/sync_sessions/PRESUBMIT.py b/components/sync_sessions/PR diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -69,7 +69,7 @@ TranslateManager::LanguageDetectedCallbackList* g_detection_callback_list_ = +@@ -68,7 +68,7 @@ TranslateManager::LanguageDetectedCallbackList* g_detection_callback_list_ = nullptr; const char kReportLanguageDetectionErrorURL[] = - "https://translate.google.com/translate_error?client=cr&action=langidc"; + "https://translate.9oo91e.qjz9zk/translate_error?client=cr&action=langidc"; - // Used in kReportLanguageDetectionErrorURL to specify the original page + // Used in kReportLanguageDetectionErrorURL to specify the page source // language. diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/components/translate/core/browser/translate_ranker_impl.cc --- a/components/translate/core/browser/translate_ranker_impl.cc +++ b/components/translate/core/browser/translate_ranker_impl.cc -@@ -81,15 +81,15 @@ RankerModelStatus ValidateModel(const RankerModel& model) { +@@ -82,15 +82,15 @@ RankerModelStatus ValidateModel(const RankerModel& model) { #if defined(OS_ANDROID) const char kDefaultTranslateRankerModelURL[] = @@ -23724,7 +24408,7 @@ 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 -@@ -3140,7 +3140,7 @@ Status IndexedDBBackingStore::MigrateToV3(LevelDBWriteBatch* write_batch) { +@@ -3141,7 +3141,7 @@ Status IndexedDBBackingStore::MigrateToV3(LevelDBWriteBatch* write_batch) { indexed_db::ReportV2Schema(has_blobs, origin_); if (has_blobs) { INTERNAL_CONSISTENCY_ERROR(UPGRADING_SCHEMA_CORRUPTED_BLOBS); @@ -23733,7 +24417,7 @@ diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/br return InternalInconsistencyStatus(); } else { ignore_result(PutInt(write_batch, schema_version_key, db_schema_version)); -@@ -3186,7 +3186,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { +@@ -3187,7 +3187,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { const std::string schema_version_key = SchemaVersionKey::Encode(); Status s; @@ -23769,7 +24453,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 -@@ -4378,7 +4378,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -4346,7 +4346,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -23778,7 +24462,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4406,7 +4406,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { +@@ -4374,7 +4374,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 " @@ -23787,7 +24471,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4638,7 +4638,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -4606,7 +4606,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -23799,7 +24483,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -327,7 +327,7 @@ int g_next_accessibility_reset_token = 1; +@@ -370,7 +370,7 @@ int g_next_accessibility_reset_token = 1; // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. bool g_allow_injecting_javascript = false; @@ -23832,18 +24516,6 @@ diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resour revisionIdentifier}/${filepath}`; } -diff --git a/content/browser/resources/media/media_internals.html b/content/browser/resources/media/media_internals.html ---- a/content/browser/resources/media/media_internals.html -+++ b/content/browser/resources/media/media_internals.html -@@ -17,7 +17,7 @@ found in the LICENSE file. - -
    -
    -- chrome://media-internals is deprecated and will be removed in Chrome 91. Please migrate to the new devtools panel. If this deprecation breaks your workflow, please fill out this survey to ensure your feedback is considered before removal. -+ chrome://media-internals is deprecated and will be removed in Chrome 91. Please migrate to the new devtools panel. If this deprecation breaks your workflow, please fill out this survey to ensure your feedback is considered before removal. -
    -
    - (click to dismiss) diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc --- a/content/browser/service_worker/service_worker_metrics.cc +++ b/content/browser/service_worker/service_worker_metrics.cc @@ -23892,7 +24564,7 @@ diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -6483,7 +6483,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6676,7 +6676,7 @@ void WebContentsImpl::RunJavaScriptDialog( base::StringPrintf( "A different origin subframe tried to create a JavaScript " "dialog. This is no longer allowed and was blocked. See " @@ -23904,7 +24576,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/webauth/authenticator_common.cc --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -178,12 +178,12 @@ base::Optional ProcessAppIdExtension(std::string appid, +@@ -178,12 +178,12 @@ absl::optional 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 = @@ -23920,7 +24592,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w (appid_url.EqualsIgnoringRef(kGstatic1) || appid_url.EqualsIgnoringRef(kGstatic2))) { return appid; -@@ -724,7 +724,7 @@ std::string SerializeWebAuthnCollectedClientDataToJson( +@@ -712,7 +712,7 @@ std::string SerializeWebAuthnCollectedClientDataToJson( ret.append(R"(,"other_keys_can_be_added_here":")"); ret.append( "do not compare clientDataJSON against a template. See " @@ -23929,6 +24601,18 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w } ret.append("}"); +diff --git a/content/browser/webrtc/resources/webrtc_internals.js b/content/browser/webrtc/resources/webrtc_internals.js +--- a/content/browser/webrtc/resources/webrtc_internals.js ++++ b/content/browser/webrtc/resources/webrtc_internals.js +@@ -351,7 +351,7 @@ function addPeerConnection(data) { + 'compatibility issues on modern browsers. The standardized SDP ' + + 'format, \"unified-plan\", has been used by default since M72 ' + + '(January, 2019). Dropping support for Plan B is targeted for ' + +- 'M93. See https://www.chromestatus.com/feature/5823036655665152 ' + ++ 'M93. See https://www.ch40mestatus.qjz9zk/feature/5823036655665152 ' + + 'for more details.'); + } + peerConnectionElement.appendChild(deprecationNotices); diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc @@ -23936,32 +24620,11 @@ diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/bro } else { LOG(FATAL) << "No usable sandbox! Update your kernel or see " -- "https://chromium.googlesource.com/chromium/src/+/master/" -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/" +- "https://chromium.googlesource.com/chromium/src/+/main/" ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/" "docs/linux/suid_sandbox_development.md for more information on " "developing with the SUID sandbox. " "If you want to live dangerously and need an immediate workaround, " -diff --git a/content/public/PRESUBMIT.py b/content/public/PRESUBMIT.py ---- a/content/public/PRESUBMIT.py -+++ b/content/public/PRESUBMIT.py -@@ -4,7 +4,7 @@ - - """Content public presubmit script - --See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -+See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts - for more details about the presubmit API built into gcl. - """ - -@@ -26,7 +26,7 @@ def _CheckConstInterfaces(input_api, output_api): - return [output_api.PresubmitError( - 'Do not add const to content/public ' - 'interfaces. See ' -- 'https://www.chromium.org/developers/content-module/content-api', -+ 'https://www.ch40m1um.qjz9zk/developers/content-module/content-api', - files) ] - - return [] diff --git a/content/renderer/PRESUBMIT.py b/content/renderer/PRESUBMIT.py --- a/content/renderer/PRESUBMIT.py +++ b/content/renderer/PRESUBMIT.py @@ -23989,7 +24652,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 -@@ -423,17 +423,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -404,17 +404,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -24013,7 +24676,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -452,7 +452,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -433,7 +433,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -24025,7 +24688,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 -@@ -89,7 +89,7 @@ GURL GetStartupURL() { +@@ -87,7 +87,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -24041,8 +24704,8 @@ diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_li if (!setuid_sandbox->IsSuidSandboxUpToDate()) { LOG(WARNING) << "You are using a wrong version of the setuid binary!\n" "Please read " -- "https://chromium.googlesource.com/chromium/src/+/master/" -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/" +- "https://chromium.googlesource.com/chromium/src/+/main/" ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/" "docs/linux/suid_sandbox_development.md." "\n\n"; } @@ -24106,7 +24769,7 @@ diff --git a/device/fido/fido_test_data.h b/device/fido/fido_test_data.h diff --git a/device/gamepad/xbox_controller_mac.mm b/device/gamepad/xbox_controller_mac.mm --- a/device/gamepad/xbox_controller_mac.mm +++ b/device/gamepad/xbox_controller_mac.mm -@@ -195,7 +195,7 @@ const size_t kXboxSeriesXOldFirmwareButtonDataBytes = 40; +@@ -193,7 +193,7 @@ const size_t kXboxSeriesXOldFirmwareButtonDataBytes = 40; const size_t kXboxSeriesXButtonDataBytes = 44; // From MSDN: @@ -24170,7 +24833,7 @@ diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/extensions/browser/api/web_request/web_request_permissions.cc --- a/extensions/browser/api/web_request/web_request_permissions.cc +++ b/extensions/browser/api/web_request/web_request_permissions.cc -@@ -197,7 +197,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { +@@ -196,7 +196,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { // TODO(battre) Merge this, CanExtensionAccessURL and // PermissionsData::CanAccessPage into one function. @@ -24179,7 +24842,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext static constexpr char kClient[] = "clients"; constexpr size_t kGoogleComLength = base::size(kGoogleCom) - 1; constexpr size_t kClientLength = base::size(kClient) - 1; -@@ -338,7 +338,7 @@ bool WebRequestPermissions::HideRequest( +@@ -337,7 +337,7 @@ bool WebRequestPermissions::HideRequest( extension_urls::IsBlacklistUpdateUrl(url) || extension_urls::IsSafeBrowsingUrl(url::Origin::Create(url), url.path_piece()) || @@ -24276,7 +24939,7 @@ diff --git a/extensions/common/api/extensions_manifest_types.json b/extensions/c diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc --- a/extensions/common/csp_validator.cc +++ b/extensions/common/csp_validator.cc -@@ -193,7 +193,7 @@ bool isNonWildcardTLD(const std::string& url, +@@ -192,7 +192,7 @@ bool isNonWildcardTLD(const std::string& url, // Allow *.googleapis.com to be whitelisted for backwards-compatibility. // (crbug.com/409952) @@ -24316,12 +24979,16 @@ 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 -@@ -491,7 +491,7 @@ const char kInvalidManifestVersion[] = - "zero."; - const char kInvalidManifestVersionOld[] = - "The 'manifest_version' key must be present and set to * (without quotes). " -- "See developer.chrome.com/*/manifestVersion.html for details."; -+ "See developer.ch40me.qjz9zk/*/manifestVersion.html for details."; +@@ -490,10 +490,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 *. " +- "See developer.chrome.com/*/manifestVersion for details."; ++ "See developer.ch40me.qjz9zk/*/manifestVersion for details."; + const char kInvalidManifestVersionUnsupported[] = + "Invalid value for 'manifest_version'. Must be an integer *. " +- "See developer.chrome.com/*/manifestVersion for details."; ++ "See developer.ch40me.qjz9zk/*/manifestVersion for details."; const char kInvalidMatch[] = "Invalid value for 'content_scripts[*].matches[*]': *"; const char kInvalidMatchCount[] = @@ -24894,7 +25561,7 @@ diff --git a/ios/build/bots/scripts/PRESUBMIT.py b/ios/build/bots/scripts/PRESUB diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts/result_sink_util.py --- a/ios/build/bots/scripts/result_sink_util.py +++ b/ios/build/bots/scripts/result_sink_util.py -@@ -33,7 +33,7 @@ def compose_test_result(test_id, status, expected, test_log=None, tags=None): +@@ -30,7 +30,7 @@ def _compose_test_result(test_id, status, expected, test_log=None, tags=None): Returns: A dict of test results with input information, confirming to @@ -24903,27 +25570,15 @@ diff --git a/ios/build/bots/scripts/result_sink_util.py b/ios/build/bots/scripts """ assert status in VALID_STATUSES, ( '%s is not a valid status (one in %s) for ResultSink.' % -@@ -122,7 +122,7 @@ class ResultSinkClient(object): +@@ -129,7 +129,7 @@ class ResultSinkClient(object): 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 """ - if not self.sink: - return -diff --git a/ios/build/bots/scripts/run.py b/ios/build/bots/scripts/run.py ---- a/ios/build/bots/scripts/run.py -+++ b/ios/build/bots/scripts/run.py -@@ -56,7 +56,7 @@ class Runner(): - Args: - xcode_build_version: (string) Xcode build version to install. - mac_toolchain_cmd: (string) Path to mac_toolchain command to install Xcode -- See https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/cmd/mac_toolchain/ -+ See https://chromium.9oo91esource.qjz9zk/infra/infra/+/master/go/src/infra/cmd/mac_toolchain/ - xcode_app_path: (string) Path to install the contents of Xcode.app. - - Returns: + res = self._session.post( + url=self.url, diff --git a/ios/build/bots/scripts/standard_json_util.py b/ios/build/bots/scripts/standard_json_util.py --- a/ios/build/bots/scripts/standard_json_util.py +++ b/ios/build/bots/scripts/standard_json_util.py @@ -24939,15 +25594,24 @@ diff --git a/ios/build/bots/scripts/standard_json_util.py b/ios/build/bots/scrip diff --git a/ios/build/bots/scripts/xcode_util.py b/ios/build/bots/scripts/xcode_util.py --- a/ios/build/bots/scripts/xcode_util.py +++ b/ios/build/bots/scripts/xcode_util.py -@@ -38,7 +38,7 @@ def install(mac_toolchain, xcode_build_version, xcode_path): +@@ -208,7 +208,7 @@ def _install_xcode(mac_toolchain, xcode_build_version, xcode_path, Args: xcode_build_version: (string) Xcode build version to install. mac_toolchain: (string) Path to mac_toolchain command to install Xcode -- See https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/cmd/mac_toolchain/ -+ See https://chromium.9oo91esource.qjz9zk/infra/infra/+/master/go/src/infra/cmd/mac_toolchain/ +- See https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/cmd/mac_toolchain/ ++ See https://chromium.9oo91esource.qjz9zk/infra/infra/+/main/go/src/infra/cmd/mac_toolchain/ xcode_path: (string) Path to install the contents of Xcode.app. + using_new_mac_toolchain: (bool) Using new mac_toolchain. - Raises: +@@ -254,7 +254,7 @@ def install(mac_toolchain, xcode_build_version, xcode_app_path, **runtime_args): + Args: + xcode_build_version: (string) Xcode build version to install. + mac_toolchain: (string) Path to mac_toolchain command to install Xcode +- See https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/cmd/mac_toolchain/ ++ See https://chromium.9oo91esource.qjz9zk/infra/infra/+/main/go/src/infra/cmd/mac_toolchain/ + xcode_app_path: (string) Path to install the contents of Xcode.app. + runtime_args: Keyword arguments related with runtime installation. Can be + empty when installing an Xcode w/o runtime (for real device tasks). Namely: diff --git a/ios/build/chrome_build.gni b/ios/build/chrome_build.gni --- a/ios/build/chrome_build.gni +++ b/ios/build/chrome_build.gni @@ -24963,7 +25627,7 @@ diff --git a/ios/build/chrome_build.gni b/ios/build/chrome_build.gni diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/strings/ios_chromium_strings.grd --- a/ios/chrome/app/strings/ios_chromium_strings.grd +++ b/ios/chrome/app/strings/ios_chromium_strings.grd -@@ -179,7 +179,7 @@ locale. The strings in this file are specific to iOS. +@@ -176,7 +176,7 @@ locale. The strings in this file are specific to iOS. Chromium tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. @@ -24972,7 +25636,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -275,7 +275,7 @@ locale. The strings in this file are specific to iOS. +@@ -290,7 +290,7 @@ locale. The strings in this file are specific to iOS. Data from Chromium sync @@ -24981,7 +25645,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -284,7 +284,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. 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. @@ -24990,7 +25654,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 -@@ -362,7 +362,7 @@ locale. The strings in this file are specific to iOS. +@@ -377,7 +377,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chromium data from this device or keep it @@ -25002,7 +25666,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/app/strings/ios_google_chrome_strings.grd --- a/ios/chrome/app/strings/ios_google_chrome_strings.grd +++ b/ios/chrome/app/strings/ios_google_chrome_strings.grd -@@ -179,7 +179,7 @@ locale. The strings in this file are specific to iOS. +@@ -176,7 +176,7 @@ locale. The strings in this file are specific to iOS. Chrome tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. @@ -25011,7 +25675,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -275,7 +275,7 @@ locale. The strings in this file are specific to iOS. +@@ -290,7 +290,7 @@ locale. The strings in this file are specific to iOS. Data from Chrome sync @@ -25020,7 +25684,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -284,7 +284,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. 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. @@ -25029,7 +25693,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 -@@ -362,7 +362,7 @@ locale. The strings in this file are specific to iOS. +@@ -377,7 +377,7 @@ locale. The strings in this file are specific to iOS. Choose whether to clear your Chrome data from this device or keep it @@ -25041,7 +25705,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd --- a/ios/chrome/app/strings/ios_strings.grd +++ b/ios/chrome/app/strings/ios_strings.grd -@@ -376,7 +376,7 @@ locale. The strings in this file are specific to iOS. +@@ -385,7 +385,7 @@ locale. The strings in this file are specific to iOS. Current Webpage is on Incognito @@ -25050,7 +25714,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Bandwidth -@@ -541,7 +541,7 @@ locale. The strings in this file are specific to iOS. +@@ -550,7 +550,7 @@ locale. The strings in this file are specific to iOS. You won't be signed out of your Google Account. @@ -25059,7 +25723,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios This clears synced data from all devices. Saved site settings will not be deleted and may reflect your browsing habits. BEGIN_LINKLearn moreEND_LINK -@@ -552,8 +552,8 @@ locale. The strings in this file are specific to iOS. +@@ -561,8 +561,8 @@ locale. The strings in this file are specific to iOS. Ok, got it @@ -25070,7 +25734,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -715,7 +715,7 @@ locale. The strings in this file are specific to iOS. +@@ -733,7 +733,7 @@ locale. The strings in this file are specific to iOS. By signing out, your bookmarks, history, passwords, and other Chrome data will no longer be synced to your Google Account. @@ -25079,7 +25743,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. -@@ -934,7 +934,7 @@ Because your account is managed by $1google.com$1google.com @@ -25088,7 +25752,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1088,7 +1088,7 @@ Because your account is managed by $1google.com$1google.com @@ -25097,7 +25761,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1306,7 +1306,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1363,7 +1363,7 @@ Handoff must also be enabled in the General section of Settings, and your device Continue @@ -25106,7 +25770,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Add existing data to $1john@doe.com. -@@ -1518,7 +1518,7 @@ While in incognito, sites can't use cookies to see your browsing activity across +@@ -1575,7 +1575,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Privacy Notice @@ -25115,7 +25779,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1569,7 +1569,7 @@ While in incognito, sites can't use cookies to see your browsing activity across +@@ -1626,7 +1626,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -25124,7 +25788,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -1817,7 +1817,7 @@ Follow the steps below: +@@ -1874,7 +1874,7 @@ Follow the steps below: Turned off by your organization. @@ -25133,7 +25797,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Check Passwords -@@ -2283,12 +2283,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -25148,7 +25812,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. -@@ -2550,7 +2550,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -2630,7 +2630,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -25160,7 +25824,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/BUILD.gn --- a/ios/chrome/browser/autofill/BUILD.gn +++ b/ios/chrome/browser/autofill/BUILD.gn -@@ -187,7 +187,7 @@ autofill_test_files = [ +@@ -189,7 +189,7 @@ autofill_test_files = [ "//components/test/data/autofill/heuristics/input/049_register_ebay.com.html", "//components/test/data/autofill/heuristics/input/050_register_ecomm.dell.com.html", "//components/test/data/autofill/heuristics/input/051_register_epson.com.html", @@ -25169,7 +25833,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", -@@ -364,7 +364,7 @@ autofill_test_files = [ +@@ -366,7 +366,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", @@ -25205,7 +25869,7 @@ diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_contr diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc -@@ -81,41 +81,41 @@ const char* const kChromeHostURLs[] = { +@@ -82,41 +82,41 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = base::size(kChromeHostURLs); const char kSyncGoogleDashboardURL[] = @@ -25259,7 +25923,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"; -@@ -123,4 +123,4 @@ const char kReadingListReferrerURL[] = +@@ -124,4 +124,4 @@ const char kReadingListReferrerURL[] = const char kChromeUIAboutNewTabURL[] = "about://newtab/"; const char kManagementLearnMoreURL[] = @@ -25268,7 +25932,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr diff --git a/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm b/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm --- a/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm +++ b/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm -@@ -33,9 +33,9 @@ bool IsNptUrl(const GURL& url) { +@@ -34,9 +34,9 @@ bool IsNptUrl(const GURL& url) { (url.SchemeIs(url::kAboutScheme) && (url.path() == "//newtab" || url.path() == "//newtab/")); } @@ -25292,7 +25956,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, -@@ -805,7 +805,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { +@@ -811,7 +811,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -25301,18 +25965,6 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderName) : @"TestEngine", -diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm ---- a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm -+++ b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm -@@ -112,7 +112,7 @@ const char* const kGeolocationAuthorizationActionNewUser = - #pragma mark - Private - - - (BOOL)URLIsAuthorizationPromptingURL:(const GURL&)url { -- // Per PRD: "Show a modal dialog upon reaching google.com or a search results -+ // Per PRD: "Show a modal dialog upon reaching 9oo91e.qjz9zk or a search results - // page..." However, we only want to do this for domains where we will send - // location. - return (google_util::IsGoogleHomePageUrl(url) || 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 @@ -25429,26 +26081,26 @@ diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm b/ios/chrome/ } - (void)waitForBookmarkModelLoaded:(BOOL)loaded { -diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm ---- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm -+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm -@@ -108,7 +108,7 @@ ContentSuggestion CreateSuggestion(Category category, +diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm +--- a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm ++++ b/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm +@@ -107,7 +107,7 @@ ContentSuggestion CreateSuggestion(Category category, std::string index = base::SysNSStringToUTF8(@(i).stringValue); suggestions.push_back( CreateSuggestion([self category], "chromium" + index, - GURL("http://chromium.org/" + index))); + GURL("http://ch40m1um.qjz9zk/" + index))); } - [self provider] -> FireSuggestionsChanged([self category], - std::move(suggestions)); -@@ -129,7 +129,7 @@ ContentSuggestion CreateSuggestion(Category category, + [self provider]->FireSuggestionsChanged([self category], + std::move(suggestions)); +@@ -128,7 +128,7 @@ ContentSuggestion CreateSuggestion(Category category, std::string index = base::NumberToString(suggestionNumber); std::vector suggestions; suggestions.push_back(CreateSuggestion([self category], "chromium" + index, - GURL("http://chromium.org/" + index))); + GURL("http://ch40m1um.qjz9zk/" + index))); - [self provider] -> FireSuggestionsChanged([self category], - std::move(suggestions)); + [self provider]->FireSuggestionsChanged([self category], + std::move(suggestions)); } diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm @@ -25569,9 +26221,9 @@ diff --git a/ios/chrome/browser/ui/settings/translate_table_view_controller.mm b diff --git a/ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm b/ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm --- a/ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm +++ b/ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm -@@ -134,7 +134,7 @@ std::unique_ptr CreateSslBlockingPageDelegate( - std::unique_ptr - CreateCaptivePortalBlockingPageDelegate(web::WebState* web_state) { +@@ -132,7 +132,7 @@ CreateSslBlockingPage(web::WebState* web_state, const GURL& url) { + std::unique_ptr + CreateCaptivePortalBlockingPage(web::WebState* web_state) { GURL landing_url("https://captive.portal/login"); - GURL request_url("https://google.com"); + GURL request_url("https://9oo91e.qjz9zk"); @@ -25617,7 +26269,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 -@@ -107,13 +107,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( +@@ -108,13 +108,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( NSString* ChromeIdentityService::GetCachedHostedDomainForIdentity( ChromeIdentity* identity) { @@ -25648,14 +26300,15 @@ 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,6 +10,6 @@ +@@ -10,7 +10,7 @@ namespace ios { -NSString* const kManagedIdentityEmailSuffix = @"@google.com"; +NSString* const kManagedIdentityEmailSuffix = @"@9oo91e.qjz9zk"; - } // namespace ios + NSString* const kMinorModeIdentityEmailSuffix = @"@minor-mode"; + 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 @@ -25737,9 +26390,9 @@ diff --git a/ios/testing/data/http_server_files/simple_login_form.html b/ios/tes Login form. -
    + - - - +
    +
    + diff --git a/ios/testing/data/http_server_files/simple_signup_form.html b/ios/testing/data/http_server_files/simple_signup_form.html --- a/ios/testing/data/http_server_files/simple_signup_form.html +++ b/ios/testing/data/http_server_files/simple_signup_form.html @@ -25749,9 +26402,9 @@ diff --git a/ios/testing/data/http_server_files/simple_signup_form.html b/ios/te Signup form. - + - - - +
    +
    + diff --git a/ios/testing/data/http_server_files/window_open.html b/ios/testing/data/http_server_files/window_open.html --- a/ios/testing/data/http_server_files/window_open.html +++ b/ios/testing/data/http_server_files/window_open.html @@ -25767,20 +26420,32 @@ 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 -@@ -863,10 +863,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, - // request url of the transient item, or pending item if transient doesn't - // exist, or last committed item if both of them don't exist. The reason is - // that a server side redirect may change the item's url. -- // For example, the user visits www.chromium.org and is then redirected -- // to m.chromium.org, when the user wants to refresh the page with a different -+ // For example, the user visits www.ch40m1um.qjz9zk and is then redirected -+ // to m.ch40m1um.qjz9zk, when the user wants to refresh the page with a different - // configuration (e.g. user agent), the user would be expecting to visit -- // www.chromium.org instead of m.chromium.org. -+ // www.ch40m1um.qjz9zk instead of m.ch40m1um.qjz9zk. +@@ -874,10 +874,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 +- // item's url. For example, the user visits www.chromium.org and is then +- // redirected to m.chromium.org, when the user wants to refresh the page with ++ // item's url. For example, the user visits www.ch40m1um.qjz9zk and is then ++ // redirected to m.ch40m1um.qjz9zk, when the user wants to refresh the page with + // a different configuration (e.g. user agent), the user would be expecting to +- // visit www.chromium.org instead of m.chromium.org. ++ // visit www.ch40m1um.qjz9zk instead of m.ch40m1um.qjz9zk. if (reload_type == web::ReloadType::ORIGINAL_REQUEST_URL) { NavigationItem* reload_item = nullptr; - if (GetTransientItem()) + if (GetPendingItem()) +diff --git a/ios/web/web_state/ui/wk_content_rule_list_util.mm b/ios/web/web_state/ui/wk_content_rule_list_util.mm +--- a/ios/web/web_state/ui/wk_content_rule_list_util.mm ++++ b/ios/web/web_state/ui/wk_content_rule_list_util.mm +@@ -35,7 +35,7 @@ NSString* CreateLocalBlockingJsonRuleList() { + + NSMutableDictionary* allow_crbug_block = [@{ + @"trigger" : [@{ +- @"url-filter" : @"https://bugs.chromium.org/.*", ++ @"url-filter" : @"https://bugs.ch40m1um.qjz9zk/.*", + @"if-top-url" : @[ @"file://.*" ], + @"resource-type" : @[ + // Allow opening crbug from chrome:// urls diff --git a/ios/web_view/PRESUBMIT.py b/ios/web_view/PRESUBMIT.py --- a/ios/web_view/PRESUBMIT.py +++ b/ios/web_view/PRESUBMIT.py @@ -25808,7 +26473,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 -@@ -820,7 +820,7 @@ BOOL gChromeLongPressAndForceTouchHandlingEnabled = YES; +@@ -819,7 +819,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 @@ -26742,20 +27407,6 @@ diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_n // // From my (adamk) testing on Snow Leopard, 0.0.0.0 // seems to be reachable if any network connection is available. -diff --git a/net/base/url_util.cc b/net/base/url_util.cc ---- a/net/base/url_util.cc -+++ b/net/base/url_util.cc -@@ -435,8 +435,8 @@ bool IsGoogleHost(base::StringPiece host) { - } - - bool IsTLS13ExperimentHost(base::StringPiece host) { -- return host == "inbox.google.com" || host == "mail.google.com" || -- host == "gmail.com"; -+ return host == "inbox.9oo91e.qjz9zk" || host == "mail.9oo91e.qjz9zk" || -+ host == "9ma1l.qjz9zk"; - } - - bool IsLocalHostname(base::StringPiece host) { diff --git a/net/data/fuzzer_data/http_security_headers/http_security_header_047.txt b/net/data/fuzzer_data/http_security_headers/http_security_header_047.txt index 8f399931f72a1a2424bb35bb9fb772f0025401e1..04a97302b154c46fa2de53684a2961dc4fb1033f 100644 GIT binary patch @@ -26823,7 +27474,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 -@@ -383,7 +383,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -384,7 +384,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" @@ -26886,15 +27537,15 @@ diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc "If logging was interrupted, you can stitch a NetLog file out of the\n" ".inprogress directory manually using:\n" "\n" -- "https://chromium.googlesource.com/chromium/src/+/master/net/tools/" -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/net/tools/" +- "https://chromium.googlesource.com/chromium/src/+/main/net/tools/" ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/net/tools/" "stitch_net_log_files.py\n"); } diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc --- a/net/quic/crypto/proof_verifier_chromium.cc +++ b/net/quic/crypto/proof_verifier_chromium.cc -@@ -195,7 +195,7 @@ ProofVerifierChromium::Job::~Job() { +@@ -196,7 +196,7 @@ ProofVerifierChromium::Job::~Job() { UMA_HISTOGRAM_TIMES("Net.QuicSession.VerifyProofTime", end_time - start_time_); // |hostname_| will always be canonicalized to lowercase. @@ -26906,7 +27557,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 -@@ -2217,10 +2217,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2189,10 +2189,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -26924,7 +27575,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 -@@ -3044,7 +3044,7 @@ void SpdySession::RecordProtocolErrorHistogram( +@@ -3023,7 +3023,7 @@ void SpdySession::RecordProtocolErrorHistogram( SpdyProtocolErrorDetails details) { UMA_HISTOGRAM_ENUMERATION("Net.SpdySessionErrorDetails2", details, NUM_SPDY_PROTOCOL_ERROR_DETAILS); @@ -27186,15 +27837,15 @@ diff --git a/printing/print_settings_initializer_win.cc b/printing/print_setting diff --git a/remoting/base/breakpad_mac.mm b/remoting/base/breakpad_mac.mm --- a/remoting/base/breakpad_mac.mm +++ b/remoting/base/breakpad_mac.mm -@@ -52,7 +52,7 @@ void InitializeCrashReporting() { - [breakpad_config setObject:@"21600" forKey:@BREAKPAD_REPORT_INTERVAL]; +@@ -50,7 +50,7 @@ void InitializeCrashReporting() { + breakpad_config[@BREAKPAD_REPORT_INTERVAL] = @"21600"; } - if (![breakpad_config objectForKey:@BREAKPAD_URL]) { -- [breakpad_config setObject:@"https://clients2.google.com/cr/report" -+ [breakpad_config setObject:@"https://clients2.9oo91e.qjz9zk/cr/report" - forKey:@BREAKPAD_URL]; + if (!breakpad_config[@BREAKPAD_URL]) { +- breakpad_config[@BREAKPAD_URL] = @"https://clients2.google.com/cr/report"; ++ breakpad_config[@BREAKPAD_URL] = @"https://clients2.9oo91e.qjz9zk/cr/report"; } + if (!BreakpadCreate(breakpad_config)) { 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 @@ -27238,7 +27889,7 @@ diff --git a/remoting/client/notification/gstatic_json_fetcher.cc b/remoting/cli -constexpr char kGstaticUrlPrefix[] = "https://www.gstatic.com/chromoting/"; +constexpr char kGstaticUrlPrefix[] = "https://www.95tat1c.qjz9zk/chromoting/"; - base::Optional GetResponse( + absl::optional GetResponse( std::unique_ptr fetcher) { diff --git a/remoting/host/it2me/com.google.chrome.remote_assistance-firefox.json.jinja2 b/remoting/host/it2me/com.google.chrome.remote_assistance-firefox.json.jinja2 --- a/remoting/host/it2me/com.google.chrome.remote_assistance-firefox.json.jinja2 @@ -27266,7 +27917,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 -@@ -1485,7 +1485,7 @@ def watch_for_resolution_changes(initial_size): +@@ -1503,7 +1503,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 @@ -27275,7 +27926,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) -@@ -1687,7 +1687,7 @@ Web Store: https://chrome.google.com/remotedesktop""" +@@ -1705,7 +1705,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 " @@ -27322,7 +27973,7 @@ diff --git a/remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.j diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc --- a/remoting/host/setup/start_host_main.cc +++ b/remoting/host/setup/start_host_main.cc -@@ -181,7 +181,7 @@ int StartHostMain(int argc, char** argv) { +@@ -194,7 +194,7 @@ int StartHostMain(int argc, char** argv) { fprintf(stdout, "You need a web browser to use this command. Please visit\n"); fprintf(stdout, @@ -27552,15 +28203,15 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c "The setuid sandbox provides API version %d, " "but you need %d\n" "Please read " -- "https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox_development.md." -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox_development.md." +- "https://chromium.googlesource.com/chromium/src/+/main/docs/linux/suid_sandbox_development.md." ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/linux/suid_sandbox_development.md." "\n\n", kSUIDSandboxApiNumber, api_number); diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -489,7 +489,7 @@ NtQueryObject g_QueryObject = NULL; +@@ -490,7 +490,7 @@ NtQueryObject g_QueryObject = NULL; static const char* kDuplicateHandleWarning = "You are attempting to duplicate a privileged handle into a sandboxed" @@ -27572,7 +28223,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 -@@ -33,7 +33,7 @@ namespace device { +@@ -34,7 +34,7 @@ namespace device { namespace { const char kNetworkLocationBaseUrl[] = @@ -27605,11 +28256,11 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html

    Modern C++ use in Chromium

    This document lives at -- -+ +- ++ src/styleguide/c++/c++11.html in a Chromium checkout and is part of the more general -- -+ +- ++ Chromium C++ style guide. It summarizes the supported state of new and updated language and library features in recent C++ standards and the Abseil library. This guide @@ -27687,20 +28338,28 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -298,9 +298,9 @@ The current status of existing standards and Abseil features is: +@@ -299,16 +299,16 @@ The current status of existing standards and Abseil features is: + absl::optional + Early adaptation of C++17 std::optional. + std::optional +-Replaces base::Optional. Discussion thread ++Replaces base::Optional. Discussion thread + + + Status 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.
    +-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.
    -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.
    ++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.
    +Discussion thread -@@ -308,7 +308,7 @@ The current status of existing standards and Abseil features is: +@@ -316,7 +316,7 @@ The current status of existing standards and Abseil features is: absl::variant Early adaptation of C++17 std::variant. std::variant @@ -27709,39 +28368,39 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -398,7 +398,7 @@ the allowed or banned sections.

    +@@ -406,7 +406,7 @@ the allowed or banned sections.

    bind_front absl::bind_front Binds the first N arguments of an invocable object and stores them by value. --bind_front.h -+bind_front.h +-bind_front.h ++bind_front.h
    Avoid std::bind Overlaps with base::Bind. -@@ -407,7 +407,7 @@ the allowed or banned sections.

    +@@ -415,7 +415,7 @@ the allowed or banned sections.

    Cleanup FILE* sink_file = fopen(sink_path, "w");
    auto sink_closer = absl::MakeCleanup([sink_file] { fclose(sink_file); });     Implements the scope guard idiom, invoking the contained callback's `operator()() &&` on scope exit. --cleanup.h -+cleanup.h +-cleanup.h ++cleanup.h Similar to `defer` in Golang. -@@ -426,7 +426,7 @@ absl::InlinedVector, absl::FixedArray +@@ -434,7 +434,7 @@ absl::InlinedVector, absl::FixedArray Container utilities auto it = absl::c_find(container, value); Container-based versions of algorithmic functions within C++ standard library. --container.h -+container.h +-container.h ++container.h Overlaps with base/ranges/algorithm.h. -@@ -434,7 +434,7 @@ absl::InlinedVector, absl::FixedArray +@@ -442,7 +442,7 @@ absl::InlinedVector, absl::FixedArray FunctionRef absl::FunctionRef Type for holding a non-owning reference to an object of any invocable type. --function_ref.h -+function_ref.h +-function_ref.h ++function_ref.h @@ -27749,8 +28408,8 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html StatusOr absl::StatusOr<T> An object that is either a usable value, or an error Status explaining why such a value is not present. --statusor.h -+statusor.h +-statusor.h ++statusor.h @@ -27853,8 +28512,8 @@ diff --git a/testing/merge_scripts/code_coverage/merge_results.py b/testing/merg def _MergeAPIArgumentParser(*args, **kwargs): """Parameters passed to this merge script, as per: -- https://chromium.googlesource.com/chromium/tools/build/+/master/scripts/slave/recipe_modules/swarming/resources/merge_api.py -+ https://chromium.9oo91esource.qjz9zk/chromium/tools/build/+/master/scripts/slave/recipe_modules/swarming/resources/merge_api.py +- https://chromium.googlesource.com/chromium/tools/build/+/main/scripts/slave/recipe_modules/swarming/resources/merge_api.py ++ https://chromium.9oo91esource.qjz9zk/chromium/tools/build/+/main/scripts/slave/recipe_modules/swarming/resources/merge_api.py """ parser = argparse.ArgumentParser(*args, **kwargs) parser.add_argument('--build-properties', help=argparse.SUPPRESS) @@ -27885,7 +28544,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 -@@ -169,7 +169,7 @@ def get_gtest_summary_passes(output): +@@ -205,7 +205,7 @@ def get_gtest_summary_passes(output): Only partially parses the format. This code is based on code in tools/build, specifically @@ -27922,8 +28581,8 @@ diff --git a/testing/scripts/run_performance_tests.py b/testing/scripts/run_perf is the perf specific results (with unenforced format, could be histogram or graph json), and test_results.json, which is a JSON test results format file --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 TESTING: To test changes to this script, please run @@ -27934,8 +28593,8 @@ diff --git a/testing/test_env.py b/testing/test_env.py """Run command and stream its stdout/stderr to the console & |stdoutfile|. Also forward_signals to obey -- https://chromium.googlesource.com/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance -+ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance +- https://chromium.googlesource.com/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance ++ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance Returns: integer returncode of the subprocess. @@ -27943,8 +28602,8 @@ diff --git a/testing/test_env.py b/testing/test_env.py """Run command and stream its stdout/stderr both to stdout. Also forward_signals to obey -- https://chromium.googlesource.com/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance -+ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance +- https://chromium.googlesource.com/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance ++ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance Returns: integer returncode of the subprocess. @@ -27952,8 +28611,8 @@ diff --git a/testing/test_env.py b/testing/test_env.py """Run command and stream its stdout/stderr both to |file_handle|. Also forward_signals to obey -- https://chromium.googlesource.com/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance -+ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance +- https://chromium.googlesource.com/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance ++ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance Returns: integer returncode of the subprocess. @@ -27961,8 +28620,8 @@ diff --git a/testing/test_env.py b/testing/test_env.py """Forwards unix's SIGTERM or win's CTRL_BREAK_EVENT to the given processes. This plays nicely with swarming's timeout handling. See also -- https://chromium.googlesource.com/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance -+ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/master/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance +- https://chromium.googlesource.com/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance ++ https://chromium.9oo91esource.qjz9zk/infra/luci/luci-py/+/main/appengine/swarming/doc/Bot.md#graceful-termination_aka-the-sigterm-and-sigkill-dance Args: procs: A list of subprocess.Popen objects representing child processes. @@ -28005,7 +28664,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 -@@ -779,7 +779,7 @@ +@@ -866,7 +866,7 @@ { "name": "API_Enabled", "params": { @@ -28014,7 +28673,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillServerCommunication", -@@ -2719,7 +2719,7 @@ +@@ -3122,7 +3122,7 @@ "params": { "DnsHttpssvcControlDomainWildcard": "true", "DnsHttpssvcEnableQueryOverInsecure": "true", @@ -28023,7 +28682,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -3690,7 +3690,7 @@ +@@ -4226,7 +4226,7 @@ { "name": "Enabled", "params": { @@ -28032,7 +28691,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "IncompatibleApplicationsWarning" -@@ -5420,12 +5420,12 @@ +@@ -6193,12 +6193,12 @@ { "name": "Enabled_Prefetch_Prefetch1_NSP6_Small_20210301", "params": { @@ -28047,16 +28706,16 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "IsolatePrerenders", -@@ -5587,7 +5587,7 @@ +@@ -6430,7 +6430,7 @@ { - "name": "EnabledNTPWithExploreAndTrending", + "name": "EnabledExploreAndTrendingSegmentation1", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -5610,7 +5610,7 @@ +@@ -6455,7 +6455,7 @@ { "name": "EnabledStitchAndTrending", "params": { @@ -28065,7 +28724,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "experiment_tag": "{enableTrending: true, maxTrendingQueries: 8}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -6854,7 +6854,7 @@ +@@ -7877,7 +7877,7 @@ { "name": "launch_20180628_model_20170329_with_blacklist_override_default", "params": { @@ -28074,7 +28733,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -6873,7 +6873,7 @@ +@@ -7896,7 +7896,7 @@ { "name": "20180123_launch", "params": { @@ -28083,7 +28742,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -6894,7 +6894,7 @@ +@@ -7917,7 +7917,7 @@ { "name": "Enforcement20170918", "params": { @@ -28092,7 +28751,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerEnforcement", -@@ -7360,7 +7360,7 @@ +@@ -8507,7 +8507,7 @@ { "name": "Enabled", "params": { @@ -29384,12 +30043,12 @@ diff --git a/third_party/blink/common/loader/record_load_histograms.cc b/third_p @@ -22,7 +22,7 @@ void RecordLoadHistograms(const url::Origin& origin, if (destination == network::mojom::RequestDestination::kDocument) { base::UmaHistogramSparse("Net.ErrorCodesForMainFrame4", -net_error); - if (GURL::SchemeIsCryptographic(origin.scheme())) { -- if (origin.host() == "www.google.com") { -+ if (origin.host() == "www.9oo91e.qjz9zk") { - base::UmaHistogramSparse("Net.ErrorCodesForHTTPSGoogleMainFrame3", - -net_error); - } + if (GURL::SchemeIsCryptographic(origin.scheme()) && +- origin.host() == "www.google.com") { ++ origin.host() == "www.9oo91e.qjz9zk") { + base::UmaHistogramSparse("Net.ErrorCodesForHTTPSGoogleMainFrame3", + -net_error); + } diff --git a/third_party/blink/public/common/scheduler/PRESUBMIT.py b/third_party/blink/public/common/scheduler/PRESUBMIT.py --- a/third_party/blink/public/common/scheduler/PRESUBMIT.py +++ b/third_party/blink/public/common/scheduler/PRESUBMIT.py @@ -29450,7 +30109,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. --> -@@ -1130,14 +1130,14 @@ below: +@@ -1138,14 +1138,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 @@ -29467,7 +30126,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. -@@ -1146,7 +1146,7 @@ below: +@@ -1154,7 +1154,7 @@ below: # # Contributor(s): # Mitch (original author) @@ -29752,16 +30411,16 @@ diff --git a/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/third 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 +++ b/third_party/blink/renderer/build/scripts/update_css_ranking.py -@@ -14,7 +14,7 @@ import cluster - import json5_generator - import math +@@ -17,7 +17,7 @@ try: + except ImportError: + from urllib2 import urlopen -CSS_RANKING_API = "http://www.chromestatus.com/data/csspopularity" +CSS_RANKING_API = "http://www.ch40mestatus.qjz9zk/data/csspopularity" CSS_RANKING_FILE = "../../core/css/css_properties_ranking.json5" CSS_PROPERTIES = "../../core/css/css_properties.json5" CONFIG_FILE = "../../core/css/css_group_config.json5" -@@ -50,7 +50,7 @@ def update_css_ranking(css_ranking_file, css_ranking_api): +@@ -53,7 +53,7 @@ def update_css_ranking(css_ranking_file, css_ranking_api): "// The popularity ranking of all css properties the first properties is the most\n" ) fw.write( @@ -29785,7 +30444,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 -@@ -400,7 +400,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -402,7 +402,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 " @@ -29794,7 +30453,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ } return; } -@@ -430,7 +430,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -432,7 +432,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 " @@ -29806,7 +30465,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ diff --git a/third_party/blink/renderer/core/events/touch_event.cc b/third_party/blink/renderer/core/events/touch_event.cc --- a/third_party/blink/renderer/core/events/touch_event.cc +++ b/third_party/blink/renderer/core/events/touch_event.cc -@@ -132,7 +132,7 @@ void TouchEvent::preventDefault() { +@@ -135,7 +135,7 @@ void TouchEvent::preventDefault() { message = "Unable to preventDefault inside passive event listener due to " "target being treated as passive. See " @@ -29830,7 +30489,7 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/blink/renderer/core/frame/deprecation.cc --- a/third_party/blink/renderer/core/frame/deprecation.cc +++ b/third_party/blink/renderer/core/frame/deprecation.cc -@@ -33,16 +33,16 @@ namespace { +@@ -32,16 +32,16 @@ namespace { const char kChromeLoadTimesNavigationTiming[] = "chrome.loadTimes() is deprecated, instead use standardized API: " "Navigation Timing 2. " @@ -29850,7 +30509,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ enum Milestone { kUnknown, -@@ -176,7 +176,7 @@ String WillBeRemoved(const char* feature, +@@ -178,7 +178,7 @@ String WillBeRemoved(const char* feature, const char* details) { return String::Format( "%s is deprecated and will be removed in %s. See " @@ -29859,7 +30518,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ feature, MilestoneString(milestone).Ascii().c_str(), details); } -@@ -186,7 +186,7 @@ String ReplacedWillBeRemoved(const char* feature, +@@ -188,7 +188,7 @@ String ReplacedWillBeRemoved(const char* feature, const char* details) { return String::Format( "%s is deprecated and will be removed in %s. Please use %s instead. See " @@ -29868,7 +30527,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ feature, MilestoneString(milestone).Ascii().c_str(), replacement, details); } -@@ -266,14 +266,14 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -268,14 +268,14 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "Subresource requests using legacy protocols (like `ftp:`) " "are blocked. Please deliver web-accessible resources over " "modern protocols like HTTPS. See " @@ -29885,7 +30544,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; // Powerful features on insecure origins (https://goo.gl/rStTGz) -@@ -283,7 +283,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -285,7 +285,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "getCurrentPosition() and watchPosition() no longer work on " "insecure origins. To use this feature, you should consider " "switching your application to a secure origin, such as HTTPS. " @@ -29894,7 +30553,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved: case WebFeature::kGeolocationInsecureOriginIframeDeprecatedNotRemoved: -@@ -291,7 +291,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -293,7 +293,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "getCurrentPosition() and watchPosition() are deprecated on " "insecure origins. To use this feature, you should consider " "switching your application to a secure origin, such as HTTPS. " @@ -29903,7 +30562,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGetUserMediaInsecureOrigin: case WebFeature::kGetUserMediaInsecureOriginIframe: -@@ -299,7 +299,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -301,7 +301,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "GetUserMediaInsecureOrigin", kUnknown, "getUserMedia() no longer works on insecure origins. To use this " "feature, you should consider switching your application to a " @@ -29912,7 +30571,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kMediaSourceAbortRemove: -@@ -310,7 +310,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -312,7 +312,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "will be removed in the future. You should instead await " "'updateend'. abort() is intended to only abort an asynchronous " "media append or reset parser state. See " @@ -29921,7 +30580,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kMediaSourceDurationTruncatingBuffered: -@@ -322,7 +322,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -324,7 +324,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "buffered media will be removed in the future. You should instead " "perform explicit remove(newDuration, oldDuration) on all " "sourceBuffers, where newDuration < oldDuration. See " @@ -29930,7 +30589,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kApplicationCacheAPIInsecureOrigin: -@@ -351,7 +351,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -353,7 +353,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "origins. " "You should consider switching your application to a secure " "origin, " @@ -29939,7 +30598,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kNotificationPermissionRequestedIframe: return {"NotificationPermissionRequestedIframe", kUnknown, -@@ -360,7 +360,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -362,7 +362,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "a cross-origin iframe. You should consider requesting " "permission " "from a top-level frame or opening a new window instead. See " @@ -29948,7 +30607,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kCSSSelectorInternalMediaControlsOverlayCastButton: -@@ -368,7 +368,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -370,7 +370,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "The disableRemotePlayback attribute should be used in order to " "disable the default Cast integration instead of using " "-internal-media-controls-overlay-cast-button selector. See " @@ -29957,7 +30616,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kSelectionAddRangeIntersect: -@@ -376,7 +376,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -378,7 +378,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "SelectionAddRangeIntersect", kUnknown, "The behavior that Selection.addRange() merges existing Range and " "the specified Range was removed. See " @@ -29966,7 +30625,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kRtcpMuxPolicyNegotiate: -@@ -385,7 +385,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -387,7 +387,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "removal and may be removed no earlier than %s. " "If you depend on it, " "please see " @@ -29975,7 +30634,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "5654810086866944 " "for more details.", MilestoneString(kM62).Ascii().c_str())}; -@@ -398,7 +398,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -400,7 +400,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "are blocked. Please remove newlines and encode less-than " "characters from places like element attribute values in order to " "load these resources. See " @@ -29984,7 +30643,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kLocalCSSFileExtensionRejected: -@@ -452,7 +452,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -454,7 +454,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "TextToSpeech_DisallowedByAutoplay", kM71, String::Format("speechSynthesis.speak() without user activation is " "no longer allowed since %s. See " @@ -29993,7 +30652,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "5687444770914304 for more details", MilestoneString(kM71).Ascii().c_str())}; -@@ -474,7 +474,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -476,7 +476,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { String::Format( "Web MIDI will ask a permission to use even if the sysex is " "not specified in the MIDIOptions since around %s. See " @@ -30002,7 +30661,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "more details.", MilestoneString(kM82).Ascii().c_str())}; -@@ -507,7 +507,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -509,7 +509,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "Support for calls to CSSStyleSheet.replace() with stylesheet " "text that includes @import has been deprecated, and will be " "removed in %s. See " @@ -30011,7 +30670,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details.", MilestoneString(kM84).Ascii().c_str())}; -@@ -517,7 +517,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -519,7 +519,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { String::Format( "SharedArrayBuffer will require cross-origin isolation as of " "%s. See " @@ -30020,7 +30679,16 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ " for more details.", MilestoneString(kM92).Ascii().c_str())}; -@@ -603,7 +603,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -577,7 +577,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { + "compatibility issues on modern browsers. The standardized SDP " + "format, \"unified-plan\", has been used by default since M72 " + "(January, 2019). Dropping support for Plan B is targeted for " +- "M93. See https://www.chromestatus.com/feature/5823036655665152 " ++ "M93. See https://www.ch40mestatus.qjz9zk/feature/5823036655665152 " + "for more details."}; + + case WebFeature::kRTCPeerConnectionSdpSemanticsPlanBWithReverseOriginTrial: +@@ -606,7 +606,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 " @@ -30032,7 +30700,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 -@@ -1794,7 +1794,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1914,7 +1914,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 " @@ -30041,7 +30709,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } return false; } -@@ -1895,7 +1895,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -2015,7 +2015,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 " @@ -30053,7 +30721,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 -@@ -261,7 +261,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -262,7 +262,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "