Updated patches from Chromium 102.0.4983.0 to Chromium 102.0.4987.0.

2022-05-13 18:01:40 +01:00
parent af94800d07
commit 67e524d181
45 changed files with 78 additions and 78 deletions
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 1e6b67849586eb4aa41b831aaae959d4f2ac514f..bc527c5727b7b97151916897b53b5b9a024ff5a1 100644
+index c49d23d14226c0c2ed2407bd09045c736bd3db75..b1a76f3358f3b962ae1df68f737c69db02c545ff 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4123,6 +4123,7 @@ if (is_android) {
+@@ -4127,6 +4127,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/task/TaskTraits.java",
       "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
     ]
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 191998bd48f7df22bd5ddb63fb3e62aee7480f8c..51378dc18f43426a8279f6e09a21a54d2bd390a0 100644
+index 70ec1dc26fcc6e1c18da3ef55ce7ebf5a16d9165..142448b8f6ee0ad1da440808c39751d10c73a22c 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
@@ -485,6 +485,7 @@ if (enable_java_templates) {
@@ -1,8 +1,8 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 427296f350788b3dbfbcec34e3157aa48913d3d7..53bf2c375b67b4930823e9830a7a53dcf47e7495 100644
+index f00e99b0cdca6e2bd1e79c22d752d6f3e47be0b5..9d708de95e9ac65ac8106b42a62311508c23622b 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1680,6 +1680,7 @@ config("chromium_code") {
+@@ -1675,6 +1675,7 @@ config("chromium_code") {
       ]
     }
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 9bad5f3f07e1a9a6c0f7d0d3b3afcfda2cb6d028..dd4e7d07d6ddc55d8b7387049b0280b645d5133d 100644
+index 6a072c35a6cdfabff1704bb297e443f09080961d..703237a9617bf56effcadbacf011e1248d279041 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
@@ -270,6 +270,7 @@ android_resources("chrome_app_java_resources") {
@@ -42,7 +42,7 @@ index 9bad5f3f07e1a9a6c0f7d0d3b3afcfda2cb6d028..dd4e7d07d6ddc55d8b7387049b0280b6
 }
 
 action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -2243,6 +2248,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2242,6 +2247,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 ee6c0a4c0dc687e60bb34044516c9801ffa0413f..3173279e6ff3c56dbd0d218fac6c9ef5d62ee8f9 100644
+index d677db6cadce3b7bd16450741b9cc283ce135f7e..d06996faf18084bbc44d5888dc662d33ed4833d8 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1230,3 +1230,4 @@ chrome_java_sources = [
+@@ -1235,3 +1235,4 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
 ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-index 0a3617a6ae2d906e3c6cb4523da02ba76dd6b33f..f87d791ed7c4c005dd06a28702a5fcd2e56b3660 100644
+index b9a36e2105e508fa149d8761ea767d986af2afd5..1fe592aed29eb50f0add82915299142bd12e177e 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -374,6 +374,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -375,6 +375,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
                 /* observer = */ this, offlinePageBridge);
 
         int maxRows = 2;
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index e7ad66ab7a784f9f2a79753e2508fc56c6714ff0..66b9024be8f7f0fd1c3ed78e3f036ef615041c0b 100644
+index 39c2f3f41ea24bc989a2fd9f341966721f34b300..4bfb96e5952cc5e81686f139ed0ac6ac22d78171 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2584,6 +2584,7 @@ static_library("browser") {
+@@ -2590,6 +2590,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 e230d139fb95930b68511c026c6d96d25071d032..db600b72bce8a786f56a04227953ec6dc65df7ce 100644
+index acfe572390ed19c0cddd7c8176239414036a3e7b..c602de660e527da2717fdd7b4b8b86b0b4207810 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -2931,6 +2931,7 @@ const FeatureEntry::Choice kAlwaysEnableHdcpChoices[] = {
+@@ -2968,6 +2968,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = {
 //
 // When adding a new choice, add it to the end of the list.
 const FeatureEntry kFeatureEntries[] = {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index a71defea17c38fc21f8c5c1b109f83dd8b84aeb6..877d0016c6709082cfd4ca8c235885cb878f643a 100644
+index 4e88500d983bd6af503ae76b9a0ab7c499aad4fe..ad7059de777756faafb8b17df72fbe4583cba7ae 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1338,6 +1338,7 @@ static_library("extensions") {
+@@ -1340,6 +1340,7 @@ static_library("extensions") {
   } else {
     sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-index 3ba07a022f4d3cd9cd19616548e4d74e0788f1d0..0928e9452535331196ca1b3c60fea7c3b4f3e261 100644
+index 9515376e628370c83e99000dd85b275d459074ce..db8675378618cc9e723e38fe61aaac6a30382cb3 100644
 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
 +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -158,6 +158,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
@@ -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 316b8bb56d72640f96f74e058de69b28e47e9629..fe4e39656256d0b96982101b7740838f9c1b52e3 100644
+index 0e39ecf68a51151c1c96c39a590d890f126aae8f..67564841085106b58ce2265742e555bb63d9b5a7 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -368,6 +368,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -367,6 +367,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
 };
 
 const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
-index aad1cd62c0d793de26b7a61de8ce28f85a9dcfc7..daba2889ee33dd490daccea0ccfdbdd7b9d74c78 100644
+index 84e9eb4616d93ea36c00c49b8622bf31fd4d98cf..828d050a3d003a96307e3e68887a3d50620e76ac 100644
 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc
 +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
@@ -348,7 +348,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 2fab15e52614d604bb0cad9f5acc86b609b76f48..83c019cf33ebe9b198315d1a7143424f82cca5da 100644
+index e2d76eb46cd17522bfcc508d68c8fb20693527b3..7c231b0f0f0402071f39a6b19748c2c78783b48e 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
@@ -364,7 +364,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
@@ -1,8 +1,8 @@
 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 5ef77d88c8990c4db565e986f707f25f0e3ca620..5090f9fbd714fb1fb28edc398f1577746e1c14a1 100644
+index c068761b5c0d0431cac5d456347ff4541cfa942a..224ceb9807bbdacb1f7a41cacd3e42268e3e3cc9 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -150,6 +150,7 @@ class RenderViewContextMenu
+@@ -149,6 +149,7 @@ class RenderViewContextMenu
   // Returns true if keyboard lock is active and requires the user to press and
   // hold escape to exit exclusive access mode.
   bool IsPressAndHoldEscRequiredToExitFullscreen() const;
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
-index a2da3e278433c579fa9184b208da9342d5676acb..c7362147428707747ee3001510256a49c50f3966 100644
+index ae4e4c8dac4209339e1dc0358a8299aacda1d8d8..5504ccb7c7f09a1247396308a7c6b47da3be79f1 100644
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
@@ -8,6 +8,7 @@ import {pageVisibility} from './page_visibility.js';
@@ -10,7 +10,7 @@ index a2da3e278433c579fa9184b208da9342d5676acb..c7362147428707747ee3001510256a49
 /**
  * Add all of the child routes that originate from the privacy route,
  * regardless of whether the privacy section under basic or advanced.
-@@ -215,6 +216,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
+@@ -218,6 +219,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
       // </if>
     }
   }
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts
-index 2ba49e1b624bff534de65a827c1e49046c2ce04c..ef69419593f5e79eb0211f51f8ef48e04c8cffa3 100644
+index 9ba653f21b482c02b759282bb1c6bfacb04d0f55..5a2cda173defa66cc602ee29cb94cba8f21832f7 100644
 --- a/chrome/browser/resources/settings/settings_routes.ts
 +++ b/chrome/browser/resources/settings/settings_routes.ts
-@@ -87,4 +87,5 @@ export type SettingsRoutes = {
+@@ -88,4 +88,5 @@ export type SettingsRoutes = {
   SYNC_ADVANCED: Route,
   SYSTEM: Route,
   TRIGGERED_RESET_DIALOG: Route,
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 996e49fad5ecdffcb783195b2d85cbf4629a0e8e..5d65deb195fc01a73906e514b75d2f3cb88b6d10 100644
+index 77b3bcffd732188cccdf2d830f9bd3af4c1b3835..7007a4c44866c8cfb5ff4effd98970ae4a4f5157 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -646,6 +646,7 @@ static_library("ui") {
+@@ -650,6 +650,7 @@ static_library("ui") {
     "//ui/webui",
     "//v8:v8_version",
   ]
@@ -10,7 +10,7 @@ index 996e49fad5ecdffcb783195b2d85cbf4629a0e8e..5d65deb195fc01a73906e514b75d2f3c
 
   # TODO(crbug/925153): Remove this circular dependency.
   allow_circular_includes_from = [
-@@ -3815,10 +3816,13 @@ static_library("ui") {
+@@ -3820,10 +3821,13 @@ static_library("ui") {
       ]
       deps += [ "//google_update" ]
     } else {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-index 8a65c531756a7165ac23ebfb466ea0da095b1e13..a3346019cc93fffe63821b04904a95e93dea2b23 100644
+index 3493b718cb952fb363ba2496ed6924d993f132cd..30cd6db2c6efe70c0ef68b114f442f420241e091 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-@@ -62,7 +62,6 @@ ExtensionActionViewController::Create(
+@@ -63,7 +63,6 @@ ExtensionActionViewController::Create(
     Browser* browser,
     ExtensionsContainer* extensions_container) {
   DCHECK(browser);
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
-index f89600b5c3b180ae4466519c89cbe349932acac6..804269865775c6db21a93ea497dd533460818149 100644
+index cdd4882eb906ac6ee8fb5dd590a1da3c70445c4a..3238041d6a32e893a5671412452e65c85ad9f7f7 100644
 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
 +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -155,6 +155,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index 89e4f27b2359c6d11413413f753a2271182da100..c490322b5cf24be68ab2b1da464925341f27157f 100644
+index 0ace4d8d7aa7fd7f2618789b670d1a3e1746b6a2..1143eaf6efb4cdc0bb6eba503b43fb01b9cedd93 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -610,4 +610,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -611,4 +611,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,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index 68c047f2ec4d625a04aa33d30f24e41154375d87..ca6da400355ba7b7f357c7edfae02a4adcfb12d4 100644
+index 233e0a48c98a1be970c83b1df0d11c04696b584a..fbdfc2fd3bcc5613755bfb75e0f59be2b50f7fb9 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -975,6 +975,7 @@ void BookmarkBarView::Layout() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
-index a9a8e1e6220d9a182f31e66775d50dad54303b07..c89bf5d350a0827bf9acd3c09ff423e76f60837d 100644
+index 75b245723b424cd4575aa5fac437491ca21d1871..b52bfd75b5004d18b288eff27f54b4d8f932c307 100644
 --- a/chrome/browser/ui/views/frame/browser_view.h
 +++ b/chrome/browser/ui/views/frame/browser_view.h
-@@ -743,6 +743,7 @@ class BrowserView : public BrowserWindow,
+@@ -748,6 +748,7 @@ class BrowserView : public BrowserWindow,
       const std::map<std::string, std::string>& extra_data) override;
 #endif
 
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
-index 4ccba4207c78c294fa1fedd893e9a78e8ce50a3c..7262687027083dfd116dcb8610df75664b2aad21 100644
+index 9073fb2d0916ff47dcbf4cf36a142ab395cd9425..33bc473781baecefdade929c250bb5cd8e24d5a0 100644
 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
 +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
-@@ -571,6 +571,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
+@@ -572,6 +572,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
   const float corner_radius = highlight_bounds.height() / 2.f;
   const SkRect rect = RectToSkRect(highlight_bounds);
 
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index 8737b880da2f0d2f0760ca2238323a539bb7f0f9..7d424158c140fbba243e88901b15f3f5e1519da2 100644
+index bbec78cfd639ef806f412454a4434bc817fb181d..a9697a2fb8d7cbfd5e931c351a4234af29f62415 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -667,6 +667,7 @@ void LocationBarView::Layout() {
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index 3322aea2a95a03a965b83934dd672381b5f0594a..7070a309fa5c112f55eab307477679aa5f56cdf1 100644
+index e098eb1932aafa558dc82a190eea526af1be1ac5..662727fbab2e86bc31fd3c324ef059ee26c8f5a2 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -1409,6 +1409,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -1412,6 +1412,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 4a50fdd3dc6535a67f10235c9076c40feccb8704..019303e5a69a6fe3aaa4b0144fcb3bdec18d2739 100644
+index 6a841a275a59524193154ef594f29e2dbaf1e4d0..d951ab3ae97f1aa4d2b8b9c813810dd4ba55aeec 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
@@ -86,6 +86,7 @@ source_set("channel_info") {
@@ -10,7 +10,7 @@ index 4a50fdd3dc6535a67f10235c9076c40feccb8704..019303e5a69a6fe3aaa4b0144fcb3bde
 }
 
 source_set("ini_parser") {
-@@ -518,6 +519,7 @@ static_library("non_code_constants") {
+@@ -514,6 +515,7 @@ static_library("non_code_constants") {
     "//printing/buildflags",
     "//ui/base:buildflags",
   ]
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1ec0c40436ced97e830411ce352b601f9723718a..15b5b72867ce196680d48252c0927d1af2e30da2 100644
+index 0664182904fb067b6ac2cbbb029a283b6a6c5f6d..0fe85c815bb4312c40d3b8f27d1696466d73ce3a 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -305,6 +305,7 @@ static_library("test_support") {
+@@ -306,6 +306,7 @@ static_library("test_support") {
     "//ui/gl",
   ]
 
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 101b01f953117f24f82eedc59a310ac50ceaa49d..e2ed125091a2bf4cd6f33dda3db89476b4dc9036 100644
+index 6c14e1dd0ec9df4f313dd8866d88682e66edf81e..986d9e6f7e1d43e6d6e860443e0ab13f2d008218 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -191,6 +191,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal(
+@@ -192,6 +192,7 @@ ContentSetting CookieSettings::GetCookieSettingInternal(
   DCHECK(value.is_int());
   ContentSetting setting = ValueToContentSetting(value);
   bool block = block_third && is_third_party_request;
@@ -1,5 +1,5 @@
 diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h
-index 6eeb4e0660e945c78a3d535ac38dad6e326ca982..e9d68787471eb13a247381d68775a469c48254e6 100644
+index dec048d7750ceb43751111542abae5584ad6eb04..29b01915c00d9022da490ccc7aa9cbfa03f4a5a1 100644
 --- a/components/history/core/browser/history_types.h
 +++ b/components/history/core/browser/history_types.h
@@ -48,6 +48,8 @@ enum VisitSource {
@@ -1,8 +1,8 @@
 diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
-index 56f33c3d8b2f782a1297dd99d8982e7ea5a0f65d..1e19f5abe05486b425ed65ca342fe7acc8ca069d 100644
+index 7c6aaf572729553e52796e4ba73de621488ff208..51eb52c96134ac288b2a7cbdd034d0035ab69c79 100644
 --- a/content/browser/renderer_host/navigation_controller_impl.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl.cc
-@@ -3351,16 +3351,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
+@@ -3349,16 +3349,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
   // Note: we intentionally leave the pending entry in place for renderer debug
   // URLs, unlike the cases below where we clear it if the navigation doesn't
   // proceed.
@@ -1,8 +1,8 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index a7bda4f1b3cddecb0369fc53760c23bdb19cb1ed..7351263002a81cd5031b538e779c60a94929269d 100644
+index ea6acd7b55b69b79eafcc8102953f0a423fc8f2c..20e6fc00fe37fb5a00d819fe4279096d7791e87b 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -2641,6 +2641,7 @@ void NavigationRequest::OnRequestRedirected(
+@@ -2646,6 +2646,7 @@ void NavigationRequest::OnRequestRedirected(
   common_params_->url = redirect_info.new_url;
   common_params_->method = redirect_info.new_method;
   common_params_->referrer->url = GURL(redirect_info.new_referrer);
@@ -10,7 +10,7 @@ index a7bda4f1b3cddecb0369fc53760c23bdb19cb1ed..7351263002a81cd5031b538e779c60a9
   common_params_->referrer = Referrer::SanitizeForRequest(
       common_params_->url, *common_params_->referrer);
 
-@@ -3975,6 +3976,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -3980,6 +3981,7 @@ void NavigationRequest::OnStartChecksComplete(
   headers.MergeFrom(TakeModifiedRequestHeaders());
   begin_params_->headers = headers.ToString();
 
@@ -1,8 +1,8 @@
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index d64b78aa922e6c1bca70f69948a0074e91f57081..ce65b60fa1aeb502aea8c02fb09de4ececaf75f8 100644
+index d6ad990189520f7fc15e04c1c4bd03588d3ee81e..b6ff0c62332235d9ea397e6a15e2af9be377b216 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1976,6 +1976,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1970,6 +1970,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual ui::AXMode GetAXModeForBrowserContext(
       BrowserContext* browser_context);
 
@@ -1,5 +1,5 @@
 diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h
-index a0103760ba4f577fda856801485755a4d0556e21..79493eb4379129e4e8d32b2db4e66082f2c5663e 100644
+index f812337197424ebcea49f0c37591c3f0a1a06d2e..9b16ab266949f9877c4ff4d3cff2ccaadaf8b3bb 100644
 --- a/extensions/renderer/native_extension_bindings_system.h
 +++ b/extensions/renderer/native_extension_bindings_system.h
@@ -41,6 +41,7 @@ class NativeExtensionBindingsSystem {
@@ -1,5 +1,5 @@
 diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
-index fc16edc84021e85b20f3c73e30938e90fbb6ffc8..3b248dc8316b604b9a98185f28f6d8c55c7184f3 100644
+index 4175a190794d10b86dc6176dd2fce377fb23473b..3d36d8e492e100f544e9b16351933fa4f9261b30 100644
 --- a/ios/chrome/browser/prefs/browser_prefs.mm
 +++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -205,6 +205,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -10,7 +10,7 @@ index fc16edc84021e85b20f3c73e30938e90fbb6ffc8..3b248dc8316b604b9a98185f28f6d8c5
 }
 
 void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
-@@ -317,6 +318,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -322,6 +323,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kSigninAllowedByPolicy, true);
 
   registry->RegisterBooleanPref(kShowReadingListInBookmarkBar, true);
@@ -1,8 +1,8 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index ae7601d9fd29e302aa248f0888f0c3d809fe6873..6db39477a103d2c0c295435573a7d7607e041c7b 100644
+index a6f8d5595183fb8bf20fb41d2f57d332d14ee9eb..1f5afba00c42f9eb739d867ead243ef4680fde8b 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1137,6 +1137,7 @@ component("net") {
+@@ -1138,6 +1138,7 @@ component("net") {
       "reporting/reporting_uploader.h",
     ]
   }
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index 8eec9c4156d7c47cc635d73f2df9680c196e596c..e5d344efba68341c6c021f51f2fd9f009ab4de74 100644
+index db8dd0e8fd0f71895b64a4a666b6633ad754fb09..2b93965f5ab991328a31e89990ff37b830b4c66a 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
@@ -359,6 +359,7 @@ component("core") {
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-index ed4fb441d7cc9c45c2560b08efb2c85ad7138a1d..b60c21c4274dbb7f5130bccda39f0798a6056123 100644
+index 8f8d65c6bc854999d7fc2a5a874c439d2692830e..94cd84966a55ebc1255daf8889f7566f2a53a793 100644
 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
@@ -262,6 +262,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-index 36326b20c4cfc37e940a2ad72b6d399a920e51c7..04c46265b3e8d534af7abbb089687c11c8dfb705 100644
+index 313ea4212605dbbab5b0a5efe9afd7a66eaff3d7..c3ceb3751fee1a2e458f5745f4d1d972becc1ab5 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-@@ -1006,6 +1006,7 @@ String HTMLCanvasElement::ToDataURLInternal(
+@@ -1005,6 +1005,7 @@ String HTMLCanvasElement::ToDataURLInternal(
     if (!data_buffer)
       return String("data:,");
 
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
-index 24aa67674d60d74face751d2d8e7b42878ea93d0..6cf17114df78ad6f264963314902a7e506d1300b 100644
+index 4e27b92d644ab77a99153ba9a442d2a3a14650e5..70453261cef08e9b7f68c23f8ca70d456aad900c 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
-@@ -317,6 +317,7 @@ class CORE_EXPORT HTMLCanvasElement final
+@@ -313,6 +313,7 @@ class CORE_EXPORT HTMLCanvasElement final
 
   bool IsPlaceholder() const override { return IsOffscreenCanvasRegistered(); }
 
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-index 8b1bfba3c7681e7b74dd1ba0277debc42e61b91f..cd029efc9359d52f66295b6d39d26ad443537440 100644
+index 59416d0a53c08cb7be7412086c7f3249873294d6..c591002f680d7d2f70fff001778d3540564c372c 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -909,6 +909,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -910,6 +910,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
   if (!canvas()->GetDocument().GetFrame())
     return MakeGarbageCollected<TextMetrics>();
 
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-index 37fda2cae9b9228386cf6e646c9acb9b52069cb4..a39ecee5013d3f661c264fc1c7c8ac0ffbb8e0fd 100644
+index d2775c93844a76603a686b88635356f42502f71e..5a9007e3661f9ba83ba3fba62c4a7bb2631a0aee 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -658,6 +658,8 @@ void MediaDevices::DevicesEnumerated(
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
-index a44f62fd4acbe71d961b52d1eaa0ab55609453bd..dd858a969465cc241ecd0b69487ba074d56268fe 100644
+index 8d2f6fcafaa3798c05a1855ee68d7bb3568652b8..3cbcbe436a9a3f74949d4aca4dcb09ea32829eeb 100644
 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
@@ -5238,6 +5238,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
-index 62d4121f7078b90cc08ba72bb53b5c96f73c0a31..c47dd22f421ee71473304484ab0ef26b808745a6 100644
+index 4c9aea8382f49fbd6119a69c54bce3e5472b406d..6fcdd469e9908c5a62f807708e637bd6a30ae1e0 100644
 --- a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
 +++ b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
-@@ -173,6 +173,7 @@ scoped_refptr<FontData> FontFallbackList::GetFontData(
+@@ -175,6 +175,7 @@ scoped_refptr<FontData> FontFallbackList::GetFontData(
           GetFontSelector()->ReportFontLookupByUniqueOrFamilyName(
               curr_family->FamilyName(), font_description,
               DynamicTo<SimpleFontData>(result.get()));
@@ -1,8 +1,8 @@
 diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm
-index d7c4d1b9c950a3f2bb950effb71480613f1b2c01..f4630a54deaf48a07d9c4eb17b7930399a3bd2fc 100644
+index e36eedc550ec25052b5d574c0137ee634ef4260b..ece5397ce7fd37c29e59dfffd78a3e87aa64389f 100644
 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm
 +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
-@@ -1986,6 +1986,7 @@ - (NSAttributedString*)accessibilityAttributedStringForRange:(NSRange)range {
+@@ -1985,6 +1985,7 @@ - (NSAttributedString*)accessibilityAttributedStringForRange:(NSRange)range {
   if (!_node)
     return nil;
 
@@ -1,5 +1,5 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index be753e5ea42cc8757b0e7f9a21aa12b40f1928f2..2eea3dd87d9057764e6e81c067a79e3da990cba6 100644
+index 244b208e6a7872ea4d25fcf74a78abc9248a9ac3..22732a2a23acdb821bfc7a8700b85ca3e886c8c0 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
@@ -470,6 +470,7 @@ component("base") {