Update to Chromium version 93.0.4577.15

2025-06-05 21:39:12 +02:00 · 2021-07-28 21:29:46 -04:00
parent 0cfa65b48c
commit 2d46bb789e
61 changed files with 277 additions and 276 deletions
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,5 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 {
-  'chromium_checkout': 'refs/tags/93.0.4577.0'
+  'chromium_checkout': 'refs/tags/93.0.4577.15',
  'depot_tools_checkout': '981189acae'
 }
--- a/patch/patches/base_sandbox_2743.patch
+++ b/patch/patches/base_sandbox_2743.patch
@@ -1,5 +1,5 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index 576bd49a6198f..d5872f293f7cc 100644
+index 576bd49a6198..d5872f293f7c 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
@@ -37,7 +37,7 @@ index 576bd49a6198f..d5872f293f7cc 100644
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 diff --git base/hash/md5.h base/hash/md5.h
-index 8a49f08dcb04d..2f03d7a6d1b34 100644
+index 8a49f08dcb04..2f03d7a6d1b3 100644
 --- base/hash/md5.h
 +++ base/hash/md5.h
@@ -10,8 +10,9 @@
@@ -52,7 +52,7 @@ index 8a49f08dcb04d..2f03d7a6d1b34 100644
 #else
 #include "base/hash/md5_boringssl.h"
 diff --git base/hash/sha1.h base/hash/sha1.h
-index 5bb10fe069850..206344d0fd3b1 100644
+index 5bb10fe06985..206344d0fd3b 100644
 --- base/hash/sha1.h
 +++ base/hash/sha1.h
@@ -14,7 +14,9 @@
--- a/patch/patches/base_string_piece_1049498.patch
+++ b/patch/patches/base_string_piece_1049498.patch
@@ -1,5 +1,5 @@
 diff --git base/strings/string_piece.h base/strings/string_piece.h
-index 5ceb3a40eb01b..89476bfa41e9b 100644
+index 5ceb3a40eb01..89476bfa41e9 100644
 --- base/strings/string_piece.h
 +++ base/strings/string_piece.h
@@ -23,6 +23,7 @@
--- a/patch/patches/browser_scheduler.patch
+++ b/patch/patches/browser_scheduler.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
-index c04efa1296318..8c8515cb74a2b 100644
+index c04efa129631..8c8515cb74a2 100644
 --- content/browser/scheduler/browser_task_executor.cc
 +++ content/browser/scheduler/browser_task_executor.cc
