Updated patches from Chromium 88.0.4315.7 to Chromium 88.0.4324.11.

2021-01-05 21:27:43 -05:00
parent 4ec807b12e
commit 145fb0e598
141 changed files with 366 additions and 308 deletions
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 5bc48a734b4b85a0e30a2570aa4ff6f776f40a69..e63c1286eef96edc30d7e25e2b5afc1abe9a5400 100644
+index 9d0250c77571fad6db362953fdddafe009f3bddb..a0844728a99d3fd591d8643833fe9e73fb78cb06 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3746,6 +3746,7 @@ if (is_android) {
+@@ -3750,6 +3750,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/task/TaskTraits.java",
       "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
     ]
@@ -1,9 +1,9 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index 4c363465c3c7a153c7934ba99b665435d8fdaf12..25e1033577f9821d0e6fce4d87d49aac2aea57d9 100644
+index 19b5ab7d5b77d284db95b101e7a0240975c75297..f209de065c8c983758d13ce9ed9ba72dc000f0b5 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
-@@ -7,6 +7,7 @@
- import("//build/config/chromeos/ui_mode.gni")
+@@ -10,6 +10,7 @@ import("//build/config/chromeos/ui_mode.gni")
+ import("//build/config/android/channel.gni")
 
 # This file contains common system config stuff for the Android build.
 +import("//brave/build/android/config.gni")
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index c01294f793e85040bc3d258c277cb82869609eb8..a91d163dafe8c60c41b20ad9601542b364c4c664 100644
+index f79f26ef501ed326c56b070dbe2cc993d2f858b0..0a2da0edc7823bdf036b57f98e24e1aa7904d70d 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
-@@ -2023,6 +2023,7 @@ if (enable_java_templates) {
+@@ -2072,6 +2072,7 @@ if (enable_java_templates) {
         _deps = [ ":$_desugar_target" ]
         _previous_output_jar = _desugar_output_jar
       }
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 588b619121a62905a0b056b1a4640f3d62446c4b..d68609ee34a09075d3b48eb36dadccab63e9d644 100644
+index fe47adf0b62e92eaf22bed9476e28567880c396f..8f0a33372d7d191d03422b49735da56849eff2ba 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
@@ -658,6 +658,7 @@ if (enable_java_templates) {
@@ -8,5 +8,5 @@ index 588b619121a62905a0b056b1a4640f3d62446c4b..d68609ee34a09075d3b48eb36dadccab
   template("jinja_template") {
 +    if (defined(invoker.includes)) { invoker.includes += brave_android_manifest_includes } else { invoker.includes = brave_android_manifest_includes }
     action_with_pydeps(target_name) {
-       forward_variables_from(invoker,
-                              [
+       # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+       run_under_python2 = true
@@ -1,8 +1,8 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ed3d81786b0dd16f998ece213f7cd66723bed5fb..84b1e1aac1b113688f4b6bd527be846db2a8aee1 100644
+index 9d66490cdb555a6114d71b156a32b2fd7a32591f..ca637f0f50bb5b750f82c3a9507ccf6e6a74f186 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1670,6 +1670,7 @@ config("chromium_code") {
+@@ -1645,6 +1645,7 @@ config("chromium_code") {
       cflags += [ "-Wextra-semi" ]
     }
   }
@@ -1,5 +1,5 @@
 diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
-index 58bf3e8caf4e0a0fdcba03c5b8bf72b30ea8f075..b504e562355cc2468a1c661a4daec983e68dfb6a 100644
+index 47309866ca790e6753d20cdd097cce9ee2b3f57b..99e676117f6f60ef06fb84162ecea7d0efdf614b 100644
 --- a/build/toolchain/win/setup_toolchain.py
 +++ b/build/toolchain/win/setup_toolchain.py
@@ -277,6 +277,7 @@ def main():
@@ -1,5 +1,5 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721c31746c4 100644
+index f721f1aff4781fa5936010dfb5b0c97587e81c05..8476c12cd97d3f01974b574a1ff137fdcc11969e 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
@@ -150,6 +150,10 @@ if (!is_android && !is_mac) {
@@ -73,7 +73,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721
       extra_substitutions = [
         "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
         "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -1019,6 +1028,10 @@ if (is_win) {
+@@ -1033,6 +1042,10 @@ if (is_win) {
     if (is_chrome_branded) {
       deps += [ ":default_apps" ]
     }
@@ -84,7 +84,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721
 
     ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ]
 
-@@ -1176,6 +1189,7 @@ if (is_win) {
+@@ -1190,6 +1203,7 @@ if (is_win) {
 
 group("browser_dependencies") {
   public_deps = [
@@ -92,7 +92,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//chrome/app:shutdown_signal_handlers",
-@@ -1276,12 +1290,13 @@ group("child_dependencies") {
+@@ -1290,12 +1304,13 @@ group("child_dependencies") {
       # this is OK because all of content is linked into one library.
       "//content/browser",
     ]
@@ -107,7 +107,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721
     output = "$target_gen_dir/chrome_exe_version.rc"
   }
 
-@@ -1335,6 +1350,7 @@ group("resources") {
+@@ -1349,6 +1364,7 @@ group("resources") {
     "//chrome/browser:resources",
     "//chrome/common:resources",
     "//chrome/renderer:resources",
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d42018e7dac5b 100644
+index cb60323b4b9a3d49882297d037e319ca622ac4b1..5989ec44e88f3f82ab2ba704b16453cab9b7dc9a 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
@@ -231,6 +231,7 @@ android_resources("chrome_app_java_resources") {
@@ -10,7 +10,7 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201
 }
 
 if (enable_vr) {
-@@ -530,6 +531,7 @@ android_library("chrome_java") {
+@@ -531,6 +532,7 @@ android_library("chrome_java") {
   ]
 
   deps += feed_deps
@@ -18,7 +18,7 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
-@@ -560,6 +562,7 @@ android_library("chrome_java") {
+@@ -561,6 +563,7 @@ android_library("chrome_java") {
     "//components/ui_metrics:ui_metrics_enums_java",
     "//net:effective_connection_type_java",
   ]
@@ -26,15 +26,15 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201
 
   # From java_sources.gni.
   sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -683,6 +686,7 @@ group("jni_headers") {
+@@ -678,6 +681,7 @@ group("jni_headers") {
     "//chrome/browser/webauthn/android:jni_headers",
     "//components/media_router/browser/android:jni_headers",
   ]
 +  public_deps += ["//brave/build/android:jni_headers"]
 }
 
- action("chrome_android_java_google_api_keys_srcjar") {
-@@ -1799,6 +1803,7 @@ if (current_toolchain == default_toolchain) {
+ # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+@@ -1798,6 +1802,7 @@ if (current_toolchain == default_toolchain) {
         ":${_variant}_locale_pak_assets",
         ":${_variant}_paks",
       ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index f8040f5bf4374f5eb81bc264282fb56562b2cc80..984762215631a61efadf6b0094cfb957fbc9068b 100644
+index 70110a8d91ddec05e760a1029b12905f5f421961..513abb2f10f7655b869ce91868ca952d1c3ca9fd 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1682,3 +1682,4 @@ chrome_java_sources = [
+@@ -1687,3 +1687,4 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
 ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 45b925f5df82cb1ed624ca357a49b8d044df1c6f..fd06f89a8ff95f6c96601de59a6762ac58b04bc6 100644
+index 5bd971071b54553b992bc359576a2a08eb431ae9..4682a9dc22af4e00c106f127a4d1c364b066ef6d 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -207,6 +207,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+@@ -210,6 +210,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
       "${_material_package}:[Ss]lider",
       "${_material_package}:[Tt]oolbarLayout",
     ]
@@ -10,7 +10,7 @@ index 45b925f5df82cb1ed624ca357a49b8d044df1c6f..fd06f89a8ff95f6c96601de59a6762ac
 
     if (!_is_monochrome) {
       product_config_java_packages = [ "org.chromium.chrome.browser" ]
-@@ -316,6 +317,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+@@ -319,6 +320,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
-index b7143fd76a6114e222cabdb2e298d424622cde1d..7a28c11c2be01a03cc56d5bc6c6a394d2acc1811 100644
+index dd0775a711d40c7a2336e724d9530b01d24c0b92..113ecb70a6d10e7116709dab1daea3066bbff32c 100644
 --- a/chrome/android/expectations/lint-suppressions.xml
 +++ b/chrome/android/expectations/lint-suppressions.xml
-@@ -342,4 +342,5 @@ Still reading?
+@@ -344,4 +344,5 @@ Still reading?
     <!-- Discussed in crbug.com/1069204, ignoring this class of errors since these are Q+ constants. -->
     <ignore regexp="Must be one of: LineBreaker.BREAK_STRATEGY_SIMPLE, LineBreaker.BREAK_STRATEGY_HIGH_QUALITY, LineBreaker.BREAK_STRATEGY_BALANCED"/>
   </issue>
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88d8d6e0ab 100644
+index 4f73e753eb851db0c3547a5ee636b94ded5350fd..5939198b6c899268128985999d3348b9e4e0c6d7 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
@@ -38,7 +38,9 @@ by a child template that "extends" this file.
@@ -12,7 +12,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
-@@ -48,17 +50,24 @@ by a child template that "extends" this file.
+@@ -48,9 +50,13 @@ by a child template that "extends" this file.
     {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
         <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     {% endif %}
@@ -25,9 +25,8 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
 +-->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission android:name="android.permission.NFC"/>
-+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+@@ -59,7 +65,9 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -37,7 +36,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
     <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-@@ -107,7 +116,9 @@ by a child template that "extends" this file.
+@@ -107,7 +115,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"/>
 
@@ -47,7 +46,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
 
     {% block extra_uses_permissions %}
     {% endblock %}
-@@ -160,6 +171,7 @@ by a child template that "extends" this file.
+@@ -160,6 +170,7 @@ by a child template that "extends" this file.
           org.chromium.chrome.browser.ChromeApplication
           {%- endif -%}
           {% endblock %}"
@@ -55,7 +54,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
         android:icon="@drawable/ic_launcher"
         android:roundIcon="@drawable/ic_launcher_round"
         android:label="{% block application_label %}@string/app_name{% endblock %}"
-@@ -1166,6 +1178,7 @@ by a child template that "extends" this file.
+@@ -1171,6 +1182,7 @@ by a child template that "extends" this file.
         </activity>
         {% endif %}
 
@@ -63,7 +62,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88
         {% block extra_application_definitions %}
         {% endblock %}
       {% endmacro %}
-@@ -1248,6 +1261,7 @@ by a child template that "extends" this file.
+@@ -1253,6 +1265,7 @@ by a child template that "extends" this file.
       <!-- ARCore APK integration -->
       <!-- This tag indicates that this application optionally uses ARCore. -->
       <meta-data android:name="com.google.ar.core" android:value="optional" />
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-index 7463c1449dae81fc33d1518c4a95d71b16072a5b..283cb6c535f16e5914305565862a6c789f2711d2 100644
+index ed15b5d777ae94b92e8dc36e138416243cdc7d39..e342cb1a60367f67ee99661bc55fee5bd92da372 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-@@ -77,7 +77,7 @@ public abstract class AppHooks {
+@@ -78,7 +78,7 @@ public abstract class AppHooks {
 
     @CalledByNative
     public static AppHooks get() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
-index 8d2a47311ce2f686cc343fc16c775008bffe855a..c05e6c020335951b421dcfd4c3918415ffe6bf79 100644
+index 882fc599e5542cd97ae1c4a157aacf60e9ad0c4f..9934e0594254921ed3692dfbfed889b410f6aa0e 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
@@ -56,7 +56,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -1,5 +1,5 @@
 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 bcefc55f69ce1810cb7e70a15613aba5d6c96a80..595817c9826f6a1d89da0125f758301d2896e17c 100644
+index 0de599b3e2c0a22da7de31b432c1bd6619459247..53b0cf35737bbb1a7f52851e2449c83a7850d03a 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
@@ -331,7 +331,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-index e857d81ad38bdcf73b3b75607b3d6144f1588e91..88dd035856cc0c0f060a3c1eaae4eb849f95ed63 100644
+index 2470d6bae98c5c0ba059b72f59608adfede06681..cb4a2acc687c5c4865004452b6b92be784294d4d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -58,7 +58,7 @@ import java.util.Locale;
+@@ -57,7 +57,7 @@ import java.util.Locale;
  * to view saved passwords (just the username and URL), and to delete saved passwords.
  */
 public class PasswordSettings
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
-index e29316630cceb054aef4ab270f3aa325dc62a075..1ae510a0255511d65d4292711aa2115c0f0af128 100644
+index a1101ceecf751b9914ba4bff7a91c8cac241879d..3aba3e417b2e006488676db7a62d90e02a8aab88 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
@@ -76,7 +76,7 @@ import org.chromium.ui.widget.ButtonCompat;
@@ -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 ec684d7d473d0c8d96acbacdb25ec0b349361f3a..3cfa37bd82493689b7cbfdb1de6d7f6eb918aa9d 100644
+index 867575d317a6961d1a85bdb2dd1bf302f5ce703b..94e8ac7c040ae2bebfeeec2cfbfb17cda4585969 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
-@@ -379,14 +379,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -391,14 +391,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
         ThemeColorProvider overviewModeThemeColorProvider = mAppThemeColorProvider;
 
         Runnable requestFocusRunnable = compositorViewHolder::requestFocus;
@@ -19,7 +19,7 @@ index ec684d7d473d0c8d96acbacdb25ec0b349361f3a..3cfa37bd82493689b7cbfdb1de6d7f6e
                 appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mActivity,
                 (focus, type)
                         -> setUrlBarFocus(focus, type),
-@@ -735,7 +735,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -757,7 +757,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
             IdentityDiscController identityDiscController,
             OneshotSupplier<StartSurface> startSurfaceSupplier) {
         // clang-format off
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-index e3b12ac8f13bc16a55b244d25075bb944ff7de6d..9be68e7dc5641bc5bbec56e3fc4c76b050d42a9f 100644
+index dd58bc81f065e0434d28f8ec665a3ae8e0ddd29b..8b8f3de73df0dc977bddc719a9805ff2353a2ef2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-@@ -98,7 +98,7 @@ public class BottomControlsCoordinator {
+@@ -94,7 +94,7 @@ public class BottomControlsCoordinator {
         View container = root.findViewById(R.id.bottom_container_slot);
         ViewGroup.LayoutParams params = container.getLayoutParams();
         params.height = root.getResources().getDimensionPixelOffset(bottomControlsHeightId);
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad601409273 100644
+index b39668dd8f239b5867a97a98419e67590a46e3fe..ea588d4f64a3a20459b731c6d645e181c4b9e857 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-@@ -86,7 +86,7 @@ import java.util.List;
+@@ -85,7 +85,7 @@ import java.util.List;
 /**
  * Phone specific toolbar implementation.
  */
@@ -11,7 +11,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6
     /** The amount of time transitioning from one theme color to another should take in ms. */
     public static final long THEME_COLOR_TRANSITION_DURATION = 250;
 
-@@ -399,10 +399,12 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -398,10 +398,12 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
     /**
      * Set the background color of the location bar to appropriately match the theme color.
      */
@@ -25,7 +25,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6
     }
 
     /**
-@@ -512,6 +514,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -511,6 +513,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
                         EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
             }
         }
@@ -33,7 +33,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6
     }
 
     @Override
-@@ -681,7 +684,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -680,7 +683,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
      * @return The right bounds of the location bar after accounting for any visible left buttons.
      */
     private int getBoundsAfterAccountingForRightButtons() {
@@ -42,7 +42,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6
     }
 
     private void updateToolbarBackground(int color) {
-@@ -2087,6 +2090,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
+@@ -2086,6 +2089,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
         } else {
             populateUrlClearFocusingAnimatorSet(animators);
         }
@@ -1,8 +1,8 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index d85c8180793d59dd22d4aafbfb95ac0b746908ca..1eed0b7c4fa3fce7c7a6d80b0a006cc19d78bf4d 100644
+index bc9b9495ad18b5b2e2980e975a06f5691b65a71f..06423a2741497c46b9ce11618043950dd306044d 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
-@@ -74,6 +74,8 @@ grit("generated_resources") {
+@@ -77,6 +77,8 @@ grit("generated_resources") {
   if (is_android) {
     outputs += android_generated_java_resources
   }
@@ -11,7 +11,7 @@ index d85c8180793d59dd22d4aafbfb95ac0b746908ca..1eed0b7c4fa3fce7c7a6d80b0a006cc1
 }
 
 if (is_android) {
-@@ -96,7 +98,7 @@ grit("google_chrome_strings") {
+@@ -99,7 +101,7 @@ grit("google_chrome_strings") {
 }
 
 grit("chromium_strings") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 535d65e656797dcb397e944d7d1ca5102ad5f9c6..93723bb09b79a6b58f4675f9a760fa3c55973ee0 100644
+index 53ce992f043cda690807b65a7a19b3c820e862dd..eb88a20ce5ac772d9ee709c6c3c6d32b6dbfa372 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2385,6 +2385,7 @@ static_library("browser") {
+@@ -2423,6 +2423,7 @@ static_library("browser") {
       "performance_monitor/metric_evaluator_helper_posix.h",
     ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 4747a7d3424672f8cc79debf00a5633ed8eba044..76cb61eaa3c4716eb2cdd2322ddd1ff371034384 100644
+index 2d0ef2748a473149a9e6bf454cc8e0a91cf9e712..e194807caf853ddd26d6786266f3786b6528dac2 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -297,14 +297,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
+@@ -298,14 +298,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
 const FeatureEntry::Choice kTraceUploadURL[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -21,7 +21,7 @@ index 4747a7d3424672f8cc79debf00a5633ed8eba044..76cb61eaa3c4716eb2cdd2322ddd1ff3
 
 const FeatureEntry::Choice kPassiveListenersChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -6682,6 +6682,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6721,6 +6721,7 @@ const FeatureEntry kFeatureEntries[] = {
     // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
     // Histograms" in tools/metrics/histograms/README.md (run the
     // AboutFlagsHistogramTest unit test to verify this process).
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index fb5ec1857ec97a887562420e284cb99e63e61e8f..97f39d0d4847a89df6af52226f430b62ec7cc203 100644
+index c6f87c148d166b498cbdc635142cce72ad9a3870..97908ee5529d21faad39190cfa07582c6f75ee3f 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -722,6 +722,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -727,6 +727,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   }
 
  private:
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-index f3b51e20cb9c84719947b6fbf779d8429e924570..27d78b367a8fb8505ee49c51fa17a033aca2b66a 100644
+index cf62b79358e14c90dab5a1e68cec7055c0cce39f..3a6f8c0ea0368b627fc5477163858f028a45ebc1 100644
 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-@@ -86,6 +86,7 @@ scoped_refptr<RefcountedKeyedService>
+@@ -87,6 +87,7 @@ scoped_refptr<RefcountedKeyedService>
 
   scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
       profile->GetPrefs(),
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 142b6699f13a779c783d93a25f1c5e3452183a83..a3f199a67c6e026865903f80a403b8394a68787f 100644
+index 0b3b0372d42a7f2c78d404125351ab54e6e258bd..ad8fa0ed5d4d23c87ae7cb31472b7e65a9173ad7 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1266,6 +1266,7 @@ static_library("extensions") {
+@@ -1271,6 +1271,7 @@ static_library("extensions") {
   } else {
     sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-index 81202cee9f5a9a31cf0097ff549ff002376514bf..3f1de5233e55770106187d93049af175f249efcc 100644
+index 18045b809f9cd6e7fccf49e5f7172fec0559c677..1e806c4c4b28c4931d8f2f03b8d06c6dd0e2eabf 100644
 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
 +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-@@ -129,6 +129,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
+@@ -128,6 +128,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
         std::move(pdf_viewer_replacements);
   }
 #endif
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index aecef847f26608a9a3f18a5479621a88c2c41465..545d662b5764fd0934f843add4a0a3d19f91f9ee 100644
+index 6368e26a6bf97ffef4cebeb390d2aab9de22bbe0..4e3bd0b62666c6188250235f2de352373d52bd82 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
@@ -17,6 +17,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index e0482c79a4f176381376285e8b93c3c5abc65db3..e063a10394852b0c9cbb2acce0772ecf2b97b51e 100644
+index e8c50f50be776cdc056fdcfec42b4a91c5145eae..24738818b2643ff2b1bd25398aa67b2e767a4032 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -276,6 +276,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -280,6 +280,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
 };
 
 const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
-index 3477bb6fbeceb2ab3d9a00332bc0146f22793450..faf701cc8342ed7eed0679a6da93c136e2e6cfb6 100644
+index 313758372e0fcb842ee6a5b5cd69a64b8a95b2ac..cc920fb9459462075a1a9c123ae7af34ea5c8ac8 100644
 --- a/chrome/browser/net/net_error_tab_helper.cc
 +++ b/chrome/browser/net/net_error_tab_helper.cc
-@@ -201,6 +201,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) {
+@@ -200,6 +200,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) {
 }
 
 bool NetErrorTabHelper::ProbesAllowed() const {
@@ -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 7f58187215cb94be47e38f6be9de32012332d9fd..72d0d7bd243e3fa373f00396d5af8843551aa5cc 100644
+index c45a5a758d91d87d03791ceba1e3befca6768cdf..e610453c4f2ad9662fd7d89f856a5992e70ddc60 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -218,7 +218,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -220,7 +220,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
     if (!manager_)
       return;
     manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 9c81ffe93ae903e045c07b578c89083b6675a935..418ade6c5662779666b78290556d4d233ff87b22 100644
+index 7e31648f1a8cde7b84a3764c80930309138b9ec2..d7d925a3de64aa8574dc099b74638503477734d1 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -742,6 +742,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -764,6 +764,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #if defined(TOOLKIT_VIEWS)
   RegisterBrowserViewLocalPrefs(registry);
 #endif
@@ -10,7 +10,7 @@ index 9c81ffe93ae903e045c07b578c89083b6675a935..418ade6c5662779666b78290556d4d23
 
   // This is intentionally last.
   RegisterLocalStatePrefsForMigration(registry);
-@@ -1008,6 +1009,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1029,6 +1030,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
 #endif
 
   RegisterProfilePrefsForMigration(registry);
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 039035dce20878b29523ad7ebce2bf189eadfa0c..c08083fd5cef809ddff0e97f7c87df4c5a00b48d 100644
+index 103c8c04b728e35b3ac1a5b8461acbc8616dcf47..6820c83d5b14012e879587c96273375f9178dcd5 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
@@ -131,6 +131,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
@@ -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 d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fcf3a4e71f 100644
+index 103ec9874ad51926189a20c53f129183b38cd7c3..f03aed0dc8022453eb549c5226d36c6e937f1c7a 100644
 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc
 +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
-@@ -335,7 +335,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
+@@ -343,7 +343,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
 #elif defined(OS_CHROMEOS)
 constexpr size_t kDefaultAvatarIconsCount = 27;
 #else
@@ -11,7 +11,7 @@ index d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fc
 #endif
 
 #if !defined(OS_ANDROID)
-@@ -470,6 +470,7 @@ size_t GetPlaceholderAvatarIndex() {
+@@ -474,6 +474,7 @@ size_t GetPlaceholderAvatarIndex() {
 
 size_t GetModernAvatarIconStartIndex() {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -19,7 +19,7 @@ index d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fc
   return GetPlaceholderAvatarIndex() + 1;
 #else
   // Only use the placeholder avatar on ChromeOS and Android.
-@@ -503,6 +504,7 @@ std::string GetPlaceholderAvatarIconUrl() {
+@@ -507,6 +508,7 @@ std::string GetPlaceholderAvatarIconUrl() {
 
 const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) {
   CHECK_LT(index, kDefaultAvatarIconsCount);
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 1c6cb0b66b46a958ad57f3f8c31ad225558d5c71..9ad82d26e2760cb0e06d95fedaed9c4f26986b49 100644
+index 03953cd006a5e6717d78a5f878a8ff065c520318..2eb4f00844c0acf3e98918cbbbdd55535cbc7dc6 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
@@ -356,7 +356,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
-index 7c91474fa32ce1780b2a9ceb8924a848a01187e1..0ecefb79f1c19fea87457b30323aec6cd21d4d8d 100644
+index 16c5e6132537cd576fdb6832d291f9413c578344..f2147c203b23b8ffd5a1437b643befa539c69766 100644
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
@@ -255,6 +255,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
@@ -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 6043ab9230474f36fb901ddfeee456615ed30183..d6651c5f599d814ea9ee93df239c1e13f4a389b2 100644
+index 35806cc9646da03b306d7e059b87405be2984fc9..1bd6ace6d63c816ab8b5bec52f523eddf73ee787 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1631,6 +1631,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -1630,6 +1630,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/resources/downloads/toolbar.js b/chrome/browser/resources/downloads/toolbar.js
-index a14fbf89bfe7eb925e9a9febdd280454d573c90b..8caf240db979c09d30a36a71ab74d31e582b8b8c 100644
+index 9d6413739b71440ad88eb3bd57b0f415d425299c..8aecba85bed4c7d3461f2ec7f04734c1eeab0ff9 100644
 --- a/chrome/browser/resources/downloads/toolbar.js
 +++ b/chrome/browser/resources/downloads/toolbar.js
@@ -4,7 +4,7 @@
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index 41882a90448cee3778522c1c1abdd0d5ef675bca..fcfcacabd41712c874d08be461022f38b1e6ff5e 100644
+index cfed148d68be8d0880823b391b55936f942c22cc..2b2989f4ce45b6b74d25d3537865d7d09c54c19e 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
@@ -57,6 +57,7 @@ generate_grd("build_grd") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/optimize_webui.gni b/chrome/browser/resources/optimize_webui.gni
-index f4c1ca5ad559e285b1bfff925c4098b27c0d5888..9fc33e3b38f78cf500a293837e303b0db78890a8 100644
+index 3aaf5b333c1fcc0c2133af8ec8342925836ba772..fae4b6e64f337d8959446745217a0f8960f81d79 100644
 --- a/chrome/browser/resources/optimize_webui.gni
 +++ b/chrome/browser/resources/optimize_webui.gni
-@@ -44,6 +44,7 @@ template("optimize_webui") {
+@@ -47,6 +47,7 @@ template("optimize_webui") {
     }
 
     deps = invoker.deps
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 3a364142fc0b49a183a2fd046956b530aa900569..d2a2db08cb93baac1b87b1627960f8a75a27edff 100644
+index 11a8c2b06277288e35925866e6a7387d59c6faca..952034904b01f5b9bfbfbf99a76a8729b8ad1bf3 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
@@ -85,6 +85,7 @@ generate_grd("build_grd") {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js
-index 0a9d21082eedb5802c5a9f54847cb559658cd903..af7ffc904254dd6ede455d5b2a4d227ba2730001 100644
+index f1aeec3e53c7c7d196111d4260b6ae6a85b02895..396dae1f7a26bb2582d19d58d37030d1dcab53c7 100644
 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js
 +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js
@@ -165,6 +165,7 @@ Polymer({
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js
-index a0870deecdd923cbeac4fa5cc3a073cf42093de5..218fc1da1f7d0dd478a55763b08145f638c1512d 100644
+index 1679cc0ddb9eab2879bc8260143c022b70c702c1..9a502ed2d44b1b8bd69670006beff8a473a09c63 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.js
 +++ b/chrome/browser/resources/settings/site_settings/constants.js
-@@ -43,6 +43,7 @@ export const ContentSettingsTypes = {
+@@ -42,6 +42,7 @@ export const ContentSettingsTypes = {
   VR: 'vr',
   WINDOW_PLACEMENT: 'window-placement',
   ZOOM_LEVELS: 'zoom-levels',
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
-index 99a163ccbde4258ab0794213ceb8d592b38f7a3a..55116d5a0df8cd1de469ac53f3b1c639c16c21ff 100644
+index ddf7337ca74fabe4a1cd4f083e27fb64bed629d6..7ecabf340de6fa32316815f948f4ab7361d66a95 100644
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
@@ -60,7 +60,7 @@ std::string ReadFileIntoString(base::FilePath path) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
-index e1dc8ce5ae095eed5bbaf42ee8106ad4b07b12d6..29355416e5f391e5a644e5bf1ba11d100c007990 100644
+index 3f95a01c4f13fbae02a00e18135e316c7833e6f4..0a0793faa475221bbfb45f252c91b471701589aa 100644
 --- a/chrome/browser/sync/profile_sync_service_factory.cc
 +++ b/chrome/browser/sync/profile_sync_service_factory.cc
-@@ -257,7 +257,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
+@@ -260,7 +260,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
   }
 
   auto pss =
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 2df4783a2e4ab3fe527e384540120626d5d0f90e..4392bf24b4074149c4f473433da1a187ff4ce655 100644
+index 91bb3832b7efdc317875db18ec4b8a8965458ba6..9a2c00f9886b0a9bbce8fc8ca93394a4c63f77f0 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
@@ -580,6 +580,7 @@ static_library("ui") {
@@ -10,7 +10,7 @@ index 2df4783a2e4ab3fe527e384540120626d5d0f90e..4392bf24b4074149c4f473433da1a187
   allow_circular_includes_from +=
       [ "//chrome/browser/ui/webui/bluetooth_internals" ]
 
-@@ -3202,10 +3203,13 @@ static_library("ui") {
+@@ -3214,10 +3215,13 @@ static_library("ui") {
       ]
       deps += [ "//google_update" ]
     } else {
@@ -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 85660451f742d274d16b8354c18829108f3220d0..7986427e332ab60d75d986c3c0a0ea54128d2f7b 100644
+index 6fad28ee0ed0a12d2d57d076b65025b7aeb2f1bf..7c9546fc1c3d724c4c642464238e2508ba0974ca 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
-@@ -219,6 +219,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+@@ -217,6 +217,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
         mPopup.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable(
                 context.getResources(), R.drawable.popup_bg_tinted));
         if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim);
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index e2e505a71e51224364085f9c9556ed02f4d8cd70..0d3c8d6aa4d3c63aac4a001bdf89646255e42255 100644
+index 2c9d816e1aff340615061e888cbbcd69300befcd..76f9bc4537210c08f0d696f6f41ec7b9a08a943e 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -449,7 +449,7 @@ Browser::Browser(const CreateParams& params)
+@@ -445,7 +445,7 @@ Browser::Browser(const CreateParams& params)
       tab_strip_model_delegate_(
           std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
       tab_strip_model_(
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 764429a330c130871c2310b564481b03b8175840..e6abcbf6a2e0bdeefdf351c1c45a75522994c14e 100644
+index afd852999cd7716d246a31aa407fc262bb5dc128..e5d64b5d71718f1def54c0e4bf63560cee7064c6 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -689,6 +689,7 @@ class Browser : public TabStripModelObserver,
+@@ -682,6 +682,7 @@ class Browser : public TabStripModelObserver,
   // Sets the browser's user title. Setting it to an empty string clears it.
   void SetWindowUserTitle(const std::string& user_title);
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 237ee2d0a68aa631d6356b07c6baba71ac6d746d..b818005c81c3f93e8fa76667213d49df7173f04c 100644
+index 9e33691853229c2104b1a14a34971eb947fbc06f..3b22c194cad838756a5f32f0d36ca33906ad748c 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
@@ -469,6 +469,7 @@ void Navigate(NavigateParams* params) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index 6683c0e666062755776097522a012fa10611a35b..bb2f44b52282640e3d29542b63aecfceefa56b7c 100644
+index 2e479cf5d944b11956b9908531eca758d9bac1df..6b10fdda40f30b1768b93be37268df784e000f2e 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -299,7 +299,7 @@ void ShowSlow(Browser* browser) {
+@@ -300,7 +300,7 @@ void ShowSlow(Browser* browser) {
 #endif
 }
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
-index c7ef438a98109198d0b12f0e3ae3146588fe7547..54e6fcccffde04146cdcb15f9e82b4a7f8962efd 100644
+index 1667c1fa640089f88709ca919ca6475622b84383..5ab1db8c781dda9aaafcd3011c4366523029d7c8 100644
 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm
 +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
-@@ -39,6 +39,8 @@ const struct AcceleratorMapping {
+@@ -40,6 +40,8 @@ const struct AcceleratorMapping {
      ui::VKEY_N},
     {IDC_NEW_TAB, ui::EF_COMMAND_DOWN, ui::VKEY_T},
     {IDC_NEW_WINDOW, ui::EF_COMMAND_DOWN, ui::VKEY_N},
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
-index 9659d68c224c83f8c258fa7b2a89cb627149eb1f..2e05ef22deeade7b57efc2240224531af7b3f307 100644
+index ceb7da90363cbf5b5cde7442fd7ae43f95ddf21b..3b7180e3cdfe810a40e7f8f7e76e2000b1ef017c 100644
 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm
 +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
-@@ -104,6 +104,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
+@@ -106,6 +106,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
                 Item(IDS_NEW_INCOGNITO_WINDOW_MAC)
                     .command_id(IDC_NEW_INCOGNITO_WINDOW)
                     .remove_if(is_pwa),
@@ -10,7 +10,7 @@ index 9659d68c224c83f8c258fa7b2a89cb627149eb1f..2e05ef22deeade7b57efc2240224531a
                 Item(IDS_REOPEN_CLOSED_TABS_MAC)
                     .command_id(IDC_RESTORE_TAB)
                     .remove_if(is_pwa),
-@@ -468,6 +469,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
+@@ -473,6 +474,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
             Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK),
 #endif
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index 87756b3052dab230e18d82386101d31b3c5178e1..94f446d6080e54c19ca4ebe966674955a717ea27 100644
+index b3ee8bf0344880efcfeee9e6b65216dd253ff1e6..2430a1f7aa75473508463f557a73bde5275532db 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -444,6 +444,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
+@@ -447,6 +447,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
   welcome_enabled =
       welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
 #endif  // !defined(OS_CHROMEOS)
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index 95f73b57ff8650b233d4f09790ee62f6db9d97c3..a62d1850ec3295dbf2e35461c6dbf157d8fbde2b 100644
+index 4fb7af3b12fb837a8b0c64cd6dddec4cc561eb22..b14cca336cb000a42c72bb268b1d1ba5f0f16920 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -472,4 +472,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -483,4 +483,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 bbce058e630d638ce6bb732bda439fef7c3b8f42..100027486c4cccfba0d9900068ab3db639098116 100644
+index 70e8a233c4b80d7f6c16e2a7828b90a6c6145528..c213bb8030896d8d7cb80d0ba63694d2fb7628c9 100644
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -577,6 +577,7 @@ class TabStripModel : public TabGroupController {
+@@ -579,6 +579,7 @@ class TabStripModel : public TabGroupController {
   // current tree of openers).
   bool ShouldResetOpenerOnActiveTabChange(content::WebContents* contents) const;
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index f2815225febb0e97b2cd3a5ac019ca5c3c7cef87..4b7b5dbc4e4cdc4ee96ce7894bc249154592288a 100644
+index 5c81512d1538b526c5836e7d85a9f8aea34cba4b..1c2029df77176d55d2136a2c4912059a76e7b372 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-@@ -828,6 +828,7 @@ void BookmarkBarView::Layout() {
+@@ -827,6 +827,7 @@ void BookmarkBarView::Layout() {
       x = next_x;
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
-index 7201633f3fbbd584709d2775c50fc2b68734a06a..e5ddaf7e3f216b8bfd3858b44e64c67016bf875b 100644
+index fccee1c56910a5f0d93e239774924c91303ffdc2..8ee2bfd4e507370ac9254b4bebb430bc31fc1790 100644
 --- a/chrome/browser/ui/views/extensions/extension_popup.cc
 +++ b/chrome/browser/ui/views/extensions/extension_popup.cc
-@@ -68,7 +68,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const {
+@@ -77,7 +77,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const {
 
 void ExtensionPopup::AddedToWidget() {
   BubbleDialogDelegateView::AddedToWidget();
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-index 8289da805fe46573242a430f14b76e257500b1fb..3d211b91081a46d15a0eb6ade75a895771500269 100644
+index 8de3e4300f760a7c5a9c82a27939eb3217342e4c..6a8ab7da6a5a95c74fc33cbdb4aad8292ac21e63 100644
 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
 +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-@@ -87,6 +87,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
+@@ -117,6 +117,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
 
   for (permissions::PermissionRequest* request : visible_requests_)
     AddPermissionRequestLine(request);
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
-index 918580305b81f03571a46e4b4e30119239cc4c57..3c0234eb65600d0f264b0bba993290c8b4600c52 100644
+index 2afb7ccd34ac790f16c30d188796ae24af77427c..62e89de11d7bf99445b4ddd67ec08616fc9879ed 100644
 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
 +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
@@ -11,6 +11,7 @@
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index 402433a52145e2c6de72f2365860c80674a3643b..9b27ff35cc977334ecd4d84a1bdb1e4b9e3505ac 100644
+index 5b3767480871dee708eee1731be5358f64039a4b..201025b5d3a20cf41455bdca192af1e84d7b54f0 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-@@ -175,7 +175,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
+@@ -176,7 +176,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
           source_language, target_language));
   std::unique_ptr<TranslateBubbleModel> model(
       new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
@@ -1,5 +1,5 @@
 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 481d67a923fceae3eb4be5356ea189756e0b15af..0e2a5df31118064c89b1dfb21684bba75fadf925 100644
+index 36103b6f487ead53d487a2056a4a7be46b0c18e2..e0eec060e4af91e84864a9dd96a6bdf51af04db5 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -12,6 +12,7 @@
@@ -10,7 +10,7 @@ index 481d67a923fceae3eb4be5356ea189756e0b15af..0e2a5df31118064c89b1dfb21684bba7
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -1089,7 +1090,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -1084,7 +1085,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-index 94b8e4d0ebefc130fe9eca0bd850d509eddcc689..c99b797e1801c9202e2162f97ac7c84d6cea2c0a 100644
+index 41c46b82e26ea5b42c6f7c7437a0cdc27d6f6562..70b29b7d93cdae18db35d8a6ddb3a3868a98107f 100644
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -341,6 +341,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
-index 413bd276f132a879db7647008ab87a85702bffdf..25ba06e5563a5e306dcc2ad287750ba46d8274a6 100644
+index 4f7e554e9f4e766a9803bf3b09f44655a9bdf1a4..3b4b68e594cfdbfee91534fc80a90d030a3ed6cf 100644
 --- a/chrome/browser/ui/webui/history/history_ui.cc
 +++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -54,6 +54,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc
-index 1637dc014a75986cab0ec4abd327034f975a102b..1a53fdc6fb3850d502d43e62f5d3f2231950ada9 100644
+index aa57ad77c5308704a850521a59cff7d1eecf5064..235d1cb2766190df8588982efe295a47bd80c74b 100644
 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc
 +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
@@ -126,6 +126,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
-index 69e0de500fa796a39774607d3b5378f8141a2846..dc8cd5a73342ede683c39ea6d47b79cc5ea06f10 100644
+index e326ae815ea7fe2bd8b867868f1752b648c6c01f..1633aaa85878915e0468f44ef8b98d52d75b1dc0 100644
 --- a/chrome/browser/ui/webui/settings/people_handler.cc
 +++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -855,7 +855,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) {
@@ -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 4419c80e874b26a4e36ec6e07c6d54638062a831..1ade38d17b75870ed6fd70453d5cc8c1c9c6441c 100644
+index d9f3037dbda7cf2add6dd0ec3946d7ff9bcaaf0b..036e2a8ffd6cf2592cf03f740122e848497e4a4c 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2484,6 +2484,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -2441,6 +2441,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 0b2ebbd8c1f33bccc3723157243c1cf6fc78c76b..17c90ea4d1b4a2c79ebda253e286fc5cd7d67039 100644
+index 0f5493f32679e17705f9b5d12346e83a36acfe01..da2913db54ad17d919844ab82b48987b578347f6 100644
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -375,6 +375,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
-index 8bba0ceb4ced4a2874210f0fe8d4271163096c51..1dbcc3bf4b8b244d303581c70f5cadd019e96c2d 100644
+index 2fc0d6b3f182096aef2800fa493cc9cd71c354f7..f78073b1177d88592eb2ba63a56749a797e3f3d2 100644
 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
 +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
@@ -761,6 +761,7 @@ base::FilePath GetChromeAppsFolder() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd1bfa5103 100644
+index 4d104f4a9d4da9388c3ef4f7fbb618c00b4c0298..972cecd40c348e5e319e228daa4bd4ec12f7d298 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
@@ -61,6 +61,7 @@ source_set("channel_info") {
@@ -10,7 +10,7 @@ index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd
   public_deps = [
     "//base",
     "//components/version_info",
-@@ -147,6 +148,7 @@ static_library("common") {
+@@ -143,6 +144,7 @@ static_library("common") {
   ]
 
   public_deps = [
@@ -18,7 +18,7 @@ index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd
     ":available_offline_content_mojom",
     ":buildflags",
     ":channel_info",
-@@ -544,6 +546,7 @@ static_library("non_code_constants") {
+@@ -540,6 +542,7 @@ static_library("non_code_constants") {
     "//printing/buildflags",
     "//ui/base:buildflags",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
-index 2e1d52fd96771467f303936e042a8fda21fbe725..9af235bb7bd3fe460d14b4584f8be5d7fb3d34b8 100644
+index b3fc448575b68fbde67a57040896f88fb77cf54c..7be27ac9fd258c15f14d8805b1b3fee2134374af 100644
 --- a/chrome/installer/mac/BUILD.gn
 +++ b/chrome/installer/mac/BUILD.gn
-@@ -14,6 +14,7 @@ group("mac") {
+@@ -18,6 +18,7 @@ group("mac") {
 }
 
 _packaging_dir = "$root_out_dir/$chrome_product_full_name Packaging"
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index 890f971dd2651a17e4c07bacd22950477c8e8405..5877960c9cadf45b5586920ff76557aa51e99ae9 100644
+index a75484da690fc22614e4a5615aec727b6d763fd5..11086c2d5c5339e12ca4a67a543f48a1c295e799 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
-@@ -12,6 +12,7 @@ import("//third_party/icu/config.gni")
+@@ -13,6 +13,7 @@ import("//third_party/icu/config.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
@@ -10,7 +10,7 @@ index 890f971dd2651a17e4c07bacd22950477c8e8405..5877960c9cadf45b5586920ff76557aa
 
 declare_args() {
   # The Chrome archive is compressed in official builds to reduce the size of
-@@ -192,6 +193,9 @@ template("generate_mini_installer") {
+@@ -194,6 +195,9 @@ template("generate_mini_installer") {
       "//third_party/icu:icudata",
       chrome_dll_target,
     ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index 8921aee102cba12388edeb7f29ab1edf1b40115d..28fecdc2967bc0d377bcdea053264be3ace4bff1 100644
+index fb7fa9ff4ed24743bd57a5617167525ebcf03890..a7d64f6e41bee490f0f7410278b56edf4eb2f100 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -193,6 +193,7 @@ static_library("renderer") {
+@@ -214,6 +214,7 @@ static_library("renderer") {
     "//v8",
   ]
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 8d6c5b93ec076efecd900883c9012ab0c9e79398..8e87a1647d3f13eb164b88c2231f1315a17dcd9b 100644
+index 7dbbe8742ca4f680ac99b5e286f7522e2b91dc14..64a0ac991d6a534c594b49d8f0beed529c12d985 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -479,7 +479,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -480,7 +480,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
       ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher());
 #endif
   content_settings::ContentSettingsAgentImpl* content_settings =
@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index ebc067f99c6f1dc036e687088dfff4bf50b05e4e..10e38f11d6fde74f7b3a5902585c190a2b243e4f 100644
+index b76ed96d41c174aaf225e35b72d03b9f870b3d70..6adea12808104134ac67275716b0c1e22b99238d 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -230,6 +230,7 @@ class ChromeContentRendererClient
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index fb795ad06ee72129d0acb713c2cc707b86c87184..c3b2e0d8dfc7890349add3fa8e8827df5eba4184 100644
+index 95fd449c6d532adf5231540ea4bd2be519ad6040..7512356b1e71f2a587aa764e7fb68eb2cb3153a5 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -866,6 +866,7 @@ if (!is_android) {
+@@ -868,6 +868,7 @@ if (!is_android) {
       "//v8",
     ]
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
-index d160f84e5e4a0a89e3aba47b9b75bff9fc418115..907d7c6f6805d7a699ef1d3d60730ab37b84751e 100644
+index 011c8898386fff3bc433759286fe94f3d53c4800..1f5b8e034a53edd29605e621f8755bbee0026020 100644
 --- a/chrome/test/base/testing_profile.cc
 +++ b/chrome/test/base/testing_profile.cc
-@@ -350,6 +350,7 @@ void TestingProfile::Init() {
+@@ -354,6 +354,7 @@ void TestingProfile::Init() {
       EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -1,5 +1,5 @@
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
-index 1d6b82c8761cb0cc2dd4cb49f49c18f920e95fe0..41bbe8bb7c1872bf319ed769f839cc52a3f51c0f 100644
+index 77c61d9546adb6bff55723c3d193c54099f8af94..f3e264d73f753235a7594864327c22ad996ecd7d 100644
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
@@ -28,6 +28,7 @@ static_library("utility") {
@@ -1,8 +1,8 @@
 diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
-index 9660f26b0af22ac72c2b2533449a073dd9588c6c..e4084402c62a9d643ec9df1cfa2446361ab675da 100644
+index 99be30f27435b19fb512f0fc68440545f97c5227..1774d17abb03741cbb5c9bd55bc9af1c78541bf9 100644
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -338,6 +338,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
+@@ -345,6 +345,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
   services.Add(RunAssistantAudioDecoder);
 #endif
 #endif
@@ -1,8 +1,8 @@
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
-index c1bb12707ee01e92a35442198e520d6c4ff0a316..b84741bffbe00aa538d7d581798ea76329f22c53 100644
+index 317ef338f58763cd53a344731236e2a2a5b8a375..a6d9f97e484b656581858932a43d7d3905c70336 100644
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -302,6 +302,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -304,6 +304,7 @@ class BookmarkModel : public BookmarkUndoProvider,
     return weak_factory_.GetWeakPtr();
   }
 
@@ -1,5 +1,5 @@
 diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h
-index a9f9307c804e9af0353c16ac37ff28f5bc9759e8..297e151497040d3f79d058107491f373a27b6ce0 100644
+index 5a5f0d32ea458a33e5588ef99e45c2409508a555..4c71a4e0422a213929fd6085e5e0230b70fbf064 100644
 --- a/components/component_updater/component_updater_service.h
 +++ b/components/component_updater/component_updater_service.h
@@ -162,6 +162,7 @@ class OnDemandUpdater {
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc
-index ce7fb3005d4fbd377855b0cd060a4b66f2efa495..bf522128a13727e33b836262571688c63a97568c 100644
+index 5bf15c19254e1b63c85d8cd8cd01d8a71c0cd31d..ef97bd22f353a1bcd95db9f44618152a67a1962d 100644
 --- a/components/content_settings/browser/page_specific_content_settings.cc
 +++ b/components/content_settings/browser/page_specific_content_settings.cc
@@ -481,6 +481,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
-index 5ce9ad00c2c570c8d5c93cee2f3c9036749c4ebe..29deabeacaf6d7c8cb03d8c69ea85acb03b5b585 100644
+index 2ce3bb2ed29a1149d2495f1f12f33fb7805d30cb..8f50f601cafecf15692a63caa57ef1995b8255ae 100644
 --- a/components/content_settings/core/browser/BUILD.gn
 +++ b/components/content_settings/core/browser/BUILD.gn
-@@ -65,6 +65,7 @@ static_library("browser") {
+@@ -64,6 +64,7 @@ static_library("browser") {
     "//services/preferences/public/cpp",
     "//url",
   ]
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h
-index 4a9ce3a8eb9e5dcfe2b19a336b34f6cfdf68b8d8..97910be49844fc16bf758ff729d22ce2ee3df6af 100644
+index 7c16ebc5e335a73395eaba96166e5e351e4302da..222f3cc1d8591fca626362d3aad99b93f94c9e46 100644
 --- a/components/content_settings/core/browser/content_settings_pref_provider.h
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.h
-@@ -67,6 +67,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -64,6 +64,7 @@ class PrefProvider : public UserModifiableProvider {
   ContentSettingsPref* GetPref(ContentSettingsType type) const;
 
  private:
@@ -1,10 +1,10 @@
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
-index a7a88cf7c4503fa6a2ae8881a2f7ebc5cb401d4d..a3b991193680ad07fbee955db8fcbadea30c8e56 100644
+index b462833a618434afb05e4bdbbf4163f7079e5adb..5f702e3c0472446dbf7dfda4290466553324020a 100644
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -145,6 +145,7 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
-                              ResourceIdentifier(), &(rules->script_rules));
-   map->GetSettingsForOneType(ContentSettingsType::POPUPS, ResourceIdentifier(),
+                              &(rules->script_rules));
+   map->GetSettingsForOneType(ContentSettingsType::POPUPS,
                              &(rules->popup_redirect_rules));
 +  BRAVE_GET_RENDER_CONTENT_SETTING_RULES
 }
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
-index c6f6ff7ca3714e9f13f6694d446a34b9d8e65ea3..74b4f7b1bbcdf1573e1269cadebc0d5c61fd936c 100644
+index 4de6d5608a08863a7948111394758d692af0c0d5..ccfd01c0ecfb789b441d045ebf3fbe581278f087 100644
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
@@ -179,6 +179,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
-index 66254566b4860caeeb0f6bb209ca3b03ee8e30ff..bcef4b570894d9089b9b64a1534b0c7b27679149 100644
+index 5d2109d96d9ec6daf2a1dcd30c94d9431ee02254..febcb4fd9af7764254e94082e91a8448d906893f 100644
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
-@@ -78,6 +78,7 @@ struct RendererContentSettingRules {
+@@ -79,6 +79,7 @@ struct RendererContentSettingRules {
   ContentSettingsForOneType script_rules;
   ContentSettingsForOneType popup_redirect_rules;
   ContentSettingsForOneType mixed_content_rules;
@@ -1,8 +1,8 @@
 diff --git a/components/feed/features.gni b/components/feed/features.gni
-index b5325898a2e5fbf74cf987a3cd5266c54334a35a..feea62505af710ea62e68f49f71a50d3fae16f70 100644
+index a6d7cc641b74c980003ba38a5d0bc5ea6a6ee284..a015729d2b3d8aa6ec6d434a53035f35549f0985 100644
 --- a/components/feed/features.gni
 +++ b/components/feed/features.gni
-@@ -25,5 +25,5 @@ declare_args() {
+@@ -26,5 +26,5 @@ declare_args() {
 
 if (is_android && android_channel != "default") {
   # You probably don't want to build without either version in a Clank release.
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
-index 701a48d40a94269ccdb2a461604c5eddc36d22ba..80c63fdb6a9a309279f91795d69639718b2e3640 100644
+index 40ee7e58f1662ddd451b057a45ba3a309a826250..af0faa80885ce18931c91ba3e5d63f9d4f6e8106 100644
 --- a/components/omnibox/browser/BUILD.gn
 +++ b/components/omnibox/browser/BUILD.gn
-@@ -259,6 +259,7 @@ static_library("browser") {
+@@ -261,6 +261,7 @@ static_library("browser") {
     "//ui/base",
     "//ui/gfx",
   ]
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
-index 16a7ad1e5bb6ac4ac5e0336ebf719e3a1b847a95..bf522fd05adc418d1db5f0b54a9daeeb0ca51567 100644
+index afd567adb77b36ad4fde802174463856a689e72c..9cc59437254ef6b276aa40ba2a0b97817c68ded0 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -371,6 +371,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
+@@ -374,6 +374,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
       (*text == display_text_ || *text == url_for_editing_)) {
     *url_from_text = controller()->GetLocationBarModel()->GetURL();
     *write_url = true;
@@ -1,8 +1,8 @@
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
-index 94c8320c48f4f167dce9ba4dd2d3da8b67a27042..131037ab519cfd597605ea32c48aa9ff12479496 100644
+index 3de10082bfaa65366a1a4a05af3fd42b63e27f50..bed8f85f57d47c0339760555a661f3953c06e86c 100644
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -964,6 +964,7 @@ void PageInfo::PresentSitePermissions() {
+@@ -966,6 +966,7 @@ void PageInfo::PresentSitePermissions() {
       }
     }
 
@@ -1,8 +1,8 @@
 diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc
-index 8af82087dbb790e78a905dd3888c1db79d15511d..c2ec077204d8d7a56e833b2360e35d8c29a17b6e 100644
+index a3c71cbd3012ecff8bcc88719c36ae13742394e3..79a63acd7b4b6084e1f26c65ed692cbdb2e1a4c8 100644
 --- a/components/page_info/page_info_ui.cc
 +++ b/components/page_info/page_info_ui.cc
-@@ -642,6 +642,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(
+@@ -657,6 +657,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(
     SkColor related_text_color) {
   const gfx::VectorIcon* icon = &gfx::kNoneIcon;
   switch (info.type) {
@@ -1,8 +1,8 @@
 diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
-index 84f1561c00b7983cef8f91345d9ab4366cdd8671..3b332ab3cda0bf6582fc9814194d02986d39a14c 100644
+index c8b258c0ca3de8a4277804c167def8174df03a7b..b59250f74f78a785e6f580f6a1fba55b6ac6d02b 100644
 --- a/components/password_manager/core/browser/login_database.cc
 +++ b/components/password_manager/core/browser/login_database.cc
-@@ -1978,6 +1978,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
+@@ -1977,6 +1977,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
     EncryptionResult result = InitPasswordFormFromStatement(
         *statement, /*decrypt_and_fill_password_value=*/true, &primary_key,
         new_form.get());
@@ -1,8 +1,8 @@
 diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc
-index 7f6c5f760f5f7aa777da0689d91da4bd1416a0da..0d795a9d16eb5cd62d797bf5f39737c14a0dd917 100644
+index a3237754374bad111ac0dced25c9018718c8a2cb..56c303c4a72045c3e294166d8b3fdd09e7ca3bac 100644
 --- a/components/password_manager/core/browser/password_form_filling.cc
 +++ b/components/password_manager/core/browser/password_form_filling.cc
-@@ -202,6 +202,9 @@ LikelyFormFilling SendFillInformationToRenderer(
+@@ -215,6 +215,9 @@ LikelyFormFilling SendFillInformationToRenderer(
 
   bool wait_for_username =
       wait_for_username_reason != WaitForUsernameReason::kDontWait;
@@ -1,12 +1,71 @@
 diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h
-index 64358a516f01b2049e0228220ac19535ea5cab8b..c2a23a9d09d2855103ae866fe7e7f35e6ff10386 100644
+index a6fcca9147f97de0952d88931bc84c0c1cea77fa..a8b63bdf4266e7ea55c7815be4b71d43993b9c1b 100644
 --- a/components/permissions/permission_request.h
 +++ b/components/permissions/permission_request.h
-@@ -59,6 +59,7 @@ enum class PermissionRequestType {
-   PERMISSION_WINDOW_PLACEMENT = 25,
-   PERMISSION_FONT_ACCESS = 26,
-   PERMISSION_IDLE_DETECTION = 27,
+@@ -19,6 +19,66 @@ struct VectorIcon;
+ 
+ namespace permissions {
+ 
+<<<<<<< ours
+=======
+// Used for UMA to record the types of permission prompts shown.
+// When updating, you also need to update:
+//   1) The PermissionRequestType enum in tools/metrics/histograms/enums.xml.
+//   2) The PermissionRequestTypes suffix list in
+//      tools/metrics/histograms/histograms.xml.
+//   3) GetPermissionRequestString in
+//      chrome/browser/permissions/permission_uma_util.cc.
+//
+// The usual rules of updating UMA values applies to this enum:
+// - don't remove values
+// - only ever add values at the end
+enum class PermissionRequestType {
+  UNKNOWN = 0,
+  MULTIPLE = 1,
+  // UNUSED_PERMISSION = 2,
+  QUOTA = 3,
+  DOWNLOAD = 4,
+  // MEDIA_STREAM = 5,
+  REGISTER_PROTOCOL_HANDLER = 6,
+  PERMISSION_GEOLOCATION = 7,
+  PERMISSION_MIDI_SYSEX = 8,
+  PERMISSION_NOTIFICATIONS = 9,
+  PERMISSION_PROTECTED_MEDIA_IDENTIFIER = 10,
+  // PERMISSION_PUSH_MESSAGING = 11,
+  PERMISSION_FLASH = 12,
+  PERMISSION_MEDIASTREAM_MIC = 13,
+  PERMISSION_MEDIASTREAM_CAMERA = 14,
+  PERMISSION_ACCESSIBILITY_EVENTS = 15,
+  // PERMISSION_CLIPBOARD_READ = 16, // Replaced by
+  // PERMISSION_CLIPBOARD_READ_WRITE in M81.
+  PERMISSION_SECURITY_KEY_ATTESTATION = 17,
+  PERMISSION_PAYMENT_HANDLER = 18,
+  PERMISSION_NFC = 19,
+  PERMISSION_CLIPBOARD_READ_WRITE = 20,
+  PERMISSION_VR = 21,
+  PERMISSION_AR = 22,
+  PERMISSION_STORAGE_ACCESS = 23,
+  PERMISSION_CAMERA_PAN_TILT_ZOOM = 24,
+  PERMISSION_WINDOW_PLACEMENT = 25,
+  PERMISSION_FONT_ACCESS = 26,
+  PERMISSION_IDLE_DETECTION = 27,
 +  BRAVE_PERMISSION_REQUEST_TYPES
-   // NUM must be the last value in the enum.
-   NUM
- };
+  // NUM must be the last value in the enum.
+  NUM
+};
+
+// Used for UMA to record whether a gesture was associated with the request. For
+// simplicity not all request types track whether a gesture is associated with
+// it or not, for these types of requests metrics are not recorded.
+enum class PermissionRequestGestureType {
+  UNKNOWN,
+  GESTURE,
+  NO_GESTURE,
+  // NUM must be the last value in the enum.
+  NUM
+};
+
+>>>>>>> theirs
+ // Describes the interface a feature making permission requests should
+ // implement. A class of this type is registered with the permission request
+ // manager to receive updates about the result of the permissions request
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
-index 1d64d3ccd60b7aa9e5b0cc6eb6bb37801846f133..7881c45ca26c9a05b0f569d34fb98678763f7cbf 100644
+index a2d9c47f7e91830e7b71627f89928b54ad6897da..a312b3cbf996631e8c721f21604bd8046e10665f 100644
 --- a/components/permissions/permission_uma_util.cc
 +++ b/components/permissions/permission_uma_util.cc
@@ -50,7 +50,7 @@ namespace {
@@ -1,8 +1,8 @@
 diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
-index eb66a2d945650a81c3a3248975fb9deda036e51e..f11f019049297b7dd777a27b3a5bd4cd6a692784 100644
+index d95854ac6098e7b8b721575900f44e549bab9fc3..b87a60a2a7e926009265cd94d197e540036c017a 100644
 --- a/components/search_engines/BUILD.gn
 +++ b/components/search_engines/BUILD.gn
-@@ -194,6 +194,7 @@ json_to_struct("prepopulated_engines") {
+@@ -195,6 +195,7 @@ json_to_struct("prepopulated_engines") {
   schema_file = "prepopulated_engines_schema.json"
   namespace = "TemplateURLPrepopulateData"
   deps = [ ":search_engine_type" ]
@@ -1,8 +1,8 @@
 diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
-index c368f1cc5549dbfcf24230fc3858e0b066c35fa2..fb1ff87368b1738b16973ad4e91f3384d3cb310f 100644
+index e07af0706b0b02ed55bbfb1b42b2c3254eec0bbd..ebc7d9e827c2413cba9c96d2a81f5fc9f29f67e4 100644
 --- a/components/sync/BUILD.gn
 +++ b/components/sync/BUILD.gn
-@@ -274,6 +274,7 @@ static_library("rest_of_sync") {
+@@ -273,6 +273,7 @@ static_library("rest_of_sync") {
     "nigori/pending_local_nigori_commit.cc",
     "nigori/pending_local_nigori_commit.h",
   ]
@@ -1,8 +1,8 @@
 diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn
-index 4f8b54f717d114a16016308f52dba788818203ed..ae2e42997cdf1a192febe8c4bd497558ff1ae79c 100644
+index 584158fe8c69e383a8faa94a01f660e25d50fca5..d739d9e18eb9bdba5fa3265995f84868bc445fb8 100644
 --- a/components/sync/driver/BUILD.gn
 +++ b/components/sync/driver/BUILD.gn
-@@ -113,6 +113,7 @@ static_library("driver") {
+@@ -112,6 +112,7 @@ static_library("driver") {
   }
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -1,8 +1,8 @@
 diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h
-index 6115b3a8b3353cd2fee3dd63493c2c570415f902..f443515149d5faf7f97a80c4c8e68dcdd57a9552 100644
+index 36f3d4bedc9e7ecbc2a350ab6c9c5dafa04de11b..127c3cc3e930a99d024d4bf952a9963bc46d06e6 100644
 --- a/components/sync/driver/profile_sync_service.h
 +++ b/components/sync/driver/profile_sync_service.h
-@@ -247,6 +247,7 @@ class ProfileSyncService : public SyncService,
+@@ -253,6 +253,7 @@ class ProfileSyncService : public SyncService,
 
   static std::string GenerateCacheGUIDForTest();
 
--- a/Show More
+++ b/Show More