Update patches from Chromium 118.0.5993.88 to Chromium 119.0.6045.33.

2023-10-23 13:19:01 +01:00
parent 772a210618
commit dbefc5a7f8
195 changed files with 398 additions and 398 deletions
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 82cb596dcbb369cf67addf856dfe8c0789449e78..e6be16420eb0ecac0158072065cac54be619f4d8 100644
+index 55479f4187323ad0f26dbbda555c0ff3093cc8d5..3ce31b4526993c440c3bee3766e8350d1cada5e4 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4422,6 +4422,7 @@ if (is_android) {
+@@ -4461,6 +4461,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java",
       "android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java",
     ]
@@ -1,8 +1,8 @@
 diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
-index 63a0ac10b98e68fb32547edcd70e635d1dd48e08..7b182a3517009e7a037f44294cba860bd18de040 100644
+index 6306371c88f3a572f0355e8c68c7aacad1d707ad..8054573c12df37180034f4286c5d497d0661c7bd 100644
 --- a/base/test/launcher/test_results_tracker.cc
 +++ b/base/test/launcher/test_results_tracker.cc
-@@ -151,6 +151,7 @@ TestResultsTracker::~TestResultsTracker() {
+@@ -144,6 +144,7 @@ TestResultsTracker::~TestResultsTracker() {
                    : ""),
               result.GetTestCaseName().c_str());
       if (result.status != TestResult::TEST_SUCCESS) {
@@ -1,8 +1,8 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 61ef504585b1347799be57205f1f7f87d01f5aec..96904b027f1f561236051d4da61f4fe662d8c67c 100644
+index b0bd783057a77a6752729105c5ca9d12f5b14ab0..21e2ecab20f51456b6b43e92e472bb6946dfb0a2 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
-@@ -710,6 +710,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives {
+@@ -711,6 +711,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] 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 292e5ce4922b37a642233a70672d777f5ec6143a..d2a9e629a8b2d660560f85afc63abd89874c4ade 100644
+index 2f9a9813f863caa8f444bbcf64806826f5a8febb..13710d4612c9f6038ceae4b797643073cfdf41d1 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -191,6 +191,7 @@
+@@ -192,6 +192,7 @@
   X("webrtc")                                                            \
   X("webrtc_stats")                                                      \
   X("xr")                                                                \
@@ -1,5 +1,5 @@
 diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
-index 221b3fd50c7d02e56f337cacb7174e004ce15d7f..50db6b75db8c8bcfae75137fce46b72c1797f4bc 100755
+index ae87291066f3f9782ab087993ab130d70105ffa2..5a629f85f05a6fe2e4268b9a7c54c5b2782a5b74 100755
 --- a/build/android/gyp/dex.py
 +++ b/build/android/gyp/dex.py
@@ -30,6 +30,7 @@ DEFAULT_IGNORE_WARNINGS = (
@@ -1,8 +1,8 @@
 diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
-index 89a1b2dd3dfc6a58c1c350587d76395028b21b32..601ee249ae18d2e38b5427aa895f1a89517ed1ba 100755
+index 153352c77d809dc8ba6528f7612d4c322043f0cc..f8145d2bc7a1e02b96fdc76aa4f5eacc730be084 100755
 --- a/build/android/gyp/proguard.py
 +++ b/build/android/gyp/proguard.py
-@@ -329,6 +329,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
+@@ -331,6 +331,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 e7c18c068d4e5d401e4128d7f2384bb06e506a30..5f26aed99647932158b4a25a46ae5b03fbccb633 100644
+index 9e481132f8f7dcb7be0c10821ac9a0dbec595010..592b0aff58ccb5c4ae126a1c0f00561be0908810 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
@@ -39,6 +39,7 @@ config("compiler") {
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index d8d9a6b8de8788c4dad03b6bdb0ca33c8348fd02..686d5361d3b63ea7034c1d16b60c0e96a26e0269 100644
+index 0ad9fc4df71bfa2bd9ff8f45514e8fefb01267b0..1146b3be1186aab3464c6d1474dd6ed1019acd55 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
-@@ -22,6 +22,7 @@ declare_args() {
+@@ -25,6 +25,7 @@ robolectric_toolchain = "//build/toolchain/android:robolectric_$host_cpu"
 # toolchain, this GNI file may be read and processed from within Chrome OS
 # toolchains. Checking |is_android| here would therefore be too restrictive.
 if (is_android || is_chromeos) {
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index d6bcf850168e853cdf70d16362c282256b693868..164c20ff23f2cefafa9e8a91ad1797f30968add1 100644
+index afbbcf781c23a3a857233b529e908282a3cb5a02..ebeebd623352691d434e2834257335fdb7075de0 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -4070,6 +4070,7 @@ if (enable_java_templates) {
+@@ -4010,6 +4010,7 @@ if (enable_java_templates) {
       } else {
         not_needed(invoker, [ "missing_classes_allowlist" ])
       }
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 9fd501ff10137a903e87213b9ed29ec975420e1e..c68234ab0609deb949614dbf1c3cb0d08e69d00d 100644
+index 4b2024518f1fc9214d0c893ead69c2d59909388c..777d597466ef34aef99ba76cccf6e4e7e648fd8c 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -285,6 +285,7 @@ if (enable_java_templates && is_android) {
+@@ -211,6 +211,7 @@ if (enable_java_templates && is_android) {
   #     ]
   #   }
   template("java_cpp_enum") {
@@ -10,7 +10,7 @@ index 9fd501ff10137a903e87213b9ed29ec975420e1e..c68234ab0609deb949614dbf1c3cb0d0
     action_with_pydeps(target_name) {
       forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ])
 
-@@ -460,6 +461,7 @@ if (enable_java_templates && is_android) {
+@@ -386,6 +387,7 @@ if (enable_java_templates && is_android) {
   #     output = "$target_gen_dir/AndroidManifest.xml"
   #   }
   template("jinja_template") {
@@ -1,5 +1,5 @@
 diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
-index 427fcf69da0b5b15f972b58e3988c7d103bae80d..12cfea27becb565b28ba667f1efb326c2754de68 100644
+index 7eb557d204d9d52faa7bc8b5651a81ffbdd47b34..f237114e8024216cd482e11d7eee7e2d500522d9 100644
 --- a/build/rust/cargo_crate.gni
 +++ b/build/rust/cargo_crate.gni
@@ -153,6 +153,7 @@ template("cargo_crate") {
@@ -1,8 +1,8 @@
 diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
-index 16cf8d04033041608f09aca89610b644c30ab916..8bc041563e4bfd105a34a69aa83e3808f634b4c5 100755
+index ebf7e0b307a942c575d39336a69c84a332082d43..95d02f8ca1550f030bbdf8dd25af3f799cb044d7 100755
 --- a/build/util/android_chrome_version.py
 +++ b/build/util/android_chrome_version.py
-@@ -200,6 +200,7 @@ def _GetAbisToDigitMask(build_number, patch_number):
+@@ -206,6 +206,7 @@ def _GetAbisToDigitMask(build_number, patch_number):
     mapped to version code suffix.
   """
   # Scheme change was made directly to M113 and M114 branches.
@@ -10,7 +10,7 @@ index 16cf8d04033041608f09aca89610b644c30ab916..8bc041563e4bfd105a34a69aa83e3808
   use_new_scheme = (build_number >= 5750
                     or (build_number == 5672 and patch_number >= 176)
                     or (build_number == 5735 and patch_number >= 53))
-@@ -333,7 +334,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
+@@ -339,7 +340,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
 
   build_number = int(version_values['BUILD'])
   patch_number = int(version_values['PATCH'])
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080ae6b9a023 100644
+index f56c41b506f45122f8b86f13dcbed4f02e7dab19..8010216aaf31dfc0f17826d1f2c8d2ba6f07d6ad 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
@@ -169,6 +169,7 @@ if (current_toolchain == default_toolchain) {
@@ -10,7 +10,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
   }
 
   android_resources("chrome_app_java_resources") {
-@@ -237,6 +238,7 @@ if (current_toolchain == default_toolchain) {
+@@ -236,6 +237,7 @@ if (current_toolchain == default_toolchain) {
       "//third_party/androidx:androidx_gridlayout_gridlayout_java",
       "//third_party/androidx:androidx_preference_preference_java",
     ]
@@ -18,7 +18,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
   }
 
   android_library("app_hooks_java") {
-@@ -659,6 +661,7 @@ if (current_toolchain == default_toolchain) {
+@@ -662,6 +664,7 @@ if (current_toolchain == default_toolchain) {
     ]
 
     deps += feed_deps
@@ -26,7 +26,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
 
     srcjar_deps = [
       ":chrome_android_java_enums_srcjar",
-@@ -677,6 +680,7 @@ if (current_toolchain == default_toolchain) {
+@@ -680,6 +683,7 @@ if (current_toolchain == default_toolchain) {
       "//components/supervised_user/core/browser:supervised_user_url_filter_enum_javagen",
       "//net:effective_connection_type_java",
     ]
@@ -34,7 +34,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
 
     # From java_sources.gni.
     sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -812,6 +816,7 @@ if (current_toolchain == default_toolchain) {
+@@ -817,6 +821,7 @@ if (current_toolchain == default_toolchain) {
       "//components/messages/android/internal:java",
       "//components/segmentation_platform/internal:internal_java",
     ]
@@ -42,7 +42,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
   }
 
   action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -2134,6 +2139,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2152,6 +2157,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",
     ]
@@ -50,7 +50,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
 
     # Dep needed to ensure override works properly.
     deps = [ ":chrome_base_module_resources" ]
-@@ -2346,6 +2352,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2364,6 +2370,7 @@ if (current_toolchain == default_toolchain) {
         ":${_variant}_locale_pak_assets",
         ":${_variant}_paks",
       ]
@@ -58,7 +58,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
       if (_is_monochrome) {
         deps += [ "//android_webview:locale_pak_assets" ]
       }
-@@ -2610,6 +2617,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2628,6 +2635,7 @@ if (current_toolchain == default_toolchain) {
       "//components/payments/content/android:service_java",
       "//third_party/androidx:androidx_browser_browser_java",
     ]
@@ -66,7 +66,7 @@ index a988d7f714baca21708931e36b54f3202c6d545e..3702dfc47a885357a4bc31e543e0080a
 
     # More deps for DFMs.
     if (dfmify_dev_ui) {
-@@ -3556,6 +3564,7 @@ generate_jni("chrome_jni_headers") {
+@@ -3630,6 +3638,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 f4d274b24e1120bf7e8a4bab31ec7628f24610df..556e36df338efe0927bfe07b27eb47324e6b59a9 100644
+index ac72edb1e282844cd3cc0ba784d45ba578be8053..1493dd0999ad3f34265c1a95de5aba2b48db91bf 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1211,3 +1211,4 @@ chrome_java_sources = [
+@@ -1223,3 +1223,4 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.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 ba3b2534130b96d44170a36567187688e86acc9a..2c514ce2d64b139476dc310960df94c57638a994 100644
+index 13ab7ec536d429e3444ab640c790b51af183be33..e9dbce7b59158cfd76a62bae84f8f5c4a118fb19 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -314,6 +314,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -309,6 +309,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 ba3b2534130b96d44170a36567187688e86acc9a..2c514ce2d64b139476dc310960df94c5
 
     # Most of these, with the exception of resource_exclusion_exceptions,
     # are currently duplicated in system_webview_apk_tmpl.gni.
-@@ -338,6 +339,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -333,6 +334,7 @@ template("chrome_common_apk_or_module_tmpl") {
 
       proguard_enabled = true
       proguard_configs = [ "//chrome/android/proguard/main.flags" ]
@@ -18,7 +18,7 @@ index ba3b2534130b96d44170a36567187688e86acc9a..2c514ce2d64b139476dc310960df94c5
       if (_is_monochrome) {
         proguard_configs +=
             [ "//android_webview/nonembedded/java/proguard.flags" ]
-@@ -749,6 +751,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -744,6 +746,7 @@ template("chrome_common_apk_or_module_tmpl") {
                                  "version_code",
                                  "version_name",
                                ])
@@ -26,7 +26,7 @@ index ba3b2534130b96d44170a36567187688e86acc9a..2c514ce2d64b139476dc310960df94c5
   }
 }
 
-@@ -777,6 +780,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
+@@ -772,6 +775,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
     if (!defined(is_monochrome)) {
       is_trichrome = true
     }
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
-index 83f7680cdee0a0cf5dab220ed0047866e4699137..076fa1f5865c005038ef018b9c5a952b6a290205 100644
+index 75e5870bd2a12cf4adfce3e103cc8d3508c492d1..cff1d9b79a07e79d767ee4e3a8d5f9e8e6fbe796 100644
 --- a/chrome/android/expectations/lint-suppressions.xml
 +++ b/chrome/android/expectations/lint-suppressions.xml
@@ -268,4 +268,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
-index c73c8adfa810ca56b5854d958df1eab89e95cf9a..15269f48bb9294fd19ef122f4acd868beea42a19 100644
+index 3ac20275302323bef9e31ceaf79617956d12d33d..d56f4393d2c30b23d810fe898cb49758967ada1a 100644
 --- a/chrome/android/features/tab_ui/BUILD.gn
 +++ b/chrome/android/features/tab_ui/BUILD.gn
-@@ -85,6 +85,7 @@ android_resources("java_resources") {
+@@ -88,6 +88,7 @@ android_resources("java_resources") {
     "java/res/values/ids.xml",
     "java/res/values/styles.xml",
   ]
@@ -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 a6013d2f2e272dd03a52338d228820ea80ae41bf..1be145a65be30c266f5d11bfe132f753fa9011c4 100644
+index 8ffb0e6dac424e63f9be8624db732d92561ac969..09747cefee76409a54f15ac54e8b57e9029f481b 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
-@@ -58,7 +58,7 @@ import org.chromium.ui.text.SpanApplier;
+@@ -57,7 +57,7 @@ import org.chromium.ui.text.SpanApplier;
  * Fragment to keep track of the all the privacy related preferences.
  */
 public class PrivacySettings
@@ -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 eca03a3f80dc14464f7047cba46b78e960efa3c4..a956a11f425fe8e79f79ee9f1d1676fd7d8974b5 100644
+index ac18722ce077e3008c6ad599f3974e42d475e46f..39e3cd8cd1b60055d9e196d65b5de7a2ea669014 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
-@@ -50,7 +50,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
+@@ -51,7 +51,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
 import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment;
 import org.chromium.chrome.browser.ui.signin.SignOutDialogCoordinator;
 import org.chromium.chrome.browser.ui.signin.SignOutDialogCoordinator.Listener;
@@ -11,7 +11,7 @@ index eca03a3f80dc14464f7047cba46b78e960efa3c4..a956a11f425fe8e79f79ee9f1d1676fd
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
-@@ -354,7 +354,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
+@@ -358,7 +358,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
                                                      .getIdentityManager(getProfile())
                                                      .getPrimaryAccountInfo(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/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-index c5ebaf667c7793bcadd85a258c2d32e5d9422205..55b405edc99eaccf00bfbece1e81963479230229 100644
+index aba8e61c030bffbad381b93f54ad0f61ad6f269e..1473342cc76d6eb69b76795bc7486dfeca151552 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -702,7 +702,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -694,7 +694,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
             NotificationPermissionController.attach(
                     mWindowAndroid, mNotificationPermissionController);
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 7b5a8e56879b7aab545da6ca847d809020e11e96..49dd37f2d9fa3acf45a1d890b9a565c9d4ebfd5d 100644
+index 807530111d7c4af45ea4f0efcf3a1cea9f2e2256..85a222d88522ec6cebbcc58a723043ebe74006a7 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
@@ -117,6 +117,7 @@ grit("generated_resources") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 31bf3d854d9a672e535f747fb8734d66ac0c37e9..b8ebd1a9ba83304bc4d4053b45bce6457a1579bf 100644
+index 7cb8d3fc03da2017fc5eaa83a9677d51013f4d92..8abd47e1393f93a947120882e824c424dd5484d7 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2624,6 +2624,7 @@ static_library("browser") {
+@@ -2688,6 +2688,7 @@ static_library("browser") {
       "metrics/family_link_user_metrics_provider.h",
     ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 859416382602f3524d24d8a7cf644ed37f830d34..25889b6490678e5ec7e8a15162ef5d4529ca578f 100644
+index 7f96090e9459a045c25d1d64eeb34a0a7c8509a5..03886a79ec2f9a355853b13a84b7e4dfa5fceeb8 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3808,6 +3808,7 @@ const FeatureEntry::FeatureVariation kPasswordGenerationExperimentVariations[] =
+@@ -4034,6 +4034,7 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
 //
 // When adding a new choice, add it to the end of the list.
 const FeatureEntry kFeatureEntries[] = {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
-index db6cf130160312e15dbc0444b3cf27b91fb3eb86..5f81bc3fa743570df55bded7586ec2d308d16641 100644
+index f477e7d102c33c55d29f3c71593283c9cd70f878..0583d55aea5f552f15c6b44a4bbe22fa5dfca6c7 100644
 --- a/chrome/browser/app_controller_mac.mm
 +++ b/chrome/browser/app_controller_mac.mm
@@ -645,7 +645,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn
-index 09361f7e30a09edab1618d563788972ffed92a21..3889826c2d235e9e376af53b811e04d441b61b47 100644
+index cc476ef4af3068ffc328e87b103307903127a558..fb19a9c53cb2c9fab8d35e68cdc547b6ae8a12bb 100644
 --- a/chrome/browser/download/internal/android/BUILD.gn
 +++ b/chrome/browser/download/internal/android/BUILD.gn
-@@ -200,6 +200,7 @@ android_resources("java_resources") {
+@@ -201,6 +201,7 @@ android_resources("java_resources") {
     "java/res/values/ids.xml",
     "java/res/values/styles.xml",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index a58ecf9d565a69134c510d082587535b13c0c003..fbb52b59ee62c0a75a94d3482904e162ad6b2b34 100644
+index 44c425894e08df5b4599d8d629bf0613d8129362..684432968b23897803a3db1f29eb900ab31aa6ad 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1417,6 +1417,7 @@ static_library("extensions") {
+@@ -1420,6 +1420,7 @@ static_library("extensions") {
   } else {
     sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
@@ -1,5 +1,5 @@
 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 74a1d670662ff81389d547a2a5521cd1872d657b..1276ae22389bc0197912cf193f5b255f1320a547 100644
+index fab2a25f61a2c87afcec1cc409d177909d29b263..3bb9af6d47378c49375a99babfebdc0dae0d5401 100644
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -661,6 +661,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index cc2802dfaea85ecc71aa3f387cb1b96364baca93..24768c9b75789167dc6f463e0068aeae7962196b 100644
+index 7a1843341498adc3f7565dff96469518f21386dd..ec469448142e067854190941e0a841d48453d02d 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -939,6 +939,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
+@@ -944,6 +944,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 327cffcf16c58cbd40f413baa55e68c004db642d..c62e0f75320ceb88d7470c20ce63226170fe7b7c 100644
+index 9d848548e774e9cb2f5c537968d8a3c39eeb0348..e81c3a1056c5e14e27401b4d1ec6ae753819b050 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -804,6 +804,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -819,6 +819,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
   }
 
   if (!url.SchemeIs(content::kChromeUIScheme)) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
-index 09b404dd9f397bb9099e497d5cfc23f2bdc52e73..a1d6f1ba62ccf53f80849f98ebb6f5a9c13bf38c 100644
+index 85ce2f93ec74201e7310bef29a17daf22d84496a..d916941733a7eb625c554384132299c044bc617b 100644
 --- a/chrome/browser/first_run/upgrade_util_win.cc
 +++ b/chrome/browser/first_run/upgrade_util_win.cc
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
 #include "components/prefs/pref_service.h"
 #include "ui/base/ui_base_switches.h"
 
@@ -11,7 +11,7 @@ index 09b404dd9f397bb9099e497d5cfc23f2bdc52e73..a1d6f1ba62ccf53f80849f98ebb6f5a9
 #include "chrome/updater/app/server/win/updater_legacy_idl.h"
 #endif
 
-@@ -58,7 +58,7 @@ bool GetNewerChromeFile(base::FilePath* path) {
+@@ -60,7 +60,7 @@ bool GetNewerChromeFile(base::FilePath* path) {
 }
 
 bool InvokeGoogleUpdateForRename() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
-index dc6a77d26c9cc79354d296872607070e4107e756..cee8e40e6380df71c4957771b95b3ed395114b2c 100644
+index df003b051ed5945780f8affc7ee748aa57b9a1f3..d282fae68a58e732a019b85af37c40cd451e43ff 100644
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -33,6 +33,7 @@ android_library("java") {
+@@ -34,6 +34,7 @@ android_library("java") {
     "//third_party/android_deps:guava_android_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/incognito/BUILD.gn b/chrome/browser/incognito/BUILD.gn
-index b6c611172ac34551196ae8b647eb06773340aece..47d105e70e1cc3b32d8f3ce49de215dcb6073539 100644
+index 88c3a379d99774a96d5305d6b3b3e50fbdbf8bea..4c599c070c1f0c8c7865bc164099bb0529120cc4 100644
 --- a/chrome/browser/incognito/BUILD.gn
 +++ b/chrome/browser/incognito/BUILD.gn
-@@ -63,6 +63,7 @@ android_library("java") {
+@@ -64,6 +64,7 @@ android_library("java") {
     "//url:gurl_java",
   ]
 
@@ -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 1d6a86f404da31d1e3767b1176aa45eb09801254..97add6890c98e466d2982c9c250605c40799e800 100644
+index 2d4683b149ed081d216d63727b88465797f36aaf..41c4099b2b52ee4752a5734164e0a1abc5202930 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -525,6 +525,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
+@@ -535,6 +535,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
   std::vector<std::string> excluded_legacy_spkis(
       TranslateStringArray(ct_excluded_legacy_spkis));
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
-index 79914e85fd22de30832348cc07918d56ff15a9d6..5339ee2386c42de33fe71f9e68f04754db7321fd 100644
+index 6668badb2b76f430be1dc6871e08ad5ae51a03a6..dddbfce72c45079d623f8fbe79b00e8ffd21f939 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -346,7 +346,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -362,7 +362,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
     if (!manager_)
       return;
     manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
-index 249433c797fde787e52689f1a9b8dc672a4bcbbe..2f4d62ac0ad3df6ccacecdd8e6ecdf8766411b61 100644
+index 807d5727a4a00268eee6c21e89f2de5755d5518a..fc1e268b96cc1ac3376dd6f4b8023935815abc5b 100644
 --- a/chrome/browser/notifications/BUILD.gn
 +++ b/chrome/browser/notifications/BUILD.gn
-@@ -82,6 +82,7 @@ if (is_android) {
+@@ -83,6 +83,7 @@ if (is_android) {
       "//third_party/androidx:androidx_core_core_java",
       "//ui/android:ui_no_recycler_view_java",
     ]
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc
-index 8997ebf2279caeb46136739a01a79e2ca3ccc6ee..7f61e2a45393355192d74a46ca02e194f60a5fa7 100644
+index dd54367758df3446b994b537622cb19289669296..400ab4b5bbf28144734d37dbd92b9cdc3feea6be 100644
 --- a/chrome/browser/notifications/notification_display_service_impl.cc
 +++ b/chrome/browser/notifications/notification_display_service_impl.cc
@@ -123,6 +123,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/notification_platform_bridge_android.h b/chrome/browser/notifications/notification_platform_bridge_android.h
-index cb095b5536acbc9e60a2598ded68e997720ba40e..059327d257987324229a97b7ef6c98d04220344c 100644
+index 4e6f48bf82ce9f32630a9461f0e519931f981a16..165e41b9ecbd9c3da513adea25af49f28e5b6264 100644
 --- a/chrome/browser/notifications/notification_platform_bridge_android.h
 +++ b/chrome/browser/notifications/notification_platform_bridge_android.h
-@@ -88,6 +88,7 @@ class NotificationPlatformBridgeAndroid : public NotificationPlatformBridge {
+@@ -92,6 +92,7 @@ class NotificationPlatformBridgeAndroid : public NotificationPlatformBridge {
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
  private:
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 965aec4dd16619659d77142b01aa5a457023e622..6aee99e3b51be28a4e06ae09bdd7bb870ee9184f 100644
+index fc8d276b5191adf8bf3d68107d9b98d74a80be82..6837c8993f08b6b358677baa0ccda3b703d7f320 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1574,6 +1574,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1605,6 +1605,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
 #endif
 
@@ -11,7 +11,7 @@ index 965aec4dd16619659d77142b01aa5a457023e622..6aee99e3b51be28a4e06ae09bdd7bb87
 #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
   screen_ai::RegisterLocalStatePrefs(registry);
 #endif  // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
-@@ -1997,6 +1999,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2029,6 +2031,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
 #if BUILDFLAG(ENTERPRISE_DATA_CONTROLS)
   data_controls::RegisterProfilePrefs(registry);
 #endif  // BUILDFLAG(ENTERPRISE_DATA_CONTROLS)
@@ -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 5013dafa7629eaa6c9436428e606a3feae04dc76..e2f89013f56fd124d94bed95e31fc0173abf0aeb 100644
+index 9ed9d3b43c45b9fb3d58eff97403f7d0e1b41edf..d809cf2d9ef2e704a8da2e8a1d89f197a5b4c3ca 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -2178,6 +2178,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -2172,6 +2172,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
   selection_navigation_url_ = match.destination_url;
   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 b74da355c7b6b9ec674aef6f3cb69c24423d58a8..a8ed7750c7786239aca08378e8ae3362da6fc06d 100644
+index 45f2a2a82cb03ef3b4a1a3c535c21999bdc4bc8c..7e13510d6e1591e90d8bbd9d013ea9ef6783304d 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -191,6 +191,7 @@ class RenderViewContextMenu
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/downloads/BUILD.gn b/chrome/browser/resources/downloads/BUILD.gn
-index 4f432ea90cefa3ee5137a27fc01abc3f5862036d..6373f84d4d901a397c82f2d5e96e6c53a149838a 100644
+index 98a256778955797c73cabbcae3b6b23b2c507ea2..40f9520c16e1364639cb97caff725b7fca8a0597 100644
 --- a/chrome/browser/resources/downloads/BUILD.gn
 +++ b/chrome/browser/resources/downloads/BUILD.gn
-@@ -54,4 +54,5 @@ build_webui("build") {
+@@ -53,4 +53,5 @@ build_webui("build") {
     optimize_webui_host = "downloads"
     optimize_webui_in_files = [ "downloads.js" ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/downloads/downloads.ts b/chrome/browser/resources/downloads/downloads.ts
-index 0b05e22165c61dcb57aeeb46f251f697a6514978..2b41f68fdfde55be0b43e9c5c44a1cfa4d030db2 100644
+index 74394a6a9c8272ce160305e13d8920567442ab9f..6255aacb10caf9b7e9595369f7a7659531e65b5b 100644
 --- a/chrome/browser/resources/downloads/downloads.ts
 +++ b/chrome/browser/resources/downloads/downloads.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 807d3076ee961265bd6b80796d2596fd25a35361..d017c312c519a325566b8b2d0ccea2a620e01eff 100644
+index fb27d6f9b685ff137088bfba9333a42a1e3b0d6f..c9a52a6a42dac2fb7275909a26fad5c3f4922146 100644
 --- a/chrome/browser/resources/extensions/item_list.html
 +++ b/chrome/browser/resources/extensions/item_list.html
-@@ -147,5 +147,6 @@
+@@ -146,5 +146,6 @@
         </template>
       </div>
     </div>
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts
-index 4b121dbace39b1215bf80f28f2f91249263f7bc3..31cc2e1be554e34a747e5b4cfb5fc8eb800b9196 100644
+index 62a2a93b9794237c9c318904d45e78b0316d4f0f..d6060f4108134dd6bacaaaaf8ae2015ef5b260cd 100644
 --- a/chrome/browser/resources/extensions/item_list.ts
 +++ b/chrome/browser/resources/extensions/item_list.ts
-@@ -15,6 +15,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu
+@@ -14,6 +14,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu
 
 import {ExtensionsItemElement, ItemDelegate} from './item.js';
 import {getTemplate} from './item_list.html.js';
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/password_manager/BUILD.gn b/chrome/browser/resources/password_manager/BUILD.gn
-index 6c4b33d9b7db616970af5a7fdd786aa3f9cb76cc..f909ecc6b36716704ad7b8939791646e82fb2a71 100644
+index 3bc967e43033aba16f38087327d117b98452363f..048dff5007b4647cad28de95cd9155f7061b4616 100644
 --- a/chrome/browser/resources/password_manager/BUILD.gn
 +++ b/chrome/browser/resources/password_manager/BUILD.gn
-@@ -136,4 +136,5 @@ build_webui("build") {
+@@ -140,4 +140,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 00636b8e4f0aabe012d5c4cd4d18c55b7962334c..125db9abd26c25489bf0f932d58237ca46ae96ef 100644
+index 7f500bb17a599eba994e9d8f76c1bf54afca3427..01d394423d3a96214dc8b02857a92bcf07b9bd1c 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 6b484992fb3ffdaf5128aa8a29fbf6a408513308..975eac76efad9b21bb6286ebee707b62361aea3f 100644
+index 4c0a4de77f4b7e0a7477911b8a09e6976ca38abf..770dfe1cc64ac3b818a4990ffb36c32a2b6b20b0 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -443,4 +443,5 @@ build_webui("build") {
+@@ -444,4 +444,5 @@ build_webui("build") {
               "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
               root_build_dir) ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 9072306bbf4fdba5a0a0aa37b4ccebee0c1ff33e..f028873838d4ba5010c35306b49bd4af11fed902 100644
+index 3fa3fca9d9270fa79870d0eaffff5f44df1eedae..aaa97536fd90c545ddc1a1fd025fa248f6de3a07 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -34,6 +34,7 @@
+@@ -36,6 +36,7 @@
     <settings-animated-pages id="pages" section="privacy"
         focus-config="[[focusConfig_]]">
       <div route-path="default">
@@ -10,7 +10,7 @@ index 9072306bbf4fdba5a0a0aa37b4ccebee0c1ff33e..f028873838d4ba5010c35306b49bd4af
         <cr-link-row id="clearBrowsingData"
             start-icon="cr:delete"
             label="$i18n{clearBrowsingData}"
-@@ -244,6 +245,7 @@
+@@ -259,6 +260,7 @@
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -18,7 +18,7 @@ index 9072306bbf4fdba5a0a0aa37b4ccebee0c1ff33e..f028873838d4ba5010c35306b49bd4af
       <template is="dom-if" route-path="/content/backgroundSync" no-search>
         <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
             search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -271,6 +273,7 @@
+@@ -286,6 +288,7 @@
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index f063fa13689e802d0dfc642dbc601b0d74cc11c3..116326c6e4304cadac3bd027a76e0d600ca4300f 100644
+index 3c73c734435a0d2f800411e0c7e1fe47ee85e7f0..02b6491ea10b44669ca5cc8a6ee79cd62bda9260 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -18,6 +18,7 @@ import '../settings_page/settings_animated_pages.js';
+@@ -20,6 +20,7 @@ import '../settings_page/settings_animated_pages.js';
 import '../settings_page/settings_subpage.js';
 import '../settings_shared.css.js';
 import '../site_settings/settings_category_default_radio_group.js';
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index 82631548e92c7b11cb0c1bfb673a809b11f3de00..06bb35a2710b0b070a3f910acc882ec231fbcaeb 100644
+index 26619e82e4a4d3162958184baba262c823243b3e..0057c9f5b540dbd59df0d34c01c84c7379083196 100644
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
@@ -8,6 +8,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
@@ -10,7 +10,7 @@ index 82631548e92c7b11cb0c1bfb673a809b11f3de00..06bb35a2710b0b070a3f910acc882ec2
 /**
  * Add all of the child routes that originate from the privacy route,
  * regardless of whether the privacy section under basic or advanced.
-@@ -283,6 +284,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
+@@ -287,6 +288,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
     }
     // </if>
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
-index d8783de1b83335f8dd295e1f53d3c4752a531a5c..ecb90e239e9727a2c0c3ca8585c4ebfe0ea2ea03 100644
+index 62243ae56beb6bf8218c3e5b3a0c5912d0c1de8e..a7da589dd6ad9b4f82dda1e1fe956cf5b00888e3 100644
 --- a/chrome/browser/resources/settings/settings.ts
 +++ b/chrome/browser/resources/settings/settings.ts
@@ -2,6 +2,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
-index 81acd993d10b96b5edb57d566197967696973d4f..c923b663a75bcd505a9d56e4b0bd3a5cfe283a2f 100644
+index 83cac6858b32189269e0ed8198d4f84d882569e6..cb03bc31f592d1ebf28e3489ec670e5a3a9b4744 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.ts
 +++ b/chrome/browser/resources/settings/site_settings/constants.ts
-@@ -54,6 +54,7 @@ export enum ContentSettingsTypes {
+@@ -55,6 +55,7 @@ export enum ContentSettingsTypes {
   // are used everywhere where ContentSettingsTypes is used in JS.
   PDF_DOCUMENTS = 'pdfDocuments',
   SITE_DATA = 'site-data',
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-index 30a5a05854db15351c292ec28ba8ea422efed16f..16c3add479c09abd7f47ef6de0e0879a00097e47 100644
+index c122da8251dbd8cd8bc2191c0b58fbfae411b6ae..9be2d72371e6729e21aec6e0d2566cbd327bba82 100644
 --- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
 +++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-@@ -159,6 +159,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends
+@@ -160,6 +160,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends
       case ContentSettingsTypes.WINDOW_MANAGEMENT:
         // "Ask" vs "Blocked".
         return ContentSetting.ASK;
@@ -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 6b3fcd5a1d53b56ad69aecddf96108d3c26782ee..eded10a7e6959b5ad4219601ea0a70e115fbe262 100644
+index 0d9387d95a99f82d61ac61b63413a46b30792740..959b2efd0a64e74e5b3e506f3b64cbf093aaa789 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
@@ -8,6 +8,7 @@
@@ -1,5 +1,5 @@
 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 2e13c777517eae71cbf8da2b4e0d0f4ac3e066bf..f9d60fb20e02f9d224e09ee85461fcc1543e6320 100644
+index 7f39d9ea5516a06a42336028d61933328c6f3191..5cdd364a038fdb332c9d8a4d5c2aa1a4df476d2c 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 {
@@ -11,7 +11,7 @@ index 2e13c777517eae71cbf8da2b4e0d0f4ac3e066bf..f9d60fb20e02f9d224e09ee85461fcc1
   getMetricsReporting(): Promise<MetricsReporting>;
   setMetricsReportingEnabled(enabled: boolean): void;
 
-@@ -92,7 +92,7 @@ export interface PrivacyPageBrowserProxy {
+@@ -83,7 +83,7 @@ export interface PrivacyPageBrowserProxy {
 }
 
 export class PrivacyPageBrowserProxyImpl implements PrivacyPageBrowserProxy {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
-index 55a1def4837a4ebdbc9eb9b243e1ea4d63257a0c..332b32aa1f01e4e2463e07142742be6e20ed942b 100644
+index 9b19b901a2f971890869713b8f7e9b756a05e7f2..4a0efe0cebbd938d9378c6e7fa89d923b52d4add 100644
 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
 +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
-@@ -101,6 +101,7 @@ export class ProfilePickerMainViewElement extends
+@@ -104,6 +104,7 @@ export class ProfilePickerMainViewElement extends
     if (!isProfileCreationAllowed()) {
       this.$.addProfile.style.display = 'none';
     }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
-index 032e9d2cf753b14512ad6683546b28e63b90a3b9..3ea42b413f26b55dc1e9852d06352850696e7de2 100644
+index 772a7785015de1e6506b811af6e0d944754a0853..e5f438b918bf5fe42d059673fbb9377ee3368fca 100644
 --- a/chrome/browser/shell_integration_linux.cc
 +++ b/chrome/browser/shell_integration_linux.cc
@@ -504,7 +504,7 @@ std::string GetIconName() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
-index a8f5898effb1294a62ffc75adab5b189395401b3..cacfacd7bd318e9208b69e34733fc6ccbd433f0f 100644
+index f52ccec7f6846ee82388e943f0b3ca9e2bc4dc57..835187559b7f43809fa86fa1379db06bbad4d99b 100644
 --- a/chrome/browser/sync/sync_service_factory.cc
 +++ b/chrome/browser/sync/sync_service_factory.cc
-@@ -172,7 +172,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -162,7 +162,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
   }
 
   auto sync_service =
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 9da0c57372d3de3d47cc745602eb6f11a394ce5e..d4578bc33983b55af222e90f890c4401af26b6de 100644
+index d5bc836ec888d3bb1f8e5e6f9f03511337ff9cf2..0e88fb860df4e80673fb07c6dbdf72b0e3f55a2c 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -698,6 +698,7 @@ static_library("ui") {
+@@ -691,6 +691,7 @@ static_library("ui") {
     "//chrome/browser/profiling_host",
     "//chrome/browser/ui/webui:configs",
   ]
@@ -10,7 +10,7 @@ index 9da0c57372d3de3d47cc745602eb6f11a394ce5e..d4578bc33983b55af222e90f890c4401
 
   if (enable_vr && is_win) {
     deps += [ "//chrome/browser/vr:vr_base" ]
-@@ -4346,10 +4347,13 @@ static_library("ui") {
+@@ -4418,10 +4419,13 @@ static_library("ui") {
       ]
       deps += [ "//chrome/updater/app/server/win:updater_legacy_idl_idl" ]
     } else {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
-index 1562440ac47d0b6834a5ecac0c8988ae136767e7..08bba4685ffa3547e56edeebba135dfd19efeb0b 100644
+index c0f14b858e704981a9a27d553eda638cfaafc3b7..33a6eebd54bc1d304bbb1ecb37afd2c188b9401a 100644
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -116,6 +116,7 @@ android_library("java") {
+@@ -117,6 +117,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
     "java/src/org/chromium/chrome/browser/toolbar/top/VisibleUrlText.java",
   ]
@@ -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 6127d7e53cf5d36c7421a0535ccd9604f0d8be90..eadb81f1d0e1a8f939c5da7e142d8d62c4773d5b 100644
+index bd66b0b7f107940754944cf900393e223be5d013..dd809c0423cccf3c38bd5479e8ceab2cfbdc4707 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 fdde4f4b600b90ba793c24018c19dc508e2d8009..dcf11139d267536a58498e98de79921ba53c0608 100644
+index 0dbe4aa666dbfd1b261891dec76cf763342f4cc1..e6eb72f3636914e2ad21ae515edbc9049d75735e 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
-@@ -405,6 +405,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -422,6 +422,7 @@ public class ToolbarPhone extends ToolbarLayout
         if (mOptionalButtonCoordinator != null) {
             mOptionalButtonCoordinator.setBackgroundColorFilter(color);
         }
@@ -10,7 +10,7 @@ index fdde4f4b600b90ba793c24018c19dc508e2d8009..dcf11139d267536a58498e98de79921b
     }
 
     private void updateModernLocationBarCorners() {
-@@ -574,6 +575,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -591,6 +592,7 @@ public class ToolbarPhone extends ToolbarLayout
                         EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
             }
         }
@@ -18,7 +18,7 @@ index fdde4f4b600b90ba793c24018c19dc508e2d8009..dcf11139d267536a58498e98de79921b
     }
 
     @Override
-@@ -1025,6 +1027,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -1049,6 +1051,7 @@ public class ToolbarPhone extends ToolbarLayout
      * New Tab Page.
      */
     private void updateLocationBarLayoutForExpansionAnimation() {
@@ -26,7 +26,7 @@ index fdde4f4b600b90ba793c24018c19dc508e2d8009..dcf11139d267536a58498e98de79921b
         TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
         if (isInTabSwitcherMode()) return;
 
-@@ -1366,6 +1369,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -1392,6 +1395,7 @@ public class ToolbarPhone extends ToolbarLayout
             canvas.restore();
         }
 
@@ -34,7 +34,7 @@ index fdde4f4b600b90ba793c24018c19dc508e2d8009..dcf11139d267536a58498e98de79921b
         // Draw the tab stack button and associated text if necessary.
         if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null
                 && mUrlExpansionFraction != 1f) {
-@@ -2158,6 +2162,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -2188,6 +2192,7 @@ public class ToolbarPhone extends ToolbarLayout
         } else {
             populateUrlClearExpansionAnimatorSet(animators);
         }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-index cfe3a5761e43a064c9639aec18f482b66c35fc62..c77016ae84627f3aa7b4e41119694cebf4565e70 100644
+index ba4e8490ca42b169c109a7fa6b431dbb109712db..2aac12a835cae12a102a6b80fc1e6f6c76f4227c 100644
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-@@ -396,10 +396,12 @@ public class ToolbarTablet
+@@ -397,10 +397,12 @@ public class ToolbarTablet
             mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab());
             RecordUserAction.record("MobileToolbarDownloadPage");
         }
@@ -15,7 +15,7 @@ index cfe3a5761e43a064c9639aec18f482b66c35fc62..c77016ae84627f3aa7b4e41119694ceb
         String description = null;
         Context context = getContext();
         Resources resources = context.getResources();
-@@ -505,6 +507,7 @@ public class ToolbarTablet
+@@ -506,6 +508,7 @@ public class ToolbarTablet
         mLocationBar.getTabletCoordinator().tintBackground(textBoxColor);
         mLocationBar.updateVisualsForState();
         setToolbarHairlineColor(color);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index fdb96dee050670757ed4ce247bc0a12b01005d04..b123fb2ded7a23480ad3e7c1d2a946cf34391b62 100644
+index 9ba202563436566aa63897b9e702e131b4353664..f1e2d108a6983e084c677d00817abe7e5c2a0731 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -448,6 +448,7 @@ Browser* Browser::Create(const CreateParams& params) {
+@@ -452,6 +452,7 @@ Browser* Browser::Create(const CreateParams& params) {
   // not possible, e.g. using the wrong profile or during shutdown. The caller
   // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
   CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
@@ -10,7 +10,7 @@ index fdb96dee050670757ed4ce247bc0a12b01005d04..b123fb2ded7a23480ad3e7c1d2a946cf
   return new Browser(params);
 }
 
-@@ -458,7 +459,7 @@ Browser::Browser(const CreateParams& params)
+@@ -462,7 +463,7 @@ Browser::Browser(const CreateParams& params)
       window_(nullptr),
       tab_strip_model_delegate_(
           std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 3b7f96e505e0ba32837b83be5473562e3e120452..b4433a1fd9b008741a0ef9d6e9d75405d93a0287 100644
+index e76824b5ba371d251882050677131cf04f1c41e6..f9d32865543f2a8407a4a790034691ff7e20d099 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
-@@ -585,6 +585,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
+@@ -587,6 +587,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
     // Block any navigation requests in locked fullscreen mode.
     return nullptr;
   }
@@ -10,7 +10,7 @@ index 3b7f96e505e0ba32837b83be5473562e3e120452..b4433a1fd9b008741a0ef9d6e9d75405
 
   // Open System Apps in their standalone window if necessary.
   // TODO(crbug.com/1096345): Remove this code after we integrate with intent
-@@ -922,6 +923,7 @@ bool IsHostAllowedInIncognito(const GURL& url) {
+@@ -933,6 +934,7 @@ bool IsHostAllowedInIncognito(const GURL& url) {
   base::StringPiece host = url.host_piece();
   if (scheme != content::kChromeUIScheme)
     return true;
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 1d312986c62def1b09ca502e02d755b56c6cdcb0..8e9b4707b730fb1f1bd060bb109bfba2b59488c5 100644
+index 83d3c4331fcdab2bdf62530423aa7517aef9aafb..b0658d21dd7f08a21460c485338a8f19e9b850a6 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -83,7 +83,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index 69bf9d2f105c6f4d0ad8d2be2ac60b3640fb53b9..fe5dd5f83ce2be38eafaa26e176122c56cee9acc 100644
+index 1995981bb0c9b2a7de30cf38300b2d79db347762..dc62f2380485a9fe7195a47d5f6c0539f6e565c8 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -356,7 +356,7 @@ void ShowSlow(Browser* browser) {
+@@ -357,7 +357,7 @@ void ShowSlow(Browser* browser) {
 #endif
 }
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
-index bcf4697bb530e67efc0482c01d5c0c5c0a3ce1f7..a531b87b66842de087bbfa6e8613ca4a27f7f9c5 100644
+index 24efb3e8abbbc0fd8ecd2b7a6088d362afb3d40b..01078b4ef0e870fb629fadc97b4dfd17e2631b02 100644
 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm
 +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
@@ -109,6 +109,7 @@ NSMenuItem* BuildFileMenu(NSApplication* nsapp,
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-index 448eb26ee4fffcbba6b2cc6ebe91c4d4e1cc5707..87f5ec73c863f53c787388767178f49d554ebeb6 100644
+index 00fde67c1f83e10cca9dabec89871d50122b5a91..2eca2fd7c8807916664fdfc303371552b578eea6 100644
 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
 +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -35,6 +35,8 @@ namespace {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
-index 2a4de33fb97a91c8835ff9e171946dedbcb96c4a..b1def6b8dc9f48cac528bb0893e609ccbb1fbc6c 100644
+index ffa5e3e9b8fb003133e842eb4ecec47281bb795c..330a2ef72546d5dc2ee191a8df47d08fb1905f00 100644
 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
 +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
-@@ -190,6 +190,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
+@@ -191,6 +191,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
   gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
   if (rep.scale() != canvas->image_scale()) {
     skia.AddRepresentation(
@@ -10,7 +10,7 @@ index 2a4de33fb97a91c8835ff9e171946dedbcb96c4a..b1def6b8dc9f48cac528bb0893e609cc
         ScaleImageSkiaRep(rep, extensions::ExtensionAction::ActionIconSize(),
                           canvas->image_scale()));
   }
-@@ -200,6 +201,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
+@@ -201,6 +202,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
       (size().width() - extensions::ExtensionAction::ActionIconSize()) / 2.0);
   int y_offset = std::floor(
       (size().height() - extensions::ExtensionAction::ActionIconSize()) / 2.0);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index d9f7c6749b8b6a8e33745ead0d0d3650ea6d32eb..433fd078ab8d21349ec5ab58ad68917013a8d660 100644
+index 48fec16cdae0db5d125f8f06f853ed77db1d7f92..b365c9624b6487c3d85f5500ae8964668bf62b5b 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -734,4 +734,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -753,4 +753,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/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
-index a584cad57ba3264f944b180072613d61cc201207..455a4f573d9198ef1b38721f67217dafb58187ae 100644
+index 2158fa70a8c878124361420cf4b66994724bd5fd..6704b8671a64f9bcd001c8e1dd3f1cbc14b2fda1 100644
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -582,6 +582,7 @@ class TabStripModel : public TabGroupController {
+@@ -580,6 +580,7 @@ class TabStripModel : public TabGroupController {
   // Serialise this object into a trace.
   void WriteIntoTrace(perfetto::TracedValue context) 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 9f7e3947cb4dba0100366e1f333590300a5a8c91..c46c79caae33dbd2e91078265395cec3f2538e70 100644
+index a9f542230542bc65e2108d0e346c9cc8a6c6c199..fe197f36fa328336ff0f174dc4af6320169759b6 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-@@ -1157,6 +1157,7 @@ void BookmarkBarView::Layout() {
+@@ -1159,6 +1159,7 @@ void BookmarkBarView::Layout() {
       x = next_x;
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-index 673f2ed2d0a46b02049864d9da34242dd9c2a264..c91d3ad943f83c7c6b8afc31c8eca9c2e73bdbdc 100644
+index b374f3a4f307689006955ed8bdeb4f1a31eb66be..f1c95389a519adaddaa7956bd45e654618a070e3 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-@@ -533,6 +533,7 @@ void BookmarkBubbleView::ShowBubble(
+@@ -534,6 +534,7 @@ void BookmarkBubbleView::ShowBubble(
   auto bubble = std::make_unique<views::BubbleDialogModelHost>(
       std::move(dialog_model), anchor_view, views::BubbleBorder::TOP_RIGHT);
   bookmark_bubble_ = bubble.get();
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index d5c32354b060badf92e1504b3e46980dca6eb740..5fe1cf31ca64b29703a30f72485bc33a7669629c 100644
+index 020073134f1ab091bb4fb54391df6804faf68841..39c17d5a7761c5ec5c4c29fa4d38ed5641004a2c 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -754,6 +754,7 @@ void LocationBarView::Layout() {
+@@ -756,6 +756,7 @@ void LocationBarView::Layout() {
     }
   };
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
-index 0e3f3edeff9f3b9132e15dd4a55d9df60a4a0756..eb2b466415a68a98151367b46f1611a88c651827 100644
+index 6b968634a1e79cee24d6f8848afc9fd34f0dbc46..740b07b91e150e340186c1850d66e7afd46286e8 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -109,6 +109,7 @@ class LocationBarView : public LocationBar,
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
-index c8ca3a7e265f5dc63fddfa2c1fabb6e79f076689..8b62151e7e822d6e934d1a14d3761643bf7a6c2b 100644
+index d39ffdf2f679d32a0e15a54dd077535e849200f5..ae04470c6f8dcc7275bf5bf9f6ef8b61dca3328d 100644
 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -171,6 +171,7 @@ bool LocationIconView::GetShowText() const {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index 9e5e40c912c00b70d921d422ce141cd9d4a5bcd3..1211fb980fc28cc3fa8a6805846288edb27b3fbd 100644
+index 50c222d235461ecce1f3ccc8941293de41cc134c..d4abba637aaab916403a20f9101f1d0f5aa8fec8 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-@@ -666,6 +666,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) {
+@@ -668,6 +668,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) {
 
   max_size_ = new_max_size;
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
-index 57aa072f005a47373e6e379142d7aba7207d951e..802e419b20e57e23cf9346c3c2de3dec84981f67 100644
+index 63c61e4eabc1f36ada46fdd5b7415fbd024c0942..38d4440da0691acefb7c74174cccb15aee28e395 100644
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
-@@ -409,6 +409,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
+@@ -415,6 +415,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
 
   const gfx::VectorIcon* icon = &gfx::kNoneIcon;
   switch (info.type) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
-index c2b922df0590d17fd84e2b6c95208fd566da1aef..f8423480cfcaf7cf298be42abf38aa3c851c24c7 100644
+index 44456785156b0fa20bfd25294ce2b04de9a35839..f403ab6d7cc699588b36fe76839891b2937f0052 100644
 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
-@@ -197,6 +197,7 @@ PermissionPromptBubbleBaseView::PermissionPromptBubbleBaseView(
+@@ -158,6 +158,7 @@ PermissionPromptBubbleBaseView::PermissionPromptBubbleBaseView(
   }
 
   SetProperty(views::kElementIdentifierKey, kMainViewId);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
-index 4908042cef26dae68dd45a61c6c640e753ed269e..f3957372bb667c9e252d66b4e39fcf295b7c8506 100644
+index 46f9031f7592249a380a16857a1be000f39d693f..058996be785c904082d7c0db6f49dc8c07ee8b02 100644
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
-@@ -414,6 +414,7 @@ void Tab::Layout() {
+@@ -418,6 +418,7 @@ void Tab::Layout() {
     int title_right = contents_rect.right();
     if (showing_alert_indicator_) {
       title_right = alert_indicator_button_->x() - after_title_padding;
@@ -10,7 +10,7 @@ index 4908042cef26dae68dd45a61c6c640e753ed269e..f3957372bb667c9e252d66b4e39fcf29
     } else if (showing_close_button_) {
       // Allow the title to overlay the close button's empty border padding.
       title_right = close_x - after_title_padding;
-@@ -1033,6 +1034,7 @@ void Tab::UpdateIconVisibility() {
+@@ -1058,6 +1059,7 @@ void Tab::UpdateIconVisibility() {
       available_width -= favicon_width;
 
     showing_close_button_ = large_enough_for_close_button;
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-index 2ea09fd7e8cc03d17942e843b25f027f4caea3af..c2f16e2273931e7140c30b3d3c1fb68916236229 100644
+index 26de912e300e9b8e53c6d87b74a023f15777630a..5e0c57513bddf1fbc152c1556f6268fad8f410f0 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -445,6 +445,7 @@ void ToolbarView::Init() {
+@@ -455,6 +455,7 @@ void ToolbarView::Init() {
         container_view_->AddChildView(std::move(side_panel_button));
   }
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn
-index c450791517869cd1475cb3732195f72698b4eb99..8ca92d5777988202468d3e68975eed305883724e 100644
+index 3d6f82f1dfd5a521fa8cc8f2f2b51c130e2f7596..e7342ab7fe5d10d57062991c017956b548a47daa 100644
 --- a/chrome/browser/ui/webui/BUILD.gn
 +++ b/chrome/browser/ui/webui/BUILD.gn
-@@ -75,4 +75,5 @@ source_set("configs") {
+@@ -76,4 +76,5 @@ source_set("configs") {
       deps += [ "//ash/webui/sample_system_web_app_ui" ]
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index 182cb8d7e8486f401dfad3d672839f45de0698ee..22a9c42cf54587673821a45302897d6d629ffad1 100644
+index a7105e8a9406bd4523de3379c71ada75ce9f9a10..1f67da8618e1815df2de49461fc4d7b211435c9c 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -981,6 +981,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -986,6 +986,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
-index e56ad5469d6cded25cf3b37466973d6162cb4a50..8a49018ce3218ca3aba1a4abb5595fc9874c6512 100644
+index 9a8570ff1a770346a11e5f7781340bbbe2a3168b..6027d94f4715735f38235013c54ee34eb93418c2 100644
 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -60,6 +60,7 @@ namespace {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-index 3f6e547e8abf35eec5476a06f91dddfc5ec8eafc..85e1a8ed5a65f211031ee9d94c8c1154e942af6a 100644
+index dff2c49b830a5feb7f35ba1db89f70f83877b84e..5547ce8e403d6dc1ddb012f7b65260ee7633c12e 100644
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -441,6 +441,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -442,6 +442,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
   source->AddBoolean("safetyHubShowReviewPanel",
                      base::FeatureList::IsEnabled(features::kSafetyHub));
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
-index a134e692f136fd468a9650b0ca08f9ce0ec658b2..1904f0358a403683dca8f30a3c73f6a9570df6f7 100644
+index 0ae5523054ab22de65d2f4dfdd156f8bb66062d3..73469fee4cef04d337871a571eb5824604200001 100644
 --- a/chrome/browser/ui/webui/settings/people_handler.cc
 +++ b/chrome/browser/ui/webui/settings/people_handler.cc
-@@ -875,6 +875,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
+@@ -873,6 +873,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
 
 void PeopleHandler::BeforeUnloadDialogCancelled() {
   // The before unload dialog is only shown during the first sync setup.
@@ -10,7 +10,7 @@ index a134e692f136fd468a9650b0ca08f9ce0ec658b2..1904f0358a403683dca8f30a3c73f6a9
   DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
       signin::ConsentLevel::kSync));
   syncer::SyncService* service = GetSyncService();
-@@ -924,6 +925,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
+@@ -922,6 +923,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
       service && !disallowed_by_policy && service->IsSetupInProgress() &&
           !service->GetUserSettings()->IsInitialSyncFeatureSetupComplete() &&
           identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 899ae48f57d2c1bc83aba77d70802f8c4a577c87..0fe36a25eaa6125c6c5bb3b8060140b99bad4057 100644
+index 5bd3bf17d56b99f651d1161e198c26e38a134254..27c2b316c15b85103499a3b4de2972ce28edbaeb 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -3533,6 +3533,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3630,6 +3630,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
   policy_indicator::AddLocalizedStrings(html_source);
   AddSecurityKeysStrings(html_source);
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-index f22bc4eefa4ffe5378d24ea1cbda57a91778a415..7c0a243ff395d69abe9b68c5c78e3eafc46944f3 100644
+index 8a6ff5638ca7d54625be88d22d50c67fe99004ee..a43376a957bd8aa378c801e4cbfcc921b69bbc01 100644
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -202,6 +202,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
-index 493161c29afc97feeb3f369fd65dd442024cd2f4..429f4ef2852a6712903a0561f5d21b9dd313bc6a 100644
+index 56e1198b3bd07badc97e3e494b9aa1e310f62e9b..0f190efec644237458139f118e2d7b1d2dc4d105 100644
 --- a/chrome/common/extensions/chrome_extensions_client.cc
 +++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -13,6 +13,7 @@
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
-index eec8f3b69d89ac3f302e447951c9d9f2a492e030..02982455db04926f910658475f1ea12df2f122ad 100644
+index a743a4e9b1fea69a64239e59d7718ee84edad386..5cc718b11ff174e12eeda0ab3420659bff4b9dff 100644
 --- a/chrome/installer/util/BUILD.gn
 +++ b/chrome/installer/util/BUILD.gn
@@ -205,6 +205,7 @@ static_library("with_no_strings") {
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
-index e43cc9fc2e804fae22aab1c25e59249016af8469..8e8f76b1caffce3759581b70f94d041abbe826d5 100644
+index 1f0d49fcfc2461bec787d70f589df05cb7b7a9d8..4c1f1df2484ffcab35607d17829ea7fbcc138e3b 100644
 --- a/chrome/installer/util/google_update_settings.cc
 +++ b/chrome/installer/util/google_update_settings.cc
@@ -32,7 +32,11 @@ using base::win::RegKey;
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
-index 595d30a92a0994015b1f9b3d7d425f96677f4a0c..e6b5eb9770ab4dabfb366ac03a62fe1de2a73d2b 100644
+index 7f20d494956cd5be760465356edd0ffea96f59d3..f0e8118ea51a744fd448927408bca27b3b2b3ae8 100644
 --- a/chrome/installer/util/shell_util.cc
 +++ b/chrome/installer/util/shell_util.cc
-@@ -370,6 +370,7 @@ void GetChromeProgIdEntries(
+@@ -363,6 +363,7 @@ void GetChromeProgIdEntries(
   app_info.delegate_clsid = install_static::GetLegacyCommandExecuteImplClsid();
 
   GetProgIdEntries(app_info, entries);
@@ -10,7 +10,7 @@ index 595d30a92a0994015b1f9b3d7d425f96677f4a0c..e6b5eb9770ab4dabfb366ac03a62fe1d
 
   if (!app_info.delegate_clsid.empty()) {
     auto delegate_execute_entries =
-@@ -465,6 +466,7 @@ void GetShellIntegrationEntries(
+@@ -458,6 +459,7 @@ void GetShellIntegrationEntries(
 
   const std::wstring html_prog_id(GetBrowserProgId(suffix));
   for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != nullptr; i++) {
@@ -18,7 +18,7 @@ index 595d30a92a0994015b1f9b3d7d425f96677f4a0c..e6b5eb9770ab4dabfb366ac03a62fe1d
     entries->push_back(std::make_unique<RegistryEntry>(
         capabilities + L"\\FileAssociations",
         ShellUtil::kPotentialFileAssociations[i], html_prog_id));
-@@ -489,6 +491,7 @@ void GetAppExtRegistrationEntries(
+@@ -482,6 +484,7 @@ void GetAppExtRegistrationEntries(
   std::wstring key_name =
       base::StrCat({ShellUtil::kRegClasses, kFilePathSeparator, ext,
                     kFilePathSeparator, ShellUtil::kRegOpenWithProgids});
@@ -26,7 +26,7 @@ index 595d30a92a0994015b1f9b3d7d425f96677f4a0c..e6b5eb9770ab4dabfb366ac03a62fe1d
   entries->push_back(
       std::make_unique<RegistryEntry>(key_name, prog_id, std::wstring()));
 }
-@@ -1742,8 +1745,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
+@@ -1523,8 +1526,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
     L".htm", L".html",  L".pdf",  L".shtml", L".svg",
     L".xht", L".xhtml", L".webp", nullptr};
 const wchar_t* ShellUtil::kBrowserProtocolAssociations[] = {L"http", L"https",
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index 01c93bf7e64afc49c38a5a13c6f558efe1e3e5d9..1624b54d91ff51bbc6515ee7129f8bbeedcab48c 100644
+index 18b342e66f11a3c40a2243f424cc2ff7e825aad3..072074be162a9ca28888ab9093030a744d4c20a6 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -233,6 +233,7 @@ static_library("renderer") {
+@@ -234,6 +234,7 @@ static_library("renderer") {
     "//v8",
   ]
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index c573a3908fd43f678af1ca5142c5f4258ff426bf..1aac3e7b57b4d213dc1d7ff21392b55671acba86 100644
+index 8ef09f60649bb8b593f644952c652506dcc431f1..bebee50eb167568a0ec9493eb795b9fbbe18e11a 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -588,7 +588,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index a315f817a8977d36e52b8f7c81d9e6778d3dcca2..b524546144a3d9f1a2542e0b5b8c619f965ac082 100644
+index 317aa37c811c4b461cd8a4b8e321a820622df4c3..2aa803bce91f03c9f82beed15aaabfbba3f8fead 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -433,6 +433,7 @@ static_library("test_support") {
+@@ -447,6 +447,7 @@ static_library("test_support") {
     "//ui/gl",
   ]
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn
-index 3c6f511fc32a16e475334e7cba8077ec10ab1b40..0612bcd9be59910e8175ed34cbed785775e92780 100644
+index edbc87e12027daea89358b315036770f0a5a6c2f..bfe5f4e94089fb7a09c34b3b74f848126047f34c 100644
 --- a/chrome/test/data/webui/settings/BUILD.gn
 +++ b/chrome/test/data/webui/settings/BUILD.gn
-@@ -225,6 +225,7 @@ build_webui_tests("build") {
+@@ -224,6 +224,7 @@ build_webui_tests("build") {
     ts_definitions +=
         [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/tools/build/mac/BUILD.gn b/chrome/tools/build/mac/BUILD.gn
-index 5f663d27fc5bdc2d54d9b5ec79fec0810ef5349f..172b719e5f34fad84b5c76e629e1dea0b6b66c84 100644
+index 94007792858a92b49b6ef76e21f2f48b72636033..278bb8cbae362bc0970843bb6cd906374b829043 100644
 --- a/chrome/tools/build/mac/BUILD.gn
 +++ b/chrome/tools/build/mac/BUILD.gn
@@ -17,6 +17,7 @@ if (current_toolchain != default_toolchain) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/tools/build/mac/infoplist_strings_util.cc b/chrome/tools/build/mac/infoplist_strings_util.cc
-index 57c5b13e8aefe45122ac9d4e47e2f2bdf0bac709..c1f6f661b0ab6b6d773aad96c3d453ef617e015d 100644
+index 1b5d070769ae24538f2e9427b7eda96d78952e2b..ef1ba86f73fe51081814040b6ea7ad4457ba18ff 100644
 --- a/chrome/tools/build/mac/infoplist_strings_util.cc
 +++ b/chrome/tools/build/mac/infoplist_strings_util.cc
@@ -153,6 +153,7 @@ int main(int argc, char* const argv[]) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
-index bf29364c22715208cf40701e3ec7102d7d120cde..e0521460a6c6fba865c3d443f9b183e3d323747f 100644
+index 69dedb71cc24e08c66580189393790254dd0c879..052a638ff359f759e0fc963f2af740b00f0d0a7b 100644
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
@@ -72,6 +72,8 @@ static_library("utility") {
--- a/Show More
+++ b/Show More