Update patches from Chromium 130.0.6723.70 to Chromium 131.0.6778.14.

2024-10-24 12:14:35 +01:00
parent 98b83c85c8
commit 84583872af
242 changed files with 502 additions and 506 deletions
@@ -1,12 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-<<<<<<< HEAD
-index aa1654d428420e99bdce3abf3140f764d73e7c48..cbe7fe8fa1f99202d4904ee3d9ccb6355312146b 100644
-=======
-index 3a08c3bde5977eeb0bfa1f14713b715394f2cd6f..1a891b80b9b1e93ce7a40e1a3bdd02d55507533a 100644
->>>>>>> a6a09ab89ec ([Android] Move base.cached_flags to components.cached_flags)
+index 4c0e4645f64e3e9f4466bd59972f8587866da8c5..dae4b156f37f51893f27c1e6ab24542f4b03edbb 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4417,6 +4417,7 @@ if (is_android) {
+@@ -4438,6 +4438,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/ValueChangedCallback.java",
       "android/java/src/org/chromium/base/WrappedClassLoader.java",
     ]
@@ -14,7 +10,7 @@ index 3a08c3bde5977eeb0bfa1f14713b715394f2cd6f..1a891b80b9b1e93ce7a40e1a3bdd02d5
 
     if (use_clang_profiling) {
       sources += [
-@@ -4882,6 +4883,7 @@ if (is_android) {
+@@ -4906,6 +4907,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
       "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
     ]
@@ -1,5 +1,5 @@
 diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h
-index 84d8945c4e027c6c362c365657becb8345e4ef74..ddc1a795964b3e953945642f9b58a62f0c873d1b 100644
+index effa04b16f8778a1ce4a7b03bc164ab01200102a..7b3a1ede2b23a4aa8d60d1bd264fb2abda050ec4 100644
 --- a/base/metrics/histogram_functions.h
 +++ b/base/metrics/histogram_functions.h
@@ -79,6 +79,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) {
@@ -1,5 +1,5 @@
 diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
-index d26f4d09dd3ddbb201f15f870c065b686063bb88..d9e9981ec5635714cfa5d311072ae03a78244d0f 100644
+index c37ba6534270c3c4f7c2d20e6a84824875d9a6b4..09df14d7cba4c3e2173d1c8e5978a5ac41a39676 100644
 --- a/base/test/BUILD.gn
 +++ b/base/test/BUILD.gn
@@ -346,6 +346,7 @@ static_library("test_support") {
@@ -1,8 +1,8 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 0de909d74fffc91b9e3afead3204f9c8234fa131..0ca35931519b75a86ad80f3938956507f27cade9 100644
+index 149838be725f2e09274421d087ce4494ecf4bc1d..61e21d7ea50d0e2d9fd14a45053f0e61a6b9f20b 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
-@@ -732,6 +732,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
+@@ -736,6 +736,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
   ScopedAllowBaseSyncPrimitives& operator=(
       const ScopedAllowBaseSyncPrimitives&) = delete;
 
@@ -1,8 +1,8 @@
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 5bbe83c8948a2db7b3ce558e010ff38632da25cb..6a6dbf7a785d6ffb82bb6c30cca29aeac7cdcccf 100644
+index bf7628ed923556b471c9758311d6d62ea6056125..0366184b2c23574c7fc80c903e3346fea2eacbd0 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -199,6 +199,7 @@
+@@ -200,6 +200,7 @@
   X("webrtc")                                                            \
   X("webrtc_stats")                                                      \
   X("xr")                                                                \
@@ -1,8 +1,8 @@
 diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
-index 517ebbb47112568cfad411dcfa6b994a88eb19b1..e266d1fb5be6df59416eefabe44679c284c9e6d4 100755
+index efac6ab90ec93f9c036eb735c14e1ec8fc6aee84..3730e8c888a790f19e4ea2dcc12d00d5f7078419 100755
 --- a/build/android/gyp/lint.py
 +++ b/build/android/gyp/lint.py
-@@ -527,5 +527,6 @@ def main():
+@@ -548,5 +548,6 @@ def main():
   build_utils.Touch(args.stamp)
 
 
@@ -1,8 +1,8 @@
 diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
-index 5dd433ae0bd92209bd0275e19e710c310e6e8793..cdfe28a2f8facb3f5a50bf0698adbdd838adf5a6 100755
+index a42ce1c8312080ac8cfa0042827c6b6fd059ae22..fcf96a1892a3e0be9312143fd15f216e3db6448d 100755
 --- a/build/android/gyp/proguard.py
 +++ b/build/android/gyp/proguard.py
-@@ -376,6 +376,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
+@@ -378,6 +378,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
         '--pg-map-output',
         tmp_mapping_path,
     ]
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
-index 2124c74e6efd65a55e11ecb7b542e915574f2539..4806c016e2af38f267289d9aa77791b50fa6ad7b 100644
+index 9162edaf82c231bfd1e2cf9741ae698ba18a6880..115f45b3f043ab00b16fe06fbd6188b35787d5e2 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
@@ -53,6 +53,7 @@ config("compiler") {
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index ec9705d3b1beb96866173666719c42ebe620110c..b2adfe8b2325bb25b3ca26c1465d6a1aa799748a 100644
+index b849838c5642430959890e554821b4eea7916a7a..cafae6ee551f2a57e5ed9442ccf5dd27679bebb7 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -4167,6 +4167,7 @@ if (enable_java_templates) {
+@@ -4190,6 +4190,7 @@ if (enable_java_templates) {
       } else {
         not_needed(invoker, [ "missing_classes_allowlist" ])
       }
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 95c88605890462aeb97dab4dbffd80960bf1533e..4ca2fef1aa52989ead931aa6ce5e2dffb456b183 100644
+index aa6a2fe716646df02b4fe58d288ad2edda3641b6..0659f4ca0cde17f12de3520d429eda07e449aba9 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
@@ -207,6 +207,7 @@ if (!is_robolectric && enable_java_templates) {
@@ -1,5 +1,5 @@
 diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
-index 72904511ee69f25e985aa201f7d9a47ccd0f1480..c1b2804791fa48dab0b4a468e0b6e40aa07d89c6 100644
+index ad5d0020c8e140d7fc92eb13e7aa44f697f1a3f3..f80c18be047063dc4a9c5dbce14a278d99444ad4 100644
 --- a/build/rust/cargo_crate.gni
 +++ b/build/rust/cargo_crate.gni
@@ -158,6 +158,7 @@ template("cargo_crate") {
@@ -1,5 +1,5 @@
 diff --git a/build/rust/rust_target.gni b/build/rust/rust_target.gni
-index 10371f12c0a836d3e99f8fea4c1185198d4b7f0d..4a3021928b2703c1e297e5d5b8c1f941a2f0bf89 100644
+index b8b0e3a0ea1f02f5ebd72116e1d9d7f88a143514..b937393d6910ebd2e2fc6a663e207da32a2bfbeb 100644
 --- a/build/rust/rust_target.gni
 +++ b/build/rust/rust_target.gni
@@ -192,7 +192,7 @@ template("rust_target") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91d500ec7c 100644
+index e2d2446670d358346b5c7399596625087627d5e4..b08871f4036fb5ba5dc93a17a8c144df3c2420b4 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -203,6 +203,7 @@ if (!is_android && !is_mac) {
+@@ -199,6 +199,7 @@ if (!is_android && !is_mac) {
           "common/crash_keys.cc",
           "common/crash_keys.h",
         ]
@@ -10,7 +10,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
 
         deps += [
           ":chrome_dll",
-@@ -536,11 +537,12 @@ if (is_win) {
+@@ -516,11 +517,12 @@ if (is_win) {
       args += [ "--keystone=0" ]
     }
   }
@@ -24,7 +24,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
     extra_substitutions = [
       "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
       "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -560,6 +562,7 @@ if (is_win) {
+@@ -540,6 +542,7 @@ if (is_win) {
       "//chrome/common:buildflags",
       "//chrome/common:version_header",
     ]
@@ -32,7 +32,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
 
     if (enable_updater) {
       deps += [ ":chromium_updater_privileged_helper" ]
-@@ -702,6 +705,7 @@ if (is_win) {
+@@ -682,6 +685,7 @@ if (is_win) {
       # this dependency directly copies the file into the framework's
       # resources directory.
       public_deps += [ ":chrome_framework_widevine_signature" ]
@@ -40,7 +40,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
     }
   }
 
-@@ -745,9 +749,11 @@ if (is_win) {
+@@ -725,9 +729,11 @@ if (is_win) {
       "--scm=0",
     ]
   }
@@ -52,7 +52,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
     if (is_chrome_branded && include_branded_entitlements) {
       # These entitlements are bound to the official Google Chrome signing
       # certificate and will not necessarily work in any other build.
-@@ -772,6 +778,7 @@ if (is_win) {
+@@ -752,6 +758,7 @@ if (is_win) {
         info_plist_target = invoker.info_plist_target
       } else {
         info_plist_target = ":chrome_helper_plist"
@@ -60,7 +60,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
       }
 
       extra_substitutions = [
-@@ -950,6 +957,7 @@ if (is_win) {
+@@ -930,6 +937,7 @@ if (is_win) {
     if (enable_updater) {
       if (is_chrome_branded) {
         sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ]
@@ -68,7 +68,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
       } else {
         sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
 
-@@ -1253,6 +1261,7 @@ if (is_win) {
+@@ -1235,6 +1243,7 @@ if (is_win) {
       "-current_version",
       chrome_dylib_version,
     ]
@@ -76,7 +76,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
 
     if (!is_component_build) {
       # Specify a sensible install_name for static builds. The library is
-@@ -1434,6 +1443,7 @@ if (is_win) {
+@@ -1416,6 +1425,7 @@ if (is_win) {
 
 group("dependencies") {
   public_deps = [
@@ -84,7 +84,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//chrome/browser",
-@@ -1499,7 +1509,7 @@ group("dependencies") {
+@@ -1471,7 +1481,7 @@ group("dependencies") {
 
 if (is_win) {
   process_version_rc_template("chrome_exe_version") {
@@ -93,7 +93,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
     output = "$target_gen_dir/chrome_exe_version.rc"
   }
 
-@@ -1548,6 +1558,7 @@ group("resources") {
+@@ -1520,6 +1530,7 @@ group("resources") {
     "//chrome/browser:resources",
     "//chrome/common:resources",
     "//chrome/renderer:resources",
@@ -101,7 +101,7 @@ index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91
   ]
 }
 
-@@ -1601,6 +1612,7 @@ if (!is_android) {
+@@ -1573,6 +1584,7 @@ if (!is_android) {
     if (enable_resource_allowlist_generation) {
       repack_allowlist = _chrome_resource_allowlist
       deps = [ ":resource_allowlist" ]
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b604c6e6db9 100644
+index 2d866288c143aa30273ff2bdd6f47c29e25ff83f..bdb795e49b4b0868851aad1b4e4102ec83353f7e 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
@@ -192,6 +192,7 @@ if (current_toolchain == default_toolchain) {
@@ -10,7 +10,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
   }
 
   android_resources("chrome_app_java_resources") {
-@@ -281,6 +282,7 @@ if (current_toolchain == default_toolchain) {
+@@ -282,6 +283,7 @@ if (current_toolchain == default_toolchain) {
     } else {
       deps += [ "//components/plus_addresses/android:java_resources" ]
     }
@@ -18,7 +18,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
   }
 
   android_resources("java_overlay_resources") {
-@@ -743,6 +745,7 @@ if (current_toolchain == default_toolchain) {
+@@ -737,6 +739,7 @@ if (current_toolchain == default_toolchain) {
     ]
 
     deps += feed_deps
@@ -26,7 +26,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
 
     srcjar_deps = [
       ":chrome_android_java_enums_srcjar",
-@@ -760,6 +763,7 @@ if (current_toolchain == default_toolchain) {
+@@ -754,6 +757,7 @@ if (current_toolchain == default_toolchain) {
       "//components/sharing_message:sharing_send_message_result_generated_enum",
       "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
     ]
@@ -34,7 +34,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
 
     # From java_sources.gni.
     sources = chrome_java_sources
-@@ -890,6 +894,7 @@ if (current_toolchain == default_toolchain) {
+@@ -883,6 +887,7 @@ if (current_toolchain == default_toolchain) {
       "//components/saved_tab_groups/public:conversion_utils_java",
       "//components/segmentation_platform/internal:internal_java",
     ]
@@ -42,7 +42,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
   }
 
   action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -1558,6 +1563,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1525,6 +1530,7 @@ if (current_toolchain == default_toolchain) {
       "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarSecurityIconTest.java",
       "javatests/src/org/chromium/chrome/browser/webapps/WebappLaunchCauseMetricsTest.java",
     ]
@@ -50,7 +50,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
     deps = [
       ":chrome_app_java_resources",
       ":chrome_unit_test_java_resources",
-@@ -2311,6 +2317,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2286,6 +2292,7 @@ if (current_toolchain == default_toolchain) {
       "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
       "java/res_chromium_base/values/channel_constants.xml",
     ]
@@ -58,7 +58,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
 
     # Dep needed to ensure override works properly.
     deps = [ ":chrome_base_module_resources" ]
-@@ -2523,6 +2530,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2498,6 +2505,7 @@ if (current_toolchain == default_toolchain) {
         ":${_variant}_locale_pak_assets",
         ":${_variant}_paks",
       ]
@@ -66,7 +66,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
       if (_is_monochrome) {
         deps += [ "//android_webview:locale_pak_assets" ]
       }
-@@ -2795,6 +2803,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2772,6 +2780,7 @@ if (current_toolchain == default_toolchain) {
       "//components/payments/content/android:service_java",
       "//third_party/androidx:androidx_browser_browser_java",
     ]
@@ -74,7 +74,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
 
     # More deps for DFMs.
     if (dfmify_dev_ui) {
-@@ -3880,6 +3889,7 @@ generate_jni("chrome_jni_headers") {
+@@ -3879,6 +3888,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
     "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index c9f8dee73517bff0316b640e040fc086440ff463..bfff40a4c17a97d00e00331379a8673a30807f0b 100644
+index aab8e9a5a54059b2f502c702fcccfb535af20d49..45ed6f2ac6bd37c00c0e0c60d07aa78d2ed14bf1 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1217,3 +1217,4 @@ chrome_java_sources = [
+@@ -1219,3 +1219,4 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
 ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 22701454051942b21cdcd6c171e37579dc6166a7..129b9806c595bfab460a1054f74b73f4c65b1ba8 100644
+index b1ab5a7b2a4522ece9a277673ae95430afc4f3a6..e7071b6e2fda8ea91f56b79b0d37d1768c94d5e2 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -318,6 +318,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -319,6 +319,7 @@ template("chrome_common_apk_or_module_tmpl") {
       "*ic_file_download_white*",  # Bottom edge seems misaligned.
       "*ic_lock.*",  # Bottom edge seems misaligned.
     ]
@@ -10,7 +10,7 @@ index 22701454051942b21cdcd6c171e37579dc6166a7..129b9806c595bfab460a1054f74b73f4
 
     # Most of these, with the exception of resource_exclusion_exceptions,
     # are currently duplicated in system_webview_apk_tmpl.gni.
-@@ -342,6 +343,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -343,6 +344,7 @@ template("chrome_common_apk_or_module_tmpl") {
 
       proguard_enabled = true
       proguard_configs = [ "//chrome/android/proguard/main.flags" ]
@@ -18,7 +18,7 @@ index 22701454051942b21cdcd6c171e37579dc6166a7..129b9806c595bfab460a1054f74b73f4
       if (_is_monochrome) {
         proguard_configs +=
             [ "//android_webview/nonembedded/java/proguard.flags" ]
-@@ -762,6 +764,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -749,6 +751,7 @@ template("chrome_common_apk_or_module_tmpl") {
                                  "version_code",
                                  "version_name",
                                ])
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
-index e49e2cddb7005aabbf081b17e0f29a671802761d..0a79e777e7a2ff48d4b59a5bf7e687423c95f07a 100644
+index 107a2fb1b557b66dc2c5ee81ef941e658ff2b7c5..236ef5b8fa2048037226c63c8a5ae96cf3ed1535 100644
 --- a/chrome/android/expectations/lint-suppressions.xml
 +++ b/chrome/android/expectations/lint-suppressions.xml
-@@ -296,4 +296,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
+@@ -300,4 +300,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
     <!-- Discussed in crbug.com/1069204, ignoring this class of errors since these are Q+ constants. -->
     <ignore regexp="Must be one of: LineBreaker.BREAK_STRATEGY_SIMPLE, LineBreaker.BREAK_STRATEGY_HIGH_QUALITY, LineBreaker.BREAK_STRATEGY_BALANCED"/>
   </issue>
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
-index 0cd7e86e0cc30e6693df3ed341ec591fb9b62ceb..b9e67b25f29e544898460dd5cd3d580d46877ff5 100644
+index 15eb0b937d56a30420a5a78487d64ffd88971dd8..abe7c93379b73dfb0ce4ea9a42541d00824102d1 100644
 --- a/chrome/android/features/tab_ui/BUILD.gn
 +++ b/chrome/android/features/tab_ui/BUILD.gn
-@@ -113,6 +113,7 @@ android_resources("java_resources") {
+@@ -112,6 +112,7 @@ android_resources("java_resources") {
     "java/res/xml/tab_archive_time_delta_preference.xml",
     "java/res/xml/tabs_settings.xml",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
-index c8b8ece464e563ef37ab70429a10fb08451f5986..9d35d3e727fb0d5821492135e81507ff6bc9241d 100644
+index 4f48a5ce2593de9989d7c661b424cd9b1b277c48..77d4e0b97bac1cdb4b66ccdae1cdc466148c9c25 100644
 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
 +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
-@@ -301,7 +301,7 @@ public class FeedSurfaceMediator
+@@ -303,7 +303,7 @@ public class FeedSurfaceMediator
         // Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The
         // value should be updated before adding an observer to prevent an extra call of
         // updateContent().
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b2e9f3295 100644
+index ab689d4788bf3be40731a8734af7eedfe360c2f4..d29dfc2e69d047d8ede3a3d43fa1d7c44cf4872d 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
@@ -20,7 +20,7 @@ index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b
     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
-@@ -75,11 +78,17 @@ by a child template that "extends" this file.
+@@ -79,11 +82,17 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" tools:ignore="SystemPermissionTypo" />
     <uses-permission android:name="android.permission.RUN_USER_INITIATED_JOBS" />
 
@@ -38,7 +38,7 @@ index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-@@ -88,7 +97,9 @@ by a child template that "extends" this file.
+@@ -92,7 +101,9 @@ by a child template that "extends" this file.
     <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -48,7 +48,7 @@ index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b
     <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-@@ -140,7 +151,9 @@ by a child template that "extends" this file.
+@@ -144,7 +155,9 @@ by a child template that "extends" this file.
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
 
@@ -58,7 +58,7 @@ index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b
 
     {% block extra_uses_permissions %}
     {% endblock %}
-@@ -351,6 +364,7 @@ by a child template that "extends" this file.
+@@ -355,6 +368,7 @@ by a child template that "extends" this file.
             <intent-filter>
                 <action android:name="com.sec.android.airview.HOVER" />
             </intent-filter>
@@ -66,7 +66,7 @@ index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b
             <meta-data android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity-alias>
-@@ -1206,6 +1220,7 @@ by a child template that "extends" this file.
+@@ -1194,6 +1208,7 @@ by a child template that "extends" this file.
           </activity>
         {% endif %}
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
-index eab9f6a69e1a09fb66801465cf69503cbc92682f..2d59ac1ec9ad6bb503ff91009b425bddf881420b 100644
+index 08111da566c6a8e832c732dd9580b5a990de51d5..6c7db1687046dfd39f18fd7e16f55d3ea3a76226 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
@@ -140,7 +140,7 @@ public class SwipeRefreshHandler extends TabWebContentsUserData
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
-index c09394de87cbe5a6f7b99f68fbcac681ccdcd39d..23977dbd6442164f2672149dfad726fb9606fefc 100644
+index 8051698a9f277e4cd4a255cc0b30d2f41b38da46..25bb25c47850b4ced07568c866a7c3f9cc19c142 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
@@ -63,7 +63,7 @@ class ChromeContextMenuItem {
@@ -1,8 +1,8 @@
 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
-index 05fafaeb1aa2748640849838743178b7cdabe49f..536a5dad926a446c90fc8dae621d64bf2b0ad874 100644
+index 9a27d978b5733fdcf4768d279e3e19ef717bcd0d..f04dfff4516850bbefd7c7d859c23980d6fb4c66 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -161,7 +161,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -163,7 +163,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             Action.SHARE_HIGHLIGHT,
             Action.REMOVE_HIGHLIGHT,
             Action.LEARN_MORE,
@@ -11,7 +11,7 @@ index 05fafaeb1aa2748640849838743178b7cdabe49f..536a5dad926a446c90fc8dae621d64bf
         })
         @Retention(RetentionPolicy.SOURCE)
         public @interface Action {
-@@ -206,7 +206,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -208,7 +208,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             int LEARN_MORE = 38;
             int OPEN_IN_NEW_TAB_IN_GROUP = 39;
             int OPEN_IN_NEW_WINDOW = 40;
@@ -20,7 +20,7 @@ index 05fafaeb1aa2748640849838743178b7cdabe49f..536a5dad926a446c90fc8dae621d64bf
         }
     }
 
-@@ -296,6 +296,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -300,6 +300,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec())
                     && !UrlUtilities.isTelScheme(mParams.getLinkUrl())) {
                 linkGroup.add(createListItem(Item.COPY_LINK_ADDRESS));
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-index 06593f15483f890dc56ba8fcccec47c8e90caaea..0e7187c5623b0cea02de34c797b449280da5bfb0 100644
+index c54f135aa83a4bc9730ab283640f486dd6de6e81..5234a99582a0b936e50ced4b9b8f9671d387b3c3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@@ -48,7 +48,7 @@ public class HomepageManager
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
-index 83b44aed3069ca17fe3ad82bb2f112c69c8d8aee..d5200904d0ec4fb79b2797f5895dd92b0e526113 100644
+index 0f69d6975ee9225e14ae925b5f81f127ead41403..aa56e1c8e829c517efa285ffa7021af16cd19a4d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
@@ -141,7 +141,7 @@ public class NotificationPlatformBridge {
@@ -11,7 +11,7 @@ index 83b44aed3069ca17fe3ad82bb2f112c69c8d8aee..d5200904d0ec4fb79b2797f5895dd92b
         public final String notificationId;
         public final @NotificationType int notificationType;
         public final String origin;
-@@ -892,7 +892,7 @@ public class NotificationPlatformBridge {
+@@ -893,7 +893,7 @@ public class NotificationPlatformBridge {
                 .storeNotificationResourcesIfSuspended(notification);
     }
 
@@ -1,8 +1,8 @@
 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
-index ba86bbd08ee70b82e079fb7954f3dd4e15777b19..383a81c1d75a1998c631cf880c9105a9446a35b8 100644
+index 76a5bd263d4e13edc5800c576cb3dc02031b105f..82a660a432a9be54d4b6ec9340d1455006bb0b52 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -53,7 +53,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan;
+@@ -54,7 +54,7 @@ import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.ui.text.SpanApplier;
 
 /** Fragment to keep track of the all the privacy related preferences. */
@@ -11,7 +11,7 @@ index ba86bbd08ee70b82e079fb7954f3dd4e15777b19..383a81c1d75a1998c631cf880c9105a9
         implements Preference.OnPreferenceChangeListener {
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
     private static final String PREF_PRELOAD_PAGES = "preload_pages";
-@@ -408,6 +408,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -423,6 +423,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.clear();
@@ -19,7 +19,7 @@ index ba86bbd08ee70b82e079fb7954f3dd4e15777b19..383a81c1d75a1998c631cf880c9105a9
         MenuItem help =
                 menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
         help.setIcon(
-@@ -422,7 +423,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -437,7 +438,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     .show(getActivity(), getString(R.string.help_context_privacy), null);
             return true;
         }
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-index eaffd5888cef7125b1181188a6bf67595186105c..2574e22438c895d9f16705715300a732163d4978 100644
+index b6e0e06784b588377166d1c1f6ed4f1c1068a486..6a3f57aa6ec84b7d4e794818b40f047ee9bd3b73 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-@@ -62,7 +62,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils;
+@@ -64,7 +64,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils;
 import org.chromium.chrome.browser.ui.signin.SignoutButtonPreference;
 import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper;
 import org.chromium.chrome.browser.ui.theme.ChromeSemanticColorUtils;
@@ -11,7 +11,7 @@ index eaffd5888cef7125b1181188a6bf67595186105c..2574e22438c895d9f16705715300a732
 import org.chromium.components.browser_ui.settings.ChromeBasePreference;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
-@@ -652,7 +652,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
+@@ -666,7 +666,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
                                                 ? ConsentLevel.SIGNIN
                                                 : ConsentLevel.SYNC));
         // May happen if account is removed from the device while this screen is shown.
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
-index d73760eb6b423ea00ea07908158f79bbff3b89b2..9a0a86dac12585b3c630ca5b740503394800f24d 100644
+index 6687781711e29c8e1013a2f225cc512f787cb977..9ac3ff8785b33e62bea71ec2614793928788b757 100644
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -21,6 +21,7 @@ import("//chrome/common/features.gni")
+@@ -20,6 +20,7 @@ import("//chrome/common/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
 import("//device/vr/buildflags/buildflags.gni")
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
-index 9fce053b65940a68fc9e6b89768d642ad63efeb9..97e68c9b4691e6e24406ca396fdb8dbcf770de78 100644
+index fba475a9c6bf96263f3b09f46a4ae5e3b8860260..e10626c8b733182bb70a9e7c293983056b7f9d96 100644
 --- a/chrome/app/chrome_crash_reporter_client.cc
 +++ b/chrome/app/chrome_crash_reporter_client.cc
@@ -176,7 +176,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 7f1c26990d8d43e92615bd3a5f4046d121d6ac6b..2b821a11ad5a449c0be7a58cfd858176049f24ed 100644
+index 31ad4d86787ac856c422ecfde0389fb9090c6355..c203ca6207be358e41a47e469c8a2599c637464e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2516,6 +2516,7 @@ static_library("browser") {
+@@ -2514,6 +2514,7 @@ static_library("browser") {
       "performance_monitor/metric_evaluator_helper_posix.h",
     ]
   }
@@ -10,7 +10,7 @@ index 7f1c26990d8d43e92615bd3a5f4046d121d6ac6b..2b821a11ad5a449c0be7a58cfd858176
 
   if (!is_chromeos_ash) {
     sources += [
-@@ -8512,6 +8513,7 @@ static_library("browser_public_dependencies") {
+@@ -8599,6 +8600,7 @@ static_library("browser_public_dependencies") {
       "//rlz:rlz_lib",
     ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 3dd02e4175a3884266dd55c648976ea64837f794..f3bc36af4f342fd81a4ef8c6ee9f5e492befc933 100644
+index d86aa0d0bd4c4bc7eb7d11427cadbcac2a37e2c7..4d7659383a0ba18771f726bcf5775212dacb4533 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4231,6 +4231,7 @@ const FeatureEntry::FeatureVariation
+@@ -4225,6 +4225,7 @@ const FeatureEntry::FeatureVariation
 //
 // When adding a new choice, add it to the end of the list.
 const FeatureEntry kFeatureEntries[] = {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-index e0f4ea6b9ee0ada184f63b9f8283a27563c95742..7a27b72e8285f840512ab54ac9b981ca250c761d 100644
+index bba15cbd93207c47512ba1a15546983a189ff575..80919dfb7feb6db465fc7c86c47ccb42924fa383 100644
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -1629,6 +1629,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
+@@ -1654,6 +1654,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
       return "WebrtcVideoPerfHistory";
     case TracingDataType::kMediaDeviceSalts:
       return "MediaDeviceSalts";
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 3297c631e40aa95ed19907dd89f3cc1204e6c5b8..b5ccfb47f15069c10b4d14aa515e8d78d1952535 100644
+index 85da6b1a223e06f72c62f1c87081cc8f3766a8ea..04b2e327bba1cfb36d35048b48325a3ddf4ec559 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1543,6 +1543,7 @@ source_set("extensions") {
+@@ -1483,6 +1483,7 @@ source_set("extensions") {
       "//components/enterprise/data_controls/core/browser",
     ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-index 3b28400ef1a8ef85df77689925d8c3e727b2c408..4de06c2f72c6ece8aeb714393daee344eeb05d59 100644
+index ec62f6c16e7944a84cee3c0450ed508511656fcf..5682c257b265dfb833f214211b906acd3e72cca9 100644
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-@@ -677,6 +677,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
+@@ -678,6 +678,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
   info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension);
   info->incognito_access.is_active =
       util::IsIncognitoEnabled(extension.id(), browser_context_);
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
-index b57fd80c4b9a95b2c8d9bdadccc9de8cab9e2cea..cd1addad287b86fbfd07b86f8ad0b323afa69e7a 100644
+index da0938c298483c3c28deac413c6c8a9356247bd3..dff529029877f182aee728bc8fe2b5df21de841b 100644
 --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
 +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
@@ -186,6 +186,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-index 76eaec3f02e6236da44fabfeac3cbded0f2b57bf..6576408bf10ea01c2caf5ae245ab3b37b414d8c9 100644
+index 78631c3636b9adf637c09ea320f06ab529f635ad..4125aa71d53dcf48c006e06bc11ae76249692479 100644
 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-@@ -89,6 +89,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
+@@ -88,6 +88,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
     const api::webrtc_logging_private::RequestInfo& request,
     const std::string& security_origin,
     std::string* error) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-index 83fea62df6d7a70c09f433d7d967920860971320..6fe094695314dc641665ddc19d7079719dbfcd7e 100644
+index 389cc9c00d4fa685c9464e388c37224761815215..c961791046cd5c93e5c3b41f1020329b241d8d59 100644
 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
 +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -165,6 +165,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index bfe0bd55056b8b657cea2e0fefa1fe5c30fd98e2..4f025b7d22354e4d1b03e1cdaab25042d80f7bae 100644
+index e7c575b4d4616779d3c73887bbb9b8bf06a991c8..e5a10157fe7ecf885e560e63d644bb8024fd577f 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -969,6 +969,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
+@@ -1053,6 +1053,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
     content::BrowserContext* context) const {
   TRACE_EVENT0("browser,startup",
                "ExtensionManagementFactory::BuildServiceInstanceFor");
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index 1687e36dd5966b67fad971fc895ebbbe63b57775..0f404e573b99ea64798a295b9a042b91a73d038b 100644
+index a896cb1079d975fc68cfaf2bd2aa4aa38e7d0af1..a1bbe5c1990b609e951e296d69eeb337c03a7443 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -996,6 +996,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -994,6 +994,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
   }
 
   if (!url.SchemeIs(content::kChromeUIScheme)) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
-index 3c77a50fc57b31c187bd6f6fb18c44c2917f449d..30f37dab771f449d969ed5218a8245b5f276b728 100644
+index b44735d5eedeb988445e030f9b4d64c85be1b120..d5c44d4e1d3e2f7981f89f5a20d258a0e4b9dd7c 100644
 --- a/chrome/browser/external_protocol/external_protocol_handler.cc
 +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
-@@ -403,7 +403,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
+@@ -409,7 +409,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
   if (scheme == "mailto") {
     base::UmaHistogramEnumeration(kBlockStateMetric,
                                   BlockStateMetric::kAllowedDefaultMail);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
-index 718110bc6d60dfc55ac35cfc316844e1bb19fcb4..51a342c2481f49900bdd521a855a645a7637de6e 100644
+index f63eddccb64da91beaaca2684ad63e5c3815e5f9..5f6cfd585807ae5a1ed66b9b118d4c909b684260 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -507,6 +507,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
+@@ -588,6 +588,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
   std::vector<std::string> excluded_spkis(
       TranslateStringArray(ct_excluded_spkis));
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
-index afb5ce8d83b05645a19649bfe8bbdfe4512b33fe..4c341ecd0e7f9b193f972a05b1d411ad8d4a2797 100644
+index 1730a008726665c27d3275b98644cc3d1d94a670..10ceb57bf010493f9fa0050795ff22e7de17ac60 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -406,7 +406,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
-index 49db8238010480739add40efd57c06325b1abd0c..537aa8b1a59c2132720d1755b74d7cf8bdbcf061 100644
+index 338eec1164182da1f040578c9c3887e68a64935b..456b7059674089870a5d965d469fc4030cffb742 100644
 --- a/chrome/browser/notifications/BUILD.gn
 +++ b/chrome/browser/notifications/BUILD.gn
-@@ -85,6 +85,7 @@ if (is_android) {
+@@ -86,6 +86,7 @@ if (is_android) {
       "//third_party/jni_zero:jni_zero_java",
       "//ui/android:ui_no_recycler_view_java",
     ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 921f99a4ee22d230e0a035d15c8800d15ef8223f..6b7995dddc8560f26110dc952956ef4669fc1edc 100644
+index 3e27913d47dc75eddcf96b829f5440ba73e6357a..c2506c63c9b80059e6f723040bac0db14dd96118 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1865,6 +1865,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1940,6 +1940,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kQRCodeGeneratorEnabled, true);
 
   // This is intentionally last.
@@ -10,7 +10,7 @@ index 921f99a4ee22d230e0a035d15c8800d15ef8223f..6b7995dddc8560f26110dc952956ef46
   RegisterLocalStatePrefsForMigration(registry);
 }
 
-@@ -2307,6 +2308,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2380,6 +2381,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   registry->RegisterDictionaryPref(prefs::kReportingEndpoints);
 
   registry->RegisterBooleanPref(prefs::kCompactModeEnabled, false);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 76e435416e7ca956468ccbf9c222547d9e75dcaa..f426a199ce2f58f7c3b7193574c277fb5082a5ef 100644
+index 89254771117da2948bc176b881873e0d22f5ade6..6d7915b59f0fdc153262c2e30b1cc2c15932fdc3 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -111,6 +111,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
+@@ -101,6 +101,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
   // DevTools::BrowserContext, MediaRouter::Presentation, and
   // CaptivePortal::Signin are exceptions to this ban.
   if (*this == PrimaryID() ||
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
-index 9c2dc034b2055e6a24f015f94dbed1c341ad9b36..0132cb947f686d4e451a0f3ee87af6b3dd48039e 100644
+index 640b8198e61c8f3a724b283ef13b4ecf0cfbccea..07183ca537ec58e83cf0c775fd25028a4ec203b2 100644
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
@@ -1054,6 +1054,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index aa0d1cc1d45fe17eb59ecceb5dd1f8a1594012a9..f0a508b0085cb149b694ade347c271dfe06bff81 100644
+index db228a497bd288bad6c4b28259ee9f9070607e2e..59956927f079c514f70495322b8ae443491faccf 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -2411,6 +2411,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -2413,6 +2413,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
   if (!selection_navigation_url_.is_valid()) {
     return;
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-index 91de5780521af73eb8b41969562ac1c04a23a47f..fd6fc90ac45780e78a117624179268d3434d3191 100644
+index 0266119ae401068dbfbb7905a5a087c52b249dd7..63bd71b579e61bf5b9b164c0db6d0a8bb04eef78 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -198,6 +198,7 @@ class RenderViewContextMenu
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/downloads/BUILD.gn b/chrome/browser/resources/downloads/BUILD.gn
-index 9e9169da0931a577476fe6367be9bd368b631373..e97ba9bc9973680d147ca3215c8ebfff47e1dc37 100644
+index f388e81c0cc50be62ac7471254730dfa54a95644..55384e1dbcfd48387791d9d82362cbfd576e9bb8 100644
 --- a/chrome/browser/resources/downloads/BUILD.gn
 +++ b/chrome/browser/resources/downloads/BUILD.gn
-@@ -76,4 +76,5 @@ build_webui("build") {
+@@ -71,4 +71,5 @@ build_webui("build") {
     optimize_webui_host = "downloads"
     optimize_webui_in_files = [ "downloads.js" ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index 35be9d4dfa2b43d3b4f3ed96147814295e5bef7e..391414e6a5822e0a75e21666146364fb93905438 100644
+index 875fd23fc501c93ed2dd22e91d44352f904e97d4..5e5203f5fe0a1f7dc276a53f172f88af75834481 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
-@@ -100,4 +100,5 @@ build_webui("build") {
+@@ -126,4 +126,5 @@ build_webui("build") {
     optimize_webui_host = "extensions"
     optimize_webui_in_files = [ "extensions.js" ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts
-index 0c026efc93e789ba9327dd02c90dc4de51b451b0..4e309238b2e14667687df886f561e9a94a3da12b 100644
+index 74acc182a99b7864509335588b6a60893c0661d4..60ed52f2970c5a8f263e72f6d71bec216023ebf3 100644
 --- a/chrome/browser/resources/extensions/extensions.ts
 +++ b/chrome/browser/resources/extensions/extensions.ts
@@ -2,6 +2,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/extensions/item_list.html b/chrome/browser/resources/extensions/item_list.html
-index 4437b5ec9e6d02daca5d63c09e7b73f80e89f246..8ab1fa9c0911acdea50bcef183f7b2cb814c06e7 100644
+index 0142e7b64129a4b30505d8951f19d08ebef273e7..a027bc9045bcc4917702a07db9c41462fd58026d 100644
 --- a/chrome/browser/resources/extensions/item_list.html
 +++ b/chrome/browser/resources/extensions/item_list.html
-@@ -164,5 +164,6 @@
+@@ -165,5 +165,6 @@
         </template>
       </div>
     </div>
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts
-index 379c286d3399378d6aa85a0b4a82fea164f7839e..e371a3d76e4ff5cc7dad74352c8cd441813b6b46 100644
+index 22b0f8711ef0388f249d2a206c658ffc7813ebd6..8749d81790c85b8a71dea14c8eed182c24a2aadc 100644
 --- a/chrome/browser/resources/extensions/item_list.ts
 +++ b/chrome/browser/resources/extensions/item_list.ts
@@ -16,6 +16,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn
-index 65f4cef1706e97df2073c7cb662f345ef74db98c..14dc52b8d1fd8bc3decf1540c1dc81212c84ca7b 100644
+index 372975618eebc2d5cba0961cbca4e0113f04d60a..84234b138014b51fc288ac008ea5ba46166d054d 100644
 --- a/chrome/browser/resources/history/BUILD.gn
 +++ b/chrome/browser/resources/history/BUILD.gn
-@@ -85,4 +85,5 @@ build_webui("build") {
+@@ -86,4 +86,5 @@ build_webui("build") {
       "lazy_load.js",
     ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/history/history.ts b/chrome/browser/resources/history/history.ts
-index 90cac9ef363267c6395156dec1022a3a3f617d74..d06ba2c923390e7e32b28787c806bbf4fce6ef75 100644
+index df7ce3f1cfb1adf3cad7f58cdfffb655e4547f3a..ccba80a32d4a9db2c9158dd737059cfab614e2a9 100644
 --- a/chrome/browser/resources/history/history.ts
 +++ b/chrome/browser/resources/history/history.ts
@@ -2,6 +2,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/password_manager/BUILD.gn b/chrome/browser/resources/password_manager/BUILD.gn
-index 6ed26b34261d4ef9dc3cc79fe231ff47634bf947..639163137639fc8a7d8fc2961ec5eaa4f36b9aa4 100644
+index db130bfc91f9743c31d2042393238032c4803680..81f04d556c4f82fbd32743704e4a4bfbb9e504c2 100644
 --- a/chrome/browser/resources/password_manager/BUILD.gn
 +++ b/chrome/browser/resources/password_manager/BUILD.gn
-@@ -163,4 +163,5 @@ build_webui("build") {
+@@ -168,4 +168,5 @@ build_webui("build") {
               "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
               root_build_dir) ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/password_manager/password_manager.ts b/chrome/browser/resources/password_manager/password_manager.ts
-index a575094e9c3bd85d3510778483c99cd6984bd9aa..14e82df24eed987cae68d809ce1ec41a1d99525e 100644
+index 12ca0e4a9e9d124e32fa0282e15d2f8f719a402f..88151643da3fc5668c0f5162e6c453473ed1ef99 100644
 --- a/chrome/browser/resources/password_manager/password_manager.ts
 +++ b/chrome/browser/resources/password_manager/password_manager.ts
@@ -2,6 +2,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 5ecfd08141976b2b4fdd3aa878d62c2973e45ba9..58cfc9ffab81ccc4ce0ba87c614daf0428d9833f 100644
+index 4f67e62a9d29966790ce80c5926e4a9f57f30ae2..f1199b0ec883f7fafc151a64a59d657232d0291d 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -451,4 +451,5 @@ build_webui("build") {
+@@ -456,4 +456,5 @@ build_webui("build") {
               "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
               root_build_dir) ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-index 90943cda4959b3e2eb2559652db3fb14de5af6ac..94262a26c04a8d7db5fb5d7ee7fb58fe5ab2787e 100644
+index b86ef3f0d419048dceb1b3d76cf885bbcfd84fcc..279b9bdcbd515d6c1280898455cea7800d840e91 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -23,7 +23,7 @@
@@ -36,7 +36,7 @@ index 90943cda4959b3e2eb2559652db3fb14de5af6ac..94262a26c04a8d7db5fb5d7ee7fb58fe
     <settings-toggle-button id="urlCollectionToggle"
         class="hr"
         pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
-@@ -116,6 +118,7 @@
+@@ -117,6 +119,7 @@
           on-click="onHistorySearchRowClick_">
       </cr-link-row>
     </template>
@@ -44,7 +44,7 @@ index 90943cda4959b3e2eb2559652db3fb14de5af6ac..94262a26c04a8d7db5fb5d7ee7fb58fe
 <if expr="_google_chrome">
 <if expr="not chromeos_ash">
     <settings-toggle-button id="spellCheckControl"
-@@ -167,6 +170,7 @@
+@@ -168,6 +171,7 @@
       </settings-toggle-button>
     </template>
 
@@ -52,7 +52,7 @@ index 90943cda4959b3e2eb2559652db3fb14de5af6ac..94262a26c04a8d7db5fb5d7ee7fb58fe
     <template is="dom-if" if="[[showSignoutDialog_]]" restamp>
       <settings-signout-dialog sync-status="[[syncStatus]]"
           on-close="onSignoutDialogClosed_">
-@@ -184,3 +188,4 @@
+@@ -185,3 +189,4 @@
           on-close="onRelaunchDialogClose"></relaunch-confirmation-dialog>
     </template>
 </if>
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-index 7b32d6792384404027c01ae14ed294548f90ac71..4c633c877438d846132111a9ff7478d17d8b2e82 100644
+index 72337e108b378d37d7c0e82a79488a29cfedadc7..6a2a3aee4cc00edcb855713ce3252ba01a1a11e0 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -91,7 +91,7 @@ export class SettingsPersonalizationOptionsElement extends
@@ -11,7 +11,7 @@ index 7b32d6792384404027c01ae14ed294548f90ac71..4c633c877438d846132111a9ff7478d1
       // TODO(dbeam): make a virtual.* pref namespace and set/get this normally
       // (but handled differently in C++).
       metricsReportingPref_: {
-@@ -152,7 +152,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -157,7 +157,7 @@ export class SettingsPersonalizationOptionsElement extends
   focusConfig: FocusConfig;
   syncStatus: SyncStatus;
 
@@ -20,7 +20,7 @@ index 7b32d6792384404027c01ae14ed294548f90ac71..4c633c877438d846132111a9ff7478d1
   private metricsReportingPref_: chrome.settingsPrivate.PrefObject<boolean>;
   private showRestart_: boolean;
   // </if>
-@@ -209,7 +209,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -215,7 +215,7 @@ export class SettingsPersonalizationOptionsElement extends
   override ready() {
     super.ready();
 
@@ -29,7 +29,7 @@ index 7b32d6792384404027c01ae14ed294548f90ac71..4c633c877438d846132111a9ff7478d1
     const setMetricsReportingPref = (metricsReporting: MetricsReporting) =>
         this.setMetricsReportingPref_(metricsReporting);
     this.addWebUiListener('metrics-reporting-change', setMetricsReportingPref);
-@@ -224,9 +224,11 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -230,9 +230,11 @@ export class SettingsPersonalizationOptionsElement extends
         this.setChromeSigninUserChoiceInfo_.bind(this));
     // </if>
 
@@ -41,7 +41,7 @@ index 7b32d6792384404027c01ae14ed294548f90ac71..4c633c877438d846132111a9ff7478d1
   }
 
   // <if expr="chromeos_ash">
-@@ -255,7 +257,7 @@ export class SettingsPersonalizationOptionsElement extends
+@@ -261,7 +263,7 @@ export class SettingsPersonalizationOptionsElement extends
   }
   // </if>
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 3edf3a7f146129e487e01a03b697f4c60d565063..98c8b6884b20536aa2b96c4ffb86b0865470e06a 100644
+index cbc13c12082ec35a258f23ac2f780f6014b3bac8..2c7200df858c37d3ca86b288a288ffb4d5f0e1eb 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -36,6 +36,7 @@
@@ -10,7 +10,7 @@ index 3edf3a7f146129e487e01a03b697f4c60d565063..98c8b6884b20536aa2b96c4ffb86b086
         <cr-link-row id="clearBrowsingData"
             start-icon="cr:delete"
             label="$i18n{clearBrowsingData}"
-@@ -317,6 +318,7 @@
+@@ -319,6 +320,7 @@
           </settings-subpage>
         </template>
       </template>
@@ -18,7 +18,7 @@ index 3edf3a7f146129e487e01a03b697f4c60d565063..98c8b6884b20536aa2b96c4ffb86b086
       <template is="dom-if" route-path="/content/backgroundSync" no-search>
         <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
             search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -344,6 +346,7 @@
+@@ -346,6 +348,7 @@
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index ead2033ad6ce1cf4d537d5820e619f3f6556a061..7f8159faa04693c15cbc62ee7395d49373ce1b36 100644
+index 130e9e9b38a682ad1c956973e36cd3ac89eb41a7..ede6878636c9090878475f029b8c7ba553c53b2e 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -23,6 +23,7 @@ import '../settings_page/settings_subpage.js';
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index 287dd67692105fcf52194989e644814075170f4b..64a511e43d8da6988787acd065acf24520e378aa 100644
+index afdd3ed9f90afae64e2b025519ddd6ebcec6d2ab..1a228530c242b34e992cbbe53c000862503ef955 100644
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
@@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js';
@@ -10,7 +10,7 @@ index 287dd67692105fcf52194989e644814075170f4b..64a511e43d8da6988787acd065acf245
 /**
  * Add all of the child routes that originate from the privacy route,
  * regardless of whether the privacy section under basic or advanced.
-@@ -318,6 +319,7 @@ function createRoutes(): SettingsRoutes {
+@@ -327,6 +328,7 @@ function createRoutes(): SettingsRoutes {
           loadTimeData.getString('performancePageTitle'));
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
-index 1fb0b38fef0dcee31015a939fd31202e0294bca7..3abf7c2b1083ad32841b1ef5064da971f6ab1fb7 100644
+index afe6eb3c611c80833e7ceaa32368a45cf8f2dcad..9e2ae5933cb523c0cf5ab48f5bb4218abd251c42 100644
 --- a/chrome/browser/resources/settings/router.ts
 +++ b/chrome/browser/resources/settings/router.ts
-@@ -120,6 +120,7 @@ export interface SettingsRoutes {
+@@ -121,6 +121,7 @@ export interface SettingsRoutes {
   IMPORT_DATA: Route;
   SIGN_OUT: Route;
   // </if>
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
-index 585035dcc577fdc068df718f3fa14ff4cc62cc0f..926fffe8083772470e52bf3960ab5a4ba5c71662 100644
+index 2037a2df2256f5c4d8e220d18c3ee56fe2d7b87d..e78586a6b2609a270ef730dea3f33656b8a366b8 100644
 --- a/chrome/browser/resources/settings/settings.ts
 +++ b/chrome/browser/resources/settings/settings.ts
@@ -2,6 +2,7 @@
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
-index 8ef2d31d03a8491e8ef70474646f662053eb21ba..ba78bc05eb1b8531a87a95ca1b0a23681f739d36 100644
+index 6c5d4cb887e6741d5d319b1103f1a5fe4fddf72e..0026b2ff4d75b1d2acb7c64bdcbbffb1448ece24 100644
 --- a/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
 +++ b/chrome/browser/resources/settings/settings_page/main_page_mixin.ts
@@ -40,7 +40,7 @@ guestTopLevelRoute = routes.PRIVACY;
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-index c89ef3b498e14fa416b6b34bfc203e66baf026d6..6b4e23d31effd28747b8d06a84da1389eb189c4a 100644
+index 148f0d9c610a632f4cdf32c565c763786c967b37..6144a6fc2d6cdd7fd7e8fbcd9ab7ac04848738bf 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -9,6 +9,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings_shared/privacy_page/privacy_page_browser_proxy.ts b/chrome/browser/resources/settings_shared/privacy_page/privacy_page_browser_proxy.ts
-index 7f39d9ea5516a06a42336028d61933328c6f3191..5cdd364a038fdb332c9d8a4d5c2aa1a4df476d2c 100644
+index bbc0426516db825d840015851d561e07018ce983..81695e0277226b33330cac2daddedc126070b802 100644
 --- a/chrome/browser/resources/settings_shared/privacy_page/privacy_page_browser_proxy.ts
 +++ b/chrome/browser/resources/settings_shared/privacy_page/privacy_page_browser_proxy.ts
-@@ -54,7 +54,7 @@ export interface SecureDnsSetting {
+@@ -62,7 +62,7 @@ export interface SecureDnsSetting {
 }
 
 export interface PrivacyPageBrowserProxy {
@@ -11,7 +11,7 @@ index 7f39d9ea5516a06a42336028d61933328c6f3191..5cdd364a038fdb332c9d8a4d5c2aa1a4
   getMetricsReporting(): Promise<MetricsReporting>;
   setMetricsReportingEnabled(enabled: boolean): void;
 
-@@ -83,7 +83,7 @@ export interface PrivacyPageBrowserProxy {
+@@ -91,7 +91,7 @@ export interface PrivacyPageBrowserProxy {
 }
 
 export class PrivacyPageBrowserProxyImpl implements PrivacyPageBrowserProxy {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
-index 1ce2ff08fa00a627e267515f58caed40dccf9eb8..c26eb69478cc1fcd0ebebc5d7aba849c3386d28b 100644
+index 0a4d1c928bc278b6e89b5b36a77f8e7bbe2e339d..fa439e05d59cfa76bbbac6579591ad659c54d564 100644
 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
 +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
@@ -3,6 +3,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/side_panel/read_anything/BUILD.gn b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
-index d359c56e3443c7ee8b5d17688fa3dbdf77c3eefc..38e7ac4b8a20841f843135955010b0254eba0b13 100644
+index 6ca49c3d2b32ae5f030c1c906120c40f0a00a083..bf3b063f47bd4f699c53465446d60498a7d28d32 100644
 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn
 +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
-@@ -65,7 +65,7 @@ build_webui("build") {
+@@ -68,7 +68,7 @@ build_webui("build") {
             target_gen_dir) ]
 
   webui_context_type = "untrusted"
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
-index fd47cd395ad8e531da57dc4ca0666162f5b28caa..bca0790d681e96af37930e36b8c0adb01803e5d4 100644
+index 19cc1b47ecf4a970f930f7c0b7e802d2739d5802..d37aff1fb03b7383ee5a33ddabc9ac1a13e292a6 100644
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -475,6 +475,7 @@ static_library("safe_browsing") {
+@@ -485,6 +485,7 @@ static_library("safe_browsing") {
         "//components/safe_browsing/android:safe_browsing_mobile",
       ]
     }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
-index 8ba985a855a17fbd3846e77a49760fbacbda8d71..a425f09679ceaa247e32f23aa335400c54672cd3 100644
+index 2334ef0d22d6eb2788dbd5b576c14d22a205b3f3..011e544273b05249ab862852f34bb5914feaa433 100644
 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
 +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
@@ -325,6 +325,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
-index b12e7409a86b78a1f23f0421e4cfc40f7c52ef44..c85d0325c368af296b8c6cb52be89879ae3909cd 100644
+index 29a951523893743ad0c22eb79f608faf6f933d02..7b97014f13308ad67c26b1059926ebc88578058e 100644
 --- a/chrome/browser/shell_integration_linux.cc
 +++ b/chrome/browser/shell_integration_linux.cc
-@@ -487,7 +487,7 @@ std::string GetIconName() {
+@@ -488,7 +488,7 @@ std::string GetIconName() {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   return "google-chrome";
 #else  // BUILDFLAG(CHROMIUM_BRANDING)
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
-index acf531439ae2c45f49f26b4cb4eb2244d33b06fd..ebe8fe337dbebfeb5df831d78829a906be2a0bd7 100644
+index 948a8e31ba7ed7c3ce6f1d3bd5f13152dccae8b8..c1ff39b0abf1ec53191ee0d1dd40d5695edf7bcc 100644
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -197,6 +197,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
+@@ -191,6 +191,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
     Profile* profile) {
   DCHECK(ShouldBuildServiceForProfile(profile));
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
-index 96e6d2cff17c67cbe6fd624bf66534b7a0499de4..a0a58eb041ce5dae57b0905442e8bc0becb4e603 100644
+index 38ceb5f98e704f3072a220d09d52dcc68c1e7b50..b32a4ea4e6e574571f9725a51b279a6daa92f9ae 100644
 --- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
 +++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
-@@ -433,6 +433,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial(
+@@ -447,6 +447,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial(
         break;
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
-index be9118475d27ca8651198121dcbec2366a77fdb7..8b8d728b218ca634f704616709514b13c600bd21 100644
+index 05aab64447726fa34c27ace700ba38ab9de6820f..e8705c5ec7952b5067f22ad11cc47ab435401512 100644
 --- a/chrome/browser/sync/sync_service_factory.cc
 +++ b/chrome/browser/sync/sync_service_factory.cc
-@@ -413,7 +413,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -414,7 +414,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
   }
 
   auto sync_service =
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
-index 55d7ce0e353a1e5d7e3c230a58e10b9735b1d50f..3a9078c058fcd4385b8325751021cab8c045b735 100644
+index 8d3982aab2f0ccc1cbbf97d89fba31e55bf292dc..a265ddf05de8228afcd0168f6609037d8af8f322 100644
 --- a/chrome/browser/themes/theme_service_factory.cc
 +++ b/chrome/browser/themes/theme_service_factory.cc
@@ -106,6 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 1d4df92c6685b8f6a7501cb37a470235df57b507..7dff5f269ff1e7db3e01f5f48dac71d46703d00f 100644
+index 04bfa8a3f5229d3436ddc004cd36e064167bc004..2d4a931b1e5c70afde870136502c627ff38da314 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -736,6 +736,7 @@ static_library("ui") {
+@@ -741,6 +741,7 @@ static_library("ui") {
     "//chrome/browser/content_settings:impl",
     "//chrome/browser/content_settings:content_settings_util_impl",
   ]
@@ -10,7 +10,7 @@ index 1d4df92c6685b8f6a7501cb37a470235df57b507..7dff5f269ff1e7db3e01f5f48dac71d4
 
   if (enable_vr && is_win) {
     deps += [ "//chrome/browser/vr:vr_base" ]
-@@ -3656,7 +3657,10 @@ static_library("ui") {
+@@ -3601,7 +3602,10 @@ static_library("ui") {
       ]
       deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ]
     } else {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/actions/chrome_action_id.h b/chrome/browser/ui/actions/chrome_action_id.h
-index f36a6ecbca4ba9f6396c9c85e71ad2f946aeb01a..e7daabc52cc33e69c2c5b7319bdaf3e4cab46885 100644
+index 3c8c3fd5b4d2c49d70bf35fca67765b61965f17d..cad5dacdff0c02c2e61e0c1c4874e11eab05d866 100644
 --- a/chrome/browser/ui/actions/chrome_action_id.h
 +++ b/chrome/browser/ui/actions/chrome_action_id.h
-@@ -540,6 +540,7 @@
+@@ -542,6 +542,7 @@
   /* Side Panel items */ \
   E(kActionSidePanelShowAboutThisSite) \
   E(kActionSidePanelShowAssistant) \
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
-index 00ca9a9e250635402df26382f9d7b4b6bf36084b..1ca4fa1c83bb3f8f9e57f402a5f615702150b56c 100644
+index eaece2d8ff3f93acc7e77b3ef08a3bb5aacddc1f..4b579eacdd926b3f88ae35d0f47ae910138a2125 100644
 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
 +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
@@ -21,6 +21,7 @@ android_library("java") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
-index 3215767dde35a6f7443df41267780e7d7bc0d856..2887e59e34012543ed33357faa452dfc23af0779 100644
+index 3faab8b9145128091edff3b5e264d9f0c8f0021b..6e50624f7613afa8b98dadb77b6e8f00362088bb 100644
 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
 +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
-@@ -307,6 +307,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+@@ -304,6 +304,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
                 anchorView,
                 groupDividerResourceId,
                 anchorViewOffset);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
-index 1f40d76224d521b64894ec51167ee6d2f9eea30e..9be6d36701a1a08a2602eae795e9f5d477e751c5 100644
+index 73cd5a42c426f1d250ae0a2f92b05a07746f7114..667fbe4b2cf94f7d6869ab3cbe467dfc27a0e533 100644
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -107,6 +107,7 @@ android_library("java") {
+@@ -109,6 +109,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java",
     "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java",
   ]
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
-index d91ce25ea457b34de61773d9059bae7a692809f4..c448d5463b217e1f1f0473cee96be2a3cfcb802a 100644
+index 8737a8ed9fc318c8d5793944c6f02cba314c3acc..7d2c1663b041322e52fe4b5c413b403f130d189f 100644
 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml
@@ -38,6 +38,7 @@ found in the LICENSE file.
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
-index b42cdce90f03672094a77f16004064b17e8e446f..5edb2ef910e81e74a18d86df020c950b96696a69 100644
+index 1056313a7c48ec99d6118e3befd1303a04c0e243..29dc9e5e97aab151d196c6432c845ec0730dc785 100644
 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
@@ -66,6 +66,7 @@ found in the LICENSE file.
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444e1cf581f 100644
+index 4c4dda95361ab35d2892019989fef3bd18a528e9..976047ec51c5e41496bfaa75424bdd3a61696816 100644
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-@@ -435,6 +435,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -434,6 +434,7 @@ public class ToolbarPhone extends ToolbarLayout
         if (mOptionalButtonCoordinator != null) {
             mOptionalButtonCoordinator.setBackgroundColorFilter(color);
         }
@@ -10,7 +10,7 @@ index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444
     }
 
     private void updateModernLocationBarCorners() {
-@@ -589,6 +590,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -588,6 +589,7 @@ public class ToolbarPhone extends ToolbarLayout
                 mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
             }
         }
@@ -18,7 +18,7 @@ index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444
     }
 
     @Override
-@@ -1047,6 +1049,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -1046,6 +1048,7 @@ public class ToolbarPhone extends ToolbarLayout
      * Tab Page.
      */
     private void updateLocationBarLayoutForExpansionAnimation() {
@@ -26,7 +26,7 @@ index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444
         TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
         if (isInTabSwitcherMode()) return;
 
-@@ -1426,6 +1429,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -1425,6 +1428,7 @@ public class ToolbarPhone extends ToolbarLayout
             canvas.restore();
         }
 
@@ -34,7 +34,7 @@ index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444
         // Draw the tab stack button and associated text if necessary.
         if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) {
             // Draw the tab stack button image.
-@@ -2106,6 +2110,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -2105,6 +2109,7 @@ public class ToolbarPhone extends ToolbarLayout
         } else {
             populateUrlClearExpansionAnimatorSet(animators);
         }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index e1ebde9b491c38cdf0bc6f574e78ac72aa997c66..757564b8cfc0e05702da4030823ba5183d7f06e1 100644
+index e87612be406274364fd125e7e89e803aa21702d8..bb8d0e5261d708475ed6c492eaa7fb7fd1c370d0 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
@@ -529,6 +529,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 061432f5974e1b0bcf2b5a62be5540b8ba6df12f..3c5fb01529cb93a8ba317e7fb594291239daf916 100644
+index 70d7f4fbda71c935f08bd90346849d931f5f6821..675200b674cef638e8f627256c084682dadc66c3 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
-@@ -625,6 +625,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
+@@ -627,6 +627,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
       return nullptr;
     }
   }
@@ -10,7 +10,7 @@ index 061432f5974e1b0bcf2b5a62be5540b8ba6df12f..3c5fb01529cb93a8ba317e7fb5942912
 
   // Open System Apps in their standalone window if necessary.
   // TODO(crbug.com/40136163): Remove this code after we integrate with intent
-@@ -1046,6 +1047,7 @@ bool IsURLAllowedInIncognito(const GURL& url,
+@@ -1044,6 +1045,7 @@ bool IsURLAllowedInIncognito(const GURL& url,
     return stripped_url.is_valid() &&
            IsURLAllowedInIncognito(stripped_url, browser_context);
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index dc3191190654b7c9dfa32d5b0c92814c3b4d4480..2d00a9a5d0b30dceffbf769146a27ffbdbcbc9df 100644
+index 6beaa87108b322443497156d49c147c314b8212b..7a0fa6ef3c3a7458bbb949a7722430d99620b26c 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -98,7 +98,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
       translate::prefs::kOfferTranslateEnabled, true,
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index 840b3156b3e14606ec473b8f96fb738fe9e97d5d..1367fafab60d82e147d0699f262b02bca01cb09c 100644
+index bf6f4b20da6c1bac3c63fa6039189e9fe13ea031..18758e3ac719abea953c7e04d76356c7bfbfebe3 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
@@ -403,7 +403,7 @@ void ShowSlow(Browser* browser) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn
-index aa06f30703313055734cbd8e73be651a493aeae1..f8b81651022a9876fcba331ce64a7a1c5d838f6d 100644
+index 02d3457d65c4edf2cdbb3c37d90813b496f7945b..c7a8b1b901c2106f4d6145bb5ea9b08479122a65 100644
 --- a/chrome/browser/ui/color/BUILD.gn
 +++ b/chrome/browser/ui/color/BUILD.gn
-@@ -61,6 +61,7 @@ source_set("mixers") {
+@@ -62,6 +62,7 @@ source_set("mixers") {
     "//ui/color:color",
     "//ui/color:mixers",
   ]
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
-index ecd15f6fcd2a2d713f9f688477d07524a2f53386..1b27de5cf6fe2305a4834f7f1c38631a34fe5e70 100644
+index e13c48e733b29acfc935b5af6cdf66b460aac116..073fcebd740101b5e6da1171e35ce597a093ef85 100644
 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
 +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
@@ -23,7 +23,7 @@ class GURL;
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index b7dacc2a46e5351d265fe36321460b50c3f3d3ef..fd76360663de51fdecd57d759f7d2bab19a091fc 100644
+index a1ddc3b63da9991506b43daae66b6cdb6923cdc0..fd2088acc6c6ebe0e4cb8d25f3974371f9123995 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -828,4 +828,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -827,4 +827,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
 
   // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
   // organized.
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
-index f31ce671fe77c84a1469e49355dccca377052bae..a951b599bd49187abd61945e3fd46a8c2761d321 100644
+index 159fdebfb81c3ff0f1b2714a700184ebd6f8db8c..738871b2d6457440fb7e95fa95ebcd55a737a118 100644
 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
 +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
-@@ -444,6 +444,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() {
+@@ -457,6 +457,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() {
     DCHECK(!session->GetSessionName().empty());
     std::unique_ptr<ui::SimpleMenuModel> device_menu_model =
         CreateOtherDeviceSubMenu(session, tabs_in_session);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc
-index 55d69de6c8d27300153648467393f56741f0525b..e89b4f62929cf848e005641b447560f61e5896ac 100644
+index d0ac4166816514cf713d129581135fb8871e63f8..939103710846a867166193b3017359cb66e00c3a 100644
 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc
 +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model_unittest.cc
-@@ -164,6 +164,7 @@ class RecentTabsSubMenuModelTest : public BrowserWithTestWindowTest {
+@@ -165,6 +165,7 @@ class RecentTabsSubMenuModelTest : public BrowserWithTestWindowTest {
     helper->VerifyExport(session_sync_service_->GetOpenTabsUIDelegate());
   }
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
-index 4d900c4a7f58c8ed0e68e4f890b2f79484ad89dc..0d2f081f130a7c7f33db2a0f020d28afff8c683d 100644
+index e96ec5acc5b037f62c47923433516e0d0f0090c5..e463c7d88deb59b35a25e71a365971c79939813e 100644
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -660,6 +660,7 @@ class TabStripModel : public TabGroupController {
+@@ -664,6 +664,7 @@ class TabStripModel : public TabGroupController {
   tabs::TabModel* GetTabForWebContents(
       const content::WebContents* contents) const;
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index 9cecb25b41d3b6ac27c11f3c76d655b40c513a57..adcbad9b2896f5b1374003417b17ac382dc82a33 100644
+index 56e9a9a66cecaad4a710bcdfb3817d1b43100cfb..7c75dea16f9f7c8dcb8ff4d3fb746d980c27a2ed 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-@@ -881,6 +881,7 @@ void BookmarkBarView::Layout(PassKey) {
+@@ -884,6 +884,7 @@ void BookmarkBarView::Layout(PassKey) {
       x = next_x;
     }
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
-index 5c989ce1b3ab12442abf6edcc0d4d1bffc96ee80..e9915c42a1dbebc685261279421b6b050798d0f1 100644
+index 9d1efc2534b6439213d1133eb8636271dbf8b465..8490fcec2ad2f8a9d41942c6fdd6c1bc41e0b311 100644
 --- a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
 +++ b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
@@ -6,6 +6,7 @@
@@ -10,7 +10,7 @@ index 5c989ce1b3ab12442abf6edcc0d4d1bffc96ee80..e9915c42a1dbebc685261279421b6b05
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/top_chrome/webui_contents_warmup_level_recorder.h"
 #include "chrome/browser/ui/webui/top_chrome/webui_url_utils.h"
-@@ -69,7 +70,8 @@ bool WebUIBubbleManager::ShowBubble(const std::optional<gfx::Rect>& anchor,
+@@ -68,7 +69,8 @@ bool WebUIBubbleManager::ShowBubble(const std::optional<gfx::Rect>& anchor,
   if ((!disable_close_bubble_helper_) &&
       BrowserList::GetInstance()->GetLastActive()) {
     close_bubble_helper_ = std::make_unique<CloseBubbleOnTabActivationHelper>(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc
-index 9a08b9d0a91bc624c3a7736e80d2016aa70faf30..e8f0bdb434e5cf8f1e8ee11322e244be95bcdab7 100644
+index da9875371c873757b277f929423cff04d3413f80..41c75a144e2b5d3c2f11751b7979148d9214ad54 100644
 --- a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc
 +++ b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc
-@@ -718,6 +718,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem(
+@@ -719,6 +719,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem(
     ExtensionMenuItemView::SitePermissionsButtonAccess
         site_permissions_button_access,
     int index) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
-index 978d23e01af7e16c3b35c6d6fc80ff7d7dfe84cb..daa9730713794591f01b36e16331ad1044d1acd5 100644
+index 66fdd5d92c2aa28bf9a89f24be37536efc589330..c05ddc610beaca6886469945f089bed440011860 100644
 --- a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
 +++ b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc
-@@ -337,6 +337,7 @@ ExtensionsMenuViewController::~ExtensionsMenuViewController() {
+@@ -356,6 +356,7 @@ ExtensionsMenuViewController::~ExtensionsMenuViewController() {
 }
 
 void ExtensionsMenuViewController::OpenMainPage() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
-index cb14b46b727ca9c17e92bf490f06306c6130f327..57ee62350e263b7048eea981245749562d1365de 100644
+index 148c255ec04d34931539d056862f18372bbbe884..804b90205b1514e5873e554752bc39a89a5219c6 100644
 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc
 +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -73,6 +73,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
--- a/Show More
+++ b/Show More