@@ -269,7 +269,7 @@ BrowserTaskExecutor::OnUserInputStart() {
--- a/patch/patches/browser_security_policy_1081397.patch
+++ b/patch/patches/browser_security_policy_1081397.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
-index eefad1a677606..7318d223a63d0 100644
+index eefad1a67760..7318d223a63d 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
@@ -1721,6 +1721,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
@@ -20,7 +20,7 @@ index eefad1a677606..7318d223a63d0 100644
           // TODO(wjmaclean): We should update the ProcessLock comparison API
 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
-index 5b830ecbb4a47..39b32f681233e 100644
+index 5b830ecbb4a4..39b32f681233 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
@@ -5606,6 +5606,12 @@ url::Origin
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@@ -1,5 +1,5 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index 13ed917c81281..5f7bf7cbf5ae9 100644
+index 13ed917c8128..5f7bf7cbf5ae 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
@@ -1855,8 +1855,6 @@ config("thin_archive") {
--- a/patch/patches/chrome_browser.patch
+++ b/patch/patches/chrome_browser.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 0d81f08e66b1e..eba77d4116945 100644
+index 0d81f08e66b1..eba77d411694 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
--- a/patch/patches/chrome_browser_background_mode_1100085.patch
+++ b/patch/patches/chrome_browser_background_mode_1100085.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
-index dd4c916b7581a..c27d72bf53c9b 100644
+index dd4c916b7581..c27d72bf53c9 100644
 --- chrome/browser/app_controller_mac.mm
 +++ chrome/browser/app_controller_mac.mm
@@ -31,6 +31,7 @@
@@ -57,7 +57,7 @@ index dd4c916b7581a..c27d72bf53c9b 100644
 void OpenUrlsInBrowserWithProfile(const std::vector<GURL>& urls,
 diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
-index a7657cb6e5d5e..d6c6f3225fcb6 100644
+index a7657cb6e5d5..d6c6f3225fcb 100644
 --- chrome/browser/browser_process.h
 +++ chrome/browser/browser_process.h
@@ -198,9 +198,9 @@ class BrowserProcess {
@@ -72,7 +72,7 @@ index a7657cb6e5d5e..d6c6f3225fcb6 100644
       std::unique_ptr<BackgroundModeManager> manager) = 0;
 #endif
 diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
-index 1149818336011..0e454299e2622 100644
+index 114981833601..0e454299e262 100644
 --- chrome/browser/browser_process_impl.cc
 +++ chrome/browser/browser_process_impl.cc
@@ -970,18 +970,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -96,7 +96,7 @@ index 1149818336011..0e454299e2622 100644
     std::unique_ptr<BackgroundModeManager> manager) {
   background_mode_manager_ = std::move(manager);
 diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
-index 2bb0b1ec912b0..2235c7b56a456 100644
+index 2bb0b1ec912b..2235c7b56a45 100644
 --- chrome/browser/browser_process_impl.h
 +++ chrome/browser/browser_process_impl.h
@@ -174,8 +174,8 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -110,7 +110,7 @@ index 2bb0b1ec912b0..2235c7b56a456 100644
       std::unique_ptr<BackgroundModeManager> manager) override;
 #endif
 diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
-index fb05f448cb250..e94c28d492e7a 100644
+index fb05f448cb25..e94c28d492e7 100644
 --- chrome/browser/lifetime/browser_close_manager.cc
 +++ chrome/browser/lifetime/browser_close_manager.cc
@@ -151,12 +151,14 @@ void BrowserCloseManager::CloseBrowsers() {
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
-index ba0c5c3fc0446..b4df9af95ecd1 100644
+index ba0c5c3fc044..b4df9af95ecd 100644
 --- chrome/browser/browser_about_handler.cc
 +++ chrome/browser/browser_about_handler.cc
@@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
@@ -13,7 +13,7 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644
   return false;
 }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index 8fdddbadf5e9a..4c5ea3c875db2 100644
+index 8fdddbadf5e9..4c5ea3c875db 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
@@ -262,6 +262,20 @@
@@ -200,7 +200,7 @@ index 8fdddbadf5e9a..4c5ea3c875db2 100644
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index 2908b4b70815d..9eb3be7b231ad 100644
+index 2908b4b70815..9eb3be7b231a 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@@ -294,7 +294,7 @@ index 2908b4b70815d..9eb3be7b231ad 100644
   // The following factory is used for chrome update coalescing.
 diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
-index a4af0836da1aa..bdf26e401d563 100644
+index a4af0836da1a..bdf26e401d56 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
@@ -456,6 +456,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -312,7 +312,7 @@ index a4af0836da1aa..bdf26e401d563 100644
   // tab helpers, so the entire set of tab helpers needs to be set up
   // immediately.
 diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
-index 72ad734682957..668a1b950df6b 100644
+index 72ad73468295..668a1b950df6 100644
 --- chrome/browser/ui/browser_tabstrip.cc
 +++ chrome/browser/ui/browser_tabstrip.cc
@@ -30,9 +30,13 @@ void AddTabAt(Browser* browser,
--- a/patch/patches/chrome_browser_content_settings.patch
+++ b/patch/patches/chrome_browser_content_settings.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
-index 173582c7c4904..bbf57904b6de9 100644
+index 173582c7c490..bbf57904b6de 100644
 --- chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -8,6 +8,7 @@
@@ -54,7 +54,7 @@ index 173582c7c4904..bbf57904b6de9 100644
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   SupervisedUserSettingsService* supervised_service =
 diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
-index 610f6d942998c..f822df04ff07d 100644
+index 610f6d942998..f822df04ff07 100644
 --- components/content_settings/renderer/content_settings_agent_impl.cc
 +++ components/content_settings/renderer/content_settings_agent_impl.cc
@@ -170,7 +170,7 @@ ContentSetting GetContentSettingFromRulesImpl(
--- a/patch/patches/chrome_browser_context_menus.patch
+++ b/patch/patches/chrome_browser_context_menus.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index 408566907e832..1266687ccd665 100644
+index 00cffaf573b2..e324126c2dae 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -273,6 +273,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -274,6 +274,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
   return callback.get();
 }
@@ -16,7 +16,7 @@ index 408566907e832..1266687ccd665 100644
 enum class UmaEnumIdLookupType {
   GeneralEnumId,
   ContextSpecificEnumId,
-@@ -484,6 +491,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -485,6 +492,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
     return 1;
@@ -27,7 +27,7 @@ index 408566907e832..1266687ccd665 100644
   id = CollapseCommandsForUMA(id);
   const auto& map = GetIdcToUmaMap(type);
   auto it = map.find(id);
-@@ -656,6 +667,14 @@ RenderViewContextMenu::RenderViewContextMenu(
+@@ -657,6 +668,14 @@ RenderViewContextMenu::RenderViewContextMenu(
   system_app_type_ = GetBrowser() && GetBrowser()->app_controller()
                          ? GetBrowser()->app_controller()->system_app_type()
                          : absl::nullopt;
@@ -42,7 +42,7 @@ index 408566907e832..1266687ccd665 100644
 }
 RenderViewContextMenu::~RenderViewContextMenu() = default;
-@@ -1022,6 +1041,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1024,6 +1043,12 @@ void RenderViewContextMenu::InitMenu() {
   // menu, meaning that each menu item added/removed in this function will cause
   // it to visibly jump on the screen (see b/173569669).
   AppendQuickAnswersItems();
@@ -55,7 +55,7 @@ index 408566907e832..1266687ccd665 100644
 }
 Profile* RenderViewContextMenu::GetProfile() const {
-@@ -2742,6 +2767,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
+@@ -2744,6 +2769,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
   *GetMenuShownCallback() = std::move(cb);
 }
@@ -69,7 +69,7 @@ index 408566907e832..1266687ccd665 100644
 RenderViewContextMenu::GetHandlersForLinkUrl() {
   ProtocolHandlerRegistry::ProtocolHandlerList handlers =
 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
-index 34b6152a222ec..b03c81bd076b8 100644
+index 34b6152a222e..b03c81bd076b 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -101,6 +101,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
@@ -96,7 +96,7 @@ index 34b6152a222ec..b03c81bd076b8 100644
   // "Use enhanced spell check" items.
   std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
 diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
-index 13a65de79e185..0901c4cade4f1 100644
+index 13a65de79e18..0901c4cade4f 100644
 --- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
 +++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
@@ -110,7 +110,7 @@ index 13a65de79e185..0901c4cade4f1 100644
   // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
   switch (command_id) {
 diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
-index b2513d5ca3ead..f1894f4e05385 100644
+index b2513d5ca3ea..f1894f4e0538 100644
 --- components/renderer_context_menu/render_view_context_menu_base.cc
 +++ components/renderer_context_menu/render_view_context_menu_base.cc
@@ -376,6 +376,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
@@ -132,7 +132,7 @@ index b2513d5ca3ead..f1894f4e05385 100644
   command_executed_ = true;
   RecordUsedItem(id);
 diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
-index 051953091fd4f..7e771526ce52a 100644
+index 051953091fd4..7e771526ce52 100644
 --- components/renderer_context_menu/render_view_context_menu_base.h
 +++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -82,6 +82,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
@@ -176,7 +176,7 @@ index 051953091fd4f..7e771526ce52a 100644
   bool IsCustomItemEnabled(int id) const;
 diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc
-index 2e2d05f91c646..85b256b2be9bd 100644
+index 2e2d05f91c64..85b256b2be9b 100644
 --- components/renderer_context_menu/render_view_context_menu_observer.cc
 +++ components/renderer_context_menu/render_view_context_menu_observer.cc
@@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) {
@@ -189,7 +189,7 @@ index 2e2d05f91c646..85b256b2be9bd 100644
 +  return false;
 +}
 diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h
-index b360a8eb4e820..6f9023a629046 100644
+index b360a8eb4e82..6f9023a62904 100644
 --- components/renderer_context_menu/render_view_context_menu_observer.h
 +++ components/renderer_context_menu/render_view_context_menu_observer.h
@@ -11,6 +11,10 @@ namespace content {
--- a/patch/patches/chrome_browser_net_export.patch
+++ b/patch/patches/chrome_browser_net_export.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index ac4bc7b9021ee..fefdb822c5b71 100644
+index ef291e5fc39d..7abde248d806 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@@ -29,7 +29,7 @@ index ac4bc7b9021ee..fefdb822c5b71 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -4878,6 +4884,7 @@ static_library("ui") {
+@@ -4879,6 +4885,7 @@ static_library("ui") {
   if (enable_basic_printing) {
     deps += [
       "//components/printing/browser",
@@ -38,7 +38,7 @@ index ac4bc7b9021ee..fefdb822c5b71 100644
     ]
     if (use_cups) {
 diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
-index fcd1f66b3a7a4..70ded321f5498 100644
+index fcd1f66b3a7a..70ded321f549 100644
 --- chrome/browser/ui/webui/net_export_ui.cc
 +++ chrome/browser/ui/webui/net_export_ui.cc
@@ -21,6 +21,7 @@
--- a/patch/patches/chrome_browser_profile_menu.patch
+++ b/patch/patches/chrome_browser_profile_menu.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
-index c00884e06f960..858fdb75529f8 100644
+index c00884e06f96..858fdb75529f 100644
 --- chrome/browser/profiles/profile_window.cc
 +++ chrome/browser/profiles/profile_window.cc
@@ -272,7 +272,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
@@ -14,7 +14,7 @@ index c00884e06f960..858fdb75529f8 100644
                               : profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
 diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
-index 8a93e597977b0..4d0faa950a2af 100644
+index 8a93e597977b..4d0faa950a2a 100644
 --- chrome/browser/ui/views/profiles/incognito_menu_view.cc
 +++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
@@ -37,7 +37,9 @@
@@ -29,7 +29,7 @@ index 8a93e597977b0..4d0faa950a2af 100644
   chrome::RecordDialogCreation(
 diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-index e8273f40a6d09..b5b21c30ba780 100644
+index e8273f40a6d0..b5b21c30ba78 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
--- a/patch/patches/chrome_browser_profiles.patch
+++ b/patch/patches/chrome_browser_profiles.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
-index d4654752a2132..5829ddeaa91a7 100644
+index d4654752a213..5829ddeaa91a 100644
 --- chrome/browser/profiles/off_the_record_profile_impl.cc
 +++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -628,7 +628,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
@@ -14,7 +14,7 @@ index d4654752a2132..5829ddeaa91a7 100644
 }
 diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
-index 01f72891d3035..050f4aa94c6d0 100644
+index 01f72891d303..050f4aa94c6d 100644
 --- chrome/browser/profiles/profile.cc
 +++ chrome/browser/profiles/profile.cc
@@ -86,6 +86,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@@ -52,7 +52,7 @@ index 01f72891d3035..050f4aa94c6d0 100644
 Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
   return CreateUnique(kDevToolsOTRProfileIDPrefix);
 diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
-index e3e819d9ecd87..ef8c6ebd1cf2e 100644
+index e3e819d9ecd8..ef8c6ebd1cf2 100644
 --- chrome/browser/profiles/profile.h
 +++ chrome/browser/profiles/profile.h
@@ -119,6 +119,10 @@ class Profile : public content::BrowserContext {
@@ -85,10 +85,10 @@ index e3e819d9ecd87..ef8c6ebd1cf2e 100644
   virtual bool IsSignedIn() = 0;
 diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
-index 5d87d4fff37ab..61d00177e036e 100644
+index 17926a44d919..d96b7264e5b4 100644
 --- chrome/browser/profiles/profile_impl.cc
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -929,7 +929,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
+@@ -951,7 +951,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
   otr_profiles_[otr_profile_id] = std::move(otr_profile);
@@ -100,7 +100,7 @@ index 5d87d4fff37ab..61d00177e036e 100644
   return raw_otr_profile;
 }
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index aef8964db423d..e15bc0dc20285 100644
+index aef8964db423..e15bc0dc2028 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
@@ -495,7 +495,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -113,7 +113,7 @@ index aef8964db423d..e15bc0dc20285 100644
 }
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index 915a95e287c58..0424e8bdd7d84 100644
+index 915a95e287c5..0424e8bdd7d8 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
@@ -119,7 +119,7 @@ class ProfileManager : public Profile::Delegate {
@@ -135,7 +135,7 @@ index 915a95e287c58..0424e8bdd7d84 100644
   // Returns the directory where the first created profile is stored,
   // relative to the user data directory currently in use.
 diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
-index 5e71c1f56da15..db5c46cb5f85f 100644
+index 5e71c1f56da1..db5c46cb5f85 100644
 --- chrome/browser/profiles/renderer_updater.cc
 +++ chrome/browser/profiles/renderer_updater.cc
@@ -8,6 +8,7 @@
--- a/patch/patches/chrome_browser_safe_browsing.patch
+++ b/patch/patches/chrome_browser_safe_browsing.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
-index 102a18a81e424..c530945922b1d 100644
+index 102a18a81e42..c530945922b1 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
@@ -27,6 +27,7 @@ static_library("safe_browsing") {
--- a/patch/patches/chrome_browser_themes.patch
+++ b/patch/patches/chrome_browser_themes.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
-index ca830ceefd5d5..8b3af9620670d 100644
+index ca830ceefd5d..8b3af9620670 100644
 --- chrome/browser/themes/theme_service.cc
 +++ chrome/browser/themes/theme_service.cc
@@ -27,6 +27,7 @@
@@ -42,7 +42,7 @@ index ca830ceefd5d5..8b3af9620670d 100644
   theme_syncable_service_ =
       std::make_unique<ThemeSyncableService>(profile_, this);
 diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
-index dc2350f0b2443..7f4b9283534f3 100644
+index dc2350f0b244..7f4b9283534f 100644
 --- chrome/browser/themes/theme_service_factory.cc
 +++ chrome/browser/themes/theme_service_factory.cc
@@ -7,6 +7,7 @@
--- a/patch/patches/chrome_plugins.patch
+++ b/patch/patches/chrome_plugins.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
-index 4cb831441aed4..ed0092720b63f 100644
+index 4cb831441aed..ed0092720b63 100644
 --- chrome/browser/plugins/plugin_info_host_impl.cc
 +++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -115,7 +115,7 @@ index 4cb831441aed4..ed0092720b63f 100644
   bool enabled = i < matching_plugins.size();
   if (!enabled) {
 diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
-index a0b3175223f3e..a1117001ad1fc 100644
+index a0b3175223f3..a1117001ad1f 100644
 --- chrome/browser/plugins/plugin_utils.cc
 +++ chrome/browser/plugins/plugin_utils.cc
@@ -5,6 +5,7 @@
@@ -151,7 +151,7 @@ index a0b3175223f3e..a1117001ad1fc 100644
   Profile* profile = Profile::FromBrowserContext(browser_context);
   const std::vector<std::string>& allowlist =
 diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
-index 88a87fd4d74bb..2815c9897d636 100644
+index 88a87fd4d74b..2815c9897d63 100644
 --- chrome/common/google_url_loader_throttle.cc
 +++ chrome/common/google_url_loader_throttle.cc
@@ -7,6 +7,7 @@
@@ -186,7 +186,7 @@ index 88a87fd4d74bb..2815c9897d636 100644
   // that the X-Frame-Options protection mechanism is set to either DENY or
   // SAMEORIGIN.
 diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
-index a6e34d86aa11c..1141f02719e9b 100644
+index a6e34d86aa11..1141f02719e9 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
@@ -919,6 +919,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -238,7 +238,7 @@ index a6e34d86aa11c..1141f02719e9b 100644
       }
     }
 diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
-index bc13113e725e0..2bc15de23ec4a 100644
+index bc13113e725e..2bc15de23ec4 100644
 --- content/browser/browser_plugin/browser_plugin_guest.h
 +++ content/browser/browser_plugin/browser_plugin_guest.h
@@ -113,6 +113,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
--- a/patch/patches/chrome_renderer.patch
+++ b/patch/patches/chrome_renderer.patch
@@ -1,5 +1,5 @@
 diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
-index 02cdf42567745..74fff92e5b6e1 100644
+index 02cdf4256774..74fff92e5b6e 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@@ -1,5 +1,5 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 495893eec9704..e967494683f19 100644
+index 495893eec970..e967494683f1 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
@@ -29,6 +29,7 @@
@@ -78,7 +78,7 @@ index 495893eec9704..e967494683f19 100644
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index dff0a32062f0e..9378b2a0be47f 100644
+index dff0a32062f0..9378b2a0be47 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@
@@ -118,7 +118,7 @@ index dff0a32062f0e..9378b2a0be47f 100644
 // of lacros-chrome is complete.
 #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index 95d1ebc190910..13cdfa52db108 100644
+index 95d1ebc19091..13cdfa52db10 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644
 +#endif
 }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 8650dd04f9c44..45ab4913bbe04 100644
+index 8650dd04f9c4..45ab4913bbe0 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
@@ -38,6 +38,7 @@
@@ -180,7 +180,7 @@ index 8650dd04f9c44..45ab4913bbe04 100644
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
 diff --git chrome/browser/notifications/alert_dispatcher_xpc.mm chrome/browser/notifications/alert_dispatcher_xpc.mm
-index ab4c2b03755d3..8e813496f9df6 100644
+index ab4c2b03755d..8e813496f9df 100644
 --- chrome/browser/notifications/alert_dispatcher_xpc.mm
 +++ chrome/browser/notifications/alert_dispatcher_xpc.mm
@@ -19,6 +19,7 @@
@@ -205,7 +205,7 @@ index ab4c2b03755d3..8e813496f9df6 100644
     base::mac::ScopedMachSendRight exceptionPort(
         crash_reporter::GetCrashpadClient().GetHandlerMachPort());
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index 3de6df64935e3..78a2bf3896e72 100644
+index 3de6df64935e..78a2bf3896e7 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -10,6 +10,7 @@
--- a/patch/patches/chrome_runtime_views.patch
+++ b/patch/patches/chrome_runtime_views.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
-index 57ef822f46944..06cef42aab9ed 100644
+index 57ef822f4694..06cef42aab9e 100644
 --- chrome/browser/ui/browser_command_controller.cc
 +++ chrome/browser/ui/browser_command_controller.cc
@@ -351,8 +351,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -31,7 +31,7 @@ index 57ef822f46944..06cef42aab9ed 100644
 void BrowserCommandController::InitCommandState() {
 diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
-index 3fca382fde67e..6adddf506bb16 100644
+index 3fca382fde67..6adddf506bb1 100644
 --- chrome/browser/ui/views/frame/browser_frame.cc
 +++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -69,15 +69,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@@ -106,7 +106,7 @@ index 3fca382fde67e..6adddf506bb16 100644
     // or not we always use the dark ui instance.
     if (base::FeatureList::IsEnabled(
 diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
-index 0ce7abdeb7d9f..8197a6bb7da98 100644
+index 0ce7abdeb7d9..8197a6bb7da9 100644
 --- chrome/browser/ui/views/frame/browser_frame.h
 +++ chrome/browser/ui/views/frame/browser_frame.h
@@ -54,7 +54,9 @@ enum class TabDragKind {
@@ -120,7 +120,7 @@ index 0ce7abdeb7d9f..8197a6bb7da98 100644
   // Initialize the frame (creates the underlying native window).
 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
-index f3239963d569a..2bee32af5a8dd 100644
+index 338c049c8116..6a1a97b37573 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -589,11 +589,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
@@ -234,7 +234,7 @@ index f3239963d569a..2bee32af5a8dd 100644
   MaybeInitializeWebUITabStrip();
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index 02f0019d7d324..2bcf69c2098ae 100644
+index 02f0019d7d32..2bcf69c2098a 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
@@ -114,7 +114,9 @@ class BrowserView : public BrowserWindow,
@@ -261,7 +261,7 @@ index 02f0019d7d324..2bcf69c2098ae 100644
   // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
   // interface to keep these two classes decoupled and testable.
 diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
-index 18a85f436bd97..0d6e4c9f916e7 100644
+index 18a85f436bd9..0d6e4c9f916e 100644
 --- chrome/browser/ui/views/frame/browser_view_layout.cc
 +++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -441,6 +441,12 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
@@ -278,7 +278,7 @@ index 18a85f436bd97..0d6e4c9f916e7 100644
   bool toolbar_visible = delegate_->IsToolbarVisible();
   int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
 diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-index bb4f5ff05c72e..2cd5634bc96b6 100644
+index bb4f5ff05c72..2cd5634bc96b 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -586,37 +586,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -336,7 +336,7 @@ index bb4f5ff05c72e..2cd5634bc96b6 100644
 }
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index 9fe383741657c..39b7adae6cfaf 100644
+index 9fe383741657..39b7adae6cfa 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -161,12 +161,13 @@ auto& GetViewCommandMap() {
@@ -365,7 +365,7 @@ index 9fe383741657c..39b7adae6cfaf 100644
   size_animation_.Reset(1);
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
-index 8346b612cfbe6..d7fc5440af829 100644
+index 8346b612cfbe..d7fc5440af82 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.h
 +++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -90,7 +90,8 @@ class ToolbarView : public views::AccessiblePaneView,
--- a/patch/patches/chrome_widevine.patch
+++ b/patch/patches/chrome_widevine.patch
@@ -1,5 +1,5 @@
 diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
-index 91bcefa2f0698..9a5759239e590 100644
+index 91bcefa2f069..9a5759239e59 100644
 --- third_party/widevine/cdm/BUILD.gn
 +++ third_party/widevine/cdm/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/chromeos/ui_mode.gni")
--- a/patch/patches/component_build.patch
+++ b/patch/patches/component_build.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
-index eec7a23a657a4..982efc615ab06 100644
+index eec7a23a657a..982efc615ab0 100644
 --- content/browser/devtools/devtools_instrumentation.h
 +++ content/browser/devtools/devtools_instrumentation.h
@@ -87,7 +87,7 @@ bool ApplyUserAgentMetadataOverrides(
@@ -12,7 +12,7 @@ index eec7a23a657a4..982efc615ab06 100644
     bool is_navigation,
     bool is_download,
 diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
-index eef661b3e0950..6c0dacfa4bc3a 100644
+index eef661b3e095..6c0dacfa4bc3 100644
 --- content/browser/renderer_host/input/synthetic_gesture_target_base.h
 +++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
@@ -9,6 +9,7 @@
@@ -34,7 +34,7 @@ index eef661b3e0950..6c0dacfa4bc3a 100644
   explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
   ~SyntheticGestureTargetBase() override;
 diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h
-index 57072bf1263ae..0a93446e4d21c 100644
+index 57072bf1263a..0a93446e4d21 100644
 --- content/common/content_switches_internal.h
 +++ content/common/content_switches_internal.h
@@ -15,7 +15,7 @@ class CommandLine;
@@ -47,7 +47,7 @@ index 57072bf1263ae..0a93446e4d21c 100644
 blink::mojom::V8CacheOptions GetV8CacheOptions();
 diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
-index 8003cd409ff37..8ac3fefade6de 100644
+index 8003cd409ff3..8ac3fefade6d 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
@@ -29,6 +29,7 @@ component("controller") {
@@ -68,7 +68,7 @@ index 8003cd409ff37..8ac3fefade6de 100644
   if (is_linux || is_chromeos) {
 diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
-index 86bbf620ff0d9..6c06b461c6da1 100644
+index 86bbf620ff0d..6c06b461c6da 100644
 --- ui/events/keycodes/BUILD.gn
 +++ ui/events/keycodes/BUILD.gn
@@ -19,6 +19,8 @@ source_set("xkb") {
@@ -81,7 +81,7 @@ index 86bbf620ff0d9..6c06b461c6da1 100644
     "//base",
     "//build:chromeos_buildflags",
 diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h
-index e1fefa4cead9e..8213402ff263d 100644
+index e1fefa4cead9..8213402ff263 100644
 --- ui/events/keycodes/keyboard_code_conversion_xkb.h
 +++ ui/events/keycodes/keyboard_code_conversion_xkb.h
@@ -9,6 +9,7 @@
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
-index 1891a950448c9..cf6cdb676edc9 100644
+index 1891a950448c..cf6cdb676edc 100644
 --- chrome/browser/download/download_target_determiner.cc
 +++ chrome/browser/download/download_target_determiner.cc
@@ -677,7 +677,7 @@ void IsHandledBySafePlugin(int render_process_id,
@@ -12,7 +12,7 @@ index 1891a950448c9..cf6cdb676edc9 100644
   if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
     // The GetPlugins call causes the plugin list to be refreshed. Once that's
 diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
-index 27f7028908745..35e1cdb72874f 100644
+index 27f702890874..35e1cdb72874 100644
 --- chrome/browser/plugins/chrome_plugin_service_filter.cc
 +++ chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -133,6 +133,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -24,7 +24,7 @@ index 27f7028908745..35e1cdb72874f 100644
     content::WebPluginInfo* plugin) {
   base::AutoLock auto_lock(lock_);
 diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h
-index 937d3d5bc84fd..ac327392dcf37 100644
+index 937d3d5bc84f..ac327392dcf3 100644
 --- chrome/browser/plugins/chrome_plugin_service_filter.h
 +++ chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -64,6 +64,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
@@ -36,7 +36,7 @@ index 937d3d5bc84fd..ac327392dcf37 100644
                          content::WebPluginInfo* plugin) override;
 diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
-index d0a5a12620bd3..a02e13bbd8154 100644
+index d0a5a12620bd..a02e13bbd815 100644
 --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
 +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle,
@@ -49,7 +49,7 @@ index d0a5a12620bd3..a02e13bbd8154 100644
       false /* allow_wildcard */, is_stale, &plugin_info,
       nullptr /* actual_mime_type */);
 diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
-index 6e2d09885b457..da23a0211754b 100644
+index 6e2d09885b45..da23a0211754 100644
 --- chrome/browser/ui/views/frame/browser_root_view.cc
 +++ chrome/browser/ui/views/frame/browser_root_view.cc
@@ -85,7 +85,7 @@ void OnFindURLMimeType(const GURL& url,
@@ -62,7 +62,7 @@ index 6e2d09885b457..da23a0211754b 100644
 #endif
 diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
-index 38f24359a5a25..3c724e29facbd 100644
+index 38f24359a5a2..3c724e29facb 100644
 --- content/browser/devtools/devtools_http_handler.cc
 +++ content/browser/devtools/devtools_http_handler.cc
@@ -575,7 +575,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -75,7 +75,7 @@ index 38f24359a5a25..3c724e29facbd 100644
                       GetContentClient()->browser()->GetUserAgent());
     version.SetString("V8-Version", V8_VERSION_STRING);
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index 4d0c1a27449d5..34bb0372c7f8f 100644
+index 4d0c1a27449d..34bb0372c7f8 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -631,6 +631,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -102,7 +102,7 @@ index 4d0c1a27449d5..34bb0372c7f8f 100644
   if (stale) {
 diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
-index 9be14f9a03219..00e2520112d81 100644
+index 9be14f9a0321..00e2520112d8 100644
 --- content/browser/plugin_service_impl.cc
 +++ content/browser/plugin_service_impl.cc
@@ -270,6 +270,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
@@ -124,7 +124,7 @@ index 9be14f9a03219..00e2520112d81 100644
       if (actual_mime_type)
         *actual_mime_type = mime_types[i];
 diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h
-index b0fb11b4d5ba7..1bce64c6b20ee 100644
+index b0fb11b4d5ba..1bce64c6b20e 100644
 --- content/browser/plugin_service_impl.h
 +++ content/browser/plugin_service_impl.h
@@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService {
@@ -136,7 +136,7 @@ index b0fb11b4d5ba7..1bce64c6b20ee 100644
                      const std::string& mime_type,
                      bool allow_wildcard,
 diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc
-index 68ccb16a86ad0..7e9aeed8c8c32 100644
+index 68ccb16a86ad..7e9aeed8c8c3 100644
 --- content/browser/renderer_host/plugin_registry_impl.cc
 +++ content/browser/renderer_host/plugin_registry_impl.cc
@@ -30,6 +30,7 @@ void PluginRegistryImpl::Bind(
@@ -169,7 +169,7 @@ index 68ccb16a86ad0..7e9aeed8c8c32 100644
       auto plugin_blink = blink::mojom::PluginInfo::New();
       plugin_blink->name = plugin.name;
 diff --git content/browser/renderer_host/plugin_registry_impl.h content/browser/renderer_host/plugin_registry_impl.h
-index 632ae86c6fd69..55b749ec12421 100644
+index 632ae86c6fd6..55b749ec1242 100644
 --- content/browser/renderer_host/plugin_registry_impl.h
 +++ content/browser/renderer_host/plugin_registry_impl.h
@@ -24,11 +24,13 @@ class PluginRegistryImpl : public blink::mojom::PluginRegistry {
@@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
                           const std::vector<WebPluginInfo>& all_plugins);
 diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
-index d3401f43eadaf..582486dad6500 100644
+index 01bf04ee4615..8c26603be9d0 100644
 --- content/browser/renderer_host/render_frame_host_impl.cc
 +++ content/browser/renderer_host/render_frame_host_impl.cc
-@@ -11827,6 +11827,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
+@@ -11833,6 +11833,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
 }
 void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -199,7 +199,7 @@ index d3401f43eadaf..582486dad6500 100644
                                         const url::Origin& main_frame_origin,
                                         const std::string& mime_type,
                                         GetPluginInfoCallback callback) {
-@@ -11834,7 +11835,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
+@@ -11840,7 +11841,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
   WebPluginInfo info;
   std::string actual_mime_type;
   bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
@@ -210,10 +210,10 @@ index d3401f43eadaf..582486dad6500 100644
   std::move(callback).Run(found, info, actual_mime_type);
 }
 diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
-index 275239e659e11..514bfa186c70b 100644
+index e63909db27f0..279d0dbce804 100644
 --- content/browser/renderer_host/render_frame_host_impl.h
 +++ content/browser/renderer_host/render_frame_host_impl.h
-@@ -2530,6 +2530,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
+@@ -2533,6 +2533,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
       int32_t plugin_child_id,
       const base::FilePath& path) override;
   void GetPluginInfo(const GURL& url,
@@ -222,7 +222,7 @@ index 275239e659e11..514bfa186c70b 100644
                      const std::string& mime_type,
                      GetPluginInfoCallback callback) override;
 diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom
-index a544bfed7ed85..60aad01350c2f 100644
+index a544bfed7ed8..60aad01350c2 100644
 --- content/common/pepper_plugin.mojom
 +++ content/common/pepper_plugin.mojom
@@ -29,6 +29,7 @@ interface PepperHost {
@@ -234,7 +234,7 @@ index a544bfed7ed85..60aad01350c2f 100644
                 string mime_type) =>
                (bool found,
 diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
-index b5022114e4e19..7d8f17f9e39ac 100644
+index b5022114e4e1..7d8f17f9e39a 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@@ -247,7 +247,7 @@ index b5022114e4e19..7d8f17f9e39ac 100644
 #include <utility>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index 799490ac3f7c0..fe921248a0818 100644
+index 799490ac3f7c..fe921248a081 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
@@ -32,6 +32,7 @@
@@ -285,7 +285,7 @@ index 799490ac3f7c0..fe921248a0818 100644
   virtual std::string GetUserAgent();
 diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h
-index edcc4c1747123..29eea000a9100 100644
+index edcc4c174712..29eea000a910 100644
 --- content/public/browser/plugin_service.h
 +++ content/public/browser/plugin_service.h
@@ -78,6 +78,7 @@ class CONTENT_EXPORT PluginService {
@@ -297,7 +297,7 @@ index edcc4c1747123..29eea000a9100 100644
                              const std::string& mime_type,
                              bool allow_wildcard,
 diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h
-index 570b5a4738b94..923a5f7195c53 100644
+index 570b5a4738b9..923a5f7195c5 100644
 --- content/public/browser/plugin_service_filter.h
 +++ content/public/browser/plugin_service_filter.h
@@ -30,6 +30,7 @@ class PluginServiceFilter {
@@ -309,7 +309,7 @@ index 570b5a4738b94..923a5f7195c53 100644
                                  WebPluginInfo* plugin) = 0;
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index 7ec0901cf6ba2..db5b5529a4cda 100644
+index 7ec0901cf6ba..db5b5529a4cd 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
@@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -334,10 +334,10 @@ index 7ec0901cf6ba2..db5b5529a4cda 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 21a03f22e32f6..e550d97161ee4 100644
+index 5f7a44233f04..4667ca90a8f2 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -3304,7 +3304,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -3309,7 +3309,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
   WebPluginInfo info;
   std::string mime_type;
   bool found = false;
@@ -348,7 +348,7 @@ index 21a03f22e32f6..e550d97161ee4 100644
                                  &mime_type);
   if (!found)
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index d372704f462dc..29fc97bd3e48b 100644
+index d372704f462d..29fc97bd3e48 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
@@ -607,6 +607,8 @@ void RenderThreadImpl::Init() {
@@ -361,7 +361,7 @@ index d372704f462dc..29fc97bd3e48b 100644
       &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 2ca27e17e9e10..e4b443d28af38 100644
+index 2ca27e17e9e1..e4b443d28af3 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
@@ -1107,6 +1107,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -381,7 +381,7 @@ index 2ca27e17e9e10..e4b443d28af38 100644
   if (!code_cache_host_) {
     code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index cb8770a47a808..34df834f31b83 100644
+index cb8770a47a80..34df834f31b8 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
@@ -258,6 +258,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -395,7 +395,7 @@ index cb8770a47a808..34df834f31b83 100644
   // plus eTLD+1, such as https://google.com), or to a more specific origin.
   void SetIsLockedToSite();
 diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc
-index c25b7d1a18432..7e007d964f1a1 100644
+index c25b7d1a1843..7e007d964f1a 100644
 --- content/shell/browser/shell_plugin_service_filter.cc
 +++ content/shell/browser/shell_plugin_service_filter.cc
@@ -17,6 +17,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
@@ -407,7 +407,7 @@ index c25b7d1a18432..7e007d964f1a1 100644
     WebPluginInfo* plugin) {
   return plugin->name == u"Blink Test Plugin" ||
 diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h
-index 337b4b0653fe2..107ab4c9d8a85 100644
+index 337b4b0653fe..107ab4c9d8a8 100644
 --- content/shell/browser/shell_plugin_service_filter.h
 +++ content/shell/browser/shell_plugin_service_filter.h
@@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
--- a/patch/patches/content_main_654986.patch
+++ b/patch/patches/content_main_654986.patch
@@ -1,5 +1,5 @@
 diff --git content/app/content_main.cc content/app/content_main.cc
-index df88067d61a6d..cf0c735c8d3d9 100644
+index df88067d61a6..cf0c735c8d3d 100644
 --- content/app/content_main.cc
 +++ content/app/content_main.cc
@@ -215,15 +215,10 @@ void InitializeMojo(mojo::core::Configuration* config) {
@@ -111,7 +111,7 @@ index df88067d61a6d..cf0c735c8d3d9 100644
   return RunContentProcess(params, runner.get());
 }
 diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
-index 81638b94331aa..3a36c1629b158 100644
+index 81638b94331a..3a36c1629b15 100644
 --- content/app/content_main_runner_impl.cc
 +++ content/app/content_main_runner_impl.cc
@@ -43,6 +43,7 @@
@@ -135,7 +135,7 @@ index 81638b94331aa..3a36c1629b158 100644
 std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() {
   return ContentMainRunnerImpl::Create();
 diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
-index 86c624e53cf99..090171f7db228 100644
+index 86c624e53cf9..090171f7db22 100644
 --- content/app/content_main_runner_impl.h
 +++ content/app/content_main_runner_impl.h
@@ -39,7 +39,7 @@ class ContentMainDelegate;
@@ -157,7 +157,7 @@ index 86c624e53cf99..090171f7db228 100644
   int RunBrowser(MainFunctionParams& main_function_params,
                  bool start_minimal_browser);
 diff --git content/common/set_process_title.cc content/common/set_process_title.cc
-index 8b829a4887739..a69a088697287 100644
+index 8b829a488773..a69a08869728 100644
 --- content/common/set_process_title.cc
 +++ content/common/set_process_title.cc
@@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
@@ -170,7 +170,7 @@ index 8b829a4887739..a69a088697287 100644
   if (main_argv)
     setproctitle_init(main_argv);
 diff --git content/public/app/content_main.h content/public/app/content_main.h
-index 97aac3d0c7584..fc795ae0287f9 100644
+index 97aac3d0c758..fc795ae0287f 100644
 --- content/public/app/content_main.h
 +++ content/public/app/content_main.h
@@ -68,7 +68,16 @@ struct ContentMainParams {
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@@ -1,5 +1,5 @@
 diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
-index 9b08e23e921b0..49182504ae361 100644
+index 9b08e23e921b..49182504ae36 100644
 --- chrome/chrome_elf/BUILD.gn
 +++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@
@@ -47,7 +47,7 @@ index 9b08e23e921b0..49182504ae361 100644
 source_set("dll_hash") {
 diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc
-index 886372e114899..ad3bc2242883b 100644
+index 886372e11489..ad3bc2242883 100644
 --- chrome/chrome_elf/crash/crash_helper.cc
 +++ chrome/chrome_elf/crash/crash_helper.cc
@@ -11,12 +11,17 @@
@@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644
   g_crash_helper_enabled = true;
   return true;
 diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
-index 41cb4fdea7320..7bca01cf303c8 100644
+index 41cb4fdea732..7bca01cf303c 100644
 --- chrome/common/crash_keys.cc
 +++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@
@@ -112,7 +112,7 @@ index 41cb4fdea7320..7bca01cf303c8 100644
 void SetActiveExtensions(const std::set<std::string>& extensions) {
 diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
-index bcf172e645a23..f879aa745adfc 100644
+index bcf172e645a2..f879aa745adf 100644
 --- chrome/common/crash_keys.h
 +++ chrome/common/crash_keys.h
@@ -17,6 +17,10 @@ class CommandLine;
@@ -127,7 +127,7 @@ index bcf172e645a23..f879aa745adfc 100644
 // on the given |command_line|.
 void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
 diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
-index 00009dacdc2b0..e6454d5b1a23d 100644
+index 00009dacdc2b..e6454d5b1a23 100644
 --- components/crash/core/app/breakpad_linux.cc
 +++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
@@ -203,7 +203,7 @@ index 00009dacdc2b0..e6454d5b1a23d 100644
       writer.Flush();
     }
 diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h
-index 9ea80370a842c..3043f7d32f33d 100644
+index 9ea80370a842..3043f7d32f33 100644
 --- components/crash/core/app/breakpad_linux.h
 +++ components/crash/core/app/breakpad_linux.h
@@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type);
@@ -217,7 +217,7 @@ index 9ea80370a842c..3043f7d32f33d 100644
 extern void InitCrashKeysForTesting();
 diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
-index 89b4bfccd5d32..7cb0a85470d2f 100644
+index 89b4bfccd5d3..7cb0a85470d2 100644
 --- components/crash/core/app/crash_reporter_client.cc
 +++ components/crash/core/app/crash_reporter_client.cc
@@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
@@ -290,7 +290,7 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644
 }  // namespace crash_reporter
 diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
-index 39557cce47443..236806090021a 100644
+index 39557cce4744..236806090021 100644
 --- components/crash/core/app/crash_reporter_client.h
 +++ components/crash/core/app/crash_reporter_client.h
@@ -5,7 +5,9 @@
@@ -357,7 +357,7 @@ index 39557cce47443..236806090021a 100644
 }  // namespace crash_reporter
 diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
-index 42938c3994679..3e8eaeebd7b2b 100644
+index 42938c399467..3e8eaeebd7b2 100644
 --- components/crash/core/app/crashpad.cc
 +++ components/crash/core/app/crashpad.cc
@@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client,
@@ -371,7 +371,7 @@ index 42938c3994679..3e8eaeebd7b2b 100644
         ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
   }
 diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
-index e3fc1fb2bcab3..56395d7100f94 100644
+index e3fc1fb2bcab..56395d7100f9 100644
 --- components/crash/core/app/crashpad_mac.mm
 +++ components/crash/core/app/crashpad_mac.mm
@@ -16,11 +16,14 @@
@@ -474,7 +474,7 @@ index e3fc1fb2bcab3..56395d7100f94 100644
           handler_path, database_path, metrics_path, url,
           GetProcessSimpleAnnotations(), arguments, true, false);
 diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
-index 7dd251b2fdda8..3d358889ea6f2 100644
+index 7dd251b2fdda..3d358889ea6f 100644
 --- components/crash/core/app/crashpad_win.cc
 +++ components/crash/core/app/crashpad_win.cc
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
--- a/patch/patches/crashpad_tp_1995.patch
+++ b/patch/patches/crashpad_tp_1995.patch
@@ -1,5 +1,5 @@
 diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
-index 492d466239d1a..a1df635870ede 100644
+index 492d466239d1..a1df635870ed 100644
 --- third_party/crashpad/crashpad/client/prune_crash_reports.cc
 +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
@@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database,
@@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644
 static const time_t kSecondsInDay = 60 * 60 * 24;
 diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
-index 07a70980f12af..ddf7f17325fed 100644
+index 07a70980f12a..ddf7f17325fe 100644
 --- third_party/crashpad/crashpad/client/prune_crash_reports.h
 +++ third_party/crashpad/crashpad/client/prune_crash_reports.h
@@ -59,7 +59,8 @@ class PruneCondition {
@@ -40,7 +40,7 @@ index 07a70980f12af..ddf7f17325fed 100644
   virtual ~PruneCondition() {}
 diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
-index 3855b9b6a4b20..263f985043716 100644
+index 3855b9b6a4b2..263f98504371 100644
 --- third_party/crashpad/crashpad/client/settings.cc
 +++ third_party/crashpad/crashpad/client/settings.cc
@@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
@@ -130,7 +130,7 @@ index 3855b9b6a4b20..263f985043716 100644
 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
     FileHandle file,
 diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
-index 5761c6b965b5c..aee4e6c96033e 100644
+index 5761c6b965b5..aee4e6c96033 100644
 --- third_party/crashpad/crashpad/client/settings.h
 +++ third_party/crashpad/crashpad/client/settings.h
@@ -115,6 +115,11 @@ class Settings {
@@ -146,7 +146,7 @@ index 5761c6b965b5c..aee4e6c96033e 100644
   struct Data;
 diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
-index a697b338e8eeb..96d4b45c5aa51 100644
+index a697b338e8ee..96d4b45c5aa5 100644
 --- third_party/crashpad/crashpad/handler/BUILD.gn
 +++ third_party/crashpad/crashpad/handler/BUILD.gn
@@ -12,6 +12,7 @@
@@ -184,7 +184,7 @@ index a697b338e8eeb..96d4b45c5aa51 100644
   if (crashpad_is_win) {
 diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
-index b7e445fd9f3ed..c5f1a3c3ceee7 100644
+index b7e445fd9f3e..c5f1a3c3ceee 100644
 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
 +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -263,6 +263,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
@@ -197,7 +197,7 @@ index b7e445fd9f3ed..c5f1a3c3ceee7 100644
   if (!reader->SeekSet(start_offset)) {
 diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
-index 2ec1147d2620d..8ff9a72e0bd79 100644
+index 2ec1147d2620..8ff9a72e0bd7 100644
 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
 +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -15,6 +15,7 @@
@@ -248,7 +248,7 @@ index 2ec1147d2620d..8ff9a72e0bd79 100644
   //! \brief Calls ProcessPendingReports() in response to ReportPending() having
   //!     been called on any thread, as well as periodically on a timer.
 diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
-index 737ee4e09f676..f5a8727f7e6b1 100644
+index 737ee4e09f67..f5a8727f7e6b 100644
 --- third_party/crashpad/crashpad/handler/handler_main.cc
 +++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -39,6 +39,7 @@
--- a/patch/patches/embedder_product_override.patch
+++ b/patch/patches/embedder_product_override.patch
@@ -1,5 +1,5 @@
 diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
-index 46f67d07365ca..069b96b9b4b8b 100644
+index 46f67d07365c..069b96b9b4b8 100644
 --- components/embedder_support/user_agent_utils.cc
 +++ components/embedder_support/user_agent_utils.cc
@@ -10,6 +10,7 @@
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
-index 5c903a13a14ed..c85964a7bab17 100644
+index 5c903a13a14e..c85964a7bab1 100644
 --- chrome/browser/extensions/api/streams_private/streams_private_api.cc
 +++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -6,6 +6,7 @@
@@ -60,7 +60,7 @@ index 5c903a13a14ed..c85964a7bab17 100644
   std::unique_ptr<StreamContainer> stream_container(
       new StreamContainer(tab_id, embedded, handler_url, extension_id,
 diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
-index 7e38155c3b695..78768b28d8c99 100644
+index 7e38155c3b69..78768b28d8c9 100644
 --- extensions/browser/extension_host.cc
 +++ extensions/browser/extension_host.cc
@@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -125,7 +125,7 @@ index 7e38155c3b695..78768b28d8c99 100644
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
 diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
-index 305726557f2ea..caa4b798a013e 100644
+index 305726557f2e..caa4b798a013 100644
 --- extensions/browser/extension_host.h
 +++ extensions/browser/extension_host.h
@@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -160,7 +160,7 @@ index 305726557f2ea..caa4b798a013e 100644
   // A pointer to the current or speculative main frame in `host_contents_`. We
   // can't access this frame through the `host_contents_` directly as it does
 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
-index 530de7eea3649..3af4fb0179aa1 100644
+index 530de7eea364..3af4fb0179aa 100644
 --- extensions/browser/extensions_browser_client.h
 +++ extensions/browser/extensions_browser_client.h
@@ -27,6 +27,7 @@
@@ -195,7 +195,7 @@ index 530de7eea3649..3af4fb0179aa1 100644
   // once each time the extensions system is loaded per browser_context. The
   // implementation may wish to use the BrowserContext to record the current
 diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
-index 0bf4809cb6f60..fccf3478b8669 100644
+index 0bf4809cb6f6..fccf3478b866 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
@@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
--- a/patch/patches/gn_config.patch
+++ b/patch/patches/gn_config.patch
@@ -1,5 +1,5 @@
 diff --git .gn .gn
-index 1c7897a648315..39324a6c6c6f2 100644
+index 1c7897a64831..39324a6c6c6f 100644
 --- .gn
 +++ .gn
@@ -150,6 +150,8 @@ exec_script_whitelist =
@@ -12,7 +12,7 @@ index 1c7897a648315..39324a6c6c6f2 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index aa2cb7b4583a3..260067ac3c871 100644
+index aa2cb7b4583a..260067ac3c87 100644
 --- BUILD.gn
 +++ BUILD.gn
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@@ -34,7 +34,7 @@ index aa2cb7b4583a3..260067ac3c871 100644
     deps += [
       "//ios:all",
 diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
-index 982fbe8d3f0d0..e757be4688f10 100644
+index 982fbe8d3f0d..e757be4688f1 100644
 --- build/config/win/visual_studio_version.gni
 +++ build/config/win/visual_studio_version.gni
@@ -12,9 +12,8 @@ declare_args() {
@@ -66,7 +66,7 @@ index 982fbe8d3f0d0..e757be4688f10 100644
 +         "studio path")
 }
 diff --git chrome/app/framework.order chrome/app/framework.order
-index d2266b28b33f8..a7ff6d9b68f38 100644
+index d2266b28b33f..a7ff6d9b68f3 100644
 --- chrome/app/framework.order
 +++ chrome/app/framework.order
@@ -72,3 +72,8 @@ _ChromeMain
@@ -79,7 +79,7 @@ index d2266b28b33f8..a7ff6d9b68f38 100644
 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
 +
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index 66084f63cd04a..a4997689c68cd 100644
+index 66084f63cd04..a4997689c68c 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
@@ -4,6 +4,7 @@
@@ -102,7 +102,7 @@ index 66084f63cd04a..a4997689c68cd 100644
       sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]
       deps += [ "//extensions:extensions_browser_resources" ]
 diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
-index 203d54004d324..39ec05bffcf5c 100644
+index 203d54004d32..39ec05bffcf5 100644
 --- chrome/chrome_repack_locales.gni
 +++ chrome/chrome_repack_locales.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@@ -125,7 +125,7 @@ index 203d54004d324..39ec05bffcf5c 100644
       source_patterns +=
           [ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
 diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
-index 51fa0d7f4cf77..2ede68e9377eb 100644
+index 51fa0d7f4cf7..2ede68e9377e 100644
 --- chrome/installer/mini_installer/BUILD.gn
 +++ chrome/installer/mini_installer/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
@@ -152,7 +152,7 @@ index 51fa0d7f4cf77..2ede68e9377eb 100644
   outputs = [
     # See also chrome.packed.7z conditionally added below.
 diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni
-index 5b92d7a6cd920..ceb274146131c 100644
+index 5b92d7a6cd92..ceb274146131 100644
 --- tools/grit/grit_defines.gni
 +++ tools/grit/grit_defines.gni
@@ -5,6 +5,7 @@
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@@ -1,5 +1,5 @@
 diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
-index 2340bedbe4a56..7353775d6fc43 100644
+index 2340bedbe4a5..7353775d6fc4 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
@@ -820,4 +820,13 @@
--- a/patch/patches/ime_1610.patch
+++ b/patch/patches/ime_1610.patch
@@ -1,5 +1,5 @@
 diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
-index de4e2f8fa1761..3a60044e871fb 100644
+index de4e2f8fa176..3a60044e871f 100644
 --- ui/base/ime/win/input_method_win_base.cc
 +++ ui/base/ime/win/input_method_win_base.cc
@@ -262,8 +262,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
--- a/patch/patches/linux_assets_path_1936.patch
+++ b/patch/patches/linux_assets_path_1936.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
-index bbc1d4d057291..a7c7d75f61df6 100644
+index bbc1d4d05729..a7c7d75f61df 100644
 --- content/browser/child_process_launcher_helper_linux.cc
 +++ content/browser/child_process_launcher_helper_linux.cc
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
@@ -12,7 +12,7 @@ index bbc1d4d057291..a7c7d75f61df6 100644
   base::File file(exe_dir.Append(path),
                   base::File::FLAG_OPEN | base::File::FLAG_READ);
 diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
-index 7022a65e03578..c9aaf5d76e4a1 100644
+index 7022a65e0357..c9aaf5d76e4a 100644
 --- sandbox/linux/suid/client/setuid_sandbox_host.cc
 +++ sandbox/linux/suid/client/setuid_sandbox_host.cc
@@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() {
@@ -25,7 +25,7 @@ index 7022a65e03578..c9aaf5d76e4a1 100644
     if (base::PathExists(sandbox_candidate))
       sandbox_binary = sandbox_candidate;
 diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
-index 016046d6caa4f..116e4919cda08 100644
+index 016046d6caa4..116e4919cda0 100644
 --- ui/gl/init/gl_initializer_linux_x11.cc
 +++ ui/gl/init/gl_initializer_linux_x11.cc
@@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {
--- a/patch/patches/linux_atk_1123214.patch
+++ b/patch/patches/linux_atk_1123214.patch
@@ -1,5 +1,5 @@
 diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn
-index 92baff2a9b6ee..fdf40cd38ad3a 100644
+index 92baff2a9b6e..fdf40cd38ad3 100644
 --- build/config/linux/atk/BUILD.gn
 +++ build/config/linux/atk/BUILD.gn
@@ -11,7 +11,7 @@ import("//build/config/ui.gni")
@@ -12,7 +12,7 @@ index 92baff2a9b6ee..fdf40cd38ad3a 100644
 if (use_atk) {
   assert(use_glib, "use_atk=true requires that use_glib=true")
 diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn
-index 988a995681361..1791ea607550e 100644
+index 988a99568136..1791ea607550 100644
 --- build/config/linux/atspi2/BUILD.gn
 +++ build/config/linux/atspi2/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni")
--- a/patch/patches/linux_poll_2466.patch
+++ b/patch/patches/linux_poll_2466.patch
@@ -1,5 +1,5 @@
 diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc
-index 0c37e08d78825..80a8d27d9733b 100644
+index 0c37e08d7882..80a8d27d9733 100644
 --- base/files/file_path_watcher_linux.cc
 +++ base/files/file_path_watcher_linux.cc
@@ -5,6 +5,7 @@
--- a/patch/patches/message_loop.patch
+++ b/patch/patches/message_loop.patch
@@ -1,5 +1,5 @@
 diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
-index 04a5dcf91d0ca..935c22f9ee963 100644
+index 04a5dcf91d0c..935c22f9ee96 100644
 --- base/message_loop/message_pump_win.cc
 +++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@
@@ -30,7 +30,7 @@ index 04a5dcf91d0ca..935c22f9ee963 100644
   }
   if (has_msg)
 diff --git base/task/current_thread.cc base/task/current_thread.cc
-index 9641285fde742..51cc852fcc165 100644
+index 9641285fde74..51cc852fcc16 100644
 --- base/task/current_thread.cc
 +++ base/task/current_thread.cc
@@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver(
@@ -43,7 +43,7 @@ index 9641285fde742..51cc852fcc165 100644
   current_->RemoveDestructionObserver(destruction_observer);
 }
 diff --git base/task/current_thread.h base/task/current_thread.h
-index bdcd661bfa282..823a1d02ca858 100644
+index bdcd661bfa28..823a1d02ca85 100644
 --- base/task/current_thread.h
 +++ base/task/current_thread.h
@@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread {
--- a/patch/patches/message_pump_mac_2495.patch
+++ b/patch/patches/message_pump_mac_2495.patch
@@ -1,5 +1,5 @@
 diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
-index ebc9aa83a1a0e..a64b1f9d90c0c 100644
+index ebc9aa83a1a0..a64b1f9d90c0 100644
 --- base/message_loop/message_pump_mac.mm
 +++ base/message_loop/message_pump_mac.mm
@@ -692,7 +692,8 @@ void MessagePumpUIApplication::Detach() {
--- a/patch/patches/mime_handler_view_guest_1565_2727.patch
+++ b/patch/patches/mime_handler_view_guest_1565_2727.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
-index cdbc0273838e5..ee2809a0bb98a 100644
+index cdbc0273838e..ee2809a0bb98 100644
 --- content/browser/web_contents/web_contents_view.h
 +++ content/browser/web_contents/web_contents_view.h
@@ -22,7 +22,7 @@ struct DropData;
@@ -12,7 +12,7 @@ index cdbc0273838e5..ee2809a0bb98a 100644
   virtual ~WebContentsView() {}
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 2dc016e4be765..fb052a3a0bf21 100644
+index 2dc016e4be76..fb052a3a0bf2 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -211,6 +211,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -48,7 +48,7 @@ index 2dc016e4be765..fb052a3a0bf21 100644
     WebContents* source,
     const content::OpenURLParams& params) {
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index bb90319f768ed..b0ba7bfa08c03 100644
+index bb90319f768e..b0ba7bfa08c0 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -130,6 +130,7 @@ class MimeHandlerViewGuest
@@ -68,7 +68,7 @@ index bb90319f768ed..b0ba7bfa08c03 100644
   bool is_embedder_fullscreen_ = false;
   bool plugin_can_save_ = false;
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
-index 98689e2614604..a1b08274f4556 100644
+index 98689e261460..a1b08274f455 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
@@ -8,9 +8,9 @@
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@@ -1,5 +1,5 @@
 diff --git net/base/load_flags_list.h net/base/load_flags_list.h
-index 96d1a51ec1078..e8120a818b1f2 100644
+index 96d1a51ec107..e8120a818b1f 100644
 --- net/base/load_flags_list.h
 +++ net/base/load_flags_list.h
@@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15)
@@ -10,7 +10,7 @@ index 96d1a51ec1078..e8120a818b1f2 100644
 +// This load will not send any cookies. For CEF usage.
 +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
-index 3f7b5bb32fa27..2c092b62f3ce4 100644
+index 3f7b5bb32fa2..2c092b62f3ce 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
@@ -566,7 +566,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
@@ -24,7 +24,7 @@ index 3f7b5bb32fa27..2c092b62f3ce4 100644
         request_->force_ignore_site_for_cookies();
     if (cookie_store->cookie_access_delegate() &&
 diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
-index 13c90fe5f838c..ac3a0bc7a2db5 100644
+index 13c90fe5f838..ac3a0bc7a2db 100644
 --- services/network/public/cpp/resource_request.cc
 +++ services/network/public/cpp/resource_request.cc
@@ -253,7 +253,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/input/fling_scheduler.cc content/browser/renderer_host/input/fling_scheduler.cc
-index c7a4f1f0c3d00..7e6e3b4e56d42 100644
+index c7a4f1f0c3d0..7e6e3b4e56d4 100644
 --- content/browser/renderer_host/input/fling_scheduler.cc
 +++ content/browser/renderer_host/input/fling_scheduler.cc
@@ -68,6 +68,9 @@ void FlingScheduler::ProgressFlingOnBeginFrameIfneeded(
@@ -13,7 +13,7 @@ index c7a4f1f0c3d00..7e6e3b4e56d42 100644
   if (host_->GetView() && host_->GetView()->GetNativeView() &&
       host_->GetView()->GetNativeView()->GetHost() &&
 diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h
-index cc4b13a7b9c67..84f3b9ed7cf49 100644
+index cc4b13a7b9c6..84f3b9ed7cf4 100644
 --- content/browser/renderer_host/input/fling_scheduler_base.h
 +++ content/browser/renderer_host/input/fling_scheduler_base.h
@@ -7,12 +7,23 @@
@@ -41,7 +41,7 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
 }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index c2356a3d97bfe..0d9f359886e20 100644
+index c2356a3d97bf..0d9f359886e2 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3088,6 +3088,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -57,7 +57,7 @@ index c2356a3d97bfe..0d9f359886e20 100644
     const WebInputEvent& event) {
   if ((base::FeatureList::IsEnabled(
 diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
-index d082d920c4124..b588cb681c4e8 100644
+index d082d920c412..b588cb681c4e 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
@@ -762,6 +762,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
--- a/patch/patches/print_preview_123.patch
+++ b/patch/patches/print_preview_123.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
-index d282ff9e1e7be..f698a1b235cca 100644
+index d282ff9e1e7b..f698a1b235cc 100644
 --- chrome/browser/download/download_prefs.cc
 +++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@
@@ -34,7 +34,7 @@ index d282ff9e1e7be..f698a1b235cca 100644
 }
 diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
-index 4ff73fd2d9ec3..d56686d8284ba 100644
+index 4ff73fd2d9ec..d56686d8284b 100644
 --- chrome/browser/printing/print_preview_dialog_controller.cc
 +++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -15,6 +15,7 @@
@@ -58,7 +58,7 @@ index 4ff73fd2d9ec3..d56686d8284ba 100644
   // Add an entry to the map.
   preview_dialog_map_[preview_dialog] = initiator;
 diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
-index 867227684ddba..98986fdad1e7f 100644
+index 867227684ddb..98986fdad1e7 100644
 --- chrome/browser/printing/print_view_manager_base.cc
 +++ chrome/browser/printing/print_view_manager_base.cc
@@ -21,6 +21,7 @@
@@ -97,7 +97,7 @@ index 867227684ddba..98986fdad1e7f 100644
 void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
 diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
-index 48e2baa05cdf6..b4da112845d86 100644
+index 48e2baa05cdf..b4da112845d8 100644
 --- chrome/browser/printing/print_view_manager_base.h
 +++ chrome/browser/printing/print_view_manager_base.h
@@ -124,9 +124,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
@@ -111,7 +111,7 @@ index 48e2baa05cdf6..b4da112845d86 100644
   void Observe(int type,
                const content::NotificationSource& source,
 diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
-index 920f646f06484..76c0b5e5ee04b 100644
+index 920f646f0648..76c0b5e5ee04 100644
 --- chrome/browser/resources/print_preview/ui/destination_dialog.html
 +++ chrome/browser/resources/print_preview/ui/destination_dialog.html
@@ -25,10 +25,7 @@
@@ -127,7 +127,7 @@ index 920f646f06484..76c0b5e5ee04b 100644
       $i18n{cancel}
     </cr-button>
 diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
-index dd3512b303c40..0627aa331492c 100644
+index dd3512b303c4..0627aa331492 100644
 --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
 +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -26,6 +26,8 @@
@@ -151,7 +151,7 @@ index dd3512b303c40..0627aa331492c 100644
 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() = default;
 diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
-index 32c3e9c3cb267..011b333602bfb 100644
+index 32c3e9c3cb26..011b333602bf 100644
 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
 +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -21,6 +21,7 @@
@@ -270,7 +270,7 @@ index 32c3e9c3cb267..011b333602bfb 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   drive::DriveIntegrationService* drive_service =
 diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
-index e326047aef5e9..4fc8898e95b6f 100644
+index e326047aef5e..4fc8898e95b6 100644
 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
 +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
@@ -11,6 +11,7 @@
@@ -304,7 +304,7 @@ index e326047aef5e9..4fc8898e95b6f 100644
   base::FilePath GetSaveLocation() const;
 diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-index 5cebaa1d75b74..3c2fae113c678 100644
+index 5cebaa1d75b7..3c2fae113c67 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -25,6 +25,7 @@
@@ -334,7 +334,7 @@ index 5cebaa1d75b74..3c2fae113c678 100644
   if (printer_type == mojom::PrinterType::kPdf) {
     if (!pdf_printer_handler_) {
 diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-index 7d68582201d35..899df572ef835 100644
+index 7d68582201d3..899df572ef83 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -29,6 +29,7 @@
--- a/patch/patches/printing_context_2196.patch
+++ b/patch/patches/printing_context_2196.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index 2824b97e715a4..7207b58654e49 100644
+index 2824b97e715a..7207b58654e4 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
@@ -135,6 +135,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
@@ -11,7 +11,7 @@ index 2824b97e715a4..7207b58654e49 100644
 PrintJobWorker::~PrintJobWorker() {
 diff --git printing/printing_context.h printing/printing_context.h
-index 5c300fa414fbb..84da337deeca4 100644
+index 5c300fa414fb..84da337deeca 100644
 --- printing/printing_context.h
 +++ printing/printing_context.h
@@ -133,6 +133,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
--- a/patch/patches/renderer_host_1070713.patch
+++ b/patch/patches/renderer_host_1070713.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
-index ce54ce5ee0d4f..43b9c048bb172 100644
+index ce54ce5ee0d4..43b9c048bb17 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -625,6 +625,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
--- a/patch/patches/renderer_preferences_util_545103.patch
+++ b/patch/patches/renderer_preferences_util_545103.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
-index f61123b6cf989..b2d3b3619b93c 100644
+index f61123b6cf98..b2d3b3619b93 100644
 --- chrome/browser/renderer_preferences_util.cc
 +++ chrome/browser/renderer_preferences_util.cc
@@ -42,7 +42,8 @@
--- a/patch/patches/resource_bundle_2512.patch
+++ b/patch/patches/resource_bundle_2512.patch
@@ -1,5 +1,5 @@
 diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
-index 2ecaac520bd2f..25cff6cf13cbd 100644
+index 2ecaac520bd2..25cff6cf13cb 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
@@ -838,6 +838,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -28,7 +28,7 @@ index 2ecaac520bd2f..25cff6cf13cbd 100644
 void ResourceBundle::InitSharedInstance(Delegate* delegate) {
   DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
 diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
-index 61f5b2a2972d1..6b683617a1e67 100644
+index 61f5b2a2972d..6b683617a1e6 100644
 --- ui/base/resource/resource_bundle.h
 +++ ui/base/resource/resource_bundle.h
@@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
--- a/patch/patches/runhooks.patch
+++ b/patch/patches/runhooks.patch
@@ -1,5 +1,5 @@
 diff --git .vpython3 .vpython3
-index 14faab39343e8..0aeeb03f79bdd 100644
+index 14faab39343e..0aeeb03f79bd 100644
 --- .vpython3
 +++ .vpython3
@@ -204,7 +204,7 @@ wheel <
@@ -12,7 +12,7 @@ index 14faab39343e8..0aeeb03f79bdd 100644
 wheel <
 diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
-index c1d2fa2ce0aa2..d1d215f35ac12 100644
+index c1d2fa2ce0aa..d1d215f35ac1 100644
 --- build/toolchain/win/setup_toolchain.py
 +++ build/toolchain/win/setup_toolchain.py
@@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
@@ -39,7 +39,7 @@ index c1d2fa2ce0aa2..d1d215f35ac12 100644
     if (cpu != 'x64'):
       # x64 is default target CPU thus any other CPU requires a target set
 diff --git build/vs_toolchain.py build/vs_toolchain.py
-index ecf0971ab1349..bf90866524442 100755
+index ecf0971ab134..bf9086652444 100755
 --- build/vs_toolchain.py
 +++ build/vs_toolchain.py
@@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
--- a/patch/patches/rwh_background_color_1984.patch
+++ b/patch/patches/rwh_background_color_1984.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index 2e653492a9093..05fb213ad423f 100644
+index 2e653492a909..05fb213ad423 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -645,10 +645,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
--- a/patch/patches/services_network_2622.patch
+++ b/patch/patches/services_network_2622.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
-index bae294fef1f8b..06d2dfcecc956 100644
+index bae294fef1f8..06d2dfcecc95 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@@ -42,7 +42,7 @@ index bae294fef1f8b..06d2dfcecc956 100644
     // change.
     network_context_params->http_server_properties_path =
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index e2e1e9acb3605..f0b22ab2dce9d 100644
+index e2e1e9acb360..f0b22ab2dce9 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
@@ -506,6 +506,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -72,7 +72,7 @@ index e2e1e9acb3605..f0b22ab2dce9d 100644
 void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
   DCHECK(thread_checker_.CalledOnValidThread());
 diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
-index 4b24d429aabb4..fbfa765aba86a 100644
+index 4b24d429aabb..fbfa765aba86 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
@@ -182,6 +182,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -85,7 +85,7 @@ index 4b24d429aabb4..fbfa765aba86a 100644
   // Enables writing session cookies into the cookie database. If this this
   // method is called, it must be called before first use of the instance
 diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
-index afa99e255bdf1..5e8201696c613 100644
+index afa99e255bdf..5e8201696c61 100644
 --- net/cookies/cookie_store.h
 +++ net/cookies/cookie_store.h
@@ -156,6 +156,11 @@ class NET_EXPORT CookieStore {
@@ -101,7 +101,7 @@ index afa99e255bdf1..5e8201696c613 100644
   virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
                                const std::string& parent_absolute_name) const;
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index a397306372054..8a1bacea8d70c 100644
+index a39730637205..8a1bacea8d70 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
@@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -123,7 +123,7 @@ index a397306372054..8a1bacea8d70c 100644
 void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index a38eeaf6e58af..02ec2034afc8a 100644
+index a38eeaf6e58a..02ec2034afc8 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
@@ -2052,16 +2052,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -157,7 +157,7 @@ index a38eeaf6e58af..02ec2034afc8a 100644
     trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
 diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
-index 25d6c99d4f6be..2c6cf5a907d16 100644
+index 25d6c99d4f6b..2c6cf5a907d1 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
@@ -249,6 +249,9 @@ struct NetworkContextParams {
--- a/patch/patches/services_network_2718.patch
+++ b/patch/patches/services_network_2718.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
-index a7584ed4201ec..7cf54d07d0954 100644
+index 795226b889cc..29cab7a88a11 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
@@ -494,10 +494,6 @@ class LoginHandlerDelegate {
@@ -26,7 +26,7 @@ index a7584ed4201ec..7cf54d07d0954 100644
   new LoginHandlerDelegate(std::move(auth_challenge_responder),
                            std::move(web_contents_getter), auth_info,
                            is_request_for_main_frame, process_id, routing_id,
-@@ -2598,8 +2588,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -2606,8 +2596,12 @@ void StoragePartitionImpl::GetQuotaSettings(
     return;
   }
@@ -40,7 +40,7 @@ index a7584ed4201ec..7cf54d07d0954 100644
       storage::GetDefaultDeviceInfoHelper(), std::move(callback));
 }
-@@ -2612,6 +2606,11 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -2620,6 +2614,11 @@ void StoragePartitionImpl::InitNetworkContext() {
   GetContentClient()->browser()->ConfigureNetworkContextParams(
       browser_context_, is_in_memory_, relative_partition_path_,
       context_params.get(), cert_verifier_creation_params.get());
--- a/patch/patches/set_resize_background_color.patch
+++ b/patch/patches/set_resize_background_color.patch
@@ -1,5 +1,5 @@
 diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc
-index 1a85a7b4a8305..66817eaecd86b 100644
+index 1a85a7b4a830..66817eaecd86 100644
 --- ui/views/controls/native/native_view_host.cc
 +++ ui/views/controls/native/native_view_host.cc
@@ -161,7 +161,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
@@ -12,7 +12,7 @@ index 1a85a7b4a8305..66817eaecd86b 100644
 void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) {
 diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h
-index 3ed75e4c9b11e..c4a7318de5dd7 100644
+index 3ed75e4c9b11..c4a7318de5dd 100644
 --- ui/views/controls/native/native_view_host.h
 +++ ui/views/controls/native/native_view_host.h
@@ -94,6 +94,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
@@ -39,7 +39,7 @@ index 3ed75e4c9b11e..c4a7318de5dd7 100644
 };
 diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
-index 75c1f03c6efff..5ed55bb974958 100644
+index 75c1f03c6eff..5ed55bb97495 100644
 --- ui/views/controls/webview/webview.cc
 +++ ui/views/controls/webview/webview.cc
@@ -131,6 +131,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@@ -54,7 +54,7 @@ index 75c1f03c6efff..5ed55bb974958 100644
   if (crashed_overlay_view_ == crashed_overlay_view)
     return;
 diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
-index 71883873f5028..def24d95736fb 100644
+index 71883873f502..def24d95736f 100644
 --- ui/views/controls/webview/webview.h
 +++ ui/views/controls/webview/webview.h
@@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View,
--- a/patch/patches/storage_incognito_2289.patch
+++ b/patch/patches/storage_incognito_2289.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
-index 4960b1067e1c4..2686fa5bc550b 100644
+index 4960b1067e1c..2686fa5bc550 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.cc
 +++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
@@ -13,7 +13,7 @@ index 4960b1067e1c4..2686fa5bc550b 100644
           {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
            base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index 42f3b85ab0485..d8b50c18afd0e 100644
+index 42f3b85ab048..d8b50c18afd0 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
@@ -136,7 +136,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@@ -36,7 +36,7 @@ index 42f3b85ab0485..d8b50c18afd0e 100644
   std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
   if (use_in_memory_db) {
 diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc
-index 0095de1d05fd1..0e651cbcbe541 100644
+index 0095de1d05fd..0e651cbcbe54 100644
 --- content/public/browser/storage_partition_config.cc
 +++ content/public/browser/storage_partition_config.cc
@@ -7,6 +7,7 @@
@@ -58,7 +58,7 @@ index 0095de1d05fd1..0e651cbcbe541 100644
 // static
 diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
-index c96e3fad1a70f..302b2be31d8dc 100644
+index c96e3fad1a70..302b2be31d8d 100644
 --- storage/browser/database/database_tracker.cc
 +++ storage/browser/database/database_tracker.cc
@@ -562,7 +562,7 @@ bool DatabaseTracker::LazyInit() {
--- a/patch/patches/trace_event.patch
+++ b/patch/patches/trace_event.patch
@@ -1,5 +1,5 @@
 diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
-index a9616406d4d37..178e4bdad971c 100644
+index a9616406d4d3..178e4bdad971 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
@@ -61,6 +61,8 @@
--- a/patch/patches/ui_dragdrop_355390.patch
+++ b/patch/patches/ui_dragdrop_355390.patch
@@ -1,5 +1,5 @@
 diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
-index d3f24a6dce7ad..901198a562e44 100644
+index d3f24a6dce7a..901198a562e4 100644
 --- ui/base/x/x11_os_exchange_data_provider.cc
 +++ ui/base/x/x11_os_exchange_data_provider.cc
@@ -123,7 +123,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
--- a/patch/patches/views_1749_2102.patch
+++ b/patch/patches/views_1749_2102.patch
@@ -1,5 +1,5 @@
 diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
-index 279be87a33e9e..f295fdac67165 100644
+index 279be87a33e9..f295fdac6716 100644
 --- ui/base/models/menu_model.h
 +++ ui/base/models/menu_model.h
@@ -14,8 +14,11 @@
@@ -43,7 +43,7 @@ index 279be87a33e9e..f295fdac67165 100644
   virtual void MenuWillShow() {}
 diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
-index 988159e708dcc..3d957f7ea966e 100644
+index 988159e708dc..3d957f7ea966 100644
 --- ui/gfx/render_text.cc
 +++ ui/gfx/render_text.cc
@@ -650,6 +650,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
@@ -82,7 +82,7 @@ index 988159e708dcc..3d957f7ea966e 100644
 }
 diff --git ui/gfx/render_text.h ui/gfx/render_text.h
-index 36811695d23a5..db6b5f8bb08a4 100644
+index 36811695d23a..db6b5f8bb08a 100644
 --- ui/gfx/render_text.h
 +++ ui/gfx/render_text.h
@@ -342,6 +342,10 @@ class GFX_EXPORT RenderText {
@@ -106,7 +106,7 @@ index 36811695d23a5..db6b5f8bb08a4 100644
 }  // namespace gfx
 diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
-index bd0975b485de4..6e853e7018e9b 100644
+index bd0975b485de..6e853e7018e9 100644
 --- ui/views/animation/ink_drop_host_view.h
 +++ ui/views/animation/ink_drop_host_view.h
@@ -184,6 +184,8 @@ class VIEWS_EXPORT InkDropHost {
@@ -119,7 +119,7 @@ index bd0975b485de4..6e853e7018e9b 100644
   friend class test::InkDropHostTestApi;
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index 9d12e8a9f7487..442f45617e275 100644
+index 9d12e8a9f748..442f45617e27 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
@@ -509,6 +509,12 @@ void LabelButton::OnThemeChanged() {
@@ -136,7 +136,7 @@ index 9d12e8a9f7487..442f45617e275 100644
   Button::StateChanged(old_state);
   ResetLabelEnabledColor();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index 9b5389139c2fb..6111c18533564 100644
+index 9b5389139c2f..6111c1853356 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
@@ -134,6 +134,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -150,7 +150,7 @@ index 9b5389139c2fb..6111c18533564 100644
   ImageView* image() const { return image_; }
   Label* label() const { return label_; }
 diff --git ui/views/controls/label.cc ui/views/controls/label.cc
-index 79a26da93a4eb..e755a11efc658 100644
+index 79a26da93a4e..e755a11efc65 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
@@ -52,12 +52,27 @@ enum LabelPropertyKey {
@@ -215,7 +215,7 @@ index 79a26da93a4eb..e755a11efc658 100644
 }
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index 5bad0a8cd8cbc..da57021f0cefa 100644
+index 5bad0a8cd8cb..da57021f0cef 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
@@ -230,6 +230,10 @@ class VIEWS_EXPORT Label : public View,
@@ -238,7 +238,7 @@ index 5bad0a8cd8cbc..da57021f0cefa 100644
   std::unique_ptr<SelectionController> selection_controller_;
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 8ba686c398002..7842a7c8936cb 100644
+index 8ba686c39800..7842a7c8936c 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
@@ -2795,8 +2795,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -269,7 +269,7 @@ index 8ba686c398002..7842a7c8936cb 100644
     SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
   else if (item->GetParentMenuItem()->GetParentMenuItem())
 diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
-index b47a61998daaa..e6f1b862838b9 100644
+index b47a61998daa..e6f1b862838b 100644
 --- ui/views/controls/menu/menu_delegate.h
 +++ ui/views/controls/menu/menu_delegate.h
@@ -80,6 +80,22 @@ class VIEWS_EXPORT MenuDelegate {
@@ -308,7 +308,7 @@ index b47a61998daaa..e6f1b862838b9 100644
   virtual int GetMaxWidthForMenu(MenuItemView* menu);
 diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
-index 039cbc90f0eed..09f16763f7581 100644
+index 039cbc90f0ee..09f16763f758 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
@@ -1080,6 +1080,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -342,7 +342,7 @@ index 039cbc90f0eed..09f16763f7581 100644
       GetMenuController() && GetMenuController()->use_touchable_layout()
           ? style::CONTEXT_TOUCH_MENU
 diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
-index 895745cf0f7e5..28c24b1b007c9 100644
+index 895745cf0f7e..28c24b1b007c 100644
 --- ui/views/controls/menu/menu_model_adapter.cc
 +++ ui/views/controls/menu/menu_model_adapter.cc
@@ -246,6 +246,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
@@ -424,7 +424,7 @@ index 895745cf0f7e5..28c24b1b007c9 100644
   // Look up the menu model for this menu.
   const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
 diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
-index 76a9001061649..c5026f9241334 100644
+index 76a900106164..c5026f924133 100644
 --- ui/views/controls/menu/menu_model_adapter.h
 +++ ui/views/controls/menu/menu_model_adapter.h
@@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
@@ -449,7 +449,7 @@ index 76a9001061649..c5026f9241334 100644
   void WillHideMenu(MenuItemView* menu) override;
   void OnMenuClosed(MenuItemView* menu) override;
 diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
-index 979682ad5d7aa..a819da9125eb7 100644
+index 979682ad5d7a..a819da9125eb 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -239,6 +239,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -465,7 +465,7 @@ index 979682ad5d7aa..a819da9125eb7 100644
       content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
 diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc
-index 64e09ff4359a8..714e8e9ff6610 100644
+index 64e09ff4359a..714e8e9ff661 100644
 --- ui/views/test/ui_controls_factory_desktop_aurax11.cc
 +++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -89,10 +89,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
@@ -480,7 +480,7 @@ index 64e09ff4359a8..714e8e9ff6610 100644
         x11_ui_controls_test_helper_.ButtonDownMask() == 0) {
       // Move the cursor because EnterNotify/LeaveNotify are generated with the
 diff --git ui/views/view.h ui/views/view.h
-index 2c7cbb21185ab..304a1b0e5df97 100644
+index 2c7cbb21185a..304a1b0e5df9 100644
 --- ui/views/view.h
 +++ ui/views/view.h
@@ -20,6 +20,7 @@
--- a/patch/patches/views_widget.patch
+++ b/patch/patches/views_widget.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index c31a2b532540b..a27dfc0173d73 100644
+index c31a2b532540..a27dfc0173d7 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -622,6 +622,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
@@ -18,7 +18,7 @@ index c31a2b532540b..a27dfc0173d73 100644
   if (!GetMouseWheelPhaseHandler())
     return;
 diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
-index 17803f43ea181..15ce076ba78a6 100644
+index 17803f43ea18..15ce076ba78a 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -67,6 +67,7 @@ class CursorManager;
@@ -63,7 +63,7 @@ index 17803f43ea181..15ce076ba78a6 100644
   FRIEND_TEST_ALL_PREFIXES(
       BrowserSideFlingBrowserTest,
 diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
-index 9043a181d4c04..a72a96e015e9d 100644
+index 9043a181d4c0..a72a96e015e9 100644
 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -49,6 +49,10 @@ namespace {
@@ -111,7 +111,7 @@ index 9043a181d4c04..a72a96e015e9d 100644
   if (host_ && set_focus_on_mouse_down_or_key_event_) {
     set_focus_on_mouse_down_or_key_event_ = false;
 diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
-index 2486758e79114..3ef43f47b62e3 100644
+index 2486758e7911..3ef43f47b62e 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
@@ -249,6 +249,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -130,10 +130,10 @@ index 2486758e79114..3ef43f47b62e3 100644
   // Set the view's active state (i.e., tint state of controls).
   virtual void SetActive(bool active) = 0;
 diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
-index 21f7e7bfc0e75..11163b3ef0144 100644
+index 55eab0cb3732..3f26f85feaef 100644
 --- ui/platform_window/x11/x11_window.cc
 +++ ui/platform_window/x11/x11_window.cc
-@@ -1665,7 +1665,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
+@@ -1660,7 +1660,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
   req.border_pixel = 0;
   bounds_in_pixels_ = SanitizeBounds(bounds);
@@ -144,7 +144,7 @@ index 21f7e7bfc0e75..11163b3ef0144 100644
   req.y = bounds_in_pixels_.y();
   req.width = bounds_in_pixels_.width();
 diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
-index 7c352dd0d992d..cf1a0c3e6db63 100644
+index 7c352dd0d992..cf1a0c3e6db6 100644
 --- ui/views/widget/desktop_aura/desktop_screen_win.cc
 +++ ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -20,6 +20,8 @@ DesktopScreenWin::~DesktopScreenWin() {
@@ -157,7 +157,7 @@ index 7c352dd0d992d..cf1a0c3e6db63 100644
   return host ? host->GetAcceleratedWidget() : nullptr;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-index 3f3917338dbd8..ddedabd555a5a 100644
+index 3f3917338dbd..ddedabd555a5 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -215,6 +215,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -189,7 +189,7 @@ index 3f3917338dbd8..ddedabd555a5a 100644
   properties->x11_extension_delegate = this;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-index 49c2776892f1f..02df1b4bafe17 100644
+index 49c2776892f1..02df1b4bafe1 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
@@ -73,6 +73,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -221,7 +221,7 @@ index 49c2776892f1f..02df1b4bafe17 100644
   base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 4d986b929bd79..fe188b76db852 100644
+index 4d986b929bd7..fe188b76db85 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -170,8 +170,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -257,7 +257,7 @@ index 4d986b929bd79..fe188b76db852 100644
 bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 20bcac8ebadfa..f36e48dbf6549 100644
+index 20bcac8ebadf..f36e48dbf654 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -294,6 +294,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -272,7 +272,7 @@ index 20bcac8ebadfa..f36e48dbf6549 100644
   // a reference.
   corewm::TooltipWin* tooltip_;
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index a742d7d7f5d56..ac66f0cb18006 100644
+index a742d7d7f5d5..ac66f0cb1800 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
@@ -332,7 +332,8 @@ void Widget::Init(InitParams params) {
@@ -317,7 +317,7 @@ index a742d7d7f5d56..ac66f0cb18006 100644
 }
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index d6ce8c4934ed1..773125ba2dd5f 100644
+index d6ce8c4934ed..773125ba2dd5 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
@@ -326,6 +326,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -330,7 +330,7 @@ index d6ce8c4934ed1..773125ba2dd5f 100644
     // the NativeWidget may specify a default size. If the parent is specified,
     // |bounds| is in the parent's coordinate system. If the parent is not
 diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
-index 8accd587315a8..6836cbae3c520 100644
+index 8accd587315a..6836cbae3c52 100644
 --- ui/views/widget/widget_delegate.h
 +++ ui/views/widget/widget_delegate.h
@@ -388,6 +388,10 @@ class VIEWS_EXPORT WidgetDelegate {
@@ -345,7 +345,7 @@ index 8accd587315a8..6836cbae3c520 100644
   bool enable_arrow_key_traversal() const {
     return params_.enable_arrow_key_traversal;
 diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
-index c23259757d984..450b2610e34d1 100644
+index c23259757d98..450b2610e34d 100644
 --- ui/views/widget/widget_hwnd_utils.cc
 +++ ui/views/widget/widget_hwnd_utils.cc
@@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams(
@@ -358,7 +358,7 @@ index c23259757d984..450b2610e34d1 100644
       if (native_widget_delegate->IsDialogBox()) {
         *style |= DS_MODALFRAME;
 diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
-index a221915d4ca70..059aabf614696 100644
+index a221915d4ca7..059aabf61469 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
@@ -3121,10 +3121,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
--- a/patch/patches/viz_osr_2575.patch
+++ b/patch/patches/viz_osr_2575.patch
@@ -1,5 +1,5 @@
 diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
-index 3b00759e513dc..90fe332d59f5b 100644
+index 3b00759e513d..90fe332d59f5 100644
 --- components/viz/host/host_display_client.cc
 +++ components/viz/host/host_display_client.cc
@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
@@ -29,7 +29,7 @@ index 3b00759e513dc..90fe332d59f5b 100644
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
-index 5e260e13762f6..1ccff27f2fdbe 100644
+index 5e260e13762f..1ccff27f2fdb 100644
 --- components/viz/host/host_display_client.h
 +++ components/viz/host/host_display_client.h
@@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
@@ -54,7 +54,7 @@ index 5e260e13762f6..1ccff27f2fdbe 100644
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc
-index b04f654fe820f..131977a36591d 100644
+index b04f654fe820..131977a36591 100644
 --- components/viz/host/layered_window_updater_impl.cc
 +++ components/viz/host/layered_window_updater_impl.cc
@@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
@@ -67,7 +67,7 @@ index b04f654fe820f..131977a36591d 100644
   if (!canvas_) {
 diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h
-index 1026b739d283f..fe562ab60ce98 100644
+index 1026b739d283..fe562ab60ce9 100644
 --- components/viz/host/layered_window_updater_impl.h
 +++ components/viz/host/layered_window_updater_impl.h
@@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
@@ -80,7 +80,7 @@ index 1026b739d283f..fe562ab60ce98 100644
  private:
   const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index 4e93b8609553e..97f52868bb68a 100644
+index 4e93b8609553..97f52868bb68 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
@@ -206,6 +206,8 @@ viz_component("service") {
@@ -93,7 +93,7 @@ index 4e93b8609553e..97f52868bb68a 100644
   defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
 diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 827084542417d..73f44ba997497 100644
+index 827084542417..73f44ba99749 100644
 --- components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -16,6 +16,7 @@
@@ -126,7 +126,7 @@ index 827084542417d..73f44ba997497 100644
   return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
                                        display_client);
 diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
-index 599b06c1765ef..e8ae98b0b1320 100644
+index 599b06c1765e..e8ae98b0b132 100644
 --- components/viz/service/display_embedder/software_output_device_win.cc
 +++ components/viz/service/display_embedder/software_output_device_win.cc
@@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
@@ -142,7 +142,7 @@ index 599b06c1765ef..e8ae98b0b1320 100644
   TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
 diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
-index 50ff2c9facc2a..c34d1f28d2e90 100644
+index 50ff2c9facc2..c34d1f28d2e9 100644
 --- content/browser/compositor/viz_process_transport_factory.cc
 +++ content/browser/compositor/viz_process_transport_factory.cc
@@ -395,8 +395,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -162,7 +162,7 @@ index 50ff2c9facc2a..c34d1f28d2e90 100644
       compositor_data.display_client->GetBoundRemote(resize_task_runner_);
 diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
-index fd962645ec69c..a29cdd8f86c04 100644
+index fd962645ec69..a29cdd8f86c0 100644
 --- mojo/public/cpp/bindings/sync_call_restrictions.h
 +++ mojo/public/cpp/bindings/sync_call_restrictions.h
@@ -39,6 +39,7 @@ class Compositor;
@@ -183,7 +183,7 @@ index fd962645ec69c..a29cdd8f86c04 100644
   // running in the same process, so it won't block anything.
   // TODO(159346933) Remove once the origin isolation logic is moved outside of
 diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom
-index 409115f95787e..278354c126a0c 100644
+index 409115f95787..278354c126a0 100644
 --- services/viz/privileged/mojom/compositing/display_private.mojom
 +++ services/viz/privileged/mojom/compositing/display_private.mojom
@@ -85,12 +85,14 @@ interface DisplayPrivate {
@@ -203,7 +203,7 @@ index 409115f95787e..278354c126a0c 100644
   // Notifies that a swap has occurred and provides information about the pixel
 diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom
-index 6b7fbb6cf13dc..e2af75168cb91 100644
+index 6b7fbb6cf13d..e2af75168cb9 100644
 --- services/viz/privileged/mojom/compositing/layered_window_updater.mojom
 +++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom
@@ -26,5 +26,5 @@ interface LayeredWindowUpdater {
@@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
 +  Draw(gfx.mojom.Rect damage_rect) => ();
 };
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index dfb0c89dc7bd8..4b54ea85c0298 100644
+index dfb0c89dc7bd..4b54ea85c029 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
@@ -29,7 +29,9 @@
--- a/patch/patches/web_contents_1257_1565.patch
+++ b/patch/patches/web_contents_1257_1565.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index ce65fbf4c4e62..6b05415374c87 100644
+index ce65fbf4c4e6..6b05415374c8 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
@@ -2878,6 +2878,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -50,7 +50,7 @@ index ce65fbf4c4e62..6b05415374c87 100644
 void WebContentsImpl::DidCallFocus() {
 diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
-index f1dcf53ea481b..192f7c0ddd04f 100644
+index f1dcf53ea481..192f7c0ddd04 100644
 --- content/public/browser/web_contents.cc
 +++ content/public/browser/web_contents.cc
@@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
@@ -62,7 +62,7 @@ index f1dcf53ea481b..192f7c0ddd04f 100644
 WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index 279d292d96507..496e48d666a36 100644
+index 279d292d9650..496e48d666a3 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
@@ -85,10 +85,12 @@ class BrowserContext;
@@ -90,7 +90,7 @@ index 279d292d96507..496e48d666a36 100644
     // the value that'll be returned by GetLastActiveTime(). If this is left
     // default initialized then the value is not passed on to the WebContents
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index 0574d390dc94a..7ad9c7bc6e456 100644
+index 0574d390dc94..7ad9c7bc6e45 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
@@ -59,10 +59,12 @@ class EyeDropperListener;
@@ -122,7 +122,7 @@ index 0574d390dc94a..7ad9c7bc6e456 100644
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
-index 264f4fa3ded25..d2e6e02f51727 100644
+index 264f4fa3ded2..d2e6e02f5172 100644
 --- content/public/browser/web_contents_observer.h
 +++ content/public/browser/web_contents_observer.h
@@ -705,6 +705,10 @@ class CONTENT_EXPORT WebContentsObserver {
--- a/patch/patches/web_url_loader_cancel_1617042.patch
+++ b/patch/patches/web_url_loader_cancel_1617042.patch
@@ -1,5 +1,5 @@
 diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
-index 3894775930095..aef157bc50b79 100644
+index 389477593009..aef157bc50b7 100644
 --- third_party/blink/public/platform/web_url_loader.h
 +++ third_party/blink/public/platform/web_url_loader.h
@@ -152,12 +152,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader {
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@@ -1,5 +1,5 @@
 diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom
-index ff7a8ed89e94a..77f44956ff22f 100644
+index ff7a8ed89e94..77f44956ff22 100644
 --- third_party/blink/public/mojom/plugins/plugin_registry.mojom
 +++ third_party/blink/public/mojom/plugins/plugin_registry.mojom
@@ -36,5 +36,5 @@ interface PluginRegistry {
@@ -10,7 +10,7 @@ index ff7a8ed89e94a..77f44956ff22f 100644
 +  GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
 };
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index 9d96af5c4c9b5..fee49109c35d3 100644
+index 9d96af5c4c9b..fee49109c35d 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
@@ -875,6 +875,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -26,7 +26,7 @@ index 9d96af5c4c9b5..fee49109c35d3 100644
   static void InitializeMainThreadCommon(Platform* platform,
                                          std::unique_ptr<Thread> main_thread);
 diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc
-index 463e3e5e73419..97aaf0da2b9a5 100644
+index 463e3e5e7341..97aaf0da2b9a 100644
 --- third_party/blink/renderer/core/dom/document_init.cc
 +++ third_party/blink/renderer/core/dom/document_init.cc
@@ -177,11 +177,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) {
@@ -44,7 +44,7 @@ index 463e3e5e73419..97aaf0da2b9a5 100644
 DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
 diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
-index c0f2ba8de2f77..745dfcb704ad2 100644
+index c0f2ba8de2f7..745dfcb704ad 100644
 --- third_party/blink/renderer/core/frame/local_frame.cc
 +++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1879,7 +1879,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -57,7 +57,7 @@ index c0f2ba8de2f77..745dfcb704ad2 100644
 }
 diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
-index 881b5a6234586..c28e864b98bc1 100644
+index 881b5a623458..c28e864b98bc 100644
 --- third_party/blink/renderer/core/inspector/devtools_session.cc
 +++ third_party/blink/renderer/core/inspector/devtools_session.cc
@@ -8,6 +8,7 @@
@@ -85,7 +85,7 @@ index 881b5a6234586..c28e864b98bc1 100644
 void DevToolsSession::DispatchProtocolCommand(
 diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
-index 3afca2407df4b..6127652fb5f42 100644
+index 3afca2407df4..6127652fb5f4 100644
 --- third_party/blink/renderer/core/page/page.cc
 +++ third_party/blink/renderer/core/page/page.cc
@@ -212,7 +212,8 @@ Page::Page(base::PassKey<Page>,
@@ -160,7 +160,7 @@ index 3afca2407df4b..6127652fb5f42 100644
   visitor->Trace(plugins_changed_observers_);
   visitor->Trace(next_related_page_);
 diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
-index 72e214c315acf..c89b578f7d6d5 100644
+index 72e214c315ac..c89b578f7d6d 100644
 --- third_party/blink/renderer/core/page/page.h
 +++ third_party/blink/renderer/core/page/page.h
@@ -148,7 +148,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
@@ -184,7 +184,7 @@ index 72e214c315acf..c89b578f7d6d5 100644
   Member<ValidationMessageClient> validation_message_client_;
 diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc
-index 89beb74dae8a9..63bfa84b45b72 100644
+index 89beb74dae8a..63bfa84b45b7 100644
 --- third_party/blink/renderer/core/page/plugin_data.cc
 +++ third_party/blink/renderer/core/page/plugin_data.cc
@@ -91,10 +91,12 @@ void PluginData::RefreshBrowserSidePluginCache() {
@@ -212,7 +212,7 @@ index 89beb74dae8a9..63bfa84b45b72 100644
     auto* plugin_info = MakeGarbageCollected<PluginInfo>(
         plugin->name, FilePathToWebString(plugin->filename),
 diff --git third_party/blink/renderer/core/page/plugin_data.h third_party/blink/renderer/core/page/plugin_data.h
-index 310319d4595be..491b7705a006c 100644
+index 310319d4595b..491b7705a006 100644
 --- third_party/blink/renderer/core/page/plugin_data.h
 +++ third_party/blink/renderer/core/page/plugin_data.h
@@ -98,7 +98,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected<PluginData> {
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -1,5 +1,5 @@
 diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
-index f54b993e9fb9f..ec081f68adddb 100644
+index f54b993e9fb9..ec081f68addd 100644
 --- third_party/blink/public/web/web_view.h
 +++ third_party/blink/public/web/web_view.h
@@ -338,6 +338,7 @@ class WebView {
@@ -11,7 +11,7 @@ index f54b993e9fb9f..ec081f68adddb 100644
   // Cancels and hides the current popup (datetime, select...) if any.
   virtual void CancelPagePopup() = 0;
 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
-index 2f9022d37ab98..5637137cafc50 100644
+index 2f9022d37ab9..5637137cafc5 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -244,8 +244,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -39,7 +39,7 @@ index 2f9022d37ab98..5637137cafc50 100644
       fullscreen_controller_(std::make_unique<FullscreenController>(this)),
       page_base_background_color_(
 diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
-index 97e3d30f1427b..284bd30aa95e1 100644
+index 97e3d30f1427..284bd30aa95e 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.h
 +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -131,7 +131,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -62,7 +62,7 @@ index 97e3d30f1427b..284bd30aa95e1 100644
   TransformationMatrix device_emulation_transform_;
 diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
-index 7528cfa4793e9..35a37668930a7 100644
+index 7528cfa4793e..35a37668930a 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -839,7 +839,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
--- a/patch/patches/webui_2037.patch
+++ b/patch/patches/webui_2037.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
-index 462eb546fbd94..f75ea77326f33 100644
+index 462eb546fbd9..f75ea77326f3 100644
 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
 +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -10,6 +10,7 @@
@@ -62,7 +62,7 @@ index 462eb546fbd94..f75ea77326f33 100644
   bool result =
       base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
 diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
-index 77538809e177d..256ab01bf7704 100644
+index 77538809e177..256ab01bf770 100644
 --- chrome/browser/memory_details.cc
 +++ chrome/browser/memory_details.cc
@@ -17,6 +17,7 @@
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,8 +1,8 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 381fd664557d6..a9171702c5683 100644
+index 07ffb8615708..f60aa9aeae29 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
-@@ -5279,7 +5279,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5286,7 +5286,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         </message>
       </if>
       <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">