diff --git a/build/RELEASE b/build/RELEASE index 0f2f963d..4545f710 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -89.0.4389.117 +90.0.4430.55 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 038f9c6b..2ba84104 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -117,7 +117,6 @@ AImageReader-CFI-crash-mitigations.patch Update-i18n-zh_CN-support.patch Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch Add-menu-item-to-view-source.patch -Enable-legacy-TLS-interstitital-warning.patch Block-gateway-attacks-via-websockets.patch Enable-prefetch-privacy-changes-by-default.patch Disable-support-for-RAR-files-inspection.patch @@ -125,12 +124,11 @@ Add-history-support-in-incognito-mode.patch Enable-darken-websites-checkbox-in-themes.patch Remove-blocklisted-URLs-upon-bookmark-creation.patch Disable-the-DIAL-repeating-discovery.patch -Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch +Block-qjz9zk-or-trk-requests.patch Hardening-against-incognito-mode-detection.patch Remove-weblayer-dependency-on-Play-Services.patch Timezone-customization.patch Move-some-account-settings-back-to-privacy-settings.patch -User-agent-customization.patch Restore-Simplified-NTP-launch.patch Revert-the-removal-of-an-option-to-block-autoplay.patch Disable-text-fragments-by-default.patch @@ -142,10 +140,10 @@ Disable-unified-autoplay-feature.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-enterprise-policies-for-secure-DNS.patch -Enable-app-overflow-menu-icons-by-default.patch Add-menu-item-to-bookmark-all-tabs.patch Add-flag-for-save-data-header.patch Add-option-to-force-tablet-UI.patch Make-all-favicon-requests-on-demand.patch Add-Alt-D-hotkey-to-focus-address-bar.patch +Remove-offline-measurement-background-task.patch Automated-domain-substitution.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 5d564013..1fe00606 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -83,7 +83,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1772,7 +1772,7 @@ +@@ -1899,7 +1899,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], @@ -95,7 +95,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 -@@ -3254,6 +3254,22 @@ +@@ -3236,6 +3236,22 @@ "dont_delete_source_texture_for_egl_image" ] }, @@ -121,7 +121,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 -@@ -38,6 +38,11 @@ bool FieldIsInBlocklist(const char* current_value, std::string blocklist_str) { +@@ -49,6 +49,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { } // namespace #if defined(OS_ANDROID) @@ -143,11 +143,11 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h +GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer; GPU_EXPORT extern const base::Feature kUseGles2ForOopR; GPU_EXPORT extern const base::Feature kAndroidSurfaceControl; - GPU_EXPORT extern const base::Feature kAImageReader; + GPU_EXPORT extern const base::Feature kWebViewSurfaceControl; 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 -@@ -111,6 +111,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -112,6 +112,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !defined(OS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -157,7 +157,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -316,6 +319,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -317,6 +320,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = kGpuFeatureStatusBlocklisted; } @@ -178,12 +178,12 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list disable_accelerated_av1_decode +disable_aimagereader disable_accelerated_av1_decode_d3d11 + disable_accelerated_h264_encode disable_accelerated_vp8_decode - disable_accelerated_vp8_encode diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -477,6 +477,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -488,6 +488,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } @@ -206,7 +206,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ #include "base/android/scoped_hardware_buffer_fence_sync.h" #include "base/bind.h" #include "base/feature_list.h" -@@ -48,7 +49,15 @@ std::unique_ptr MakeCurrent( +@@ -49,7 +50,15 @@ std::unique_ptr MakeCurrent( } TextureOwner::Mode GetTextureOwnerMode() { @@ -226,7 +226,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -604,6 +604,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -620,6 +620,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -240,7 +240,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -206,6 +206,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; +@@ -210,6 +210,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 34295a30..7bbbf8c5 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -33,7 +33,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn include_dirs = libaom_include_dirs } -@@ -184,7 +184,7 @@ if (enable_libaom) { +@@ -192,7 +192,7 @@ if (enable_libaom) { configs += [ "//build/config/compiler:no_chromium_code" ] if (current_cpu == "arm") { configs -= [ "//build/config/compiler:compiler_arm_fpu" ] @@ -42,7 +42,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn } configs += [ ":libaom_config" ] -@@ -233,6 +233,8 @@ if (enable_libaom) { +@@ -242,6 +242,8 @@ if (enable_libaom) { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] @@ -54,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -616,6 +616,11 @@ aom_mem_sources = [ +@@ -629,6 +629,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] @@ -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 -@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0 +@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 @@ -77,11 +77,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RUNTIME_CPU_DETECT equ 1 + CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -89,11 +89,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 1 + #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm -@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0 +@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 @@ -101,11 +101,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RUNTIME_CPU_DETECT equ 0 + CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -113,11 +113,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 0 + #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm -@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0 +@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 @@ -125,11 +125,11 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RUNTIME_CPU_DETECT equ 0 + CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -137,11 +137,11 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 0 + #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm -@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0 +@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 @@ -149,11 +149,11 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RUNTIME_CPU_DETECT equ 0 + CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -161,11 +161,11 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 0 + #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm -@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0 +@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 @@ -173,11 +173,11 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 - CONFIG_RUNTIME_CPU_DETECT equ 1 + CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -185,11 +185,11 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 1 + #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ %define CONFIG_NORMAL_TILE_MODE 1 %define CONFIG_OPTICAL_FLOW_API 0 %define CONFIG_OS_SUPPORT 1 @@ -197,11 +197,11 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ +%define CONFIG_PIC 1 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 - %define CONFIG_RUNTIME_CPU_DETECT 1 + %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 @@ -209,7 +209,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 - #define CONFIG_RUNTIME_CPU_DETECT 1 + #define CONFIG_RT_ML_PARTITIONING 0 -- 2.17.1 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 7c8426bc..09431d06 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,8 +17,8 @@ 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 -@@ -3040,6 +3040,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, +@@ -3100,6 +3100,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) +#if defined(OS_ANDROID) @@ -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 -@@ -533,6 +533,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = +@@ -589,6 +589,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 -@@ -329,6 +329,9 @@ extern const char kEnableAutofillAccountWalletStorageDescription[]; +@@ -362,6 +362,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 -@@ -334,6 +334,9 @@ const char kHomePage[] = "homepage"; +@@ -326,6 +326,9 @@ const char kHomePage[] = "homepage"; // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; @@ -88,7 +88,7 @@ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h -@@ -113,6 +113,7 @@ extern const char kForceFirstRun[]; +@@ -111,6 +111,7 @@ extern const char kForceFirstRun[]; extern const char kForceStackedTabStripLayout[]; extern const char kHomePage[]; extern const char kIncognito[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index c008a367..e2422814 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -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 -@@ -51,12 +51,15 @@ public class PrivacySettings +@@ -54,12 +54,15 @@ public class PrivacySettings private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; 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"; @@ -102,7 +102,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -136,6 +136,12 @@ +@@ -162,6 +162,12 @@ @@ -182,16 +182,16 @@ 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 -@@ -410,6 +410,8 @@ - #include "chrome/browser/media/feeds/media_feeds_service.h" - #endif +@@ -156,6 +156,8 @@ + #include "printing/buildflags/buildflags.h" + #include "rlz/buildflags/buildflags.h" +#include "chrome/browser/net/proxy_service_factory.h" + - namespace { - - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -697,6 +699,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { + #if BUILDFLAG(ENABLE_BACKGROUND_MODE) + #include "chrome/browser/background/background_mode_manager.h" + #endif +@@ -746,6 +748,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { PluginsResourceService::RegisterPrefs(registry); #endif @@ -634,7 +634,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 -@@ -254,6 +254,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", @@ -646,15 +646,15 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -62,6 +62,7 @@ +@@ -53,6 +53,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" +#include "chrome/browser/ui/webui/proxy_config_ui.h" #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" - #include "chrome/browser/ui/webui/settings/settings_ui.h" - #include "chrome/browser/ui/webui/settings/settings_utils.h" -@@ -545,6 +546,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, + #include "chrome/browser/ui/webui/signin_internals_ui.h" + #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" +@@ -558,6 +559,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1135,7 +1135,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -325,6 +327,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -327,6 +329,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1143,7 +1143,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -523,6 +526,7 @@ const char* const kChromeHostURLs[] = { +@@ -539,6 +542,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1154,7 +1154,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -117,6 +117,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -120,6 +120,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 93a29e04..2630b3d1 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -147,7 +147,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; -@@ -1633,8 +1634,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1720,6 +1721,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } + if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)) { -+ return mIncognitoTabCreator; ++ incognito = true; + } - return incognito ? mIncognitoTabCreator : mRegularTabCreator; + return mTabCreatorManagerSupplier.get().getTabCreator(incognito); } 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 -@@ -539,6 +539,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -557,6 +557,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -199,7 +199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -29,7 +29,9 @@ import androidx.annotation.VisibleForTesting; +@@ -30,7 +30,9 @@ import org.chromium.base.Callback; import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.supplier.Supplier; @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator.ContextMenuUma.Action; -@@ -372,7 +374,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -344,7 +346,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (FirstRunStatus.getFirstRunFlowComplete() && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl().getSpec())) { if (mMode == ContextMenuMode.NORMAL) { @@ -288,7 +288,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 -@@ -39,6 +39,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -42,6 +42,7 @@ import org.chromium.ui.text.SpanApplier; */ public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener { @@ -296,7 +296,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"; -@@ -46,6 +47,7 @@ public class PrivacySettings +@@ -49,6 +50,7 @@ public class PrivacySettings private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA, @@ -307,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -40,6 +40,10 @@ import org.chromium.ui.base.PageTransition; +@@ -41,6 +41,10 @@ import org.chromium.ui.base.PageTransition; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; @@ -318,7 +318,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}. */ -@@ -61,6 +65,7 @@ public class ChromeTabCreator extends TabCreator { +@@ -69,6 +73,7 @@ public class ChromeTabCreator extends TabCreator { private final ChromeActivity mActivity; private final StartupTabPreloader mStartupTabPreloader; private final boolean mIncognito; @@ -326,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome private WindowAndroid mNativeWindow; private TabModel mTabModel; -@@ -79,6 +84,10 @@ public class ChromeTabCreator extends TabCreator { +@@ -87,6 +92,10 @@ public class ChromeTabCreator extends TabCreator { mNativeWindow = nativeWindow; mTabDelegateFactorySupplier = tabDelegateFactory; mIncognito = incognito; @@ -337,7 +337,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mOverviewNTPCreator = overviewNTPCreator; mAsyncTabParamsManager = asyncTabParamsManager; } -@@ -232,6 +241,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -247,6 +256,8 @@ public class ChromeTabCreator extends TabCreator { if (creationState == TabCreationState.LIVE_IN_FOREGROUND && !openInForeground) { creationState = TabCreationState.LIVE_IN_BACKGROUND; } @@ -346,7 +346,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return tab; } finally { -@@ -266,6 +277,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -281,6 +292,8 @@ public class ChromeTabCreator extends TabCreator { @TabCreationState int creationState = openInForeground ? TabCreationState.LIVE_IN_FOREGROUND : TabCreationState.LIVE_IN_BACKGROUND; @@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type, creationState); return true; } -@@ -309,7 +322,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -324,7 +337,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) { @@ -363,7 +363,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName()); if (forceNewTab && !isLaunchedFromChrome) { -@@ -423,6 +435,8 @@ public class ChromeTabCreator extends TabCreator { +@@ -438,6 +450,8 @@ public class ChromeTabCreator extends TabCreator { .setSerializedCriticalPersistedTabData(serializedCriticalPersistedTabData) .build(); } @@ -383,7 +383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import org.chromium.base.Log; import org.chromium.base.ObserverList; import org.chromium.base.StreamUtil; -@@ -51,6 +52,8 @@ import org.chromium.components.embedder_support.util.UrlUtilities; +@@ -52,6 +53,8 @@ import org.chromium.components.embedder_support.util.UrlUtilities; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.UiThreadTaskTraits; @@ -392,7 +392,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; -@@ -615,6 +618,13 @@ public class TabPersistentStore extends TabPersister { +@@ -646,6 +649,13 @@ public class TabPersistentStore { } } } @@ -454,7 +454,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 -@@ -395,7 +395,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -400,7 +400,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -466,7 +466,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -856,6 +856,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -893,6 +893,13 @@ Your Google account may have other forms of browsing history like searches and a Clears history and autocompletions in the address bar. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 4bf85dcd..da045af4 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -18,7 +18,7 @@ Completely remove contacts picker permission from the file dialog .../browser/bookmarks/BookmarkManager.java | 22 ++ .../browser/bookmarks/BookmarkPage.java | 9 +- .../native_page/NativePageFactory.java | 3 +- - chrome/browser/BUILD.gn | 6 +- + chrome/browser/BUILD.gn | 2 + chrome/browser/about_flags.cc | 6 + .../android/bookmarks/bookmark_bridge.cc | 284 ++++++++++++++++++ .../android/bookmarks/bookmark_bridge.h | 28 +- @@ -27,7 +27,7 @@ Completely remove contacts picker permission from the file dialog .../DownloadLocationDialogCoordinator.java | 10 +- chrome/browser/flag_descriptions.cc | 5 + chrome/browser/flag_descriptions.h | 3 + - .../flags/android/chrome_feature_list.cc | 4 + + .../flags/android/chrome_feature_list.cc | 5 + .../flags/android/chrome_feature_list.h | 1 + .../browser/flags/ChromeFeatureList.java | 1 + chrome/browser/importer/profile_writer.cc | 12 + @@ -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, 875 insertions(+), 21 deletions(-) diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc @@ -349,7 +349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + public void exportBookmarks(WindowAndroid window, ModalDialogManager modalDialogManager) { + assert mIsNativeBookmarkModelLoaded; + if (ChromeFeatureList.isEnabled(ChromeFeatureList.BOOKMARKS_EXPORT_USESAF) || -+ Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) ++ Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) + exportBookmarksImplUseSaf(window); + else + exportBookmarksImplUseFile(window, modalDialogManager); @@ -540,7 +540,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Synchronously gets a list of bookmarks that match the specified search query. * @param query Keyword used for searching bookmarks. -@@ -1016,6 +1257,39 @@ public class BookmarkBridge { +@@ -1021,6 +1262,39 @@ public class BookmarkBridge { depthList.add(depth); } @@ -580,7 +580,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static List> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -1083,6 +1357,9 @@ public class BookmarkBridge { +@@ -1088,6 +1362,9 @@ public class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, List bookmarksList); @@ -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 -@@ -95,7 +95,8 @@ public class NativePageFactory { +@@ -96,7 +96,8 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { return new BookmarkPage(mActivity.getComponentName(), mActivity.getSnackbarManager(), @@ -709,16 +709,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -203,6 +203,8 @@ static_library("browser") { - "bitmap_fetcher/bitmap_fetcher_service.h", - "bitmap_fetcher/bitmap_fetcher_service_factory.cc", - "bitmap_fetcher/bitmap_fetcher_service_factory.h", -+ "bookmarks/bookmark_html_writer.cc", -+ "bookmarks/bookmark_html_writer.h", - "bluetooth/bluetooth_chooser_context.cc", - "bluetooth/bluetooth_chooser_context.h", - "bluetooth/bluetooth_chooser_context_factory.cc", -@@ -1895,6 +1897,8 @@ static_library("browser") { +@@ -1876,6 +1876,8 @@ static_library("browser") { "webapps/chrome_webapps_client.h", "window_placement/window_placement_permission_context.cc", "window_placement/window_placement_permission_context.h", @@ -727,21 +718,12 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn ] configs += [ -@@ -3439,8 +3443,6 @@ static_library("browser") { - "badging/badge_manager_factory.h", - "banners/app_banner_manager_desktop.cc", - "banners/app_banner_manager_desktop.h", -- "bookmarks/bookmark_html_writer.cc", -- "bookmarks/bookmark_html_writer.h", - "browsing_data/access_context_audit_database.cc", - "browsing_data/access_context_audit_database.h", - "browsing_data/access_context_audit_service.cc", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7115,6 +7115,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7303,6 +7303,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( - password_manager::features::kSyncingCompromisedCredentials)}, + optimization_guide::features::kOptimizationGuideModelDownloading)}, + {"export-bookmarks-use-saf", + flag_descriptions::kBookmarksExportUseSafName, @@ -1257,7 +1239,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 -@@ -4988,6 +4988,11 @@ const char kWebrtcPipeWireCapturerDescription[] = +@@ -5179,6 +5179,11 @@ const char kWebrtcPipeWireCapturerDescription[] = "capturing the desktop content on the Wayland display server."; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1272,7 +1254,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 -@@ -2928,6 +2928,9 @@ extern const char kWebrtcPipeWireCapturerName[]; +@@ -3051,6 +3051,9 @@ extern const char kWebrtcPipeWireCapturerName[]; extern const char kWebrtcPipeWireCapturerDescription[]; #endif // #if defined(WEBRTC_USE_PIPEWIRE) @@ -1285,20 +1267,21 @@ 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 -@@ -138,6 +138,7 @@ const base::Feature* kFeaturesExposedToJava[] = { - &kAssistantIntentPageUrl, +@@ -140,6 +140,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &kAssistantIntentTranslateInfo, + &kAppLaunchpad, &kBentoOffline, + &kBookmarksExportUseSaf, &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -724,6 +725,9 @@ const base::Feature kVoiceButtonInTopToolbar{"VoiceButtonInTopToolbar", +@@ -742,6 +743,10 @@ const base::Feature kVoiceButtonInTopToolbar{"VoiceButtonInTopToolbar", const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", base::FEATURE_ENABLED_BY_DEFAULT}; ++// disabled by default because of an issue on Android 6.0 +const base::Feature kBookmarksExportUseSaf{"BookmarksExportUseSaf", -+ base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_DISABLED_BY_DEFAULT}; + static jboolean JNI_ChromeFeatureList_IsEnabled( JNIEnv* env, @@ -1306,7 +1289,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -151,6 +151,7 @@ extern const base::Feature kVoiceSearchAudioCapturePolicy; +@@ -154,6 +154,7 @@ extern const base::Feature kVoiceSearchAudioCapturePolicy; extern const base::Feature kVoiceButtonInTopToolbar; extern const base::Feature kVrBrowsingFeedback; extern const base::Feature kPrefetchNotificationSchedulingIntegration; @@ -1317,7 +1300,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -481,6 +481,7 @@ public abstract class ChromeFeatureList { +@@ -503,6 +503,7 @@ public abstract class ChromeFeatureList { public static final String WEB_AUTH_PHONE_SUPPORT = "WebAuthenticationPhoneSupport"; public static final String WEB_FEED = "WebFeed"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; @@ -1386,7 +1369,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 -@@ -90,6 +90,8 @@ public final class ChromePreferenceKeys { +@@ -91,6 +91,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"; @@ -1395,7 +1378,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -845,6 +847,7 @@ public final class ChromePreferenceKeys { +@@ -896,6 +898,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_NUMBER_OF_LITE_SCRIPTS_CANCELED, AUTOFILL_ASSISTANT_PROACTIVE_HELP, APPLICATION_OVERRIDE_LANGUAGE, @@ -1442,12 +1425,12 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn + "importer/imported_bookmark_entry.cc", + "importer/imported_bookmark_entry.h", ] + deps += [ "//components/embedder_support/android/common:url_constants" ] } else { - # Non-Android. diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -73,8 +73,6 @@ static_library("utility") { +@@ -79,8 +79,6 @@ static_library("utility") { if (!is_android) { sources += [ @@ -1456,7 +1439,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", -@@ -191,6 +189,11 @@ static_library("utility") { +@@ -180,6 +178,11 @@ static_library("utility") { } } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 29d54bfd..d98d8708 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -269,6 +271,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -268,6 +270,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 -@@ -46,10 +46,12 @@ public class PrivacySettings +@@ -49,10 +49,12 @@ public class PrivacySettings private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private ManagedPreferenceDelegate mManagedPreferenceDelegate; -@@ -105,6 +107,10 @@ public class PrivacySettings +@@ -120,6 +122,10 @@ public class PrivacySettings } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled( (boolean) newValue); @@ -73,7 +73,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -128,6 +134,11 @@ public class PrivacySettings +@@ -143,6 +149,11 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -88,7 +88,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 -@@ -3986,6 +3986,13 @@ Data from your Incognito session will only be cleared from Chrome when you Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 9ca9be86..e9600764 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -6,16 +6,16 @@ Corrected Exit functionality --- chrome/android/java/res/menu/main_menu.xml | 6 ++++++ chrome/android/java/res/menu/main_menu_regroup.xml | 3 +++ - .../org/chromium/chrome/browser/ChromeTabbedActivity.java | 3 +++ + .../org/chromium/chrome/browser/ChromeTabbedActivity.java | 4 ++++ .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++ .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ - 6 files changed, 26 insertions(+), 1 deletion(-) + 6 files changed, 27 insertions(+), 1 deletion(-) 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 -@@ -119,6 +119,9 @@ +@@ -122,6 +122,9 @@ android:icon="@drawable/vr_headset" /> @@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -145,6 +148,9 @@ +@@ -148,6 +151,9 @@ @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android/java/res/menu/main_menu_regroup.xml --- a/chrome/android/java/res/menu/main_menu_regroup.xml +++ b/chrome/android/java/res/menu/main_menu_regroup.xml -@@ -181,6 +181,9 @@ +@@ -184,6 +184,9 @@ android:icon="@drawable/vr_headset" /> @@ -51,15 +51,16 @@ diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; - import org.chromium.chrome.browser.IntentHandler.TabOpenType; - import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; - import org.chromium.chrome.browser.app.ChromeActivity; +@@ -189,6 +189,8 @@ import java.lang.annotation.RetentionPolicy; + import java.util.List; + import java.util.Locale; + +import org.chromium.chrome.browser.ApplicationLifetime; - import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; - import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; - import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; -@@ -1821,6 +1822,8 @@ public class ChromeTabbedActivity extends ChromeActivity - RecordUserAction.record("MobileMenuSettings"); +@@ -2129,6 +2130,11 @@ public abstract class ChromeActivity + return true; } + if (id == R.id.exit_id) { @@ -110,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2916,6 +2916,9 @@ Data from your Incognito session will only be cleared from Chrome when you Settings diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index c1804eac..ad6640a4 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 -@@ -4332,6 +4332,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4471,6 +4471,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 -@@ -913,6 +913,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -975,6 +975,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 -@@ -518,6 +518,9 @@ extern const char kDiagnosticsAppDescription[]; +@@ -557,6 +557,9 @@ extern const char kDiagnosticsAppDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -70,7 +70,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -150,6 +150,10 @@ const base::FeatureParam +@@ -149,6 +149,10 @@ const base::FeatureParam const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -91,8 +91,8 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp +extern const base::Feature kEnableSaveDataHeader; +COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kRequestInitiatorSiteLockEnfocement; + COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kCertVerifierService; -- 2.17.1 diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 6ef762f2..c0abc9ba 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 -@@ -816,6 +816,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -865,6 +865,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 == -@@ -3656,6 +3661,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3750,6 +3755,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 -@@ -1404,6 +1404,10 @@ const char kMediaHistoryDescription[] = +@@ -1464,6 +1464,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 -@@ -832,6 +832,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -868,6 +868,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; 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 7602077d..cbf63020 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 -@@ -2635,6 +2635,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2666,6 +2666,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 -@@ -972,6 +972,11 @@ const char kEnableLoginDetectionName[] = "Enable login detection"; - const char kEnableLoginDetectionDescription[] = - "Allow user sign-in to be detected based on heuristics."; +@@ -1032,6 +1032,11 @@ const char kEnablePciguardUiDescription[] = + "Enable toggling Pciguard settings through the Settings App. By default, " + "this flag is enabled."; +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 -@@ -558,6 +558,9 @@ extern const char kEnablePortalsDescription[]; +@@ -594,6 +594,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index d50d47b2..b35b3c4f 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 -@@ -4604,6 +4604,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4751,6 +4751,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 -@@ -2805,6 +2805,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -2922,6 +2922,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -625,6 +625,9 @@ extern const char kEnableWasmThreadsName[]; +@@ -664,6 +664,9 @@ extern const char kEnableWasmThreadsName[]; extern const char kEnableWasmThreadsDescription[]; extern const char kEnableWasmTieringName[]; @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" -@@ -3369,8 +3370,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3326,8 +3327,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 82bd3ea3..03f51f83 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2588,6 +2588,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2619,6 +2619,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAccelerated2dCanvasName, flag_descriptions::kAccelerated2dCanvasDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, @@ -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 -@@ -511,6 +511,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; +@@ -562,6 +562,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 -@@ -317,6 +317,9 @@ extern const char kDisallowDocWrittenScriptsUiDescription[]; +@@ -347,6 +347,9 @@ extern const char kDisallowDocWrittenScriptsUiDescription[]; extern const char kEnableAccessibilityObjectModelName[]; extern const char kEnableAccessibilityObjectModelDescription[]; diff --git a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch index 46e0adc6..180a7e8a 100644 --- a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch @@ -20,7 +20,7 @@ legacy acceleration events. 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 -@@ -2799,6 +2799,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2856,6 +2856,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, @@ -36,7 +36,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 -@@ -755,6 +755,14 @@ const char kWinrtSensorsImplementationDescription[] = +@@ -821,6 +821,14 @@ const char kWinrtSensorsImplementationDescription[] = "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for " "sensors"; @@ -54,7 +54,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 -@@ -455,6 +455,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; +@@ -494,6 +494,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; extern const char kWinrtSensorsImplementationName[]; extern const char kWinrtSensorsImplementationDescription[]; @@ -83,7 +83,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -837,6 +837,16 @@ const base::Feature kWebOtpBackendAuto{"WebOtpBackendAuto", +@@ -886,6 +886,16 @@ const base::Feature kWebOtpBackendAuto{"WebOtpBackendAuto", // The JavaScript API for payments on the web. const base::Feature kWebPayments{"WebPayments", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -103,7 +103,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 -@@ -197,6 +197,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrArModule; +@@ -209,6 +209,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHandInput; CONTENT_EXPORT extern const base::Feature kWebXrHitTest; CONTENT_EXPORT extern const base::Feature kWebXrIncubations; @@ -116,14 +116,14 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h @@ -97,6 +97,8 @@ class WebRuntimeFeatures { - BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool); - BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool); - BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool); + BLINK_PLATFORM_EXPORT static void EnableCompositeRelativeKeyframes( + bool enable); + BLINK_PLATFORM_EXPORT static void EnableCookieDeprecationMessages(bool); + BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool); + BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool); - BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool); - BLINK_PLATFORM_EXPORT static void EnableDatabase(bool); - BLINK_PLATFORM_EXPORT static void EnableDecodeJpeg420ImagesToYUV(bool); + BLINK_PLATFORM_EXPORT static void EnableCookiesWithoutSameSiteMustBeSecure( + bool); + BLINK_PLATFORM_EXPORT static void EnableCanvas2dImageChromium(bool); diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc --- a/third_party/blink/renderer/modules/modules_initializer.cc +++ b/third_party/blink/renderer/modules/modules_initializer.cc @@ -147,8 +147,8 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p 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 -@@ -175,6 +175,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { - RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); +@@ -195,6 +195,14 @@ void WebRuntimeFeatures::EnableKeyboardAccessibleTooltip(bool enable) { + RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable); } +void WebRuntimeFeatures::EnableDeviceMotion(bool enable) { @@ -165,7 +165,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 -@@ -1385,6 +1385,14 @@ +@@ -1437,6 +1437,14 @@ name: "OffscreenCanvasCommit", status: "experimental", }, diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index ea9f5452..b295d499 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 -@@ -37,12 +37,15 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -40,12 +40,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"; -@@ -54,6 +57,7 @@ public class PrivacySettings +@@ -57,6 +60,7 @@ public class PrivacySettings private static final String PREF_PROXY_OPTIONS = "proxy"; private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA, PREF_ALWAYS_INCOGNITO, @@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS, PREF_CLOSE_TABS_ON_EXIT, PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_PRIVACY_SANDBOX, -@@ -103,6 +107,11 @@ public class PrivacySettings +@@ -118,6 +122,11 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updateSummaries(); } -@@ -123,6 +132,9 @@ public class PrivacySettings +@@ -138,6 +147,9 @@ public class PrivacySettings SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue); sharedPreferencesEditor.apply(); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -167,6 +179,13 @@ public class PrivacySettings +@@ -188,6 +200,13 @@ public class PrivacySettings (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); closeTabsOnExitPref.setOnPreferenceChangeListener(this); closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -164,7 +164,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" -@@ -968,6 +970,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1027,6 +1029,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -175,7 +175,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 -@@ -880,6 +880,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -917,6 +917,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 @@ -191,7 +191,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 -@@ -3155,6 +3155,11 @@ const char kShowCaretBrowsingDialog[] = +@@ -3152,6 +3152,11 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosAllowed[] = "lacros_allowed"; #endif @@ -206,9 +206,9 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1116,6 +1116,10 @@ extern const char kCartModuleRemoved[]; - extern const char kCartModuleWelcomeSurfaceShownTimes[]; - #endif +@@ -1131,6 +1131,10 @@ extern const char kFetchKeepaliveDurationOnShutdown[]; + + extern const char kSuppressDifferentOriginSubframeJSDialogs[]; +#if defined(OS_ANDROID) +extern const char kIncognitoTabHistoryEnabled[]; diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 9d1632a0..d0052ce1 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -133,6 +137,9 @@ +@@ -136,6 +140,9 @@ @@ -62,16 +62,16 @@ diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android 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 -@@ -63,6 +63,8 @@ import org.chromium.chrome.browser.ApplicationLifetime; - import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; - import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; +@@ -66,6 +66,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier; + import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; + import org.chromium.chrome.browser.app.tabmodel.TabbedModeTabModelOrchestrator; +import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; -@@ -1832,6 +1834,8 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -@@ -472,6 +472,7 @@ public class BookmarkUtils { +@@ -502,6 +502,7 @@ public class BookmarkUtils { List topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -234,7 +234,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -497,6 +498,9 @@ public class BookmarkUtils { +@@ -527,6 +528,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -314,7 +314,7 @@ diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser 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 -@@ -3014,6 +3014,9 @@ Data from your Incognito session will only be cleared from Chrome when you Track prices diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 00a4b1c8..e3df968e 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -7,11 +7,11 @@ Subject: Add menu item to view source chrome/android/java/res/menu/main_menu.xml | 3 +++ chrome/android/java/res/menu/main_menu_regroup.xml | 3 +++ .../chrome/browser/ChromeTabbedActivity.java | 2 ++ - .../chrome/browser/app/ChromeActivity.java | 2 ++ + .../chrome/browser/app/ChromeActivity.java | 5 +++++ .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++ .../CustomTabAppMenuPropertiesDelegate.java | 1 + .../ui/android/strings/android_chrome_strings.grd | 3 +++ - 8 files changed, 31 insertions(+) + 8 files changed, 34 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 @@ -29,7 +29,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 -@@ -91,6 +91,9 @@ +@@ -94,6 +94,9 @@ @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android/java/res/menu/main_menu_regroup.xml --- a/chrome/android/java/res/menu/main_menu_regroup.xml +++ b/chrome/android/java/res/menu/main_menu_regroup.xml -@@ -142,6 +142,9 @@ +@@ -145,6 +145,9 @@ @@ -55,7 +55,7 @@ diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android 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 -@@ -1850,6 +1850,8 @@ public class ChromeTabbedActivity extends ChromeActivity - } catch (ActivityNotFoundException e) { - Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show(); - } -+ } else if (id == R.id.view_source_id) { +@@ -2287,6 +2287,11 @@ public abstract class ChromeActivity + return true; + } + ++ if (id == R.id.view_source_id) { + currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString())); - } else if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) { - final boolean reloadOnChange = !currentTab.isNativePage(); - final boolean usingDesktopUserAgent = ++ return true; ++ } ++ + if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) { + boolean usingDesktopUserAgent = + currentTab.getWebContents().getNavigationController().getUseDesktopUserAgent(); 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 -@@ -519,6 +519,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -537,6 +537,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -87,7 +90,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)); -@@ -932,6 +933,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -950,6 +951,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } } @@ -110,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -225,6 +225,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -228,6 +228,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible); MenuItem homescreenItem = menu.findItem(R.id.add_to_homescreen_id); MenuItem openWebApkItem = menu.findItem(R.id.open_webapk_id); diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 7beea0ae..f51d372b 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -78,7 +78,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 -@@ -444,6 +444,7 @@ public final class ChromePreferenceKeys { +@@ -449,6 +449,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 +100,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 -@@ -1164,6 +1164,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1166,6 +1166,12 @@ Your Google account may have other forms of browsing history like searches and a Turn off @@ -116,7 +116,7 @@ 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 -@@ -488,7 +488,7 @@ test("components_unittests") { +@@ -501,7 +501,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 +125,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] } -@@ -730,7 +730,7 @@ if (!is_ios && !is_fuchsia) { +@@ -748,7 +748,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. @@ -142,9 +142,9 @@ diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn "//base:base_java", "//base:jni_java", + "//chrome/browser/preferences:java", - "//third_party/android_deps:androidx_annotation_annotation_java", - "//third_party/android_deps:androidx_appcompat_appcompat_java", - "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", + "//third_party/androidx:androidx_annotation_annotation_java", + "//third_party/androidx:androidx_appcompat_appcompat_java", + "//third_party/androidx:androidx_appcompat_appcompat_resources_java", diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index df0be688..1eaddcfb 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 -@@ -1112,8 +1112,10 @@ public class ChromeTabbedActivity extends ChromeActivity IMAGE diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 8241e5ad..0406ef46 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -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()); -@@ -3528,7 +3534,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3447,7 +3453,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 -@@ -157,6 +157,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -150,6 +150,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 b31a7453..a375d6e7 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 -@@ -119,7 +119,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( +@@ -118,7 +118,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 526a23ef..0533b8d4 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 @@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -156,7 +156,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams( +@@ -155,7 +155,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams( local_state->GetBoolean(prefs::kNtlmV2Enabled); #endif // defined(OS_POSIX) @@ -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 -@@ -561,7 +561,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -582,7 +582,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index b08a47e0..6b371d32 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -6,16 +6,16 @@ Subject: Automated domain substitution PRESUBMIT.py | 56 +- .../cts_config/webview_cts_gcs_path.json | 24 +- android_webview/tools/generate_flag_labels.py | 2 +- - android_webview/tools/record_netlog.py | 4 +- + android_webview/tools/record_netlog.py | 6 +- .../tools/remove_preinstalled_webview.py | 2 +- android_webview/tools/update_cts.py | 4 +- ash/app_list/PRESUBMIT.py | 2 +- ash/ash_strings.grd | 10 +- ash/assistant/assistant_setup_controller.cc | 2 +- ash/assistant/util/deep_link_util.cc | 16 +- - ash/login/ui/login_user_menu_view.cc | 2 +- .../quick_answers_controller_impl.cc | 2 +- ash/resources/PRESUBMIT.py | 4 +- + ...pcie_peripheral_notification_controller.cc | 2 +- base/PRESUBMIT.py | 4 +- base/android/jni_generator/PRESUBMIT.py | 2 +- base/android/resource_exclusions.gni | 2 +- @@ -27,10 +27,11 @@ Subject: Automated domain substitution build/android/gradle/generate_gradle.py | 2 +- .../android/gyp/assert_static_initializers.py | 2 +- build/android/gyp/lint.py | 2 +- - build/android/gyp/proguard.py | 2 +- + build/android/gyp/proguard.py | 4 +- build/android/gyp/util/diff_utils.py | 4 +- build/android/gyp/util/protoresources.py | 2 +- .../android/incremental_install/installer.py | 2 +- + build/android/pylib/base/result_sink.py | 2 +- build/android/pylib/constants/__init__.py | 2 +- build/android/pylib/device_settings.py | 8 +- build/android/pylib/dex/dex_parser.py | 6 +- @@ -49,9 +50,10 @@ Subject: Automated domain substitution build/chromeos/test_runner.py | 2 +- build/config/android/rules.gni | 2 +- build/config/chromeos/args.gni | 4 +- - build/config/chromeos/rules.gni | 2 +- + build/config/chromeos/rules.gni | 6 +- build/config/compiler/compiler.gni | 4 +- build/config/nacl/rules.gni | 2 +- + build/config/ozone.gni | 2 +- build/config/sanitizers/sanitizers.gni | 2 +- build/config/win/control_flow_guard.gni | 2 +- build/fuchsia/binary_sizes.py | 2 +- @@ -75,9 +77,9 @@ Subject: Automated domain substitution .../javatest_manifest_config_delta.json | 2 +- .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- - chrome/app/chromium_strings.grd | 12 +- - chrome/app/generated_resources.grd | 244 ++-- - chrome/app/google_chrome_strings.grd | 12 +- + chrome/app/chromium_strings.grd | 14 +- + chrome/app/generated_resources.grd | 244 +-- + chrome/app/google_chrome_strings.grd | 14 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- chrome/browser/about_flags.cc | 12 +- @@ -86,16 +88,19 @@ Subject: Automated domain substitution chrome/browser/android/vr/PRESUBMIT.py | 2 +- .../digital_goods_factory_impl.cc | 2 +- .../apps/platform_apps/install_chrome_app.cc | 2 +- + chrome/browser/ash/app_mode/fake_cws.cc | 2 +- + .../browser/ash/assistant/assistant_util.cc | 4 +- + .../easy_unlock/easy_unlock_key_names.cc | 2 +- + .../login/saml/password_sync_token_fetcher.cc | 2 +- + .../recommend_apps_fetcher_impl.cc | 2 +- .../autofill/autofill_gstatic_reader.cc | 4 +- .../autofill/captured_sites_test_utils.cc | 2 +- .../browser_switcher_service.cc | 2 +- chrome/browser/cart/cart_service.cc | 8 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../chromeos/android_sms/android_sms_urls.cc | 16 +- - chrome/browser/chromeos/app_mode/fake_cws.cc | 2 +- .../auth/arc_background_auth_code_fetcher.cc | 2 +- .../arc/auth/arc_robot_auth_code_fetcher.cc | 2 +- - .../chromeos/assistant/assistant_util.cc | 4 +- .../attestation/attestation_ca_client.cc | 8 +- .../backdrop_wallpaper_handlers.cc | 6 +- .../cert_provisioning_test_helpers.cc | 2 +- @@ -110,11 +115,7 @@ Subject: Automated domain substitution .../first_run/drive_first_run_controller.cc | 4 +- chrome/browser/chromeos/hats/hats_dialog.cc | 2 +- .../input_method/assistive_suggester.cc | 12 +- - .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../login/marketing_backend_connector.cc | 4 +- - .../login/saml/password_sync_token_fetcher.cc | 2 +- - .../recommend_apps_fetcher_impl.cc | 2 +- - .../login/session/user_session_manager.cc | 2 +- .../dns_latency_routine.cc | 2 +- .../dns_resolution_routine.cc | 2 +- .../http_firewall_routine.cc | 6 +- @@ -131,8 +132,9 @@ Subject: Automated domain substitution chrome/browser/devtools/url_constants.cc | 4 +- .../mixed_content_download_blocking.cc | 2 +- .../connectors/connectors_service.cc | 4 +- + .../file_system/signin_dialog_delegate.cc | 2 +- .../extension_request_notification.cc | 4 +- - .../chrome_js_error_report_processor.cc | 4 +- + ...e_js_error_report_processor_nonchromeos.cc | 4 +- .../cryptotoken_private_api.cc | 6 +- .../identity_launch_web_auth_flow_function.cc | 2 +- .../chrome_management_api_delegate.cc | 2 +- @@ -148,8 +150,6 @@ Subject: Automated domain substitution chrome/browser/flag_descriptions.cc | 4 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- - .../browser/installable/quality_enforcer.cc | 4 +- - .../lacros/cert_db_initializer_impl.cc | 40 +- .../service_discovery_client_mac.mm | 4 +- .../cast/cast_media_route_provider.cc | 4 +- .../dial/dial_media_route_provider.cc | 12 +- @@ -167,7 +167,6 @@ Subject: Automated domain substitution ...page_load_metrics_observer_test_harness.cc | 2 +- ...rvice_worker_page_load_metrics_observer.cc | 2 +- ...rd_manager_signin_intercept_test_helper.cc | 2 +- - .../browser/pepper_broker_infobar_delegate.cc | 2 +- .../performance_hints_features.cc | 2 +- ...ped_permission_infobar_delegate_android.cc | 2 +- .../policy/extension_force_install_mixin.cc | 2 +- @@ -175,19 +174,18 @@ Subject: Automated domain substitution chrome/browser/policy/policy_test_utils.h | 2 +- .../tools/prerender_test_server/index.html | 2 +- .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- + .../profiles/profile_avatar_downloader.cc | 2 +- chrome/browser/profiles/profile_window.cc | 2 +- .../push_messaging_constants.cc | 2 +- .../push_messaging_service_impl.cc | 2 +- .../tab_ranker/tab_features_test_helper.cc | 2 +- chrome/browser/resources/PRESUBMIT.py | 2 +- .../resources/chromeos/about_os_credits.html | 6 +- - .../annotation/user_annotation_handler.js | 2 +- .../chromevox/background/command_handler.js | 6 +- - .../i_tutorial/components/i_tutorial.js | 6 +- .../chromevox/options/options.css | 2 +- - .../accessibility/chromevox/panel/panel.html | 2 +- .../tools/webstore_extension_util.py | 10 +- .../chromevox_manifest.json.jinja2 | 8 +- + .../common/tutorial/chromevox_tutorial.js | 6 +- .../accessibility/select_to_speak/options.css | 2 +- .../select_to_speak/select_to_speak.js | 8 +- .../select_to_speak_manifest.json.jinja2 | 8 +- @@ -196,6 +194,7 @@ Subject: Automated domain substitution .../add_supervision/add_supervision_ui.js | 16 +- .../chromeos/arc_support/background.js | 12 +- .../chromeos/arc_support/playstore.js | 6 +- + .../assistant_optin/assistant_related_info.js | 4 +- .../assistant_optin/assistant_value_prop.js | 2 +- .../connectivity_diagnostics/manifest.json | 4 +- .../resources/chromeos/echo/manifest.json | 122 +- @@ -216,6 +215,7 @@ Subject: Automated domain substitution .../discards/graph_doc_template.html | 2 +- chrome/browser/resources/downloads/icons.html | 2 +- .../resources/feedback/js/feedback_util.js | 10 +- + .../feedback_webui/js/feedback_util.js | 10 +- .../resources/gaia_auth_host/authenticator.js | 4 +- .../saml_password_attributes.js | 2 +- .../resources/hangout_services/manifest.json | 2 +- @@ -233,11 +233,11 @@ Subject: Automated domain substitution .../shared/nearby_contact_visibility.js | 2 +- .../shared/nearby_shared_icons.html | 4 +- .../nearby_shared_share_type_icons.html | 2 +- - .../domain_security_policy_view.html | 4 +- - .../resources/net_internals/events_view.html | 2 +- + .../resources/net_internals/index.html | 6 +- .../network_speech_synthesis/manifest.json | 2 +- .../network_speech_synthesis/tts_extension.js | 2 +- .../new_tab_page/doodle_share_dialog.js | 2 +- + .../new_tab_page/modules/drive/module.js | 8 +- .../new_tab_page/voice_search_overlay.js | 2 +- chrome/browser/resources/omnibox/omnibox.html | 2 +- .../resources/omnibox/omnibox_output.js | 4 +- @@ -277,6 +277,7 @@ Subject: Automated domain substitution ...ings_reset_prompt_model_browsertest_win.cc | 2 +- .../background/ntp_background_service.cc | 6 +- .../search/background/ntp_backgrounds.cc | 10 +- + chrome/browser/search/drive/drive_service.cc | 4 +- chrome/browser/search/local_ntp_source.cc | 6 +- chrome/browser/search/ntp_icon_source.cc | 2 +- .../template_url_service_test_util.cc | 2 +- @@ -310,16 +311,16 @@ Subject: Automated domain substitution .../tab_under_navigation_throttle.h | 2 +- ...r_content_setting_bubble_model_delegate.cc | 4 +- .../browser_navigator_browsertest_chromeos.cc | 2 +- + chrome/browser/ui/chrome_pages.cc | 2 +- .../rosetta_required_infobar_delegate.mm | 2 +- .../browser/ui/cocoa/share_menu_controller.mm | 2 +- + .../ui/commander/open_url_command_source.cc | 2 +- .../installation_error_infobar_delegate.cc | 2 +- - .../ui/hats/hats_survey_status_checker.cc | 4 +- chrome/browser/ui/signin_view_controller.cc | 2 +- ...al_provider_signin_dialog_win_test_data.cc | 2 +- .../toolbar/media_router_contextual_menu.cc | 6 +- .../app_dialog/app_uninstall_dialog_view.cc | 2 +- .../ui/views/hats/hats_next_web_dialog.cc | 2 +- - .../browser/ui/views/hats/hats_web_dialog.cc | 6 +- ...picker_bubble_view_browsertest_chromeos.cc | 12 +- .../media_router/cast_dialog_sink_button.cc | 2 +- .../ui/views/network_profile_bubble_view.cc | 2 +- @@ -370,35 +371,22 @@ Subject: Automated domain substitution chrome/common/extensions/api/debugger.json | 8 +- .../extensions/api/declarative_content.json | 4 +- chrome/common/extensions/api/dom.json | 2 +- - .../api/enterprise_device_attributes.idl | 2 +- chrome/common/extensions/api/gcm.json | 4 +- chrome/common/extensions/api/i18n.json | 2 +- - chrome/common/extensions/api/identity.idl | 4 +- - .../extensions/api/image_writer_private.idl | 2 +- chrome/common/extensions/api/instance_id.json | 2 +- - chrome/common/extensions/api/printing.idl | 6 +- - chrome/common/extensions/api/scripting.idl | 4 +- + chrome/common/extensions/api/privacy.json | 2 +- chrome/common/extensions/api/tabs.json | 4 +- chrome/common/extensions/api/tts.json | 2 +- - .../extensions/api/webrtc_audio_private.idl | 2 +- chrome/common/extensions/api/webview_tag.json | 4 +- 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 | 230 ++-- - .../extension/task_manager_unittests.cc | 6 +- + chrome/common/url_constants.cc | 232 +- .../gaiacp/associated_user_validator.cc | 2 +- - .../associated_user_validator_unittests.cc | 4 +- .../gaiacp/gaia_credential_base.cc | 8 +- - .../gaiacp/gaia_credential_base_unittests.cc | 14 +- - .../gaia_credential_provider_unittests.cc | 14 +- - .../gaiacp/gaia_credential_unittests.cc | 2 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- - .../gaiacp/gcp_utils_unittests.cc | 4 +- .../gaiacp/gcpw_strings.cc | 2 +- .../credential_provider/gaiacp/mdm_utils.cc | 2 +- - .../gaiacp/reauth_credential_unittests.cc | 2 +- - .../gaiacp/win_http_url_fetcher_unittests.cc | 2 +- chrome/docs/devtools-pillar.html | 2 +- chrome/docs/index.html | 18 +- chrome/docs/platform-pillar.html | 12 +- @@ -446,8 +434,10 @@ Subject: Automated domain substitution chrome/installer/setup/eula/oem_zh-TW.html | 2 +- .../setup/google_chrome_behaviors.cc | 2 +- chrome/renderer/media/flash_embed_rewrite.cc | 2 +- + .../cart/cart_domain_cart_url_regex.json | 2 +- .../extensions/identity_custom_bindings.js | 2 +- .../subresource_redirect_params.cc | 2 +- + .../mac_notification_service_ns.mm | 2 +- .../speech/cloud_speech_recognition_client.cc | 2 +- chrome/tools/build/PRESUBMIT.py | 2 +- chrome/tools/webforms_aggregator_tests.py | 4 +- @@ -468,7 +458,6 @@ Subject: Automated domain substitution .../components/camera_app_ui/camera_app_ui.cc | 2 +- .../resources/js/lib/analytics.js | 14 +- .../camera_app_ui/resources/js/util.js | 2 +- - .../camera_app_ui/resources/manifest.json | 2 +- .../resources/strings/camera_strings.grd | 2 +- .../resources/routine_section.js | 2 +- chromeos/components/drivefs/drivefs_auth.cc | 2 +- @@ -476,7 +465,6 @@ Subject: Automated domain substitution .../multidevice/stub_multidevice_util.cc | 2 +- chromeos/components/phonehub/url_constants.cc | 2 +- .../translation_result_loader.cc | 2 +- - .../scanning/resources/scanner_select.html | 2 +- .../scanning/resources/scanning_app.html | 2 +- .../scanning/resources/scanning_app.js | 2 +- .../trial_group/trial_group_checker.cc | 2 +- @@ -534,18 +522,15 @@ Subject: Automated domain substitution .../crash/core/browser/resources/crashes.js | 4 +- components/cronet/PRESUBMIT.py | 2 +- .../cronet_consumer_app_delegate.mm | 4 +- - components/cronet/native/cronet.idl | 14 +- components/cronet/tools/generate_javadoc.py | 2 +- .../core/common/chrome_proxy_header.txt | 4 +- - .../common/data_reduction_proxy_params.cc | 2 +- .../core/html/dom_distiller_viewer.html | 2 +- .../core/javascript/dom_distiller_viewer.js | 2 +- components/dom_distiller/core/viewer.cc | 6 +- - .../domain_reliability/bake_in_configs.py | 286 ++--- + .../domain_reliability/bake_in_configs.py | 286 +-- components/drive/service/drive_api_service.cc | 6 +- .../error_page/common/localized_error.cc | 2 +- .../favicon/core/large_icon_service_impl.cc | 2 +- - components/feed/core/feed_networking_host.cc | 2 +- components/feed/core/v2/feed_network_impl.cc | 10 +- components/feed/feed_feature_list.cc | 2 +- components/feedback/feedback_uploader.cc | 2 +- @@ -559,6 +544,7 @@ Subject: Automated domain substitution .../per_user_topic_subscription_manager.cc | 2 +- .../tab_modal_dialog_manager.cc | 2 +- .../core/keyed_service_base_factory.cc | 2 +- + components/lens/lens_features.cc | 2 +- components/media_router/common/media_source.h | 2 +- .../metrics/net/net_metrics_log_uploader.cc | 2 +- components/metrics/url_constants.cc | 6 +- @@ -591,7 +577,6 @@ Subject: Automated domain substitution .../browser/password_manager_test_utils.cc | 4 +- .../core/browser/password_reuse_detector.cc | 2 +- .../browser/password_scripts_fetcher_impl.cc | 2 +- - ...password_scripts_fetcher_impl_unittests.cc | 2 +- .../core/browser/password_store.cc | 8 +- .../core/browser/password_sync_util.cc | 4 +- .../core/browser/password_ui_utils.cc | 2 +- @@ -608,7 +593,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 | 1126 ++++++++--------- + .../policy/resources/policy_templates.json | 1948 ++++++++--------- .../policy/resources/webui/policy_base.js | 2 +- .../policy/test_support/policy_testserver.py | 14 +- .../policy/tools/generate_extension_admx.py | 2 +- @@ -621,7 +606,6 @@ Subject: Automated domain substitution .../writers/template_writer.py | 2 +- .../query_tiles/internal/tile_config.cc | 2 +- components/quirks/quirks_client.cc | 2 +- - components/rappor/rappor_service_impl.cc | 2 +- components/resources/terms/terms_am.html | 4 +- components/resources/terms/terms_ar.html | 4 +- components/resources/terms/terms_bg.html | 4 +- @@ -675,11 +659,10 @@ Subject: Automated domain substitution components/resources/terms/terms_zh-CN.html | 4 +- components/resources/terms/terms_zh-TW.html | 4 +- .../browser/client_side_detection_service.cc | 2 +- - .../password_protection_service.cc | 6 +- .../content/triggers/trigger_util.cc | 2 +- .../browser/safe_browsing_token_fetcher.h | 2 +- - .../core/common/safebrowsing_constants.cc | 2 +- .../core/db/v4_protocol_manager_util.cc | 4 +- + .../password_protection_service_base.cc | 6 +- .../core/realtime/url_lookup_service.cc | 2 +- .../safe_search_url_checker_client.cc | 2 +- .../safe_search_api/stub_url_checker.cc | 2 +- @@ -690,10 +673,11 @@ Subject: Automated domain substitution .../core/safe_browsing_loud_error_ui.cc | 4 +- .../security_interstitials/core/urls.cc | 4 +- .../services/quarantine/quarantine_mac.mm | 2 +- - .../core/common/disabled_sites.cc | 6 +- + .../core/common/disabled_sites.cc | 8 +- .../browser/chrome_connected_header_helper.cc | 4 +- .../browser/account_consistency_service.mm | 14 +- .../signin/public/base/test_signin_client.cc | 2 +- + .../identity_manager/access_token_fetcher.cc | 2 +- .../browser/spelling_service_client.cc | 2 +- .../browser/subresource_filter_constants.h | 8 +- .../core/common/PRESUBMIT.py | 2 +- @@ -722,14 +706,14 @@ Subject: Automated domain substitution .../indexed_db/indexed_db_reporting.cc | 2 +- .../portal/portal_navigation_throttle.cc | 2 +- .../renderer_host/navigation_request.cc | 6 +- + .../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 | 6 +- + .../browser/webauth/authenticator_common.cc | 8 +- .../zygote_host/zygote_host_impl_linux.cc | 2 +- content/public/PRESUBMIT.py | 4 +- content/renderer/PRESUBMIT.py | 2 +- @@ -739,7 +723,6 @@ Subject: Automated domain substitution content/zygote/zygote_main_linux.cc | 2 +- device/bluetooth/bluetooth_adapter_mac.mm | 2 +- .../bluetooth/bluetooth_classic_device_mac.mm | 4 +- - device/fido/client_data.cc | 2 +- device/fido/fido_strings.grd | 2 +- device/fido/fido_test_data.h | 2 +- device/gamepad/xbox_controller_mac.mm | 2 +- @@ -751,19 +734,7 @@ Subject: Automated domain substitution .../browser/updater/extension_downloader.cc | 4 +- .../browser/updater/safe_manifest_parser.cc | 2 +- extensions/common/api/PRESUBMIT.py | 2 +- - extensions/common/api/app_runtime.idl | 4 +- - extensions/common/api/app_window.idl | 2 +- - .../common/api/bluetooth_low_energy.idl | 6 +- - extensions/common/api/bluetooth_socket.idl | 2 +- .../common/api/extensions_manifest_types.json | 6 +- - extensions/common/api/networking_onc.idl | 2 +- - extensions/common/api/networking_private.idl | 6 +- - extensions/common/api/printer_provider.idl | 6 +- - extensions/common/api/serial.idl | 2 +- - extensions/common/api/socket.idl | 2 +- - extensions/common/api/sockets_tcp.idl | 2 +- - extensions/common/api/sockets_tcp_server.idl | 2 +- - extensions/common/api/sockets_udp.idl | 4 +- extensions/common/csp_validator.cc | 2 +- extensions/common/extension_urls.cc | 10 +- extensions/common/manifest_constants.cc | 2 +- @@ -772,7 +743,7 @@ Subject: Automated domain substitution google_apis/drive/drive_api_url_generator.cc | 4 +- google_apis/gaia/gaia_auth_fetcher.cc | 4 +- google_apis/gaia/gaia_auth_util.cc | 6 +- - google_apis/gaia/gaia_constants.cc | 36 +- + google_apis/gaia/gaia_constants.cc | 64 +- google_apis/gaia/gaia_oauth_client.cc | 6 +- google_apis/gaia/gaia_urls.cc | 8 +- google_apis/gcm/base/mcs_util.cc | 2 +- @@ -780,7 +751,6 @@ Subject: Automated domain substitution google_apis/gcm/engine/mcs_client.cc | 2 +- google_apis/gcm/tools/mcs_probe.cc | 2 +- google_apis/google_api_keys.cc | 2 +- - google_update/google_update_idl.idl | 2 +- .../ANGLE/EGL_ANGLE_sync_control_rate.txt | 2 +- .../CHROMIUM_color_space_metadata.txt | 2 +- .../CHROMIUM_texture_storage_image.txt | 2 +- @@ -804,8 +774,8 @@ Subject: Automated domain substitution ios/build/bots/scripts/standard_json_util.py | 2 +- ios/build/bots/scripts/xcode_util.py | 2 +- ios/build/chrome_build.gni | 2 +- - .../app/strings/ios_chromium_strings.grd | 6 +- - .../app/strings/ios_google_chrome_strings.grd | 6 +- + .../app/strings/ios_chromium_strings.grd | 8 +- + .../app/strings/ios_google_chrome_strings.grd | 8 +- ios/chrome/app/strings/ios_strings.grd | 28 +- ios/chrome/browser/autofill/BUILD.gn | 4 +- .../autofill/automation/automation_action.mm | 2 +- @@ -815,7 +785,7 @@ Subject: Automated domain substitution 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 | 10 +- + .../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 +- @@ -830,7 +800,6 @@ Subject: Automated domain substitution .../translate_table_view_controller.mm | 2 +- .../interstitials/interstitial_ui_util.mm | 2 +- ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- - .../system_cookie_store_unittest_template.h | 2 +- ios/net/crn_http_protocol_handler.mm | 2 +- .../omaha/test_omaha_service_provider.mm | 2 +- .../browser/signin/chrome_identity_service.mm | 4 +- @@ -838,6 +807,7 @@ Subject: Automated domain substitution ios/showcase/alert/sc_alert_coordinator.mm | 8 +- .../sc_infobar_modal_save_card_coordinator.mm | 2 +- .../fake_autocomplete_suggestion.mm | 4 +- + .../http_server_files/simple_login_form.html | 2 +- .../data/http_server_files/window_open.html | 2 +- ios/web/navigation/navigation_manager_impl.mm | 6 +- ios/web_view/PRESUBMIT.py | 2 +- @@ -894,10 +864,7 @@ Subject: Automated domain substitution native_client_sdk/src/web/manifest.html | 6 +- net/base/network_change_notifier_mac.mm | 2 +- net/base/url_util.cc | 4 +- - net/cookies/cookie_store_unittest.h | 4 +- - net/data/filter_unittests/google.txt | 2 +- .../http_security_header_047.txt | Bin 166 -> 169 bytes - .../v3_certificate_template.txt | 2 +- net/dns/dns_test_util.h | 12 +- net/dns/dns_transaction.cc | 2 +- net/dns/public/doh_provider_entry.cc | 4 +- @@ -911,13 +878,6 @@ Subject: Automated domain substitution net/tools/print_certificates.py | 2 +- .../transport_security_state_generator.cc | 2 +- pdf/pdfium/pdfium_test_base.cc | 2 +- - ppapi/api/pp_macros.idl | 2 +- - ppapi/api/ppb_file_system.idl | 2 +- - ppapi/api/ppb_host_resolver.idl | 2 +- - ppapi/api/ppb_network_monitor.idl | 2 +- - ppapi/api/ppb_network_proxy.idl | 2 +- - ppapi/api/ppb_tcp_socket.idl | 2 +- - ppapi/api/ppb_udp_socket.idl | 2 +- .../breakpad_crash_test/crash_in_syscall.html | 4 +- .../trusted_crash_in_startup.html | 4 +- .../breakpad_crash_test/untrusted_crash.html | 4 +- @@ -961,13 +921,12 @@ 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 | 36 +- + styleguide/c++/c++11.html | 40 +- styleguide/c++/chromium-cpp/main.py | 2 +- testing/PRESUBMIT.py | 2 +- .../java/AndroidManifest.xml.jinja2 | 4 +- .../browser_test_commands_linux.txt | 2 +- .../chromoting_test_driver_commands_linux.txt | 4 +- - testing/libfuzzer/unittest_main.cc | 2 +- testing/merge_scripts/PRESUBMIT.py | 2 +- .../merge_scripts/code_coverage/PRESUBMIT.py | 2 +- .../code_coverage/merge_results.py | 2 +- @@ -980,7 +939,7 @@ Subject: Automated domain substitution testing/trigger_scripts/PRESUBMIT.py | 2 +- .../trigger_scripts/base_test_triggerer.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 26 +- + .../variations/fieldtrial_testing_config.json | 20 +- .../markdown/extensions/smarty.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- third_party/abseil-cpp/conanfile.py | 2 +- @@ -1034,82 +993,15 @@ Subject: Automated domain substitution .../renderer/bindings/scripts/v8_methods.py | 2 +- .../renderer/bindings/scripts/v8_types.py | 2 +- .../renderer/bindings/scripts/v8_utilities.py | 2 +- - .../bindings/tests/idls/core/test_node.idl | 2 +- .../build/scripts/update_css_ranking.py | 4 +- - .../renderer/core/css/css_font_face_rule.idl | 2 +- - .../renderer/core/css/css_import_rule.idl | 2 +- - .../renderer/core/css/css_media_rule.idl | 2 +- - .../blink/renderer/core/css/css_page_rule.idl | 2 +- - .../blink/renderer/core/css/css_rule.idl | 2 +- - .../core/css/css_style_declaration.idl | 2 +- - .../renderer/core/css/css_style_rule.idl | 2 +- - .../renderer/core/css/css_style_sheet.idl | 2 +- .../core/css/remote_font_face_source.cc | 2 +- - .../blink/renderer/core/css/style_sheet.idl | 2 +- - .../renderer/core/css/style_sheet_list.idl | 2 +- - third_party/blink/renderer/core/dom/attr.idl | 2 +- - .../blink/renderer/core/dom/cdata_section.idl | 2 +- - .../blink/renderer/core/dom/child_node.idl | 2 +- - .../blink/renderer/core/dom/comment.idl | 2 +- - .../renderer/core/dom/dom_implementation.idl | 2 +- - .../blink/renderer/core/dom/element.idl | 4 +- - .../blink/renderer/core/dom/events/event.idl | 2 +- - .../core/dom/events/event_listener.idl | 2 +- .../renderer/core/dom/events/event_target.cc | 4 +- - .../renderer/core/dom/events/event_target.idl | 2 +- - .../blink/renderer/core/dom/iterator.idl | 2 +- - .../renderer/core/dom/named_node_map.idl | 2 +- - third_party/blink/renderer/core/dom/node.idl | 2 +- - .../blink/renderer/core/dom/node_filter.idl | 2 +- - .../blink/renderer/core/dom/node_iterator.idl | 2 +- - .../blink/renderer/core/dom/node_list.idl | 2 +- - .../core/dom/processing_instruction.idl | 2 +- - third_party/blink/renderer/core/dom/range.idl | 2 +- - .../blink/renderer/core/dom/tree_walker.idl | 2 +- - .../events/application_cache_error_event.idl | 2 +- - .../renderer/core/events/keyboard_event.idl | 2 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- - .../renderer/core/events/wheel_event.idl | 2 +- - .../blink/renderer/core/frame/deprecation.cc | 48 +- + .../blink/renderer/core/frame/deprecation.cc | 50 +- .../blink/renderer/core/frame/local_frame.cc | 4 +- - .../core/html/custom/element_internals.idl | 2 +- - .../core/html/custom/validity_state_flags.idl | 2 +- - .../core/html/forms/html_button_element.idl | 2 +- - .../forms/html_form_controls_collection.idl | 2 +- - .../core/html/forms/html_form_element.idl | 2 +- - .../core/html/forms/html_input_element.idl | 2 +- - .../core/html/forms/html_label_element.idl | 2 +- - .../core/html/forms/html_legend_element.idl | 2 +- - .../core/html/forms/html_option_element.idl | 2 +- - .../html/forms/html_options_collection.idl | 2 +- - .../core/html/forms/html_select_element.idl | 2 +- - .../html/forms/html_text_area_element.idl | 2 +- - .../core/html/forms/validity_state.idl | 2 +- - .../core/html/html_anchor_element.idl | 2 +- - .../renderer/core/html/html_area_element.idl | 2 +- - .../renderer/core/html/html_body_element.idl | 2 +- - .../renderer/core/html/html_collection.idl | 2 +- - .../renderer/core/html/html_document.idl | 2 +- - .../blink/renderer/core/html/html_element.idl | 2 +- - .../renderer/core/html/html_embed_element.idl | 2 +- - .../renderer/core/html/html_frame_element.idl | 2 +- - .../core/html/html_frame_set_element.idl | 2 +- .../renderer/core/html/html_iframe_element.cc | 2 +- - .../core/html/html_iframe_element.idl | 2 +- - .../renderer/core/html/html_image_element.idl | 2 +- .../renderer/core/html/html_link_element.cc | 4 +- - .../renderer/core/html/html_link_element.idl | 2 +- - .../renderer/core/html/html_map_element.idl | 2 +- - .../core/html/html_object_element.idl | 2 +- - .../renderer/core/html/html_pre_element.idl | 2 +- - .../renderer/core/html/html_style_element.idl | 2 +- - .../core/html/html_table_caption_element.idl | 2 +- - .../core/html/html_table_cell_element.idl | 2 +- - .../core/html/html_table_col_element.idl | 2 +- - .../renderer/core/html/html_table_element.idl | 2 +- - .../core/html/html_table_row_element.idl | 2 +- - .../core/html/html_table_section_element.idl | 2 +- .../core/html/media/autoplay_policy.cc | 4 +- .../core/html/media/html_media_element.cc | 4 +- .../core/html/portal/html_portal_element.cc | 4 +- @@ -1117,63 +1009,19 @@ Subject: Automated domain substitution .../renderer/core/loader/frame_loader.cc | 4 +- .../core/loader/mixed_content_checker.cc | 2 +- .../core/loader/subresource_filter.cc | 2 +- - .../core/page/scrolling/scroll_state.idl | 2 +- - .../core/page/scrolling/scroll_state_init.idl | 2 +- .../script/document_write_intervention.cc | 6 +- - .../blink/renderer/core/svg/svg_angle.idl | 2 +- - .../renderer/core/svg/svg_animated_number.idl | 2 +- - .../renderer/core/svg/svg_circle_element.idl | 2 +- - .../core/svg/svg_clip_path_element.idl | 2 +- - .../blink/renderer/core/svg/svg_element.idl | 2 +- - .../renderer/core/svg/svg_filter_element.idl | 2 +- - ...g_filter_primitive_standard_attributes.idl | 2 +- - .../renderer/core/svg/svg_fit_to_view_box.idl | 2 +- - .../blink/renderer/core/svg/svg_length.idl | 2 +- - .../renderer/core/svg/svg_length_list.idl | 2 +- - .../blink/renderer/core/svg/svg_matrix.idl | 2 +- - .../blink/renderer/core/svg/svg_number.idl | 2 +- - .../renderer/core/svg/svg_number_list.idl | 2 +- - .../renderer/core/svg/svg_path_element.idl | 2 +- - .../blink/renderer/core/svg/svg_point.idl | 2 +- - .../blink/renderer/core/svg/svg_rect.idl | 2 +- - .../renderer/core/svg/svg_rect_element.idl | 2 +- - .../renderer/core/svg/svg_style_element.idl | 2 +- - .../renderer/core/svg/svg_svg_element.idl | 2 +- - .../blink/renderer/core/svg/svg_tests.idl | 2 +- - .../renderer/core/svg/svg_transform_list.idl | 2 +- - .../renderer/core/svg/svg_uri_reference.idl | 2 +- - .../renderer/core/svg/svg_zoom_and_pan.idl | 2 +- .../renderer/core/testing/data/hit_test.html | 2 +- - .../renderer/core/timing/memory_info.idl | 2 +- - .../renderer/core/timing/performance.idl | 2 +- - .../renderer/core/xml/xpath_expression.idl | 2 +- - .../renderer/core/xml/xpath_ns_resolver.idl | 2 +- - .../renderer/core/xml/xslt_processor.idl | 2 +- .../core/xmlhttprequest/xml_http_request.cc | 2 +- .../modules/bluetooth/bluetooth_error.cc | 16 +- .../modules/clipboard/clipboard_promise.cc | 2 +- .../credentials_container.cc | 4 +- .../encryptedmedia/encrypted_media_utils.h | 2 +- - .../modules/gamepad/gamepad_axis_event.idl | 2 +- - .../gamepad/gamepad_axis_event_init.idl | 2 +- - .../modules/gamepad/gamepad_button_event.idl | 2 +- - .../gamepad/gamepad_button_event_init.idl | 2 +- - .../gamepad/gamepad_effect_parameters.idl | 2 +- .../modules/geolocation/geolocation.cc | 2 +- .../play_app_url_manifest.json | 2 +- - .../payments/android_pay_method_data.idl | 2 +- .../modules/payments/payment_request.cc | 6 +- .../modules/payments/skip_to_gpay_utils.cc | 6 +- - .../peerconnection/rtc_peer_connection.idl | 2 +- - .../renderer/modules/scheduler/scheduler.idl | 2 +- - .../scheduler/scheduler_post_task_options.idl | 2 +- - .../modules/scheduler/task_controller.idl | 2 +- - .../modules/scheduler/task_signal.idl | 2 +- - .../modules/scheduler/window_scheduler.idl | 2 +- - .../modules/vibration/navigator_vibration.idl | 2 +- .../modules/vibration/vibration_controller.cc | 4 +- .../modules/webaudio/audio_context.cc | 4 +- - .../modules/webcodecs/video_color_space.idl | 2 +- .../modules/webmidi/navigator_web_midi.cc | 2 +- .../blink/renderer/platform/PRESUBMIT.py | 2 +- .../platform/fonts/mac/font_cache_mac.mm | 4 +- @@ -1188,16 +1036,6 @@ Subject: Automated domain substitution .../tools/blinkpy/common/system/filesystem.py | 2 +- .../tools/blinkpy/common/system/profiler.py | 2 +- .../blink/tools/blinkpy/style/filter.py | 2 +- - .../third_party/wpt/wpt/tools/lint/rules.py | 4 +- - .../tools/third_party/pywebsocket3/setup.py | 4 +- - .../wpt/tools/webdriver/webdriver/client.py | 2 +- - .../third_party/wpt/wpt/tools/wpt/android.py | 2 +- - .../third_party/wpt/wpt/tools/wpt/browser.py | 28 +- - .../third_party/wpt/wpt/tools/wpt/run.py | 4 +- - .../wpt/wpt/tools/wptrunner/requirements.txt | 2 +- - .../wpt/wpt/tools/wptrunner/setup.py | 2 +- - .../wptrunner/executors/executormarionette.py | 14 +- - .../wptrunner/formatters/chromium.py | 2 +- .../blinkpy/tool/commands/flaky_tests.py | 6 +- .../tools/blinkpy/w3c/chromium_commit.py | 2 +- .../tools/blinkpy/w3c/chromium_commit_mock.py | 2 +- @@ -1209,7 +1047,7 @@ Subject: Automated domain substitution .../blink/tools/blinkpy/w3c/monorail.py | 2 +- .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- - .../blink/tools/blinkpy/w3c/test_importer.py | 12 +- + .../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 +- @@ -1299,7 +1137,7 @@ Subject: Automated domain substitution .../closure/goog/net/tmpnetwork.js | 2 +- .../closure/goog/soy/soy_testhelper.js | 4 +- .../closure/goog/testing/performancetable.css | 4 +- - .../closure/goog/transpile.js | 158 +-- + .../closure/goog/transpile.js | 158 +- .../closure/goog/ui/editor/linkdialog.js | 2 +- .../closure/goog/ui/editor/messages.js | 2 +- .../closure/goog/ui/hovercard_test.html | 6 +- @@ -1367,12 +1205,8 @@ Subject: Automated domain substitution .../src/be/hyph-be.lic.txt | 6 +- .../src/hu/hyph-hu.lic.txt | 4 +- .../src/hy/hyph-hy.lic.txt | 2 +- - third_party/iaccessible2/ia2_api_all.idl | 8 +- third_party/inspector_protocol/roll.py | 4 +- .../scripts/unpack_binaries.py | 2 +- - third_party/isimpledom/ISimpleDOMDocument.idl | 4 +- - third_party/isimpledom/ISimpleDOMNode.idl | 4 +- - third_party/isimpledom/ISimpleDOMText.idl | 2 +- third_party/jstemplate/compile.py | 2 +- .../jstemplate/jstemplate_example.html | 2 +- third_party/jstemplate/jstemplate_jsunit.html | 10 +- @@ -1444,7 +1278,7 @@ Subject: Automated domain substitution .../src/google/protobuf/util/json_util.cc | 2 +- third_party/protobuf/update_version.py | 4 +- .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- - .../src/benchmarks/chromium.linux.json | 152 +-- + .../src/benchmarks/chromium.linux.json | 152 +- third_party/pyjson5/src/setup.py | 2 +- .../tcmalloc/chromium/src/config_linux.h | 2 +- .../tcmalloc/chromium/src/debugallocation.cc | 2 +- @@ -1456,6 +1290,18 @@ Subject: Automated domain substitution .../vendor/src/windows/addr2line-pdb.c | 2 +- .../tcmalloc/vendor/src/windows/config.h | 2 +- .../tcmalloc/vendor/src/windows/nm-pdb.c | 2 +- + .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- + .../metrics/text_similarity_metric_ops.py | 2 +- + third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- + .../tools/third_party/pywebsocket3/setup.py | 4 +- + .../wpt/tools/webdriver/webdriver/client.py | 2 +- + .../wpt_tools/wpt/tools/wpt/android.py | 2 +- + .../wpt_tools/wpt/tools/wpt/browser.py | 28 +- + third_party/wpt_tools/wpt/tools/wpt/run.py | 4 +- + .../wpt/tools/wptrunner/requirements.txt | 2 +- + .../wpt_tools/wpt/tools/wptrunner/setup.py | 2 +- + .../wptrunner/executors/executormarionette.py | 14 +- + .../wptrunner/formatters/chromium.py | 2 +- tools/accessibility/nvda/README.txt | 2 +- tools/android/checkxmlstyle/PRESUBMIT.py | 2 +- tools/android/checkxmlstyle/checkxmlstyle.py | 6 +- @@ -1468,6 +1314,7 @@ Subject: Automated domain substitution .../dependency_analysis/js/src/load_graph.js | 2 +- .../js/src/package_view.html | 2 +- .../dependency_analysis/upload_html_viewer.py | 2 +- + .../convenience/touch_resources.py | 2 +- tools/android/native_lib_memory/PRESUBMIT.py | 2 +- tools/android/sdk_updater/update_sdk.py | 2 +- tools/binary_size/PRESUBMIT.py | 2 +- @@ -1505,7 +1352,7 @@ Subject: Automated domain substitution .../cygprofile/orderfile_generator_backend.py | 4 +- tools/download_optimization_profile.py | 2 +- .../dromaeo_benchmark_runner.py | 10 +- - tools/emacs/trybot-mac.txt | 232 ++-- + tools/emacs/trybot-mac.txt | 232 +- tools/find_runtime_symbols/PRESUBMIT.py | 2 +- tools/flags/list_flags.py | 4 +- tools/generate_stubs/generate_stubs.py | 2 +- @@ -1514,7 +1361,6 @@ Subject: Automated domain substitution tools/gn/roll_gn.py | 6 +- tools/grit/PRESUBMIT.py | 2 +- tools/grit/grit/format/rc.py | 2 +- - tools/grit/grit/pseudo_rtl.py | 2 +- tools/grit/grit/tool/android2grd.py | 4 +- tools/grit/grit/tool/resize.py | 2 +- tools/grit/pak_util.py | 2 +- @@ -1549,9 +1395,8 @@ Subject: Automated domain substitution ...ram_configuration_model_test_histograms.py | 68 +- tools/metrics/histograms/split_xml.py | 4 +- tools/metrics/md2xml.py | 4 +- - tools/metrics/rappor/PRESUBMIT.py | 2 +- tools/metrics/structured/PRESUBMIT.py | 2 +- - tools/metrics/structured/validate_format.py | 2 +- + tools/metrics/structured/model.py | 6 +- tools/metrics/ukm/PRESUBMIT.py | 2 +- tools/metrics/ukm/xml_validations.py | 4 +- tools/nocompile_driver.py | 2 +- @@ -1605,7 +1450,6 @@ Subject: Automated domain substitution ui/file_manager/audio_player/manifest.json | 2 +- ui/file_manager/base/js/mock_chrome.js | 4 +- ui/file_manager/base/tools/PRESUBMIT.py | 2 +- - .../js/volume_manager_unittest.m.js | 28 +- .../cws_widget/cws_widget_container.js | 4 +- .../foreground/elements/icons.html | 2 +- .../foreground/js/web_store_utils.js | 4 +- @@ -1614,8 +1458,6 @@ Subject: Automated domain substitution ui/file_manager/image_loader/piex/Makefile | 2 +- ui/file_manager/video_player/manifest.json | 2 +- ui/gl/gl_image_io_surface_egl.mm | 2 +- - .../chromeos_user_pod_template.html | 2 +- - .../account_picker/user_pod_template.html | 2 +- ui/ozone/ozone.gni | 2 +- ui/resources/PRESUBMIT.py | 4 +- ui/resources/resource_check/ico_files.py | 4 +- @@ -1631,7 +1473,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 +- - 1628 files changed, 4297 insertions(+), 4297 deletions(-) + 1470 files changed, 4508 insertions(+), 4508 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1717,7 +1559,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -547,7 +547,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -556,7 +556,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1726,7 +1568,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1202,7 +1202,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1215,7 +1215,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1735,7 +1577,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1355,7 +1355,7 @@ _KNOWN_ROBOTS = set( +@@ -1368,7 +1368,7 @@ _KNOWN_ROBOTS = set( 'wpt-autoroller', 'chrome-weblayer-builder') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1744,7 +1586,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('chromium-internal-autoroll',)) -@@ -1711,7 +1711,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1724,7 +1724,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' @@ -1753,7 +1595,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1922,7 +1922,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1935,7 +1935,7 @@ def CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1762,7 +1604,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -2107,7 +2107,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -2120,7 +2120,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1771,7 +1613,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2216,7 +2216,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2229,7 +2229,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' @@ -1780,7 +1622,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2967,7 +2967,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2992,7 +2992,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. @@ -1789,7 +1631,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. -@@ -3265,7 +3265,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3292,7 +3292,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' @@ -1798,7 +1640,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3399,7 +3399,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3426,7 +3426,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1807,7 +1649,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3430,7 +3430,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3457,7 +3457,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' @@ -1816,7 +1658,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3454,7 +3454,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3481,7 +3481,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.' @@ -1825,7 +1667,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3474,7 +3474,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3501,7 +3501,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' @@ -1834,7 +1676,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4009,7 +4009,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -4036,7 +4036,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' @@ -1843,7 +1685,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from'))] return [] -@@ -4212,7 +4212,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4240,7 +4240,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 ' @@ -1852,7 +1694,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4247,7 +4247,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4275,7 +4275,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 ' @@ -1861,7 +1703,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 -@@ -4531,7 +4531,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4559,7 +4559,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1870,7 +1712,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) -@@ -4775,7 +4775,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4803,7 +4803,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1879,7 +1721,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5107,7 +5107,7 @@ def CheckStrings(input_api, output_api): +@@ -5135,7 +5135,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 ' @@ -2005,7 +1847,7 @@ diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/reco """ from __future__ import print_function -@@ -60,7 +60,7 @@ Configures WebView to start recording a netlog. This script chooses a suitable +@@ -61,7 +61,7 @@ Configures WebView to start recording a netlog. This script chooses a suitable netlog filename for the application, and will pull the netlog off the device when the user terminates the script (with ctrl-C). For a more complete usage guide, open your web browser to: @@ -2014,6 +1856,15 @@ diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/reco """) parser.add_argument( '--package', +@@ -90,7 +90,7 @@ https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/net-d + raise device_errors.MultipleDevicesError(devices) + + if device.build_type == 'user': +- device_setup_url = ('https://chromium.googlesource.com/chromium/src/+/HEAD/' ++ device_setup_url = ('https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/' + 'android_webview/docs/device-setup.md') + raise RuntimeError('It appears your device is a "user" build. We only ' + 'support capturing netlog on userdebug/eng builds. See ' diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webview/tools/remove_preinstalled_webview.py --- a/android_webview/tools/remove_preinstalled_webview.py +++ b/android_webview/tools/remove_preinstalled_webview.py @@ -2062,7 +1913,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 -@@ -620,7 +620,7 @@ This file contains the strings for ash. +@@ -651,7 +651,7 @@ This file contains the strings for ash. @@ -2071,7 +1922,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -994,7 +994,7 @@ This file contains the strings for ash. +@@ -1028,7 +1028,7 @@ This file contains the strings for ash. Supervised user @@ -2080,7 +1931,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1212,7 +1212,7 @@ This file contains the strings for ash. +@@ -1249,7 +1249,7 @@ This file contains the strings for ash. Tap to configure @@ -2089,7 +1940,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -2688,7 +2688,7 @@ This file contains the strings for ash. +@@ -2743,7 +2743,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2098,7 +1949,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3014,7 +3014,7 @@ Here are some things you can try to get started. +@@ -3069,7 +3069,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2160,18 +2011,6 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link if (!IsWebDeepLinkType(type, params)) return base::nullopt; -diff --git a/ash/login/ui/login_user_menu_view.cc b/ash/login/ui/login_user_menu_view.cc ---- a/ash/login/ui/login_user_menu_view.cc -+++ b/ash/login/ui/login_user_menu_view.cc -@@ -23,7 +23,7 @@ - namespace ash { - namespace { - constexpr char kLegacySupervisedUserManagementDisplayURL[] = -- "www.chrome.com/manage"; -+ "www.ch40me.qjz9zk/manage"; - - // Vertical margin between username and mail. - constexpr int kUserMenuVerticalMarginUsernameMailDp = 8; diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answers/quick_answers_controller_impl.cc --- a/ash/quick_answers/quick_answers_controller_impl.cc +++ b/ash/quick_answers/quick_answers_controller_impl.cc @@ -2199,6 +2038,18 @@ diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py for the rules we're checking against here. """ +diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc +--- a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc ++++ b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc +@@ -29,7 +29,7 @@ namespace ash { + namespace { + const char kNotifierPciePeripheral[] = "ash.pcie_peripheral"; + const char kLearnMoreHelpUrl[] = +- "https://www.support.google.com/chromebook?p=connect_thblt_usb4_accy"; ++ "https://www.support.9oo91e.qjz9zk/chromebook?p=connect_thblt_usb4_accy"; + const int kNotificationsClicksThreshold = 3; + + const char kPciePeripheralLimitedPerformanceNotificationId[] = diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py --- a/base/PRESUBMIT.py +++ b/base/PRESUBMIT.py @@ -2340,9 +2191,9 @@ diff --git a/build/android/gyp/assert_static_initializers.py b/build/android/gyp diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py -@@ -22,7 +22,7 @@ from xml.etree import ElementTree - from util import build_utils +@@ -23,7 +23,7 @@ from util import build_utils from util import manifest_utils + from util import server_utils -_LINT_MD_URL = 'https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint.md' # pylint: disable=line-too-long +_LINT_MD_URL = 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/build/android/docs/lint.md' # pylint: disable=line-too-long @@ -2352,7 +2203,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -327,7 +327,7 @@ def _OptimizeWithR8(options, +@@ -375,7 +375,7 @@ def _OptimizeWithR8(options, fail_on_output=options.warnings_as_errors) except build_utils.CalledProcessError as err: debugging_link = ('\n\nR8 failed. Please see {}.'.format( @@ -2361,6 +2212,15 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py 'android/docs/java_optimization.md#Debugging-common-failures\n')) raise build_utils.CalledProcessError(err.cwd, err.args, err.output + debugging_link) +@@ -527,7 +527,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. + """ + 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 @@ -2401,6 +2261,18 @@ diff --git a/build/android/incremental_install/installer.py b/build/android/incr To enable access: adb -s {0} shell settings put global {1} 0 +diff --git a/build/android/pylib/base/result_sink.py b/build/android/pylib/base/result_sink.py +--- a/build/android/pylib/base/result_sink.py ++++ b/build/android/pylib/base/result_sink.py +@@ -110,7 +110,7 @@ class ResultSinkClient(object): + 'name': test_id, + 'location': { + 'file_name': test_file, +- 'repo': 'https://chromium.googlesource.com/chromium/src', ++ 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', + } + } + diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py --- a/build/android/pylib/constants/__init__.py +++ b/build/android/pylib/constants/__init__.py @@ -2590,7 +2462,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 -@@ -991,7 +991,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1031,7 +1031,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, @@ -2650,7 +2522,7 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py --- a/build/chromeos/test_runner.py +++ b/build/chromeos/test_runner.py -@@ -876,7 +876,7 @@ def main(): +@@ -912,7 +912,7 @@ def main(): tast_test_parser = subparsers.add_parser( 'tast', help='Runs a device-side set of Tast tests. For more details, see: ' @@ -2662,7 +2534,7 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1717,7 +1717,7 @@ if (enable_java_templates) { +@@ -1705,7 +1705,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -2687,7 +2559,16 @@ diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni 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 -@@ -234,7 +234,7 @@ template("tast_test") { +@@ -118,7 +118,7 @@ if (is_chromeos_device && cros_sdk_version != "") { + # overriding the board to test the built binary. + # 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 ++# https://chromium.9oo91esource.qjz9zk/chromiumos/platform/tast/+/HEAD/docs/writing_tests.md#Runtime-variables + template("generate_runner_script") { + forward_variables_from(invoker, + [ +@@ -339,7 +339,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: @@ -2696,16 +2577,25 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni tast_attr_expr = "\"group:mainline\" && \"dep:chrome\"" if (defined(enable_tast_informational_tests) && +@@ -403,7 +403,7 @@ template("lacros_tast_test") { + # 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 + tast_vars = [ "lacrosDeployedBinary=/usr/local/lacros-chrome" ] + data_deps = [ + "//chrome", # Builds the browser. diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni @@ -105,7 +105,7 @@ declare_args() { - # and hardware supports the feature and it's enabled by OS then additional - # additional validation of return address will be performed as mitigation - # against Return-oriented programming (ROP). + # 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 - enable_cet_shadow_stack = false + enable_cet_shadow_stack = target_cpu == "x64" } @@ -215,7 +215,7 @@ declare_args() { @@ -2729,6 +2619,18 @@ diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni # resolved. if (current_cpu == "pnacl") { objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump") +diff --git a/build/config/ozone.gni b/build/config/ozone.gni +--- a/build/config/ozone.gni ++++ b/build/config/ozone.gni +@@ -22,7 +22,7 @@ declare_args() { + # Enable explicit apitrace (https://apitrace.github.io) loading. + # This requires apitrace library with additional bindings. + # See ChromeOS package for details: +- # https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2659419 ++ # https://chromium-review.9oo91esource.qjz9zk/c/chromiumos/overlays/chromiumos-overlay/+/2659419 + # Chrome will not start without an apitrace.so library. + # Trace will be saved to /tmp/gltrace.dat file by default. You can + # override it at run time with TRACE_FILE= environment variable. diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni --- a/build/config/sanitizers/sanitizers.gni +++ b/build/config/sanitizers/sanitizers.gni @@ -2756,7 +2658,7 @@ diff --git a/build/config/win/control_flow_guard.gni b/build/config/win/control_ diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py --- a/build/fuchsia/binary_sizes.py +++ b/build/fuchsia/binary_sizes.py -@@ -90,7 +90,7 @@ def CreateTestResults(test_status, timestamp): +@@ -95,7 +95,7 @@ def CreateTestResults(test_status, timestamp): """Create test results data to write to JSON test results file. The JSON data format is defined in @@ -3094,7 +2996,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 -@@ -323,7 +323,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> +@@ -329,7 +329,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. @@ -3103,7 +3005,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. -@@ -570,7 +570,7 @@ Chromium is unable to recover your settings. +@@ -576,7 +576,7 @@ Chromium is unable to recover your settings. @@ -3112,7 +3014,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -680,10 +680,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! @@ -3125,7 +3027,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. -@@ -728,7 +728,7 @@ Chromium is unable to recover your settings. +@@ -734,7 +734,7 @@ Chromium is unable to recover your settings. @@ -3134,21 +3036,25 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -1112,7 +1112,7 @@ Chromium is unable to recover your settings. - - - -- You can manage this and other Google Accounts you've added for $1John from one place in <a id="osSettingsLink" href="$2https://google.com/">Settings</a>. -+ You can manage this and other Google Accounts you've added for $1John from one place in <a id="osSettingsLink" href="$2https://9oo91e.qjz9zk/">Settings</a>. - Permissions you have granted to websites in the Chromium browser and apps from Google Play may apply to all accounts. +@@ -759,10 +759,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. + + +- $1Elisa is already signed in to this Chromium profile. This will create a new Chromium profile for $2foo@gmail.com ++ $1Elisa is already signed in to this Chromium profile. This will create a new Chromium profile for $2foo@9ma1l.qjz9zk + + +- This will create a new Chromium profile for $1foo@gmail.com ++ This will create a new Chromium profile for $1foo@9ma1l.qjz9zk + 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 -@@ -368,16 +368,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -389,16 +389,16 @@ are declared in tools/grit/grit_rule.gni. + - - $1google.com wants to + $19oo91e.qjz9zk wants to @@ -3167,7 +3073,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -559,7 +559,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -580,7 +580,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3176,8 +3082,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -706,7 +706,7 @@ are declared in tools/grit/grit_rule.gni. - &Search $1Google for image +@@ -730,7 +730,7 @@ are declared in tools/grit/grit_rule.gni. + Search image with Google Lens - &Go to $1http://www.google.com/ @@ -3185,7 +3091,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -781,7 +781,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -805,7 +805,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3194,8 +3100,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -940,7 +940,7 @@ are declared in tools/grit/grit_rule.gni. - &Search $1Google for Image +@@ -967,7 +967,7 @@ are declared in tools/grit/grit_rule.gni. + Search Image with Google Lens - &Go to $1http://www.google.com/ @@ -3203,7 +3109,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1156,7 +1156,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1183,7 +1183,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3212,7 +3118,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Move window to desk -@@ -1275,7 +1275,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1302,7 +1302,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3221,7 +3127,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2617,10 +2617,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2647,10 +2647,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3234,7 +3140,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2629,7 +2629,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2659,7 +2659,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3243,7 +3149,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2641,28 +2641,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2671,28 +2671,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3279,7 +3185,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2683,19 +2683,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2713,19 +2713,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3304,7 +3210,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2707,7 +2707,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2737,7 +2737,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3313,7 +3219,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2716,7 +2716,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2746,7 +2746,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3322,7 +3228,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -2819,7 +2819,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2858,7 +2858,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3331,7 +3237,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3349,13 +3349,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3388,13 +3388,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3348,7 +3254,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3560,10 +3560,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3599,10 +3599,10 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3361,7 +3267,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3572,7 +3572,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3611,7 +3611,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3370,7 +3276,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3608,16 +3608,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3647,16 +3647,16 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -3391,7 +3297,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -3818,13 +3818,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3857,13 +3857,13 @@ are declared in tools/grit/grit_rule.gni. These items may be dangerous @@ -3407,7 +3313,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The app "$1Gmail" was automatically removed. -@@ -3836,10 +3836,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3875,10 +3875,10 @@ are declared in tools/grit/grit_rule.gni. @@ -3420,7 +3326,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -3978,22 +3978,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4017,22 +4017,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3449,7 +3355,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4002,10 +4002,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4041,10 +4041,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3462,7 +3368,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4357,7 +4357,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4393,7 +4393,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3471,7 +3377,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4410,7 +4410,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4446,7 +4446,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3480,7 +3386,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -4695,7 +4695,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4731,7 +4731,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3489,7 +3395,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -4938,10 +4938,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4974,10 +4974,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3502,7 +3408,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 -@@ -5315,7 +5315,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5314,7 +5314,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3511,7 +3417,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5326,7 +5326,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5325,7 +5325,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3520,7 +3426,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5336,7 +5336,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5335,7 +5335,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3529,7 +3435,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5345,16 +5345,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5344,16 +5344,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3549,7 +3455,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -5670,10 +5670,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5716,10 +5716,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? @@ -3562,7 +3468,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -5879,7 +5879,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5916,7 +5916,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3571,7 +3477,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5968,7 +5968,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6005,7 +6005,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 @@ -3580,7 +3486,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6065,7 +6065,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6105,7 +6105,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. @@ -3589,7 +3495,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6102,7 +6102,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6142,7 +6142,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. @@ -3598,7 +3504,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6457,7 +6457,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6497,7 +6497,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -3607,7 +3513,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6467,7 +6467,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6507,7 +6507,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3616,7 +3522,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -6676,7 +6676,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6716,7 +6716,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -3625,7 +3531,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6978,31 +6978,31 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7018,31 +7018,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. @@ -3662,7 +3568,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Hide -@@ -7030,7 +7030,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7070,7 +7070,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3671,7 +3577,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7038,10 +7038,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7078,10 +7078,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -3684,7 +3590,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8066,7 +8066,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8106,7 +8106,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Work @@ -3693,7 +3599,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8075,10 +8075,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8115,10 +8115,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -3706,7 +3612,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8103,13 +8103,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8143,13 +8143,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -3722,7 +3628,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8158,7 +8158,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8198,7 +8198,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -3731,7 +3637,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -8169,8 +8169,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8209,8 +8209,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -3742,7 +3648,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8195,7 +8195,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8235,7 +8235,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Date Modified @@ -3751,7 +3657,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8334,7 +8334,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8374,7 +8374,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3760,7 +3666,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On - sync everything -@@ -8767,7 +8767,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8804,7 +8804,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3769,7 +3675,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9184,7 +9184,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9221,7 +9221,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3778,7 +3684,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -9224,7 +9224,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9261,7 +9261,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. @@ -3787,7 +3693,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 -@@ -9313,7 +9313,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9350,7 +9350,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3796,7 +3702,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9345,10 +9345,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9382,10 +9382,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3809,7 +3715,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9459,19 +9459,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9496,19 +9496,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -3832,7 +3738,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -9495,10 +9495,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9532,10 +9532,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3845,7 +3751,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -9535,7 +9535,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9572,7 +9572,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -3854,7 +3760,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -9562,7 +9562,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9599,7 +9599,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -3863,16 +3769,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9781,7 +9781,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. Choose what you'd like to share. +@@ -9818,7 +9818,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + $1Google Hangouts wants to share the contents of your screen. -- $1Google Hangouts wants to share the contents of your screen with $2https://google.com. Choose what you'd like to share. -+ $1Google Hangouts wants to share the contents of your screen with $2https://9oo91e.qjz9zk. Choose what you'd like to share. +- $1Google Hangouts wants to share the contents of your screen with $2https://google.com. ++ $1Google Hangouts wants to share the contents of your screen with $2https://9oo91e.qjz9zk. Share audio -@@ -9804,7 +9804,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9849,7 +9849,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Share this tab @@ -3881,7 +3787,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share audio -@@ -9838,7 +9838,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9883,7 +9883,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3890,7 +3796,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9910,8 +9910,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9955,8 +9955,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -3901,7 +3807,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10104,7 +10104,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10164,7 +10164,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3910,7 +3816,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -10145,7 +10145,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10205,7 +10205,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3919,7 +3825,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to pair -@@ -10188,7 +10188,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10251,7 +10251,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3928,7 +3834,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect -@@ -10228,7 +10228,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10291,7 +10291,7 @@ Please help our engineers fix this problem. Tell us what happened right before y No nearby devices found. @@ -3937,7 +3843,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -10260,7 +10260,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10323,7 +10323,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3946,7 +3852,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -10285,7 +10285,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10348,7 +10348,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3955,7 +3861,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -10307,7 +10307,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10370,7 +10370,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3964,7 +3870,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -10445,7 +10445,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10508,7 +10508,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3973,14 +3879,14 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -10620,13 +10620,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10683,13 +10683,13 @@ Please help our engineers fix this problem. Tell us what happened right before y - Use your security key with $1google.com + Use your security key with $19oo91e.qjz9zk - + Continue @@ -3989,7 +3895,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -10814,7 +10814,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10783,7 +10783,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 + + + Didn't get it? +@@ -10894,7 +10894,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3998,7 +3913,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -10827,7 +10827,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10910,7 +10910,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 @@ -4007,16 +3922,23 @@ 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. -@@ -10836,7 +10836,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10919,13 +10919,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? - accounts.google.com$1 wants to see the make and model of your security key + accounts.9oo91e.qjz9zk$1 wants to see the make and model of your security key + + + Allow this site to identify your security key? + + +- accounts.google.com$1 issued your security key and wants to learn its ID number. The site will know exactly which security key you're using. ++ accounts.9oo91e.qjz9zk$1 issued your security key and wants to learn its ID number. The site will know exactly which security key you're using. Allow -@@ -11023,7 +11023,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11119,7 +11119,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4025,28 +3947,10 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11112,7 +11112,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - -- https://support.google.com/chrome/?p=mac_ARM -+ https://support.9oo91e.qjz9zk/chrome/?p=mac_ARM - - -- https://support.google.com/chrome/?p=mac_ARM -+ https://support.9oo91e.qjz9zk/chrome/?p=mac_ARM - - - 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 -@@ -329,7 +329,7 @@ chromium_strings.grd. --> +@@ -335,7 +335,7 @@ chromium_strings.grd. --> To send a number from here to your Android phone, sign in to Chrome on both devices. @@ -4055,7 +3959,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. -@@ -577,7 +577,7 @@ Google Chrome is unable to recover your settings. +@@ -583,7 +583,7 @@ Google Chrome is unable to recover your settings. @@ -4064,7 +3968,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -687,10 +687,10 @@ Google Chrome is unable to recover your settings. +@@ -693,10 +693,10 @@ Google Chrome is unable to recover your settings. You're signed in to Chrome! @@ -4077,7 +3981,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. -@@ -735,7 +735,7 @@ Google Chrome is unable to recover your settings. +@@ -741,7 +741,7 @@ Google Chrome is unable to recover your settings. @@ -4086,19 +3990,23 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -1126,7 +1126,7 @@ Google Chrome is unable to recover your settings. - - - -- You can manage this and other Google Accounts you've added for $1John from one place in <a id="osSettingsLink" href="$2https://google.com/">Settings</a>. -+ You can manage this and other Google Accounts you've added for $1John from one place in <a id="osSettingsLink" href="$2https://9oo91e.qjz9zk/">Settings</a>. - Permissions you have granted to websites in the Chrome browser and apps from Google Play may apply to all accounts. +@@ -766,10 +766,10 @@ Google Chrome is unable to recover your settings. + $1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you. + + +- $1Elisa is already signed in to this Chrome profile. This will create a new Chrome profile for $2foo@gmail.com ++ $1Elisa is already signed in to this Chrome profile. This will create a new Chrome profile for $2foo@9ma1l.qjz9zk + + +- This will create a new Chrome profile for $1foo@gmail.com ++ This will create a new Chrome profile for $1foo@9ma1l.qjz9zk + diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd -@@ -165,12 +165,12 @@ +@@ -173,12 +173,12 @@ @@ -4113,7 +4021,7 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc -@@ -180,18 +180,18 @@ +@@ -188,18 +188,18 @@ @@ -4153,7 +4061,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -316,14 +316,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -317,14 +317,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -4172,7 +4080,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3510,7 +3510,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3607,7 +3607,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -4181,7 +4089,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, -@@ -3756,7 +3756,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3853,7 +3853,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4241,7 +4149,7 @@ diff --git a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc b/c diff --git a/chrome/browser/apps/platform_apps/install_chrome_app.cc b/chrome/browser/apps/platform_apps/install_chrome_app.cc --- a/chrome/browser/apps/platform_apps/install_chrome_app.cc +++ b/chrome/browser/apps/platform_apps/install_chrome_app.cc -@@ -25,7 +25,7 @@ namespace { +@@ -24,7 +24,7 @@ namespace { // The URL to the webstore page for a specific app. const char kWebstoreUrlFormat[] = @@ -4250,6 +4158,68 @@ diff --git a/chrome/browser/apps/platform_apps/install_chrome_app.cc b/chrome/br // Error given when the extension is not an app. const char kInstallChromeAppErrorNotAnApp[] = +diff --git a/chrome/browser/ash/app_mode/fake_cws.cc b/chrome/browser/ash/app_mode/fake_cws.cc +--- a/chrome/browser/ash/app_mode/fake_cws.cc ++++ b/chrome/browser/ash/app_mode/fake_cws.cc +@@ -55,7 +55,7 @@ const char kPrivateStoreAppHasUpdateTemplate[] = + + const char kUpdateContentTemplate[] = + "" +- "" + "" + "$APPS" +diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc +--- a/chrome/browser/ash/assistant/assistant_util.cc ++++ b/chrome/browser/ash/assistant/assistant_util.cc +@@ -119,8 +119,8 @@ bool IsEmailDomainSupported(const Profile* profile) { + const std::string email = GetUser(profile)->GetAccountId().GetUserEmail(); + DCHECK(!email.empty()); + +- return (gaia::ExtractDomainName(email) == "gmail.com" || +- gaia::ExtractDomainName(email) == "googlemail.com" || ++ return (gaia::ExtractDomainName(email) == "9ma1l.qjz9zk" || ++ gaia::ExtractDomainName(email) == "9oo91email.qjz9zk" || + gaia::IsGoogleInternalAccountEmail(email)); + } + +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"; + const char kKeySerializedBeaconSeeds[] = "serializedBeaconSeeds"; + const char kKeyUnlockKey[] = "unlockKey"; + const char kKeyLabelPrefix[] = "easy-unlock-"; +-const char kPermitPermitIdFormat[] = "permit://google.com/easyunlock/v1/%s"; ++const char kPermitPermitIdFormat[] = "permit://9oo91e.qjz9zk/easyunlock/v1/%s"; + const char kPermitTypeLicence[] = "licence"; + + } // namespace key_names +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[] = + "Accept=text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"; + + const char kPasswordSyncTokenBaseEndPoint[] = +- "https://chromedevicetoken.googleapis.com/v1/tokens"; ++ "https://chromedevicetoken.9oo91eapis.qjz9zk/v1/tokens"; + + const char kPasswordSyncTokenCreateEndPoint[] = ""; + +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 { + namespace { + + constexpr const char kGetAppListUrl[] = +- "https://android.clients.google.com/fdfe/chrome/getfastreinstallappslist"; ++ "https://android.clients.9oo91e.qjz9zk/fdfe/chrome/getfastreinstallappslist"; + + constexpr int kResponseErrorNotEnoughApps = 5; + diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc --- a/chrome/browser/autofill/autofill_gstatic_reader.cc +++ b/chrome/browser/autofill/autofill_gstatic_reader.cc @@ -4268,7 +4238,7 @@ diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser diff --git a/chrome/browser/autofill/captured_sites_test_utils.cc b/chrome/browser/autofill/captured_sites_test_utils.cc --- a/chrome/browser/autofill/captured_sites_test_utils.cc +++ b/chrome/browser/autofill/captured_sites_test_utils.cc -@@ -373,7 +373,7 @@ void TestRecipeReplayer::SetUpCommandLine(base::CommandLine* command_line) { +@@ -555,7 +555,7 @@ void TestRecipeReplayer::SetUpCommandLine(base::CommandLine* command_line) { "MAP *:80 127.0.0.1:%d," "MAP *:443 127.0.0.1:%d," // Set to always exclude, allows cache_replayer overwrite @@ -4292,7 +4262,7 @@ diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrom 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 -@@ -219,23 +219,23 @@ void CartService::AddCartsWithFakeData() { +@@ -206,23 +206,23 @@ void CartService::AddCartsWithFakeData() { // Polulate and add some carts with fake data. double time_now = base::Time::Now().ToDoubleT(); cart_db::ChromeCartContentProto dummy_proto1; @@ -4323,7 +4293,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm -@@ -143,7 +143,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { +@@ -153,7 +153,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { //////////////////////////////////////////////////////////////////////////////// // HISTORICAL COMMENT (by viettrungluu, from @@ -4373,18 +4343,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/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc ---- a/chrome/browser/chromeos/app_mode/fake_cws.cc -+++ b/chrome/browser/chromeos/app_mode/fake_cws.cc -@@ -55,7 +55,7 @@ const char kPrivateStoreAppHasUpdateTemplate[] = - - const char kUpdateContentTemplate[] = - "" -- "" - "" - "$APPS" diff --git a/chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.cc b/chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.cc --- a/chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.cc +++ b/chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.cc @@ -4409,24 +4367,10 @@ diff --git a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher.cc b/c policy::DeviceManagementService* GetDeviceManagementService() { policy::BrowserPolicyConnectorChromeOS* const connector = -diff --git a/chrome/browser/chromeos/assistant/assistant_util.cc b/chrome/browser/chromeos/assistant/assistant_util.cc ---- a/chrome/browser/chromeos/assistant/assistant_util.cc -+++ b/chrome/browser/chromeos/assistant/assistant_util.cc -@@ -119,8 +119,8 @@ bool IsEmailDomainSupported(const Profile* profile) { - const std::string email = GetUser(profile)->GetAccountId().GetUserEmail(); - DCHECK(!email.empty()); - -- return (gaia::ExtractDomainName(email) == "gmail.com" || -- gaia::ExtractDomainName(email) == "googlemail.com" || -+ return (gaia::ExtractDomainName(email) == "9ma1l.qjz9zk" || -+ gaia::ExtractDomainName(email) == "9oo91email.qjz9zk" || - gaia::IsGoogleInternalAccountEmail(email)); - } - diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client.cc b/chrome/browser/chromeos/attestation/attestation_ca_client.cc --- a/chrome/browser/chromeos/attestation/attestation_ca_client.cc +++ b/chrome/browser/chromeos/attestation/attestation_ca_client.cc -@@ -24,15 +24,15 @@ const char kAttestationServerTest[] = "test"; +@@ -31,15 +31,15 @@ const char kAttestationServerTest[] = "test"; // Endpoints for the default Google Privacy CA operations. const char kDefaultEnrollRequestURL[] = @@ -4509,7 +4453,7 @@ diff --git a/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_e 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 -@@ -65,7 +65,7 @@ const char kCrostiniDefaultUsername[] = "emperor"; +@@ -64,7 +64,7 @@ const char kCrostiniDefaultUsername[] = "emperor"; // Generated using crx_file::id_util::GenerateId("LinuxAppsFolder") const char kCrostiniFolderId[] = "ddolnhmblagmcagkedkbfejapapdimlk"; const char kCrostiniDefaultImageServerUrl[] = @@ -4545,7 +4489,7 @@ diff --git a/chrome/browser/chromeos/drive/drivefs_test_support.cc b/chrome/brow 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 -@@ -860,7 +860,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGotDownloadUrl( +@@ -863,7 +863,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGotDownloadUrl( const CoreAccountId& account_id = identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kNotRequired); std::vector scopes; @@ -4557,7 +4501,7 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.c diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -82,7 +82,7 @@ namespace { +@@ -81,7 +81,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -4660,18 +4604,6 @@ diff --git a/chrome/browser/chromeos/input_method/assistive_suggester.cc b/chrom }; const char* kTestUrls[] = { -diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc ---- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc -+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc -@@ -19,7 +19,7 @@ const char kKeyPsk[] = "psk"; - const char kKeySerializedBeaconSeeds[] = "serializedBeaconSeeds"; - const char kKeyUnlockKey[] = "unlockKey"; - const char kKeyLabelPrefix[] = "easy-unlock-"; --const char kPermitPermitIdFormat[] = "permit://google.com/easyunlock/v1/%s"; -+const char kPermitPermitIdFormat[] = "permit://9oo91e.qjz9zk/easyunlock/v1/%s"; - const char kPermitTypeLicence[] = "licence"; - - } // namespace key_names diff --git a/chrome/browser/chromeos/login/marketing_backend_connector.cc b/chrome/browser/chromeos/login/marketing_backend_connector.cc --- a/chrome/browser/chromeos/login/marketing_backend_connector.cc +++ b/chrome/browser/chromeos/login/marketing_backend_connector.cc @@ -4688,42 +4620,6 @@ diff --git a/chrome/browser/chromeos/login/marketing_backend_connector.cc b/chro const char kChromebookEmailServicePath[] = "v2/chromebookEmailPreferences"; constexpr size_t kResponseMaxBodySize = 4 * 1024 * 1024; // 4MiB -diff --git a/chrome/browser/chromeos/login/saml/password_sync_token_fetcher.cc b/chrome/browser/chromeos/login/saml/password_sync_token_fetcher.cc ---- a/chrome/browser/chromeos/login/saml/password_sync_token_fetcher.cc -+++ b/chrome/browser/chromeos/login/saml/password_sync_token_fetcher.cc -@@ -71,7 +71,7 @@ const char kAcceptValue[] = - "Accept=text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"; - - const char kPasswordSyncTokenBaseEndPoint[] = -- "https://chromedevicetoken.googleapis.com/v1/tokens"; -+ "https://chromedevicetoken.9oo91eapis.qjz9zk/v1/tokens"; - - const char kPasswordSyncTokenCreateEndPoint[] = ""; - -diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc ---- a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc -+++ b/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc -@@ -38,7 +38,7 @@ namespace chromeos { - namespace { - - constexpr const char kGetAppListUrl[] = -- "https://android.clients.google.com/fdfe/chrome/getfastreinstallappslist"; -+ "https://android.clients.9oo91e.qjz9zk/fdfe/chrome/getfastreinstallappslist"; - - constexpr int kResponseErrorNotEnoughApps = 5; - -diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc ---- a/chrome/browser/chromeos/login/session/user_session_manager.cc -+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc -@@ -1215,7 +1215,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile, - - NavigateParams params( - profile, -- GURL("https://support.google.com/chromebook/?p=new_account"), -+ GURL("https://support.9oo91e.qjz9zk/chromebook/?p=new_account"), - ui::PAGE_TRANSITION_AUTO_TOPLEVEL); - params.disposition = WindowOpenDisposition::NEW_WINDOW; - Navigate(¶ms); diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc --- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc +++ b/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc @@ -4827,7 +4723,7 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_ diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_license_checker.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_license_checker.cc --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_license_checker.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_license_checker.cc -@@ -35,8 +35,8 @@ namespace plugin_vm { +@@ -33,8 +33,8 @@ namespace plugin_vm { namespace { constexpr char kValidationOAuth2Scope[] = @@ -4998,7 +4894,7 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome/browser/enterprise/connectors/connectors_service.cc --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -43,7 +43,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -44,7 +44,7 @@ const char kServiceProviderConfig[] = R"({ "version": { "1": { "analysis": { @@ -5007,7 +4903,7 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome "supported_tags": [ { "name": "malware", -@@ -96,7 +96,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -97,7 +97,7 @@ const char kServiceProviderConfig[] = R"({ ] }, "reporting": { @@ -5016,6 +4912,18 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome } } } +diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +--- a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc ++++ b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +@@ -38,7 +38,7 @@ namespace { + // 4/ This URI is used by other native apps for the same purpose. + // 5/ It is controlled by Google. + bool IsOAuth2RedirectURI(const GURL& url) { +- return url.host() == "google.com" && url.path() == "/generate_204"; ++ return url.host() == "9oo91e.qjz9zk" && url.path() == "/generate_204"; + } + + } // namespace diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc --- a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc +++ b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc @@ -5037,10 +4945,10 @@ diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_req gfx::Image icon(gfx::CreateVectorIcon( vector_icons::kBusinessIcon, message_center::kSmallImageSize, ui::NativeTheme::GetInstanceForWeb()->GetSystemColor( -diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor.cc ---- a/chrome/browser/error_reporting/chrome_js_error_report_processor.cc -+++ b/chrome/browser/error_reporting/chrome_js_error_report_processor.cc -@@ -40,9 +40,9 @@ +diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +--- a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc ++++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +@@ -25,9 +25,9 @@ namespace { @@ -5049,9 +4957,9 @@ diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor.cc constexpr char kCrashEndpointStagingUrl[] = - "https://clients2.google.com/cr/staging_report"; + "https://clients2.9oo91e.qjz9zk/cr/staging_report"; - constexpr char kNoBrowserNoWindow[] = "NO_BROWSER"; - constexpr char kRegularTabbedWindow[] = "REGULAR_TABBED"; - constexpr char kWebAppWindow[] = "WEB_APP"; + + } // namespace + diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc @@ -5191,7 +5099,7 @@ diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc diff --git a/chrome/browser/feedback/feedback_uploader_chrome.cc b/chrome/browser/feedback/feedback_uploader_chrome.cc --- a/chrome/browser/feedback/feedback_uploader_chrome.cc +++ b/chrome/browser/feedback/feedback_uploader_chrome.cc -@@ -35,7 +35,7 @@ constexpr char kAuthenticationErrorLogMessage[] = +@@ -37,7 +37,7 @@ constexpr char kAuthenticationErrorLogMessage[] = constexpr char kConsumer[] = "feedback_uploader_chrome"; @@ -5203,7 +5111,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 -@@ -488,7 +488,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = +@@ -539,7 +539,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = "Detect target embedding domains as lookalikes."; const char kDetectTargetEmbeddingLookalikesDescription[] = "Shows a lookalike interstitial when navigating to target embedding domains" @@ -5212,7 +5120,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeviceDiscoveryNotificationsName[] = "Device Discovery Notifications"; -@@ -2039,7 +2039,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2121,7 +2121,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 " @@ -5338,75 +5246,6 @@ diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/bro struct BadBinaryData { const char* data; -diff --git a/chrome/browser/installable/quality_enforcer.cc b/chrome/browser/installable/quality_enforcer.cc ---- a/chrome/browser/installable/quality_enforcer.cc -+++ b/chrome/browser/installable/quality_enforcer.cc -@@ -34,13 +34,13 @@ constexpr char kHttpErrorConsoleMessageFormat[] = - constexpr char kUnavailableOfflineConsoleMessageFormat[] = - "Page %s is not available offline. Please handle offline resource requests " - "using a ServiceWorker. See: " -- "https://developers.google.com/web/fundamentals/codelabs/offline"; -+ "https://developers.9oo91e.qjz9zk/web/fundamentals/codelabs/offline"; - - constexpr char kDigitalAssetLinkConsoleMessageFormat[] = - "Launch URL %s failed digital asset link verification. Please review the " - "Trusted Web Activity quick start guide for how to correctly implement " - "Digital Assetlinks: " -- "https://developers.google.com/web/android/trusted-web-activity/" -+ "https://developers.9oo91e.qjz9zk/web/android/trusted-web-activity/" - "quick-start"; - - } // namespace -diff --git a/chrome/browser/lacros/cert_db_initializer_impl.cc b/chrome/browser/lacros/cert_db_initializer_impl.cc ---- a/chrome/browser/lacros/cert_db_initializer_impl.cc -+++ b/chrome/browser/lacros/cert_db_initializer_impl.cc -@@ -33,26 +33,26 @@ namespace { - // everyone when the policy stack is ready (expected to happen before Feb 2021). - bool IsEnabledForEarlyAccess(Profile* profile) { - static base::NoDestructor> allowlist{ -- {"bartfab@google.com", "darin@google.com", -- "dhaddock@google.com", "edcourtney@google.com", -- "erikchen@google.com", "fangzhoug@google.com", -- "fukino@google.com", "gianluca@google.com", -- "heiserya@google.com", "hidehiko@google.com", -- "huangs@google.com", "huanr@google.com", -- "igorcov@google.com", "jamescook@google.com", -- "jennyz@google.com", "jorgelo@google.com", -- "ketakid@google.com", "lakpamarthy@google.com", -- "leolai@google.com", "liaoyuke@google.com", -- "maguschen@google.com", "marinakz@google.com", -- "miersh@google.com", "mkarkada@google.com", -- "okalitova@google.com", "oshima@google.com", -- "pmarko@google.com", "pucchakayala@google.com", -- "rbock@google.com", "rjkroege@google.com", -- "rogerta@google.com", "satorux@google.com", -- "sinhak@google.com", "songsuk@google.com", -- "srinivassista@google.com", "svenzheng@google.com", -- "willmcleod@google.com", "ythjkt@google.com", -- "yusukes@google.com"}}; -+ {"bartfab@9oo91e.qjz9zk", "darin@9oo91e.qjz9zk", -+ "dhaddock@9oo91e.qjz9zk", "edcourtney@9oo91e.qjz9zk", -+ "erikchen@9oo91e.qjz9zk", "fangzhoug@9oo91e.qjz9zk", -+ "fukino@9oo91e.qjz9zk", "gianluca@9oo91e.qjz9zk", -+ "heiserya@9oo91e.qjz9zk", "hidehiko@9oo91e.qjz9zk", -+ "huangs@9oo91e.qjz9zk", "huanr@9oo91e.qjz9zk", -+ "igorcov@9oo91e.qjz9zk", "jamescook@9oo91e.qjz9zk", -+ "jennyz@9oo91e.qjz9zk", "jorgelo@9oo91e.qjz9zk", -+ "ketakid@9oo91e.qjz9zk", "lakpamarthy@9oo91e.qjz9zk", -+ "leolai@9oo91e.qjz9zk", "liaoyuke@9oo91e.qjz9zk", -+ "maguschen@9oo91e.qjz9zk", "marinakz@9oo91e.qjz9zk", -+ "miersh@9oo91e.qjz9zk", "mkarkada@9oo91e.qjz9zk", -+ "okalitova@9oo91e.qjz9zk", "oshima@9oo91e.qjz9zk", -+ "pmarko@9oo91e.qjz9zk", "pucchakayala@9oo91e.qjz9zk", -+ "rbock@9oo91e.qjz9zk", "rjkroege@9oo91e.qjz9zk", -+ "rogerta@9oo91e.qjz9zk", "satorux@9oo91e.qjz9zk", -+ "sinhak@9oo91e.qjz9zk", "songsuk@9oo91e.qjz9zk", -+ "srinivassista@9oo91e.qjz9zk", "svenzheng@9oo91e.qjz9zk", -+ "willmcleod@9oo91e.qjz9zk", "ythjkt@9oo91e.qjz9zk", -+ "yusukes@9oo91e.qjz9zk"}}; - signin::IdentityManager* identity_manager = - IdentityManagerFactory::GetForProfile(profile); - return base::Contains(*allowlist, identity_manager 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 @@ -5445,7 +5284,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 -@@ -692,12 +692,12 @@ std::vector DialMediaRouteProvider::GetOrigins( +@@ -686,12 +686,12 @@ std::vector DialMediaRouteProvider::GetOrigins( base::flat_map>> origin_allowlist( {{"YouTube", @@ -5503,7 +5342,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser diff --git a/chrome/browser/metrics/testing/sync_metrics_test_utils.cc b/chrome/browser/metrics/testing/sync_metrics_test_utils.cc --- a/chrome/browser/metrics/testing/sync_metrics_test_utils.cc +++ b/chrome/browser/metrics/testing/sync_metrics_test_utils.cc -@@ -34,7 +34,7 @@ std::unique_ptr InitializeProfileForSync( +@@ -35,7 +35,7 @@ std::unique_ptr InitializeProfileForSync( username = info.email; #endif if (username.empty()) { @@ -5576,7 +5415,7 @@ diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_pro 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 -@@ -321,7 +321,7 @@ bool NotificationPlatformBridgeMac::SupportsAlerts() { +@@ -321,7 +321,7 @@ void NotificationPlatformBridgeMac::CloseAllNotificationsForProfile( // Overriden from _NSUserNotificationCenterDelegatePrivate. // Emitted when a user closes a notification from the notification center. // This is an undocumented method introduced in 10.8 according to @@ -5588,7 +5427,7 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/ diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc --- a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc -@@ -129,7 +129,7 @@ void RecordFeatureUsage(content::RenderFrameHost* rfh, +@@ -110,7 +110,7 @@ void RecordFeatureUsage(content::RenderFrameHost* rfh, std::string GetHeavyAdReportMessage(const ad_metrics::FrameTreeData& frame_data, bool will_unload_adframe) { const char kChromeStatusMessage[] = @@ -5645,18 +5484,6 @@ diff --git a/chrome/browser/password_manager/password_manager_signin_intercept_t constexpr char kGaiaId[] = "test_gaia_id"; } // namespace -diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc ---- a/chrome/browser/pepper_broker_infobar_delegate.cc -+++ b/chrome/browser/pepper_broker_infobar_delegate.cc -@@ -66,7 +66,7 @@ base::string16 PepperBrokerInfoBarDelegate::GetLinkText() const { - } - - GURL PepperBrokerInfoBarDelegate::GetLinkURL() const { -- return GURL("https://support.google.com/chrome/?p=ib_pepper_broker"); -+ return GURL("https://support.9oo91e.qjz9zk/chrome/?p=ib_pepper_broker"); - } - - base::string16 PepperBrokerInfoBarDelegate::GetMessageText() const { diff --git a/chrome/browser/performance_hints/performance_hints_features.cc b/chrome/browser/performance_hints/performance_hints_features.cc --- a/chrome/browser/performance_hints/performance_hints_features.cc +++ b/chrome/browser/performance_hints/performance_hints_features.cc @@ -5696,7 +5523,7 @@ diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/bro diff --git a/chrome/browser/policy/policy_test_utils.cc b/chrome/browser/policy/policy_test_utils.cc --- a/chrome/browser/policy/policy_test_utils.cc +++ b/chrome/browser/policy/policy_test_utils.cc -@@ -248,7 +248,7 @@ void PolicyTest::ClearEnableFlag(const keyboard::KeyboardEnableFlag& flag) { +@@ -251,7 +251,7 @@ void PolicyTest::ClearEnableFlag(const keyboard::KeyboardEnableFlag& flag) { // static GURL PolicyTest::GetExpectedSearchURL(bool expect_safe_search) { @@ -5732,7 +5559,7 @@ diff --git a/chrome/browser/prefetch/no_state_prefetch/tools/prerender_test_serv diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc --- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc +++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc -@@ -45,7 +45,7 @@ GURL PrefetchProxyProxyHost() { +@@ -46,7 +46,7 @@ GURL PrefetchProxyProxyHost() { if (url.is_valid() && url.SchemeIs(url::kHttpsScheme)) { return url; } @@ -5741,7 +5568,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } std::string PrefetchProxyProxyHeaderKey() { -@@ -157,7 +157,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() { +@@ -158,7 +158,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() { if (url.is_valid()) { return url; } @@ -5750,7 +5577,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } GURL PrefetchProxyDNSCanaryCheckURL() { -@@ -166,7 +166,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() { +@@ -167,7 +167,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() { if (url.is_valid()) { return url; } @@ -5759,10 +5586,22 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } base::TimeDelta PrefetchProxyCanaryCheckCacheLifetime() { +diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc +--- a/chrome/browser/profiles/profile_avatar_downloader.cc ++++ b/chrome/browser/profiles/profile_avatar_downloader.cc +@@ -19,7 +19,7 @@ + + namespace { + const char kHighResAvatarDownloadUrlPrefix[] = +- "https://www.gstatic.com/chrome/profile_avatars/"; ++ "https://www.95tat1c.qjz9zk/chrome/profile_avatars/"; + } + + ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -360,7 +360,7 @@ bool IsLockAvailable(Profile* profile) { +@@ -296,7 +296,7 @@ bool IsLockAvailable(Profile* profile) { // TODO(mlerman): Prohibit only users who authenticate using SAML. Until then, // prohibited users who use hosted domains (aside from google.com). @@ -5786,7 +5625,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc -@@ -90,7 +90,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -92,7 +92,7 @@ const char kSilentPushUnsupportedMessage[] = "Chrome currently only supports the Push API for subscriptions that will " "result in user-visible messages. You can indicate this by calling " "pushManager.subscribe({userVisibleOnly: true}) instead. See " @@ -5837,22 +5676,10 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br The template is used to generate a device-dependent about_os_credits.html when a CrOS image is built.

-diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/annotation/user_annotation_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/annotation/user_annotation_handler.js ---- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/annotation/user_annotation_handler.js -+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/annotation/user_annotation_handler.js -@@ -39,7 +39,7 @@ UserAnnotationHandler = class { - * @type {boolean} - */ - this.enabled = false; -- chrome.commandLinePrivate.hasSwitch( -+ ch40me.qjz9zkmandLinePrivate.hasSwitch( - 'enable-experimental-accessibility-chromevox-annotations', - (enabled) => { - this.enabled = enabled; diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js -@@ -203,7 +203,7 @@ CommandHandler.onCommand = function(command) { +@@ -202,7 +202,7 @@ CommandHandler.onCommand = function(command) { QueueMode.FLUSH); return false; case 'reportIssue': @@ -5861,7 +5688,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1487,13 +1487,13 @@ CommandHandler.init = function() { +@@ -1476,13 +1476,13 @@ CommandHandler.init = function() { } }); @@ -5877,28 +5704,6 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'enable-experimental-accessibility-language-detection-dynamic', (enabled) => { if (enabled) { -diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/i_tutorial.js b/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/i_tutorial.js ---- a/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/i_tutorial.js -+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/i_tutorial.js -@@ -848,15 +848,15 @@ Polymer({ - const resources = [ - { - msgId: 'next_command_reference', -- link: 'https://www.chromevox.com/next_keyboard_shortcuts.html' -+ link: 'https://www.ch40mevox.qjz9zk/next_keyboard_shortcuts.html' - }, - { - msgId: 'chrome_keyboard_shortcuts', -- link: 'https://support.google.com/chromebook/answer/183101?hl=en' -+ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/183101?hl=en' - }, - { - msgId: 'touchscreen_accessibility', -- link: 'https://support.google.com/chromebook/answer/6103702?hl=en' -+ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/6103702?hl=en' - }, - ]; - for (const resource of resources) { diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -5911,18 +5716,6 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/o body { margin: 0 0 20px 0; -diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/panel/panel.html b/chrome/browser/resources/chromeos/accessibility/chromevox/panel/panel.html ---- a/chrome/browser/resources/chromeos/accessibility/chromevox/panel/panel.html -+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/panel/panel.html -@@ -6,7 +6,7 @@ - - - -- -+ - - - diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py b/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py --- a/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py @@ -5981,6 +5774,28 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. ], "all_frames": true, "js": [ +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 +@@ -581,15 +581,15 @@ Polymer({ + const resources = [ + { + msgId: 'next_command_reference', +- link: 'https://www.chromevox.com/next_keyboard_shortcuts.html' ++ link: 'https://www.ch40mevox.qjz9zk/next_keyboard_shortcuts.html' + }, + { + msgId: 'chrome_keyboard_shortcuts', +- link: 'https://support.google.com/chromebook/answer/183101?hl=en' ++ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/183101?hl=en' + }, + { + msgId: 'touchscreen_accessibility', +- link: 'https://support.google.com/chromebook/answer/6103702?hl=en' ++ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/6103702?hl=en' + }, + ]; + for (const resource of resources) { diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css @@ -6053,7 +5868,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js --- a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +++ b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js -@@ -38,7 +38,7 @@ export class SwitchAccess { +@@ -37,7 +37,7 @@ export class SwitchAccess { */ this.enableImprovedTextInput_ = false; @@ -6190,15 +6005,36 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome var language = document.language; if (!language) { language = navigator.language; -diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js ---- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js -+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js -@@ -52,7 +52,7 @@ Polymer({ +diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js ++++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +@@ -73,7 +73,7 @@ Polymer({ * @private {string} */ urlTemplate_: -- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v2_omni_$.html', -+ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v2_omni_$.html', +- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', ++ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', + + /** + * Whether try to reload with the default url when a 404 error occurred. +@@ -246,7 +246,7 @@ Polymer({ + 'icon-src', + 'data:text/html;charset=utf-8,' + + encodeURIComponent(this.$.zippy.getWrappedIcon( +- 'https://www.gstatic.com/images/icons/material/system/2x/' + ++ 'https://www.95tat1c.qjz9zk/images/icons/material/system/2x/' + + 'info_outline_grey600_24dp.png', + this.i18n('assistantScreenContextTitle')))); + this.consentStringLoaded_ = true; +diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js ++++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +@@ -64,7 +64,7 @@ Polymer({ + * @private {string} + */ + urlTemplate_: +- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', ++ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', /** * Whether try to reload with the default url when a 404 error occurred. @@ -6547,16 +6383,16 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js --- a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js -@@ -178,7 +178,7 @@ Polymer({ +@@ -188,7 +188,7 @@ Polymer({ * The hostname of the url where the terms of service will be fetched. * Overwritten by tests to load terms of service from local test server. */ - termsOfServiceHostName_: 'https://play.google.com', + termsOfServiceHostName_: 'https://play.9oo91e.qjz9zk', - /** @override */ - ready() { -@@ -722,7 +722,7 @@ Polymer({ + + defaultUIStep() { +@@ -682,7 +682,7 @@ Polymer({ if (results && results.length == 1 && typeof results[0] == 'string') { self.showUrlOverlay(results[0]); } else { @@ -6568,19 +6404,19 @@ 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 -@@ -75,7 +75,7 @@ - -
+@@ -131,7 +131,7 @@ +
Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA --
www.google.com
-+
www.9oo91e.qjz9zk
+-
www.google.com
++
www.9oo91e.qjz9zk
+ , 'password': } If user did not type domain |email| will be added by @@ -6741,6 +6577,44 @@ diff --git a/chrome/browser/resources/feedback/js/feedback_util.js b/chrome/brow * @const */ -const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.google.com/terms'; ++const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.9oo91e.qjz9zk/terms'; + + /** + * Opens the supplied url in an app window. It uses the url as the window ID. +diff --git a/chrome/browser/resources/feedback_webui/js/feedback_util.js b/chrome/browser/resources/feedback_webui/js/feedback_util.js +--- a/chrome/browser/resources/feedback_webui/js/feedback_util.js ++++ b/chrome/browser/resources/feedback_webui/js/feedback_util.js +@@ -6,29 +6,29 @@ + * @const + */ + const FEEDBACK_LANDING_PAGE = +- 'https://support.google.com/chrome/go/feedback_confirmation'; ++ 'https://support.9oo91e.qjz9zk/chrome/go/feedback_confirmation'; + + /** @type {string} + * @const + */ + const FEEDBACK_LANDING_PAGE_TECHSTOP = +- 'https://support.google.com/pixelbook/answer/7659411'; ++ 'https://support.9oo91e.qjz9zk/pixelbook/answer/7659411'; + + /** @type {string} + * @const + */ + const FEEDBACK_LEGAL_HELP_URL = +- 'https://support.google.com/legal/answer/3110420'; ++ 'https://support.9oo91e.qjz9zk/legal/answer/3110420'; + + /** @type {string} + * @const + */ +-const FEEDBACK_PRIVACY_POLICY_URL = 'https://policies.google.com/privacy'; ++const FEEDBACK_PRIVACY_POLICY_URL = 'https://policies.9oo91e.qjz9zk/privacy'; + + /** @type {string} + * @const + */ +-const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.google.com/terms'; +const FEEDBACK_TERM_OF_SERVICE_URL = 'https://policies.9oo91e.qjz9zk/terms'; /** @@ -6748,7 +6622,7 @@ diff --git a/chrome/browser/resources/feedback/js/feedback_util.js b/chrome/brow 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 -@@ -664,7 +664,7 @@ cr.define('cr.login', function() { +@@ -671,7 +671,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -6757,7 +6631,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/b 'client_id=' + encodeURIComponent(data.clientId) + '&access_type=offline'); -@@ -999,7 +999,7 @@ cr.define('cr.login', function() { +@@ -1006,7 +1006,7 @@ cr.define('cr.login', function() { // TODO(https://crbug.com/837107): remove this once API is fully // stabilized. // @example.com is used in tests. @@ -6892,7 +6766,7 @@ diff --git a/chrome/browser/resources/internals/query_tiles/query_tiles_internal diff --git a/chrome/browser/resources/local_ntp/customize.js b/chrome/browser/resources/local_ntp/customize.js --- a/chrome/browser/resources/local_ntp/customize.js +++ b/chrome/browser/resources/local_ntp/customize.js -@@ -2327,7 +2327,7 @@ customize.colorsMenuOnThemeChange = function() { +@@ -2331,7 +2331,7 @@ customize.colorsMenuOnThemeChange = function() { $(customize.IDS.COLORS_THEME).classList.add(customize.CLASSES.VISIBLE); $(customize.IDS.COLORS_THEME_NAME).innerHTML = ntpTheme.themeName; $(customize.IDS.COLORS_THEME_WEBSTORE_LINK).href = @@ -6904,7 +6778,7 @@ diff --git a/chrome/browser/resources/local_ntp/customize.js b/chrome/browser/re diff --git a/chrome/browser/resources/local_ntp/doodles.js b/chrome/browser/resources/local_ntp/doodles.js --- a/chrome/browser/resources/local_ntp/doodles.js +++ b/chrome/browser/resources/local_ntp/doodles.js -@@ -116,7 +116,7 @@ doodles.resizeDoodleHandler = function(args) { +@@ -120,7 +120,7 @@ doodles.resizeDoodleHandler = function(args) { const transitionCallback = function() { iframe.removeEventListener('webkitTransitionEnd', transitionCallback); iframe.contentWindow.postMessage( @@ -6913,7 +6787,7 @@ diff --git a/chrome/browser/resources/local_ntp/doodles.js b/chrome/browser/reso }; iframe.addEventListener('webkitTransitionEnd', transitionCallback, false); -@@ -677,7 +677,7 @@ doodles.updateShareDialog = function() { +@@ -681,7 +681,7 @@ doodles.updateShareDialog = function() { const shortLink = doodles.targetDoodle.metadata.shortLink; facebookButton.onclick = function() { @@ -6925,7 +6799,7 @@ diff --git a/chrome/browser/resources/local_ntp/doodles.js b/chrome/browser/reso diff --git a/chrome/browser/resources/local_ntp/voice.js b/chrome/browser/resources/local_ntp/voice.js --- a/chrome/browser/resources/local_ntp/voice.js +++ b/chrome/browser/resources/local_ntp/voice.js -@@ -1020,7 +1020,7 @@ text.LISTENING_TIMEOUT_MS_ = 2000; +@@ -1024,7 +1024,7 @@ text.LISTENING_TIMEOUT_MS_ = 2000; * @const @private */ text.SUPPORT_LINK_BASE_ = @@ -7003,31 +6877,29 @@ diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_ty --> -diff --git a/chrome/browser/resources/net_internals/domain_security_policy_view.html b/chrome/browser/resources/net_internals/domain_security_policy_view.html ---- a/chrome/browser/resources/net_internals/domain_security_policy_view.html -+++ b/chrome/browser/resources/net_internals/domain_security_policy_view.html -@@ -13,8 +13,8 @@ +diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html +--- a/chrome/browser/resources/net_internals/index.html ++++ b/chrome/browser/resources/net_internals/index.html +@@ -20,7 +20,7 @@ found in the LICENSE file. +
+
+ The net-internals events viewer and related functionality has been removed. +- Please use chrome://net-export to save netlogs and the external netlog_viewer to view them. ++ Please use chrome://net-export to save netlogs and the external netlog_viewer to view them. +
-
- HSTS is HTTP Strict Transport Security: a way for sites to elect to -- always use HTTPS. See -- https://www.chromium.org/hsts. PKP is Public Key Pinning: Chrome "pins" -+ always use HTTPS. See -+ https://www.ch40m1um.qjz9zk/hsts. PKP is Public Key Pinning: Chrome "pins" - certain public keys for certain sites in official builds.
- -

Add HSTS domain

-diff --git a/chrome/browser/resources/net_internals/events_view.html b/chrome/browser/resources/net_internals/events_view.html ---- a/chrome/browser/resources/net_internals/events_view.html -+++ b/chrome/browser/resources/net_internals/events_view.html -@@ -1,6 +1,6 @@ - -
- The net-internals events viewer and related functionality has been removed. -- Please use chrome://net-export to save netlogs and the external netlog_viewer to view them. -+ Please use chrome://net-export to save netlogs and the external netlog_viewer to view them. -
+
+@@ -62,8 +62,8 @@ found in the LICENSE file. +
+ HSTS is HTTP Strict Transport Security: a way for sites to elect to + always use HTTPS. See +- +- https://www.chromium.org/hsts. PKP is Public Key Pinning: Chrome ++ ++ https://www.ch40m1um.qjz9zk/hsts. PKP is Public Key Pinning: Chrome + "pins" certain public keys for certain sites in official builds.
+

Add HSTS domain

diff --git a/chrome/browser/resources/network_speech_synthesis/manifest.json b/chrome/browser/resources/network_speech_synthesis/manifest.json --- a/chrome/browser/resources/network_speech_synthesis/manifest.json +++ b/chrome/browser/resources/network_speech_synthesis/manifest.json @@ -7064,6 +6936,32 @@ diff --git a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js b/chro `?app_id=${FACEBOOK_APP_ID}` + `&href=${encodeURIComponent(this.url.url)}` + `&hashtag=${encodeURIComponent('#GoogleDoodle')}`; +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 +@@ -79,18 +79,18 @@ class DriveModuleElement extends mixinBehaviors + // TODO(crbug/1177439): Use URL from ItemSuggest to generate URL. + switch (file.type) { + case (drive.mojom.FileType.kDoc): +- return `https://docs.google.com/document/d/${id}/edit?usp=drive_web`; ++ return `https://docs.9oo91e.qjz9zk/document/d/${id}/edit?usp=drive_web`; + case (drive.mojom.FileType.kSlide): +- return `https://docs.google.com/presentation/d/${ ++ return `https://docs.9oo91e.qjz9zk/presentation/d/${ + id}/edit?usp=drive_web`; + case (drive.mojom.FileType.kSheet): +- return `https://docs.google.com/spreadsheets/d/${ ++ return `https://docs.9oo91e.qjz9zk/spreadsheets/d/${ + id}/edit?usp=drive_web`; + default: + // TODO(crbug/1177426): Generic drive link leads to preview of page, + // will need to decide if this is appropriate or we want to navigate + // directly to the page we want. +- return `https://drive.google.com/file/d/${id}/view?usp=drive_web`; ++ return `https://drive.9oo91e.qjz9zk/file/d/${id}/view?usp=drive_web`; + } + } + } 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 @@ -7287,7 +7185,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py b/chrome/br diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html --- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html +++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ -@@ -1634,7 +1634,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1645,7 +1645,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -8082,7 +8001,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -1782,7 +1782,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

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

<resetlink>reset sync

@@ -8100,7 +8019,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) -@@ -2292,7 +2292,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -8109,7 +8028,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro You are viewing a preview of this page -@@ -3611,7 +3611,7 @@ Data from your Incognito session will only be cleared from Chrome when you @@ -8118,7 +8037,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro No compatible devices found -@@ -3650,7 +3650,7 @@ Data from your Incognito session will only be cleared from Chrome when you @@ -8127,7 +8046,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Got it -@@ -3905,7 +3905,7 @@ Data from your Incognito session will only be cleared from Chrome when you %1$sTanya's Pixel 2... @@ -8139,7 +8058,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result.cc b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result.cc --- a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result.cc +++ b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result.cc -@@ -23,7 +23,7 @@ namespace app_list { +@@ -26,7 +26,7 @@ namespace app_list { namespace { constexpr char kPlayStoreAppUrlPrefix[] = @@ -8237,7 +8156,7 @@ diff --git a/chrome/browser/ui/ash/assistant/conversation_starters_client_impl.c diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc -@@ -46,7 +46,7 @@ +@@ -48,7 +48,7 @@ namespace { const char kKeyboardShortcutHelpPageUrl[] = @@ -8303,7 +8222,7 @@ diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc -@@ -34,7 +34,7 @@ +@@ -28,7 +28,7 @@ namespace { GURL GetGoogleURL() { @@ -8312,6 +8231,18 @@ diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrom } using BrowserNavigatorTestChromeOS = BrowserNavigatorTest; +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 +@@ -282,7 +282,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { + + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + void ShowChromeTips(Browser* browser) { +- static const char kChromeTipsURL[] = "https://www.google.com/chrome/tips/"; ++ static const char kChromeTipsURL[] = "https://www.9oo91e.qjz9zk/chrome/tips/"; + ShowSingletonTab(browser, GURL(kChromeTipsURL)); + } + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) diff --git a/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.mm b/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.mm --- a/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.mm @@ -8336,6 +8267,18 @@ diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/u for (NSSharingService* service in services) { // Don't include "Add to Reading List". if ([[service name] +diff --git a/chrome/browser/ui/commander/open_url_command_source.cc b/chrome/browser/ui/commander/open_url_command_source.cc +--- a/chrome/browser/ui/commander/open_url_command_source.cc ++++ b/chrome/browser/ui/commander/open_url_command_source.cc +@@ -27,7 +27,7 @@ CommandSource::CommandResults OpenURLCommandSource::GetCommands( + } command_map[] = { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + {"Chrome Help", +- "https://support.google.com/chrome/?p=help&ctx=menu#topic=9796470"}, ++ "https://support.9oo91e.qjz9zk/chrome/?p=help&ctx=menu#topic=9796470"}, + // GSuite + {"New Google Doc", "https://docs.new"}, + {"New Google Sheet", "https://sheets.new"}, 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 @@ -8348,31 +8291,10 @@ diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc } base::string16 InstallationErrorInfoBarDelegate::GetMessageText() const { -diff --git a/chrome/browser/ui/hats/hats_survey_status_checker.cc b/chrome/browser/ui/hats/hats_survey_status_checker.cc ---- a/chrome/browser/ui/hats/hats_survey_status_checker.cc -+++ b/chrome/browser/ui/hats/hats_survey_status_checker.cc -@@ -37,7 +37,7 @@ HatsSurveyStatusChecker::HatsSurveyStatusChecker(Profile* profile) { - // info doesn't meet requirements. However, the cookie's value is not checked. - // To fetch the survey status directly, we need to set the cookie, but it is - // ok to use a non-conforming value. -- GURL cookie_url = GURL("https://www.google.com"); -+ GURL cookie_url = GURL("https://www.9oo91e.qjz9zk"); - auto survey_cookie = net::CanonicalCookie::Create( - cookie_url, "PAIDCONTENT=0", base::Time::Now(), base::nullopt); - DCHECK(survey_cookie); -@@ -125,7 +125,7 @@ base::OnceClosure HatsSurveyStatusChecker::CreateTimeoutCallbackForTesting() { - HatsSurveyStatusChecker::HatsSurveyStatusChecker() = default; - - std::string HatsSurveyStatusChecker::HatsSurveyURLWithoutId() { -- std::string url("https://www.google.com/"); -+ std::string url("https://www.9oo91e.qjz9zk/"); - return url + kHatsSurveyDataPath; - } - 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 -@@ -283,7 +283,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -284,7 +284,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 " @@ -8396,7 +8318,7 @@ diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_tes 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 -@@ -137,11 +137,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { +@@ -138,11 +138,11 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const { void MediaRouterContextualMenu::ExecuteCommand(int command_id, int event_flags) { const char kAboutPageUrl[] = @@ -8414,7 +8336,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 -@@ -229,7 +229,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { +@@ -228,7 +228,7 @@ void AppUninstallDialogView::InitializeCheckbox(const GURL& app_start_url) { [](Profile* profile) { NavigateParams params( profile, @@ -8426,7 +8348,7 @@ diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.c diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc -@@ -120,7 +120,7 @@ HatsNextWebDialog::HatsNextWebDialog(Browser* browser, +@@ -125,7 +125,7 @@ HatsNextWebDialog::HatsNextWebDialog(Browser* browser, : HatsNextWebDialog( browser, trigger_id, @@ -8435,36 +8357,10 @@ diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/brows base::TimeDelta::FromSeconds(10), std::move(success_callback), std::move(failure_callback)) {} -diff --git a/chrome/browser/ui/views/hats/hats_web_dialog.cc b/chrome/browser/ui/views/hats/hats_web_dialog.cc ---- a/chrome/browser/ui/views/hats/hats_web_dialog.cc -+++ b/chrome/browser/ui/views/hats/hats_web_dialog.cc -@@ -43,7 +43,7 @@ constexpr char kScriptSrcReplacementToken[] = "scriptSrc"; - - // Google consumer survey host site. - constexpr char kSurveyHost[] = -- "https://www.google.com/insights/consumersurveys"; -+ "https://www.9oo91e.qjz9zk/insights/consumersurveys"; - // Base URL to fetch the Google consumer survey script. - constexpr char kBaseFormatUrl[] = "%s/async_survey?site=%s&force_https=1&sc=%s"; - -@@ -90,11 +90,11 @@ HatsWebDialog::HatsWebDialog(Browser* browser, const std::string& site_id) - auto* settings_map = - HostContentSettingsMapFactory::GetForProfile(otr_profile_); - settings_map->SetContentSettingCustomScope( -- ContentSettingsPattern::FromString("[*.]google.com"), -+ ContentSettingsPattern::FromString("[*.]9oo91e.qjz9zk"), - ContentSettingsPattern::Wildcard(), ContentSettingsType::COOKIES, - CONTENT_SETTING_ALLOW); - settings_map->SetContentSettingCustomScope( -- ContentSettingsPattern::FromString("[*.]doubleclick.net"), -+ ContentSettingsPattern::FromString("[*.]60u613cl1c4.n3t.qjz9zk"), - ContentSettingsPattern::Wildcard(), ContentSettingsType::COOKIES, - CONTENT_SETTING_ALLOW); - } 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 -@@ -241,7 +241,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { +@@ -243,7 +243,7 @@ class IntentPickerBubbleViewBrowserTestChromeOS : public InProcessBrowserTest { // Test that the intent picker bubble will pop out for ARC apps. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, BubblePopOut) { @@ -8473,7 +8369,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(); -@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -283,7 +283,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // bubble. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, OutOfScopeDoesNotShowBubble) { @@ -8482,7 +8378,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); -@@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -308,7 +308,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // candidates. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, PWAOnlyShowBubble) { @@ -8491,7 +8387,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(); -@@ -346,7 +346,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -348,7 +348,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) { @@ -8500,7 +8396,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(); -@@ -385,7 +385,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -387,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, // apps. IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, DismissBubble) { @@ -8509,7 +8405,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(); -@@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -544,7 +544,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) { @@ -8521,7 +8417,7 @@ diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chrom 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 -@@ -130,7 +130,7 @@ base::Optional FindTabWithUrlPrefix(TabStripModel* tabs, +@@ -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) { @@ -8533,7 +8429,7 @@ diff --git a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc b/c 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 -@@ -93,7 +93,7 @@ void NetworkProfileBubbleView::LinkClicked(const ui::Event& event) { +@@ -97,7 +97,7 @@ void NetworkProfileBubbleView::LinkClicked(const ui::Event& event) { WindowOpenDisposition disposition = ui::DispositionFromEventFlags( event.flags(), WindowOpenDisposition::NEW_FOREGROUND_TAB); content::OpenURLParams params( @@ -8557,7 +8453,7 @@ diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/br diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc -@@ -229,7 +229,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { +@@ -230,7 +230,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { void PluginVmInstallerView::OnLinkClicked() { NavigateParams params(profile_, @@ -8581,7 +8477,7 @@ diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/bro diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc --- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc +++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc -@@ -357,7 +357,7 @@ void ProfileSigninConfirmationDialogViews::ContinueSigninButtonPressed() { +@@ -355,7 +355,7 @@ void ProfileSigninConfirmationDialogViews::ContinueSigninButtonPressed() { void ProfileSigninConfirmationDialogViews::LearnMoreClicked( const ui::Event& event) { NavigateParams params( @@ -8647,10 +8543,10 @@ diff --git a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ut "2x/screen_search_desktop_grey600_24dp.png")); get_more_data.Append(std::move(context_data)); -diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/edu_coexistence_login_handler_chromeos.cc ---- a/chrome/browser/ui/webui/chromeos/edu_coexistence_login_handler_chromeos.cc -+++ b/chrome/browser/ui/webui/chromeos/edu_coexistence_login_handler_chromeos.cc -@@ -52,7 +52,7 @@ namespace { +diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc +--- a/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc ++++ b/chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc +@@ -53,7 +53,7 @@ namespace { constexpr char kEduCoexistenceLoginURLSwitch[] = "edu-coexistence-url"; constexpr char kEduCoexistenceLoginDefaultURL[] = @@ -8674,7 +8570,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -339,7 +339,7 @@ std::string GetAccountDomain(Profile* profile) { +@@ -335,7 +335,7 @@ std::string GetAccountDomain(Profile* profile) { const std::string domain = gaia::ExtractDomainName(std::move(username)); @@ -8728,7 +8624,7 @@ diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/br diff --git a/chrome/browser/ui/webui/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 -@@ -234,11 +234,11 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) { +@@ -242,11 +242,11 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) { source->AddString("modulesTasksInfo1", l10n_util::GetStringFUTF16( IDS_NTP_MODULES_SHOPPING_TASKS_INFO_1, @@ -8757,7 +8653,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 -@@ -81,22 +81,22 @@ namespace { +@@ -71,22 +71,22 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -8812,7 +8708,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, +@@ -1418,7 +1418,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( @@ -8885,12 +8781,12 @@ diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc b/chrome/ diff --git a/chrome/browser/video_tutorials/internal/config.cc b/chrome/browser/video_tutorials/internal/config.cc --- a/chrome/browser/video_tutorials/internal/config.cc +++ b/chrome/browser/video_tutorials/internal/config.cc -@@ -12,7 +12,7 @@ namespace video_tutorials { +@@ -11,7 +11,7 @@ + namespace video_tutorials { // Default base URL string for the server. - constexpr char kDefaultBaseURL[] = -- "https://staging-gsaprototype-pa.sandbox.googleapis.com"; -+ "https://staging-gsaprototype-pa.sandbox.9oo91eapis.qjz9zk"; +-constexpr char kDefaultBaseURL[] = "https://chromeupboarding-pa.googleapis.com"; ++constexpr char kDefaultBaseURL[] = "https://chromeupboarding-pa.9oo91eapis.qjz9zk"; // Default URL string for GetTutorials RPC. constexpr char kDefaultGetTutorialsPath[] = "/v1/videotutorials"; @@ -9070,7 +8966,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 -@@ -53,7 +53,7 @@ namespace { +@@ -54,7 +54,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -9082,7 +8978,7 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -310,7 +310,7 @@ void ChromeAuthenticatorRequestDelegate::RegisterActionCallbacks( +@@ -311,7 +311,7 @@ void ChromeAuthenticatorRequestDelegate::RegisterActionCallbacks( bool ChromeAuthenticatorRequestDelegate::ShouldPermitIndividualAttestation( const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = @@ -9091,7 +8987,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 -@@ -660,11 +660,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -680,11 +680,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. @@ -9153,7 +9049,7 @@ diff --git a/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc b/chrome/chr diff --git a/chrome/chrome_cleaner/executables/chrome_cleaner_main.cc b/chrome/chrome_cleaner/executables/chrome_cleaner_main.cc --- a/chrome/chrome_cleaner/executables/chrome_cleaner_main.cc +++ b/chrome/chrome_cleaner/executables/chrome_cleaner_main.cc -@@ -455,7 +455,7 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) { +@@ -451,7 +451,7 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) { ::MessageBox(nullptr, L"Manually running this program is no longer supported. " L"Please visit " @@ -9290,14 +9186,14 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext +++ b/chrome/common/extensions/api/_api_features.json @@ -159,7 +159,7 @@ }, - // This API is whitelisted on stable and should not be enabled for a wider + // This API is allowlisted on stable and should not be enabled for a wider // audience without resolving security issues raised in API proposal and - // review (https://codereview.chromium.org/25305002). + // review (https://codereview.ch40m1um.qjz9zk/25305002). "browserAction.openPopup": [{ "channel": "dev", "dependencies": ["manifest:browser_action"], -@@ -286,7 +286,7 @@ +@@ -287,7 +287,7 @@ "dashboardPrivate": [{ "channel": "stable", "contexts": ["blessed_web_page", "web_page"], @@ -9390,18 +9286,6 @@ diff --git a/chrome/common/extensions/api/dom.json b/chrome/common/extensions/ap "type": "object", "additionalProperties": { "type": "any" } } -diff --git a/chrome/common/extensions/api/enterprise_device_attributes.idl b/chrome/common/extensions/api/enterprise_device_attributes.idl ---- a/chrome/common/extensions/api/enterprise_device_attributes.idl -+++ b/chrome/common/extensions/api/enterprise_device_attributes.idl -@@ -18,7 +18,7 @@ namespace enterprise.deviceAttributes { - - interface Functions { - // Fetches the value of -- // the device identifier of the directory API, -+ // the device identifier of the directory API, - // that is generated by the server and identifies the cloud record of the - // device for querying in the cloud directory API. - // If the current user is not affiliated, returns an empty string. diff --git a/chrome/common/extensions/api/gcm.json b/chrome/common/extensions/api/gcm.json --- a/chrome/common/extensions/api/gcm.json +++ b/chrome/common/extensions/api/gcm.json @@ -9435,39 +9319,6 @@ diff --git a/chrome/common/extensions/api/i18n.json b/chrome/common/extensions/a } ], "functions": [ -diff --git a/chrome/common/extensions/api/identity.idl b/chrome/common/extensions/api/identity.idl ---- a/chrome/common/extensions/api/identity.idl -+++ b/chrome/common/extensions/api/identity.idl -@@ -177,7 +177,7 @@ namespace identity { - // providers by launching a web view and navigating it to the - // first URL in the provider's auth flow. When the provider - // redirects to a URL matching the pattern -- // https://<app-id>.chromiumapp.org/*, the -+ // https://<app-id>.ch40m1umapp.qjz9zk/*, the - // window will close, and the final redirect URL will be passed to - // the callback function. - // -@@ -195,7 +195,7 @@ namespace identity { - // Generates a redirect URL to be used in |launchWebAuthFlow|. - // - // The generated URLs match the pattern -- // https://<app-id>.chromiumapp.org/*. -+ // https://<app-id>.ch40m1umapp.qjz9zk/*. - // - // |path| : The path appended to the end of the generated URL. - [nocompile] static DOMString getRedirectURL(optional DOMString path); -diff --git a/chrome/common/extensions/api/image_writer_private.idl b/chrome/common/extensions/api/image_writer_private.idl ---- a/chrome/common/extensions/api/image_writer_private.idl -+++ b/chrome/common/extensions/api/image_writer_private.idl -@@ -6,7 +6,7 @@ - // removable media. - // - // See the design doc for a detailed description of this API. --// https://goo.gl/KzMEFq -+// https://goo.gl.qjz9zk/KzMEFq - namespace imageWriterPrivate { - // The different stages of a write call. - // diff --git a/chrome/common/extensions/api/instance_id.json b/chrome/common/extensions/api/instance_id.json --- a/chrome/common/extensions/api/instance_id.json +++ b/chrome/common/extensions/api/instance_id.json @@ -9480,57 +9331,18 @@ diff --git a/chrome/common/extensions/api/instance_id.json b/chrome/common/exten }, "scope": { "type": "string", -diff --git a/chrome/common/extensions/api/printing.idl b/chrome/common/extensions/api/printing.idl ---- a/chrome/common/extensions/api/printing.idl -+++ b/chrome/common/extensions/api/printing.idl -@@ -68,7 +68,7 @@ namespace printing { - PrinterSource source; - - // The flag which shows whether the printer fits -- // -+ // - // DefaultPrinterSelection rules. - // Note that several printers could be flagged. - boolean isDefault; -@@ -117,7 +117,7 @@ namespace printing { - // Response for $(ref:getPrinterInfo) request. - dictionary GetPrinterInfoResponse { - // Printer capabilities in -- // -+ // - // CDD format. - // The property may be missing. - object? capabilities; -@@ -165,7 +165,7 @@ namespace printing { - static void getPrinters(GetPrintersCallback callback); - - // Returns the status and capabilities of the printer in -- // -+ // - // CDD format. - // This call will fail with a runtime error if no printers with given id are - // installed. -diff --git a/chrome/common/extensions/api/scripting.idl b/chrome/common/extensions/api/scripting.idl ---- a/chrome/common/extensions/api/scripting.idl -+++ b/chrome/common/extensions/api/scripting.idl -@@ -8,7 +8,7 @@ namespace scripting { - callback InjectedFunction = void(); - - // The origin for a style change. -- // See style origins -+ // See style origins - // for more info. - enum StyleOrigin { - AUTHOR, -@@ -19,7 +19,7 @@ namespace scripting { - // The ID of the tab into which to inject. - long tabId; - -- // The IDs -+ // The IDs - // of specific frames to inject into. - long[]? frameIds; - +diff --git a/chrome/common/extensions/api/privacy.json b/chrome/common/extensions/api/privacy.json +--- a/chrome/common/extensions/api/privacy.json ++++ b/chrome/common/extensions/api/privacy.json +@@ -103,7 +103,7 @@ + "privacySandboxEnabled": { + "$ref": "types.ChromeSetting", + "value": ["privacySandboxEnabled", {"type": "boolean"}], +- "description": "If enabled, the experimental Privacy Sandbox features are active. The value of this preference is of type boolean, and the default value is true. PLEASE NOTE: The schema of this API may change in the future as the Privacy Sandbox features crystallize. In that case, we will provide prior notice." ++ "description": "If enabled, the experimental Privacy Sandbox features are active. The value of this preference is of type boolean, and the default value is true. PLEASE NOTE: The schema of this API may change in the future as the Privacy Sandbox features crystallize. In that case, we will provide prior notice." + }, + "hyperlinkAuditingEnabled": { + "$ref": "types.ChromeSetting", 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 @@ -9564,18 +9376,6 @@ diff --git a/chrome/common/extensions/api/tts.json b/chrome/common/extensions/ap "types": [ { "id": "EventType", -diff --git a/chrome/common/extensions/api/webrtc_audio_private.idl b/chrome/common/extensions/api/webrtc_audio_private.idl ---- a/chrome/common/extensions/api/webrtc_audio_private.idl -+++ b/chrome/common/extensions/api/webrtc_audio_private.idl -@@ -11,7 +11,7 @@ - // extension calling this API (i.e. they cannot be shared between - // extensions). - // --// See http://goo.gl/8rOmgk for further documentation of this API. -+// See http://goo.gl.qjz9zk/8rOmgk for further documentation of this API. - - namespace webrtcAudioPrivate { - diff --git a/chrome/common/extensions/api/webview_tag.json b/chrome/common/extensions/api/webview_tag.json --- a/chrome/common/extensions/api/webview_tag.json +++ b/chrome/common/extensions/api/webview_tag.json @@ -9627,7 +9427,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 -@@ -79,7 +79,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( +@@ -86,7 +86,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -9636,7 +9436,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); -@@ -134,7 +134,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( +@@ -149,7 +149,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -9648,7 +9448,7 @@ diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc -@@ -12,44 +12,44 @@ +@@ -12,50 +12,50 @@ namespace chrome { const char kAccessibilityLabelsLearnMoreURL[] = @@ -9679,6 +9479,14 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chrome?p=bluetooth"; + "https://support.9oo91e.qjz9zk/chrome?p=bluetooth"; + const char kChooserHidOverviewUrl[] = +- "https://support.google.com/chrome?p=webhid"; ++ "https://support.9oo91e.qjz9zk/chrome?p=webhid"; + + const char kChooserSerialOverviewUrl[] = +- "https://support.google.com/chrome?p=webserial"; ++ "https://support.9oo91e.qjz9zk/chrome?p=webserial"; + const char kChooserUsbOverviewURL[] = - "https://support.google.com/chrome?p=webusb"; + "https://support.9oo91e.qjz9zk/chrome?p=webusb"; @@ -9705,7 +9513,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif // BUILDFLAG(IS_CHROMEOS_ASH) const char kChromeHelpViaMenuURL[] = -@@ -57,20 +57,20 @@ const char kChromeHelpViaMenuURL[] = +@@ -63,20 +63,20 @@ const char kChromeHelpViaMenuURL[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"; #else @@ -9730,7 +9538,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) -@@ -94,196 +94,196 @@ const char kChromeSearchScheme[] = "chrome-search"; +@@ -100,223 +100,223 @@ const char kChromeSearchScheme[] = "chrome-search"; const char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; @@ -9832,10 +9640,6 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chrome/?p=ui_usagestat"; + "https://support.9oo91e.qjz9zk/chrome/?p=ui_usagestat"; - const char kLegacySupervisedUserManagementDisplayURL[] = -- "www.chrome.com/manage"; -+ "www.ch40me.qjz9zk/manage"; - const char kManagedUiLearnMoreUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) - "https://support.google.com/chromebook/?p=is_chrome_managed"; @@ -9921,10 +9725,6 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc + "https://support.9oo91e.qjz9zk/chrome/?p=settings_privacy"; #endif - const char kPrivacySandboxURL[] = -- "https://www.chromium.org/Home/chromium-privacy/privacy-sandbox"; -+ "https://www.ch40m1um.qjz9zk/Home/chromium-privacy/privacy-sandbox"; - const char kRemoveNonCWSExtensionURL[] = - "https://support.google.com/chrome/?p=ui_remove_non_cws_extensions"; + "https://support.9oo91e.qjz9zk/chrome/?p=ui_remove_non_cws_extensions"; @@ -9983,16 +9783,14 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chrome?p=your_administrator"; + "https://support.9oo91e.qjz9zk/chrome?p=your_administrator"; - #if defined(OS_ANDROID) - const char kAndroidAppScheme[] = "android-app"; -@@ -293,34 +293,34 @@ const char kAndroidAppScheme[] = "android-app"; + #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID) const char kEnhancedPlaybackNotificationLearnMoreURL[] = #endif #if BUILDFLAG(IS_CHROMEOS_ASH) - "https://support.google.com/chromebook/?p=enhanced_playback"; + "https://support.9oo91e.qjz9zk/chromebook/?p=enhanced_playback"; #elif defined(OS_ANDROID) - // Keep in sync with chrome/android/java/strings/android_chrome_strings.grd + // Keep in sync with chrome/browser/ui/android/strings/android_chrome_strings.grd - "https://support.google.com/chrome/?p=mobile_protected_content"; + "https://support.9oo91e.qjz9zk/chrome/?p=mobile_protected_content"; #endif @@ -10028,7 +9826,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kChromeOSAssetHost[] = "chromeos-asset"; const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; -@@ -335,18 +335,18 @@ const char kChromeOSGestureEducationHelpURL[] = +@@ -331,18 +331,18 @@ const char kChromeOSGestureEducationHelpURL[] = "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = @@ -10051,7 +9849,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kEchoLearnMoreURL[] = "chrome://help-app/help/sub/3399709/id/2703646"; -@@ -355,92 +355,92 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -351,95 +351,95 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -10120,6 +9918,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromebook/?p=settings_search_help"; + "https://support.9oo91e.qjz9zk/chromebook/?p=settings_search_help"; + const char kPeripheralDataAccessHelpURL[] = +- "https://support.google.com/chromebook?p=connect_thblt_usb4_accy"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=connect_thblt_usb4_accy"; + const char kTPMFirmwareUpdateLearnMoreURL[] = - "https://support.google.com/chromebook/?p=tpm_update"; + "https://support.9oo91e.qjz9zk/chromebook/?p=tpm_update"; @@ -10171,7 +9973,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"; -@@ -448,12 +448,12 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -447,12 +447,12 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -10186,40 +9988,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif } // namespace chrome -diff --git a/chrome/credential_provider/extension/task_manager_unittests.cc b/chrome/credential_provider/extension/task_manager_unittests.cc ---- a/chrome/credential_provider/extension/task_manager_unittests.cc -+++ b/chrome/credential_provider/extension/task_manager_unittests.cc -@@ -176,7 +176,7 @@ TEST_F(TaskManagerTest, TaskExecuted) { - // Create a fake user associated to a gaia id. - CComBSTR sid1; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( -- L"foo@gmail.com", L"password", L"Full Name", L"comment", -+ L"foo@9ma1l.qjz9zk", L"password", L"Full Name", L"comment", - L"test-gaia-id", base::string16(), L"domain", &sid1)); - - base::string16 device_resource_id1 = L"foo_resource_id"; -@@ -214,7 +214,7 @@ TEST_F(TaskManagerTest, TaskExecuted) { - // Create another user associated to a gaia id. - CComBSTR sid2; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( -- L"bar@gmail.com", L"password", L"Full Name", L"comment", -+ L"bar@9ma1l.qjz9zk", L"password", L"Full Name", L"comment", - L"test-gaia-id2", base::string16(), L"domain", &sid2)); - base::string16 device_resource_id2 = L"foo_resource_id"; - ASSERT_EQ(S_OK, SetUserProperty(OLE2W(sid2), L"device_resource_id", -@@ -277,7 +277,7 @@ TEST_F(TaskManagerTest, BackOff) { - // Create a fake user associated to a gaia id. - CComBSTR sid1; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( -- L"foo@gmail.com", L"password", L"Full Name", L"comment", -+ L"foo@9ma1l.qjz9zk", L"password", L"Full Name", L"comment", - L"test-gaia-id", base::string16(), L"domain", &sid1)); - - base::string16 device_resource_id1 = L"foo_resource_id"; diff --git a/chrome/credential_provider/gaiacp/associated_user_validator.cc b/chrome/credential_provider/gaiacp/associated_user_validator.cc --- a/chrome/credential_provider/gaiacp/associated_user_validator.cc +++ b/chrome/credential_provider/gaiacp/associated_user_validator.cc -@@ -37,7 +37,7 @@ const base::TimeDelta AssociatedUserValidator::kTokenHandleValidityLifetime = +@@ -38,7 +38,7 @@ const base::TimeDelta AssociatedUserValidator::kTokenHandleValidityLifetime = base::TimeDelta::FromSeconds(60); const char AssociatedUserValidator::kTokenInfoUrl[] = @@ -10228,27 +10000,6 @@ diff --git a/chrome/credential_provider/gaiacp/associated_user_validator.cc b/ch constexpr long kDayInMillis = 86400000; -diff --git a/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc b/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc ---- a/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc -+++ b/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc -@@ -117,7 +117,7 @@ TEST_F(AssociatedUserValidatorTest, CleanupStaleUsers) { - CComBSTR sid_good; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - L"username", L"password", L"Full Name", L"Comment", -- L"gaia-id", L"foo@gmail.com", &sid_good)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", &sid_good)); - ASSERT_EQ(S_OK, - SetUserProperty(OLE2W(sid_good), kUserTokenHandle, L"good-th")); - -@@ -136,7 +136,7 @@ TEST_F(AssociatedUserValidatorTest, CleanupStaleUsers) { - CComBSTR sid_no_token_handle; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - L"username3", L"password", L"Full Name", L"Comment", -- L"gaia-id3", L"foo3@gmail.com", &sid_no_token_handle)); -+ L"gaia-id3", L"foo3@9ma1l.qjz9zk", &sid_no_token_handle)); - // Clear the token handle automatically created by CreateTestOSUser. - EXPECT_EQ(S_OK, - SetUserProperty((BSTR)sid_no_token_handle, kUserTokenHandle, L"")); diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/credential_provider/gaiacp/gaia_credential_base.cc --- a/chrome/credential_provider/gaiacp/gaia_credential_base.cc +++ b/chrome/credential_provider/gaiacp/gaia_credential_base.cc @@ -10261,167 +10012,27 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ constexpr int kHttpTimeout = 3000; // in milliseconds // Names of keys used to fetch the custom attributes from google admin sdk -@@ -148,7 +148,7 @@ HRESULT GetExistingAccountMappingFromCD( +@@ -147,7 +147,7 @@ HRESULT GetExistingAccountMappingFromCD( std::string escape_url_encoded_email = - net::EscapeUrlEncodedData(base::UTF16ToUTF8(email), true); + net::EscapeUrlEncodedData(base::WideToUTF8(email), true); std::string get_cd_user_url = base::StringPrintf( - "https://www.googleapis.com/admin/directory/v1/users/" + "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" "%s?projection=full&viewType=domain_public", escape_url_encoded_email.c_str()); LOGFN(VERBOSE) << "Encoded URL : " << get_cd_user_url; -@@ -470,9 +470,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, +@@ -469,9 +469,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, // Determine if the email is a consumer domain (gmail.com or googlemail.com). - base::string16 email = GetDictString(result, kKeyEmail); + std::wstring email = GetDictString(result, kKeyEmail); std::transform(email.begin(), email.end(), email.begin(), ::tolower); -- base::string16::size_type consumer_domain_pos = email.find(L"@gmail.com"); -+ base::string16::size_type consumer_domain_pos = email.find(L"@9ma1l.qjz9zk"); - if (consumer_domain_pos == base::string16::npos) +- std::wstring::size_type consumer_domain_pos = email.find(L"@gmail.com"); ++ std::wstring::size_type consumer_domain_pos = email.find(L"@9ma1l.qjz9zk"); + if (consumer_domain_pos == std::wstring::npos) - consumer_domain_pos = email.find(L"@googlemail.com"); + consumer_domain_pos = email.find(L"@9oo91email.qjz9zk"); - *is_consumer_account = consumer_domain_pos != base::string16::npos; + *is_consumer_account = consumer_domain_pos != std::wstring::npos; -diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc ---- a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc -+++ b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc -@@ -1237,7 +1237,7 @@ TEST_F(GcpGaiaCredentialBaseTest, StripEmailTLD_Gmail) { - Microsoft::WRL::ComPtr test; - ASSERT_EQ(S_OK, cred.As(&test)); - -- constexpr char email[] = "bar@gmail.com"; -+ constexpr char email[] = "bar@9ma1l.qjz9zk"; - - ASSERT_EQ(S_OK, test->SetGlsEmailAddress(email)); - -@@ -1258,7 +1258,7 @@ TEST_F(GcpGaiaCredentialBaseTest, StripEmailTLD_Googlemail) { - Microsoft::WRL::ComPtr test; - ASSERT_EQ(S_OK, cred.As(&test)); - -- constexpr char email[] = "toto@googlemail.com"; -+ constexpr char email[] = "toto@9oo91email.qjz9zk"; - - ASSERT_EQ(S_OK, test->SetGlsEmailAddress(email)); - -@@ -1278,7 +1278,7 @@ TEST_F(GcpGaiaCredentialBaseTest, InvalidUsernameCharacters) { - Microsoft::WRL::ComPtr test; - ASSERT_EQ(S_OK, cred.As(&test)); - -- constexpr char email[] = "a\\[]:|<>+=;?*z@gmail.com"; -+ constexpr char email[] = "a\\[]:|<>+=;?*z@9ma1l.qjz9zk"; - - ASSERT_EQ(S_OK, test->SetGlsEmailAddress(email)); - -@@ -1299,7 +1299,7 @@ TEST_F(GcpGaiaCredentialBaseTest, EmailTooLong) { - Microsoft::WRL::ComPtr test; - ASSERT_EQ(S_OK, cred.As(&test)); - -- constexpr char email[] = "areallylongemailadressdude@gmail.com"; -+ constexpr char email[] = "areallylongemailadressdude@9ma1l.qjz9zk"; - - ASSERT_EQ(S_OK, test->SetGlsEmailAddress(email)); - -@@ -1403,7 +1403,7 @@ class GcpGaiaCredentialBaseCloudMappingTest - Microsoft::WRL::ComPtr cred_; - // The admin sdk users directory get URL. - std::string get_cd_user_url_ = base::StringPrintf( -- "https://www.googleapis.com/admin/directory/v1/users/" -+ "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" - "%s?projection=full&viewType=domain_public", - net::EscapeUrlEncodedData(kDefaultEmail, true).c_str()); - GaiaUrls* gaia_urls_ = GaiaUrls::GetInstance(); -@@ -1569,7 +1569,7 @@ class GcpGaiaCredentialBaseAdScenariosTest : public GcpGaiaCredentialBaseTest { - Microsoft::WRL::ComPtr cred_; - // The admin sdk users directory get URL. - std::string get_cd_user_url_ = base::StringPrintf( -- "https://www.googleapis.com/admin/directory/v1/users/" -+ "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" - "%s?projection=full&viewType=domain_public", - net::EscapeUrlEncodedData(kDefaultEmail, true).c_str()); - GaiaUrls* gaia_urls_ = GaiaUrls::GetInstance(); -@@ -1784,7 +1784,7 @@ class GcpGaiaCredentialBaseCloudLocalAccountTest - Microsoft::WRL::ComPtr cred_; - // The admin sdk users directory get URL. - std::string get_cd_user_url_ = base::StringPrintf( -- "https://www.googleapis.com/admin/directory/v1/users/" -+ "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" - "%s?projection=full&viewType=domain_public", - net::EscapeUrlEncodedData(kDefaultEmail, true).c_str()); - GaiaUrls* gaia_urls_ = GaiaUrls::GetInstance(); -diff --git a/chrome/credential_provider/gaiacp/gaia_credential_provider_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_provider_unittests.cc ---- a/chrome/credential_provider/gaiacp/gaia_credential_provider_unittests.cc -+++ b/chrome/credential_provider/gaiacp/gaia_credential_provider_unittests.cc -@@ -320,7 +320,7 @@ TEST_F(GcpCredentialProviderTest, AddPersonAfterUserRemove) { - CComBSTR sid; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - kDummyUsername, kDummyPassword, L"full name", L"comment", -- L"gaia-id", L"foo@gmail.com", &sid)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", &sid)); - - CreateDefaultCloudPoliciesForUser((BSTR)sid); - -@@ -413,14 +413,14 @@ TEST_P(GcpCredentialProviderSetSerializationTest, CheckAutoLogon) { - constexpr wchar_t first_username[] = L"username"; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - first_username, L"password", L"full name", L"comment", -- L"gaia-id", L"foo@gmail.com", &first_sid)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", &first_sid)); - CreateDefaultCloudPoliciesForUser((BSTR)first_sid); - - CComBSTR second_sid; - constexpr wchar_t second_username[] = L"username2"; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - second_username, L"password", L"Full Name", L"Comment", -- L"gaia-id2", L"foo2@gmail.com", &second_sid)); -+ L"gaia-id2", L"foo2@9ma1l.qjz9zk", &second_sid)); - CreateDefaultCloudPoliciesForUser((BSTR)second_sid); - - // Build a dummy authentication buffer that can be passed to SetSerialization. -@@ -520,13 +520,13 @@ TEST_P(GcpCredentialProviderWithGaiaUsersTest, ReauthCredentialTest) { - // enable_cloud_association is set to false. - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - L"username", L"password", L"full name", L"comment", -- L"gaia-id", L"foo@gmail.com", L"domain", &sid)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", L"domain", &sid)); - - } else { - // Add a local user. - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - L"username", L"password", L"full name", L"comment", -- L"gaia-id", L"foo@gmail.com", &sid)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", &sid)); - } - - if (user_property_status & 1) { -@@ -764,14 +764,14 @@ TEST_P(GcpCredentialProviderAvailableCredentialsTest, AvailableCredentials) { - constexpr wchar_t first_username[] = L"username"; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - first_username, L"password", L"full name", L"comment", -- L"gaia-id", L"foo@gmail.com", &first_sid)); -+ L"gaia-id", L"foo@9ma1l.qjz9zk", &first_sid)); - CreateDefaultCloudPoliciesForUser((BSTR)first_sid); - - CComBSTR second_sid; - constexpr wchar_t second_username[] = L"username2"; - ASSERT_EQ(S_OK, fake_os_user_manager()->CreateTestOSUser( - second_username, L"password", L"Full Name", L"Comment", -- L"gaia-id2", L"foo2@gmail.com", &second_sid)); -+ L"gaia-id2", L"foo2@9ma1l.qjz9zk", &second_sid)); - CreateDefaultCloudPoliciesForUser((BSTR)second_sid); - - // Set the user locking the system. -diff --git a/chrome/credential_provider/gaiacp/gaia_credential_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_unittests.cc ---- a/chrome/credential_provider/gaiacp/gaia_credential_unittests.cc -+++ b/chrome/credential_provider/gaiacp/gaia_credential_unittests.cc -@@ -240,7 +240,7 @@ TEST_F(GcpGaiaCredentialGlsRunnerTest, - Microsoft::WRL::ComPtr test; - ASSERT_EQ(S_OK, cred.As(&test)); - ASSERT_EQ(S_OK, test->SetGlsEmailAddress(base::UTF16ToUTF8(base_username) + -- "@gmail.com")); -+ "@9ma1l.qjz9zk")); - ASSERT_EQ(S_OK, StartLogonProcessAndWait()); - - // New username should be truncated at the end and have the last character diff --git a/chrome/credential_provider/gaiacp/gcp_utils.cc b/chrome/credential_provider/gaiacp/gcp_utils.cc --- a/chrome/credential_provider/gaiacp/gcp_utils.cc +++ b/chrome/credential_provider/gaiacp/gcp_utils.cc @@ -10434,36 +10045,15 @@ diff --git a/chrome/credential_provider/gaiacp/gcp_utils.cc b/chrome/credential_ constexpr int kMaxNumConsecutiveUploadDeviceFailures = 3; const base::TimeDelta kMaxTimeDeltaSinceLastUserPolicyRefresh = -@@ -1304,7 +1304,7 @@ base::string16 GetDevelopmentUrl(const base::string16& url, +@@ -1307,7 +1307,7 @@ std::wstring GetDevelopmentUrl(const std::wstring& url, std::string project; std::string final_part; - if (re2::RE2::FullMatch(base::UTF16ToUTF8(url), + if (re2::RE2::FullMatch(base::WideToUTF8(url), - "https://(.*).(googleapis.com.*)", &project, + "https://(.*).(9oo91eapis.qjz9zk.*)", &project, &final_part)) { - std::string url_prefix = "https://" + base::UTF16ToUTF8(dev) + "-"; - return base::UTF8ToUTF16( -diff --git a/chrome/credential_provider/gaiacp/gcp_utils_unittests.cc b/chrome/credential_provider/gaiacp/gcp_utils_unittests.cc ---- a/chrome/credential_provider/gaiacp/gcp_utils_unittests.cc -+++ b/chrome/credential_provider/gaiacp/gcp_utils_unittests.cc -@@ -555,7 +555,7 @@ TEST_P(GcpEnrollmentArgsTest, EnrollToGoogleMdmIfNeeded_MissingArgs) { - INSTANTIATE_TEST_SUITE_P( - GcpRegistrationData, - GcpEnrollmentArgsTest, -- ::testing::Combine(::testing::Values("foo@gmail.com", "", nullptr), -+ ::testing::Combine(::testing::Values("foo@9ma1l.qjz9zk", "", nullptr), - ::testing::Values("id_token", "", nullptr), - ::testing::Values("access_token", "", nullptr), - ::testing::Values("sid", "", nullptr), -@@ -569,7 +569,7 @@ INSTANTIATE_TEST_SUITE_P( - INSTANTIATE_TEST_SUITE_P( - GcpRegistrationHardwareIds, - GcpEnrollmentArgsTest, -- ::testing::Combine(::testing::Values("foo@gmail.com"), -+ ::testing::Combine(::testing::Values("foo@9ma1l.qjz9zk"), - ::testing::Values("id_token"), - ::testing::Values("access_token"), - ::testing::Values("sid"), + std::string url_prefix = "https://" + base::WideToUTF8(dev) + "-"; + return base::UTF8ToWide( diff --git a/chrome/credential_provider/gaiacp/gcpw_strings.cc b/chrome/credential_provider/gaiacp/gcpw_strings.cc --- a/chrome/credential_provider/gaiacp/gcpw_strings.cc +++ b/chrome/credential_provider/gaiacp/gcpw_strings.cc @@ -10486,30 +10076,6 @@ diff --git a/chrome/credential_provider/gaiacp/mdm_utils.cc b/chrome/credential_ template T GetMdmFunctionPointer(const base::ScopedNativeLibrary& library, -diff --git a/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc b/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc ---- a/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc -+++ b/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc -@@ -605,7 +605,7 @@ TEST_P(GcpNormalReauthCredentialUserSidMismatch, ShouldFail) { - - // The admin sdk users directory get URL. - std::string get_cd_user_url_ = base::StringPrintf( -- "https://www.googleapis.com/admin/directory/v1/users/" -+ "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" - "%s?projection=full&viewType=domain_public", - net::EscapeUrlEncodedData(base::UTF16ToUTF8(OLE2CW(email)), true) - .c_str()); -diff --git a/chrome/credential_provider/gaiacp/win_http_url_fetcher_unittests.cc b/chrome/credential_provider/gaiacp/win_http_url_fetcher_unittests.cc ---- a/chrome/credential_provider/gaiacp/win_http_url_fetcher_unittests.cc -+++ b/chrome/credential_provider/gaiacp/win_http_url_fetcher_unittests.cc -@@ -34,7 +34,7 @@ TEST_P(GcpWinHttpUrlFetcherTest, - const std::string header1 = "test-header-1"; - const std::string header1_value = "test-value-1"; - const GURL test_url = -- GURL("https://test-service.googleapis.com/v1/testEndpoint"); -+ GURL("https://test-service.9oo91eapis.qjz9zk/v1/testEndpoint"); - const std::string access_token = "test-access-token"; - - base::Value request(base::Value::Type::DICTIONARY); diff --git a/chrome/docs/devtools-pillar.html b/chrome/docs/devtools-pillar.html --- a/chrome/docs/devtools-pillar.html +++ b/chrome/docs/devtools-pillar.html @@ -11121,12 +10687,12 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe @@ -37,7 +37,7 @@ namespace installer { namespace { - constexpr base::StringPiece16 kUninstallSurveyUrl( + constexpr base::WStringPiece kUninstallSurveyUrl( - L"https://support.google.com/chrome?p=chrome_uninstall_survey"); + L"https://support.9oo91e.qjz9zk/chrome?p=chrome_uninstall_survey"); - bool NavigateToUrlWithEdge(const base::string16& url) { - base::string16 protocol_url = L"microsoft-edge:" + url; + bool NavigateToUrlWithEdge(const std::wstring& url) { + std::wstring protocol_url = L"microsoft-edge:" + url; diff --git a/chrome/renderer/media/flash_embed_rewrite.cc b/chrome/renderer/media/flash_embed_rewrite.cc --- a/chrome/renderer/media/flash_embed_rewrite.cc +++ b/chrome/renderer/media/flash_embed_rewrite.cc @@ -11139,6 +10705,18 @@ diff --git a/chrome/renderer/media/flash_embed_rewrite.cc b/chrome/renderer/medi return RewriteYouTubeFlashEmbedURL(url); if (url.DomainIs("dailymotion.com")) +diff --git a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json b/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json +--- a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json ++++ b/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json +@@ -61,7 +61,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)|(bag(/[^/]+)*).ognc)$", +-"microsoft.com": "^https://www.microsoft.com/([^/]+/)?store/(buy/)?cart/?$", ++"m1cr050ft.qjz9zk": "^https://www.m1cr050ft.qjz9zk/([^/]+/)?store/(buy/)?cart/?$", + "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/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 @@ -11162,6 +10740,18 @@ diff --git a/chrome/renderer/subresource_redirect/subresource_redirect_params.cc return url::Origin::Create(GURL(lite_page_subresource_origin)); } +diff --git a/chrome/services/mac_notifications/mac_notification_service_ns.mm b/chrome/services/mac_notifications/mac_notification_service_ns.mm +--- a/chrome/services/mac_notifications/mac_notification_service_ns.mm ++++ b/chrome/services/mac_notifications/mac_notification_service_ns.mm +@@ -326,7 +326,7 @@ void MacNotificationServiceNS::CloseAllNotifications() { + // Overriden from _NSUserNotificationCenterDelegatePrivate. + // Emitted when a user closes a notification from the notification center. + // This is an undocumented method introduced in 10.8 according to +-// https://bugzilla.mozilla.org/show_bug.cgi?id=852648#c21 ++// https://bugzilla.m0z111a.qjz9zk/show_bug.cgi?id=852648#c21 + - (void)userNotificationCenter:(NSUserNotificationCenter*)center + didRemoveDeliveredNotifications:(NSArray*)notifications { + for (NSUserNotification* notification in notifications) { 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 @@ -11265,8 +10855,8 @@ diff --git a/chrome/updater/win/app_install_controller.cc b/chrome/updater/win/a observer_info.completion_code = completion_code; observer_info.completion_text = completion_text; // TODO(sorin): implement handling the help URL. https://crbug.com/1014622 -- observer_info.help_url = L"http://www.google.com"; -+ observer_info.help_url = L"http://www.9oo91e.qjz9zk"; +- observer_info.help_url = STRING16_LITERAL("http://www.google.com"); ++ observer_info.help_url = STRING16_LITERAL("http://www.9oo91e.qjz9zk"); // TODO(sorin): implement the installer API and provide the // application info in the observer info. https://crbug.com/1014630 observer_info.apps_info.push_back({}); @@ -11285,7 +10875,7 @@ diff --git a/chrome/updater/win/signing/PRESUBMIT.py b/chrome/updater/win/signin diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc --- a/chrome/utility/importer/ie_importer_win.cc +++ b/chrome/utility/importer/ie_importer_win.cc -@@ -695,7 +695,7 @@ void IEImporter::ParseFavoritesFolder( +@@ -694,7 +694,7 @@ void IEImporter::ParseFavoritesFolder( // which URLs IE has as default, to some another sites. // We expect that users will never themselves create bookmarks having this // hostname. @@ -11293,7 +10883,7 @@ diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importe + if (url.host() == "go.m1cr050ft.qjz9zk") continue; // Read favicon. - UpdateFaviconMap(*it, url, url_locator.Get(), &favicon_map); + UpdateFaviconMap(shortcut, url, url_locator.Get(), &favicon_map); diff --git a/chromecast/app/resources/shell_devtools_discovery_page.html b/chromecast/app/resources/shell_devtools_discovery_page.html --- a/chromecast/app/resources/shell_devtools_discovery_page.html +++ b/chromecast/app/resources/shell_devtools_discovery_page.html @@ -11415,7 +11005,7 @@ diff --git a/chromecast/net/connectivity_checker_impl.cc b/chromecast/net/connec 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 -@@ -85,7 +85,7 @@ content::WebUIDataSource* CreateUntrustedCameraAppUIHTMLSource() { +@@ -84,7 +84,7 @@ content::WebUIDataSource* CreateUntrustedCameraAppUIHTMLSource() { untrusted_source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -11470,7 +11060,7 @@ diff --git a/chromeos/components/camera_app_ui/resources/js/lib/analytics.js b/c diff --git a/chromeos/components/camera_app_ui/resources/js/util.js b/chromeos/components/camera_app_ui/resources/js/util.js --- a/chromeos/components/camera_app_ui/resources/js/util.js +++ b/chromeos/components/camera_app_ui/resources/js/util.js -@@ -145,7 +145,7 @@ export function makeUnfocusableByMouse(element) { +@@ -79,7 +79,7 @@ export function makeUnfocusableByMouse(element) { */ export function openHelp() { window.open( @@ -11479,22 +11069,10 @@ diff --git a/chromeos/components/camera_app_ui/resources/js/util.js b/chromeos/c } /** -diff --git a/chromeos/components/camera_app_ui/resources/manifest.json b/chromeos/components/camera_app_ui/resources/manifest.json ---- a/chromeos/components/camera_app_ui/resources/manifest.json -+++ b/chromeos/components/camera_app_ui/resources/manifest.json -@@ -23,7 +23,7 @@ - "fileManagerPrivate", - "fileSystem.requestDownloads", - {"fileSystem": ["write", "directory"]}, -- "https://www.google-analytics.com/" -+ "https://www.9oo91e-analytics.qjz9zk/" - ], - "app": { - "background": { diff --git a/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd b/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd --- a/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd +++ b/chromeos/components/camera_app_ui/resources/strings/camera_strings.grd -@@ -334,7 +334,7 @@ +@@ -282,7 +282,7 @@ Copy text @@ -11506,15 +11084,15 @@ 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 -@@ -167,7 +167,7 @@ Polymer({ - /** @private */ - onLearnMoreClicked_() { - // TODO(joonbug): Update this link with a p-link -- window.open('https://support.google.com/chromebook/answer/6309225'); -+ window.open('https://support.9oo91e.qjz9zk/chromebook/answer/6309225'); - }, - +@@ -253,7 +253,7 @@ Polymer({ /** @protected */ + onLearnMoreClicked_() { + const baseSupportUrl = +- 'https://support.google.com/chromebook?p=diagnostics_'; ++ 'https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'; + assert(this.learnMoreLinkSection); + + window.open(baseSupportUrl + this.learnMoreLinkSection); diff --git a/chromeos/components/drivefs/drivefs_auth.cc b/chromeos/components/drivefs/drivefs_auth.cc --- a/chromeos/components/drivefs/drivefs_auth.cc +++ b/chromeos/components/drivefs/drivefs_auth.cc @@ -11575,22 +11153,10 @@ diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ch constexpr char kAuthorizationHeaderFormat[] = "Bearer "; constexpr base::StringPiece kQueryKey = "q"; -diff --git a/chromeos/components/scanning/resources/scanner_select.html b/chromeos/components/scanning/resources/scanner_select.html ---- a/chromeos/components/scanning/resources/scanner_select.html -+++ b/chromeos/components/scanning/resources/scanner_select.html -@@ -34,7 +34,7 @@ - hidden$="[[shouldHideScanHelpLink_(loaded, scanners)]]"> - [[i18n('noScannersHelpText')]] - -+ href="http://support.9oo91e.qjz9zk/chromebook?p=chrome_scanning"> - [[i18n('noScannersHelpLinkLabel')]] - -

diff --git a/chromeos/components/scanning/resources/scanning_app.html b/chromeos/components/scanning/resources/scanning_app.html --- a/chromeos/components/scanning/resources/scanning_app.html +++ b/chromeos/components/scanning/resources/scanning_app.html -@@ -251,7 +251,7 @@ +@@ -259,7 +259,7 @@ [[i18n(toastMessageKey_)]]
%1$sgoogle.com, delivered by Google. + This content is from %1$s9oo91e.qjz9zk, delivered by Google. - - Permissions -@@ -581,7 +581,7 @@ + + History +@@ -587,7 +587,7 @@ A site is using your camera and microphone @@ -12163,7 +11729,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -704,7 +704,7 @@ +@@ -710,7 +710,7 @@ other {(+ # more)}} @@ -12365,7 +11931,7 @@ diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/ diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd --- a/components/components_google_chrome_strings.grd +++ b/components/components_google_chrome_strings.grd -@@ -270,7 +270,7 @@ +@@ -276,7 +276,7 @@ @@ -12438,65 +12004,6 @@ diff --git a/components/cronet/ios/cronet_consumer/cronet_consumer_app_delegate. [Cronet setRequestFilterBlock:^BOOL(NSURLRequest* request) { BOOL isChromiumSite = [[[request URL] host] hasPrefix:chromiumPrefix]; return !isChromiumSite; -diff --git a/components/cronet/native/cronet.idl b/components/cronet/native/cronet.idl ---- a/components/cronet/native/cronet.idl -+++ b/components/cronet/native/cronet.idl -@@ -108,7 +108,7 @@ struct Error { - ERROR_ADDRESS_UNREACHABLE = 9, - - /** -- * Error code indicating an error related to the -+ * Error code indicating an error related to the - * QUIC protocol. When {@link #error_code} is this code, see - * {@link quic_detailed_error_code} for more information. - */ -@@ -135,7 +135,7 @@ struct Error { - * Cronet internal error code. This may provide more specific error - * diagnosis than |error_code|, but the constant values may change over time. - * See -- * -+ * - * here for the lastest list of values. - */ - int32 internal_error_code = 0; -@@ -152,8 +152,8 @@ struct Error { - bool immediately_retryable = false; - - /** -- * Contains detailed QUIC error code from -- * -+ * Contains detailed QUIC error code from -+ * - * QuicErrorCode when the |error_code| code is |ERROR_QUIC_PROTOCOL_FAILED|. - */ - int32 quic_detailed_error_code = 0; -@@ -524,7 +524,7 @@ struct EngineParams { - string storage_path; - - /** -- * Whether QUIC protocol -+ * Whether QUIC protocol - * is enabled. If QUIC is enabled, then QUIC User Agent Id - * containing application name and Cronet version is sent to the server. - */ -@@ -595,7 +595,7 @@ struct EngineParams { - * proxy certificate to the list of local trust anchor. Disabling the bypass will most - * likly prevent the app from sending any traffic to the pinned hosts. For more - * information see 'How does key pinning interact with local proxies and filters?' at -- * https://www.chromium.org/Home/chromium-security/security-faq -+ * https://www.ch40m1um.qjz9zk/Home/chromium-security/security-faq - */ - bool enable_public_key_pinning_bypass_for_local_trust_anchors = true; - -@@ -1294,7 +1294,7 @@ struct DateTime { - * - * Most timing metrics are taken from - * LoadTimingInfo, -+ * href="https://cs.ch40m1um.qjz9zk/chromium/src/net/base/load_timing_info.h">LoadTimingInfo, - * which holds the information for and - * . - */ diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py --- a/components/cronet/tools/generate_javadoc.py +++ b/components/cronet/tools/generate_javadoc.py @@ -12523,18 +12030,6 @@ diff --git a/components/data_reduction_proxy/core/common/chrome_proxy_header.txt traffic from non-incognito tabs. Chrome-Proxy Response Header -diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc ---- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc -+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc -@@ -33,7 +33,7 @@ const char kEnabled[] = "Enabled"; - - // Default URL for retrieving the Data Reduction Proxy configuration. - const char kClientConfigURL[] = -- "https://datasaver.googleapis.com/v1/clientConfigs"; -+ "https://datasaver.9oo91eapis.qjz9zk/v1/clientConfigs"; - - const char kExperimentsOption[] = "exp"; - diff --git a/components/dom_distiller/core/html/dom_distiller_viewer.html b/components/dom_distiller/core/html/dom_distiller_viewer.html --- a/components/dom_distiller/core/html/dom_distiller_viewer.html +++ b/components/dom_distiller/core/html/dom_distiller_viewer.html @@ -12950,27 +12445,15 @@ diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/fav const char kGoogleServerV2RequestFormat[] = "%s?client=%s&nfrp=2&%ssize=%d&min_size=%d&max_size=%d&" -diff --git a/components/feed/core/feed_networking_host.cc b/components/feed/core/feed_networking_host.cc ---- a/components/feed/core/feed_networking_host.cc -+++ b/components/feed/core/feed_networking_host.cc -@@ -42,7 +42,7 @@ namespace { - - constexpr char kApiKeyQueryParam[] = "key"; - constexpr char kAuthenticationScope[] = -- "https://www.googleapis.com/auth/googlenow"; -+ "https://www.9oo91eapis.qjz9zk/auth/googlenow"; - constexpr char kAuthorizationRequestHeaderFormat[] = "Bearer %s"; - - constexpr char kContentEncoding[] = "Content-Encoding"; diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core/v2/feed_network_impl.cc --- a/components/feed/core/v2/feed_network_impl.cc +++ b/components/feed/core/v2/feed_network_impl.cc -@@ -48,10 +48,10 @@ namespace { +@@ -47,10 +47,10 @@ namespace feed { + namespace { constexpr char kApplicationXProtobuf[] = "application/x-protobuf"; constexpr base::TimeDelta kNetworkTimeout = base::TimeDelta::FromSeconds(30); - constexpr char kUploadActionUrl[] = -- "https://discover-pa.googleapis.com/v1/actions:upload"; -+ "https://discover-pa.9oo91eapis.qjz9zk/v1/actions:upload"; +-constexpr char kDiscoverHost[] = "https://discover-pa.googleapis.com/"; ++constexpr char kDiscoverHost[] = "https://discover-pa.9oo91eapis.qjz9zk/"; signin::ScopeSet GetAuthScopes() { - return {"https://www.googleapis.com/auth/googlenow"}; @@ -12978,7 +12461,7 @@ 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) { +@@ -59,15 +59,15 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { case feedwire::FeedQuery::SCHEDULED_REFRESH: case feedwire::FeedQuery::IN_PLACE_UPDATE: return GURL( @@ -13000,19 +12483,19 @@ 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 -@@ -51,7 +51,7 @@ const base::Feature kXsurfaceMetricsReporting{ +@@ -55,7 +55,7 @@ const base::Feature kWebFeed{"WebFeed", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kXsurfaceMetricsReporting{ "XsurfaceMetricsReporting", base::FEATURE_DISABLED_BY_DEFAULT}; - const char kDefaultReferrerUrl[] = -- "https://www.googleapis.com/auth/chrome-content-suggestions"; -+ "https://www.9oo91eapis.qjz9zk/auth/chrome-content-suggestions"; +-const char kDefaultReferrerUrl[] = "https://www.google.com/"; ++const char kDefaultReferrerUrl[] = "https://www.9oo91e.qjz9zk/"; std::string GetFeedReferrerUrl() { const base::Feature* feature = base::FeatureList::IsEnabled(kInterestFeedV2) diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feedback_uploader.cc --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc -@@ -25,7 +25,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = +@@ -26,7 +26,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = FILE_PATH_LITERAL("Feedback Reports"); constexpr char kFeedbackPostUrl[] = @@ -13080,7 +12563,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc diff --git a/components/history/core/browser/browsing_history_service.cc b/components/history/core/browser/browsing_history_service.cc --- a/components/history/core/browser/browsing_history_service.cc +++ b/components/history/core/browser/browsing_history_service.cc -@@ -277,7 +277,7 @@ void BrowsingHistoryService::QueryHistoryInternal( +@@ -281,7 +281,7 @@ void BrowsingHistoryService::QueryHistoryInternal( semantics { description: "If history sync is enabled, this downloads the synced " @@ -13089,7 +12572,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo trigger: "Synced history is downloaded when user opens the history " "page, searches on the history page, or scrolls down the " -@@ -400,7 +400,7 @@ void BrowsingHistoryService::RemoveVisits( +@@ -404,7 +404,7 @@ void BrowsingHistoryService::RemoveVisits( semantics { description: "If a user who syncs their browsing history deletes one or more " @@ -13187,6 +12670,18 @@ diff --git a/components/keyed_service/core/keyed_service_base_factory.cc b/compo "change."); dependency_manager_->AddComponent(this); +diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc +--- a/components/lens/lens_features.cc ++++ b/components/lens/lens_features.cc +@@ -16,7 +16,7 @@ constexpr base::FeatureParam kMaxPixels{&kLensStandalone, + "dimensions-max-pixels", 1000}; + + constexpr base::FeatureParam kHomepageURL{ +- &kLensStandalone, "lens-homepage-url", "https://lens.google.com/"}; ++ &kLensStandalone, "lens-homepage-url", "https://lens.9oo91e.qjz9zk/"}; + + int GetMaxPixels() { + return kMaxPixels.Get(); diff --git a/components/media_router/common/media_source.h b/components/media_router/common/media_source.h --- a/components/media_router/common/media_source.h +++ b/components/media_router/common/media_source.h @@ -13202,7 +12697,7 @@ diff --git a/components/media_router/common/media_source.h b/components/media_ro diff --git a/components/metrics/net/net_metrics_log_uploader.cc b/components/metrics/net/net_metrics_log_uploader.cc --- a/components/metrics/net/net_metrics_log_uploader.cc +++ b/components/metrics/net/net_metrics_log_uploader.cc -@@ -83,7 +83,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( +@@ -80,7 +80,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation( "Usage statistics contain information such as preferences, button " "clicks, and memory usage and do not include web page URLs or " "personal information. See more at " @@ -13261,7 +12756,7 @@ diff --git a/components/net_log/resources/net_export.html b/components/net_log/r - - See the Chromium website for more detailed instructions. + See the Chromium website for more detailed instructions.
@@ -166,7 +166,7 @@ logging once the issue has reproduced. @@ -13416,16 +12911,16 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo "(?::[0-9]+)?\\/" // Port. "(?:\\S*)" // Non-whitespace chars. "(?:" -@@ -381,7 +381,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( - // True if not explicitly in keyword mode, or a Drive suggestion. - return !IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) || - base::StartsWith(input.text(), -- base::ASCIIToUTF16("drive.google.com"), -+ base::ASCIIToUTF16("drive.9oo91e.qjz9zk"), - base::CompareCase::SENSITIVE); - } - return true; -@@ -901,7 +901,7 @@ ACMatchClassifications DocumentProvider::Classify( +@@ -380,7 +380,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( + template_url_service, &keyword_input); + if (keyword_provider && + IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) && +- !base::StartsWith(input.text(), base::ASCIIToUTF16("drive.google.com"), ++ !base::StartsWith(input.text(), base::ASCIIToUTF16("drive.9oo91e.qjz9zk"), + base::CompareCase::SENSITIVE)) { + return false; + } +@@ -936,7 +936,7 @@ ACMatchClassifications DocumentProvider::Classify( // static const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Early exit to avoid unnecessary and more involved checks. @@ -13434,7 +12929,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo return GURL(); // We aim to prevent duplicate Drive URLs to appear between the Drive document -@@ -912,7 +912,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -947,7 +947,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Drive redirects are already handled by the regex in |ExtractDocIdFromUrl|. // The below logic handles google.com redirects; e.g., google.com/url/q= std::string url_str; @@ -13443,7 +12938,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo if ((!net::GetValueForKeyInQuery(url, "q", &url_str) || url_str.empty()) && (!net::GetValueForKeyInQuery(url, "url", &url_str) || url_str.empty())) return GURL(); -@@ -929,5 +929,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -964,5 +964,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Canonicalize to the /open form without any extra args. // This is similar to what we expect from the server. @@ -13607,7 +13102,7 @@ diff --git a/components/password_manager/core/browser/leak_detection/leak_detect diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc --- a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc -@@ -25,7 +25,7 @@ namespace password_manager { +@@ -26,7 +26,7 @@ namespace password_manager { namespace { constexpr char kAPIScope[] = @@ -13708,22 +13203,10 @@ diff --git a/components/password_manager/core/browser/password_scripts_fetcher_i constexpr base::FeatureParam kScriptsListUrlParam{ &features::kPasswordScriptsFetching, "custom_list_url", -diff --git a/components/password_manager/core/browser/password_scripts_fetcher_impl_unittests.cc b/components/password_manager/core/browser/password_scripts_fetcher_impl_unittests.cc ---- a/components/password_manager/core/browser/password_scripts_fetcher_impl_unittests.cc -+++ b/components/password_manager/core/browser/password_scripts_fetcher_impl_unittests.cc -@@ -345,7 +345,7 @@ TEST_F(PasswordScriptsFetcherImplTest, IsScriptAvailable) { - TEST_F(PasswordScriptsFetcherImplTest, AnotherScriptsListUrl) { - // Create a special fetcher with a non-default URL. - const char kNonDefaultScriptsListUrl[] = -- "https://gstatic.com/experimental_list.json"; -+ "https://95tat1c.qjz9zk/experimental_list.json"; - network::TestURLLoaderFactory test_url_loader_factory; - scoped_refptr test_shared_loader_factory = - base::MakeRefCounted( diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -298,10 +298,10 @@ void PasswordStore::GetLogins(const FormDigest& form, +@@ -297,10 +297,10 @@ void PasswordStore::GetLogins(const FormDigest& form, // TODO(mdm): actually delete them at some point, say M24 or so. base::Time cutoff; // the null time if (form.scheme == PasswordForm::Scheme::kHtml && @@ -13750,7 +13233,7 @@ diff --git a/components/password_manager/core/browser/password_sync_util.cc b/co } // namespace -@@ -47,7 +47,7 @@ std::string GetSyncUsernameIfSyncingPasswords( +@@ -48,7 +48,7 @@ std::string GetSyncUsernameIfSyncingPasswords( bool IsSyncAccountCredential(const PasswordForm& form, const syncer::SyncService* sync_service, const signin::IdentityManager* identity_manager) { @@ -13809,7 +13292,7 @@ diff --git a/components/password_manager/core/browser/site_affiliation/hash_affi diff --git a/components/password_manager/core/browser/sync_username_test_base.cc b/components/password_manager/core/browser/sync_username_test_base.cc --- a/components/password_manager/core/browser/sync_username_test_base.cc +++ b/components/password_manager/core/browser/sync_username_test_base.cc -@@ -55,7 +55,7 @@ void SyncUsernameTestBase::FakeSigninAs(const std::string& email) { +@@ -58,7 +58,7 @@ void SyncUsernameTestBase::FakeSigninAs(const std::string& email) { // static PasswordForm SyncUsernameTestBase::SimpleGaiaForm(const char* username) { PasswordForm form; @@ -14073,7 +13556,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Allow $3Google Chrome Frame to handle the following content types''', 'desc': '''Allow $3Google Chrome Frame to handle the following content types.''', -@@ -1226,7 +1226,7 @@ +@@ -1227,7 +1227,7 @@ + }, + { + 'name': 'HomepageLocation', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'], +@@ -1236,7 +1236,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14082,7 +13574,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1273,7 +1273,7 @@ +@@ -1253,7 +1253,7 @@ + }, + { + 'name': 'HomepageIsNewTabPage', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], +@@ -1274,7 +1274,7 @@ + }, + { + 'name': 'NewTabPageLocation', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], +@@ -1282,7 +1282,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14091,7 +13601,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1308,7 +1308,7 @@ +@@ -1301,7 +1301,7 @@ + }, + { + 'name': 'DefaultBrowserSettingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'], +@@ -1317,12 +1317,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -14100,7 +13619,103 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Set $1Google Chrome as Default Browser''', }, { -@@ -1581,7 +1581,7 @@ + 'name': 'ApplicationLocaleValue', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.win:8-'], +@@ -1345,7 +1345,7 @@ + }, + { + 'name': 'AlternateErrorPagesEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -1368,7 +1368,7 @@ + }, + { + 'name': 'SearchSuggestEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -1392,7 +1392,7 @@ + }, + { + 'name': 'NativeWindowOcclusionEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -1420,7 +1420,7 @@ + }, + { + 'name': 'WindowOcclusionEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -1456,7 +1456,7 @@ + }, + { + 'name': 'DnsPrefetchingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'], +@@ -1482,7 +1482,7 @@ + }, + { + 'name': 'NetworkPredictionOptions', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -1522,7 +1522,7 @@ + }, + { + 'name': 'WPADQuickCheckEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ], +@@ -1553,7 +1553,7 @@ + }, + { + 'name': 'DisableSpdy', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'], +@@ -1578,7 +1578,7 @@ + }, + { + 'name': 'DisabledSchemes', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -1605,7 +1605,7 @@ + }, + { + 'name': 'GloballyScopeHTTPAuthCacheEnabled', +- 'owners': ['file://net/OWNERS', 'mmenke@chromium.org'], ++ 'owners': ['file://net/OWNERS', 'mmenke@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], +@@ -1629,7 +1629,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -14109,7 +13724,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-'], -@@ -1612,7 +1612,7 @@ +@@ -1660,7 +1660,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -14118,7 +13733,70 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1842,7 +1842,7 @@ +@@ -1707,7 +1707,7 @@ + }, + { + 'name': 'Http09OnNonDefaultPortsEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:54-77', 'chrome_os:54-77'], +@@ -1732,7 +1732,7 @@ + }, + { + 'name': 'JavascriptEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:30-'], +@@ -1755,7 +1755,7 @@ + }, + { + 'name': 'IncognitoEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:11-', 'chrome_os:11-', 'android:30-'], +@@ -1779,7 +1779,7 @@ + }, + { + 'name': 'IncognitoModeAvailability', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -1832,7 +1832,7 @@ + }, + { + 'name': 'SavingBrowserHistoryDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -1855,7 +1855,7 @@ + }, + { + 'name': 'AllowDeletingBrowserHistory', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:57-', 'chrome_os:57-'], +@@ -1873,7 +1873,7 @@ + }, + { + 'name': 'AllowDinosaurEasterEgg', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:48-', 'chrome.*:48-'], +@@ -1892,7 +1892,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -14127,34 +13805,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-87', 'chrome_os:80-87'], -@@ -1865,7 +1865,7 @@ +@@ -1915,7 +1915,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'garykac@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'garykac@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-16', 'chrome_os:14-16'], -@@ -1888,7 +1888,7 @@ +@@ -1938,7 +1938,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'joedow@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'joedow@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -1906,7 +1906,7 @@ +@@ -1956,7 +1956,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'garykac@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'garykac@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -1932,7 +1932,7 @@ +@@ -1982,7 +1982,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -14163,43 +13841,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-', 'chrome_os:41-'], -@@ -1951,7 +1951,7 @@ +@@ -2001,7 +2001,7 @@ }, { 'name': 'RemoteAccessHostDomain', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'yuweih@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'yuweih@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -1969,7 +1969,7 @@ +@@ -2019,7 +2019,7 @@ }, { 'name': 'RemoteAccessHostDomainList', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'yuweih@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'yuweih@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -1995,7 +1995,7 @@ +@@ -2045,7 +2045,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'lambroslambrou@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'lambroslambrou@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2018,7 +2018,7 @@ +@@ -2068,7 +2068,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'joedow@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'joedow@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-75', 'chrome_os:41-75'], -@@ -2034,17 +2034,17 @@ +@@ -2084,17 +2084,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -14216,12 +13894,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'RemoteAccessHostRequireCurtain', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'garykac@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'garykac@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2063,7 +2063,7 @@ +@@ -2113,7 +2113,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -14230,34 +13908,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2082,7 +2082,7 @@ +@@ -2132,7 +2132,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'lambroslambrou@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'lambroslambrou@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2104,7 +2104,7 @@ +@@ -2154,7 +2154,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'garykac@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'garykac@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:36-', 'chrome_os:86-'], -@@ -2123,7 +2123,7 @@ +@@ -2173,7 +2173,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'yuweih@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'yuweih@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:36-', 'chrome_os:41-'], -@@ -2144,7 +2144,7 @@ +@@ -2194,7 +2194,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -14266,7 +13944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-'], -@@ -2163,7 +2163,7 @@ +@@ -2213,7 +2213,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -14275,16 +13953,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2185,7 +2185,7 @@ +@@ -2235,7 +2235,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'garykac@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'garykac@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2205,7 +2205,7 @@ +@@ -2255,7 +2255,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -14293,7 +13971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2223,7 +2223,7 @@ +@@ -2273,7 +2273,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -14302,16 +13980,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:25-47','chrome_os:42-47'], -@@ -2243,7 +2243,7 @@ +@@ -2293,7 +2293,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'lambroslambrou@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'lambroslambrou@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2263,7 +2263,7 @@ +@@ -2313,7 +2313,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -14320,43 +13998,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2283,7 +2283,7 @@ +@@ -2333,7 +2333,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'joedow@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'joedow@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2304,7 +2304,7 @@ - }, - { - 'name': 'RemoteAccessHostAllowRemoteAccessConnections', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:89-'], -@@ -2334,7 +2334,7 @@ - }, - { - 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', -- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], -+ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], - 'type': 'int', - 'schema': { 'type': 'integer', 'minimum': 30, 'maximum': 10080 }, - 'supported_on': ['chrome.*:89-'], @@ -2354,7 +2354,7 @@ + }, + { + 'name': 'RemoteAccessHostAllowRemoteAccessConnections', +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'joedow@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'joedow@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:89-'], +@@ -2384,7 +2384,7 @@ + }, + { + 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', +- 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org', 'joedow@chromium.org'], ++ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk', 'joedow@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 30, 'maximum': 10080 }, + 'supported_on': ['chrome.*:89-'], +@@ -2404,7 +2404,7 @@ + }, + { + 'name': 'DeviceAllowMGSToStoreDisplayProperties', +- 'owners' : ['file://chrome/browser/ash/app_mode/OWNERS', 'apotapchuk@chromium.org'], ++ 'owners' : ['file://chrome/browser/ash/app_mode/OWNERS', 'apotapchuk@ch40m1um.qjz9zk'], + 'type' : 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:90-'], +@@ -2431,7 +2431,7 @@ }, { 'name': 'PrintingEnabled', -- 'owners': ['file://printing/OWNERS', 'thestig@chromium.org'], -+ 'owners': ['file://printing/OWNERS', 'thestig@ch40m1um.qjz9zk'], +- 'owners': ['file://printing/OWNERS', 'thestig@chromium.org', 'rbpotter@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'thestig@ch40m1um.qjz9zk', 'rbpotter@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2378,7 +2378,7 @@ +@@ -2455,7 +2455,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -14365,7 +14052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2396,7 +2396,7 @@ +@@ -2473,7 +2473,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -14374,7 +14061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2437,7 +2437,7 @@ +@@ -2514,7 +2514,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -14383,7 +14070,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2480,7 +2480,7 @@ +@@ -2557,7 +2557,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -14392,7 +14079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2521,7 +2521,7 @@ +@@ -2598,7 +2598,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -14401,7 +14088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2562,7 +2562,7 @@ +@@ -2639,7 +2639,7 @@ }, { 'name': 'PrintingColorDefault', @@ -14410,7 +14097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2597,7 +2597,7 @@ +@@ -2674,7 +2674,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -14419,7 +14106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2638,7 +2638,7 @@ +@@ -2715,7 +2715,7 @@ }, { 'name': 'PrintingPinDefault', @@ -14428,7 +14115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2673,7 +2673,7 @@ +@@ -2750,7 +2750,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -14437,7 +14124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2708,7 +2708,7 @@ +@@ -2785,7 +2785,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -14446,7 +14133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -2894,7 +2894,7 @@ +@@ -2971,7 +2971,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -14455,7 +14142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -2913,7 +2913,7 @@ +@@ -2990,7 +2990,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -14464,7 +14151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 1 }, 'supported_on': ['chrome_os:84-'], -@@ -2931,7 +2931,7 @@ +@@ -3008,7 +3008,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -14473,7 +14160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:84-', 'chrome_os:84-', 'android:84-', 'webview_android:84-'], -@@ -2949,7 +2949,7 @@ +@@ -3026,7 +3026,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -14482,7 +14169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': -1 }, 'supported_on': ['chrome_os:79-'], -@@ -2971,7 +2971,7 @@ +@@ -3048,7 +3048,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -14491,7 +14178,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2995,7 +2995,7 @@ +@@ -3072,7 +3072,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -14500,7 +14187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3016,7 +3016,7 @@ +@@ -3093,7 +3093,7 @@ }, { 'name': 'ForceSafeSearch', @@ -14509,7 +14196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'], -@@ -3040,7 +3040,7 @@ +@@ -3117,7 +3117,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -14518,7 +14205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -3059,7 +3059,7 @@ +@@ -3136,7 +3136,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -14527,7 +14214,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -3153,7 +3153,7 @@ +@@ -3161,7 +3161,7 @@ + }, + { + 'name': 'ForceYouTubeRestrict', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -3205,7 +3205,7 @@ + }, + { + 'name': 'SafeBrowsingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3230,7 +3230,7 @@ If you set this policy, users can't change it or override the "Enable phishing and malware protection" setting in Chrome. If not set, "Enable phishing and malware protection" is set to True, but the user can change it. @@ -14536,7 +14241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy SafeBrowsingProtectionLevel is set, the value of the policy SafeBrowsingEnabled is ignored. -@@ -3161,7 +3161,7 @@ +@@ -3238,7 +3238,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -14545,7 +14250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3211,7 +3211,7 @@ +@@ -3288,12 +3288,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -14554,7 +14259,58 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'This policy is not supported within Arc.', }, { -@@ -3369,7 +3369,7 @@ + 'name': 'MetricsReportingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3321,7 +3321,7 @@ + }, + { + 'name': 'PasswordManagerEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3348,7 +3348,7 @@ + }, + { + 'name': 'PasswordManagerAllowShowPasswords', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-50', 'chrome_os:11-50'], +@@ -3371,7 +3371,7 @@ + }, + { + 'name': 'PasswordLeakDetectionEnabled', +- 'owners': ['file://components/password_manager/OWNERS', 'mamir@chromium.org'], ++ 'owners': ['file://components/password_manager/OWNERS', 'mamir@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3396,7 +3396,7 @@ + }, + { + 'name': 'AutoFillEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3424,7 +3424,7 @@ + }, + { + 'name': 'AutofillAddressEnabled', +- 'owners': ['file://components/autofill/OWNERS', 'sebsg@chromium.org'], ++ 'owners': ['file://components/autofill/OWNERS', 'sebsg@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -3448,7 +3448,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -14563,7 +14319,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3550,7 +3550,7 @@ +@@ -3472,7 +3472,7 @@ + }, + { + 'name': 'DisabledPlugins', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -3503,7 +3503,7 @@ + }, + { + 'name': 'EnabledPlugins', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -3534,7 +3534,7 @@ + }, + { + 'name': 'DisabledPluginsExceptions', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -3567,7 +3567,7 @@ + }, + { + 'name': 'AlwaysOpenPdfExternally', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:55-'], +@@ -3585,7 +3585,7 @@ + }, + { + 'name': 'DisablePluginFinder', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:11-64', 'chrome_os:11-64'], +@@ -3605,7 +3605,7 @@ + }, + { + 'name': 'SyncDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], +@@ -3629,7 +3629,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -14572,7 +14382,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3606,7 +3606,7 @@ +@@ -3650,7 +3650,7 @@ + }, + { + 'name': 'RoamingProfileSupportEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], +@@ -3669,7 +3669,7 @@ + }, + { + 'name': 'RoamingProfileLocation', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], +@@ -3685,7 +3685,7 @@ If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used. @@ -14581,7 +14409,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli On non-Windows platforms, this policy must be set for roaming profiles to work. -@@ -3615,7 +3615,7 @@ +@@ -3694,7 +3694,7 @@ }, { 'name': 'SigninAllowed', @@ -14590,7 +14418,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -3678,7 +3678,7 @@ +@@ -3715,7 +3715,7 @@ + }, + { + 'name': 'EnableDeprecatedWebBasedSignin', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:35-42'], +@@ -3738,7 +3738,7 @@ + }, + { + 'name': 'UserDataDir', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.win:11-', 'chrome.mac:11-'], +@@ -3757,14 +3757,14 @@ If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a directory used for other purposes, because $1Google Chrome manages its contents. @@ -14599,7 +14445,15 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is left not set the default profile path will be used and the user will be able to override it with the '--user-data-dir' command line flag.''', 'label': '''Set user data directory''', -@@ -3701,7 +3701,7 @@ + }, + { + 'name': 'DiskCacheDir', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:13-'], +@@ -3780,12 +3780,12 @@ If not set, $1Google Chrome uses the default cache directory, but users can change that setting with the --disk-cache-dir command line flag. @@ -14608,7 +14462,22 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Set disk cache directory''', }, { -@@ -3749,7 +3749,7 @@ + 'name': 'DiskCacheSize', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome.*:17-'], +@@ -3806,7 +3806,7 @@ + }, + { + 'name': 'MediaCacheSize', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome.*:17-71'], +@@ -3828,7 +3828,7 @@ }, { 'name': 'DownloadRestrictions', @@ -14617,7 +14486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3806,7 +3806,7 @@ +@@ -3885,12 +3885,12 @@ * No special restrictions means the downloads go through the usual security restrictions based on safety analysis results. @@ -14626,7 +14495,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Download restrictions''', }, { -@@ -3828,13 +3828,13 @@ + 'name': 'DownloadDirectory', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:11-', 'chrome_os:35-'], +@@ -3907,13 +3907,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. @@ -14637,12 +14512,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AutoOpenFileTypes', -- 'owners': ['csharp@chromium.org', 'qinmin@chromium.org'], -+ 'owners': ['csharp@ch40m1um.qjz9zk', 'qinmin@ch40m1um.qjz9zk'], +- 'owners': ['csharp@chromium.org', 'qinmin@chromium.org', 'pastarmovj@chromium.org'], ++ 'owners': ['csharp@ch40m1um.qjz9zk', 'qinmin@ch40m1um.qjz9zk', 'pastarmovj@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -3861,7 +3861,7 @@ +@@ -3940,7 +3940,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -14651,12 +14526,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3884,11 +3884,11 @@ +@@ -3963,11 +3963,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. -- A URL pattern has to be formatted according to https://www.chromium.org/administrators/url-blacklist-filter-format.''', -+ A URL pattern has to be formatted according to https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format.''', +- A URL pattern has to be formatted according to https://www.chromium.org/administrators/url-blocklist-filter-format.''', ++ A URL pattern has to be formatted according to https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format.''', }, { 'name': 'AutoLaunchProtocolsFromOrigins', @@ -14665,12 +14540,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -3921,13 +3921,13 @@ +@@ -4000,13 +4000,13 @@ If this policy is not set, no protocols can launch without a prompt by default. Users may opt out of prompts on a per-protocol/per-site basis unless the ExternalProtocolDialogShowAlwaysOpenCheckbox policy is set to Disabled. This policy has no impact on per-protocol/per-site prompt exemptions set by users. -- The origin matching patterns use a similar format to those for the 'URLBlocklist' policy, which are documented at http://www.chromium.org/administrators/url-blacklist-filter-format. -+ The origin matching patterns use a similar format to those for the 'URLBlocklist' policy, which are documented at http://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format. +- The origin matching patterns use a similar format to those for the 'URLBlocklist' policy, which are documented at http://www.chromium.org/administrators/url-blocklist-filter-format. ++ The origin matching patterns use a similar format to those for the 'URLBlocklist' policy, which are documented at http://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format. However, origin matching patterns for this policy cannot contain "/path" or "@query" elements. Any pattern that does contain a "/path" or "@query" element will be ignored.''', }, @@ -14681,7 +14556,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -3981,7 +3981,7 @@ +@@ -4041,7 +4041,7 @@ + }, + { + 'name': 'ClearSiteDataOnExit', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'], +@@ -4060,7 +4060,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -14690,7 +14574,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4069,7 +4069,7 @@ +@@ -4080,7 +4080,7 @@ + }, + { + 'name': 'ProxyMode', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -4148,11 +4148,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -14699,7 +14592,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'ProxyServerMode', -@@ -4129,7 +4129,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -4208,7 +4208,7 @@ If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps. For detailed examples, visit: @@ -14708,7 +14606,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line. -@@ -4161,7 +4161,7 @@ +@@ -4217,7 +4217,7 @@ + }, + { + 'name': 'ProxyServer', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -4240,12 +4240,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -14717,7 +14624,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, { -@@ -4189,7 +4189,7 @@ + 'name': 'ProxyPacUrl', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -4268,12 +4268,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -14726,7 +14639,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, { -@@ -4217,7 +4217,7 @@ + 'name': 'ProxyBypassList', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -4296,13 +4296,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -14735,7 +14654,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Comma-separated list of proxy bypass rules''', 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, -@@ -4270,7 +4270,7 @@ + { + 'name': 'ProxySettings', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -4349,12 +4349,12 @@ * fixed_server, the ProxyServer and ProxyBypassList fields are used. * pac_script, the ProxyPacUrl and ProxyBypassList fields are used. @@ -14744,7 +14670,85 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'Only a subset of proxy configuration options are made available to Android apps. Android apps may voluntarily choose to use the proxy. You cannot force them to use a proxy.', }, { -@@ -4472,7 +4472,7 @@ + 'name': 'AuthSchemes', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'], +@@ -4384,7 +4384,7 @@ + }, + { + 'name': 'DisableAuthNegotiateCnameLookup', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'], +@@ -4402,7 +4402,7 @@ + }, + { + 'name': 'EnableAuthNegotiatePort', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:9-','chrome_os:62-'], +@@ -4420,7 +4420,7 @@ + }, + { + 'name': 'BasicAuthOverHttpEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:88-','chrome_os:88-'], +@@ -4451,7 +4451,7 @@ + }, + { + 'name': 'AuthServerWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:9-','android:46-','webview_android:49-','chrome_os:62-'], +@@ -4474,7 +4474,7 @@ + }, + { + 'name': 'AuthServerAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:86-','android:86-','webview_android:86-','chrome_os:86-'], +@@ -4494,7 +4494,7 @@ + }, + { + 'name': 'AuthNegotiateDelegateWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'], +@@ -4515,7 +4515,7 @@ + }, + { + 'name': 'AuthNegotiateDelegateAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:86-','android:86-','chrome_os:86-'], +@@ -4533,7 +4533,7 @@ + }, + { + 'name': 'AuthNegotiateDelegateByKdcPolicy', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.linux:74-','chrome.mac:74-','chrome_os:74-'], +@@ -4553,7 +4553,7 @@ }, { 'name': 'BrowserLabsEnabled', @@ -14753,7 +14757,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema' : {'type': 'boolean'}, 'supported_on': ['chrome.*:89-'], -@@ -4534,7 +4534,7 @@ +@@ -4585,7 +4585,7 @@ + }, + { + 'name': 'GSSAPILibraryName', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.linux:9-'], +@@ -4603,7 +4603,7 @@ + }, + { + 'name': 'AuthAndroidNegotiateAccountType', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['android:46-','webview_android:49-'], +@@ -4615,13 +4615,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -14762,7 +14784,68 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Leaving the policy unset turns off HTTP Negotiate authentication on Android.''', }, -@@ -4699,7 +4699,7 @@ + { + 'name': 'AllowCrossOriginAuthPrompt', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:13-','chrome_os:62-'], +@@ -4641,7 +4641,7 @@ + }, + { + 'name': 'NtlmV2Enabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], +@@ -4672,7 +4672,7 @@ + }, + { + 'name': 'ExtensionInstallBlacklist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4698,7 +4698,7 @@ + { + + 'name': 'ExtensionInstallBlocklist', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4722,7 +4722,7 @@ + }, + { + 'name': 'ExtensionInstallAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4746,7 +4746,7 @@ + }, + { + 'name': 'ExtensionInstallWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4769,7 +4769,7 @@ + }, + { + 'name': 'ExtensionInstallForcelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4780,7 +4780,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14771,7 +14854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 34, 'caption': '''Configure the list of force-installed apps and extensions''', 'tags': ['full-admin-access'], -@@ -4715,9 +4715,9 @@ +@@ -4796,15 +4796,15 @@ The source code of any extension may be altered by users through developer tools, potentially rendering the extension dysfunctional. If this is a concern, set the DeveloperToolsDisabled policy. @@ -14783,7 +14866,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Extension/App IDs and update URLs to be silently installed''', 'arc_support': 'Android apps can be force-installed from the Google Admin console using Google Play. They do not use this policy.', }, -@@ -4741,14 +4741,14 @@ + { + 'name': 'ExtensionInstallSources', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4822,14 +4822,14 @@ 'tags': ['full-admin-access', 'system-security'], 'desc': '''Setting the policy specifies which URLs may install extensions, apps, and themes. Before $1Google Chrome 21, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. Afterwards, such files must be downloaded and dragged to the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow. @@ -14800,7 +14890,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -4917,7 +4917,7 @@ +@@ -4850,7 +4850,7 @@ + }, + { + 'name': 'ExtensionAllowedTypes', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -4903,7 +4903,7 @@ + }, + { + 'name': 'ExtensionSettings', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -4998,7 +4998,7 @@ }, }, }, @@ -14809,7 +14917,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -4974,7 +4974,7 @@ +@@ -5055,13 +5055,13 @@ 'tags': [], 'desc': '''Setting the policy controls extension management settings for $1Google Chrome, including any controlled by existing extension-related policies. The policy supersedes any legacy policies that might be set. @@ -14818,7 +14926,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Note: For Windows® instances not joined to a Microsoft® Active Directory® domain, forced installation is limited to apps and extensions listed in the Chrome Web Store.''', }, -@@ -4998,7 +4998,7 @@ + { + 'name': 'BlockExternalExtensions', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:80-'], +@@ -5079,12 +5079,12 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -14827,7 +14942,49 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ''', }, { -@@ -5142,7 +5142,7 @@ + 'name': 'ShowHomeButton', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], +@@ -5103,7 +5103,7 @@ + }, + { + 'name': 'DeveloperToolsDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:9-', 'chrome_os:11-'], +@@ -5129,7 +5129,7 @@ + }, + { + 'name': 'DeveloperToolsAvailability', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5168,7 +5168,7 @@ + }, + { + 'name': 'RestoreOnStartup', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5211,7 +5211,7 @@ + }, + { + 'name': 'RestoreOnStartupURLs', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -5223,7 +5223,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -14836,7 +14993,268 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -5986,7 +5986,7 @@ +@@ -5235,7 +5235,7 @@ + }, + { + 'name': 'BlockThirdPartyCookies', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:10-', 'chrome_os:11-', 'android:83-'], +@@ -5269,7 +5269,7 @@ + }, + { + 'name': 'DefaultSearchProviderEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -5294,7 +5294,7 @@ + }, + { + 'name': 'DefaultSearchProviderContextMenuAccessAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:85-', 'chrome_os:85-'], +@@ -5316,7 +5316,7 @@ + }, + { + 'name': 'DefaultSearchProviderName', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5339,7 +5339,7 @@ + }, + { + 'name': 'DefaultSearchProviderKeyword', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5362,7 +5362,7 @@ + }, + { + 'name': 'DefaultSearchProviderSearchURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5385,7 +5385,7 @@ + }, + { + 'name': 'DefaultSearchProviderSuggestURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5408,7 +5408,7 @@ + }, + { + 'name': 'DefaultSearchProviderInstantURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:10-63', 'chrome_os:11-63', 'android:30-63'], +@@ -5431,7 +5431,7 @@ + }, + { + 'name': 'DefaultSearchProviderIconURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5454,7 +5454,7 @@ + }, + { + 'name': 'DefaultSearchProviderEncodings', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -5480,7 +5480,7 @@ + }, + { + 'name': 'DefaultSearchProviderAlternateURLs', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -5506,7 +5506,7 @@ + }, + { + 'name': 'DefaultSearchProviderSearchTermsReplacementKey', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:25-63', 'chrome_os:25-63', 'android:30-63'], +@@ -5527,7 +5527,7 @@ + }, + { + 'name': 'DefaultSearchProviderImageURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5550,7 +5550,7 @@ + }, + { + 'name': 'DefaultSearchProviderNewTabURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5573,7 +5573,7 @@ + }, + { + 'name': 'DefaultSearchProviderSearchURLPostParams', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5596,7 +5596,7 @@ + }, + { + 'name': 'DefaultSearchProviderSuggestURLPostParams', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5619,7 +5619,7 @@ + }, + { + 'name': 'DefaultSearchProviderInstantURLPostParams', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:29-63', 'chrome_os:29-63', 'android:30-63'], +@@ -5640,7 +5640,7 @@ + }, + { + 'name': 'DefaultSearchProviderImageURLPostParams', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ +@@ -5663,7 +5663,7 @@ + }, + { + 'name': 'DefaultCookiesSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5709,7 +5709,7 @@ + }, + { + 'name': 'DefaultImagesSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5742,7 +5742,7 @@ + }, + { + 'name': 'DefaultJavaScriptSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5775,7 +5775,7 @@ + }, + { + 'name': 'DefaultPluginsSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5816,7 +5816,7 @@ + }, + { + 'name': 'DefaultPopupsSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5854,7 +5854,7 @@ + }, + { + 'name': 'DefaultNotificationsSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5892,7 +5892,7 @@ + }, + { + 'name': 'DefaultGeolocationSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5931,7 +5931,7 @@ + }, + { + 'name': 'DefaultMediaStreamSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5965,7 +5965,7 @@ + }, + { + 'name': 'DefaultWebBluetoothGuardSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -5999,7 +5999,7 @@ + }, + { + 'name': 'DefaultKeygenSetting', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -6033,7 +6033,7 @@ + }, + { + 'name': 'DefaultSensorsSetting', +- 'owners': ['file://third_party/blink/renderer/modules/sensor/OWNERS', 'reillyg@chromium.org'], ++ 'owners': ['file://third_party/blink/renderer/modules/sensor/OWNERS', 'reillyg@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -6067,7 +6067,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -14845,7 +15263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6020,7 +6020,7 @@ +@@ -6101,7 +6101,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -14854,7 +15272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6052,7 +6052,7 @@ +@@ -6133,7 +6133,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -14863,7 +15281,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.''', -@@ -6067,7 +6067,7 @@ +@@ -6148,7 +6148,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -14872,7 +15290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -6100,7 +6100,7 @@ +@@ -6181,7 +6181,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -14881,7 +15299,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.''', -@@ -6113,7 +6113,7 @@ +@@ -6194,7 +6194,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -14890,7 +15308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6134,11 +6134,11 @@ +@@ -6215,11 +6215,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -14904,7 +15322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6159,11 +6159,11 @@ +@@ -6240,11 +6240,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -14918,7 +15336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6197,7 +6197,7 @@ +@@ -6278,7 +6278,7 @@ }, { 'name': 'SerialAskForUrls', @@ -14927,7 +15345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6220,11 +6220,11 @@ +@@ -6301,11 +6301,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -14941,7 +15359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6247,11 +6247,11 @@ +@@ -6328,11 +6328,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -14955,7 +15373,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6285,7 +6285,7 @@ +@@ -6366,7 +6366,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -14964,7 +15382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6319,7 +6319,7 @@ +@@ -6400,7 +6400,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -14973,7 +15391,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6340,11 +6340,11 @@ +@@ -6421,11 +6421,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -14987,7 +15405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6365,11 +6365,11 @@ +@@ -6446,11 +6446,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15001,7 +15419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6390,11 +6390,11 @@ +@@ -6471,11 +6471,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -15015,7 +15433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6415,7 +6415,7 @@ +@@ -6496,11 +6496,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -15024,7 +15442,21 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AutoSelectCertificateForUrls', -@@ -6534,7 +6534,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6560,7 +6560,7 @@ + }, + { + 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6615,11 +6615,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -15033,7 +15465,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesAllowedForUrls', -@@ -6563,7 +6563,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6644,11 +6644,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. @@ -15042,7 +15479,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesBlockedForUrls', -@@ -6592,7 +6592,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6673,11 +6673,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -15051,7 +15493,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'CookiesSessionOnlyForUrls', -@@ -6623,7 +6623,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6704,11 +6704,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -15060,7 +15507,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'ImagesAllowedForUrls', -@@ -6646,7 +6646,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6727,13 +6727,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15069,7 +15521,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Note that previously this policy was erroneously enabled on Android, but this functionality has never been fully supported on Android.''', }, -@@ -6671,7 +6671,7 @@ + { + 'name': 'ImagesBlockedForUrls', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6752,13 +6752,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15078,7 +15537,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Note that previously this policy was erroneously enabled on Android, but this functionality has never been fully supported on Android.''', }, -@@ -6696,7 +6696,7 @@ + { + 'name': 'JavaScriptAllowedForUrls', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6777,11 +6777,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15087,7 +15553,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'JavaScriptBlockedForUrls', -@@ -6719,7 +6719,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6800,11 +6800,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15096,7 +15567,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'KeygenAllowedForUrls', -@@ -6743,7 +6743,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6824,11 +6824,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. @@ -15105,7 +15581,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'KeygenBlockedForUrls', -@@ -6767,11 +6767,11 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -6848,11 +6848,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. @@ -15119,7 +15600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6802,13 +6802,13 @@ +@@ -6883,13 +6883,13 @@ 'id': 623, 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], @@ -15135,7 +15616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6827,7 +6827,7 @@ +@@ -6908,7 +6908,7 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -15144,7 +15625,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. -@@ -6836,9 +6836,9 @@ +@@ -6917,9 +6917,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -15157,7 +15638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -6865,7 +6865,7 @@ +@@ -6946,7 +6946,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. @@ -15166,7 +15647,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. -@@ -6874,9 +6874,9 @@ +@@ -6955,9 +6955,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -15179,7 +15660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -6905,7 +6905,7 @@ +@@ -6986,11 +6986,11 @@ Note that this policy only affects insecure origins, so secure origins (e.g. https://example.com) included in this list will be ignored. @@ -15188,7 +15669,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PluginsAllowedForUrls', -@@ -6929,7 +6929,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7010,11 +7010,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15197,7 +15683,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PluginsBlockedForUrls', -@@ -6953,7 +6953,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7034,11 +7034,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15206,7 +15697,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'PopupsAllowedForUrls', -@@ -6981,7 +6981,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7062,11 +7062,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15215,7 +15711,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'RegisteredProtocolHandlers', -@@ -7015,7 +7015,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -7096,7 +7096,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -15224,7 +15725,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -7050,7 +7050,7 @@ +@@ -7107,7 +7107,7 @@ + }, + { + 'name': 'PopupsBlockedForUrls', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7131,11 +7131,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15233,7 +15743,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'NotificationsAllowedForUrls', -@@ -7073,7 +7073,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7154,11 +7154,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15242,7 +15757,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'NotificationsBlockedForUrls', -@@ -7096,7 +7096,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7177,11 +7177,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -15251,7 +15771,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsAllowedForUrls', -@@ -7121,7 +7121,7 @@ +- 'owners': ['file://third_party/blink/renderer/modules/sensor/OWNERS', 'timvolodine@chromium.org'], ++ 'owners': ['file://third_party/blink/renderer/modules/sensor/OWNERS', 'timvolodine@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7202,7 +7202,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. @@ -15260,7 +15785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -7146,7 +7146,7 @@ +@@ -7227,11 +7227,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. @@ -15269,7 +15794,48 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'NativeMessagingBlacklist', -@@ -7274,7 +7274,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7259,7 +7259,7 @@ + }, + { + 'name': 'NativeMessagingBlocklist', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7284,7 +7284,7 @@ + }, + { + 'name': 'NativeMessagingWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7312,7 +7312,7 @@ + }, + { + 'name': 'NativeMessagingAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7337,7 +7337,7 @@ + }, + { + 'name': 'NativeMessagingUserLevelHosts', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:34-'], +@@ -7355,7 +7355,7 @@ }, { 'name': 'Disable3DAPIs', @@ -15278,7 +15844,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-', 'chrome_os:11-'], -@@ -7312,7 +7312,7 @@ +@@ -7373,7 +7373,7 @@ + }, + { + 'name': 'PolicyRefreshRate', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 1800000, 'maximum': 86400000 }, + 'supported_on': ['chrome_os:11-', 'chrome.*:79-', 'ios:90-'], +@@ -7393,7 +7393,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -15287,7 +15862,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-'], -@@ -7331,7 +7331,7 @@ +@@ -7412,7 +7412,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -15296,7 +15871,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7382,7 +7382,7 @@ +@@ -7444,7 +7444,7 @@ + }, + { + 'name': 'RenderInChromeFrameList', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7463,11 +7463,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -15305,7 +15889,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'RenderInHostList', -@@ -7405,7 +7405,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -7486,11 +7486,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -15314,7 +15903,21 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AdditionalLaunchParameters', -@@ -7449,7 +7449,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_frame:19-32'], +@@ -7508,7 +7508,7 @@ + }, + { + 'name': 'SkipMetadataCheck', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_frame:31-32'], +@@ -7530,7 +7530,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -15323,7 +15926,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7470,7 +7470,7 @@ +@@ -7551,7 +7551,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -15332,7 +15935,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -7491,7 +7491,7 @@ +@@ -7572,7 +7572,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -15341,7 +15944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7545,7 +7545,7 @@ +@@ -7626,7 +7626,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -15350,7 +15953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -7570,7 +7570,7 @@ +@@ -7651,7 +7651,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -15359,25 +15962,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -7590,7 +7590,7 @@ +@@ -7671,7 +7671,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', -- 'owners': ['fabiansommer@chromium.org, emaxx@chromium.org'], -+ 'owners': ['fabiansommer@ch40m1um.qjz9zk, emaxx@ch40m1um.qjz9zk'], +- 'owners': ['fabiansommer@chromium.org, emaxx@chromium.org', 'fabiansommer@chromium.org'], ++ 'owners': ['fabiansommer@ch40m1um.qjz9zk, emaxx@ch40m1um.qjz9zk', 'fabiansommer@ch40m1um.qjz9zk'], 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -7626,7 +7626,7 @@ +@@ -7707,7 +7707,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', -- 'owners': ['fabiansommer@chromium.org, emaxx@chromium.org'], -+ 'owners': ['fabiansommer@ch40m1um.qjz9zk, emaxx@ch40m1um.qjz9zk'], +- 'owners': ['fabiansommer@chromium.org, emaxx@chromium.org', 'fabiansommer@chromium.org'], ++ 'owners': ['fabiansommer@ch40m1um.qjz9zk, emaxx@ch40m1um.qjz9zk', 'fabiansommer@ch40m1um.qjz9zk'], 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, - 'future_on': ['chrome_os'], -@@ -7642,7 +7642,7 @@ + 'supported_on': ['chrome_os:90-'], +@@ -7723,7 +7723,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -15386,7 +15989,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-'], -@@ -7671,7 +7671,7 @@ +@@ -7752,11 +7752,11 @@ This policy will be removed in $1Google Chrome version 95. @@ -15395,7 +15998,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'InstantEnabled', -@@ -7703,7 +7703,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'], +@@ -7784,7 +7784,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -15404,7 +16012,79 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -7909,7 +7909,7 @@ +@@ -7804,7 +7804,7 @@ + }, + { + 'name': 'TranslateEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -7828,7 +7828,7 @@ + }, + { + 'name': 'AllowOutdatedPlugins', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:12-87', 'chrome_os:12-87'], +@@ -7847,7 +7847,7 @@ + }, + { + 'name': 'AlwaysAuthorizePlugins', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:13-64', 'chrome_os:13-64'], +@@ -7866,7 +7866,7 @@ + }, + { + 'name': 'RunAllFlashInAllowMode', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], +@@ -7886,7 +7886,7 @@ + }, + { + 'name': 'BookmarkBarEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:12-', 'chrome_os:12-'], +@@ -7905,7 +7905,7 @@ + }, + { + 'name': 'EditBookmarksEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -7928,7 +7928,7 @@ + }, + { + 'name': 'ShowAppsShortcutInBookmarkBar', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:37-'], +@@ -7961,7 +7961,7 @@ + }, + { + 'name': 'AllowFileSelectionDialogs', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:12-'], +@@ -7990,7 +7990,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -15413,7 +16093,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -7930,7 +7930,7 @@ +@@ -8011,7 +8011,7 @@ }, { 'name': 'GCFUserDataDir', @@ -15422,7 +16102,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -7946,7 +7946,7 @@ +@@ -8027,14 +8027,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -15431,43 +16111,159 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this setting is left not set the default profile directory will be used.''', 'label': '''Set user data directory''', -@@ -8155,7 +8155,7 @@ + }, + { + 'name': 'DevicePolicyRefreshRate', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:11-'], +@@ -8055,7 +8055,7 @@ + }, + { + 'name': 'ImportBookmarks', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-'], +@@ -8076,7 +8076,7 @@ + }, + { + 'name': 'ImportHistory', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-'], +@@ -8097,7 +8097,7 @@ + }, + { + 'name': 'ImportHomepage', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-'], +@@ -8116,7 +8116,7 @@ + }, + { + 'name': 'ImportSearchEngine', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-'], +@@ -8136,7 +8136,7 @@ + }, + { + 'name': 'ImportSavedPasswords', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-'], +@@ -8156,7 +8156,7 @@ + }, + { + 'name': 'ImportAutofillFormData', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:39-'], +@@ -8176,7 +8176,7 @@ + }, + { + 'name': 'MaxConnectionsPerProxy', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome.*:14-'], +@@ -8195,7 +8195,7 @@ + }, + { + 'name': 'HideWebStorePromo', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:15-21', 'chrome_os:15-21'], +@@ -8213,7 +8213,7 @@ + }, + { + 'name': 'URLBlacklist', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8236,7 +8236,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. -- Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.chromium.org/administrators/url-blacklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. -+ Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. +- Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.chromium.org/administrators/url-blocklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. ++ Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. 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. -@@ -8187,7 +8187,7 @@ +@@ -8245,7 +8245,7 @@ + }, + { + 'name': 'URLWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8268,7 +8268,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. -- Setting the policy provides access to the listed URLs, as exceptions to the URL blocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.chromium.org/administrators/url-blacklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The allowlist takes precedence over blocklist. This policy is limited to 1,000 entries. -+ Setting the policy provides access to the listed URLs, as exceptions to the URL blocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The allowlist takes precedence over blocklist. This policy is limited to 1,000 entries. +- Setting the policy provides access to the listed URLs, as exceptions to the URL blocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.chromium.org/administrators/url-blocklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The allowlist takes precedence over blocklist. This policy is limited to 1,000 entries. ++ Setting the policy provides access to the listed URLs, as exceptions to the URL blocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The allowlist takes precedence over blocklist. This policy is limited to 1,000 entries. 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:". -@@ -8219,7 +8219,7 @@ +@@ -8279,7 +8279,7 @@ + }, + { + 'name': 'URLBlocklist', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8300,7 +8300,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], -- 'desc': '''Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.chromium.org/administrators/url-blacklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. -+ 'desc': '''Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. +- 'desc': '''Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.chromium.org/administrators/url-blocklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. ++ 'desc': '''Setting the policy prevents webpages with prohibited URLs from loading. It provides a list of URL patterns that specify forbidden URLs. Leaving the policy unset means no URLs are prohibited in the browser. Format the URL pattern according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). Up to 1,000 exceptions can be defined in URLAllowlist. 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. -@@ -8249,7 +8249,7 @@ +@@ -8309,7 +8309,7 @@ + }, + { + 'name': 'URLAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8330,7 +8330,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], -- 'desc': '''Setting the policy provides access to the listed URLs, as exceptions to URLBlocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.chromium.org/administrators/url-blacklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The URLAllowlist policy takes precedence over URLBlocklist. This policy is limited to 1,000 entries. -+ 'desc': '''Setting the policy provides access to the listed URLs, as exceptions to URLBlocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The URLAllowlist policy takes precedence over URLBlocklist. This policy is limited to 1,000 entries. +- 'desc': '''Setting the policy provides access to the listed URLs, as exceptions to URLBlocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.chromium.org/administrators/url-blocklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The URLAllowlist policy takes precedence over URLBlocklist. This policy is limited to 1,000 entries. ++ 'desc': '''Setting the policy provides access to the listed URLs, as exceptions to URLBlocklist. See that policy's description for the format of entries of this list. For example, setting URLBlocklist to * will block all requests, and you can use this policy to allow access to a limited list of URLs. Use it to open exceptions to certain schemes, subdomains of other domains, ports, or specific paths, using the format specified at ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). The most specific filter determines if a URL is blocked or allowed. The URLAllowlist policy takes precedence over URLBlocklist. This policy is limited to 1,000 entries. 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:". -@@ -8260,7 +8260,7 @@ +@@ -8341,7 +8341,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -15476,7 +16272,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-'], -@@ -8280,7 +8280,7 @@ +@@ -8361,7 +8361,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -15485,7 +16281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8308,7 +8308,7 @@ +@@ -8389,7 +8389,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -15494,8 +16290,21 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -8408,7 +8408,7 @@ - 'owners': ['file://components/policy/resources/OWNERS'], +@@ -8457,7 +8457,7 @@ + }, + { + 'name': 'EnableExperimentalPolicies', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -8486,10 +8486,10 @@ + }, + { + 'name': 'OpenNetworkConfiguration', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ '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', @@ -15503,8 +16312,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -8426,7 +8426,7 @@ - 'owners': ['file://components/policy/resources/OWNERS'], +@@ -8504,10 +8504,10 @@ + }, + { + 'name': 'DeviceOpenNetworkConfiguration', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ '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', @@ -15512,7 +16325,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -8600,7 +8600,7 @@ +@@ -8522,7 +8522,7 @@ + }, + { + 'name': 'DeviceKerberosEncryptionTypes', +- 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -8569,7 +8569,7 @@ + }, + { + 'name': 'DeviceUserPolicyLoopbackProcessingMode', +- 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -8612,7 +8612,7 @@ + }, + { + 'name': 'DeviceMachinePasswordChangeRate', +- 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, + 'supported_on': ['chrome_os:66-'], +@@ -8635,7 +8635,7 @@ + }, + { + 'name': 'DeviceGpoCacheLifetime', +- 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, + 'supported_on': ['chrome_os:73-'], +@@ -8658,7 +8658,7 @@ + }, + { + 'name': 'DeviceAuthDataCacheLifetime', +- 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/authpolicy/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, + 'supported_on': ['chrome_os:73-'], +@@ -8681,7 +8681,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -15521,7 +16379,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -8672,7 +8672,7 @@ +@@ -8701,7 +8701,7 @@ + }, + { + 'name': 'EnterpriseWebStoreURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'], +@@ -8718,7 +8718,7 @@ + }, + { + 'name': 'EnterpriseWebStoreName', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'], +@@ -8735,7 +8735,7 @@ + }, + { + 'name': 'DisablePrintPreview', +- 'owners': ['file://printing/OWNERS', 'rbpotter@chomium.org', 'thestig@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'rbpotter@chomium.org', 'thestig@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:18-'], +@@ -8753,7 +8753,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -15530,7 +16415,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-'], -@@ -8691,7 +8691,7 @@ +@@ -8772,7 +8772,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -15539,7 +16424,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -8800,7 +8800,7 @@ +@@ -8813,7 +8813,7 @@ + }, + { + 'name': 'DisableSSLRecordSplitting', +- 'owners': ['file://crypto/OWNERS', 'agl@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'agl@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:18-46', 'chrome_os:18-46'], +@@ -8832,7 +8832,7 @@ + }, + { + 'name': 'EnableOnlineRevocationChecks', +- 'owners': ['file://net/cert/OWNERS', 'mattm@chromium.org'], ++ 'owners': ['file://net/cert/OWNERS', 'mattm@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:19-', 'chrome_os:19-'], +@@ -8852,7 +8852,7 @@ + }, + { + 'name': 'RequireOnlineRevocationChecksForLocalAnchors', +- 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://net/cert/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], +@@ -8881,7 +8881,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -15548,7 +16460,115 @@ 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'], -@@ -9076,7 +9076,7 @@ +@@ -8902,7 +8902,7 @@ + }, + { + 'name': 'EnableCommonNameFallbackForLocalAnchors', +- 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://net/cert/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:58-65', 'chrome_os:58-65', 'android:58-65'], +@@ -8923,7 +8923,7 @@ + }, + { + 'name': 'EnableSymantecLegacyInfrastructure', +- 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://net/cert/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:66-75', 'chrome_os:66-75', 'android:66-75'], +@@ -8946,7 +8946,7 @@ + }, + { + 'name': 'BuiltinCertificateVerifierEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-'], +@@ -8971,7 +8971,7 @@ + }, + { + 'name': 'ForceEphemeralProfiles', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:32-'], +@@ -8993,7 +8993,7 @@ + }, + { + 'name': 'GaiaOfflineSigninTimeLimitDays', +- 'owners': ['rodmartin@google.com', 'chromeos-commercial-identity@google.com', 'file://components/policy/resources/OWNERS'], ++ 'owners': ['rodmartin@9oo91e.qjz9zk', 'chromeos-commercial-identity@9oo91e.qjz9zk', 'file://components/policy/resources/OWNERS'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': -1, 'maximum': 365 }, + 'supported_on': ['chrome_os:90-'], +@@ -9018,7 +9018,7 @@ + }, + { + 'name': 'SAMLOfflineSigninTimeLimit', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': -1 }, + 'supported_on': ['chrome_os:34-'], +@@ -9042,7 +9042,7 @@ + }, + { + 'name': 'AutoCleanUpStrategy', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -9082,7 +9082,7 @@ + }, + { + 'name': 'ReportDeviceVersionInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:18-'], +@@ -9102,7 +9102,7 @@ + }, + { + 'name': 'ReportDeviceActivityTimes', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:18-'], +@@ -9122,7 +9122,7 @@ + }, + { + 'name': 'ReportDeviceBootMode', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:18-'], +@@ -9142,7 +9142,7 @@ + }, + { + 'name': 'ReportDeviceLocation', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -9162,7 +9162,7 @@ + }, + { + 'name': 'ReportDeviceNetworkInterfaces', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -9182,7 +9182,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -15557,7 +16577,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -9096,7 +9096,7 @@ +@@ -9202,7 +9202,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -15566,7 +16586,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -9116,7 +9116,7 @@ +@@ -9222,7 +9222,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -15575,7 +16595,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -9182,7 +9182,7 @@ +@@ -9242,7 +9242,7 @@ + }, + { + 'name': 'ReportDeviceGraphicsStatus', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -9265,7 +9265,7 @@ + }, + { + 'name': 'ReportDeviceCrashReportInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9288,7 +9288,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -15584,7 +16622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -9204,7 +9204,7 @@ +@@ -9310,7 +9310,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -15593,7 +16631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9224,7 +9224,7 @@ +@@ -9330,7 +9330,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -15602,7 +16640,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9244,7 +9244,7 @@ +@@ -9350,7 +9350,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -15611,7 +16649,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -9349,7 +9349,7 @@ +@@ -9370,7 +9370,7 @@ + }, + { + 'name': 'ReportDeviceCpuInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -9392,7 +9392,7 @@ + }, + { + 'name': 'ReportDeviceTimezoneInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9413,7 +9413,7 @@ + }, + { + 'name': 'ReportDeviceMemoryInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9434,7 +9434,7 @@ + }, + { + 'name': 'ReportDeviceBacklightInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-'], +@@ -9455,7 +9455,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -15620,7 +16694,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -9475,7 +9475,7 @@ +@@ -9476,7 +9476,7 @@ + }, + { + 'name': 'ReportDeviceBluetoothInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -9497,7 +9497,7 @@ + }, + { + 'name': 'ReportDeviceFanInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -9518,7 +9518,7 @@ + }, + { + 'name': 'ReportDeviceVpdInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -9540,7 +9540,7 @@ + }, + { + 'name': 'ReportDeviceSystemInfo', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:86-'], +@@ -9561,7 +9561,7 @@ + }, + { + 'name': 'ReportUploadFrequency', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 60000 }, + 'supported_on': ['chrome_os:42-'], +@@ -9581,7 +9581,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -15629,7 +16748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -9494,7 +9494,7 @@ +@@ -9600,7 +9600,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -15638,7 +16757,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -9553,7 +9553,7 @@ +@@ -9619,7 +9619,7 @@ + }, + { + 'name': 'HeartbeatEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:43-'], +@@ -9639,7 +9639,7 @@ + }, + { + 'name': 'HeartbeatFrequency', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 30000 }, + 'supported_on': ['chrome_os:43-'], +@@ -9659,7 +9659,7 @@ }, { 'name': 'LogUploadEnabled', @@ -15647,7 +16784,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -9586,11 +9586,11 @@ +@@ -9679,7 +9679,7 @@ + }, + { + 'name': 'DeviceUserWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -9692,11 +9692,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -15661,7 +16807,16 @@ 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. -@@ -9613,11 +9613,11 @@ +@@ -9707,7 +9707,7 @@ + }, + { + 'name': 'DeviceUserAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -9719,11 +9719,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -15670,12 +16825,84 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 764, 'caption': '''Login user allow list''', 'tags': [], -- 'desc': '''Defines the list of users that are allowed to login to the device. Entries are of the form user@domain, such as madmax@managedchrome.com. To allow arbitrary users on a domain, use entries of the form *@domain. -+ 'desc': '''Defines the list of users that are allowed to login to the device. Entries are of the form user@domain, such as madmax@managedch40me.qjz9zk. To allow arbitrary users on a domain, use entries of the form *@domain. +- 'desc': '''Defines the list of users that are allowed to login to the device. Entries are of the form user@domain, such as madmax@managedchrome.com. To allow arbitrary users on a domain, use entries of the form *@domain. ++ 'desc': '''Defines the list of users that are allowed to login to the device. Entries are of the form user@domain, such as madmax@managedch40me.qjz9zk. To allow arbitrary users on a domain, use entries of the form *@domain. 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.''', -@@ -9794,7 +9794,7 @@ +@@ -9731,7 +9731,7 @@ + }, + { + 'name': 'DeviceAllowNewUsers', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:12-'], +@@ -9750,7 +9750,7 @@ + }, + { + 'name': 'DeviceGuestModeEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:12-'], +@@ -9768,7 +9768,7 @@ + }, + { + 'name': 'DeviceShowUserNamesOnSignin', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:12-'], +@@ -9788,7 +9788,7 @@ + }, + { + 'name': 'DeviceDataRoamingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:12-'], +@@ -9806,7 +9806,7 @@ + }, + { + 'name': 'DeviceMetricsReportingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:14-'], +@@ -9828,7 +9828,7 @@ + }, + { + 'name': 'ChromeOsReleaseChannel', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -9866,7 +9866,7 @@ + }, + { + 'name': 'ChromeOsReleaseChannelDelegated', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:19-'], +@@ -9884,7 +9884,7 @@ + }, + { + 'name': 'DeviceReleaseLtsTag', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:86-'], +@@ -9900,7 +9900,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -15684,7 +16911,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -9867,7 +9867,7 @@ +@@ -9945,7 +9945,7 @@ + }, + { + 'name': 'DeviceEphemeralUsersEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:19-'], +@@ -9961,7 +9961,7 @@ + }, + { + 'name': 'DeviceStartUpUrls', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -9973,7 +9973,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -15693,7 +16938,52 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -9971,7 +9971,7 @@ +@@ -9983,7 +9983,7 @@ + }, + { + 'name': 'DeviceIdleLogoutTimeout', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:19-40'], +@@ -10004,7 +10004,7 @@ + }, + { + 'name': 'DeviceIdleLogoutWarningDuration', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:19-40'], +@@ -10025,7 +10025,7 @@ + }, + { + 'name': 'DeviceLoginScreenSaverId', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:19-40'], +@@ -10044,7 +10044,7 @@ + }, + { + 'name': 'DeviceLoginScreenSaverTimeout', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:19-40'], +@@ -10065,7 +10065,7 @@ + }, + { + 'name': 'DeviceAppPack', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -10077,7 +10077,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -15702,7 +16992,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -10003,7 +10003,7 @@ +@@ -10089,7 +10089,7 @@ + }, + { + 'name': 'DeviceAutoUpdateDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:19-'], +@@ -10109,7 +10109,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -15711,7 +17010,97 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -10249,7 +10249,7 @@ +@@ -10125,7 +10125,7 @@ + }, + { + 'name': 'DeviceRollbackAllowedMilestones', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -10153,7 +10153,7 @@ + }, + { + 'name': 'DeviceRollbackToTargetVersion', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -10192,7 +10192,7 @@ + }, + { + 'name': 'DeviceTargetVersionPrefix', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:19-'], +@@ -10217,7 +10217,7 @@ + }, + { + 'name': 'DeviceUpdateScatterFactor', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:20-'], +@@ -10233,7 +10233,7 @@ + }, + { + 'name': 'DeviceUpdateAllowedConnectionTypes', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -10254,7 +10254,7 @@ + }, + { + 'name': 'DeviceUpdateHttpDownloadsEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -10274,7 +10274,7 @@ + }, + { + 'name': 'DeviceLocalAccounts', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -10296,7 +10296,7 @@ + }, + { + 'name': 'DeviceLocalAccountAutoLoginId', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:26-'], +@@ -10315,7 +10315,7 @@ + }, + { + 'name': 'DeviceLocalAccountAutoLoginDelay', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:26-'], +@@ -10336,7 +10336,7 @@ + }, + { + 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:28-'], +@@ -10355,7 +10355,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -15720,7 +17109,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -10268,7 +10268,7 @@ +@@ -10374,7 +10374,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -15729,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-'], -@@ -10282,7 +10282,7 @@ +@@ -10388,7 +10388,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. @@ -15738,16 +17127,70 @@ 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". -@@ -10333,7 +10333,7 @@ +@@ -10396,7 +10396,7 @@ + }, + { + 'name': 'DeviceBlockDevmode', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:37-'], +@@ -10415,7 +10415,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', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:83-88'], +@@ -10439,7 +10439,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', -- 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@chromium.org', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@ch40m1um.qjz9zk', 'pastarmovj@ch40m1um.qjz9zk'], 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -10428,13 +10428,13 @@ +@@ -10463,7 +10463,7 @@ + }, + { + 'name': 'BackgroundModeEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], +@@ -10484,7 +10484,7 @@ + }, + { + 'name': 'DriveDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:19-'], +@@ -10503,7 +10503,7 @@ + }, + { + 'name': 'DriveDisabledOverCellular', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:19-'], +@@ -10522,7 +10522,7 @@ + }, + { + 'name': 'PinnedLauncherApps', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -10534,20 +10534,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -15763,7 +17206,24 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Leaving it unset lets users change the list of pinned apps in the launcher.''', 'arc_support': 'This policy can also be used to pin Android apps.', -@@ -10482,11 +10482,11 @@ + }, + { + 'name': 'RestrictSigninToPattern', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:21-'], +@@ -10567,7 +10567,7 @@ + }, + { + 'name': 'DisableSafeBrowsingProceedAnyway', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': [ +@@ -10588,11 +10588,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -15777,7 +17237,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'], -@@ -10503,7 +10503,7 @@ +@@ -10609,11 +10609,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. @@ -15786,7 +17246,21 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SpellCheckServiceEnabled', -@@ -10561,7 +10561,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:22-', 'chrome_os:22-'], +@@ -10649,7 +10649,7 @@ + }, + { + 'name': 'ExternalStorageDisabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:22-'], +@@ -10667,7 +10667,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -15795,7 +17269,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -10620,7 +10620,7 @@ +@@ -10685,7 +10685,7 @@ + }, + { + 'name': 'AudioOutputAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:23-'], +@@ -10705,7 +10705,7 @@ + }, + { + 'name': 'AudioCaptureAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:25-', 'chrome_os:23-'], +@@ -10726,7 +10726,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -15804,7 +17296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10637,7 +10637,7 @@ +@@ -10743,11 +10743,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 @@ -15813,7 +17305,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'VideoCaptureAllowed', -@@ -10661,7 +10661,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:25-', 'chrome_os:25-'], +@@ -10767,7 +10767,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -15822,7 +17319,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10678,7 +10678,7 @@ +@@ -10784,11 +10784,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 @@ -15831,7 +17328,21 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'DisableScreenshots', -@@ -10718,7 +10718,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:22-', 'chrome.*:22-'], +@@ -10804,7 +10804,7 @@ + }, + { + 'name': 'SystemTimezone', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:22-'], +@@ -10824,7 +10824,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -15840,7 +17351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -10740,7 +10740,7 @@ +@@ -10846,7 +10846,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -15849,7 +17360,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -10780,7 +10780,7 @@ +@@ -10868,7 +10868,7 @@ + }, + { + 'name': 'ShowLogoutButtonInTray', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:25-'], +@@ -10886,7 +10886,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -15858,7 +17378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -10806,7 +10806,7 @@ +@@ -10912,7 +10912,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -15867,7 +17387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10861,7 +10861,7 @@ +@@ -10967,7 +10967,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -15876,16 +17396,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -10981,7 +10981,7 @@ +@@ -10995,7 +10995,7 @@ + }, + { + 'name': 'ShelfAutoHideBehavior', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -11032,7 +11032,7 @@ + }, + { + 'name': 'ShelfAlignment', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'string-enum', + # In shelf_prefs.cc, there are 3 const char[] defining kShelfAlignmentLocal values: + # ash::kShelfAlignmentBottom = "Bottom", ash::kShelfAlignmnetLeft = "Left", +@@ -11087,7 +11087,7 @@ }, { 'name': 'SystemFeaturesDisableList', -- 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@chromium.org'], -+ 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@ch40m1um.qjz9zk'], +- 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@chromium.org', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'ayaelattar@ch40m1um.qjz9zk', 'pmarko@ch40m1um.qjz9zk'], 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -11043,7 +11043,7 @@ +@@ -11155,7 +11155,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -15894,7 +17432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11085,7 +11085,7 @@ +@@ -11197,7 +11197,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -15903,7 +17441,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -11170,7 +11170,7 @@ +@@ -11217,7 +11217,7 @@ + }, + { + 'name': 'UserDisplayName', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:25-'], +@@ -11239,7 +11239,7 @@ + }, + { + 'name': 'SessionLengthLimit', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:25-'], +@@ -11261,7 +11261,7 @@ + }, + { + 'name': 'FullscreenAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], +@@ -11282,7 +11282,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -15912,7 +17477,232 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -12100,7 +12100,7 @@ +@@ -11313,7 +11313,7 @@ + }, + { + 'name': 'ScreenDimDelayAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11344,7 +11344,7 @@ + }, + { + 'name': 'ScreenOffDelayAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11375,7 +11375,7 @@ + }, + { + 'name': 'ScreenLockDelayAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11408,7 +11408,7 @@ + }, + { + 'name': 'IdleWarningDelayAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11439,7 +11439,7 @@ + }, + { + 'name': 'IdleDelayAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11468,7 +11468,7 @@ + }, + { + 'name': 'ScreenDimDelayBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11499,7 +11499,7 @@ + }, + { + 'name': 'ScreenOffDelayBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11530,7 +11530,7 @@ + }, + { + 'name': 'ScreenLockDelayBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11563,7 +11563,7 @@ + }, + { + 'name': 'IdleWarningDelayBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11594,7 +11594,7 @@ + }, + { + 'name': 'IdleDelayBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { + 'type': 'integer', +@@ -11623,7 +11623,7 @@ + }, + { + 'name': 'IdleAction', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -11670,7 +11670,7 @@ + }, + { + 'name': 'IdleActionAC', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -11719,7 +11719,7 @@ + }, + { + 'name': 'IdleActionBattery', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -11768,7 +11768,7 @@ + }, + { + 'name': 'LidCloseAction', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -11813,7 +11813,7 @@ + }, + { + 'name': 'PowerManagementUsesAudioActivity', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:26-'], +@@ -11831,7 +11831,7 @@ + }, + { + 'name': 'PowerManagementUsesVideoActivity', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:26-'], +@@ -11850,7 +11850,7 @@ + }, + { + 'name': 'PresentationIdleDelayScale', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:26-28'], +@@ -11867,7 +11867,7 @@ + }, + { + 'name': 'PresentationScreenDimDelayScale', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:29-'], +@@ -11887,7 +11887,7 @@ + }, + { + 'name': 'AllowWakeLocks', +- 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', 'michaelpg@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', 'michaelpg@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:71-'], +@@ -11916,7 +11916,7 @@ + }, + { + 'name': 'AllowScreenWakeLocks', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:28-'], +@@ -11945,7 +11945,7 @@ + }, + { + 'name': 'UserActivityScreenDimDelayScale', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:29-'], +@@ -11965,7 +11965,7 @@ + }, + { + 'name': 'WaitForInitialUserActivity', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:32-'], +@@ -11983,7 +11983,7 @@ + }, + { + 'name': 'PowerManagementIdleSettings', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -12087,7 +12087,7 @@ + }, + { + 'name': 'ScreenLockDelays', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -12124,7 +12124,7 @@ + }, + { + 'name': 'DeviceLoginScreenPowerManagement', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -12212,7 +12212,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -15921,7 +17711,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -12248,7 +12248,7 @@ +@@ -12241,7 +12241,7 @@ + }, + { + 'name': 'TermsOfServiceURL', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:26-'], +@@ -12261,7 +12261,7 @@ + }, + { + 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:27-'], +@@ -12282,7 +12282,7 @@ + }, + { + 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:80-'], +@@ -12303,7 +12303,7 @@ + }, + { + 'name': 'LargeCursorEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12322,7 +12322,7 @@ + }, + { + 'name': 'SpokenFeedbackEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12341,7 +12341,7 @@ + }, + { + 'name': 'HighContrastEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12360,7 +12360,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -15930,7 +17774,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12273,7 +12273,7 @@ +@@ -12385,7 +12385,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -15939,7 +17783,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12317,7 +12317,7 @@ +@@ -12410,7 +12410,7 @@ + }, + { + 'name': 'VirtualKeyboardEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:34-'], +@@ -12429,7 +12429,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -15948,7 +17801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -12369,7 +12369,7 @@ +@@ -12481,7 +12481,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -15957,7 +17810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -12388,7 +12388,7 @@ +@@ -12500,7 +12500,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -15966,7 +17819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -12413,7 +12413,7 @@ +@@ -12525,7 +12525,7 @@ }, { 'name': 'DictationEnabled', @@ -15975,7 +17828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12438,7 +12438,7 @@ +@@ -12550,7 +12550,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -15984,7 +17837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12465,7 +12465,7 @@ +@@ -12577,7 +12577,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -15993,7 +17846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12492,7 +12492,7 @@ +@@ -12604,7 +12604,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -16002,7 +17855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12519,7 +12519,7 @@ +@@ -12631,7 +12631,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -16011,7 +17864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12546,7 +12546,7 @@ +@@ -12658,7 +12658,7 @@ }, { 'name': 'AutoclickEnabled', @@ -16020,7 +17873,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12653,7 +12653,7 @@ +@@ -12685,7 +12685,7 @@ + }, + { + 'name': 'KeyboardDefaultToFunctionKeys', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:35-'], +@@ -12704,7 +12704,7 @@ + }, + { + 'name': 'ScreenMagnifierType', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -12743,7 +12743,7 @@ + }, + { + 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12765,7 +12765,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -16029,7 +17909,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -12700,7 +12700,7 @@ +@@ -12790,7 +12790,7 @@ + }, + { + 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12812,7 +12812,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -16038,7 +17927,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -12747,7 +12747,7 @@ +@@ -12837,7 +12837,7 @@ + }, + { + 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -12859,7 +12859,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -16047,7 +17945,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -12797,7 +12797,7 @@ +@@ -12884,7 +12884,7 @@ + }, + { + 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:34-'], +@@ -12909,7 +12909,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -16056,7 +17963,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -12822,7 +12822,7 @@ +@@ -12934,7 +12934,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -16065,7 +17972,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12847,7 +12847,7 @@ +@@ -12959,7 +12959,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -16074,7 +17981,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -12872,7 +12872,7 @@ +@@ -12984,7 +12984,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -16083,7 +17990,16 @@ 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-'], -@@ -12942,7 +12942,7 @@ +@@ -13010,7 +13010,7 @@ + }, + { + 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -13054,7 +13054,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -16092,7 +18008,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12989,7 +12989,7 @@ +@@ -13101,7 +13101,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -16101,7 +18017,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13014,7 +13014,7 @@ +@@ -13126,7 +13126,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -16110,7 +18026,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13039,7 +13039,7 @@ +@@ -13151,7 +13151,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -16119,7 +18035,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13064,7 +13064,7 @@ +@@ -13176,7 +13176,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -16128,7 +18044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13089,7 +13089,7 @@ +@@ -13201,7 +13201,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -16137,7 +18053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13116,7 +13116,7 @@ +@@ -13228,7 +13228,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -16146,7 +18062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13143,7 +13143,7 @@ +@@ -13255,7 +13255,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -16155,7 +18071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13168,7 +13168,7 @@ +@@ -13280,7 +13280,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -16164,7 +18080,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13324,7 +13324,7 @@ +@@ -13307,7 +13307,7 @@ + }, + { + 'name': 'HideWebStoreIcon', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:26-', 'chrome_os:68-'], +@@ -13327,7 +13327,7 @@ + }, + { + 'name': 'DeviceStartUpFlags', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -13349,7 +13349,7 @@ + }, + { + 'name': 'UptimeLimit', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:29-'], +@@ -13370,7 +13370,7 @@ + }, + { + 'name': 'RebootAfterUpdate', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:29-'], +@@ -13394,7 +13394,7 @@ + }, + { + 'name': 'VariationsRestrictParameter', +- 'owners': ['file://components/variations/OWNERS', 'mpearson@chromium.org'], ++ 'owners': ['file://components/variations/OWNERS', 'mpearson@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome.*:27-', 'android:34-'], +@@ -13415,7 +13415,7 @@ + }, + { + 'name': 'DeviceVariationsRestrictParameter', +- 'owners': ['file://components/variations/OWNERS', 'rkaplow@chromium.org'], ++ 'owners': ['file://components/variations/OWNERS', 'rkaplow@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:28-'], +@@ -13436,7 +13436,7 @@ }, { 'name': 'ChromeVariations', @@ -16173,7 +18143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13361,7 +13361,7 @@ +@@ -13473,7 +13473,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -16182,7 +18152,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. -@@ -13371,7 +13371,7 @@ +@@ -13483,7 +13483,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -16191,7 +18161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13406,7 +13406,7 @@ +@@ -13518,7 +13518,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google Chrome OS device. @@ -16200,7 +18170,97 @@ 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. -@@ -13631,20 +13631,20 @@ +@@ -13528,7 +13528,7 @@ + }, + { + 'name': 'AttestationEnabledForDevice', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:28-'], +@@ -13547,7 +13547,7 @@ + }, + { + 'name': 'AttestationEnabledForUser', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:28-'], +@@ -13565,7 +13565,7 @@ + }, + { + 'name': 'AttestationExtensionAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -13586,7 +13586,7 @@ + }, + { + 'name': 'AttestationExtensionWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -13610,7 +13610,7 @@ + }, + { + 'name': 'AttestationForContentProtectionEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:31-'], +@@ -13629,7 +13629,7 @@ + }, + { + 'name': 'SuppressChromeFrameTurndownPrompt', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + '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.''', +@@ -13645,7 +13645,7 @@ + }, + { + 'name': 'SupervisedUsersEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'deprecated': True, +@@ -13668,7 +13668,7 @@ + }, + { + 'name': 'SupervisedUserCreationEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'deprecated': True, +@@ -13691,7 +13691,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', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'deprecated': True, +@@ -13710,7 +13710,7 @@ + }, + { + 'name': 'ManagedBookmarks', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -13743,20 +13743,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -16225,7 +18285,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -13652,13 +13652,13 @@ +@@ -13764,13 +13764,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -16241,7 +18301,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:31-'], -@@ -13862,7 +13862,7 @@ +@@ -13788,7 +13788,7 @@ + }, + { + 'name': 'UserAvatarImage', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'external', + 'schema': { + 'type': 'object', +@@ -13825,7 +13825,7 @@ + }, + { + 'name': 'WallpaperImage', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'external', + 'schema': { + 'type': 'object', +@@ -13860,7 +13860,7 @@ + }, + { + 'name': 'EnableDeprecatedWebPlatformFeatures', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'string-enum-list', + 'schema': { + 'type': 'array', +@@ -13899,7 +13899,7 @@ + }, + { + 'name': 'DeviceTransferSAMLCookies', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:38-'], +@@ -13925,7 +13925,7 @@ + }, + { + 'name': 'EasyUnlockAllowed', +- 'owners': ['file://chrome/browser/ash/login/easy_unlock/OWNERS', 'hansberry@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/login/easy_unlock/OWNERS', 'hansberry@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:38-'], +@@ -13946,7 +13946,7 @@ + }, + { + 'name': 'SessionLocales', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -13974,7 +13974,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -16250,7 +18364,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:38-'], -@@ -13880,7 +13880,7 @@ +@@ -13992,7 +13992,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -16259,7 +18373,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -13898,7 +13898,7 @@ +@@ -14010,7 +14010,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -16268,7 +18382,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -13916,7 +13916,7 @@ +@@ -14028,7 +14028,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -16277,25 +18391,100 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -13977,7 +13977,7 @@ - - If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser and 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 Chrome sync will be turned on per 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 Chrome sync, use the "SyncDisabled" policy. - -- If the policy is set to "Force browser sign-in" the user is presented with an account selection dialog and has to choose and sign in to an account to use the browser. This ensures that for managed accounts the policies associated with the account are applied and enforced. By default this turns on Chrome sync for the account, except for the case when sync was disabled by the domain admin or via the "SyncDisabled" policy. The default value of BrowserGuestModeEnabled will be set to false. Note that existing unsigned profiles will be locked and inaccessible after enabling this policy. For more information, see help center article: https://support.google.com/chrome/a/answer/7572556. This option does not support Linux and Android, it will fallback to "Enable browser sign-in" if used. -+ If the policy is set to "Force browser sign-in" the user is presented with an account selection dialog and has to choose and sign in to an account to use the browser. This ensures that for managed accounts the policies associated with the account are applied and enforced. By default this turns on Chrome sync for the account, except for the case when sync was disabled by the domain admin or via the "SyncDisabled" policy. The default value of BrowserGuestModeEnabled will be set to false. Note that existing unsigned profiles will be locked and inaccessible after enabling this policy. For more information, see help center article: https://support.9oo91e.qjz9zk/chrome/a/answer/7572556. This option does not support Linux and Android, it will fallback to "Enable browser sign-in" if used. - - If this policy is not set then the user can decide if they want to enable the browser sign in option and use it as they see fit.''', +@@ -14049,7 +14049,7 @@ }, + { + 'name': 'BrowserSignin', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -14088,13 +14088,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. + +- If the policy is set to "Force browser sign-in" the user is presented with an account selection dialog and has to choose and sign in to an account to use the browser. This ensures that for managed accounts the policies associated with the account are applied and enforced. By default this turns on $1Google Chrome Sync for the account, except for the case when $1Google Chrome Sync was disabled by the domain admin or via the SyncDisabled policy. The default value of BrowserGuestModeEnabled will be set to disabled. Note that existing unsigned profiles will be locked and inaccessible after enabling this policy. For more information, see help center article: https://support.google.com/chrome/a/answer/7572556 . This option is not supported on Linux, Android or iOS. It will fall back to "Enable browser sign-in" if used. ++ If the policy is set to "Force browser sign-in" the user is presented with an account selection dialog and has to choose and sign in to an account to use the browser. This ensures that for managed accounts the policies associated with the account are applied and enforced. By default this turns on $1Google Chrome Sync for the account, except for the case when $1Google Chrome Sync was disabled by the domain admin or via the SyncDisabled policy. The default value of BrowserGuestModeEnabled will be set to disabled. Note that existing unsigned profiles will be locked and inaccessible after enabling this policy. For more information, see help center article: https://support.9oo91e.qjz9zk/chrome/a/answer/7572556 . This option is not supported on Linux, Android or iOS. It will fall back to "Enable browser sign-in" if used. + + If this policy is not set then the user can decide if they want to enable browser sign-in in the $1Google Chrome settings and use it as they see fit.''', + }, + { + 'name': 'SSLVersionMin', +- 'owners': ['file://crypto/OWNERS', 'agl@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'agl@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', @@ -14142,7 +14142,7 @@ + }, + { + 'name': 'SSLVersionFallbackMin', +- 'owners': ['file://crypto/OWNERS', 'agl@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'agl@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -14187,7 +14187,7 @@ + }, + { + 'name': 'SSLVersionMax', +- 'owners': ['file://crypto/OWNERS', 'agl@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'agl@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -14230,7 +14230,7 @@ + }, + { + 'name': 'CertificateTransparencyEnforcementDisabledForUrls', +- 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -14253,11 +14253,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. -- A URL pattern follows this format ( https://www.chromium.org/administrators/url-blacklist-filter-format ). However, because the validity of certificates for a given hostname is independent of the scheme, port, or path, $1Google Chrome only considers the hostname portion of the URL. Wildcard hosts aren't supported.''', -+ A URL pattern follows this format ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). However, because the validity of certificates for a given hostname is independent of the scheme, port, or path, $1Google Chrome only considers the hostname portion of the URL. Wildcard hosts aren't supported.''', +- A URL pattern follows this format ( https://www.chromium.org/administrators/url-blocklist-filter-format ). However, because the validity of certificates for a given hostname is independent of the scheme, port, or path, $1Google Chrome only considers the hostname portion of the URL. Wildcard hosts aren't supported.''', ++ A URL pattern follows this format ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). However, because the validity of certificates for a given hostname is independent of the scheme, port, or path, $1Google Chrome only considers the hostname portion of the URL. Wildcard hosts aren't supported.''', }, { 'name': 'CertificateTransparencyEnforcementDisabledForCas', -@@ -14258,7 +14258,7 @@ +- 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -14290,7 +14290,7 @@ + }, + { + 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', +- 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@chromium.org'], ++ 'owners': ['file://components/certificate_transparency/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -14317,7 +14317,7 @@ + }, + { + 'name': 'RC4Enabled', +- 'owners': ['file://crypto/OWNERS', 'davidben@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'davidben@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -14342,7 +14342,7 @@ + }, + { + 'name': 'DHEEnabled', +- 'owners': ['file://crypto/OWNERS', 'davidben@chromium.org'], ++ 'owners': ['file://crypto/OWNERS', 'davidben@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -14369,7 +14369,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -16304,7 +18493,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -14362,7 +14362,7 @@ +@@ -14400,7 +14400,7 @@ + }, + { + 'name': 'DeviceRebootOnShutdown', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:41-'], +@@ -14418,7 +14418,7 @@ + }, + { + 'name': 'ExtensionCacheSize', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:43-'], +@@ -14437,7 +14437,7 @@ + }, + { + 'name': 'DeviceLoginScreenDomainAutoComplete', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': [ 'chrome_os:44-'], +@@ -14455,7 +14455,7 @@ + }, + { + 'name': 'ForceMaximizeOnFirstRun', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:43-'], +@@ -14473,7 +14473,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -16313,7 +18538,39 @@ 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-'], -@@ -14441,7 +14441,7 @@ +@@ -14491,7 +14491,7 @@ + }, + { + 'name': 'SSLErrorOverrideAllowedForOrigins', +- 'owners': ['agl@chromium.org', 'niarci@microsoft.com'], ++ 'owners': ['agl@ch40m1um.qjz9zk', 'niarci@m1cr050ft.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -14512,11 +14512,11 @@ + + Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. + +- For detailed information on valid input patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy. This policy only matches based on origin, so any path in the URL pattern is ignored.''', ++ For detailed information on valid input patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. * is not an accepted value for this policy. This policy only matches based on origin, so any path in the URL pattern is ignored.''', + }, + { + 'name': 'QuicAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:43-', 'chrome_os:43-'], +@@ -14534,7 +14534,7 @@ + }, + { + 'name': 'KeyPermissions', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -14577,7 +14577,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -16322,7 +18579,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -14460,7 +14460,7 @@ +@@ -14596,7 +14596,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -16331,7 +18588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -14478,7 +14478,7 @@ +@@ -14614,7 +14614,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -16340,7 +18597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -14497,7 +14497,7 @@ +@@ -14633,7 +14633,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -16349,7 +18606,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14542,7 +14542,7 @@ +@@ -14678,7 +14678,7 @@ }, { 'name': 'ArcEnabled', @@ -16358,7 +18615,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -14620,7 +14620,7 @@ +@@ -14696,7 +14696,7 @@ + }, + { + 'name': 'ArcPolicy', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'description_schema': { +@@ -14756,7 +14756,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -16367,7 +18633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -14642,7 +14642,7 @@ +@@ -14778,7 +14778,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -16376,7 +18642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14678,7 +14678,7 @@ +@@ -14814,7 +14814,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -16385,7 +18651,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14756,7 +14756,7 @@ +@@ -14855,7 +14855,7 @@ + }, + { + 'name': 'UsbDetachableAllowlist', +- 'owners': ['file://components/policy/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -14892,7 +14892,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -16394,7 +18669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -14776,7 +14776,7 @@ +@@ -14912,7 +14912,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -16403,7 +18678,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. -@@ -14794,7 +14794,7 @@ +@@ -14930,7 +14930,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -16412,7 +18687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -14828,7 +14828,7 @@ +@@ -14964,7 +14964,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -16421,7 +18696,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14900,7 +14900,7 @@ +@@ -15018,7 +15018,7 @@ + }, + { + 'name': 'TaskManagerEndProcessEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'caption': '''Enable ending processes in Task Manager''', + 'desc': '''Setting the policy to Disabled prevents users from ending processes in the Task Manager. + +@@ -15036,7 +15036,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -16430,7 +18714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -14934,7 +14934,7 @@ +@@ -15074,7 +15074,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -16439,7 +18723,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.''', -@@ -14969,7 +14969,7 @@ +@@ -15109,7 +15109,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -16448,7 +18732,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. -@@ -14988,7 +14988,7 @@ +@@ -15128,7 +15128,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -16457,7 +18741,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. -@@ -15007,7 +15007,7 @@ +@@ -15147,7 +15147,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -16466,7 +18750,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. -@@ -15052,7 +15052,7 @@ +@@ -15192,7 +15192,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -16475,7 +18759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15076,7 +15076,7 @@ +@@ -15216,7 +15216,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -16484,7 +18768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15087,7 +15087,7 @@ +@@ -15227,7 +15227,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -16493,7 +18777,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'], -@@ -15100,9 +15100,9 @@ +@@ -15240,13 +15240,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -16505,7 +18789,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AllowScreenLock', -@@ -15124,7 +15124,7 @@ +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + '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. + +@@ -15264,7 +15264,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -16514,7 +18803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15157,7 +15157,7 @@ +@@ -15297,7 +15297,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -16523,7 +18812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'], -@@ -15166,7 +15166,7 @@ +@@ -15306,7 +15306,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -16532,7 +18821,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 331, 'caption': '''Define domains allowed to access G Suite''', 'tags': ['filtering'], -@@ -15176,11 +15176,11 @@ +@@ -15316,11 +15316,11 @@ Users cannot change or override this setting. @@ -16546,7 +18835,52 @@ 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' ], -@@ -15309,7 +15309,7 @@ +@@ -15355,7 +15355,7 @@ + }, + { + 'name': 'EnableMediaRouter', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:52-', 'chrome_os:52-', 'android:52-'], +@@ -15373,7 +15373,7 @@ + }, + { + 'name': 'ShowCastIconInToolbar', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], +@@ -15393,7 +15393,7 @@ + }, + { + 'name': 'MediaRouterCastAllowAllIPs', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:67-', 'chrome_os:67-'], +@@ -15413,7 +15413,7 @@ + }, + { + 'name': 'ArcBackupRestoreEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:53-67'], +@@ -15431,7 +15431,7 @@ + }, + { + 'name': 'ArcLocationServiceEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:57-67'], +@@ -15449,7 +15449,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -16555,7 +18889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-'], -@@ -15340,7 +15340,7 @@ +@@ -15480,7 +15480,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -16564,7 +18898,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-'], -@@ -15371,7 +15371,7 @@ +@@ -15511,7 +15511,7 @@ }, { 'name': 'NTPCardsVisible', @@ -16573,7 +18907,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-'], -@@ -15410,7 +15410,7 @@ +@@ -15550,7 +15550,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -16582,7 +18916,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-'], -@@ -15428,7 +15428,7 @@ +@@ -15568,7 +15568,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -16591,7 +18925,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15482,11 +15482,11 @@ +@@ -15590,7 +15590,7 @@ + }, + { + 'name': 'WebRestrictionsAuthority', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'id': 341, + 'type': 'string', + 'schema' : { 'type': 'string' }, +@@ -15606,7 +15606,7 @@ + }, + { + 'name': 'ComponentUpdatesEnabled', +- 'owners': ['file://components/update_client/OWNERS', 'sorin@chromium.org'], ++ 'owners': ['file://components/update_client/OWNERS', 'sorin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:54-', 'chrome_os:54-'], +@@ -15622,11 +15622,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. @@ -16605,7 +18957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15510,7 +15510,7 @@ +@@ -15650,7 +15650,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -16614,7 +18966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -15566,7 +15566,7 @@ +@@ -15706,7 +15706,7 @@ }, { 'name': 'Printers', @@ -16623,7 +18975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15590,7 +15590,7 @@ +@@ -15730,7 +15730,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -16632,16 +18984,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -15643,7 +15643,7 @@ +@@ -15783,7 +15783,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', -- 'owners': ['file://chromeos/printing/OWNERS', 'luum@chromium.org'], -+ 'owners': ['file://chromeos/printing/OWNERS', 'luum@ch40m1um.qjz9zk'], +- 'owners': ['file://chromeos/printing/OWNERS', 'luum@chromium.org', 'skau@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'luum@ch40m1um.qjz9zk', 'skau@ch40m1um.qjz9zk'], 'id': 382, 'type': 'external', 'schema': { -@@ -15676,7 +15676,7 @@ +@@ -15816,7 +15816,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -16650,34 +19002,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -15706,7 +15706,7 @@ +@@ -15846,7 +15846,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', -- 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@chromium.org'], -+ 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@ch40m1um.qjz9zk'], +- 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@chromium.org', 'skau@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@ch40m1um.qjz9zk', 'skau@ch40m1um.qjz9zk'], 'id': 383, 'supported_on': ['chrome_os:65-'], 'type': 'int-enum', -@@ -15754,7 +15754,7 @@ +@@ -15894,7 +15894,7 @@ }, { 'name': 'PrintersBulkAccessMode', -- 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@chromium.org'], -+ 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@ch40m1um.qjz9zk'], +- 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@chromium.org', 'thestig@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'zentaro@ch40m1um.qjz9zk', 'thestig@ch40m1um.qjz9zk'], 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -15799,7 +15799,7 @@ +@@ -15939,7 +15939,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', -- 'owners': ['file://chromeos/printing/OWNERS', 'thestig@chromium.org'], -+ 'owners': ['file://chromeos/printing/OWNERS', 'thestig@ch40m1um.qjz9zk'], +- 'owners': ['file://chromeos/printing/OWNERS', 'thestig@chromium.org', 'skau@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'thestig@ch40m1um.qjz9zk', 'skau@ch40m1um.qjz9zk'], 'supported_on': ['chrome_os:65-'], 'id': 384, 'type': 'list', -@@ -15821,7 +15821,7 @@ +@@ -15961,7 +15961,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -16686,16 +19038,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -15840,7 +15840,7 @@ +@@ -15980,7 +15980,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', -- 'owners': ['file://chromeos/printing/OWNERS', 'thestig@chromium.org'], -+ 'owners': ['file://chromeos/printing/OWNERS', 'thestig@ch40m1um.qjz9zk'], +- 'owners': ['file://chromeos/printing/OWNERS', 'thestig@chromium.org', 'skau@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'thestig@ch40m1um.qjz9zk', 'skau@ch40m1um.qjz9zk'], 'supported_on': ['chrome_os:65-'], 'id': 385, 'type': 'list', -@@ -15862,7 +15862,7 @@ +@@ -16002,7 +16002,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -16704,7 +19056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -15881,7 +15881,7 @@ +@@ -16021,7 +16021,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -16713,7 +19065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -15919,7 +15919,7 @@ +@@ -16059,7 +16059,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -16722,7 +19074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-'], -@@ -15967,7 +15967,7 @@ +@@ -16107,7 +16107,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -16731,7 +19083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 388, -@@ -15989,7 +15989,7 @@ +@@ -16129,7 +16129,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -16740,7 +19092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 389, -@@ -16012,7 +16012,7 @@ +@@ -16152,7 +16152,7 @@ }, { 'name': 'DevicePrinters', @@ -16749,7 +19101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -16047,7 +16047,7 @@ +@@ -16187,7 +16187,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -16758,7 +19110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -16092,7 +16092,7 @@ +@@ -16232,7 +16232,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -16767,7 +19119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -16111,7 +16111,7 @@ +@@ -16251,7 +16251,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -16776,7 +19128,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -16184,7 +16184,7 @@ +@@ -16271,7 +16271,7 @@ + }, + { + 'name': 'TPMFirmwareUpdateSettings', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'supported_on': ['chrome_os:63-'], + 'device_only': True, + 'id': 390, +@@ -16324,7 +16324,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -16785,7 +19146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -16210,7 +16210,7 @@ +@@ -16350,7 +16350,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -16794,7 +19155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -16294,7 +16294,7 @@ +@@ -16434,7 +16434,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -16803,7 +19164,61 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -16494,7 +16494,7 @@ +@@ -16458,7 +16458,7 @@ + }, + { + 'name': 'QuickUnlockModeAllowlist', +- 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -16496,7 +16496,7 @@ + }, + { + 'name': 'QuickUnlockModeWhitelist', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -16537,7 +16537,7 @@ + }, + { + 'name': 'QuickUnlockTimeout', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -16580,7 +16580,7 @@ + }, + { + 'name': 'PinUnlockMinimumLength', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:57-'], +@@ -16598,7 +16598,7 @@ + }, + { + 'name': 'PinUnlockMaximumLength', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer' }, + 'supported_on': ['chrome_os:57-'], +@@ -16616,7 +16616,7 @@ + }, + { + 'name': 'PinUnlockWeakPinsAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:57-'], +@@ -16634,7 +16634,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -16812,7 +19227,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16569,7 +16569,7 @@ +@@ -16667,7 +16667,7 @@ + }, + { + 'name': 'DeviceLoginScreenLocales', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -16688,7 +16688,7 @@ + }, + { + 'name': 'DeviceLoginScreenInputMethods', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -16709,7 +16709,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -16821,7 +19254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -16592,7 +16592,7 @@ +@@ -16732,7 +16732,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -16830,7 +19263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -16613,7 +16613,7 @@ +@@ -16753,7 +16753,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -16839,7 +19272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -16636,7 +16636,7 @@ +@@ -16776,7 +16776,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -16848,7 +19281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -16657,7 +16657,7 @@ +@@ -16797,7 +16797,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -16857,7 +19290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -16678,7 +16678,7 @@ +@@ -16818,7 +16818,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -16866,7 +19299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -16699,7 +16699,7 @@ +@@ -16839,7 +16839,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -16875,7 +19308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -16719,7 +16719,7 @@ +@@ -16859,7 +16859,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -16884,7 +19317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -16739,7 +16739,7 @@ +@@ -16879,7 +16879,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -16893,7 +19326,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -16760,7 +16760,7 @@ +@@ -16900,7 +16900,7 @@ + }, + { + 'name': 'DevicePciPeripheralDataAccessEnabled', +- 'owners': ['jimmyxgong@chromium.org', 'cros-peripheral@google.com'], ++ 'owners': ['jimmyxgong@ch40m1um.qjz9zk', 'cros-peripheral@9oo91e.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:90-'], +@@ -16932,7 +16932,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -16902,7 +19344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -16789,7 +16789,7 @@ +@@ -16961,7 +16961,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -16911,16 +19353,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16832,7 +16832,7 @@ +@@ -17004,7 +17004,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', -- 'owners': ['file://printing/OWNERS', 'thestig@chromium.org'], -+ 'owners': ['file://printing/OWNERS', 'thestig@ch40m1um.qjz9zk'], +- 'owners': ['file://printing/OWNERS', 'thestig@chromium.org', 'rbpotter@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'thestig@ch40m1um.qjz9zk', 'rbpotter@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -16864,7 +16864,7 @@ +@@ -17036,7 +17036,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -16929,7 +19371,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17003,7 +17003,7 @@ +@@ -17082,7 +17082,7 @@ + }, + { + 'name': 'EcryptfsMigrationStrategy', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -17138,7 +17138,7 @@ + }, + { + 'name': 'SchedulerConfiguration', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'string-enum', + 'schema': { + 'type': 'string', +@@ -17175,7 +17175,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -16938,7 +19398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17033,7 +17033,7 @@ +@@ -17205,7 +17205,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -16947,7 +19407,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17183,7 +17183,7 @@ +@@ -17232,7 +17232,7 @@ + }, + { + 'name': 'CastReceiverEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': ['chrome_os'], +@@ -17252,7 +17252,7 @@ + }, + { + 'name': 'CastReceiverName', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'future_on': ['chrome_os'], +@@ -17272,7 +17272,7 @@ + }, + { + 'name': 'DeviceOffHours', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -17355,7 +17355,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -16956,7 +19443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -17207,7 +17207,7 @@ +@@ -17379,7 +17379,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -16965,7 +19452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome.*:64-', 'chrome_os:64-'], -@@ -17225,7 +17225,7 @@ +@@ -17397,7 +17397,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -16974,16 +19461,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -17243,7 +17243,7 @@ +@@ -17415,7 +17415,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', -- 'owners': ['pbond@chromium.org', 'file://components/policy/resources/OWNERS'], -+ 'owners': ['pbond@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS'], +- 'owners': ['pbond@chromium.org', 'file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['pbond@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], 'type': 'dict', 'schema': { 'type': 'object', -@@ -17295,7 +17295,7 @@ +@@ -17467,7 +17467,7 @@ }, { 'name': 'IsolateOrigins', @@ -16992,7 +19479,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-'], -@@ -17316,7 +17316,7 @@ +@@ -17488,7 +17488,7 @@ }, { 'name': 'SitePerProcess', @@ -17001,7 +19488,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], -@@ -17381,7 +17381,7 @@ +@@ -17509,7 +17509,7 @@ + }, + { + 'name': 'DeviceLoginScreenIsolateOrigins', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'string', + 'schema': { 'type': 'string' }, + 'supported_on': ['chrome_os:66-76'], +@@ -17532,7 +17532,7 @@ + }, + { + 'name': 'DeviceLoginScreenSitePerProcess', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:66-76'], +@@ -17553,7 +17553,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -17010,7 +19515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -17404,7 +17404,7 @@ +@@ -17576,7 +17576,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -17019,7 +19524,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -17457,7 +17457,7 @@ +@@ -17599,7 +17599,7 @@ + }, + { + 'name': 'WebDriverOverridesIncompatiblePolicies', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:65-79'], +@@ -17629,7 +17629,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -17028,7 +19542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17504,7 +17504,7 @@ +@@ -17676,7 +17676,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -17037,7 +19551,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-'], -@@ -17522,11 +17522,11 @@ +@@ -17694,11 +17694,11 @@ Leaving the policy unset means Chrome uses its platform-specific default directory. @@ -17051,7 +19565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -17545,7 +17545,7 @@ +@@ -17717,7 +17717,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -17060,7 +19574,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-'], -@@ -17574,7 +17574,7 @@ +@@ -17746,7 +17746,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -17069,7 +19583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17605,7 +17605,7 @@ +@@ -17777,7 +17777,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -17078,7 +19592,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17639,7 +17639,7 @@ +@@ -17811,7 +17811,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -17087,7 +19601,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17670,7 +17670,7 @@ +@@ -17842,7 +17842,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -17096,7 +19610,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -17690,7 +17690,7 @@ +@@ -17862,7 +17862,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -17105,7 +19619,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-'], -@@ -17726,7 +17726,7 @@ +@@ -17898,7 +17898,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -17114,7 +19628,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17760,7 +17760,7 @@ +@@ -17932,7 +17932,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -17123,7 +19637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17771,7 +17771,7 @@ +@@ -17943,7 +17943,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -17132,7 +19646,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': [], -@@ -17785,7 +17785,7 @@ +@@ -17957,7 +17957,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -17141,7 +19655,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17834,7 +17834,7 @@ +@@ -18006,7 +18006,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -17150,7 +19664,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -17869,7 +17869,7 @@ +@@ -18041,7 +18041,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -17159,7 +19673,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -17908,7 +17908,7 @@ +@@ -18062,7 +18062,7 @@ + { + 'id': 567, + 'name': 'RelaunchHeadsUpPeriod', +- 'owners': ['file://components/policy/resources/OWNERS', 'zmin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'zmin@ch40m1um.qjz9zk'], + 'tags': [], + 'features': { + 'dynamic_refresh': True, +@@ -18080,7 +18080,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -17168,7 +19691,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -17927,7 +17927,7 @@ +@@ -18099,7 +18099,7 @@ }, { 'name': 'CrostiniAllowed', @@ -17177,7 +19700,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -17943,7 +17943,7 @@ +@@ -18115,7 +18115,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -17186,7 +19709,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -17959,7 +17959,7 @@ +@@ -18131,7 +18131,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -17195,7 +19718,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -17975,7 +17975,7 @@ +@@ -18147,7 +18147,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -17204,7 +19727,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -17994,7 +17994,7 @@ +@@ -18166,7 +18166,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -17213,7 +19736,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -18034,7 +18034,7 @@ +@@ -18206,7 +18206,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -17222,7 +19745,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18072,7 +18072,7 @@ +@@ -18244,7 +18244,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -17231,7 +19754,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -18113,7 +18113,7 @@ +@@ -18285,7 +18285,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -17240,7 +19763,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -18133,7 +18133,7 @@ +@@ -18305,7 +18305,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -17249,7 +19772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18159,7 +18159,7 @@ +@@ -18331,7 +18331,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -17258,7 +19781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18182,7 +18182,7 @@ +@@ -18354,7 +18354,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -17267,7 +19790,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18197,15 +18197,15 @@ +@@ -18369,15 +18369,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -17286,7 +19809,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-'], -@@ -18217,15 +18217,15 @@ +@@ -18389,15 +18389,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -17305,7 +19828,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-'], -@@ -18243,12 +18243,12 @@ +@@ -18415,12 +18415,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -17320,7 +19843,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -18268,7 +18268,7 @@ +@@ -18440,7 +18440,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -17329,7 +19852,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -18286,11 +18286,11 @@ +@@ -18458,11 +18458,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. @@ -17343,7 +19866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -18307,11 +18307,11 @@ +@@ -18479,11 +18479,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. @@ -17357,7 +19880,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-'], -@@ -18331,7 +18331,7 @@ +@@ -18503,7 +18503,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -17366,7 +19889,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18351,11 +18351,11 @@ +@@ -18523,11 +18523,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. @@ -17380,7 +19903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18372,11 +18372,11 @@ +@@ -18544,11 +18544,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. @@ -17394,7 +19917,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'], -@@ -18391,13 +18391,13 @@ +@@ -18563,13 +18563,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -17410,7 +19933,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -18421,7 +18421,7 @@ +@@ -18593,7 +18593,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -17419,7 +19942,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -18479,7 +18479,7 @@ +@@ -18614,7 +18614,7 @@ + }, + { + 'name': 'DeviceSamlLoginAuthenticationType', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -18651,7 +18651,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -17428,7 +19960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -18499,7 +18499,7 @@ +@@ -18671,7 +18671,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -17437,16 +19969,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -18521,7 +18521,7 @@ +@@ -18693,7 +18693,7 @@ }, { 'name': 'AllowedLanguages', -- 'owners': ['hendrich@chromium.org', 'file://components/policy/resources/OWNERS'], -+ 'owners': ['hendrich@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS'], +- 'owners': ['hendrich@chromium.org', 'file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['hendrich@ch40m1um.qjz9zk', 'file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], 'type': 'list', 'schema': { 'type': 'array', -@@ -18545,7 +18545,7 @@ +@@ -18717,7 +18717,7 @@ }, { 'name': 'AllowedInputMethods', @@ -17455,7 +19987,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18604,7 +18604,7 @@ +@@ -18741,7 +18741,7 @@ + }, + { + 'name': 'ArcAppInstallEventLoggingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:67-'], +@@ -18758,7 +18758,7 @@ + }, + { + 'name': 'ExtensionInstallEventLoggingEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'hendrich@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:85-'], +@@ -18776,7 +18776,7 @@ }, { 'name': 'UsageTimeLimit', @@ -17464,7 +20014,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -18857,7 +18857,7 @@ +@@ -18945,7 +18945,7 @@ + }, + { + 'name': 'ArcBackupRestoreServiceEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -18987,7 +18987,7 @@ + }, + { + 'name': 'ArcGoogleLocationServicesEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -19029,7 +19029,7 @@ }, { 'name': 'EnableSyncConsent', @@ -17473,7 +20041,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -18983,7 +18983,7 @@ +@@ -19047,7 +19047,7 @@ + }, + { + 'name': 'ContextualSuggestionsEnabled', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['android:69-75'], +@@ -19068,7 +19068,7 @@ + }, + { + 'name': 'DeviceAutoUpdateTimeRestrictions', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -19155,7 +19155,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -17482,7 +20068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -19002,7 +19002,7 @@ +@@ -19174,7 +19174,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -17491,7 +20077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19040,7 +19040,7 @@ +@@ -19212,7 +19212,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -17500,7 +20086,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19109,7 +19109,7 @@ +@@ -19236,7 +19236,7 @@ + }, + { + 'name': 'DeviceUpdateStagingSchedule', +- 'owners': ['file://components/policy/resources/OWNERS', 'anqing@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'anqing@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -19281,7 +19281,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -17509,7 +20104,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'], -@@ -19124,7 +19124,7 @@ +@@ -19296,13 +19296,13 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -17518,7 +20113,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy is set to false, no tabs will be frozen.''', }, -@@ -19151,7 +19151,7 @@ + { + 'name': 'UrlKeyedAnonymizedDataCollectionEnabled', +- 'owners': ['file://base/metrics/OWNERS', 'bcwhite@chromium.org'], ++ 'owners': ['file://base/metrics/OWNERS', 'bcwhite@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:69-', 'chrome_os:69-', 'android:70-', 'ios:90-'], +@@ -19323,7 +19323,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -17527,7 +20129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19166,7 +19166,7 @@ +@@ -19338,7 +19338,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -17536,7 +20138,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-'], -@@ -19186,7 +19186,7 @@ +@@ -19358,7 +19358,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -17545,7 +20147,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19204,7 +19204,7 @@ +@@ -19376,7 +19376,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -17554,7 +20156,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19229,7 +19229,7 @@ +@@ -19401,7 +19401,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -17563,7 +20165,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19267,12 +19267,12 @@ +@@ -19419,7 +19419,7 @@ + }, + { + 'name': 'ManagedConfigurationPerOrigin', +- 'owners': ['file://chrome/browser/device_api/OWNERS', 'apotapchuk@chromium.org'], ++ 'owners': ['file://chrome/browser/device_api/OWNERS', 'apotapchuk@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -19439,12 +19439,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -17579,7 +20190,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -19311,11 +19311,11 @@ +@@ -19457,7 +19457,7 @@ + }, + { + 'name': 'WebAppInstallForceList', +- 'owners': ['file://chrome/browser/web_applications/OWNERS', 'ortuno@chromium.org'], ++ 'owners': ['file://chrome/browser/web_applications/OWNERS', 'ortuno@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -19484,14 +19484,14 @@ 'per_profile': True, }, 'example_value': [{ @@ -17591,9 +20211,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli - 'url': 'https://docs.google.com', + 'url': 'https://docs.9oo91e.qjz9zk', 'default_launch_container': 'tab' + }, { +- 'url': 'https://docs.google.com/editor', ++ 'url': 'https://docs.9oo91e.qjz9zk/editor', + 'default_launch_container': 'window', + 'fallback_app_name': 'Editor' }], - 'id': 468, -@@ -19331,7 +19331,7 @@ +@@ -19524,7 +19524,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -17602,7 +20226,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19356,7 +19356,7 @@ +@@ -19549,7 +19549,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -17611,7 +20235,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19381,7 +19381,7 @@ +@@ -19574,7 +19574,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -17620,7 +20244,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19405,7 +19405,7 @@ +@@ -19598,7 +19598,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -17629,7 +20253,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19430,7 +19430,7 @@ +@@ -19623,7 +19623,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -17638,7 +20262,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19455,7 +19455,7 @@ +@@ -19648,7 +19648,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -17647,7 +20271,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -19481,7 +19481,7 @@ +@@ -19674,7 +19674,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -17656,7 +20280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -19507,7 +19507,7 @@ +@@ -19700,7 +19700,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -17665,7 +20289,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -19533,7 +19533,7 @@ +@@ -19726,7 +19726,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -17674,7 +20298,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-'], -@@ -19553,7 +19553,7 @@ +@@ -19746,7 +19746,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -17683,7 +20307,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -19572,7 +19572,7 @@ +@@ -19765,7 +19765,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -17692,7 +20316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -19590,7 +19590,7 @@ +@@ -19783,7 +19783,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -17701,7 +20325,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -19675,7 +19675,7 @@ +@@ -19828,7 +19828,7 @@ + }, + { + 'name': 'ScreenBrightnessPercent', +- 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', 'agawronska@chromium.org'], ++ 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', 'agawronska@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -19868,7 +19868,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -17710,7 +20343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -19693,7 +19693,7 @@ +@@ -19886,7 +19886,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -17719,7 +20352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19724,7 +19724,7 @@ +@@ -19917,7 +19917,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -17728,7 +20361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -19744,7 +19744,7 @@ +@@ -19937,7 +19937,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -17737,7 +20370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19771,7 +19771,7 @@ +@@ -19964,7 +19964,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -17746,7 +20379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19798,7 +19798,7 @@ +@@ -19991,7 +19991,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -17755,7 +20388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19825,7 +19825,7 @@ +@@ -20018,7 +20018,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -17764,7 +20397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -19842,12 +19842,12 @@ +@@ -20035,12 +20035,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. @@ -17779,7 +20412,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', -@@ -19862,12 +19862,12 @@ +@@ -20055,12 +20055,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. @@ -17794,7 +20427,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', -@@ -19882,12 +19882,12 @@ +@@ -20075,12 +20075,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. @@ -17809,7 +20442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -19905,7 +19905,7 @@ +@@ -20098,7 +20098,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -17818,7 +20451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -19923,7 +19923,7 @@ +@@ -20116,7 +20116,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -17827,7 +20460,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -19981,7 +19981,7 @@ +@@ -20133,7 +20133,7 @@ + }, + { + 'name': 'DeviceDisplayResolution', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -20174,7 +20174,7 @@ }, { 'name': 'PluginVmAllowed', @@ -17836,7 +20478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -19999,7 +19999,7 @@ +@@ -20192,7 +20192,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -17845,7 +20487,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -20019,7 +20019,7 @@ +@@ -20212,7 +20212,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -17854,7 +20496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20038,7 +20038,7 @@ +@@ -20231,7 +20231,7 @@ }, { 'name': 'PluginVmUserId', @@ -17863,7 +20505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -20057,7 +20057,7 @@ +@@ -20250,7 +20250,7 @@ }, { 'name': 'PluginVmImage', @@ -17872,7 +20514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20088,7 +20088,7 @@ +@@ -20281,7 +20281,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -17881,7 +20523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20107,7 +20107,7 @@ +@@ -20300,7 +20300,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -17890,7 +20532,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20312,7 +20312,7 @@ +@@ -20323,7 +20323,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'], + 'type': 'dict', + 'schema': { + 'sensitiveValue': True, +@@ -20401,7 +20401,7 @@ + }, + { + 'name': 'ClientCertificateManagementAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -20441,7 +20441,7 @@ + { + 'id': 520, + 'name': 'DeviceRebootOnUserSignout', +- 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -20488,7 +20488,7 @@ + }, + { + 'name': 'ForceNetworkInProcess', +- 'owners': ['file://services/network/OWNERS', 'jam@chromium.org'], ++ 'owners': ['file://services/network/OWNERS', 'jam@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:72-83'], +@@ -20505,7 +20505,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -17899,7 +20577,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -20352,7 +20352,7 @@ +@@ -20545,7 +20545,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -17908,7 +20586,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20370,7 +20370,7 @@ +@@ -20563,7 +20563,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -17917,7 +20595,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20388,7 +20388,7 @@ +@@ -20581,7 +20581,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -17926,7 +20604,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -20411,7 +20411,7 @@ +@@ -20604,7 +20604,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -17935,7 +20613,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20430,7 +20430,7 @@ +@@ -20623,7 +20623,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -17944,7 +20622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -20450,11 +20450,11 @@ +@@ -20643,11 +20643,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -17958,7 +20636,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -20483,7 +20483,7 @@ +@@ -20676,7 +20676,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -17967,7 +20645,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -20504,7 +20504,7 @@ +@@ -20697,7 +20697,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -17976,7 +20654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20527,7 +20527,7 @@ +@@ -20720,7 +20720,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -17985,7 +20663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20606,7 +20606,7 @@ +@@ -20799,7 +20799,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -17994,7 +20672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -20627,7 +20627,7 @@ +@@ -20820,7 +20820,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -18003,7 +20681,30 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -20681,7 +20681,7 @@ +@@ -20845,7 +20845,7 @@ + }, + { + 'name': 'SignedHTTPExchangeEnabled', +- 'owners': ['file://content/browser/web_package/OWNERS', 'ksakamoto@chromium.org'], ++ 'owners': ['file://content/browser/web_package/OWNERS', 'ksakamoto@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:75-', 'chrome_os:75-'], +@@ -20874,7 +20874,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.*'], + 'type': 'list', + 'schema': { +@@ -20900,11 +20900,11 @@ + + Note: Wildcards, *, are allowed. + +- For detailed information on valid URL patterns, please see https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.''', ++ For detailed information on valid URL patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns.''', }, { 'name': 'DeviceQuickFixBuildToken', @@ -18012,7 +20713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -20704,7 +20704,7 @@ +@@ -20927,7 +20927,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -18021,16 +20722,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -20741,7 +20741,7 @@ +@@ -20960,7 +20960,7 @@ }, { - 'name': 'SamlLockScreenReauthenticationEnabled', + 'name': 'LockScreenReauthenticationEnabled', - 'owners': ['mslus@chromium.org', 'emaxx@chromium.org'], + 'owners': ['mslus@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20760,7 +20760,7 @@ +@@ -20979,7 +20979,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -18039,7 +20740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -20791,7 +20791,7 @@ +@@ -21010,7 +21010,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -18048,7 +20749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20818,7 +20818,7 @@ +@@ -21037,7 +21037,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -18057,7 +20758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -20839,7 +20839,7 @@ +@@ -21058,7 +21058,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -18066,7 +20767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -20906,7 +20906,7 @@ +@@ -21125,7 +21125,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -18075,7 +20776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20957,7 +20957,7 @@ +@@ -21176,7 +21176,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -18084,7 +20785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -20980,7 +20980,7 @@ +@@ -21199,7 +21199,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -18093,7 +20794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -21003,7 +21003,7 @@ +@@ -21222,7 +21222,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -18102,7 +20803,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -21189,7 +21189,7 @@ +@@ -21268,7 +21268,7 @@ + }, + { + 'name': 'KerberosEnabled', +- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'fsandrade@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'fsandrade@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:87-'], +@@ -21289,7 +21289,7 @@ + }, + { + 'name': 'KerberosRememberPasswordEnabled', +- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:87-'], +@@ -21310,7 +21310,7 @@ + }, + { + 'name': 'KerberosAddAccountsAllowed', +- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:87-'], +@@ -21331,7 +21331,7 @@ + }, + { + 'name': 'KerberosAccounts', +- 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/kerberos/OWNERS', 'tomdobro@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -21408,7 +21408,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -18111,7 +20848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -21220,7 +21220,7 @@ +@@ -21439,7 +21439,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -18120,7 +20857,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -21306,7 +21306,7 @@ +@@ -21460,7 +21460,7 @@ + { + 'id': 571, + 'name': 'DevicePowerwashAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -21480,7 +21480,7 @@ + }, + { + 'name': 'ExternalPrintServers', +- 'owners': ['file://chromeos/printing/OWNERS', 'luum@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'luum@ch40m1um.qjz9zk'], + 'type': 'external', + 'schema': { + 'type': 'object', +@@ -21525,7 +21525,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -18129,7 +20884,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -21355,7 +21355,7 @@ +@@ -21574,7 +21574,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -18138,7 +20893,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -21433,7 +21433,7 @@ +@@ -21594,7 +21594,7 @@ + }, + { + 'name': 'CACertificateManagementAllowed', +- 'owners': ['file://components/policy/resources/OWNERS', 'poromov@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'poromov@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -21632,7 +21632,7 @@ + { + 'id': 581, + 'name': 'LockScreenMediaPlaybackEnabled', +- 'owners': ['file://services/media_session/OWNERS', 'mlamouri@chromium.org'], ++ 'owners': ['file://services/media_session/OWNERS', 'mlamouri@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -21652,7 +21652,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -18147,7 +20920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21568,7 +21568,7 @@ +@@ -21787,7 +21787,7 @@ }, { 'name': 'OnFileAttachedEnterpriseConnector', @@ -18156,7 +20929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21703,7 +21703,7 @@ +@@ -21922,7 +21922,7 @@ }, { 'name': 'OnBulkDataEntryEnterpriseConnector', @@ -18165,7 +20938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21834,7 +21834,7 @@ +@@ -22053,7 +22053,7 @@ }, { 'name': 'OnSecurityEventEnterpriseConnector', @@ -18174,7 +20947,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21871,7 +21871,7 @@ +@@ -22090,7 +22090,7 @@ }, { 'name': 'EnterpriseRealTimeUrlCheckMode', @@ -18183,7 +20956,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21913,7 +21913,7 @@ +@@ -22132,7 +22132,7 @@ }, { 'name': 'RendererCodeIntegrityEnabled', @@ -18192,7 +20965,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -21929,11 +21929,11 @@ +@@ -22148,11 +22148,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. @@ -18206,18 +20979,18 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21955,7 +21955,7 @@ +@@ -22178,7 +22178,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', -- 'owners': ['kdillon@chromium.org, panicker@chromium.org'], -+ 'owners': ['kdillon@ch40m1um.qjz9zk, panicker@ch40m1um.qjz9zk'], +- 'owners': ['kdillon@chromium.org, panicker@chromium.org', 'kdillon@chromium.org'], ++ 'owners': ['kdillon@ch40m1um.qjz9zk, panicker@ch40m1um.qjz9zk', 'kdillon@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'], -@@ -21976,11 +21976,11 @@ +@@ -22199,11 +22199,11 @@ - This policy will be removed in Chrome 88. + This policy will be removed in Chrome 93. - See https://www.chromestatus.com/feature/4664843055398912 .''', + See https://www.ch40mestatus.qjz9zk/feature/4664843055398912 .''', @@ -18229,7 +21002,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -22052,7 +22052,7 @@ +@@ -22229,7 +22229,7 @@ + { + 'id': 626, + 'name': 'TLS13HardeningForLocalAnchorsEnabled', +- 'owners': ['file://net/ssl/OWNERS', 'davidben@chromium.org'], ++ 'owners': ['file://net/ssl/OWNERS', 'davidben@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { + 'type': 'boolean', +@@ -22254,7 +22254,7 @@ + }, + { + 'name': 'AudioSandboxEnabled', +- 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], ++ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:79-', 'chrome.linux:79-', 'chrome.mac:79-'], +@@ -22275,7 +22275,7 @@ }, { 'name': 'CorsMitigationList', @@ -18238,7 +21029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22070,19 +22070,19 @@ +@@ -22293,19 +22293,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. @@ -18261,7 +21052,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'], -@@ -22103,7 +22103,7 @@ +@@ -22326,13 +22326,13 @@ This policy will be removed after a couple of milestones. @@ -18270,7 +21061,23 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Note that this policy was announced to be removed in $1Google Chrome version 82, but removed in version 84.''' }, -@@ -22162,7 +22162,7 @@ + { + 'name': 'ExternalPrintServersWhitelist', +- 'owners': ['file://chromeos/printing/OWNERS', 'luum@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'luum@ch40m1um.qjz9zk'], + 'supported_on': ['chrome_os:79-'], + 'id': 631, + 'features': { +@@ -22360,7 +22360,7 @@ + }, + { + 'name': 'ExternalPrintServersAllowlist', +- 'owners': ['file://chromeos/printing/OWNERS', 'thestig@chromium.org'], ++ 'owners': ['file://chromeos/printing/OWNERS', 'thestig@ch40m1um.qjz9zk'], + 'supported_on': ['chrome_os:86-'], + 'id': 750, + 'features': { +@@ -22385,7 +22385,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -18279,7 +21086,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, -@@ -22189,7 +22189,7 @@ +@@ -22412,7 +22412,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -18288,7 +21095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -22222,7 +22222,7 @@ +@@ -22445,7 +22445,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -18297,7 +21104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22257,7 +22257,7 @@ +@@ -22480,7 +22480,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -18306,7 +21113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22276,11 +22276,11 @@ +@@ -22499,11 +22499,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. @@ -18320,7 +21127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22299,11 +22299,11 @@ +@@ -22522,11 +22522,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. @@ -18334,7 +21141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -22327,11 +22327,11 @@ +@@ -22550,11 +22550,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -18348,7 +21155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -22349,7 +22349,7 @@ +@@ -22572,7 +22572,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -18357,7 +21164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22476,7 +22476,7 @@ +@@ -22699,7 +22699,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -18366,7 +21173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22499,7 +22499,7 @@ +@@ -22722,7 +22722,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -18375,7 +21182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22522,7 +22522,7 @@ +@@ -22745,7 +22745,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -18384,7 +21191,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-'], -@@ -22534,7 +22534,7 @@ +@@ -22757,7 +22757,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -18393,7 +21200,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. -@@ -22546,7 +22546,7 @@ +@@ -22769,7 +22769,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -18402,7 +21209,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -22632,7 +22632,7 @@ +@@ -22790,7 +22790,7 @@ + }, + { + 'name': 'PrinterTypeDenyList', +- 'owners': ['file://printing/OWNERS', 'weili@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'weili@ch40m1um.qjz9zk'], + 'type': 'string-enum-list', + 'schema': { + 'type': 'array', +@@ -22855,7 +22855,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -18411,7 +21227,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22672,7 +22672,7 @@ +@@ -22895,7 +22895,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -18420,7 +21236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -22695,7 +22695,7 @@ +@@ -22918,7 +22918,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -18429,7 +21245,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22770,7 +22770,7 @@ +@@ -22973,7 +22973,7 @@ + }, + { + 'name': 'PaymentMethodQueryEnabled', +- 'owners': ['file://components/payments/OWNERS', 'nburris@chromium.org'], ++ 'owners': ['file://components/payments/OWNERS', 'nburris@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:80-', 'chrome_os:80-', 'android:80-'], +@@ -22993,7 +22993,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -18438,7 +21263,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-'], -@@ -22792,7 +22792,7 @@ +@@ -23015,7 +23015,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -18447,7 +21272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -22836,8 +22836,8 @@ +@@ -23059,8 +23059,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -18458,7 +21283,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -22866,7 +22866,7 @@ +@@ -23089,7 +23089,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -18467,7 +21292,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -22909,8 +22909,8 @@ +@@ -23132,8 +23132,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -18478,7 +21303,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -22967,7 +22967,7 @@ +@@ -23160,7 +23160,7 @@ + }, + { + 'name': 'LocalDiscoveryEnabled', +- 'owners': ['file://cloud_print/OWNERS', 'weili@chromium.org'], ++ 'owners': ['file://cloud_print/OWNERS', 'weili@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:81-87', 'chrome_os:81-87'], +@@ -23193,7 +23193,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -18487,7 +21321,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-', 'chrome_os:81-'], -@@ -23008,7 +23008,7 @@ +@@ -23215,7 +23215,7 @@ + }, + { + 'name': 'AdvancedProtectionDeepScanningEnabled', +- 'owners': ['file://chrome/browser/safe_browsing/OWNERS', 'drubery@chromium.org'], ++ 'owners': ['file://chrome/browser/safe_browsing/OWNERS', 'drubery@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:81-81'], +@@ -23234,7 +23234,7 @@ }, { 'name': 'SystemProxySettings', @@ -18496,7 +21339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -23064,7 +23064,7 @@ +@@ -23290,7 +23290,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -18505,7 +21348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -23092,7 +23092,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -23318,7 +23318,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -18514,7 +21357,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -23261,7 +23261,7 @@ If set to False, $1Google Chrome will not +@@ -23345,7 +23345,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co + }, + { + 'name': 'AllowNativeNotifications', +- 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'], ++ 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.linux:83-'], +@@ -23400,7 +23400,7 @@ If set to False, $1Google Chrome will not + }, + { + 'name': 'RequiredClientCertificateForUser', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -23452,7 +23452,7 @@ If set to False, $1Google Chrome will not + }, + { + 'name': 'RequiredClientCertificateForDevice', +- 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'atwilson@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -23504,7 +23504,7 @@ If set to False, $1Google Chrome will not + }, + { + 'name': 'AdvancedProtectionAllowed', +- 'owners': ['file://chrome/browser/safe_browsing/OWNERS', 'drubery@chromium.org'], ++ 'owners': ['file://chrome/browser/safe_browsing/OWNERS', 'drubery@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:83-', 'chrome_os:83-'], +@@ -23521,7 +23521,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -18523,7 +21402,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-'], -@@ -23282,7 +23282,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23542,7 +23542,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', @@ -18532,25 +21411,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -23351,7 +23351,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23561,7 +23561,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'AccessibilityImageLabelsEnabled', +- 'owners': ['file://ui/accessibility/OWNERS', 'dmazzoni@chromium.org'], ++ 'owners': ['file://ui/accessibility/OWNERS', 'dmazzoni@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:84-', 'chrome.*:84-'], +@@ -23612,7 +23612,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', -- 'owners': ['file://components/performance_manager/OWNERS', 'chrisha@google.com'], -+ 'owners': ['file://components/performance_manager/OWNERS', 'chrisha@9oo91e.qjz9zk'], +- 'owners': ['file://components/performance_manager/OWNERS', 'chrisha@google.com', 'chrisha@chromium.org'], ++ 'owners': ['file://components/performance_manager/OWNERS', 'chrisha@9oo91e.qjz9zk', 'chrisha@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-', 'chrome.*:85-', 'android:85-'], -@@ -23389,7 +23389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23650,7 +23650,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', -- 'owners': ['chrome-bfcache@google.com'], -+ 'owners': ['chrome-bfcache@9oo91e.qjz9zk'], +- 'owners': ['chrome-bfcache@google.com', 'rakina@chromium.org'], ++ 'owners': ['chrome-bfcache@9oo91e.qjz9zk', 'rakina@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -23424,7 +23424,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23685,7 +23685,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -18559,7 +21447,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -23450,7 +23450,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23711,7 +23711,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -18568,16 +21456,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -23469,7 +23469,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23730,7 +23730,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', -- 'owners': ['file://components/client_hints/OWNERS', 'yoavweiss@google.com'], -+ 'owners': ['file://components/client_hints/OWNERS', 'yoavweiss@9oo91e.qjz9zk'], +- 'owners': ['file://components/client_hints/OWNERS', 'yoavweiss@google.com', 'aarontag@chromium.org'], ++ 'owners': ['file://components/client_hints/OWNERS', 'yoavweiss@9oo91e.qjz9zk', 'aarontag@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-', 'chrome.*:84-', 'android:84-'], -@@ -23492,7 +23492,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23753,7 +23753,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -18586,7 +21474,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23514,7 +23514,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23775,7 +23775,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -18595,7 +21483,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-'], -@@ -23537,7 +23537,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23798,7 +23798,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -18604,7 +21492,16 @@ 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-'], -@@ -23582,7 +23582,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23817,7 +23817,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'LookalikeWarningAllowlistDomains', +- 'owners': ['file://chrome/browser/lookalikes/OWNERS', 'jdeblasio@chromium.org'], ++ 'owners': ['file://chrome/browser/lookalikes/OWNERS', 'jdeblasio@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -23843,7 +23843,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -18613,7 +21510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -23612,7 +23612,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23873,7 +23873,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -18622,7 +21519,34 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23799,18 +23799,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -23916,7 +23916,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'CloudPrintWarningsSuppressed', +- 'owners': ['file://printing/OWNERS', 'rbpotter@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'rbpotter@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:86-87', 'chrome_os:86-87'], +@@ -23946,7 +23946,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'EnableDeprecatedPrivetPrinting', +- 'owners': ['file://printing/OWNERS', 'rbpotter@chromium.org'], ++ 'owners': ['file://printing/OWNERS', 'rbpotter@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:89-93', 'chrome_os:89-93'], +@@ -23975,7 +23975,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'DataLeakPreventionRulesList', +- 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'ayaelattar@chromium.org'], ++ 'owners': ['file://chrome/browser/chromeos/policy/dlp/OWNERS', 'ayaelattar@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -24060,18 +24060,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -18647,7 +21571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -23843,8 +23843,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24104,8 +24104,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -18658,12 +21582,12 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -23889,13 +23889,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24150,13 +24150,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. -- - Format the URL patterns according to this format ( https://www.chromium.org/administrators/url-blacklist-filter-format ). -+ - Format the URL patterns according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format ). +- - Format the URL patterns according to this format ( https://www.chromium.org/administrators/url-blocklist-filter-format ). ++ - Format the URL patterns according to this format ( https://www.ch40m1um.qjz9zk/administrators/url-blocklist-filter-format ). If the policy is left not set, no restrictions will be applied.''', }, @@ -18674,7 +21598,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-'], -@@ -23928,7 +23928,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24189,7 +24189,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -18683,7 +21607,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-'], -@@ -23955,7 +23955,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24216,7 +24216,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -18692,7 +21616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -23979,7 +23979,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24240,7 +24240,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -18701,7 +21625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -24004,7 +24004,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24265,7 +24265,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -18710,7 +21634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24061,7 +24061,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24319,7 +24319,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -18719,7 +21643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-'], -@@ -24093,7 +24093,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24351,7 +24351,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -18728,7 +21652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -24124,7 +24124,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24382,7 +24382,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -18737,7 +21661,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -24260,7 +24260,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24471,7 +24471,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'ProfilePickerOnStartupAvailability', +- 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -24518,7 +24518,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -18746,7 +21679,78 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -24383,7 +24383,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24553,7 +24553,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'WebXRImmersiveArEnabled', +- 'owners': ['bialpio@chromium.org', 'xr-dev@chromium.org'], ++ 'owners': ['bialpio@ch40m1um.qjz9zk', 'xr-dev@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['android:90-'], +@@ -24586,7 +24586,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'SendDownloadToCloudEnterpriseConnector', +- 'owners': ['rogerta@chromium.org', 'mad@chromium.org', 'alicego@google.com'], ++ 'owners': ['rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk', 'alicego@9oo91e.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'array', +@@ -24671,7 +24671,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'DeviceSystemWideTracingEnabled', +- 'owners': ['chinglinyu@chromium.org', 'eseckler@chromium.org'], ++ 'owners': ['chinglinyu@ch40m1um.qjz9zk', 'eseckler@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:90-'], +@@ -24705,7 +24705,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'WebAppSettings', +- 'owners': ['mjackson@microsoft.com', 'cmp@chromium.org', 'file://chrome/browser/web_applications/OWNERS', 'tapted@chromium.org'], ++ 'owners': ['mjackson@m1cr050ft.qjz9zk', 'cmp@ch40m1um.qjz9zk', 'file://chrome/browser/web_applications/OWNERS', 'tapted@ch40m1um.qjz9zk'], + 'type': 'dict', + 'schema': { + 'type': 'object', +@@ -24763,7 +24763,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'FetchKeepaliveDurationSecondsOnShutdown', +- 'owners': ['yhirano@chromium.org'], ++ 'owners': ['yhirano@ch40m1um.qjz9zk'], + 'type': 'int', + 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, + 'default': 0, +@@ -24785,7 +24785,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'SuppressDifferentOriginSubframeDialogs', +- 'owners': ['carlosil@chromium.org', 'meacer@chromium.org'], ++ 'owners': ['carlosil@ch40m1um.qjz9zk', 'meacer@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'future_on': [ +@@ -24812,14 +24812,14 @@ 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': [], +- 'desc': '''As described in https://www.chromestatus.com/feature/5148698084376576 , JavaScript modal dialogs, triggered by $6window.alert, $6window.confirm, and $6window.prompt, will be blocked in $1Google Chrome if triggered from a subframe whose origin is different from the main frame origin. ++ 'desc': '''As described in https://www.ch40mestatus.qjz9zk/feature/5148698084376576 , JavaScript modal dialogs, triggered by $6window.alert, $6window.confirm, and $6window.prompt, will be blocked in $1Google Chrome if triggered from a subframe whose origin is different from the main frame origin. + 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.''', + }, + { + 'name': 'AudioProcessHighPriorityEnabled', +- 'owners': ['file://services/audio/OWNERS', 'guidou@chromium.org'], ++ 'owners': ['file://services/audio/OWNERS', 'guidou@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:90-'], +@@ -24943,7 +24943,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, 'doc_banner': { 'desc': '''A banner shown at the top of the policy documentation''', @@ -18755,7 +21759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', -@@ -24391,13 +24391,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -24951,13 +24951,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR 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. @@ -18771,7 +21775,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''', -@@ -24469,11 +24469,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -25029,11 +25029,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''', @@ -18785,7 +21789,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''', -@@ -24493,7 +24493,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -25053,7 +25053,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.''', @@ -18794,7 +21798,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.''', -@@ -24505,7 +24505,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -25065,7 +25065,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.''', @@ -18803,7 +21807,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.''', -@@ -24517,7 +24517,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -25077,7 +25077,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.''', @@ -18812,10 +21816,19 @@ 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 +@@ -25377,7 +25377,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio + { + 'id': 6, + 'name': 'RestoreOnStartup', +- 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], ++ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], + 'caption': '''Action on startup''', + 'policies': [ + 'RestoreOnStartup', diff --git a/components/policy/resources/webui/policy_base.js b/components/policy/resources/webui/policy_base.js --- a/components/policy/resources/webui/policy_base.js +++ b/components/policy/resources/webui/policy_base.js -@@ -568,7 +568,7 @@ cr.define('policy', function() { +@@ -608,7 +608,7 @@ cr.define('policy', function() { name, link: knownPolicyNames === policyNames.chrome.policyNames && knownPolicyNamesSet.has(name) ? @@ -19002,7 +22015,7 @@ diff --git a/components/policy/tools/template_writers/writers/doc_writer.py b/co diff --git a/components/policy/tools/template_writers/writers/ios_app_config_writer.py b/components/policy/tools/template_writers/writers/ios_app_config_writer.py --- a/components/policy/tools/template_writers/writers/ios_app_config_writer.py +++ b/components/policy/tools/template_writers/writers/ios_app_config_writer.py -@@ -117,7 +117,7 @@ class IOSAppConfigWriter(xml_formatted_writer.XMLFormattedWriter): +@@ -167,7 +167,7 @@ class IOSAppConfigWriter(xml_formatted_writer.XMLFormattedWriter): def BeginTemplate(self): self._app_config.attributes[ 'xmlns:xsi'] = 'http://www.w3.org/2001/XMLSchema-instance' @@ -19046,18 +22059,6 @@ diff --git a/components/quirks/quirks_client.cc b/components/quirks/quirks_clien "/chromeos/M%d?"; const int kMaxServerFailures = 10; -diff --git a/components/rappor/rappor_service_impl.cc b/components/rappor/rappor_service_impl.cc ---- a/components/rappor/rappor_service_impl.cc -+++ b/components/rappor/rappor_service_impl.cc -@@ -32,7 +32,7 @@ const char kMimeType[] = "application/vnd.chrome.rappor"; - const char kRapporDailyEventHistogram[] = "Rappor.DailyEvent.IntervalType"; - - // The rappor server's URL. --const char kDefaultServerUrl[] = "https://clients4.google.com/rappor"; -+const char kDefaultServerUrl[] = "https://clients4.9oo91e.qjz9zk/rappor"; - - } // namespace - diff --git a/components/resources/terms/terms_am.html b/components/resources/terms/terms_am.html --- a/components/resources/terms/terms_am.html +++ b/components/resources/terms/terms_am.html @@ -19902,29 +22903,6 @@ diff --git a/components/safe_browsing/content/browser/client_side_detection_serv struct ClientSideDetectionService::ClientPhishingReportInfo { std::unique_ptr loader; -diff --git a/components/safe_browsing/content/password_protection/password_protection_service.cc b/components/safe_browsing/content/password_protection/password_protection_service.cc ---- a/components/safe_browsing/content/password_protection/password_protection_service.cc -+++ b/components/safe_browsing/content/password_protection/password_protection_service.cc -@@ -47,7 +47,7 @@ namespace { - // Keys for storing password protection verdict into a DictionaryValue. - const int kRequestTimeoutMs = 10000; - const char kPasswordProtectionRequestUrl[] = -- "https://sb-ssl.google.com/safebrowsing/clientreport/login"; -+ "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/login"; - - } // namespace - -@@ -61,8 +61,8 @@ PasswordProtectionServiceBase::PasswordProtectionServiceBase( - if (history_service) - history_service_observation_.Observe(history_service); - -- common_spoofed_domains_ = {"login.live.com", "facebook.com", "box.com", -- "google.com", "paypal.com", "apple.com", -+ common_spoofed_domains_ = {"login.live.com", "f8c3b00k.qjz9zk", "box.com", -+ "9oo91e.qjz9zk", "paypal.com", "apple.com", - "yahoo.com", "adobe.com", "amazon.com", - "linkedin.com"}; - } 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 @@ -19949,18 +22927,6 @@ diff --git a/components/safe_browsing/core/browser/safe_browsing_token_fetcher.h // This interface is used to fetch access tokens for communcations with Safe // Browsing. It asynchronously returns an access token for the current account -diff --git a/components/safe_browsing/core/common/safebrowsing_constants.cc b/components/safe_browsing/core/common/safebrowsing_constants.cc ---- a/components/safe_browsing/core/common/safebrowsing_constants.cc -+++ b/components/safe_browsing/core/common/safebrowsing_constants.cc -@@ -15,7 +15,7 @@ const base::FilePath::CharType kSafeBrowsingBaseFilename[] = - const base::FilePath::CharType kCookiesFile[] = FILE_PATH_LITERAL(" Cookies"); - - // The URL for the Safe Browsing page. --const char kSafeBrowsingUrl[] = "https://safebrowsing.google.com/"; -+const char kSafeBrowsingUrl[] = "https://safebrowsing.9oo91e.qjz9zk/"; - - const char kCustomCancelReasonForURLLoader[] = "SafeBrowsing"; - diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/db/v4_protocol_manager_util.cc --- a/components/safe_browsing/core/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/db/v4_protocol_manager_util.cc @@ -19982,6 +22948,29 @@ diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/comp std::string Unescape(const std::string& url) { std::string unescaped_str(url); +diff --git a/components/safe_browsing/core/password_protection/password_protection_service_base.cc b/components/safe_browsing/core/password_protection/password_protection_service_base.cc +--- a/components/safe_browsing/core/password_protection/password_protection_service_base.cc ++++ b/components/safe_browsing/core/password_protection/password_protection_service_base.cc +@@ -38,7 +38,7 @@ namespace { + // Keys for storing password protection verdict into a DictionaryValue. + const int kRequestTimeoutMs = 10000; + const char kPasswordProtectionRequestUrl[] = +- "https://sb-ssl.google.com/safebrowsing/clientreport/login"; ++ "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/login"; + + } // namespace + +@@ -52,8 +52,8 @@ PasswordProtectionServiceBase::PasswordProtectionServiceBase( + if (history_service) + history_service_observation_.Observe(history_service); + +- common_spoofed_domains_ = {"login.live.com", "facebook.com", "box.com", +- "google.com", "paypal.com", "apple.com", ++ common_spoofed_domains_ = {"login.live.com", "f8c3b00k.qjz9zk", "box.com", ++ "9oo91e.qjz9zk", "paypal.com", "apple.com", + "yahoo.com", "adobe.com", "amazon.com", + "linkedin.com"}; + } diff --git a/components/safe_browsing/core/realtime/url_lookup_service.cc b/components/safe_browsing/core/realtime/url_lookup_service.cc --- a/components/safe_browsing/core/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/realtime/url_lookup_service.cc @@ -20112,7 +23101,7 @@ diff --git a/components/services/quarantine/quarantine_mac.mm b/components/servi diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/components/shared_highlighting/core/common/disabled_sites.cc --- a/components/shared_highlighting/core/common/disabled_sites.cc +++ b/components/shared_highlighting/core/common/disabled_sites.cc -@@ -19,13 +19,13 @@ bool ShouldOfferLinkToText(const GURL& url) { +@@ -19,16 +19,16 @@ bool ShouldOfferLinkToText(const GURL& url) { // against the RE stored in the value. For example, {"foo.com", ".*"} means // any page on the foo.com domain. const static std::map kBlocklist = { @@ -20122,7 +23111,11 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp - {"google.com", "^\\/amp\\/.*"}, + {"9oo91e.qjz9zk", "^\\/amp\\/.*"}, {"instagram.com", ".*"}, +- {"mail.google.com", ".*"}, ++ {"mail.9oo91e.qjz9zk", ".*"}, + {"outlook.live.com", ".*"}, {"reddit.com", ".*"}, + {"twitter.com", ".*"}, {"web.whatsapp.com", ".*"}, - {"youtube.com", ".*"}, + {"y0u1ub3.qjz9zk", ".*"}, @@ -20159,10 +23152,10 @@ 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. -@@ -170,8 +170,8 @@ AccountConsistencyHandler::ShouldAllowRequest( - if (base::FeatureList::IsEnabled(signin::kRestoreGaiaCookiesOnUserAction) && +@@ -177,8 +177,8 @@ AccountConsistencyService::AccountConsistencyHandler::ShouldAllowRequest( signin::IsUrlEligibleForMirrorCookie(url) && - identity_manager_->HasPrimaryAccount()) { + identity_manager_->HasPrimaryAccount( + signin::ConsentLevel::kNotRequired)) { - // CHROME_CONNECTED cookies are added asynchronously on google.com and - // youtube.com domains when Chrome detects that the user is signed-in. By + // CHROME_CONNECTED cookies are added asynchronously on 9oo91e.qjz9zk and @@ -20170,7 +23163,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. -@@ -203,7 +203,7 @@ void AccountConsistencyHandler::ShouldAllowResponse( +@@ -210,7 +210,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 @@ -20179,7 +23172,7 @@ diff --git a/components/signin/ios/browser/account_consistency_service.mm b/comp 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 -@@ -534,7 +534,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( +@@ -570,7 +570,7 @@ void AccountConsistencyService::OnChromeConnectedCookieFinished( void AccountConsistencyService::AddChromeConnectedCookies() { DCHECK(!browser_state_->IsOffTheRecord()); // These cookie requests are preventive. Chrome cannot be sure that @@ -20198,6 +23191,18 @@ diff --git a/components/signin/public/base/test_signin_client.cc b/components/si - return gaia::ExtractDomainName(email) == "gmail.com"; + return gaia::ExtractDomainName(email) == "9ma1l.qjz9zk"; } +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() { + 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 " +- "https://bugs.chromium.org/p/chromium/issues/" ++ "https://bugs.ch40m1um.qjz9zk/p/chromium/issues/" + "list?q=component:Services>SignIn.", + scope.c_str()); + } diff --git a/components/spellcheck/browser/spelling_service_client.cc b/components/spellcheck/browser/spelling_service_client.cc --- a/components/spellcheck/browser/spelling_service_client.cc +++ b/components/spellcheck/browser/spelling_service_client.cc @@ -20341,8 +23346,8 @@ 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 -@@ -65,7 +65,7 @@ TranslateManager::TranslateErrorCallbackList* g_error_callback_list_ = nullptr; - TranslateManager::TranslateInitCallbackList* g_init_callback_list_ = nullptr; +@@ -69,7 +69,7 @@ TranslateManager::LanguageDetectedCallbackList* g_detection_callback_list_ = + nullptr; const char kReportLanguageDetectionErrorURL[] = - "https://translate.google.com/translate_error?client=cr&action=langidc"; @@ -20521,7 +23526,7 @@ diff --git a/content/app/resources/README.txt b/content/app/resources/README.txt diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -@@ -749,7 +749,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -748,7 +748,7 @@ void ExtractUnderlines(NSAttributedString* string, // TODO(suzhe): We should send mouse events to the input method first if it // wants to handle them. But it won't work without implementing method // - (NSUInteger)characterIndexForPoint:. @@ -20590,7 +23595,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 -@@ -3751,7 +3751,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -3921,7 +3921,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -20599,7 +23604,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -3779,7 +3779,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { +@@ -3949,7 +3949,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 " @@ -20608,7 +23613,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -3891,7 +3891,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -4183,7 +4183,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -20617,6 +23622,18 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows common_params_->url.spec().c_str())); GetContentClient()->browser()->LogWebFeatureForCurrentPage( rfh, blink::mojom::WebFeature::kOpenerNavigationDownloadCrossOrigin); +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 +@@ -321,7 +321,7 @@ int g_next_accessibility_reset_token = 1; + // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. + bool g_allow_injecting_javascript = false; + +-const char kDotGoogleDotCom[] = ".google.com"; ++const char kDotGoogleDotCom[] = ".9oo91e.qjz9zk"; + + typedef std::unordered_map
@@ -20698,22 +23715,10 @@ diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac. // where Nuance voices don't retain the utterance string and // crash when trying to call willSpeakWord. @interface SingleUseSpeechSynthesizer : NSSpeechSynthesizer { -diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc ---- a/content/browser/web_contents/web_contents_impl.cc -+++ b/content/browser/web_contents/web_contents_impl.cc -@@ -216,7 +216,7 @@ using AccessibilityEventCallback = - namespace { - - const int kMinimumDelayBetweenLoadingUpdatesMS = 100; --const char kDotGoogleDotCom[] = ".google.com"; -+const char kDotGoogleDotCom[] = ".9oo91e.qjz9zk"; - - using LifecycleState = RenderFrameHostImpl::LifecycleState; - 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 -@@ -167,12 +167,12 @@ base::Optional ProcessAppIdExtension(std::string appid, +@@ -171,12 +171,12 @@ base::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 = @@ -20729,6 +23734,15 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w (appid_url.EqualsIgnoringRef(kGstatic1) || appid_url.EqualsIgnoringRef(kGstatic2))) { return appid; +@@ -729,7 +729,7 @@ std::string SerializeWebAuthnCollectedClientDataToJson( + ret.append(R"(,"other_keys_can_be_added_here":")"); + ret.append( + "do not compare clientDataJSON against a template. See " +- "https://goo.gl/yabPex\""); ++ "https://goo.gl.qjz9zk/yabPex\""); + } + + ret.append("}"); 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 @@ -20789,7 +23803,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 -@@ -412,17 +412,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -413,17 +413,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -20813,7 +23827,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -441,7 +441,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -442,7 +442,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -20825,15 +23839,15 @@ 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 -@@ -88,7 +88,7 @@ GURL GetStartupURL() { +@@ -89,7 +89,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) - return GURL("https://www.google.com/"); + return GURL("https://www.9oo91e.qjz9zk/"); - GURL url(args[0]); - if (url.is_valid() && url.has_scheme()) + #if defined(OS_WIN) + GURL url(base::WideToUTF16(args[0])); diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -20849,7 +23863,7 @@ diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_li diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm -@@ -49,7 +49,7 @@ extern "C" { +@@ -50,7 +50,7 @@ extern "C" { // Using this API has the same effect as turning Bluetooth on or off using the // macOS System Preferences [4], and will effect all adapters. // @@ -20879,22 +23893,10 @@ diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth if (connection_info.rssi == 127) connection_info.rssi = kUnknownPower; -diff --git a/device/fido/client_data.cc b/device/fido/client_data.cc ---- a/device/fido/client_data.cc -+++ b/device/fido/client_data.cc -@@ -105,7 +105,7 @@ std::string SerializeCollectedClientDataToJson( - ret.append(R"(,"other_keys_can_be_added_here":")"); - ret.append( - "do not compare clientDataJSON against a template. See " -- "https://goo.gl/yabPex\""); -+ "https://goo.gl.qjz9zk/yabPex\""); - } - - ret.append("}"); diff --git a/device/fido/fido_strings.grd b/device/fido/fido_strings.grd --- a/device/fido/fido_strings.grd +++ b/device/fido/fido_strings.grd -@@ -184,7 +184,7 @@ This file contains the strings for //device/fido. +@@ -190,7 +190,7 @@ This file contains the strings for //device/fido. @@ -21055,78 +24057,6 @@ diff --git a/extensions/common/api/PRESUBMIT.py b/extensions/common/api/PRESUBMI for more details on the presubmit API built into depot_tools. """ -diff --git a/extensions/common/api/app_runtime.idl b/extensions/common/api/app_runtime.idl ---- a/extensions/common/api/app_runtime.idl -+++ b/extensions/common/api/app_runtime.idl -@@ -105,12 +105,12 @@ namespace app.runtime { - [nodoc] boolean? isDemoSession; - - // Whether the app is being launched in a Chrome OS -+ // href="https://support.9oo91e.qjz9zk/chromebook/answer/3134673">Chrome OS - // kiosk session. - boolean? isKioskSession; - - // Whether the app is being launched in a Chrome OS -+ // href="https://support.9oo91e.qjz9zk/chrome/a/answer/3017014">Chrome OS - // public session. - boolean? isPublicSession; - -diff --git a/extensions/common/api/app_window.idl b/extensions/common/api/app_window.idl ---- a/extensions/common/api/app_window.idl -+++ b/extensions/common/api/app_window.idl -@@ -331,7 +331,7 @@ namespace app.window { - // Note window.fullscreen() will cause the entire window to - // become fullscreen and does not require a user gesture. The HTML5 - // fullscreen API can also be used to enter fullscreen mode (see -- // Web APIs -+ // Web APIs - // for more details). - static void fullscreen(); - -diff --git a/extensions/common/api/bluetooth_low_energy.idl b/extensions/common/api/bluetooth_low_energy.idl ---- a/extensions/common/api/bluetooth_low_energy.idl -+++ b/extensions/common/api/bluetooth_low_energy.idl -@@ -121,7 +121,7 @@ namespace bluetoothLowEnergy { - dictionary ConnectProperties { - // Flag indicating whether a connection to the device is left open when the - // event page of the application is unloaded (see Manage App -+ // href="http://developer.ch40me.qjz9zk/apps/app_lifecycle.html">Manage App - // Lifecycle). The default value is false. - boolean persistent; - }; -@@ -131,7 +131,7 @@ namespace bluetoothLowEnergy { - dictionary NotificationProperties { - // Flag indicating whether the app should receive notifications when the - // event page of the application is unloaded (see Manage App -+ // href="http://developer.ch40me.qjz9zk/apps/app_lifecycle.html">Manage App - // Lifecycle). The default value is false. - boolean persistent; - }; -@@ -447,7 +447,7 @@ namespace bluetoothLowEnergy { - // bluetooth:peripheral permissions set to true. Additionally this API - // is only available to auto launched apps in Kiosk Mode or by setting - // the '--enable-ble-advertising-in-apps' command-line switch. -- // See https://developer.chrome.com/apps/manifest/bluetooth -+ // See https://developer.ch40me.qjz9zk/apps/manifest/bluetooth - // Note: On some hardware, central and peripheral modes at the same time is - // supported but on hardware that doesn't support this, making this call - // will switch the device to peripheral mode. In the case of hardware which -diff --git a/extensions/common/api/bluetooth_socket.idl b/extensions/common/api/bluetooth_socket.idl ---- a/extensions/common/api/bluetooth_socket.idl -+++ b/extensions/common/api/bluetooth_socket.idl -@@ -12,7 +12,7 @@ namespace bluetoothSocket { - dictionary SocketProperties { - // Flag indicating whether the socket is left open when the event page of - // the application is unloaded (see Manage App -+ // href="http://developer.ch40me.qjz9zk/apps/app_lifecycle.html">Manage App - // Lifecycle). The default value is false. When the - // application is loaded, any sockets previously opened with persistent=true - // can be fetched with $ref:getSockets. diff --git a/extensions/common/api/extensions_manifest_types.json b/extensions/common/api/extensions_manifest_types.json --- a/extensions/common/api/extensions_manifest_types.json +++ b/extensions/common/api/extensions_manifest_types.json @@ -21157,138 +24087,10 @@ diff --git a/extensions/common/api/extensions_manifest_types.json b/extensions/c "optional": true, "type": "array", "items": {"type": "string"} -diff --git a/extensions/common/api/networking_onc.idl b/extensions/common/api/networking_onc.idl ---- a/extensions/common/api/networking_onc.idl -+++ b/extensions/common/api/networking_onc.idl -@@ -9,7 +9,7 @@ - //

- //

- // Network connection configurations are specified following --// -+// - // Open Network Configuration (ONC) specification. - //

- //

-diff --git a/extensions/common/api/networking_private.idl b/extensions/common/api/networking_private.idl ---- a/extensions/common/api/networking_private.idl -+++ b/extensions/common/api/networking_private.idl -@@ -7,10 +7,10 @@ - // API is only valid if called from a browser or app associated with the - // primary user. See the Open Network Configuration (ONC) documentation for - // descriptions of properties: --// -+// - // src/components/onc/docs/onc_spec.html, or the --// --// Open Network Configuration page at chromium.org. -+// -+// Open Network Configuration page at ch40m1um.qjz9zk. - //

- // NOTE: Most dictionary properties and enum values use UpperCamelCase to match - // the ONC spec instead of the JavaScript lowerCamelCase convention. -diff --git a/extensions/common/api/printer_provider.idl b/extensions/common/api/printer_provider.idl ---- a/extensions/common/api/printer_provider.idl -+++ b/extensions/common/api/printer_provider.idl -@@ -45,7 +45,7 @@ namespace printerProvider { - DOMString title; - - // Print ticket in -- // -+ // - // CJT format. - object ticket; - -@@ -63,7 +63,7 @@ namespace printerProvider { - callback PrinterInfoCallback = void(optional PrinterInfo printerInfo); - - // |capabilities|: Device capabilities in -- // CDD -+ // CDD - // format. - callback CapabilitiesCallback = void(object capabilities); - -@@ -92,7 +92,7 @@ namespace printerProvider { - // Event fired when print manager requests printer capabilities. - // |printerId|: Unique ID of the printer whose capabilities are requested. - // |resultCallback|: Callback to return device capabilities in -- // CDD -+ // CDD - // format. - // The receiving listener must call callback exectly once. - static void onGetCapabilityRequested(DOMString printerId, -diff --git a/extensions/common/api/serial.idl b/extensions/common/api/serial.idl ---- a/extensions/common/api/serial.idl -+++ b/extensions/common/api/serial.idl -@@ -33,7 +33,7 @@ namespace serial { - dictionary ConnectionOptions { - // Flag indicating whether or not the connection should be left open when - // the application is suspended (see -- // Manage App -+ // Manage App - // Lifecycle). The default value is "false." When the application is - // loaded, any serial connections previously opened with persistent=true - // can be fetched with getConnections. -diff --git a/extensions/common/api/socket.idl b/extensions/common/api/socket.idl ---- a/extensions/common/api/socket.idl -+++ b/extensions/common/api/socket.idl -@@ -331,7 +331,7 @@ namespace socket { - // multicast loopback mode. On Windows, the applications with loopback off - // will not RECEIVE the loopback packets; while on Unix-like systems, the - // applications with loopback off will not SEND the loopback packets to -- // other applications on the same host. See MSDN: http://goo.gl/6vqbj -+ // other applications on the same host. See MSDN: http://goo.gl.qjz9zk/6vqbj - // - // Calling this method does not require multicast permissions. - // -diff --git a/extensions/common/api/sockets_tcp.idl b/extensions/common/api/sockets_tcp.idl ---- a/extensions/common/api/sockets_tcp.idl -+++ b/extensions/common/api/sockets_tcp.idl -@@ -14,7 +14,7 @@ namespace sockets.tcp { - dictionary SocketProperties { - // Flag indicating if the socket is left open when the event page of - // the application is unloaded (see -- // Manage App -+ // Manage App - // Lifecycle). The default value is "false." When the application is - // loaded, any sockets previously opened with persistent=true can be fetched - // with getSockets. -diff --git a/extensions/common/api/sockets_tcp_server.idl b/extensions/common/api/sockets_tcp_server.idl ---- a/extensions/common/api/sockets_tcp_server.idl -+++ b/extensions/common/api/sockets_tcp_server.idl -@@ -14,7 +14,7 @@ namespace sockets.tcpServer { - dictionary SocketProperties { - // Flag indicating if the socket remains open when the event page of the - // application is unloaded (see -- // Manage App -+ // Manage App - // Lifecycle). The default value is "false." When the application is - // loaded, any sockets previously opened with persistent=true can be fetched - // with getSockets. -diff --git a/extensions/common/api/sockets_udp.idl b/extensions/common/api/sockets_udp.idl ---- a/extensions/common/api/sockets_udp.idl -+++ b/extensions/common/api/sockets_udp.idl -@@ -14,7 +14,7 @@ namespace sockets.udp { - dictionary SocketProperties { - // Flag indicating if the socket is left open when the event page of the - // application is unloaded (see -- // Manage App -+ // Manage App - // Lifecycle). The default value is "false." When the application is - // loaded, any sockets previously opened with persistent=true can be fetched - // with getSockets. -@@ -278,7 +278,7 @@ namespace sockets.udp { - // multicast loopback mode. On Windows, the applications with loopback off - // will not RECEIVE the loopback packets; while on Unix-like systems, the - // applications with loopback off will not SEND the loopback packets to -- // other applications on the same host. See MSDN: http://goo.gl/6vqbj -+ // other applications on the same host. See MSDN: http://goo.gl.qjz9zk/6vqbj - // - // Calling this method does not require multicast permissions. - // 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 -@@ -203,7 +203,7 @@ bool isNonWildcardTLD(const std::string& url, +@@ -193,7 +193,7 @@ bool isNonWildcardTLD(const std::string& url, // Allow *.googleapis.com to be whitelisted for backwards-compatibility. // (crbug.com/409952) @@ -21328,7 +24130,7 @@ diff --git a/extensions/common/extension_urls.cc b/extensions/common/extension_u diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc -@@ -498,7 +498,7 @@ const char kInvalidManifestVersion[] = +@@ -493,7 +493,7 @@ const char kInvalidManifestVersion[] = "zero."; const char kInvalidManifestVersionOld[] = "The 'manifest_version' key must be present and set to * (without quotes). " @@ -21352,7 +24154,7 @@ diff --git a/extensions/common/permissions/PRESUBMIT.py b/extensions/common/perm diff --git a/extensions/strings/extensions_strings.grd b/extensions/strings/extensions_strings.grd --- a/extensions/strings/extensions_strings.grd +++ b/extensions/strings/extensions_strings.grd -@@ -278,8 +278,8 @@ +@@ -284,8 +284,8 @@ To check UI that displays these strings please use one of the sample applications such as: @@ -21419,15 +24221,12 @@ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_uti diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc -@@ -25,66 +25,66 @@ const char kSyncService[] = "chromiumsync"; +@@ -25,117 +25,117 @@ const char kSyncService[] = "chromiumsync"; const char kRemotingService[] = "chromoting"; // OAuth scopes. -const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin"; +const char kOAuth1LoginScope[] = "https://www.9oo91e.qjz9zk/accounts/OAuthLogin"; - const char kOAuthWrapBridgeUserInfoScope[] = -- "https://www.googleapis.com/auth/userinfo.email"; -+ "https://www.9oo91eapis.qjz9zk/auth/userinfo.email"; // Service/scope names for device management (cloud-based policy) server. const char kDeviceManagementServiceOAuth[] = @@ -21467,6 +24266,7 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant - "https://www.googleapis.com/auth/googletalk"; + "https://www.9oo91eapis.qjz9zk/auth/googletalk"; + // OAuth2 scope for access to Google account information. const char kGoogleUserInfoEmail[] = - "https://www.googleapis.com/auth/userinfo.email"; + "https://www.9oo91eapis.qjz9zk/auth/userinfo.email"; @@ -21474,34 +24274,101 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant - "https://www.googleapis.com/auth/userinfo.profile"; + "https://www.9oo91eapis.qjz9zk/auth/userinfo.profile"; - // OAuth scope for access to the people API (read-only). + // OAuth2 scope for access to the people API (read-only). const char kPeopleApiReadOnlyOAuth2Scope[] = - "https://www.googleapis.com/auth/peopleapi.readonly"; + "https://www.9oo91eapis.qjz9zk/auth/peopleapi.readonly"; - // OAuth scope for access to the Reauth flow. + // OAuth2 scope for access to the Reauth flow. const char kAccountsReauthOAuth2Scope[] = - "https://www.googleapis.com/auth/accounts.reauth"; + "https://www.9oo91eapis.qjz9zk/auth/accounts.reauth"; - // OAuth scope for access to audit recording (ARI). + // OAuth2 scope for access to audit recording (ARI). const char kAuditRecordingOAuth2Scope[] = - "https://www.googleapis.com/auth/auditrecording-pa"; + "https://www.9oo91eapis.qjz9zk/auth/auditrecording-pa"; - // OAuth scope for access to clear cut logs. + // OAuth2 scope for access to clear cut logs. -const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog"; +const char kClearCutOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/cclog"; - // OAuth scope for FCM, the Firebase Cloud Messaging service. + // OAuth2 scope for FCM, the Firebase Cloud Messaging service. const char kFCMOAuthScope[] = - "https://www.googleapis.com/auth/firebase.messaging"; + "https://www.9oo91eapis.qjz9zk/auth/firebase.messaging"; - // OAuth scope for access to Tachyon api. + // OAuth2 scope for access to Tachyon api. -const char kTachyonOAuthScope[] = "https://www.googleapis.com/auth/tachyon"; +const char kTachyonOAuthScope[] = "https://www.9oo91eapis.qjz9zk/auth/tachyon"; + // OAuth2 scope for access to the Photos API. +-const char kPhotosOAuth2Scope[] = "https://www.googleapis.com/auth/photos"; ++const char kPhotosOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/photos"; + + // OAuth2 scope for access to Cast backdrop API. + const char kCastBackdropOAuth2Scope[] = +- "https://www.googleapis.com/auth/cast.backdrop"; ++ "https://www.9oo91eapis.qjz9zk/auth/cast.backdrop"; + + // OAuth scope for access to Cloud Translation API. + const char kCloudTranslationOAuth2Scope[] = +- "https://www.googleapis.com/auth/cloud-translation"; ++ "https://www.9oo91eapis.qjz9zk/auth/cloud-translation"; + + // OAuth2 scope for access to passwords leak checking API. + const char kPasswordsLeakCheckOAuth2Scope[] = +- "https://www.googleapis.com/auth/identity.passwords.leak.check"; ++ "https://www.9oo91eapis.qjz9zk/auth/identity.passwords.leak.check"; + + // OAuth2 scope for access to Chrome safe browsing API. + const char kChromeSafeBrowsingOAuth2Scope[] = +- "https://www.googleapis.com/auth/chrome-safe-browsing"; ++ "https://www.9oo91eapis.qjz9zk/auth/chrome-safe-browsing"; + + // OAuth2 scope for access to kid permissions by URL. + const char kClassifyUrlKidPermissionOAuth2Scope[] = +- "https://www.googleapis.com/auth/kid.permission"; ++ "https://www.9oo91eapis.qjz9zk/auth/kid.permission"; + const char kKidFamilyReadonlyOAuth2Scope[] = +- "https://www.googleapis.com/auth/kid.family.readonly"; ++ "https://www.9oo91eapis.qjz9zk/auth/kid.family.readonly"; + + // OAuth2 scope for access to payments. + const char kPaymentsOAuth2Scope[] = +- "https://www.googleapis.com/auth/wallet.chrome"; ++ "https://www.9oo91eapis.qjz9zk/auth/wallet.chrome"; + + const char kCryptAuthOAuth2Scope[] = +- "https://www.googleapis.com/auth/cryptauth"; ++ "https://www.9oo91eapis.qjz9zk/auth/cryptauth"; + + // OAuth2 scope for access to Drive. +-const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive"; ++const char kDriveOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/drive"; + const char kDriveReadOnlyOAuth2Scope[] = +- "https://www.googleapis.com/auth/drive.readonly"; ++ "https://www.9oo91eapis.qjz9zk/auth/drive.readonly"; + + // OAuth2 scope for access to Assistant SDK. + const char kAssistantOAuth2Scope[] = +- "https://www.googleapis.com/auth/assistant-sdk-prototype"; ++ "https://www.9oo91eapis.qjz9zk/auth/assistant-sdk-prototype"; + + // OAuth2 scope for access to nearby sharing. + const char kNearbyShareOAuth2Scope[] = +- "https://www.googleapis.com/auth/nearbysharing-pa"; ++ "https://www.9oo91eapis.qjz9zk/auth/nearbysharing-pa"; + + // OAuth2 scope for access to GCM account tracker. +-const char kGCMGroupServerOAuth2Scope[] = "https://www.googleapis.com/auth/gcm"; ++const char kGCMGroupServerOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/gcm"; + + // OAuth2 scope for access to readonly Chrome web store. + const char kChromeWebstoreOAuth2Scope[] = +- "https://www.googleapis.com/auth/chromewebstore.readonly"; ++ "https://www.9oo91eapis.qjz9zk/auth/chromewebstore.readonly"; + // Used to mint uber auth tokens when needed. const char kGaiaSid[] = "sid"; diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc @@ -21614,18 +24481,6 @@ diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc // This is used as a lazy instance to determine keys once and cache them. class APIKeyCache { -diff --git a/google_update/google_update_idl.idl b/google_update/google_update_idl.idl ---- a/google_update/google_update_idl.idl -+++ b/google_update/google_update_idl.idl -@@ -902,7 +902,7 @@ interface IBrowserHttpRequest2 : IUnknown { - // @param request_headers HTTP request headers, if any. Can be NULL. - // @param response_headers_needed HTTP response headers that are needed. - // Should be one of the values listed here: -- // http://msdn.microsoft.com/aa385351.aspx -+ // http://msdn.m1cr050ft.qjz9zk/aa385351.aspx - // The input is a SAFEARRAY of DWORD. Can be a - // VT_EMPTY. - // @param response_headers HTTP response headers, returned as SAFEARRAY diff --git a/gpu/GLES2/extensions/ANGLE/EGL_ANGLE_sync_control_rate.txt b/gpu/GLES2/extensions/ANGLE/EGL_ANGLE_sync_control_rate.txt --- a/gpu/GLES2/extensions/ANGLE/EGL_ANGLE_sync_control_rate.txt +++ b/gpu/GLES2/extensions/ANGLE/EGL_ANGLE_sync_control_rate.txt @@ -21919,7 +24774,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 -@@ -176,7 +176,7 @@ locale. The strings in this file are specific to iOS. +@@ -179,7 +179,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. @@ -21928,7 +24783,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -242,7 +242,7 @@ locale. The strings in this file are specific to iOS. +@@ -257,7 +257,7 @@ locale. The strings in this file are specific to iOS. Data from Chromium sync @@ -21937,7 +24792,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -251,7 +251,7 @@ locale. The strings in this file are specific to iOS. +@@ -266,7 +266,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. @@ -21946,10 +24801,19 @@ 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 +@@ -344,7 +344,7 @@ locale. The strings in this file are specific to iOS. + Choose whether to clear your Chromium data from this device or keep it. + + +- Your account is managed by $1google.com, so your Chromium data will be cleared from this device. ++ Your account is managed by $19oo91e.qjz9zk, so your Chromium data will be cleared from this device. + + + Use Chromium Everywhere 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 -@@ -176,7 +176,7 @@ locale. The strings in this file are specific to iOS. +@@ -179,7 +179,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. @@ -21958,7 +24822,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -242,7 +242,7 @@ locale. The strings in this file are specific to iOS. +@@ -257,7 +257,7 @@ locale. The strings in this file are specific to iOS. Data from Chrome sync @@ -21967,7 +24831,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -251,7 +251,7 @@ locale. The strings in this file are specific to iOS. +@@ -266,7 +266,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. @@ -21976,10 +24840,19 @@ 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 +@@ -344,7 +344,7 @@ locale. The strings in this file are specific to iOS. + Choose whether to clear your Chrome data from this device or keep it. + + +- Your account is managed by $1google.com, so your Chrome data will be cleared from this device. ++ Your account is managed by $19oo91e.qjz9zk, so your Chrome data will be cleared from this device. + + + Use Chrome Everywhere 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 -@@ -370,7 +370,7 @@ locale. The strings in this file are specific to iOS. +@@ -376,7 +376,7 @@ locale. The strings in this file are specific to iOS. Current Webpage is on Incognito @@ -21988,7 +24861,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Bandwidth -@@ -544,7 +544,7 @@ locale. The strings in this file are specific to iOS. +@@ -541,7 +541,7 @@ locale. The strings in this file are specific to iOS. You won't be signed out of your Google Account. @@ -21997,7 +24870,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 -@@ -555,8 +555,8 @@ locale. The strings in this file are specific to iOS. +@@ -552,8 +552,8 @@ locale. The strings in this file are specific to iOS. Ok, got it @@ -22008,7 +24881,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -706,7 +706,7 @@ locale. The strings in this file are specific to iOS. +@@ -703,7 +703,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. @@ -22017,7 +24890,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. -@@ -916,7 +916,7 @@ Because your account is managed by $1google.com$1google.com @@ -22026,7 +24899,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1070,7 +1070,7 @@ Because your account is managed by $1google.com$1google.com @@ -22044,7 +24917,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Add existing data to $1john@doe.com. -@@ -1488,7 +1488,7 @@ While in incognito, sites can't use cookies to see your browsing activity across +@@ -1491,7 +1491,7 @@ While in incognito, sites can't use cookies to see your browsing activity across Privacy Notice @@ -22053,7 +24926,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1539,7 +1539,7 @@ While in incognito, sites can't use cookies to see your browsing activity across +@@ -1542,7 +1542,7 @@ While in incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -22062,7 +24935,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -1787,7 +1787,7 @@ Follow the steps below: +@@ -1790,7 +1790,7 @@ Follow the steps below: Turned off by your organization. @@ -22071,7 +24944,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Check Passwords -@@ -2226,12 +2226,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -22086,7 +24959,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. -@@ -2490,7 +2490,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -2508,7 +2508,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -22107,7 +24980,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", -@@ -417,7 +417,7 @@ bundle_data("unit_tests_bundle_data") { +@@ -418,7 +418,7 @@ bundle_data("unit_tests_bundle_data") { "//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", @@ -22143,7 +25016,7 @@ diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_contr diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc -@@ -80,41 +80,41 @@ const char* const kChromeHostURLs[] = { +@@ -81,41 +81,41 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = base::size(kChromeHostURLs); const char kSyncGoogleDashboardURL[] = @@ -22197,7 +25070,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"; -@@ -122,4 +122,4 @@ const char kReadingListReferrerURL[] = +@@ -123,4 +123,4 @@ const char kReadingListReferrerURL[] = const char kChromeUIAboutNewTabURL[] = "about://newtab/"; const char kManagementLearnMoreURL[] = @@ -22221,7 +25094,7 @@ diff --git a/ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -275,7 +275,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -308,7 +308,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -22230,7 +25103,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, -@@ -675,7 +675,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { +@@ -712,7 +712,7 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -22284,19 +25157,16 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, const GURL& osdd_url) { // Checks to see if we should generate a keyword based on the OSDD, and if -@@ -198,9 +198,9 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, - // new keyword will be created when done. For the last two args: - // 1. Used by newwork::ResourceRequest::render_frame_id. We don't use Blink - // so leave it to be the default value defined here: -- // https://cs.chromium.org/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=194; -+ // https://cs.ch40m1um.qjz9zk/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=194; - // 2. Used by network::ResourceRequest::resource_type. It's a design defect: -- // https://cs.chromium.org/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=100 -+ // https://cs.ch40m1um.qjz9zk/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=100 - // Use the same value as the SearchEngineTabHelper for Desktop. +@@ -198,7 +198,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, + // new keyword will be created when done. For |render_frame_id| arg, it's used + // by network::ResourceRequest::render_frame_id, we don't use Blink so leave + // it to be the default value defined here: +- // https://cs.chromium.org/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=194; ++ // https://cs.ch40m1um.qjz9zk/chromium/src/services/network/public/cpp/resource_request.h?rcl=39c6fbea496641a6514e34c0ab689871d14e6d52&l=194; ios::TemplateURLFetcherFactory::GetForBrowserState(browser_state) ->ScheduleDownload(keyword, osdd_url, item->GetFavicon().url, -@@ -212,7 +212,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, + url::Origin::Create(web_state_->GetLastCommittedURL()), +@@ -209,7 +209,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, // Creates a TemplateURL by |searchable_url| and adds it to TemplateURLService. // This code is based on: @@ -22394,7 +25264,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_app_i diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm +++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm -@@ -70,16 +70,16 @@ +@@ -72,16 +72,16 @@ namespace { // URL for 'Manage Activity' item in the Discover feed menu. const char kFeedManageActivityURL[] = @@ -22466,7 +25336,7 @@ diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chro diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm --- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm +++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm -@@ -530,16 +530,16 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -541,16 +541,16 @@ typedef NS_ENUM(NSInteger, ItemType) { TableViewURLItem* item = [[TableViewURLItem alloc] initWithType:ItemTypeURLNoMetadata]; item.title = @"Google Design"; @@ -22486,7 +25356,7 @@ diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.m item.metadata = @"3:42 PM"; [model addItem:item toSectionWithIdentifier:SectionIdentifierURL]; -@@ -558,7 +558,7 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -569,7 +569,7 @@ typedef NS_ENUM(NSInteger, ItemType) { item = [[TableViewURLItem alloc] initWithType:ItemTypeURLWithBadgeImage]; item.title = @"Photos - Google Photos"; @@ -22531,18 +25401,6 @@ diff --git a/ios/net/cookies/cookie_store_ios_test_util.mm b/ios/net/cookies/coo TestPersistentCookieStore::~TestPersistentCookieStore() = default; -diff --git a/ios/net/cookies/system_cookie_store_unittest_template.h b/ios/net/cookies/system_cookie_store_unittest_template.h ---- a/ios/net/cookies/system_cookie_store_unittest_template.h -+++ b/ios/net/cookies/system_cookie_store_unittest_template.h -@@ -123,7 +123,7 @@ template - class SystemCookieStoreTest : public PlatformTest { - public: - SystemCookieStoreTest() -- : test_cookie_url1_([NSURL URLWithString:@"http://foo.google.com/bar"]), -+ : test_cookie_url1_([NSURL URLWithString:@"http://foo.9oo91e.qjz9zk/bar"]), - test_cookie_url2_([NSURL URLWithString:@"http://bar.xyz.abc/"]), - test_cookie_url3_([NSURL URLWithString:@"http://123.foo.bar/"]) { - ClearCookies(); diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm --- a/ios/net/crn_http_protocol_handler.mm +++ b/ios/net/crn_http_protocol_handler.mm @@ -22570,7 +25428,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 -@@ -116,13 +116,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( +@@ -108,13 +108,13 @@ void ChromeIdentityService::GetHostedDomainForIdentity( NSString* ChromeIdentityService::GetCachedHostedDomainForIdentity( ChromeIdentity* identity) { @@ -22672,6 +25530,18 @@ diff --git a/ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm b/ios/sh "images?q=tbn:ANd9GcRl35jshKCRWt76yUSKh5r0_" "BRbWuSU1uZOCGnzq95nJ8yXUg913LciCgz-s3reyfACsrAAYg"); suggestion.icon = +diff --git a/ios/testing/data/http_server_files/simple_login_form.html b/ios/testing/data/http_server_files/simple_login_form.html +--- a/ios/testing/data/http_server_files/simple_login_form.html ++++ b/ios/testing/data/http_server_files/simple_login_form.html +@@ -2,7 +2,7 @@ + + + Login form. +-

++ + + + diff --git a/ios/testing/data/http_server_files/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 @@ -22728,7 +25598,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 -@@ -774,7 +774,7 @@ BOOL gChromeLongPressAndForceTouchHandlingEnabled = YES; +@@ -778,7 +778,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 @@ -23641,7 +26511,7 @@ diff --git a/native_client_sdk/src/web/manifest.html b/native_client_sdk/src/web diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_notifier_mac.mm --- a/net/base/network_change_notifier_mac.mm +++ b/net/base/network_change_notifier_mac.mm -@@ -185,7 +185,7 @@ void NetworkChangeNotifierMac::SetInitialConnectionType() { +@@ -213,7 +213,7 @@ void NetworkChangeNotifierMac::SetInitialConnectionType() { // Try to reach 0.0.0.0. This is the approach taken by Firefox: // @@ -23653,7 +26523,7 @@ diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_n 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 -@@ -434,8 +434,8 @@ bool IsGoogleHost(base::StringPiece host) { +@@ -435,8 +435,8 @@ bool IsGoogleHost(base::StringPiece host) { } bool IsTLS13ExperimentHost(base::StringPiece host) { @@ -23664,39 +26534,6 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc } bool IsLocalHostname(base::StringPiece host) { -diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h ---- a/net/cookies/cookie_store_unittest.h -+++ b/net/cookies/cookie_store_unittest.h -@@ -1541,7 +1541,7 @@ TYPED_TEST_P(CookieStoreTest, NetUtilCookieTest) { - - TYPED_TEST_P(CookieStoreTest, OverwritePersistentCookie) { - GURL url_foo("http://www.foo.com/"); -- GURL url_chromium("http://chromium.org"); -+ GURL url_chromium("http://ch40m1um.qjz9zk"); - CookieStore* cs = this->GetCookieStore(); - - // Insert a cookie "a" for path "/path1" -@@ -1594,7 +1594,7 @@ TYPED_TEST_P(CookieStoreTest, OverwritePersistentCookie) { - this->MatchCookieLines( - "a=val9", this->GetCookies(cs, GURL("http://www.foo.com/path2"))); - this->MatchCookieLines( -- "a=val99", this->GetCookies(cs, GURL("http://chromium.org/path1"))); -+ "a=val99", this->GetCookies(cs, GURL("http://ch40m1um.qjz9zk/path1"))); - } - - // Note that accepting an empty name is contrary to spec; see -diff --git a/net/data/filter_unittests/google.txt b/net/data/filter_unittests/google.txt ---- a/net/data/filter_unittests/google.txt -+++ b/net/data/filter_unittests/google.txt -@@ -4,7 +4,7 @@ Google's mission is to organize the world's information and make it universally - - As a first step to fulfilling that mission, Google's founders Larry Page and Sergey Brin developed a new approach to online search that took root in a Stanford University dorm room and quickly spread to information seekers around the globe. Google is now widely recognized as the world's largest search engine -- an easy-to-use free service that usually returns relevant results in a fraction of a second. - --When you visit www.google.com or one of the dozens of other Google domains, you'll be able to find information in many different languages; check stock quotes, maps, and news headlines; lookup phonebook listings for every city in the United States; search billions of images and peruse the world's largest archive of Usenet messages -- more than 1 billion posts dating back to 1981. -+When you visit www.9oo91e.qjz9zk or one of the dozens of other Google domains, you'll be able to find information in many different languages; check stock quotes, maps, and news headlines; lookup phonebook listings for every city in the United States; search billions of images and peruse the world's largest archive of Usenet messages -- more than 1 billion posts dating back to 1981. - - We also provide ways to access all this information without making a special trip to the Google homepage. The Google Toolbar enables you to conduct a Google search from anywhere on the web. And for those times when you're away from your PC altogether, Google can be used from a number of wireless platforms including WAP and i-mode phones. - 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 @@ -23706,16 +26543,6 @@ ecmZ3+xRPconfig(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -23950,90 +26777,6 @@ diff --git a/pdf/pdfium/pdfium_test_base.cc b/pdf/pdfium/pdfium_test_base.cc !result.engine->HandleDocumentLoad(nullptr)) { client->set_engine(nullptr); result.engine = nullptr; -diff --git a/ppapi/api/pp_macros.idl b/ppapi/api/pp_macros.idl ---- a/ppapi/api/pp_macros.idl -+++ b/ppapi/api/pp_macros.idl -@@ -22,7 +22,7 @@ - * supports __forceinline and GCC supports __inline__. Use of the static - * keyword ensures (in C) that the function is not compiled on its own, which - * could cause multiple definition errors. -- * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx -+ * http://msdn.m1cr050ft.qjz9zk/en-us/library/z8y1yy88.aspx - * http://gcc.gnu.org/onlinedocs/gcc/Inline.html - */ - #if defined(__cplusplus) -diff --git a/ppapi/api/ppb_file_system.idl b/ppapi/api/ppb_file_system.idl ---- a/ppapi/api/ppb_file_system.idl -+++ b/ppapi/api/ppb_file_system.idl -@@ -54,7 +54,7 @@ interface PPB_FileSystem { - * requestQuota from JavaScript: - * http://www.html5rocks.com/en/tutorials/file/filesystem/#toc-requesting-quota - * or set the unlimitedStorage permission for Chrome Web Store apps: -- * http://code.google.com/chrome/extensions/manifest.html#permissions -+ * http://code.9oo91e.qjz9zk/chrome/extensions/manifest.html#permissions - * - * @param[in] callback A PP_CompletionCallback to be called upon - * completion of Open(). -diff --git a/ppapi/api/ppb_host_resolver.idl b/ppapi/api/ppb_host_resolver.idl ---- a/ppapi/api/ppb_host_resolver.idl -+++ b/ppapi/api/ppb_host_resolver.idl -@@ -49,7 +49,7 @@ struct PP_HostResolver_Hint { - * Permissions: In order to run Resolve(), apps permission - * socket with subrule resolve-host is required. - * For more details about network communication permissions, please see: -- * http://developer.chrome.com/apps/app_network.html -+ * http://developer.ch40me.qjz9zk/apps/app_network.html - */ - interface PPB_HostResolver { - /** -diff --git a/ppapi/api/ppb_network_monitor.idl b/ppapi/api/ppb_network_monitor.idl ---- a/ppapi/api/ppb_network_monitor.idl -+++ b/ppapi/api/ppb_network_monitor.idl -@@ -20,7 +20,7 @@ label Chrome { - * Permissions: Apps permission socket with subrule - * network-state is required for UpdateNetworkList(). - * For more details about network communication permissions, please see: -- * http://developer.chrome.com/apps/app_network.html -+ * http://developer.ch40me.qjz9zk/apps/app_network.html - */ - interface PPB_NetworkMonitor { - /** -diff --git a/ppapi/api/ppb_network_proxy.idl b/ppapi/api/ppb_network_proxy.idl ---- a/ppapi/api/ppb_network_proxy.idl -+++ b/ppapi/api/ppb_network_proxy.idl -@@ -20,7 +20,7 @@ label Chrome { - * Permissions: Apps permission socket with subrule - * resolve-proxy is required for using this API. - * For more details about network communication permissions, please see: -- * http://developer.chrome.com/apps/app_network.html -+ * http://developer.ch40me.qjz9zk/apps/app_network.html - */ - [singleton] - interface PPB_NetworkProxy { -diff --git a/ppapi/api/ppb_tcp_socket.idl b/ppapi/api/ppb_tcp_socket.idl ---- a/ppapi/api/ppb_tcp_socket.idl -+++ b/ppapi/api/ppb_tcp_socket.idl -@@ -61,7 +61,7 @@ enum PP_TCPSocket_Option { - * tcp-connect is required for Connect(); subrule - * tcp-listen is required for Listen(). - * For more details about network communication permissions, please see: -- * http://developer.chrome.com/apps/app_network.html -+ * http://developer.ch40me.qjz9zk/apps/app_network.html - */ - interface PPB_TCPSocket { - /** -diff --git a/ppapi/api/ppb_udp_socket.idl b/ppapi/api/ppb_udp_socket.idl ---- a/ppapi/api/ppb_udp_socket.idl -+++ b/ppapi/api/ppb_udp_socket.idl -@@ -90,7 +90,7 @@ enum PP_UDPSocket_Option { - * udp-bind is required for Bind(); subrule - * udp-send-to is required for SendTo(). - * For more details about network communication permissions, please see: -- * http://developer.chrome.com/apps/app_network.html -+ * http://developer.ch40me.qjz9zk/apps/app_network.html - */ - interface PPB_UDPSocket { - /** diff --git a/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html b/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html --- a/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html +++ b/ppapi/native_client/tests/breakpad_crash_test/crash_in_syscall.html @@ -24514,7 +27257,7 @@ diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session. diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd --- a/remoting/resources/remoting_strings.grd +++ b/remoting/resources/remoting_strings.grd -@@ -544,7 +544,7 @@ +@@ -541,7 +541,7 @@ Welcome to Chrome Remote Desktop @@ -24523,7 +27266,7 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti Follow the instructions to set up your computer for remote access After setup is complete, refresh this page, then you'll be able to access the computer by choosing your device and entering the PIN -@@ -643,7 +643,7 @@ +@@ -640,7 +640,7 @@ @@ -24532,7 +27275,7 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti -@@ -656,7 +656,7 @@ +@@ -653,7 +653,7 @@ @@ -24651,7 +27394,7 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c 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 -@@ -497,7 +497,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" @@ -24692,16 +27435,19 @@ diff --git a/services/image_annotation/image_annotation_service.h b/services/ima diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html --- a/styleguide/c++/c++11.html +++ b/styleguide/c++/c++11.html -@@ -22,7 +22,7 @@ table tbody tr td:first-child { +@@ -21,9 +21,9 @@ table tbody tr td:first-child { +

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 +

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 -@@ -36,8 +36,8 @@ toolchain support is sufficient, a standard is declared "initially supported", +@@ -37,8 +37,8 @@ toolchain support is sufficient, a standard is declared "initially supported", with new language/library features banned pending discussion.

You can propose changing the status of a feature by sending an email to @@ -24712,7 +27458,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html think it should or should not be allowed, along with links to any relevant previous discussion. If the list arrives at some consensus, send a codereview to change this file accordingly, linking to your discussion thread.

-@@ -111,7 +111,7 @@ The current status of existing standards and Abseil features is: +@@ -113,7 +113,7 @@ The current status of existing standards and Abseil features is: long long var = value; An integer of at least 64 bits Fundamental types @@ -24721,7 +27467,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -127,7 +127,7 @@ The current status of existing standards and Abseil features is: +@@ -129,7 +129,7 @@ The current status of existing standards and Abseil features is: thread_local int foo = 1; Puts variables into thread local storage. Storage duration @@ -24730,7 +27476,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -152,7 +152,7 @@ The current status of existing standards and Abseil features is: +@@ -154,7 +154,7 @@ The current status of existing standards and Abseil features is: std::bind(function, args, ...) Declares a function object bound to certain arguments std::bind @@ -24739,7 +27485,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -176,7 +176,7 @@ The current status of existing standards and Abseil features is: +@@ -178,7 +178,7 @@ The current status of existing standards and Abseil features is: <exception> Enhancements to exception throwing and handling Standard library header <exception> @@ -24748,16 +27494,16 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -184,7 +184,7 @@ The current status of existing standards and Abseil features is: +@@ -186,7 +186,7 @@ The current status of existing standards and Abseil features is: std::function Wraps a standard polymorphic function std::function --Use base::Callback instead. Compared to std::function, base::Callback directly supports Chromium's refcounting classes and weak pointers and deals with additional thread safety concerns. Discussion thread -+Use base::Callback instead. Compared to std::function, base::Callback directly supports Chromium's refcounting classes and weak pointers and deals with additional thread safety concerns. Discussion thread +-Use base::{Once,Repeating}Callback instead. Compared to std::function, base::{Once,Repeating}Callback directly supports Chromium's refcounting classes and weak pointers and deals with additional thread safety concerns. Discussion thread ++Use base::{Once,Repeating}Callback instead. Compared to std::function, base::{Once,Repeating}Callback directly supports Chromium's refcounting classes and weak pointers and deals with additional thread safety concerns. Discussion thread -@@ -196,7 +196,7 @@ The current status of existing standards and Abseil features is: +@@ -198,7 +198,7 @@ The current status of existing standards and Abseil features is: Random number generation algorithms and utilities. Pseudo-random number generation @@ -24766,7 +27512,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -220,7 +220,7 @@ The current status of existing standards and Abseil features is: +@@ -222,7 +222,7 @@ The current status of existing standards and Abseil features is: std::shared_ptr Allows shared ownership of a pointer through reference counts std::shared_ptr @@ -24775,7 +27521,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -296,9 +296,9 @@ The current status of existing standards and Abseil features is: +@@ -298,9 +298,9 @@ The current status of existing standards and Abseil features is: Status absl::Status Type for returning detailed errors. @@ -24788,7 +27534,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -306,7 +306,7 @@ The current status of existing standards and Abseil features is: +@@ -308,7 +308,7 @@ The current status of existing standards and Abseil features is: absl::variant Early adaptation of C++17 std::variant. std::variant @@ -24797,7 +27543,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -396,7 +396,7 @@ the allowed or banned sections.

+@@ -398,7 +398,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. @@ -24806,7 +27552,16 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html
Avoid std::bind Overlaps with base::Bind. -@@ -416,7 +416,7 @@ absl::InlinedVector, absl::FixedArray +@@ -407,7 +407,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 + Similar to `defer` in Golang. + + +@@ -426,7 +426,7 @@ absl::InlinedVector, absl::FixedArray Container utilities auto it = absl::c_find(container, value); Container-based versions of algorithmic functions within C++ standard library. @@ -24815,7 +27570,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html Overlaps with base/ranges/algorithm.h. -@@ -424,7 +424,7 @@ absl::InlinedVector, absl::FixedArray +@@ -434,7 +434,7 @@ absl::InlinedVector, absl::FixedArray FunctionRef absl::FunctionRef Type for holding a non-owning reference to an object of any invocable type. @@ -24824,7 +27579,7 @@ diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html -@@ -449,7 +449,7 @@ size_t index = absl::Uniform(bitgen, 0u, elems.size()); +@@ -459,7 +459,7 @@ size_t index = absl::Uniform(bitgen, 0u, elems.size()); StatusOr absl::StatusOr<T> An object that is either a usable value, or an error Status explaining why such a value is not present. @@ -24889,18 +27644,6 @@ diff --git a/testing/chromoting/chromoting_test_driver_commands_linux.txt b/test +#PROD_DIR#/chromoting_test_driver --username=chromoting.swarming@9ma1l.qjz9zk --refresh-token-path=../../remoting/tools/internal/refresh_tokens.json --hostname=chromoting-test-driver-host --verbosity=2 --v=2 --gtest_filter=ChromotingTestFixture.TestMeasurePinBasedAuthentication --pin=123456 +#PROD_DIR#/chromoting_test_driver --username=chromoting.swarming@9ma1l.qjz9zk --refresh-token-path=../../remoting/tools/internal/refresh_tokens.json --hostname=chromoting-test-driver-host --verbosity=2 --v=2 --gtest_filter=ChromotingTestFixture.TestMeasureReconnectPerformance --pin=123456 \ No newline at end of file -diff --git a/testing/libfuzzer/unittest_main.cc b/testing/libfuzzer/unittest_main.cc ---- a/testing/libfuzzer/unittest_main.cc -+++ b/testing/libfuzzer/unittest_main.cc -@@ -42,7 +42,7 @@ int main(int argc, char **argv) { - "Alternatively, try building this target with " - "use_libfuzzer=true for a better test driver. For details see:\n" - "\n" -- "https://chromium.googlesource.com/chromium/src/+/master/" -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/" - "testing/libfuzzer/getting_started.md" - << std::endl; - exit(1); diff --git a/testing/merge_scripts/PRESUBMIT.py b/testing/merge_scripts/PRESUBMIT.py --- a/testing/merge_scripts/PRESUBMIT.py +++ b/testing/merge_scripts/PRESUBMIT.py @@ -25060,7 +27803,7 @@ diff --git a/testing/trigger_scripts/PRESUBMIT.py b/testing/trigger_scripts/PRES diff --git a/testing/trigger_scripts/base_test_triggerer.py b/testing/trigger_scripts/base_test_triggerer.py --- a/testing/trigger_scripts/base_test_triggerer.py +++ b/testing/trigger_scripts/base_test_triggerer.py -@@ -146,7 +146,7 @@ class BaseTestTriggerer(object): +@@ -135,7 +135,7 @@ class BaseTestTriggerer(object): # swarming to its own object to make trigger logic more clear. def query_swarming(self, api, query_args, verbose, limit='0', @@ -25084,7 +27827,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 -@@ -756,7 +756,7 @@ +@@ -819,7 +819,7 @@ { "name": "API_Enabled", "params": { @@ -25093,7 +27836,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillServerCommunication", -@@ -1936,7 +1936,7 @@ +@@ -1967,7 +1967,7 @@ { "name": "SuppressionExperiment", "params": { @@ -25102,7 +27845,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "enable_bar_overlap_suppression": "true" }, "enable_features": [ -@@ -2628,7 +2628,7 @@ +@@ -2811,7 +2811,7 @@ "name": "DnsHttpssvcStudy", "params": { "DnsHttpssvcControlDomainWildcard": "true", @@ -25111,7 +27854,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -3634,7 +3634,7 @@ +@@ -3897,7 +3897,7 @@ { "name": "Enabled", "params": { @@ -25120,52 +27863,25 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "IncompatibleApplicationsWarning" -@@ -5618,7 +5618,7 @@ +@@ -5822,7 +5822,7 @@ { - "name": "EnabledNTPWithExploreAndTrending_20201207", + "name": "EnabledNTPWithExploreAndTrending", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{maxLevels : 1, enableTrending : true}", + "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -5639,7 +5639,7 @@ - { - "name": "EnabledNTPWithExplore_20201207", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{maxLevels : 1}", - "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -5660,7 +5660,7 @@ - { - "name": "EnabledNTPWithStitchAndTrending_20201207", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{enableTrending : true}", - "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -5681,7 +5681,7 @@ - { - "name": "EnabledNTPWithStitch_20201207", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "", - "image_prefetch_mode": "top", - "is_unmetered_network_required": "false", -@@ -5702,7 +5702,7 @@ +@@ -5845,7 +5845,7 @@ { "name": "EnabledStitchAndTrending", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{enableTrending: true}", + "experiment_tag": "{enableTrending: true, maxTrendingQueries: 8}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -7083,7 +7083,7 @@ +@@ -7185,7 +7185,7 @@ { "name": "launch_20180628_model_20170329_with_blacklist_override_default", "params": { @@ -25174,7 +27890,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -7102,7 +7102,7 @@ +@@ -7204,7 +7204,7 @@ { "name": "20180123_launch", "params": { @@ -25183,7 +27899,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerAutoBlacklistOverride", -@@ -7123,7 +7123,7 @@ +@@ -7225,7 +7225,7 @@ { "name": "Enforcement20170918", "params": { @@ -25192,15 +27908,15 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "TranslateRankerEnforcement", -@@ -7661,7 +7661,7 @@ +@@ -7719,7 +7719,7 @@ { "name": "Enabled", "params": { -- "base_url": "https://staging-gsaprototype-pa.sandbox.googleapis.com", -+ "base_url": "https://staging-gsaprototype-pa.sandbox.9oo91eapis.qjz9zk", +- "base_url": "https://chromeupboarding-pa.googleapis.com", ++ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", "default_locale": "en", + "enable_share": "true", "experiment_tag": "", - "fetch_frequency": "15", diff --git a/third_party/Python-Markdown/markdown/extensions/smarty.py b/third_party/Python-Markdown/markdown/extensions/smarty.py --- a/third_party/Python-Markdown/markdown/extensions/smarty.py +++ b/third_party/Python-Markdown/markdown/extensions/smarty.py @@ -25626,7 +28342,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. --> -@@ -1121,14 +1121,14 @@ below: +@@ -1130,14 +1130,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 @@ -25643,7 +28359,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. -@@ -1137,7 +1137,7 @@ below: +@@ -1146,7 +1146,7 @@ below: # # Contributor(s): # Mitch (original author) @@ -25925,17 +28641,6 @@ diff --git a/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/third """ import os -diff --git a/third_party/blink/renderer/bindings/tests/idls/core/test_node.idl b/third_party/blink/renderer/bindings/tests/idls/core/test_node.idl ---- a/third_party/blink/renderer/bindings/tests/idls/core/test_node.idl -+++ b/third_party/blink/renderer/bindings/tests/idls/core/test_node.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public 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 @@ -25957,94 +28662,6 @@ diff --git a/third_party/blink/renderer/build/scripts/update_css_ranking.py b/th ) json.dump(css_ranking_content, fw, indent=4, sort_keys=False) -diff --git a/third_party/blink/renderer/core/css/css_font_face_rule.idl b/third_party/blink/renderer/core/css/css_font_face_rule.idl ---- a/third_party/blink/renderer/core/css/css_font_face_rule.idl -+++ b/third_party/blink/renderer/core/css/css_font_face_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_import_rule.idl b/third_party/blink/renderer/core/css/css_import_rule.idl ---- a/third_party/blink/renderer/core/css/css_import_rule.idl -+++ b/third_party/blink/renderer/core/css/css_import_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_media_rule.idl b/third_party/blink/renderer/core/css/css_media_rule.idl ---- a/third_party/blink/renderer/core/css/css_media_rule.idl -+++ b/third_party/blink/renderer/core/css/css_media_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_page_rule.idl b/third_party/blink/renderer/core/css/css_page_rule.idl ---- a/third_party/blink/renderer/core/css/css_page_rule.idl -+++ b/third_party/blink/renderer/core/css/css_page_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_rule.idl b/third_party/blink/renderer/core/css/css_rule.idl ---- a/third_party/blink/renderer/core/css/css_rule.idl -+++ b/third_party/blink/renderer/core/css/css_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_style_declaration.idl b/third_party/blink/renderer/core/css/css_style_declaration.idl ---- a/third_party/blink/renderer/core/css/css_style_declaration.idl -+++ b/third_party/blink/renderer/core/css/css_style_declaration.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_style_rule.idl b/third_party/blink/renderer/core/css/css_style_rule.idl ---- a/third_party/blink/renderer/core/css/css_style_rule.idl -+++ b/third_party/blink/renderer/core/css/css_style_rule.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/css_style_sheet.idl b/third_party/blink/renderer/core/css/css_style_sheet.idl ---- a/third_party/blink/renderer/core/css/css_style_sheet.idl -+++ b/third_party/blink/renderer/core/css/css_style_sheet.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/third_party/blink/renderer/core/css/remote_font_face_source.cc --- a/third_party/blink/renderer/core/css/remote_font_face_source.cc +++ b/third_party/blink/renderer/core/css/remote_font_face_source.cc @@ -26057,123 +28674,6 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th "details. Fallback font will be used while loading: " + font->Url().ElidedString())); -diff --git a/third_party/blink/renderer/core/css/style_sheet.idl b/third_party/blink/renderer/core/css/style_sheet.idl ---- a/third_party/blink/renderer/core/css/style_sheet.idl -+++ b/third_party/blink/renderer/core/css/style_sheet.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/css/style_sheet_list.idl b/third_party/blink/renderer/core/css/style_sheet_list.idl ---- a/third_party/blink/renderer/core/css/style_sheet_list.idl -+++ b/third_party/blink/renderer/core/css/style_sheet_list.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/attr.idl b/third_party/blink/renderer/core/dom/attr.idl ---- a/third_party/blink/renderer/core/dom/attr.idl -+++ b/third_party/blink/renderer/core/dom/attr.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/cdata_section.idl b/third_party/blink/renderer/core/dom/cdata_section.idl ---- a/third_party/blink/renderer/core/dom/cdata_section.idl -+++ b/third_party/blink/renderer/core/dom/cdata_section.idl -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/child_node.idl b/third_party/blink/renderer/core/dom/child_node.idl ---- a/third_party/blink/renderer/core/dom/child_node.idl -+++ b/third_party/blink/renderer/core/dom/child_node.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2013 Samsung Electronics. All rights reserved. - * - * -diff --git a/third_party/blink/renderer/core/dom/comment.idl b/third_party/blink/renderer/core/dom/comment.idl ---- a/third_party/blink/renderer/core/dom/comment.idl -+++ b/third_party/blink/renderer/core/dom/comment.idl -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/dom_implementation.idl b/third_party/blink/renderer/core/dom/dom_implementation.idl ---- a/third_party/blink/renderer/core/dom/dom_implementation.idl -+++ b/third_party/blink/renderer/core/dom/dom_implementation.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/element.idl b/third_party/blink/renderer/core/dom/element.idl ---- a/third_party/blink/renderer/core/dom/element.idl -+++ b/third_party/blink/renderer/core/dom/element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -@@ -19,7 +19,7 @@ - */ - - // See --// https://docs.google.com/document/d/1VnvAqeWFG9JFZfgG5evBqrLGDZYRE5w6G5jEDORekPY -+// https://docs.9oo91e.qjz9zk/document/d/1VnvAqeWFG9JFZfgG5evBqrLGDZYRE5w6G5jEDORekPY - // for details. - enum NativeScrollBehavior { "disable-native-scroll", "perform-before-native-scroll", "perform-after-native-scroll" }; - callback ScrollStateCallback = void (ScrollState scrollState); -diff --git a/third_party/blink/renderer/core/dom/events/event.idl b/third_party/blink/renderer/core/dom/events/event.idl ---- a/third_party/blink/renderer/core/dom/events/event.idl -+++ b/third_party/blink/renderer/core/dom/events/event.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/events/event_listener.idl b/third_party/blink/renderer/core/dom/events/event_listener.idl ---- a/third_party/blink/renderer/core/dom/events/event_listener.idl -+++ b/third_party/blink/renderer/core/dom/events/event_listener.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006 Apple Computer, Inc. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public 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 @@ -26195,138 +28695,6 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ event_type.GetString().Utf8().c_str()); PerformanceMonitor::ReportGenericViolation( -diff --git a/third_party/blink/renderer/core/dom/events/event_target.idl b/third_party/blink/renderer/core/dom/events/event_target.idl ---- a/third_party/blink/renderer/core/dom/events/event_target.idl -+++ b/third_party/blink/renderer/core/dom/events/event_target.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/iterator.idl b/third_party/blink/renderer/core/dom/iterator.idl ---- a/third_party/blink/renderer/core/dom/iterator.idl -+++ b/third_party/blink/renderer/core/dom/iterator.idl -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// http://people.mozilla.org/~jorendorff/es6-draft.html#sec-iterator-interface -+// http://people.m0z111a.qjz9zk/~jorendorff/es6-draft.html#sec-iterator-interface - - [ - LegacyNoInterfaceObject -diff --git a/third_party/blink/renderer/core/dom/named_node_map.idl b/third_party/blink/renderer/core/dom/named_node_map.idl ---- a/third_party/blink/renderer/core/dom/named_node_map.idl -+++ b/third_party/blink/renderer/core/dom/named_node_map.idl -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2007, 2009 Apple Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/dom/node.idl b/third_party/blink/renderer/core/dom/node.idl ---- a/third_party/blink/renderer/core/dom/node.idl -+++ b/third_party/blink/renderer/core/dom/node.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/node_filter.idl b/third_party/blink/renderer/core/dom/node_filter.idl ---- a/third_party/blink/renderer/core/dom/node_filter.idl -+++ b/third_party/blink/renderer/core/dom/node_filter.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/node_iterator.idl b/third_party/blink/renderer/core/dom/node_iterator.idl ---- a/third_party/blink/renderer/core/dom/node_iterator.idl -+++ b/third_party/blink/renderer/core/dom/node_iterator.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/node_list.idl b/third_party/blink/renderer/core/dom/node_list.idl ---- a/third_party/blink/renderer/core/dom/node_list.idl -+++ b/third_party/blink/renderer/core/dom/node_list.idl -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2007 Apple Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/dom/processing_instruction.idl b/third_party/blink/renderer/core/dom/processing_instruction.idl ---- a/third_party/blink/renderer/core/dom/processing_instruction.idl -+++ b/third_party/blink/renderer/core/dom/processing_instruction.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006 Apple Computer, Inc. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/range.idl b/third_party/blink/renderer/core/dom/range.idl ---- a/third_party/blink/renderer/core/dom/range.idl -+++ b/third_party/blink/renderer/core/dom/range.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006 Apple Computer, Inc. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/dom/tree_walker.idl b/third_party/blink/renderer/core/dom/tree_walker.idl ---- a/third_party/blink/renderer/core/dom/tree_walker.idl -+++ b/third_party/blink/renderer/core/dom/tree_walker.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006 Apple Computer, Inc. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/events/application_cache_error_event.idl b/third_party/blink/renderer/core/events/application_cache_error_event.idl ---- a/third_party/blink/renderer/core/events/application_cache_error_event.idl -+++ b/third_party/blink/renderer/core/events/application_cache_error_event.idl -@@ -3,7 +3,7 @@ - // found in the LICENSE file. - - // ApplicationCache Error Detail Proposal: --// https://docs.google.com/document/d/1nlk7WgRD3d0ZcfK1xrwBFVZ3DI_e44j7QoMd5gAJC4E/edit -+// https://docs.9oo91e.qjz9zk/document/d/1nlk7WgRD3d0ZcfK1xrwBFVZ3DI_e44j7QoMd5gAJC4E/edit - - // TODO(foolip): Update the spec link once this is in the HTML spec: - // https://www.w3.org/Bugs/Public/show_bug.cgi?id=22702 -diff --git a/third_party/blink/renderer/core/events/keyboard_event.idl b/third_party/blink/renderer/core/events/keyboard_event.idl ---- a/third_party/blink/renderer/core/events/keyboard_event.idl -+++ b/third_party/blink/renderer/core/events/keyboard_event.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006 Apple Computer, Inc. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public 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 @@ -26342,7 +28710,7 @@ diff --git a/third_party/blink/renderer/core/events/touch_event.cc b/third_party diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party/blink/renderer/core/events/wheel_event.cc --- a/third_party/blink/renderer/core/events/wheel_event.cc +++ b/third_party/blink/renderer/core/events/wheel_event.cc -@@ -151,7 +151,7 @@ void WheelEvent::preventDefault() { +@@ -152,7 +152,7 @@ void WheelEvent::preventDefault() { String message = "Unable to preventDefault inside passive event listener due to " "target being treated as passive. See " @@ -26351,17 +28719,6 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party auto* local_dom_window = DynamicTo(view()); if (local_dom_window && local_dom_window->GetFrame()) { Intervention::GenerateReport(local_dom_window->GetFrame(), id, message); -diff --git a/third_party/blink/renderer/core/events/wheel_event.idl b/third_party/blink/renderer/core/events/wheel_event.idl ---- a/third_party/blink/renderer/core/events/wheel_event.idl -+++ b/third_party/blink/renderer/core/events/wheel_event.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2013 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or 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 @@ -26385,7 +28742,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ enum Milestone { kUnknown, -@@ -167,7 +167,7 @@ String WillBeRemoved(const char* feature, +@@ -176,7 +176,7 @@ String WillBeRemoved(const char* feature, const char* details) { return String::Format( "%s is deprecated and will be removed in %s. See " @@ -26394,7 +28751,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ feature, MilestoneString(milestone).Ascii().c_str(), details); } -@@ -177,7 +177,7 @@ String ReplacedWillBeRemoved(const char* feature, +@@ -186,7 +186,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 " @@ -26403,7 +28760,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ feature, MilestoneString(milestone).Ascii().c_str(), replacement, details); } -@@ -257,14 +257,14 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -266,14 +266,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 " @@ -26420,7 +28777,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) -@@ -274,7 +274,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -283,7 +283,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. " @@ -26429,7 +28786,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved: case WebFeature::kGeolocationInsecureOriginIframeDeprecatedNotRemoved: -@@ -282,7 +282,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -291,7 +291,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. " @@ -26438,7 +28795,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kGetUserMediaInsecureOrigin: case WebFeature::kGetUserMediaInsecureOriginIframe: -@@ -290,7 +290,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -299,7 +299,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 " @@ -26447,7 +28804,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kMediaSourceAbortRemove: -@@ -301,7 +301,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -310,7 +310,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 " @@ -26456,7 +28813,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kMediaSourceDurationTruncatingBuffered: -@@ -313,7 +313,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -322,7 +322,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 " @@ -26465,7 +28822,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kApplicationCacheAPIInsecureOrigin: -@@ -342,7 +342,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -351,7 +351,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "origins. " "You should consider switching your application to a secure " "origin, " @@ -26474,7 +28831,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ case WebFeature::kNotificationPermissionRequestedIframe: return {"NotificationPermissionRequestedIframe", kUnknown, -@@ -351,7 +351,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -360,7 +360,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 " @@ -26483,7 +28840,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kCSSSelectorInternalMediaControlsOverlayCastButton: -@@ -359,7 +359,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -368,7 +368,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 " @@ -26492,7 +28849,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kSelectionAddRangeIntersect: -@@ -367,7 +367,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -376,7 +376,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "SelectionAddRangeIntersect", kUnknown, "The behavior that Selection.addRange() merges existing Range and " "the specified Range was removed. See " @@ -26501,7 +28858,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kRtcpMuxPolicyNegotiate: -@@ -376,7 +376,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -385,7 +385,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "removal and may be removed no earlier than %s. " "If you depend on it, " "please see " @@ -26510,7 +28867,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "5654810086866944 " "for more details.", MilestoneString(kM62).Ascii().c_str())}; -@@ -389,13 +389,13 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -398,13 +398,13 @@ 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 " @@ -26526,7 +28883,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details."}; case WebFeature::kLocalCSSFileExtensionRejected: -@@ -449,7 +449,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -458,7 +458,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "TextToSpeech_DisallowedByAutoplay", kM71, String::Format("speechSynthesis.speak() without user activation is " "no longer allowed since %s. See " @@ -26535,7 +28892,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "5687444770914304 for more details", MilestoneString(kM71).Ascii().c_str())}; -@@ -471,7 +471,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -480,7 +480,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 " @@ -26544,7 +28901,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "more details.", MilestoneString(kM82).Ascii().c_str())}; -@@ -504,7 +504,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -513,7 +513,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 " @@ -26553,7 +28910,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "details.", MilestoneString(kM84).Ascii().c_str())}; -@@ -514,7 +514,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -523,7 +523,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { String::Format( "SharedArrayBuffer will require cross-origin isolation as of " "%s. See " @@ -26562,7 +28919,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ " for more details.", MilestoneString(kM91).Ascii().c_str())}; -@@ -568,7 +568,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -579,7 +579,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { return {"CSSSeelctorWebKitDetailsMarker", kM89, ReplacedBy("::-webkit-details-marker pseudo element selector", "::marker") + @@ -26570,11 +28927,20 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ + " See https://ch40mestatus.qjz9zk/feature/6730096436051968 for " "more details."}; - case WebFeature::kRTCPeerConnectionSdpSemanticsPlanB: + case WebFeature::kV8SpeechRecognitionEvent_Interpretation_AttributeGetter: +@@ -628,7 +628,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 " +- "2021). See https://chromestatus.com/feature/5436853517811712 " ++ "2021). See https://ch40mestatus.qjz9zk/feature/5436853517811712 " + "for more details."}; + + // Features that aren't deprecated don't have a deprecation message. 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 -@@ -1718,7 +1718,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, +@@ -1720,7 +1720,7 @@ bool LocalFrame::CanNavigate(const Frame& target_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 " @@ -26583,7 +28949,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ return false; } return true; -@@ -1784,7 +1784,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, +@@ -1786,7 +1786,7 @@ bool LocalFrame::CanNavigate(const Frame& target_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 " @@ -26592,255 +28958,10 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ GetLocalFrameHostRemote().DidBlockNavigation( destination_url, GetDocument()->Url(), mojom::NavigationBlockedReason::kRedirectWithNoUserGesture); -diff --git a/third_party/blink/renderer/core/html/custom/element_internals.idl b/third_party/blink/renderer/core/html/custom/element_internals.idl ---- a/third_party/blink/renderer/core/html/custom/element_internals.idl -+++ b/third_party/blink/renderer/core/html/custom/element_internals.idl -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// https://docs.google.com/document/d/1JO8puctCSpW-ZYGU8lF-h4FWRIDQNDVexzHoOQ2iQmY/edit?pli=1#heading=h.pjt9nhs3gu3k -+// https://docs.9oo91e.qjz9zk/document/d/1JO8puctCSpW-ZYGU8lF-h4FWRIDQNDVexzHoOQ2iQmY/edit?pli=1#heading=h.pjt9nhs3gu3k - - typedef (File or USVString or FormData) ControlValue; - -diff --git a/third_party/blink/renderer/core/html/custom/validity_state_flags.idl b/third_party/blink/renderer/core/html/custom/validity_state_flags.idl ---- a/third_party/blink/renderer/core/html/custom/validity_state_flags.idl -+++ b/third_party/blink/renderer/core/html/custom/validity_state_flags.idl -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// https://docs.google.com/document/d/1JO8puctCSpW-ZYGU8lF-h4FWRIDQNDVexzHoOQ2iQmY/edit?pli=1#heading=h.pjt9nhs3gu3k -+// https://docs.9oo91e.qjz9zk/document/d/1JO8puctCSpW-ZYGU8lF-h4FWRIDQNDVexzHoOQ2iQmY/edit?pli=1#heading=h.pjt9nhs3gu3k - - dictionary ValidityStateFlags { - boolean valueMissing = false; -diff --git a/third_party/blink/renderer/core/html/forms/html_button_element.idl b/third_party/blink/renderer/core/html/forms/html_button_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_button_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_button_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/forms/html_form_controls_collection.idl b/third_party/blink/renderer/core/html/forms/html_form_controls_collection.idl ---- a/third_party/blink/renderer/core/html/forms/html_form_controls_collection.idl -+++ b/third_party/blink/renderer/core/html/forms/html_form_controls_collection.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2012 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2014 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/forms/html_form_element.idl b/third_party/blink/renderer/core/html/forms/html_form_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_form_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_form_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/forms/html_input_element.idl b/third_party/blink/renderer/core/html/forms/html_input_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_input_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_input_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2012 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/forms/html_label_element.idl b/third_party/blink/renderer/core/html/forms/html_label_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_label_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_label_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/forms/html_legend_element.idl b/third_party/blink/renderer/core/html/forms/html_legend_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_legend_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_legend_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/forms/html_option_element.idl b/third_party/blink/renderer/core/html/forms/html_option_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_option_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_option_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2010 Apple, Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/forms/html_options_collection.idl b/third_party/blink/renderer/core/html/forms/html_options_collection.idl ---- a/third_party/blink/renderer/core/html/forms/html_options_collection.idl -+++ b/third_party/blink/renderer/core/html/forms/html_options_collection.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2013, 2014 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/forms/html_select_element.idl b/third_party/blink/renderer/core/html/forms/html_select_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_select_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_select_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2013 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/forms/html_text_area_element.idl b/third_party/blink/renderer/core/html/forms/html_text_area_element.idl ---- a/third_party/blink/renderer/core/html/forms/html_text_area_element.idl -+++ b/third_party/blink/renderer/core/html/forms/html_text_area_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/forms/validity_state.idl b/third_party/blink/renderer/core/html/forms/validity_state.idl ---- a/third_party/blink/renderer/core/html/forms/validity_state.idl -+++ b/third_party/blink/renderer/core/html/forms/validity_state.idl -@@ -1,7 +1,7 @@ - /* - * This file is part of the WebKit project. - * -- * Copyright (C) 2009 Michelangelo De Simone -+ * Copyright (C) 2009 Michelangelo De Simone - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_anchor_element.idl b/third_party/blink/renderer/core/html/html_anchor_element.idl ---- a/third_party/blink/renderer/core/html/html_anchor_element.idl -+++ b/third_party/blink/renderer/core/html/html_anchor_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_area_element.idl b/third_party/blink/renderer/core/html/html_area_element.idl ---- a/third_party/blink/renderer/core/html/html_area_element.idl -+++ b/third_party/blink/renderer/core/html/html_area_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_body_element.idl b/third_party/blink/renderer/core/html/html_body_element.idl ---- a/third_party/blink/renderer/core/html/html_body_element.idl -+++ b/third_party/blink/renderer/core/html/html_body_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_collection.idl b/third_party/blink/renderer/core/html/html_collection.idl ---- a/third_party/blink/renderer/core/html/html_collection.idl -+++ b/third_party/blink/renderer/core/html/html_collection.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * Copyright (C) 2014 Samsung Electronics. All rights reserved. - * - * This library is free software; you can redistribute it and/or -diff --git a/third_party/blink/renderer/core/html/html_document.idl b/third_party/blink/renderer/core/html/html_document.idl ---- a/third_party/blink/renderer/core/html/html_document.idl -+++ b/third_party/blink/renderer/core/html/html_document.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_element.idl b/third_party/blink/renderer/core/html/html_element.idl ---- a/third_party/blink/renderer/core/html/html_element.idl -+++ b/third_party/blink/renderer/core/html/html_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_embed_element.idl b/third_party/blink/renderer/core/html/html_embed_element.idl ---- a/third_party/blink/renderer/core/html/html_embed_element.idl -+++ b/third_party/blink/renderer/core/html/html_embed_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_frame_element.idl b/third_party/blink/renderer/core/html/html_frame_element.idl ---- a/third_party/blink/renderer/core/html/html_frame_element.idl -+++ b/third_party/blink/renderer/core/html/html_frame_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -diff --git a/third_party/blink/renderer/core/html/html_frame_set_element.idl b/third_party/blink/renderer/core/html/html_frame_set_element.idl ---- a/third_party/blink/renderer/core/html/html_frame_set_element.idl -+++ b/third_party/blink/renderer/core/html/html_frame_set_element.idl -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserve -- * Copyright (C) 2006 Samuel Weinig -+ * Copyright (C) 2006 Samuel Weinig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public 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 -@@ -260,7 +260,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -261,7 +261,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "