Update patches from Chromium 146.0.7680.164 to Chromium 147.0.7727.25.

2026-03-26 19:55:51 -04:00
parent 55eaa8621b
commit a048add6d3
300 changed files with 630 additions and 628 deletions
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a001e4d38b9 100644
+index c9811ba7835ed8f96dbde412543e86dc3b5ab13b..7b526c35d13c4d619342ead7cbaa4c0fe62a7c26 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4818,6 +4818,7 @@ if (is_android) {
+@@ -4836,6 +4836,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/UserDataHost.java",
       "android/java/src/org/chromium/base/ValueChangedCallback.java",
     ]
@@ -10,7 +10,7 @@ index d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a00
 
     resources_package = "org.chromium.base"
 
-@@ -5474,6 +5475,7 @@ if (is_android) {
+@@ -5497,6 +5498,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,8 +1,8 @@
 diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h
-index eda83e423676e27631ff7b15bff03a89315fb3a6..0dd9bafa643ad34c2205398eb502f4cbeba8218f 100644
+index 16e9aeaea73d3ddcad45ec59c5fd374a9b54fd20..529d0df5fcbf0b581a5703fdc2552a85046a40d9 100644
 --- a/base/metrics/histogram_functions.h
 +++ b/base/metrics/histogram_functions.h
-@@ -89,6 +89,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) {
+@@ -86,6 +86,7 @@ void UmaHistogramEnumeration(const StringType& name, T sample) {
                 "Enumeration's kMaxValue is out of range of "
                 "LinearHistogram::kBucketCount_MAX. Use a sparse histogram "
                 "instead.");
@@ -1,8 +1,8 @@
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 56408734b26428933a1fb8c04cee317c659feea7..4a60b4244fdc821c71aa8a9b19bd8619cf45458e 100644
+index 39168e90fd6ea68e562f0a2c6d8ba1162bc29e71..5c7b2bd8288f24e31e08c091da02aef68e4b8ba1 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -279,6 +279,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
+@@ -282,6 +282,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
     perfetto::Category("webrtc").SetTags("audio", "video"),
     perfetto::Category("webrtc_stats"),
     perfetto::Category("xr"),
@@ -1,8 +1,8 @@
 diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
-index a9120ee83475b5fb9ca60934d0df2319637b15b5..5a7d00ac44d405578b45d0878767737a68fa2a37 100755
+index 4ec0458d4325302bf49d7b04112329bee6084f8c..917b53f6f0e594a8065ac739d8b7cf29801c52f4 100755
 --- a/build/android/gyp/lint.py
 +++ b/build/android/gyp/lint.py
-@@ -463,5 +463,6 @@ def main():
+@@ -453,5 +453,6 @@ def main():
   server_utils.MaybeTouch(args.stamp)
 
 
@@ -1,5 +1,5 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 4174baa9c0e39b517ade66aab07123eaf9b58e47..6ac15e59c566a7721193f4dc7349b20fadf36a7e 100644
+index 4d1ac59b9b7dc05a20a3bb523b17706a00761cde..3beaf22c51b7cc2b7c0a1a8c4968f68d572b3cd1 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
@@ -343,6 +343,7 @@ is_posix = !is_win && !is_fuchsia
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
-index 1e17083d3737458eb3397776b6ed8a8f02f52797..fb57f9244eafa79528bbbabd78f7d74a9aa40eba 100644
+index 8c59c78bce5995391e344b99c4eb3c383f5163be..1bdc9ea6bb329d71b8da9f617c4778941c691e17 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
@@ -64,6 +64,7 @@ config("compiler") {
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index cc12ce785a97775955ec26d1821688b9bb48fce0..199be21a8ca00c625af4c8c0b031472e81664202 100644
+index b9babd477e7482011136c5e53725b4a0da292e6f..57b28faf5c8259478b503bf8d2786abeb7c493c8 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
@@ -28,6 +28,7 @@ assert(!(incremental_install && !is_java_debug),
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa60e7d42e7 100644
+index b7a2264f28bf11ad1a73a8a705260597b19b7679..33299e8b0751c8b4ea326f30135835dbcadd25d7 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -3657,6 +3657,7 @@ if (enable_java_templates) {
+@@ -3649,6 +3649,7 @@ if (enable_java_templates) {
           # Filter directly in compile_java.py when no other processing is required.
           _processed_jar_path = _javac_jar_path
         }
@@ -10,7 +10,7 @@ index b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa6
       }
 
       if (_build_device_jar) {
-@@ -3864,6 +3865,7 @@ if (enable_java_templates) {
+@@ -3856,6 +3857,7 @@ if (enable_java_templates) {
       if (defined(_enable_bytecode_checks) && _enable_bytecode_checks) {
         enable_bytecode_checks = _enable_bytecode_checks
       }
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index cd213c57051d1780eb42a320ab25fb5c0b3956bf..65c9f59bb03dc2a16c2a7d03434154942c78b17a 100644
+index 18867073f2af6f982fe98384b7144ca1ce362815..c43037458ce0958ab3fe0bcac5e6727e0805d03f 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
@@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) {
@@ -1,8 +1,8 @@
 diff --git a/build/dotfile_settings.gni b/build/dotfile_settings.gni
-index 4911002e5c18b9532af94ea1ef725d9e497ecc59..aeb5c222833b43b62d7df6653c649eb6bb56f74c 100644
+index 928b3215b71cbf1b36ba182e3f38ef02fe9d1da0..ef404ebcd7e97c4290b12fddd0ed5279e64f0976 100644
 --- a/build/dotfile_settings.gni
 +++ b/build/dotfile_settings.gni
-@@ -38,3 +38,4 @@ build_dotfile_settings = {
+@@ -39,3 +39,4 @@ build_dotfile_settings = {
     "//build/util/branding.gni",
   ]
 }
@@ -1,8 +1,8 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8ff09a048 100644
+index c8c10cdab040d39f69fa56aad12fc8b1c67854f3..db0b99f8458986328be3495d0415b4d60a306a8f 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -195,6 +195,7 @@ if (!is_android && !is_mac) {
+@@ -200,6 +200,7 @@ if (!is_android && !is_mac) {
         "common/crash_keys.cc",
         "common/crash_keys.h",
       ]
@@ -10,7 +10,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
 
       deps += [
         ":chrome_dll",
-@@ -499,11 +500,12 @@ if (is_win) {
+@@ -505,11 +506,12 @@ if (is_win) {
       args += [ "--keystone=0" ]
     }
   }
@@ -24,7 +24,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
     extra_substitutions = [
       "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
       "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -523,6 +525,7 @@ if (is_win) {
+@@ -529,6 +531,7 @@ if (is_win) {
       "//chrome/common:buildflags",
       "//chrome/common:version_header",
     ]
@@ -32,7 +32,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
 
     if (enable_updater) {
       deps += [ ":chromium_updater_privileged_helper" ]
-@@ -668,6 +671,7 @@ if (is_win) {
+@@ -674,6 +677,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 d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
     }
   }
 
-@@ -711,9 +715,11 @@ if (is_win) {
+@@ -717,9 +721,11 @@ if (is_win) {
       "--scm=0",
     ]
   }
@@ -52,7 +52,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
     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.
-@@ -738,6 +744,7 @@ if (is_win) {
+@@ -744,6 +750,7 @@ if (is_win) {
         info_plist_target = invoker.info_plist_target
       } else {
         info_plist_target = ":chrome_helper_plist"
@@ -60,7 +60,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
       }
 
       extra_substitutions = [
-@@ -921,6 +928,7 @@ if (is_win) {
+@@ -927,6 +934,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 d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
       } else {
         sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
 
-@@ -1206,6 +1214,7 @@ if (is_win) {
+@@ -1215,6 +1223,7 @@ if (is_win) {
       "-current_version",
       chrome_dylib_version,
     ]
@@ -76,7 +76,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
 
     if (!is_component_build) {
       # Specify a sensible install_name for static builds. The library is
-@@ -1403,6 +1412,7 @@ if (is_win) {
+@@ -1412,6 +1421,7 @@ if (is_win) {
 
 group("dependencies") {
   public_deps = [
@@ -84,7 +84,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//chrome/browser",
-@@ -1448,7 +1458,7 @@ group("dependencies") {
+@@ -1458,7 +1468,7 @@ group("dependencies") {
 
 if (is_win) {
   process_version_rc_template("chrome_exe_version") {
@@ -93,7 +93,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
     output = "$target_gen_dir/chrome_exe_version.rc"
   }
 
-@@ -1497,6 +1507,7 @@ group("resources") {
+@@ -1507,6 +1517,7 @@ group("resources") {
     "//chrome/browser:resources",
     "//chrome/common:resources",
     "//chrome/renderer:resources",
@@ -101,7 +101,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8
   ]
 }
 
-@@ -1551,6 +1562,7 @@ if (!is_android) {
+@@ -1561,6 +1572,7 @@ if (!is_android) {
     if (enable_resource_allowlist_generation) {
       repack_allowlist = _chrome_resource_allowlist
       deps = [ ":resource_allowlist" ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d89686cd6 100644
+index d8bd462bc9349d5a4dbe8b07bf3bcac97cda8272..77c77159d847ec53b3dfb68f6379deab29e5e0d8 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -163,6 +163,7 @@ if (_is_default_toolchain) {
+@@ -164,6 +164,7 @@ if (_is_default_toolchain) {
       "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
       "java/res_chromium_base/values/channel_constants.xml",
     ]
@@ -10,7 +10,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
   }
 
   android_resources("chrome_app_java_resources") {
-@@ -272,6 +273,7 @@ if (_is_default_toolchain) {
+@@ -277,6 +278,7 @@ if (_is_default_toolchain) {
     if (enable_extensions_core) {
       deps += [ "//chrome/browser/ui/android/extensions:java_resources" ]
     }
@@ -18,7 +18,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
   }
 
   android_resources("java_overlay_resources") {
-@@ -813,6 +815,7 @@ if (_is_default_toolchain) {
+@@ -823,6 +825,7 @@ if (_is_default_toolchain) {
     ]
 
     deps += feed_deps
@@ -26,7 +26,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
 
     srcjar_deps = [
       ":chrome_android_java_enums_srcjar",
-@@ -830,6 +833,7 @@ if (_is_default_toolchain) {
+@@ -840,6 +843,7 @@ if (_is_default_toolchain) {
       "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
       "//components/touch_to_search/core/browser:quick_action_category_enum_javagen",
     ]
@@ -34,7 +34,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
 
     # From java_sources.gni.
     sources = chrome_java_sources
-@@ -967,6 +971,7 @@ if (_is_default_toolchain) {
+@@ -979,6 +983,7 @@ if (_is_default_toolchain) {
       # TODO(crbug.com/434123514): see if we can remove these stub targets.
       deps += [ "//chrome/browser/ui/android/extensions/windowing/stub:java" ]
     }
@@ -42,7 +42,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
   }
 
   action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -1719,6 +1724,7 @@ if (_is_default_toolchain) {
+@@ -1737,6 +1742,7 @@ if (_is_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 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
 
     # Dep needed to ensure override works properly.
     deps = [ ":chrome_base_module_resources" ]
-@@ -1871,6 +1877,7 @@ if (_is_default_toolchain) {
+@@ -1889,6 +1895,7 @@ if (_is_default_toolchain) {
         ":${_variant}_locale_pak_assets",
         ":${_variant}_paks",
       ]
@@ -58,7 +58,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
     }
   }
 
-@@ -2129,6 +2136,7 @@ if (_is_default_toolchain) {
+@@ -2148,6 +2155,7 @@ if (_is_default_toolchain) {
       "//third_party/androidx:androidx_annotation_annotation_experimental_java",
       "//third_party/androidx:androidx_browser_browser_java",
     ]
@@ -66,7 +66,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d
 
     # More deps for DFMs.
     if (dfmify_dev_ui) {
-@@ -3107,6 +3115,7 @@ if (_is_default_toolchain) {
+@@ -3135,6 +3143,7 @@ if (_is_default_toolchain) {
       "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 7baeeaff95f804c51945e68a8a1e967260340a2c..ff67097dfc5b8571397b2a688983f3092fffcdf2 100644
+index 78babfd827c3a544c8290d19c1d6bca02a2acdf4..39052678cea518da1fbbe72bd697cb719b2bf486 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1302,3 +1302,4 @@ if (enable_screen_capture) {
+@@ -1317,3 +1317,4 @@ if (enable_screen_capture) {
     "java/src/org/chromium/chrome/browser/media/MediaCapturePickerTabObserver.java",
   ]
 }
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522bb7a2c82 100644
+index 9f7fe934e456b429435fa46c1a532d81d292cb5d..82a7935767a92cfaf0db2ab6797117e4c87aab60 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -291,6 +291,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -18,7 +18,7 @@ index 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522
       if (_is_test) {
         proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ]
       }
-@@ -666,6 +668,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -687,6 +689,7 @@ template("chrome_common_apk_or_module_tmpl") {
                                  "version_code",
                                  "version_name",
                                ])
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
-index 30b0a449fd2dafbd57ff053859621a07ca3ee5c6..ca59096b6b6a90d83cdc058d37c763fb5d3c3f8a 100644
+index fd17b1ddb6ee7dfbf94482c47f6a52b0421baa46..abfe03db56e6769bc708374c137d95f093a807b1 100644
 --- a/chrome/android/features/tab_ui/BUILD.gn
 +++ b/chrome/android/features/tab_ui/BUILD.gn
-@@ -135,6 +135,7 @@ android_resources("java_resources") {
+@@ -133,6 +133,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 7d9d0d142300d1d2e2cdb13644b300550954b4ad..110890a4c2ff41ac9c2f1212718f298054c33c27 100644
+index 5eeaae1b713d705b0e0ff0d325f533828e5e7857..9c5c8f33ff46aece80d7bbf8711d4894ed9b5354 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
-@@ -351,7 +351,7 @@ public class FeedSurfaceMediator
+@@ -345,7 +345,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 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e9287044ea84 100644
+index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61e166e7ed 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
@@ -38,6 +38,7 @@ by a child template that "extends" this file.
@@ -70,7 +70,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
 
     <!-- Permission for using Android 14's credential management framework. -->
     <uses-permission android:name="android.permission.CREDENTIAL_MANAGER_QUERY_CANDIDATE_CREDENTIALS"/>
-@@ -166,7 +179,9 @@ by a child template that "extends" this file.
+@@ -169,7 +182,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"/>
 
@@ -80,7 +80,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
 
     <!-- Permission for using pinned windowing layer for document picture-in-picture. -->
     <uses-permission android:name="android.permission.USE_PINNED_WINDOWING_LAYER" />
-@@ -383,6 +398,7 @@ by a child template that "extends" this file.
+@@ -385,6 +400,7 @@ by a child template that "extends" this file.
             <intent-filter>
                 <action android:name="com.sec.android.airview.HOVER" />
             </intent-filter>
@@ -88,7 +88,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
             <meta-data android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity-alias>
-@@ -925,6 +941,7 @@ by a child template that "extends" this file.
+@@ -942,6 +958,7 @@ by a child template that "extends" this file.
         </service>
 
         <!-- Quick Action Search widget -->
@@ -96,7 +96,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
         <receiver
             android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch"
             android:label="@string/quick_action_search_widget_title"
-@@ -954,6 +971,7 @@ by a child template that "extends" this file.
+@@ -971,6 +988,7 @@ by a child template that "extends" this file.
                 android:name="android.appwidget.provider"
                 android:resource="@xml/quick_action_search_widget_dino_info" />
         </receiver>
@@ -104,7 +104,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
 
         <!-- Bookmarks widget -->
         <receiver android:name="com.google.android.apps.chrome.appwidget.bookmarks.BookmarkThumbnailWidgetProvider"
-@@ -1173,7 +1191,7 @@ by a child template that "extends" this file.
+@@ -1184,7 +1202,7 @@ by a child template that "extends" this file.
 
         <service android:name="org.chromium.chrome.browser.media.MediaCaptureNotificationService"
             {% if enable_screen_capture == "true" %}
@@ -113,7 +113,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928
             {% else %}
             android:foregroundServiceType="camera|microphone"
             {% endif %}
-@@ -1270,6 +1288,7 @@ by a child template that "extends" this file.
+@@ -1281,6 +1299,7 @@ by a child template that "extends" this file.
           </activity>
         {% endif %}
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
-index 2599b098db6b4228643a868d5093373cb1787b9c..2cdfa16591649676865177458d4af8276e7c9e55 100644
+index 972f4db05736e73be0e9bbf5cd3d7d71a705428b..50e107a3295a2a071670f0a26619ebc62dc97521 100644
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -64,7 +64,7 @@ found in the LICENSE file.
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index ec155c488f20e31440fd97f6f99b0e23fc834129..7a0e9d96bdfd35d2bfd854eb6c2866611098d9cc 100644
+index 2c6c55b1aa5b0481692af89c5b341c106d822bfe..68d6580b49963ada988b625d905c3167f947cf25 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -887,6 +887,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -897,6 +897,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                         private void closeIfNoTabsAndHomepageEnabled(
                                 boolean isPendingClosure, boolean shouldRemoveWindowWithZeroTabs) {
                             if (getTabModelSelector().getTotalTabCount() == 0) {
@@ -10,7 +10,7 @@ index ec155c488f20e31440fd97f6f99b0e23fc834129..7a0e9d96bdfd35d2bfd854eb6c286661
                                 if (shouldRemoveWindowWithZeroTabs) {
                                     mMultiInstanceManager.closeChromeWindowIfEmpty(mWindowId);
                                 } else if (HomepageManager.getInstance()
-@@ -3461,6 +3462,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -3583,6 +3584,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                         if (mMultiInstanceManager != null) {
                             mMultiInstanceManager.onTabStateInitialized();
                         }
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-index 47cfe3b76ef1184e5aa18abd3cef7c43a23cf73f..a050d4a40ae625ffd19e1464dac31277f632d7f0 100644
+index e8e655dfb0ddafcf9f5588c9be1e579521252451..ee1c69db9e99efd530468e4ae0b1275b76321548 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -656,7 +656,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -659,7 +659,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             mBottomContainer = findViewById(R.id.bottom_container);
 
             SnackbarManager snackbarManager =
@@ -11,7 +11,7 @@ index 47cfe3b76ef1184e5aa18abd3cef7c43a23cf73f..a050d4a40ae625ffd19e1464dac31277
                             this,
                             mBottomContainer,
                             getWindowAndroid(),
-@@ -3017,6 +3017,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -3082,6 +3082,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
      */
     public void onExitVr() {}
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-index 31a8692bb45c2d910483bceaf1255ca152eb2c3d..1ecb2788087fca03ac0607181ce11c3954669a4d 100644
+index 5bde2932a1a077ec0eb009e1a6b88aaaf00ad4b4..7ac0d73ea05296da27f0eb3357c9602fa2f1982f 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -43,6 +43,7 @@ import org.chromium.build.annotations.NullMarked;
@@ -10,7 +10,7 @@ index 31a8692bb45c2d910483bceaf1255ca152eb2c3d..1ecb2788087fca03ac0607181ce11c39
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils;
-@@ -683,7 +684,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -682,7 +683,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
         //                is not persisted when adding to the homescreen.
         // * If creating shortcuts it not supported by the current home screen.
         return WebappsUtils.isAddToHomeIntentSupported()
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-index 83188504d8feb30dfa05f8c7024c70295777e666..ef34be18ca5ffc9b3d5d0a8e24ce19564063060c 100644
+index d5f5a4e3c1173b890de04e124b791b131b92ce44..bc8e222ff6a0c89cc47016a689879429fe722fed 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -356,7 +356,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -357,7 +357,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
     }
 
     /** Called when browsing data is about to be cleared. */
@@ -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 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c3547474516842 100644
+index e122d1d9e6ded00acc4183c64c0894f3a5a69893..d59543df6067dd5499d5d89eb6949880ebc8ef44 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
-@@ -233,6 +233,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -243,6 +243,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             Action.EXIT_PICTURE_IN_PICTURE,
             Action.OPEN_IN_INCOGNITO_WINDOW,
             Action.VIEW_PAGE_SOURCE,
@@ -10,7 +10,7 @@ index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c35474
         })
         @Retention(RetentionPolicy.SOURCE)
         public @interface Action {
-@@ -289,7 +290,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -299,7 +300,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             int EXIT_PICTURE_IN_PICTURE = 50;
             int OPEN_IN_INCOGNITO_WINDOW = 51;
             int VIEW_PAGE_SOURCE = 52;
@@ -19,7 +19,7 @@ index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c35474
         }
 
         // LINT.ThenChange(/tools/metrics/histograms/enums.xml:ContextMenuOptionAndroid)
-@@ -522,6 +523,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -532,6 +533,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec())
                     && !UrlUtilities.isTelScheme(mParams.getLinkUrl())) {
                 linkGroup.add(createListItem(Item.COPY_LINK_ADDRESS));
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
-index 9f32ee8c94ee001a8e9dc2f3c30c4c413e72235f..f7daf168960a7e0ecf027530a8d9d71abe26da1b 100644
+index f0fbb3837ea1f04f587f7c75d6936d6158f1a671..1d5f9922f7a970b0e0afc2d9ee910e346047cfdf 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
-@@ -912,7 +912,7 @@ public class NewTabPage
+@@ -831,7 +831,7 @@ public class NewTabPage
      *     NTP.
      */
     public static boolean isInSingleUrlBarMode(boolean isTablet) {
@@ -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 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fcb8f3c9be 100644
+index fd566ce93a14eb0deddc82126061861c78b1b383..ce739b896c8ffcd19c044972f798e65701e1e1d1 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
-@@ -84,7 +84,7 @@ import java.util.function.Consumer;
+@@ -86,7 +86,7 @@ import java.util.function.Consumer;
 
 /** Fragment to keep track of the all the privacy related preferences. */
 @NullMarked
@@ -11,7 +11,7 @@ index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fc
         implements Preference.OnPreferenceChangeListener {
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
     private static final String PREF_PRELOAD_PAGES = "preload_pages";
-@@ -563,6 +563,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -565,6 +565,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.clear();
@@ -19,7 +19,7 @@ index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fc
         MenuItem help =
                 menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
         help.setIcon(
-@@ -577,7 +578,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -579,7 +580,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 d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796fecbd9c2 100644
+index bdc44a47df82f729f183d11b16dd7a921d4245bd..79f1a18bef8e94b653f3989d4311ac4a63fc96ca 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
-@@ -64,7 +64,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator;
+@@ -65,7 +65,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator;
 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;
@@ -11,7 +11,7 @@ index d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796
 import org.chromium.components.browser_ui.settings.ChromeBasePreference;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
-@@ -626,6 +626,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
+@@ -628,6 +628,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
      */
     private void updateSyncPreferences() {
         String signedInAccountName =
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index 19b27b83ddc8b1ff2ece1a9de2f9252fd82ab484..8b6db337a9c6d6bc01726adea0ee11e2ab4ccd14 100644
+index bde2eb32d75562feca87e570011eee5629e37075..0882bc86dcfa953b4ef964226422edf7ff94f8fe 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -1808,7 +1808,7 @@ public class ToolbarManager
+@@ -1796,7 +1796,7 @@ public class ToolbarManager
         return mOmniboxFocusStateSupplier.get()
                 || (mToolbarPositionController != null
                         && mToolbarPositionController.doesPrefMismatchPosition())
@@ -1,5 +1,5 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 07d70529c374ad81dda76864598d1d212a426d28..b1d1f17bb8ab387ecc791b57d1c30dc3f514ea4c 100644
+index ae608f51c7ac8d5a6853f18b3dfa6b18d90db01c..002bf9eae6090aa1d5928d1f43fc7ab2148e5a39 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
@@ -89,6 +89,7 @@ grit_strings("generated_resources") {
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 index 68375e1d44734b733c0716a37a5f0a88cbb441d5..76b8f6e83e7c81c5bf08ddb13738773e69901642 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2599,6 +2599,7 @@ static_library("browser") {
+@@ -2509,6 +2509,7 @@ static_library("browser") {
   } else {
     sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index bf4fdb761d26edc3a469cad571b68dd111c6322e..6ab28ddb9a2f9610fbbf1c576b41ced5569cf65f 100644
+index 1cb8861af59d093d827c739037765b29d5db7269..0e520cd02fae16ac77772b4696432aec5650286a 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4672,6 +4672,7 @@ const FeatureEntry::FeatureVariation
+@@ -4840,6 +4840,7 @@ const FeatureEntry::FeatureVariation kSigninPromoOnAvatarPillVariation[] = {
 //
 // 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/actor/site_policy.cc b/chrome/browser/actor/site_policy.cc
-index 04cfedff5a8369e6a29f3e1ac7a9429e4f85d872..90e1d5f38feddade140296fd58123de5a7b214e6 100644
+index 81ff794108a5cb71461270702d0dddb81de219eb..b4030f2e94e119d33832a3f11298c5ee73a4df2c 100644
 --- a/chrome/browser/actor/site_policy.cc
 +++ b/chrome/browser/actor/site_policy.cc
@@ -159,6 +159,7 @@ void MayActOnUrlInternal(const GURL& url,
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/actor/ui/handoff_button_controller.cc b/chrome/browser/actor/ui/handoff_button_controller.cc
-index 599aa8856525b1dfd581bf31132df3f29d44c7e5..e0ec0f7c93bbab0025fe27d17a8ecb9db62eadc1 100644
+index f7efc4d9584c9c9cd3087d5f5452b0f14268f82f..232a0f87ffeccdd25b35181a54753af59afecb61 100644
 --- a/chrome/browser/actor/ui/handoff_button_controller.cc
 +++ b/chrome/browser/actor/ui/handoff_button_controller.cc
-@@ -143,6 +143,7 @@ class GradientBubbleFrameView : public views::BubbleFrameView {
+@@ -141,6 +141,7 @@ class GradientBubbleFrameView : public views::BubbleFrameView {
       auto blur_filter = sk_make_sp<cc::BlurPaintFilter>(
           kShadowBlurSigma, kShadowBlurSigma, SkTileMode::kDecal, nullptr);
       shadow_flags.setImageFilter(std::move(blur_filter));
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-index f4daf7c490cf9372badc0e63bb46abef811d293d..e07dc258c0441fe47510e52b71b087ab6724de91 100644
+index afb691dd65b1ca382b64a4b598a261bcbe7505bc..b7c74421d99288b99097ace493be97a35b1fe776 100644
 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -119,6 +119,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
-index b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f556159943a25fe24 100644
+index 50ceb7af41fca9feaefeb7dd34b505c5bef8f375..4a231f1ba56bdcc00f0c332fb41488f6d6eba7a1 100644
 --- a/chrome/browser/app_controller_mac.mm
 +++ b/chrome/browser/app_controller_mac.mm
-@@ -767,7 +767,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
+@@ -748,7 +748,7 @@ class AppControllerProfileObserver : public ProfileAttributesStorage::Observer,
 
 + (AppController*)sharedController {
   static AppController* sharedController = [] {
@@ -11,7 +11,7 @@ index b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f55615994
     NSApp.delegate = sharedController;
     return sharedController;
   }();
-@@ -1442,7 +1442,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
+@@ -1420,7 +1420,7 @@ class AppControllerProfileObserver : public ProfileAttributesStorage::Observer,
   }
 
   auto it = _profileBookmarkMenuBridgeMap.find(profilePath);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/bookmarks/android/BUILD.gn b/chrome/browser/bookmarks/android/BUILD.gn
-index 53338f5c94c7fcb38f86ff266e0691a2f1f620a7..a8326001adf62256522da7786ee019ad03519dcb 100644
+index 4f5eacd5f0dcb3e701f4f40ef7a0ad3213852afc..f5703e201a70f6d4f06b419abbb2e1c19fb6664b 100644
 --- a/chrome/browser/bookmarks/android/BUILD.gn
 +++ b/chrome/browser/bookmarks/android/BUILD.gn
-@@ -36,6 +36,7 @@ source_set("impl") {
+@@ -37,6 +37,7 @@ source_set("impl") {
     "//components/query_parser",
     "//components/undo",
   ]
@@ -10,7 +10,7 @@ index 53338f5c94c7fcb38f86ff266e0691a2f1f620a7..a8326001adf62256522da7786ee019ad
 }
 
 android_resources("java_resources") {
-@@ -102,6 +103,7 @@ android_library("java") {
+@@ -103,6 +104,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarViewBinder.java",
     "java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarVisibilityProvider.java",
   ]
@@ -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 0ec4102207985715be691d796b1f3b86d5ef32c2..581bd5e22b94d74db9888384ca993a6869300b8d 100644
+index 9c3d04b24d786c7fa72a702b68c22678fc5ac602..a1c9be974801aad1723e13cd27e4312eb8db8df6 100644
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -1625,6 +1625,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
+@@ -1620,6 +1620,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
       return "WebrtcVideoPerfHistory";
     case TracingDataType::kMediaDeviceSalts:
       return "MediaDeviceSalts";
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
-index bdabbd8c0b3ac3bd947e523ea518918a5912c39b..ef1a76d4adfe2821af0759beb5130f30f19a6360 100644
+index 72445161880b95b6ce7f5ea25692d63c774fca70..b0c3db63fc3fd4cbf50e3f11ab38d8b9b15cb168 100644
 --- a/chrome/browser/chrome_browser_main_mac.mm
 +++ b/chrome/browser/chrome_browser_main_mac.mm
-@@ -102,6 +102,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -103,6 +103,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
   // ChromeBrowserMainParts should have loaded the resource bundle by this
   // point (needed to load the nib).
   CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/content_settings/BUILD.gn b/chrome/browser/content_settings/BUILD.gn
-index 3387a9bdbf5389fe64ca824dcd6fe89d3a6ac7b5..c1ea4e46367046670974b5d066a4200dafc827a5 100644
+index cec67ed273312856031056f6765ce9c196e22ebe..be2cc6c8c66427f06b4518e8000a7c69dabb5dcb 100644
 --- a/chrome/browser/content_settings/BUILD.gn
 +++ b/chrome/browser/content_settings/BUILD.gn
@@ -131,6 +131,7 @@ source_set("impl") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
-index 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2aa2aceb02 100644
+index 1dd2dbabc1fdcc137eb7e8055d77dfe6c7fd80f5..3950fb71b35dfc2554eae164a74c8b8c410452d6 100644
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -1217,6 +1217,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+@@ -1222,6 +1222,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
       download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP;
   if (HasPromptedForPath() ||
       confirmation_reason_ != DownloadConfirmationReason::NONE ||
@@ -10,7 +10,7 @@ index 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2a
       user_approved_path) {
     // If the "DownloadRestrictions" enterprise policy explicitly disallows the
     // download, don't let the user gesture bypass the dangerous verdict.
-@@ -1257,6 +1258,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+@@ -1262,6 +1263,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
         ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
        (download_->HasUserGesture() && visits == VISITED_REFERRER)))
     return DownloadFileType::NOT_DANGEROUS;
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 64e7c1122ba874b8199ecaa80ebbac478006a91c..b9154c348bcfd9b9469dfe992c437eedb7010802 100644
+index c7c960abd7ec51fe64b59cf9b13c91cd499d91a1..45906e8db3a0b4578d910cd09d1996ac5f69be6e 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
@@ -1570,6 +1570,7 @@ source_set("extensions") {
@@ -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 e29ca8a104ad7c3245ea4c12356669417cd67b8b..2089934d85343dc99176c83146fa5411dbf55196 100644
+index 3905ec19874e708bfe4fa889b64050173e3595cf..f61cc0f405d43931342642a226f80e6333493dbf 100644
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-@@ -711,6 +711,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension,
+@@ -710,6 +710,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension,
 #else
   info.incognito_access_pending_change = false;
 #endif
@@ -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 c31370fd37850f1630120bb764b2be48599b4d1d..d28675a779cae25ca5e6547020641c7a321d8ac9 100644
+index 9fda95bc0d4b301299aeafafaf3f8cf14c117158..8602c53bd6894f2528c337e4291ddbafcaef04ea 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
@@ -274,6 +274,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
@@ -1,5 +1,5 @@
 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 05704d3dd7d9d1b849ffc016f00a13195097be19..b3119e3389b97c4b965e97255065b057bd1c8b68 100644
+index 79a87e4879bb2706f6e97fbafe443c67ba41c536..52ea21a8dcc84afd88f6876a052398dde9c471dd 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
@@ -91,6 +91,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index bb0e7b5cba7e0ab8853aabdd61b5ac3a75776cc7..aa3c8f6ed5e9342cf315fda13e2c547d4a607e1d 100644
+index 2c809ad23947326b86b5523773cf9159915429cb..fb935ac5bad888fc7e0ad7b39090a3e49b100ea7 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -1152,6 +1152,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
+@@ -1146,6 +1146,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
     content::BrowserContext* context) const {
   TRACE_EVENT0("browser,startup",
                "ExtensionManagementFactory::BuildServiceInstanceFor");
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
-index 9d7f383e3878f0410ca7e7f34d7941b60847c097..4b9db45c891ea676f0f19c2769bdf26d945b521d 100644
+index 2cdb7e2c503c019f932a5683aafd4902c26c5a17..8f205261f6e3488ca86f2792549498f92a03a749 100644
 --- a/chrome/browser/external_protocol/external_protocol_handler.cc
 +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
@@ -414,7 +414,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/global_features.cc b/chrome/browser/global_features.cc
-index e1c76d0788c262d1e2f4fe20329d3a3c31c1d646..9b816385699617b3e9d522f10a841abb2da503e8 100644
+index ef13b8f57457c08bec8d3dc17bfb730945bb6c52..1baa60d6f499167ab5e9a3baefa34df6694dddeb 100644
 --- a/chrome/browser/global_features.cc
 +++ b/chrome/browser/global_features.cc
@@ -71,6 +71,7 @@
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/importer/BUILD.gn b/chrome/browser/importer/BUILD.gn
-index 0ad7c3c67529709274db790b8879017f362884b1..1f5c6c8f26b43761061e926619602f0f7063ceb3 100644
+index 0b36e87039987f567294e9a9785583e32f46a5fa..bf8cb3c79264ff713ffd58654bf052789f31849b 100644
 --- a/chrome/browser/importer/BUILD.gn
 +++ b/chrome/browser/importer/BUILD.gn
@@ -31,6 +31,7 @@ source_set("importer") {
@@ -10,7 +10,7 @@ index 0ad7c3c67529709274db790b8879017f362884b1..1f5c6c8f26b43761061e926619602f0f
 }
 
 source_set("impl") {
-@@ -62,6 +63,7 @@ source_set("impl") {
+@@ -63,6 +64,7 @@ source_set("impl") {
     "//components/password_manager/core/browser:password_form",
     "//components/password_manager/core/browser/password_store:password_store_interface",
   ]
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-index 269ec919d15699715b831ffadcc3525284427803..5c8f6aa405186c2bc2a207d8bc23c24078daaa8b 100644
+index bc31f90d949d574e6469c9504bc8b994d48e2987..8757d82f94c8b04c400d35acafeca7cc01ed5a92 100644
 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -431,6 +431,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
@@ -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 d0bb264e55f1f962af3f076c2de0eb3911cabfc2..882c149b84b9807711e2df9dbbad4533117aee9b 100644
+index 226a3863950c14af54207906899008d2491f8a27..ef11df29a9d8698eb6c7ba567f01b673c5cab744 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -704,6 +704,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
+@@ -723,6 +723,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 341cae2bda7fce9e5133966cb8670b9858a44654..1b5175a36e7f0084a5d33200bea780b5cf6a3fb0 100644
+index 6cd82a8e621a6bedbd4b538154613cfe69831f07..83c23bd665c30e9e450962ea720a5716967f7051 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -478,7 +478,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
-index 2abd4ae5a3cd2a3323c46512a93466b79da755a0..8e857946f403c9e2bf27749e9c9e1affbcd4dcf9 100644
+index 4da8bad8d25015672f51467ff1a328a9c41644b4..932cad6c3b68229b9e228203395c90db293ca70f 100644
 --- a/chrome/browser/notifications/BUILD.gn
 +++ b/chrome/browser/notifications/BUILD.gn
-@@ -112,6 +112,7 @@ if (is_android) {
+@@ -111,6 +111,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/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc
-index 8a4f88012293e5325b235ff755db6c3cc9a7b426..0af16df24f4e0744c2899d9c56812330763e1979 100644
+index bba7b7b6f668f7c3b7b4ebe27f8b54451817b4b8..3391dd99f0449b5450e9cd4acc8df920934dcb0f 100644
 --- a/chrome/browser/notifications/notification_display_service_impl.cc
 +++ b/chrome/browser/notifications/notification_display_service_impl.cc
-@@ -119,6 +119,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
+@@ -133,6 +133,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
                              std::make_unique<NearbyNotificationHandler>());
     }
 #endif
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn
-index ce75cb153701f95c54b0938046d43f40827879f7..b32b10c9564fd18515758e3c6b5e71252b77fa6f 100644
+index 032dddbd35beb6673c9466f04e8021fefe0dea9f..fd929399bb1eacf0648703c55bcc000f7a4d7f1c 100644
 --- a/chrome/browser/password_manager/android/BUILD.gn
 +++ b/chrome/browser/password_manager/android/BUILD.gn
@@ -189,6 +189,7 @@ android_library("java") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
-index e7e27da2d113967179a9f9b9f5019bc5e86f81f4..4bfea38dc702c110c4ed139d5022a034d72f78a4 100644
+index c9f76e7418faaa56ec5025d5689649a648f4d326..a2a5d01a92339eec4d94aa1a2049f1cde041675c 100644
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -164,6 +164,7 @@ source_set("impl") {
+@@ -170,6 +170,7 @@ source_set("impl") {
     "//services/preferences/tracked",
     "//services/preferences/tracked:features",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52cf062eb12 100644
+index ad6b592b4740392044d151801c80bbf92e7c0f55..290199413b5517fdd3aadea92de10bf1f42f82d5 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1687,6 +1687,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1723,6 +1723,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
       false);
 
   // This is intentionally last.
@@ -10,7 +10,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c
   RegisterLocalStatePrefsForMigration(registry);
 }
 
-@@ -2171,6 +2172,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2220,6 +2221,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
 #endif  // BUILDFLAG(IS_ANDROID)
 
   registry->RegisterBooleanPref(prefs::kStaticStorageQuotaEnabled, false);
@@ -18,7 +18,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-@@ -2593,6 +2595,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
+@@ -2642,6 +2644,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
   profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores);
   profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase);
   profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion);
@@ -26,7 +26,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c
   base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data")));
   base::DeleteFile(
       profile_path.Append(FILE_PATH_LITERAL("Login Data For Account")));
-@@ -2600,6 +2603,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
+@@ -2649,6 +2652,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
       profile_path.Append(FILE_PATH_LITERAL("Login Data-journal")));
   base::DeleteFile(
       profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal")));
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
-index cf4ebf3d26398785e8ef558eb0b010fe4b752601..2f265b95bbcfa6ae7595b6684b418a466838d9ca 100644
+index 2db4de27556917f5a39ba4f43025bfed268ab671..d5be1b3c73ac5378e7ff2231ee40dd81e7239fa1 100644
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -193,6 +193,7 @@ const auto kTrackedPrefs = std::to_array<prefs::TrackedPreferenceMetadata>({
+@@ -192,6 +192,7 @@ const auto kTrackedPrefs = std::to_array<prefs::TrackedPreferenceMetadata>({
 
     // See note at top, new items added here also need to be added to
     // histograms.xml's TrackedPreference enum.
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 64b3e5af4de03e477d91af925bf70d78df398410..c38651d8c4105c82b4ebfded90d56bc43a63abad 100644
+index 9fbd8722baf2ce422c1c12b84780e9ec5111555d..ec953765495582e248958e5f9f822a53b266a78f 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
@@ -114,6 +114,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
-index ffe2d52c0bf2b101a796ca8acbc5663ecd97016f..8e4a4ce18b6560920517760e0b8048a7c730b7ec 100644
+index a02025a7d78b64e2774bd62355666c076c671948..1a0263e55294eae3dd3bbcccf01bdea2f3fed8e6 100644
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -1043,6 +1043,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
+@@ -1058,6 +1058,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
 
 // This method should be periodically pruned of year+ old migrations.
 void ProfileAttributesEntry::MigrateObsoleteProfileAttributes() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
-index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c59d3f153 100644
+index e41e3babb1748f0175706cb330e84f607298938a..e5f2e3bfbaf3a9c816c649ff0b72c9cc23df500c 100644
 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc
 +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
-@@ -459,7 +459,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
+@@ -460,7 +460,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
 #elif BUILDFLAG(IS_CHROMEOS)
 constexpr size_t kDefaultAvatarIconsCount = 27;
 #else
@@ -11,7 +11,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c
 #endif
 
 #if !BUILDFLAG(IS_ANDROID)
-@@ -625,6 +625,7 @@ size_t GetPlaceholderAvatarIndex() {
+@@ -626,6 +626,7 @@ size_t GetPlaceholderAvatarIndex() {
 
 size_t GetModernAvatarIconStartIndex() {
 #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
@@ -19,7 +19,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c
   return GetPlaceholderAvatarIndex() + 1;
 #else
   // Only use the placeholder avatar on ChromeOS and Android.
-@@ -658,6 +659,7 @@ std::string GetPlaceholderAvatarIconUrl() {
+@@ -659,6 +660,7 @@ std::string GetPlaceholderAvatarIconUrl() {
 
 const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) {
   CHECK_LT(index, kDefaultAvatarIconsCount);
@@ -27,7 +27,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c
   static const std::array<IconResourceInfo, kDefaultAvatarIconsCount>
       resource_info = {{
   // Old avatar icons:
-@@ -969,6 +971,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector(
+@@ -971,6 +973,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector(
         selected_avatar_idx == GetPlaceholderAvatarIndex());
     avatars.Insert(avatars.begin(),
                    base::Value(std::move(generic_avatar_info)));
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 6bc3db5c106e40aadc0aec040ed029603387a8fb..aa5f018e5043729b5f61f9db25a89f450474b963 100644
+index db97dc1e4813e3dcdfc8173241c17328e4e040cf..b5f86c1745b5a67ed59154a2125005cc9562ec18 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
@@ -570,6 +570,7 @@ void ProfileImpl::TakePrefsFromStartupData() {
@@ -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 62cdd2ab941685926c34b90d9858211bdeaaba6f..7f6fb5722c3e9804639f2cc5fc60baf9b79e4cc9 100644
+index 66b08f07c570078a0f0f96d733bd9b7164c9258d..c65b8139c47a29e239882b763cea79cc2772aefa 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -2507,6 +2507,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -2464,6 +2464,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 5caabda59bb17fb8558b66538eb02f6aedb224f3..86f07dfa90fa3e5ba650f93033dff71eb6ab2e16 100644
+index 5bc2716727784a62cb63f07860bedcba54d6c642..c307411c42495799500f80c4c6b0a6e41866359f 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -200,6 +200,7 @@ class RenderViewContextMenu
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts
-index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0cf321d31c 100644
+index 9a11030816f0baeab6ca81fa08daaf1a6d19350d..87f461437bd0147ff67c9759110a14f2553e5347 100644
 --- a/chrome/browser/resources/bookmarks/api_listener.ts
 +++ b/chrome/browser/resources/bookmarks/api_listener.ts
-@@ -118,6 +118,7 @@ function onChildrenReordered(
+@@ -120,6 +120,7 @@ function onChildrenReordered(
  */
 function onImportBegan() {
   chrome.bookmarks.onCreated.removeListener(onBookmarkCreated);
@@ -10,7 +10,7 @@ index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0c
   document.dispatchEvent(new CustomEvent('import-began'));
 }
 
-@@ -126,6 +127,7 @@ function onImportEnded() {
+@@ -128,6 +129,7 @@ function onImportEnded() {
     dispatch(refreshNodes(normalizeNodes(results[0]!)));
   });
   chrome.bookmarks.onCreated.addListener(onBookmarkCreated);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
-index 21a87921fe01bd811e366c0cf434bc11b34f3007..b0d1278a91dcea593c5e6ad636b9082bd313bf50 100644
+index 52e81dade62c827015d86668aba2cf6c9401f195..c8759a701370b37c840968d32791ea4780081e77 100644
 --- a/chrome/browser/resources/bookmarks/command_manager.ts
 +++ b/chrome/browser/resources/bookmarks/command_manager.ts
-@@ -473,7 +473,7 @@ export class BookmarksCommandManagerElement extends
+@@ -472,7 +472,7 @@ export class BookmarksCommandManagerElement extends
         chrome.bookmarkManagerPrivate.export();
         break;
       case Command.HELP_CENTER:
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts
-index 72fe9c12d54a93fbad7114e875768e1ba2232cea..1d83343e5e4537a45780e307810452d19edcaec8 100644
+index 7e4e55e64172840f1cb43febceb5d540f5968f31..7f1c92067b6c731d64ff589556c4024bcb915e62 100644
 --- a/chrome/browser/resources/bookmarks/reducers.ts
 +++ b/chrome/browser/resources/bookmarks/reducers.ts
@@ -194,6 +194,9 @@ function editBookmark(nodes: NodeMap, action: EditBookmarkAction): NodeMap {
@@ -12,7 +12,7 @@ index 72fe9c12d54a93fbad7114e875768e1ba2232cea..1d83343e5e4537a45780e307810452d1
 
   // Change node's parent.
   nodeModifications[id] =
-@@ -429,7 +432,7 @@ export function updateFolderOpenState(
+@@ -437,7 +440,7 @@ export function updateFolderOpenState(
           folderOpenState, nodes[(action as SelectFolderAction).id]!.parentId!,
           nodes);
     case 'move-bookmark':
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/history/synced_device_manager.ts b/chrome/browser/resources/history/synced_device_manager.ts
-index f5e26215336bcd3b2d8213977a103e87bfbfc154..c6df1ad0d67d5199dd0999aced78a711fd5e187b 100644
+index 0503ed72100275e44e98bbdd460695ffe61061cf..a253ed6e96b20fd50fb61af4fb5cd7f505e7ae6b 100644
 --- a/chrome/browser/resources/history/synced_device_manager.ts
 +++ b/chrome/browser/resources/history/synced_device_manager.ts
-@@ -443,10 +443,10 @@ export class HistorySyncedDeviceManagerElement extends
+@@ -442,10 +442,10 @@ export class HistorySyncedDeviceManagerElement extends
         return;
       }
     } else if (this.isSignInState_(HistorySignInState.SIGNED_OUT)) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 01bd4cfbf9588d70d21db6543b100c61b2950971..927fe2b260fb50bc544ef1717351caa255852d6c 100644
+index da914af0eb958dce35250b05e2bf01388bd40f5f..b9bdf8550ab97cec160068d4fbb144c4afd08a9c 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -505,4 +505,5 @@ build_webui("build") {
+@@ -495,4 +495,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/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
-index ad5e2480c9f624881eacc3dbc96bdcbb0785c517..b3ee2eec7da02e94c09c69bef9209efd7ca05b1c 100644
+index 60e4e4c2e89a30581df5a189064d2010986656e3..13bc89a3dd0006091b9c2179b84cd684e21d47b6 100644
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
@@ -81,10 +81,12 @@ export interface SettingsClearBrowsingDataDialogV2Element {
@@ -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 d3c540ea1b2403d102414c3aeb7e85b837452405..f02442fba2dde111c154001eedb440f232d2edf0 100644
+index 4aca8addafc30f254582613b3e9c6673e6baf9b2..ad7d62173c682434d252f68c3b35d6743a655f2d 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -18,6 +18,7 @@
+@@ -11,6 +11,7 @@
           on-close="onPrivacyGuideDialogClosed_">
       </settings-privacy-guide-dialog>
     </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 bab9aa1c1e16592fa23e78c14c3576135de827af..b207c5da0d8f5bb1d03fd595238ffe532f715993 100644
+index 4ab4d784d4fe5b04e6e5406e2a4a4c2399292380..c26e1367c1c900e8272dd03a0b480f9268a5b3fb 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -16,6 +16,7 @@ import '../icons.html.js';
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd68f7b7cdf 100644
+index 687bc78abc1c780c262fb8193fbf034bb87147a4..847c7eb5f878a67ac30d077ed4e5c005513fdcce 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 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd6
 /**
  * Add all of the child routes that originate from the privacy route,
  * regardless of whether the privacy section under basic or advanced.
-@@ -326,6 +327,7 @@ function createRoutes(): SettingsRoutes {
+@@ -321,6 +322,7 @@ function createRoutes(): SettingsRoutes {
         loadTimeData.getString('performancePageTitle'));
   }
 
@@ -18,7 +18,7 @@ index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd6
   return r as unknown as SettingsRoutes;
 }
 
-@@ -359,7 +361,7 @@ export let routes: SettingsRoutes = Router.getInstance().getRoutes();
+@@ -354,7 +356,7 @@ export let routes: SettingsRoutes = Router.getInstance().getRoutes();
 // Returns the "effective" route when at chrome://settings/.
 export function getTopLevelRoute(): Route {
   if (!loadTimeData.getBoolean('isGuest')) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
-index 692a677c7c4d5070907a4ef9cb5a385f58408dc8..99eeb34c42730b8a38e47d09c2e90e2c76115268 100644
+index 98b163bfe8829c6597d4862272dbcadb3f9c5470..e5f8feba4b36e2ad63de31064172c1e72c37d7ae 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/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
-index 3c614567af955aa39343758a94ccf795c1d2195c..1705b280594749f8b9bfe1e21a34196156a5bb5f 100644
+index 9a7fd9e95e925cc1ac0c5a6d40c1007a338213fb..5e9913fa2bf1a450beeb21248610d2bf10bc4fd9 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.ts
 +++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -69,6 +69,7 @@ export enum ContentSettingsTypes {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
-index 4575f9c814d37d9d72e68cdc204a8b205ba5373b..e918767f49f40f9825d3f49fa96333d59e508352 100644
+index 0ae371bd02646d30842994c64b927839033af7ff..f65b5f18b2a897e5421031eac972de6716673477 100644
 --- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
@@ -9,6 +9,7 @@
@@ -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 b4c2d9e3d436550dc1dd861c927692df3b291730..0a669cef64a5fc0afce150a72baa010bb9a1d355 100644
+index c9e07b2d289952595ded4d18e542d668137265eb..44fd9ce2311c3ae1ed56a92e079b442c36812800 100644
 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
 +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
@@ -194,7 +194,8 @@ export class PowerBookmarksListElement extends PolymerElement implements
@@ -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 b273323c8702eda5877a23377e85b92a6b117fd6..f6352416b9201383733e5e8617c2e56421fc94ea 100644
+index 4e1fcd93211771a0577ba7b9c70f4dabb62945a8..90b3fe80d5f6ac0cb2f3a4f328121bec875da8ea 100644
 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn
 +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
-@@ -114,7 +114,7 @@ build_webui("build") {
+@@ -111,7 +111,7 @@ build_webui("build") {
             target_gen_dir) ]
 
   webui_context_type = "untrusted"
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts b/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts
-index dbc80d81b0f63947c703d0389603574b601b882e..c3cb4021ebb831d247e3f351b56b44f0265c58e6 100644
+index 31a8754dd89d7092bd0d3597c137478452694521..8da008b81350d3d76c11f7147f7f6b3043454fdd 100644
 --- a/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts
 +++ b/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts
@@ -2,6 +2,7 @@
@@ -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 42daa10da6c8633342802123cb37152cae7f6dc8..d6772c72ba8c2f3b5408072d7c26a0ab1983d6b6 100644
+index 8ffbfea7a978ee2b8d6ba7f268a5776c1d2bd1bc..19701e79556584eaaade1db2c63720e285bcdc4a 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
-@@ -155,6 +155,7 @@ export class ProfilePickerMainViewElement extends
+@@ -160,6 +160,7 @@ export class ProfilePickerMainViewElement extends
   }
 
   override firstUpdated() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn
-index f9c3c4dc649d0c8bdf1366236fc7e2cc8b2f53fd..e98ea1d43ca4a392ab9ef4304b41ec295da7e9ae 100644
+index 5559ef2d0038dd8d078105f703fe23c26602216c..ba701315f0c266fd42ad6fedef0b33aa8abd1ae8 100644
 --- a/chrome/browser/resources/tab_search/BUILD.gn
 +++ b/chrome/browser/resources/tab_search/BUILD.gn
-@@ -130,4 +130,5 @@ build_webui("build") {
+@@ -91,4 +91,5 @@ build_webui("build") {
       "tab_search.js",
     ]
   }
@@ -1,8 +1,8 @@
 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 cf0ad8603038fc8574b5c2dc43d63b846dfbd11d..f750f00560b833f45c70f212b559712be17a869b 100644
+index 28fc394196f05c30123953130966c0b4ca1be063..02ac09603f8045f4151163168ba6d2b540a4196a 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
-@@ -335,6 +335,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
+@@ -338,6 +338,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
   client_download_request_ = std::move(request);
   request_creation_details_ = details;
   SanitizeRequest();
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
-index 2eaacf40c2473f8d0147d79e99c9432c7d7ffdc3..d925c66c28d2aa2a66b383e31ada67f814e7f8f1 100644
+index 2081a22bf7ccfa12ad943ed7510d3e03ca506e42..943cac60ed3508d1c6e1ce5a76ef98bc409f3f24 100644
 --- a/chrome/browser/sessions/session_service.cc
 +++ b/chrome/browser/sessions/session_service.cc
@@ -385,6 +385,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
-index dfb7b597b28b4e7b740dc4d64343e3a3a9302d88..e866ca9d5a262e0ca82f1a8d692ea858f560d379 100644
+index 3e6b26b0cc5d6f1df1276aa08e35bb05a085e17e..f3cbbfc396c3e12b828df292ab97f42fc230d951 100644
 --- a/chrome/browser/signin/chrome_signin_helper.cc
 +++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -248,6 +248,7 @@ void ProcessMirrorHeader(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/signin/signin_promo_util.cc b/chrome/browser/signin/signin_promo_util.cc
-index 13318216f3429ec12488fbfd07ca93b0b27a73d5..f7fffaf509ae5f1e305923c2482c27fb1fa724c1 100644
+index 2568c43b7684ae69ff6971603018968625bc0703..5bb5c59f067519dd242bd03eae789603eb850d30 100644
 --- a/chrome/browser/signin/signin_promo_util.cc
 +++ b/chrome/browser/signin/signin_promo_util.cc
-@@ -377,6 +377,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile,
+@@ -480,6 +480,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile,
 // `ShouldShowAddressSignInPromo` and `ShouldShowPasswordSignInPromo`).
 // `profile` is the profile of the tab the promo would be shown on.
 bool ShouldShowSignInPromoCommon(Profile& profile, SignInPromoType type) {
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cfe2bc2b3e 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -772,6 +772,7 @@ static_library("ui") {
+@@ -799,6 +799,7 @@ static_library("ui") {
     # gets componentized.
     "//chrome/browser/ui/extensions:impl",
   ]
@@ -10,7 +10,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf
 
   if (enable_vr && is_win) {
     deps += [ "//chrome/browser/vr:vr_base" ]
-@@ -3369,7 +3370,10 @@ static_library("ui") {
+@@ -3442,7 +3443,10 @@ static_library("ui") {
         "//chrome/updater/app/server/win:updater_legacy_idl",
       ]
     } else {
@@ -22,7 +22,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf
     }
   }
 
-@@ -5521,6 +5525,7 @@ static_library("ui_public_dependencies") {
+@@ -5556,6 +5560,7 @@ static_library("ui_public_dependencies") {
     "//components/enterprise/buildflags",
     "//components/paint_preview/buildflags",
     "//components/safe_browsing:buildflags",
@@ -30,7 +30,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf
     "//components/segmentation_platform/public",
     "//components/sync",
     "//components/sync_user_events",
-@@ -5532,6 +5537,7 @@ static_library("ui_public_dependencies") {
+@@ -5568,6 +5573,7 @@ static_library("ui_public_dependencies") {
   if (enable_extensions_core) {
     public_deps += [ "//extensions/browser" ]
   }
@@ -38,7 +38,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf
   if (!is_android) {
     public_deps += [
       "//build:branding_buildflags",
-@@ -5672,6 +5678,7 @@ source_set("browser_navigator_params_headers") {
+@@ -5707,6 +5713,7 @@ source_set("browser_navigator_params_headers") {
     "//url",
   ]
   deps = []
@@ -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 faf125bfd6439aa0e4add87c965d5f970d848432..c13cb49a532b8c09aef9477be8143ce51a17da34 100644
+index e7028788b77e6818ada071febd6fc3198b7b9721..133f224ec79e7c14336840c0595098281ae2cd9b 100644
 --- a/chrome/browser/ui/actions/chrome_action_id.h
 +++ b/chrome/browser/ui/actions/chrome_action_id.h
-@@ -554,6 +554,7 @@
+@@ -556,6 +556,7 @@
   /* Side Panel items */ \
   E(kActionSidePanelShowAboutThisSite) \
   E(kActionSidePanelShowAssistant) \
@@ -10,7 +10,7 @@ index faf125bfd6439aa0e4add87c965d5f970d848432..c13cb49a532b8c09aef9477be8143ce5
   E(kActionSidePanelShowBookmarks, IDC_SHOW_BOOKMARK_SIDE_PANEL) \
   E(kActionSidePanelShowComments, IDC_SHOW_COMMENTS_SIDE_PANEL) \
   E(kActionSidePanelShowCustomizeChrome) \
-@@ -601,6 +602,7 @@
+@@ -603,6 +604,7 @@
   E(kActionCopyUrl, IDC_COPY_URL) \
   E(kActionTabGroupsMenu, IDC_SAVED_TAB_GROUPS_MENU) \
   E(kActionTabSearch, IDC_TAB_SEARCH) \
@@ -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 6912b8350e11908daa03dfb46b8182116a419b67..1ae9428477ab08ee71a57abb1e0e7fb1f7ed995d 100644
+index a25d9c20fbc5f4c933110507cc00d3f55f5ed8c6..6624942394614c3e1583bba317ac774423854ecd 100644
 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
 +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
@@ -22,6 +22,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 01b772b110ecde4516e6822e8fb8b6cb106abd47..d8fadd251c8e0ea3a9acdf9677ca8683f408ec5e 100644
+index 55bc6a30474d7cb199a6b2740682dd348542664a..e4bc66e1f9eacf886c1dc2a0707c20c577bf554d 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
-@@ -471,6 +471,7 @@ class AppMenu implements OnKeyListener {
+@@ -475,6 +475,7 @@ class AppMenu implements OnKeyListener {
                         anchorView,
                         anchorViewOffset);
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
-index cc6cadbfbdb44093896ae82798c19de29bc1a9d2..c86fe7510d2530f6eeae8365a76c3cd3cceead0d 100644
+index 7b530c1336918261f959d8b4c7e0ea3dfaf5387e..88705aae6cf81054ead96d4f6c7a98e200f8a926 100644
 --- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
 +++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
-@@ -60,6 +60,7 @@ found in the LICENSE file.
+@@ -50,6 +50,7 @@ found in the LICENSE file.
         app:layout_constraintTop_toBottomOf="@id/location_bar_attachments"
         app:layout_constraintEnd_toStartOf="@id/margin_spacer"/>
 
@@ -10,7 +10,7 @@ index cc6cadbfbdb44093896ae82798c19de29bc1a9d2..c86fe7510d2530f6eeae8365a76c3cd3
     <!--
     Fusebox/Omnibox top-stacked elements on Active Omnibox with Empty content
     -->
-@@ -94,7 +95,7 @@ found in the LICENSE file.
+@@ -84,7 +85,7 @@ found in the LICENSE file.
         android:contentDescription="@string/accessibility_toolbar_btn_delete_url"
         android:tooltipText="@string/accessibility_toolbar_btn_delete_url"
         app:layout_constraintTop_toBottomOf="@id/location_bar_attachments"
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
-index 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338be7f15b43 100644
+index 6c73054568e72484304e06fe3118c84c0391528c..0af12fc2fb30767c0244a2e7f11eb1a50a63e26b 100644
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -146,6 +146,7 @@ android_library("core_java") {
+@@ -138,6 +138,7 @@ android_library("core_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",
   ]
@@ -10,7 +10,7 @@ index 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338b
 
   deps = [
     ":java_resources",
-@@ -354,6 +355,7 @@ android_resources("java_resources") {
+@@ -346,6 +347,7 @@ android_resources("java_resources") {
     "//components/browser_ui/styles/android:java_resources",
     "//ui/android:ui_java_resources",
   ]
@@ -1,8 +1,8 @@
 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 7dd5a613d32d59b6127c1acfbb3e893cafc52c91..5dba5471a1c88da34cdc1455af4bf5519aebcf04 100644
+index 38d66204d2cb9aa78382fc10cf5538e6d85463e3..8720bbfc4eb26aa128c36a3b5d98db00e63cb884 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
-@@ -53,9 +53,11 @@ found in the LICENSE file.
+@@ -46,9 +46,11 @@ found in the LICENSE file.
         android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -1,8 +1,8 @@
 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 1cccb68181828003d6b99ae39c531513bb5ae4b5..aa0586dd47d8be0ae5a10b33888c702da5f1046c 100644
+index 7ffcd089ce8b3292c67a64811d22601ad4e0feed..86cca63f44af183f30b5efc07cff9d93dacbebac 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
-@@ -78,6 +78,7 @@ found in the LICENSE file.
+@@ -79,6 +79,7 @@ found in the LICENSE file.
             android:background="@drawable/modern_toolbar_tablet_text_box_background"
             android:paddingEnd="@dimen/location_bar_end_padding"
             android:clipToPadding="false" />
@@ -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 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3b091b85d 100644
+index 5f8529453b0c4b3b210d2bfee27f6adb3138a70b..26cc200fd4834a6faae72f284189008c207a8c88 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
-@@ -585,6 +585,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -576,6 +576,7 @@ public class ToolbarPhone extends ToolbarLayout
         if (mOptionalButtonCoordinator != null) {
             mOptionalButtonCoordinator.setBackgroundColorFilter(color);
         }
@@ -10,7 +10,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3
     }
 
     private void updateModernLocationBarCorners() {
-@@ -1259,6 +1260,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -1250,6 +1251,7 @@ public class ToolbarPhone extends ToolbarLayout
      * Tab Page.
      */
     private void updateLocationBarLayoutForExpansionAnimation() {
@@ -18,7 +18,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3
         TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
         if (isInTabSwitcherMode()) return;
 
-@@ -1661,6 +1663,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -1652,6 +1654,7 @@ public class ToolbarPhone extends ToolbarLayout
             canvas.restore();
         }
 
@@ -26,7 +26,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3
         // Draw the tab stack button and associated text if necessary.
         if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) {
             // Draw the tab stack button image.
-@@ -2025,6 +2028,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -2016,6 +2019,7 @@ public class ToolbarPhone extends ToolbarLayout
     @Override
     public void onHomeButtonIsEnabledUpdate(boolean homeButtonEnabled) {
         mIsHomeButtonEnabled = homeButtonEnabled;
@@ -34,7 +34,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3
         updateButtonVisibility();
     }
 
-@@ -2431,6 +2435,7 @@ public class ToolbarPhone extends ToolbarLayout
+@@ -2416,6 +2420,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 31e47d759a66b2dda7e9f7885de02bb09ddbf814..21a10d0bc27b55d399751805d29f3fefc6b306f4 100644
+index a800ebc6dbb49e609b90a352122d9ebbb06c4906..f8eb6eab8f12c5a74cc388151c0738be8ad7a267 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
-@@ -286,6 +286,7 @@ public class ToolbarTablet extends ToolbarLayout {
+@@ -290,6 +290,7 @@ public class ToolbarTablet extends ToolbarLayout {
         mLocationBar.getTabletCoordinator().tintBackground(textBoxColor);
         mLocationBar.updateVisualsForState();
         setToolbarHairlineColor(color);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/autofill/BUILD.gn b/chrome/browser/ui/autofill/BUILD.gn
-index 7c3e3f94b6fd2..147f58ff2a214 100644
+index e59abb96c6dcd8a6626bcbe836842fe15e240925..45b2a5e1ca3953c0f7bd78f6ca4a064ff1898144 100644
 --- a/chrome/browser/ui/autofill/BUILD.gn
 +++ b/chrome/browser/ui/autofill/BUILD.gn
-@@ -239,6 +239,7 @@ source_set("impl") {
+@@ -241,6 +241,7 @@ source_set("impl") {
       "//components/password_manager/core/browser/features:password_features",
       "//components/plus_addresses/core/browser/resources/strings",
     ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0ab3189f7 100644
+index dd77f2fda3db2e7974003085a22981cad3f6c794..50dcdd6351f18dad5be5928ca8b6db49610769d8 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -544,7 +544,7 @@ Browser* Browser::Create(const CreateParams& params) {
+@@ -555,7 +555,7 @@ Browser* Browser::Create(const CreateParams& params) {
   // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
   CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
 
@@ -11,7 +11,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0
   Browser* const browser_ptr = browser.get();
   BrowserManagerServiceFactory::GetForProfile(params.profile)
       ->AddBrowser(std::move(browser));
-@@ -560,7 +560,7 @@ std::unique_ptr<Browser> Browser::DeprecatedCreateOwnedForTesting(
+@@ -571,7 +571,7 @@ std::unique_ptr<Browser> Browser::DeprecatedCreateOwnedForTesting(
   // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
   CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
 
@@ -20,7 +20,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0
   BrowserManagerServiceFactory::GetForProfile(params.profile)
       ->AddBrowserForTesting(browser.get());
   return browser;
-@@ -573,7 +573,7 @@ Browser::Browser(const CreateParams& params)
+@@ -584,7 +584,7 @@ Browser::Browser(const CreateParams& params)
       window_(nullptr),
       tab_strip_model_delegate_(
           std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
@@ -29,7 +29,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0
           tab_strip_model_delegate_.get(),
           params.profile,
           // Tab groups are disabled for app browsers.
-@@ -1321,6 +1321,7 @@ void Browser::OnWindowClosing() {
+@@ -1294,6 +1294,7 @@ void Browser::OnWindowClosing() {
   if (tab_restore_service && notify_restore_service) {
     tab_restore_service->BrowserClosing(GetFeatures().live_tab_context());
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
-index 3f477375e099dfb2f60c035b34318a593f7eaf5f..5a58254cafb2185f4f0f7042accd2733434e681f 100644
+index 657cd294df1d3ca983d6fe2b6ca43d92ded569f9..221e5e3f09e48d587e2a650655f8aa96ba16896b 100644
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -1159,6 +1159,7 @@ void CloseTab(BrowserWindowInterface* browser) {
+@@ -1182,6 +1182,7 @@ void CloseTab(BrowserWindowInterface* browser) {
   }
 
   ToastController* toast_controller = browser->GetFeatures().toast_controller();
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index b5c2da1226eaef4c5aa7a60cd8ba3ff0e3f46a44..c4fdcc07ac06b9c6871e0d4f4cd10f5ef431642c 100644
+index dab09c63a53bbe0abd8ef305a1991df8eb3f9cc8..ec75b47ec5bfbf5c38cd17fc951ea18860b5b24b 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
@@ -559,6 +559,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 837e75e79bac19250455c0c995e96a55ce4cdeb8..d882a46512cddbecf5a22e43cce1c2ceb8c35a8d 100644
+index 771d84612a86fba2482b4ecff6f4920522343725..b5e43e56072adaa3cd09582eb12b2fd3c9cc9d2c 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -133,7 +133,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/browser_window/BUILD.gn b/chrome/browser/ui/browser_window/BUILD.gn
-index 1a64c7b6ff3c7dec0bc652e994e89d8523b70ba3..d60b5a3adc26c4e19403d40644226e82f68ebff9 100644
+index 0494a03994362ed28e7591cfdb7f95a021aab6e6..d304a39e9077a5695d06c9c3368f2afccc2e8419 100644
 --- a/chrome/browser/ui/browser_window/BUILD.gn
 +++ b/chrome/browser/ui/browser_window/BUILD.gn
@@ -34,6 +34,7 @@ source_set("browser_window") {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser/ui/browser_window/internal/BUILD.gn
-index 14b978d8b87d58b1bee198f7a9b239b996c2c42d..9fc139b1964a2f96e6465dc17a079c6205ad9c61 100644
+index f17e7a8a64ff5f86b943821fcb6520298804fb14..fa2a0a766029dc0281f3134feacc1775bbefd35a 100644
 --- a/chrome/browser/ui/browser_window/internal/BUILD.gn
 +++ b/chrome/browser/ui/browser_window/internal/BUILD.gn
@@ -149,6 +149,7 @@ source_set("internal") {
--- a/Show More
+++ b/Show More