Update to Chromium version 100.0.4896.0 (#972766)

2025-06-05 21:39:12 +02:00 · 2022-02-21 17:23:40 -05:00
parent a2c621bf8b
commit f97f0bbda6
120 changed files with 668 additions and 725 deletions
--- a/patch/patches/base_debug_3479396.patch
+++ b/patch/patches/base_debug_3479396.patch
@@ -0,0 +1,12 @@
+diff --git base/debug/dump_without_crashing.cc base/debug/dump_without_crashing.cc
+index b9858dc0a7a33..302774bfd773c 100644
+--- base/debug/dump_without_crashing.cc
+++ base/debug/dump_without_crashing.cc
+@@ -7,6 +7,7 @@
+ #include "base/check.h"
+ #include "base/metrics/histogram_functions.h"
+ #include "base/no_destructor.h"
+#include "base/synchronization/lock.h"
+ #include "base/trace_event/base_tracing.h"
+ 
+ namespace {
--- a/patch/patches/base_sandbox_2743.patch
+++ b/patch/patches/base_sandbox_2743.patch
@@ -1,8 +1,8 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index dbef16bc35790..4343b1759c757 100644
+index 8243e7ad76529..a013002ac9d1e 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
-@@ -36,6 +36,7 @@ import("//build/nocompile.gni")
+@@ -37,6 +37,7 @@ import("//build/nocompile.gni")
 import("//build/rust/mixed_component.gni")
 import("//build/timestamp.gni")
 import("//build_overrides/build.gni")
@@ -10,7 +10,7 @@ index dbef16bc35790..4343b1759c757 100644
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
-@@ -1867,7 +1868,11 @@ mixed_component("base") {
+@@ -1883,7 +1884,11 @@ mixed_component("base") {
     "hash/md5_constexpr_internal.h",
     "hash/sha1.h",
   ]
@@ -23,7 +23,7 @@ index dbef16bc35790..4343b1759c757 100644
     sources += [
       "hash/md5_nacl.cc",
       "hash/md5_nacl.h",
-@@ -2116,6 +2121,12 @@ mixed_component("base") {
+@@ -2136,6 +2141,12 @@ mixed_component("base") {
       defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
     }
 
--- a/patch/patches/blink_security_policy_1289230.patch
+++ b/patch/patches/blink_security_policy_1289230.patch
@@ -1,5 +1,5 @@
 diff --git third_party/blink/renderer/platform/weborigin/security_policy.cc third_party/blink/renderer/platform/weborigin/security_policy.cc
-index 4ebbed336ebd8..845f7ec694721 100644
+index 4ae902d39a8f5..adfc8d91f9829 100644
 --- third_party/blink/renderer/platform/weborigin/security_policy.cc
 +++ third_party/blink/renderer/platform/weborigin/security_policy.cc
@@ -90,7 +90,7 @@ Referrer SecurityPolicy::GenerateReferrer(
--- a/patch/patches/browser_security_policy_1081397.patch
+++ b/patch/patches/browser_security_policy_1081397.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
-index 620b3fdc4403a..f20399d453680 100644
+index ec3262207e626..910e0b6a9ff89 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
-@@ -1724,6 +1724,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
+@@ -1736,6 +1736,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
             // DeclarativeApiTest.PersistRules.
             if (actual_process_lock.matches_scheme(url::kDataScheme))
               return true;
@@ -20,10 +20,10 @@ index 620b3fdc4403a..f20399d453680 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 8a84c355e4d56..2545e0e828fe5 100644
+index 5a7fa871f7b26..71fa1b1bcd8fd 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
-@@ -5896,6 +5896,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
+@@ -5940,6 +5940,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
     network::mojom::WebSandboxFlags sandbox_flags) {
   // Calculate an approximation of the origin. The sandbox/csp are ignored.
   url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@@ -36,7 +36,7 @@ index 8a84c355e4d56..2545e0e828fe5 100644
 
   // Apply sandbox flags.
   // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
-@@ -5929,6 +5935,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
+@@ -5973,6 +5979,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
   if (IsSameDocument() || IsPageActivation())
     return GetRenderFrameHost()->GetLastCommittedOrigin();
 
@@ -49,6 +49,6 @@ index 8a84c355e4d56..2545e0e828fe5 100644
 +    return unchecked_origin.DeriveNewOpaqueOrigin();
 +  }
 +
-   url::Origin origin = GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
-       sandbox_flags_to_commit_.value());
+   url::Origin origin =
+       GetOriginForURLLoaderFactoryWithoutFinalFrameHost(SandboxFlagsToCommit());
 
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@@ -1,8 +1,8 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index af37ee76ac033..dff942745d662 100644
+index 7b9ce0172eedf..d27fe315a3b1a 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -1826,8 +1826,6 @@ config("thin_archive") {
+@@ -1842,8 +1842,6 @@ config("thin_archive") {
   # confuses lldb.
   if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
     arflags = [ "-T" ]
--- 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 09b5c00891717..cfa169e00b104 100644
+index 560930c0979ca..e99dcad7a2e5d 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 09b5c00891717..cfa169e00b104 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/downgrade/buildflags.gni")
 import("//chrome/common/features.gni")
-@@ -1925,6 +1926,7 @@ static_library("browser") {
+@@ -1904,6 +1905,7 @@ static_library("browser") {
     "//build:chromeos_buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//cc",
@@ -18,7 +18,7 @@ index 09b5c00891717..cfa169e00b104 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -2562,6 +2564,10 @@ static_library("browser") {
+@@ -2546,6 +2548,10 @@ static_library("browser") {
     deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
   }
 
--- a/patch/patches/chrome_browser_background_mode_1100085.patch
+++ b/patch/patches/chrome_browser_background_mode_1100085.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
-index aaf861970f122..1c9648d3cc917 100644
+index d7b9aa164f161..a042abaecbce7 100644
 --- chrome/browser/browser_process.h
 +++ chrome/browser/browser_process.h
-@@ -201,9 +201,9 @@ class BrowserProcess {
+@@ -198,9 +198,9 @@ class BrowserProcess {
   virtual DownloadStatusUpdater* download_status_updater() = 0;
   virtual DownloadRequestLimiter* download_request_limiter() = 0;
 
@@ -14,10 +14,10 @@ index aaf861970f122..1c9648d3cc917 100644
       std::unique_ptr<BackgroundModeManager> manager) = 0;
 #endif
 diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
-index cd8c5f9ee5835..bae8231637ab2 100644
+index c414951896de4..dee7534789e09 100644
 --- chrome/browser/browser_process_impl.cc
 +++ chrome/browser/browser_process_impl.cc
-@@ -995,18 +995,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
+@@ -1003,18 +1003,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
   return download_request_limiter_.get();
 }
 
@@ -38,7 +38,7 @@ index cd8c5f9ee5835..bae8231637ab2 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 e61312aa24305..bc4333a3b87a8 100644
+index a40df2ac3065c..6ba9442b19f09 100644
 --- chrome/browser/browser_process_impl.h
 +++ chrome/browser/browser_process_impl.h
@@ -183,8 +183,8 @@ class BrowserProcessImpl : public BrowserProcess,
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@@ -13,7 +13,7 @@ index 9e534ff1683f1..de406f5879be0 100644
   return false;
 }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index a7a64effed043..f2d36a884b278 100644
+index 04e327d970b87..0b808a691eb49 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
@@ -262,6 +262,20 @@
@@ -37,7 +37,7 @@ index a7a64effed043..f2d36a884b278 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_browser_window_helper.h"
 #endif
-@@ -498,6 +512,13 @@ Browser::Browser(const CreateParams& params)
+@@ -504,6 +518,13 @@ Browser::Browser(const CreateParams& params)
 
   tab_strip_model_->AddObserver(this);
 
@@ -51,7 +51,7 @@ index a7a64effed043..f2d36a884b278 100644
   location_bar_model_ = std::make_unique<LocationBarModelImpl>(
       location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
 
-@@ -1320,6 +1341,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1327,6 +1348,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
   if (exclusive_access_manager_->HandleUserKeyEvent(event))
     return content::KeyboardEventProcessingResult::HANDLED;
 
@@ -66,7 +66,7 @@ index a7a64effed043..f2d36a884b278 100644
   return window()->PreHandleKeyboardEvent(event);
 }
 
-@@ -1327,8 +1356,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1334,8 +1363,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                   const NativeWebKeyboardEvent& event) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -87,7 +87,7 @@ index a7a64effed043..f2d36a884b278 100644
 }
 
 bool Browser::TabsNeedBeforeUnloadFired() {
-@@ -1533,6 +1572,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
+@@ -1540,6 +1579,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
     return window->OpenURLFromTab(source, params);
   }
 
@@ -102,7 +102,7 @@ index a7a64effed043..f2d36a884b278 100644
   NavigateParams nav_params(this, params.url, params.transition);
   nav_params.FillNavigateParamsFromOpenURLParams(params);
   nav_params.source_contents = source;
-@@ -1632,6 +1679,15 @@ void Browser::AddNewContents(WebContents* source,
+@@ -1639,6 +1686,15 @@ void Browser::AddNewContents(WebContents* source,
                                                         source, disposition);
   }
 
@@ -118,7 +118,7 @@ index a7a64effed043..f2d36a884b278 100644
   chrome::AddWebContents(this, source, std::move(new_contents), target_url,
                          disposition, initial_rect);
 }
-@@ -1650,6 +1706,8 @@ void Browser::LoadingStateChanged(WebContents* source,
+@@ -1657,6 +1713,8 @@ void Browser::LoadingStateChanged(WebContents* source,
                                   bool should_show_loading_ui) {
   ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
   UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -127,7 +127,7 @@ index a7a64effed043..f2d36a884b278 100644
 }
 
 void Browser::CloseContents(WebContents* source) {
-@@ -1677,6 +1735,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
+@@ -1684,6 +1742,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
 }
 
 void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -136,7 +136,7 @@ index a7a64effed043..f2d36a884b278 100644
   if (!GetStatusBubble())
     return;
 
-@@ -1684,6 +1744,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+@@ -1691,6 +1751,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
     GetStatusBubble()->SetURL(url);
 }
 
@@ -154,7 +154,7 @@ index a7a64effed043..f2d36a884b278 100644
 void Browser::ContentsMouseEvent(WebContents* source,
                                  bool motion,
                                  bool exited) {
-@@ -1800,6 +1871,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
+@@ -1807,6 +1878,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
 
   // Make the tab show up in the task manager.
   task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -165,7 +165,7 @@ index a7a64effed043..f2d36a884b278 100644
 }
 
 void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
-@@ -1844,6 +1919,8 @@ void Browser::RendererResponsive(
+@@ -1851,6 +1926,8 @@ void Browser::RendererResponsive(
 void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
   if (web_contents == tab_strip_model_->GetActiveWebContents())
     UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -174,7 +174,7 @@ index a7a64effed043..f2d36a884b278 100644
 }
 
 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
-@@ -1890,11 +1967,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -1906,11 +1983,15 @@ void Browser::EnterFullscreenModeForTab(
     const blink::mojom::FullscreenOptions& options) {
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
@@ -190,7 +190,7 @@ index a7a64effed043..f2d36a884b278 100644
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2737,6 +2818,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+@@ -2753,6 +2834,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
     content_translate_driver->RemoveTranslationObserver(this);
     BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
   }
@@ -200,7 +200,7 @@ index a7a64effed043..f2d36a884b278 100644
 
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index 1cda451616290..2272fb467e055 100644
+index a63ba24be314e..38a6dcbf034ef 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@@ -261,7 +261,7 @@ index 1cda451616290..2272fb467e055 100644
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
-@@ -796,6 +819,11 @@ class Browser : public TabStripModelObserver,
+@@ -794,6 +817,11 @@ class Browser : public TabStripModelObserver,
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -273,7 +273,7 @@ index 1cda451616290..2272fb467e055 100644
   void ContentsMouseEvent(content::WebContents* source,
                           bool motion,
                           bool exited) override;
-@@ -1191,6 +1219,8 @@ class Browser : public TabStripModelObserver,
+@@ -1196,6 +1224,8 @@ class Browser : public TabStripModelObserver,
   const std::string initial_workspace_;
   bool initial_visible_on_all_workspaces_state_;
 
@@ -282,7 +282,7 @@ index 1cda451616290..2272fb467e055 100644
   CreationSource creation_source_ = CreationSource::kUnknown;
 
   UnloadController unload_controller_;
-@@ -1252,6 +1282,10 @@ class Browser : public TabStripModelObserver,
+@@ -1257,6 +1287,10 @@ class Browser : public TabStripModelObserver,
       extension_browser_window_helper_;
 #endif
 
@@ -294,10 +294,10 @@ index 1cda451616290..2272fb467e055 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 8b0052125942c..a121e1086eaeb 100644
+index b7b60c8f9a0c6..bb5b09e9c081d 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
-@@ -477,6 +477,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
+@@ -497,6 +497,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
   std::unique_ptr<WebContents> target_contents =
       WebContents::Create(create_params);
 
--- 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 0c42ba3e13fe9..2bb347fe9cd50 100644
+index 1301f3baf5b7f..bebc86d812313 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -293,6 +293,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -292,6 +292,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
   return callback.get();
 }
 
@@ -16,7 +16,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
 enum class UmaEnumIdLookupType {
   GeneralEnumId,
   ContextSpecificEnumId,
-@@ -506,6 +513,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -504,6 +511,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
     return 1;
 
@@ -27,7 +27,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
   id = CollapseCommandsForUMA(id);
   const auto& map = GetIdcToUmaMap(type);
   auto it = map.find(id);
-@@ -697,6 +708,14 @@ RenderViewContextMenu::RenderViewContextMenu(
+@@ -695,6 +706,14 @@ RenderViewContextMenu::RenderViewContextMenu(
   system_app_ = GetBrowser() && GetBrowser()->app_controller()
                     ? GetBrowser()->app_controller()->system_app()
                     : nullptr;
@@ -42,7 +42,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() = default;
-@@ -1064,6 +1083,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1062,6 +1081,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 0c42ba3e13fe9..2bb347fe9cd50 100644
 }
 
 Profile* RenderViewContextMenu::GetProfile() const {
-@@ -2893,6 +2918,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
+@@ -2832,6 +2857,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
   execute_plugin_action_callback_ = std::move(cb);
 }
 
@@ -69,7 +69,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
 RenderViewContextMenu::GetHandlersForLinkUrl() {
   custom_handlers::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 a45df3c894cf5..c97a1ecb08579 100644
+index 72d55de086c14..039d28af436d7 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -126,6 +126,12 @@ class RenderViewContextMenu
@@ -85,7 +85,7 @@ index a45df3c894cf5..c97a1ecb08579 100644
  protected:
   Profile* GetProfile() const;
 
-@@ -329,6 +335,9 @@ class RenderViewContextMenu
+@@ -334,6 +340,9 @@ class RenderViewContextMenu
   //   built.
   bool is_protocol_submenu_valid_ = false;
 
--- a/patch/patches/chrome_browser_extensions.patch
+++ b/patch/patches/chrome_browser_extensions.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
-index b13f110636723..e5012dd4208e8 100644
+index 38c468115fc1a..3517c3a121f65 100644
 --- chrome/browser/extensions/api/chrome_extensions_api_client.cc
 +++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -14,6 +14,7 @@
--- 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 df174d7d1ec4d..8bb63dcc89f20 100644
+index d0335e2fb75e2..8ffd1efa13703 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index df174d7d1ec4d..8bb63dcc89f20 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//chromeos/assistant/assistant.gni")
-@@ -369,6 +370,10 @@ static_library("ui") {
+@@ -355,6 +356,10 @@ static_library("ui") {
     "//build/config/compiler:wexit_time_destructors",
   ]
 
@@ -21,7 +21,7 @@ index df174d7d1ec4d..8bb63dcc89f20 100644
   # Since browser and browser_ui actually depend on each other,
   # we must omit the dependency from browser_ui to browser.
   # However, this means browser_ui and browser should more or less
-@@ -391,6 +396,7 @@ static_library("ui") {
+@@ -377,6 +382,7 @@ static_library("ui") {
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//cc/paint",
@@ -29,7 +29,7 @@ index df174d7d1ec4d..8bb63dcc89f20 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -5209,6 +5215,7 @@ static_library("ui") {
+@@ -5293,6 +5299,7 @@ static_library("ui") {
   if (enable_basic_printing) {
     deps += [
       "//components/printing/browser",
@@ -38,7 +38,7 @@ index df174d7d1ec4d..8bb63dcc89f20 100644
     ]
   }
 diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
-index c5e34303668cb..8e376848fc7d5 100644
+index 12edced619355..3a1eb1461ab08 100644
 --- chrome/browser/ui/webui/net_export_ui.cc
 +++ chrome/browser/ui/webui/net_export_ui.cc
@@ -22,6 +22,7 @@
--- a/patch/patches/chrome_browser_profile_menu.patch
+++ b/patch/patches/chrome_browser_profile_menu.patch
@@ -29,10 +29,10 @@ index 98617c979713b..1fac2a76ce097 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 921bcea63a637..2a7e2f75a313f 100644
+index 63d663a749c77..1c9376a64c623 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -513,7 +513,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
+@@ -512,7 +512,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
 
   ProfileMenuViewBase* bubble = nullptr;
   if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
--- a/patch/patches/chrome_browser_profiles.patch
+++ b/patch/patches/chrome_browser_profiles.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
-index d153cc5837e0e..5154b21d819ed 100644
+index 5e634ca7e08b1..3cfd301688e33 100644
 --- chrome/browser/profiles/off_the_record_profile_impl.cc
 +++ chrome/browser/profiles/off_the_record_profile_impl.cc
-@@ -616,7 +616,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
+@@ -629,7 +629,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
 #endif
   if (!profile)
     profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@@ -14,10 +14,10 @@ index d153cc5837e0e..5154b21d819ed 100644
 }
 
 diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
-index a3fadab7e4e6b..032300a4c4a0b 100644
+index 779971a744754..c35a4eba3f2d9 100644
 --- chrome/browser/profiles/profile.cc
 +++ chrome/browser/profiles/profile.cc
-@@ -84,6 +84,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
+@@ -82,6 +82,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
 
 namespace {
 
@@ -25,7 +25,7 @@ index a3fadab7e4e6b..032300a4c4a0b 100644
 const char kDevToolsOTRProfileIDPrefix[] = "Devtools::BrowserContext";
 const char kMediaRouterOTRProfileIDPrefix[] = "MediaRouter::Presentation";
 const char kTestOTRProfileIDPrefix[] = "Test::OTR";
-@@ -98,6 +99,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
+@@ -96,6 +97,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
   // DevTools::BrowserContext and MediaRouter::Presentation are an
   // exception to this ban.
   return *this == PrimaryID() ||
@@ -34,7 +34,7 @@ index a3fadab7e4e6b..032300a4c4a0b 100644
          base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix,
                           base::CompareCase::SENSITIVE) ||
          base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix,
-@@ -119,6 +122,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
+@@ -117,6 +120,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
       base::GUID::GenerateRandomV4().AsLowercaseString().c_str()));
 }
 
@@ -85,10 +85,10 @@ index ca2561e412621..febd52df6c971 100644
   virtual bool IsSignedIn() = 0;
 
 diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
-index 1c79ba2998e34..d0518d23944a7 100644
+index bd0c693804407..c4a62b0dae176 100644
 --- chrome/browser/profiles/profile_impl.cc
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -998,7 +998,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
+@@ -1002,7 +1002,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
 
   otr_profiles_[otr_profile_id] = std::move(otr_profile);
 
@@ -100,10 +100,10 @@ index 1c79ba2998e34..d0518d23944a7 100644
   return raw_otr_profile;
 }
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index e443ba3df4107..d3656b3cff757 100644
+index 6ad6467c59f58..57f35c3c6150f 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
-@@ -496,7 +496,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
+@@ -494,7 +494,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
                           base::Unretained(this)));
 #endif
 
@@ -113,7 +113,7 @@ index e443ba3df4107..d3656b3cff757 100644
 
   zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index 0719f998c0097..33e392a076183 100644
+index 18c384da45b1e..606d60152ebb8 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
@@ -150,7 +150,7 @@ class ProfileManager : public Profile::Delegate {
--- 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 b42acc15af846..d5a739cdb8948 100644
+index 9a4e6cd87b872..18bb0f897fd76 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
@@ -26,6 +26,7 @@ static_library("safe_browsing") {
--- a/patch/patches/chrome_browser_themes.patch
+++ b/patch/patches/chrome_browser_themes.patch
@@ -1,17 +1,17 @@
 diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
-index 479ccaad2aa8f..fd57948a4af5e 100644
+index 9de247b3f04df..e05535fd40788 100644
 --- chrome/browser/themes/theme_service.cc
 +++ chrome/browser/themes/theme_service.cc
-@@ -28,6 +28,7 @@
- #include "base/task/thread_pool.h"
+@@ -31,6 +31,7 @@
 #include "base/threading/thread_task_runner_handle.h"
+ #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
-@@ -63,6 +64,10 @@
- #include "ui/base/layout.h"
+@@ -67,6 +68,10 @@
+ #include "ui/color/color_id.h"
 #include "ui/color/color_provider.h"
 
 +#if BUILDFLAG(ENABLE_CEF)
@@ -21,7 +21,7 @@ index 479ccaad2aa8f..fd57948a4af5e 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "base/scoped_observation.h"
 #include "extensions/browser/extension_registry_observer.h"
-@@ -355,11 +360,19 @@ void ThemeService::Init() {
+@@ -359,11 +364,19 @@ void ThemeService::Init() {
   // OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
   // constructed in time to observe the corresponding events.
 #if BUILDFLAG(ENABLE_EXTENSIONS)
--- 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 2cf61c44809a9..e6948ab525700 100644
+index f2d3d1a0cd308..49c9747006521 100644
 --- chrome/browser/plugins/plugin_info_host_impl.cc
 +++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 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 9e2e8d1892366..262659f9e3204 100644
+index 34d8a9b2ff94e..fe67d6b068bf6 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -940,6 +940,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -926,6 +926,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
 
     if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
          status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -136,7 +136,7 @@ index 9e2e8d1892366..262659f9e3204 100644
         content_settings_agent_delegate->IsPluginTemporarilyAllowed(
             identifier)) {
       status = chrome::mojom::PluginStatus::kAllowed;
-@@ -1141,7 +1142,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1127,7 +1128,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
         render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
             plugin_auth_host.BindNewEndpointAndPassReceiver());
         plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -146,7 +146,7 @@ index 9e2e8d1892366..262659f9e3204 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlocked: {
-@@ -1150,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1136,7 +1138,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
         placeholder->AllowLoading();
         RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -156,7 +156,7 @@ index 9e2e8d1892366..262659f9e3204 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -1160,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1146,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                        group_name));
         RenderThread::Get()->RecordAction(
             UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -166,7 +166,7 @@ index 9e2e8d1892366..262659f9e3204 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedNoLoading: {
-@@ -1168,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1154,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             IDR_BLOCKED_PLUGIN_HTML,
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
                                        group_name));
--- 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 93f57d5fd1f4a..428371b7d7ff8 100644
+index 176314411db58..9dc533e9ef13d 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@@ -18,7 +18,7 @@ index 93f57d5fd1f4a..428371b7d7ff8 100644
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
-@@ -211,6 +213,10 @@ static_library("renderer") {
+@@ -210,6 +212,10 @@ static_library("renderer") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@@ -1,8 +1,8 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 132735e3a1200..0d392976799a4 100644
+index 7c710c515361c..bb61507a3f5d1 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
 #include "base/trace_event/trace_event_impl.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@@ -10,7 +10,7 @@ index 132735e3a1200..0d392976799a4 100644
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_resource_bundle_helper.h"
 #include "chrome/browser/defaults.h"
-@@ -390,6 +391,8 @@ struct MainFunction {
+@@ -391,6 +392,8 @@ struct MainFunction {
 
 // Initializes the user data dir. Must be called before InitializeLocalState().
 void InitializeUserDataDir(base::CommandLine* command_line) {
@@ -19,7 +19,7 @@ index 132735e3a1200..0d392976799a4 100644
 #if BUILDFLAG(IS_WIN)
   // Reach out to chrome_elf for the truth on the user data directory.
   // Note that in tests, this links to chrome_elf_test_stubs.
-@@ -712,7 +715,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
+@@ -713,7 +716,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
   }
 
 #if BUILDFLAG(IS_WIN)
@@ -29,7 +29,7 @@ index 132735e3a1200..0d392976799a4 100644
   base::sequence_manager::internal::ThreadControllerPowerMonitor::
       InitializeOnMainThread();
 #endif
-@@ -1010,6 +1015,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1024,6 +1029,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@@ -37,7 +37,7 @@ index 132735e3a1200..0d392976799a4 100644
   crash_reporter::InitializeCrashKeys();
 
 #if BUILDFLAG(IS_POSIX)
-@@ -1020,6 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1034,6 +1040,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitMacCrashReporter(command_line, process_type);
   SetUpInstallerPreferences(command_line);
 #endif
@@ -45,7 +45,7 @@ index 132735e3a1200..0d392976799a4 100644
 
 #if BUILDFLAG(IS_WIN)
   child_process_logging::Init();
-@@ -1146,6 +1153,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1161,6 +1168,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
         locale;
   }
 
@@ -53,7 +53,7 @@ index 132735e3a1200..0d392976799a4 100644
 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
-@@ -1178,6 +1186,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1193,6 +1201,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
   crash_keys::SetCrashKeysFromCommandLine(command_line);
@@ -61,7 +61,7 @@ index 132735e3a1200..0d392976799a4 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybePatchGdiGetFontData();
-@@ -1269,6 +1278,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1284,6 +1293,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@@ -69,7 +69,7 @@ index 132735e3a1200..0d392976799a4 100644
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   const base::CommandLine* command_line =
-@@ -1285,6 +1295,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1300,6 +1310,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@@ -78,7 +78,7 @@ index 132735e3a1200..0d392976799a4 100644
 
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index 4e9969d9c5b0b..e599b114f021d 100644
+index 3d59014db49e9..f96b79c02fd92 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -52,6 +52,7 @@
@@ -89,7 +89,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/active_use_util.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -1530,11 +1531,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1579,11 +1580,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
         browser_process_->local_state());
   }
 
@@ -103,7 +103,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644
 
 #if BUILDFLAG(IS_ANDROID)
   page_info::SetPageInfoClient(new ChromePageInfoClient());
-@@ -1757,11 +1760,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1760,11 +1763,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // This step is costly and is already measured in
   // Startup.StartupBrowserCreator_Start.
   // See the comment above for an explanation of |process_command_line|.
@@ -119,7 +119,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -1789,8 +1795,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1792,8 +1798,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 
     // Create the RunLoop for MainMessageLoopRun() to use and transfer
     // ownership of the browser's lifetime to the BrowserProcess.
@@ -132,7 +132,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644
         GetMainRunLoopInstance()->QuitWhenIdleClosure());
   }
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index dbd8f7ebe071d..b0f8d3d7bcff9 100644
+index 831d7173873d1..594aee58331a7 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@@ -143,7 +143,7 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_listener.h"
 #include "chrome/browser/browser_process.h"
-@@ -110,6 +111,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
     }
   }
 
@@ -151,15 +151,15 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644
   // Create the app delegate. This object is intentionally leaked as a global
   // singleton. It is accessed through -[NSApp delegate].
   AppController* app_controller = [[AppController alloc] init];
-@@ -118,6 +120,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
   chrome::BuildMainMenu(NSApp, app_controller,
                         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
   [app_controller mainMenuCreated];
 +#endif  // BUILDFLAG(ENABLE_CEF)
 
-   PrefService* local_state = g_browser_process->local_state();
-   DCHECK(local_state);
-@@ -177,7 +180,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
+   chrome::DeveloperIDCertificateReauthorizeInApp();
+ 
+@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
 }
 
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@@ -170,7 +170,7 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644
 +#endif
 }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 70df7bef3a7b1..97d130a0a1be6 100644
+index d590b2d42f416..e1039ef8b78b4 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@@ -181,7 +181,7 @@ index 70df7bef3a7b1..97d130a0a1be6 100644
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -3682,9 +3683,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -3705,9 +3706,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                           &search::HandleNewTabURLReverseRewrite);
 #endif  // BUILDFLAG(IS_ANDROID)
 
@@ -193,7 +193,7 @@ index 70df7bef3a7b1..97d130a0a1be6 100644
 }
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
-@@ -5333,7 +5336,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
+@@ -5340,7 +5343,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
       network_service);
 }
 
@@ -202,7 +202,7 @@ index 70df7bef3a7b1..97d130a0a1be6 100644
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -5351,6 +5354,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
+@@ -5358,6 +5361,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
     network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
     network_context_params->accept_language = GetApplicationLocale();
   }
@@ -212,10 +212,10 @@ index 70df7bef3a7b1..97d130a0a1be6 100644
 
 std::vector<base::FilePath>
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index 71dfd396b405e..879210ff7c8fd 100644
+index f2a7fdf291652..f106b11e61ab0 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -549,7 +549,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -557,7 +557,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       override;
   void OnNetworkServiceCreated(
       network::mojom::NetworkService* network_service) override;
@@ -225,7 +225,7 @@ index 71dfd396b405e..879210ff7c8fd 100644
       bool in_memory,
       const base::FilePath& relative_partition_path,
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index 3ae5f0a699de3..d66d193121be5 100644
+index 94cf3615137ad..369983be86323 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@@ -236,7 +236,7 @@ index 3ae5f0a699de3..d66d193121be5 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -164,6 +165,10 @@
+@@ -161,6 +162,10 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
@@ -247,7 +247,7 @@ index 3ae5f0a699de3..d66d193121be5 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -1267,6 +1272,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1273,6 +1278,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   SessionDataService::RegisterProfilePrefs(registry);
 #endif
 
--- a/patch/patches/chrome_runtime_views.patch
+++ b/patch/patches/chrome_runtime_views.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
-index 92f10fac6b017..cc53da3a0b32e 100644
+index cff1df2490bb6..9d156bd9993fa 100644
 --- chrome/browser/ui/browser_command_controller.cc
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -368,8 +368,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -371,8 +371,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
   // CommandUpdaterDelegate and CommandUpdater declare this function so we
   // choose to not implement CommandUpdaterDelegate inside this class and
   // therefore command_updater_ doesn't have the delegate set).
@@ -14,7 +14,7 @@ index 92f10fac6b017..cc53da3a0b32e 100644
 
   // No commands are enabled if there is not yet any selected tab.
   // TODO(pkasting): It seems like we should not need this, because either
-@@ -979,11 +981,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
+@@ -985,11 +987,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
 // BrowserCommandController, private:
 
 bool BrowserCommandController::IsShowingMainUI() {
@@ -29,12 +29,12 @@ index 92f10fac6b017..cc53da3a0b32e 100644
 +         browser_->toolbar_overridden();
 }
 
- void BrowserCommandController::InitCommandState() {
+ bool BrowserCommandController::IsWebAppOrCustomTab() const {
 diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
-index 6264562165ced..d20f970ba1254 100644
+index 6b644bf006532..9ae5bd273b6dc 100644
 --- chrome/browser/ui/views/frame/browser_frame.cc
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -73,15 +73,23 @@ bool IsUsingGtkTheme(Profile* profile) {
+@@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) {
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
@@ -60,7 +60,7 @@ index 6264562165ced..d20f970ba1254 100644
 }
 
 BrowserFrame::~BrowserFrame() {}
-@@ -141,6 +149,12 @@ gfx::Rect BrowserFrame::GetBoundsForTabStripRegion(
+@@ -143,6 +151,12 @@ gfx::Rect BrowserFrame::GetBoundsForTabStripRegion(
 }
 
 int BrowserFrame::GetTopInset() const {
@@ -73,7 +73,7 @@ index 6264562165ced..d20f970ba1254 100644
   return browser_frame_view_->GetTopInset(false);
 }
 
-@@ -175,15 +189,21 @@ void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
+@@ -177,15 +191,21 @@ void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
 
 content::KeyboardEventProcessingResult BrowserFrame::PreHandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
@@ -95,27 +95,37 @@ index 6264562165ced..d20f970ba1254 100644
   browser_frame_view_->OnBrowserViewInitViewsComplete();
 }
 
-@@ -244,6 +264,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
+@@ -246,6 +266,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
 
 ui::ColorProviderManager::InitializerSupplier* BrowserFrame::GetCustomTheme()
     const {
 +  if (!browser_view_)
 +    return nullptr;
   Browser* browser = browser_view_->browser();
-   auto* app_controller = browser->app_controller();
-   // Ignore GTK+ for web apps with window-controls-overlay as the
-@@ -369,7 +391,8 @@ void BrowserFrame::SelectNativeTheme() {
+   // If this is an incognito profile, there should never be a custom theme.
+   if (browser->profile()->IsIncognitoProfile())
+@@ -374,7 +396,8 @@ void BrowserFrame::SelectNativeTheme() {
   // Select between regular, dark and GTK theme.
   ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
 
 -  if (browser_view_->browser()->profile()->IsIncognitoProfile()) {
 +  if (browser_view_ &&
 +      browser_view_->browser()->profile()->IsIncognitoProfile()) {
-     // If the flag is enabled, then no matter if we are using the default theme
-     // or not we always use the dark ui instance.
-     if (base::FeatureList::IsEnabled(
+     // No matter if we are using the default theme or not we always use the dark
+     // ui instance.
+     SetNativeTheme(ui::NativeTheme::GetInstanceForDarkUI());
+@@ -387,7 +410,8 @@ void BrowserFrame::SelectNativeTheme() {
+   // display_override so the web contents can blend with the overlay by using
+   // the developer-provided theme color for a better experience. Context:
+   // https://crbug.com/1219073.
+-  if (linux_ui && !browser_view_->AppUsesWindowControlsOverlay()) {
+  if (linux_ui &&
+      (!browser_view_ || !browser_view_->AppUsesWindowControlsOverlay())) {
+     native_theme = linux_ui->GetNativeTheme(GetNativeWindow());
+   }
+ #endif
 diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
-index 6a1e9abbc66aa..aa9e3ebe2599c 100644
+index 67496d7ab6c50..fa97b9abe6253 100644
 --- chrome/browser/ui/views/frame/browser_frame.h
 +++ chrome/browser/ui/views/frame/browser_frame.h
@@ -53,7 +53,9 @@ enum class TabDragKind {
@@ -129,10 +139,10 @@ index 6a1e9abbc66aa..aa9e3ebe2599c 100644
   BrowserFrame(const BrowserFrame&) = delete;
   BrowserFrame& operator=(const BrowserFrame&) = delete;
 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
-index 8138e50a55072..e01b2274119b8 100644
+index 0f9a2e8b91715..355bdf6fa9074 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -291,11 +291,10 @@ using content::WebContents;
+@@ -297,11 +297,10 @@ using content::WebContents;
 using views::ColumnSet;
 using web_modal::WebContentsModalDialogHost;
 
@@ -147,7 +157,7 @@ index 8138e50a55072..e01b2274119b8 100644
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // UMA histograms that record animation smoothness for tab loading animation.
-@@ -683,11 +682,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
+@@ -689,11 +688,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
@@ -171,7 +181,7 @@ index 8138e50a55072..e01b2274119b8 100644
   SetShowIcon(::ShouldShowWindowIcon(browser_.get()));
 
   // In forced app mode, all size controls are always disabled. Otherwise, use
-@@ -701,7 +711,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -727,7 +737,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   }
 
   browser_->tab_strip_model()->AddObserver(this);
@@ -179,7 +189,7 @@ index 8138e50a55072..e01b2274119b8 100644
 
   // Top container holds tab strip region and toolbar and lives at the front of
   // the view hierarchy.
-@@ -749,8 +758,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -770,8 +779,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
       devtools_web_view_, contents_web_view_));
 
@@ -197,7 +207,7 @@ index 8138e50a55072..e01b2274119b8 100644
 
   contents_separator_ =
       top_container_->AddChildView(std::make_unique<ContentsSeparator>());
-@@ -1587,6 +1603,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
+@@ -1646,6 +1662,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
   if (immersive_mode_controller_->IsEnabled())
     return false;
 
@@ -206,7 +216,7 @@ index 8138e50a55072..e01b2274119b8 100644
   return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
 }
 
-@@ -2731,7 +2749,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
+@@ -2824,7 +2842,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
 }
 
 void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -216,7 +226,7 @@ index 8138e50a55072..e01b2274119b8 100644
   top_container()->DestroyLayer();
   AddChildViewAt(top_container(), 0);
   EnsureFocusOrder();
-@@ -3220,8 +3239,10 @@ void BrowserView::Layout() {
+@@ -3313,8 +3332,10 @@ void BrowserView::Layout() {
 
   // TODO(jamescook): Why was this in the middle of layout code?
   toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -229,7 +239,7 @@ index 8138e50a55072..e01b2274119b8 100644
 
   // Some of the situations when the BrowserView is laid out are:
   // - Enter/exit immersive fullscreen mode.
-@@ -3284,6 +3305,11 @@ void BrowserView::AddedToWidget() {
+@@ -3380,6 +3401,11 @@ void BrowserView::AddedToWidget() {
   SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
 #endif
 
@@ -241,7 +251,7 @@ index 8138e50a55072..e01b2274119b8 100644
   toolbar_->Init();
 
   // TODO(pbos): Manage this either inside SidePanel or the corresponding button
-@@ -3336,13 +3362,9 @@ void BrowserView::AddedToWidget() {
+@@ -3432,13 +3458,9 @@ void BrowserView::AddedToWidget() {
 
   EnsureFocusOrder();
 
@@ -257,7 +267,7 @@ index 8138e50a55072..e01b2274119b8 100644
   using_native_frame_ = frame_->ShouldUseNativeFrame();
 
   MaybeInitializeWebUITabStrip();
-@@ -3761,7 +3783,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
+@@ -3859,7 +3881,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
   // Undo our anti-jankiness hacks and force a re-layout.
   in_process_fullscreen_ = false;
   ToolbarSizeChanged(false);
@@ -267,7 +277,7 @@ index 8138e50a55072..e01b2274119b8 100644
 }
 
 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
-@@ -4052,6 +4075,8 @@ Profile* BrowserView::GetProfile() {
+@@ -4186,6 +4209,8 @@ Profile* BrowserView::GetProfile() {
 }
 
 void BrowserView::UpdateUIForTabFullscreen() {
@@ -276,7 +286,7 @@ index 8138e50a55072..e01b2274119b8 100644
   frame()->GetFrameView()->UpdateFullscreenTopUI();
 }
 
-@@ -4074,6 +4099,8 @@ void BrowserView::HideDownloadShelf() {
+@@ -4208,6 +4233,8 @@ void BrowserView::HideDownloadShelf() {
 }
 
 bool BrowserView::CanUserExitFullscreen() const {
@@ -286,10 +296,10 @@ index 8138e50a55072..e01b2274119b8 100644
 }
 
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index 02d9793dd5c8d..fe8b0cef88375 100644
+index a8abae057e699..c237aae395be8 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
-@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
+@@ -127,11 +127,16 @@ class BrowserView : public BrowserWindow,
                     public webapps::AppBannerManager::Observer {
  public:
   METADATA_HEADER(BrowserView);
@@ -306,7 +316,7 @@ index 02d9793dd5c8d..fe8b0cef88375 100644
   void set_frame(BrowserFrame* frame) { frame_ = frame; }
   BrowserFrame* frame() const { return frame_; }
 
-@@ -705,6 +710,12 @@ class BrowserView : public BrowserWindow,
+@@ -723,6 +728,12 @@ class BrowserView : public BrowserWindow,
       const std::map<std::string, std::string>& extra_data) override;
 #endif
 
@@ -320,7 +330,7 @@ index 02d9793dd5c8d..fe8b0cef88375 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 1d22e4b057c6c..d73b547f09e0b 100644
+index 5f8af5f46bf46..54aba6eb904d6 100644
 --- chrome/browser/ui/views/frame/browser_view_layout.cc
 +++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -40,6 +40,10 @@
@@ -347,10 +357,10 @@ index 1d22e4b057c6c..d73b547f09e0b 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 b5706099ce923..07cebc2f8b65f 100644
+index 9a42c3bd2207b..4de0fb1b33bce 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-@@ -559,37 +559,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
+@@ -563,37 +563,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
 }
 
 bool BrowserTabStripController::IsFrameCondensed() const {
@@ -405,10 +415,10 @@ index b5706099ce923..07cebc2f8b65f 100644
 }
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index b5098154b2f7e..4a3121cedf083 100644
+index 5ea77d3196bc0..1be02aea8cec6 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -168,12 +168,13 @@ auto& GetViewCommandMap() {
+@@ -169,12 +169,13 @@ auto& GetViewCommandMap() {
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
@@ -424,7 +434,7 @@ index b5098154b2f7e..4a3121cedf083 100644
   SetID(VIEW_ID_TOOLBAR);
 
   UpgradeDetector::GetInstance()->AddObserver(this);
-@@ -208,7 +209,7 @@ void ToolbarView::Init() {
+@@ -209,7 +210,7 @@ void ToolbarView::Init() {
 #endif
   auto location_bar = std::make_unique<LocationBarView>(
       browser_, browser_->profile(), browser_->command_controller(), this,
@@ -434,10 +444,10 @@ index b5098154b2f7e..4a3121cedf083 100644
   size_animation_.Reset(1);
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
-index 79efc97f711f1..6915479340275 100644
+index a60109508b7f5..3df342afd279b 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.h
 +++ chrome/browser/ui/views/toolbar/toolbar_view.h
-@@ -93,7 +93,8 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -94,7 +94,8 @@ class ToolbarView : public views::AccessiblePaneView,
                 // needs to be displayed.
   };
 
--- a/patch/patches/chrome_untrusted_webui_3047.patch
+++ b/patch/patches/chrome_untrusted_webui_3047.patch
@@ -1,34 +0,0 @@
-diff --git chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.cc chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.cc
-index 78d2b6eef6ca6..ebefa586902c9 100644
--- chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.cc
-+++ chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.cc
-@@ -94,9 +94,15 @@ WebUIConfigList CreateConfigs() {
- }  // namespace
- 
- // static
-void ChromeUntrustedWebUIControllerFactory::RegisterInstance() {
-+ChromeUntrustedWebUIControllerFactory*
-+ChromeUntrustedWebUIControllerFactory::GetInstance() {
-   static base::NoDestructor<ChromeUntrustedWebUIControllerFactory> instance;
-  content::WebUIControllerFactory::RegisterFactory(instance.get());
-+  return instance.get();
-+}
-+
-+// static
-+void ChromeUntrustedWebUIControllerFactory::RegisterInstance() {
-+  content::WebUIControllerFactory::RegisterFactory(GetInstance());
- }
- 
- ChromeUntrustedWebUIControllerFactory::ChromeUntrustedWebUIControllerFactory()
-diff --git chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.h chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.h
-index fd16bca71a3f0..738afa6654e42 100644
--- chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.h
-+++ chrome/browser/ui/webui/chrome_untrusted_web_ui_controller_factory.h
-@@ -12,6 +12,7 @@ class ChromeUntrustedWebUIControllerFactory
-  public:
-   // Register the singleton instance of this class.
-   static void RegisterInstance();
-+  static ChromeUntrustedWebUIControllerFactory* GetInstance();
- 
-   ChromeUntrustedWebUIControllerFactory();
-   ChromeUntrustedWebUIControllerFactory(
--- a/patch/patches/component_build.patch
+++ b/patch/patches/component_build.patch
@@ -68,7 +68,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 b54d43016f306..b26a292893de8 100644
+index a789586193e94..234a687dd1c23 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
@@ -32,6 +32,7 @@ component("controller") {
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
-index ec6be2ff24d23..159ed7776c0aa 100644
+index fc87fd9a6ffca..99c6b27018e13 100644
 --- content/browser/devtools/devtools_http_handler.cc
 +++ content/browser/devtools/devtools_http_handler.cc
@@ -576,7 +576,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -12,7 +12,7 @@ index ec6be2ff24d23..159ed7776c0aa 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 c1235f9658b88..040d9afb0d9ff 100644
+index b5c2dc992fb19..868661c86c39a 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -665,6 +665,14 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -31,7 +31,7 @@ index c1235f9658b88..040d9afb0d9ff 100644
         factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
             std::move(loader_factory));
 diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
-index 2579cf2ce325d..03b60ce3b17cb 100644
+index 0e2c7f92937f1..31bb164e25bf6 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
@@ -11,7 +11,7 @@
@@ -43,7 +43,7 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
 
 #include <utility>
 
-@@ -877,7 +877,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
+@@ -883,7 +883,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
 void ContentBrowserClient::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {}
 
@@ -52,7 +52,7 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -886,6 +886,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
+@@ -892,6 +892,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
         cert_verifier_creation_params) {
   network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
   network_context_params->accept_language = "en-us,en";
@@ -61,18 +61,18 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
 
 std::vector<base::FilePath>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index 7d3fafd564118..789bfd693888f 100644
+index aa125be3640fe..bf5dec73a5287 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
 #include "content/public/browser/login_delegate.h"
 #include "content/public/browser/mojo_binder_policy_map.h"
 #include "content/public/browser/storage_partition_config.h"
 +#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_browser_interface_broker_registry.h"
+ #include "content/public/common/alternative_error_page_override_info.mojom.h"
 #include "content/public/common/main_function_params.h"
- #include "content/public/common/page_visibility_state.h"
-@@ -1634,7 +1635,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1658,7 +1659,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   //
   // If |relative_partition_path| is the empty string, it means this needs to
   // create the default NetworkContext for the BrowserContext.
@@ -81,7 +81,7 @@ index 7d3fafd564118..789bfd693888f 100644
       BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
-@@ -1823,6 +1824,17 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1859,6 +1860,17 @@ class CONTENT_EXPORT ContentBrowserClient {
       RenderFrameHost* initiator_document,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
 
@@ -96,10 +96,10 @@ index 7d3fafd564118..789bfd693888f 100644
 +      RenderFrameHost* initiator_document,
 +      mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) { return false; }
 +
-   // Creates an OverlayWindow to be used for Picture-in-Picture. This window
-   // will house the content shown when in Picture-in-Picture mode. This will
-   // return a new OverlayWindow.
-@@ -1879,6 +1891,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+   // Creates an OverlayWindow to be used for video or document
+   // Picture-in-Picture respectively. This window will house the content shown
+   // when in Picture-in-Picture mode. This will return a new OverlayWindow.
+@@ -1920,6 +1932,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Used as part of the user agent string.
   virtual std::string GetProduct();
 
@@ -111,10 +111,10 @@ index 7d3fafd564118..789bfd693888f 100644
   // on blink::features::kUserAgentReduction. Content may cache this value.
   virtual std::string GetUserAgent();
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index b914cb91a2b49..2f84201ba4d1e 100644
+index 63ead7f8ab838..11f606368d9e8 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
-@@ -87,6 +87,9 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentRendererClient {
   // binding requests from RenderProcessHost::BindReceiver().
   virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
 
@@ -124,7 +124,7 @@ index b914cb91a2b49..2f84201ba4d1e 100644
   // Notifies that a new RenderFrame has been created.
   virtual void RenderFrameCreated(RenderFrame* render_frame) {}
 
-@@ -298,6 +301,10 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -303,6 +306,10 @@ class CONTENT_EXPORT ContentRendererClient {
   // This method may invalidate the frame.
   virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
 
@@ -136,10 +136,10 @@ index b914cb91a2b49..2f84201ba4d1e 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 03f9fac832072..1f45e54e32da9 100644
+index 0b42cba866722..d2f0841bd9069 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -640,6 +640,8 @@ void RenderThreadImpl::Init() {
+@@ -656,6 +656,8 @@ void RenderThreadImpl::Init() {
       GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
           blink::URLLoaderThrottleProviderType::kFrame);
 
@@ -149,10 +149,10 @@ index 03f9fac832072..1f45e54e32da9 100644
       &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
 
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index b4e37bbdd3a80..1d16b769a6329 100644
+index a64d78c9d8112..0551db7f7d4cc 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -1082,6 +1082,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
+@@ -1090,6 +1090,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
 
 //------------------------------------------------------------------------------
 
@@ -169,10 +169,10 @@ index b4e37bbdd3a80..1d16b769a6329 100644
 RendererBlinkPlatformImpl::GetCodeCacheHost() {
   base::AutoLock lock(code_cache_host_lock_);
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index 2191ab72dcacc..d902eb707cc99 100644
+index 10c96d3915e64..060087d2436ea 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -260,6 +260,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -261,6 +261,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
   base::PlatformThreadId GetIOThreadId() const override;
 
--- a/patch/patches/content_main_654986.patch
+++ b/patch/patches/content_main_654986.patch
@@ -1,8 +1,8 @@
 diff --git content/app/content_main.cc content/app/content_main.cc
-index bf4cbe990cb4d..e494fff1fa5d5 100644
+index 332b7d026e036..0d63ad05fde4e 100644
 --- content/app/content_main.cc
 +++ content/app/content_main.cc
-@@ -225,16 +225,10 @@ ContentMainParams::~ContentMainParams() = default;
+@@ -226,16 +226,10 @@ ContentMainParams::~ContentMainParams() = default;
 ContentMainParams::ContentMainParams(ContentMainParams&&) = default;
 ContentMainParams& ContentMainParams::operator=(ContentMainParams&&) = default;
 
@@ -21,7 +21,7 @@ index bf4cbe990cb4d..e494fff1fa5d5 100644
 
   // A flag to indicate whether Main() has been called before. On Android, we
   // may re-run Main() without restarting the browser process. This flag
-@@ -318,12 +312,6 @@ RunContentProcess(ContentMainParams params,
+@@ -320,12 +314,6 @@ RunContentProcess(ContentMainParams params,
 #endif
 
 #if BUILDFLAG(IS_MAC)
@@ -34,7 +34,7 @@ index bf4cbe990cb4d..e494fff1fa5d5 100644
     InitializeMac();
 #endif
 
-@@ -396,8 +384,18 @@ RunContentProcess(ContentMainParams params,
+@@ -398,8 +386,18 @@ RunContentProcess(ContentMainParams params,
 
   if (IsSubprocess())
     CommonSubprocessInit();
@@ -54,7 +54,7 @@ index bf4cbe990cb4d..e494fff1fa5d5 100644
   if (tracker) {
     if (exit_code == 0) {
       tracker->SetProcessPhaseIfEnabled(
-@@ -409,14 +407,41 @@ RunContentProcess(ContentMainParams params,
+@@ -411,14 +409,41 @@ RunContentProcess(ContentMainParams params,
     }
   }
 
@@ -100,7 +100,7 @@ index bf4cbe990cb4d..e494fff1fa5d5 100644
 }
 
 diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
-index 5a365936031e6..ab4a3f2138e28 100644
+index 9d22238878e32..e0833ed4572e9 100644
 --- content/app/content_main_runner_impl.cc
 +++ content/app/content_main_runner_impl.cc
@@ -44,6 +44,7 @@
@@ -111,7 +111,7 @@ index 5a365936031e6..ab4a3f2138e28 100644
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-@@ -1182,6 +1183,11 @@ void ContentMainRunnerImpl::Shutdown() {
+@@ -1205,6 +1206,11 @@ void ContentMainRunnerImpl::Shutdown() {
   is_shutdown_ = true;
 }
 
@@ -124,10 +124,10 @@ index 5a365936031e6..ab4a3f2138e28 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 2cfcb5330af5d..e1966af803dfb 100644
+index 225a0aa930732..48b5aa44c8441 100644
 --- content/app/content_main_runner_impl.h
 +++ content/app/content_main_runner_impl.h
-@@ -31,7 +31,7 @@ namespace content {
+@@ -30,7 +30,7 @@ namespace content {
 class ContentClient;
 class MojoIpcSupport;
 
@@ -136,7 +136,7 @@ index 2cfcb5330af5d..e1966af803dfb 100644
  public:
   static std::unique_ptr<ContentMainRunnerImpl> Create();
 
-@@ -50,6 +50,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
+@@ -49,6 +49,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
   int Run() override;
   void Shutdown() override;
 
--- a/patch/patches/crashpad_tp_1995.patch
+++ b/patch/patches/crashpad_tp_1995.patch
@@ -248,10 +248,10 @@ index 70f1628354455..cd043a821e96d 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 cb78aa1680aec..d50ddc7ae3c56 100644
+index 48ef8b6530a67..dbe2916492ff7 100644
 --- third_party/crashpad/crashpad/handler/handler_main.cc
 +++ third_party/crashpad/crashpad/handler/handler_main.cc
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@@ -259,7 +259,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
 #include "client/crash_report_database.h"
 #include "client/crashpad_client.h"
 #include "client/crashpad_info.h"
-@@ -88,6 +89,10 @@
+@@ -89,6 +90,10 @@
 #include "util/win/session_end_watcher.h"
 #endif  // BUILDFLAG(IS_APPLE)
 
@@ -270,7 +270,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
 namespace crashpad {
 
 namespace {
-@@ -247,6 +252,9 @@ struct Options {
+@@ -248,6 +253,9 @@ struct Options {
   bool periodic_tasks;
   bool rate_limit;
   bool upload_gzip;
@@ -280,7 +280,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   bool use_cros_crash_reporter = false;
   base::FilePath minidump_dir_for_tests;
-@@ -616,6 +624,9 @@ int HandlerMain(int argc,
+@@ -617,6 +625,9 @@ int HandlerMain(int argc,
     kOptionTraceParentWithException,
 #endif
     kOptionURL,
@@ -290,7 +290,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     kOptionUseCrosCrashReporter,
     kOptionMinidumpDirForTests,
-@@ -716,6 +727,9 @@ int HandlerMain(int argc,
+@@ -717,6 +728,9 @@ int HandlerMain(int argc,
 #endif  // BUILDFLAG(IS_ANDROID)
     {"help", no_argument, nullptr, kOptionHelp},
     {"version", no_argument, nullptr, kOptionVersion},
@@ -300,7 +300,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
     {nullptr, 0, nullptr, 0},
   };
 
-@@ -873,6 +887,27 @@ int HandlerMain(int argc,
+@@ -874,6 +888,27 @@ int HandlerMain(int argc,
         options.url = optarg;
         break;
       }
@@ -328,7 +328,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       case kOptionUseCrosCrashReporter: {
         options.use_cros_crash_reporter = true;
-@@ -1022,8 +1057,14 @@ int HandlerMain(int argc,
+@@ -1023,8 +1058,14 @@ int HandlerMain(int argc,
     upload_thread_options.upload_gzip = options.upload_gzip;
     upload_thread_options.watch_pending_reports = options.periodic_tasks;
 
@@ -343,7 +343,7 @@ index cb78aa1680aec..d50ddc7ae3c56 100644
     upload_thread.Get()->Start();
   }
 
-@@ -1094,7 +1135,8 @@ int HandlerMain(int argc,
+@@ -1095,7 +1136,8 @@ int HandlerMain(int argc,
   ScopedStoppable prune_thread;
   if (options.periodic_tasks) {
     prune_thread.Reset(new PruneCrashReportThread(
--- 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 a001f60b279ed..b0ee6283be54f 100644
+index 958a61892a19d..e137ebe5a4146 100644
 --- components/embedder_support/user_agent_utils.cc
 +++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@
@@ -7,19 +7,19 @@ index a001f60b279ed..b0ee6283be54f 100644
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 +#include "cef/libcef/common/cef_switches.h"
+ #include "components/embedder_support/pref_names.h"
 #include "components/embedder_support/switches.h"
 #include "components/policy/core/common/policy_pref_names.h"
- #include "components/prefs/pref_service.h"
-@@ -276,6 +277,12 @@ blink::UserAgentBrandList GetBrandFullVersionList(
- }  // namespace
+@@ -318,6 +319,12 @@ std::string GetMajorVersionForUserAgentString(
 
- std::string GetProduct(const bool allow_version_override) {
+ std::string GetProduct(const bool allow_version_override,
+                        ForceMajorVersionToMinorPosition force_major_to_minor) {
 +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 +  if (command_line->HasSwitch(switches::kUserAgentProductAndVersion)) {
 +    return command_line->GetSwitchValueASCII(
 +        switches::kUserAgentProductAndVersion);
 +  }
 +
-   // FF Priority 1: force major version to 99 and minor version to major version
-   // number.
+   // Force major version to 99 and minor version to major position.
   if (allow_version_override &&
+       ShouldForceMajorVersionToMinorPosition(force_major_to_minor))
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@@ -60,10 +60,10 @@ 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 3e827fcf45ae4..e1790599da17b 100644
+index 936a1100e25f9..c782d70bc3643 100644
 --- extensions/browser/extension_host.cc
 +++ extensions/browser/extension_host.cc
-@@ -60,11 +60,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
+@@ -57,11 +57,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
   DCHECK(host_type == mojom::ViewType::kExtensionBackgroundPage ||
          host_type == mojom::ViewType::kExtensionDialog ||
          host_type == mojom::ViewType::kExtensionPopup);
@@ -79,7 +79,7 @@ index 3e827fcf45ae4..e1790599da17b 100644
   main_frame_host_ = host_contents_->GetMainFrame();
 
   // Listen for when an extension is unloaded from the same profile, as it may
-@@ -79,6 +80,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
+@@ -76,6 +77,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
   ExtensionHostRegistry::Get(browser_context_)->ExtensionHostCreated(this);
 }
 
@@ -125,7 +125,7 @@ index 3e827fcf45ae4..e1790599da17b 100644
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
 
 diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
-index f88183071e861..a05302a7a2f0b 100644
+index dd22bbc07fb52..c695ece6b1a47 100644
 --- extensions/browser/extension_host.h
 +++ extensions/browser/extension_host.h
@@ -53,6 +53,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -150,7 +150,7 @@ index f88183071e861..a05302a7a2f0b 100644
   content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
   content::RenderProcessHost* render_process_host() const;
   bool has_loaded_once() const { return has_loaded_once_; }
-@@ -189,7 +195,8 @@ class ExtensionHost : public DeferredStartRenderHost,
+@@ -188,7 +194,8 @@ class ExtensionHost : public DeferredStartRenderHost,
   raw_ptr<content::BrowserContext> browser_context_;
 
   // The host for our HTML content.
@@ -196,7 +196,7 @@ index 1fa1e67dddcfd..7af2a0e231824 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 bee1c92ce2b69..31e6d5587de2a 100644
+index 78b6535762526..83675c49911db 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
@@ -391,9 +391,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
--- a/patch/patches/gn_config.patch
+++ b/patch/patches/gn_config.patch
@@ -1,8 +1,8 @@
 diff --git .gn .gn
-index 22070a9adc507..e55d32f80b438 100644
+index 1810cebef9aa4..06618025b84b0 100644
 --- .gn
 +++ .gn
-@@ -156,6 +156,8 @@ exec_script_whitelist =
+@@ -154,6 +154,8 @@ exec_script_whitelist =
 
       "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
 
@@ -12,10 +12,10 @@ index 22070a9adc507..e55d32f80b438 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index df8b37fc8b0af..e46843b39d228 100644
+index fae950dfa67de..5c4f17deed94c 100644
 --- BUILD.gn
 +++ BUILD.gn
-@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
+@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build/gn_logs.gni")
 import("//build/util/generate_wrapper.gni")
@@ -23,7 +23,7 @@ index df8b37fc8b0af..e46843b39d228 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/media/router/features.gni")
 import("//components/nacl/features.gni")
-@@ -267,6 +268,9 @@ group("gn_all") {
+@@ -269,6 +270,9 @@ group("gn_all") {
         deps += [ "//chrome/test:telemetry_perf_unittests${_target_suffix}" ]
       }
     }
@@ -66,10 +66,10 @@ index 982fbe8d3f0d0..e757be4688f10 100644
 +         "studio path")
 }
 diff --git chrome/app/framework.order chrome/app/framework.order
-index 839144aa1e9bd..29c8ab32398a7 100644
+index f8f71ef369c08..7a2ed5da7bda3 100644
 --- chrome/app/framework.order
 +++ chrome/app/framework.order
-@@ -28,3 +28,8 @@ _ChromeMain
+@@ -31,3 +31,8 @@ _ChromeMain
 _lprofDirMode
 ___llvm_profile_filename
 ___llvm_profile_raw_version
@@ -79,7 +79,7 @@ index 839144aa1e9bd..29c8ab32398a7 100644
 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
 +
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index c540719a510ab..1107dfc9f2537 100644
+index cd468f580cb63..66a06d303580d 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
@@ -5,6 +5,7 @@
@@ -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 60022cbefac60..00f3bcd528ee0 100644
+index 061bdf6812cff..3b0a4b832bd24 100644
 --- tools/grit/grit_defines.gni
 +++ tools/grit/grit_defines.gni
@@ -5,6 +5,7 @@
@@ -163,7 +163,7 @@ index 60022cbefac60..00f3bcd528ee0 100644
 import("//build/config/ui.gni")
 
 shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
-@@ -112,6 +113,13 @@ if (is_android) {
+@@ -119,6 +120,13 @@ if (is_android) {
   ]
 }
 
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@@ -1,8 +1,8 @@
 diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
-index 667a253432794..a4601aa2ab136 100644
+index 77f77f2deb13f..09939369a62d0 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -916,6 +916,15 @@
+@@ -955,6 +955,15 @@
   # END "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
 
--- a/patch/patches/linux_blink_thread_local.patch
+++ b/patch/patches/linux_blink_thread_local.patch
@@ -1,13 +1,13 @@
 diff --git third_party/blink/renderer/platform/heap/thread_local.h third_party/blink/renderer/platform/heap/thread_local.h
-index 84ef4350bd96d..dbd5b0b73ebb2 100644
+index 744b91e5b0c86..e67f542126ac6 100644
 --- third_party/blink/renderer/platform/heap/thread_local.h
 +++ third_party/blink/renderer/platform/heap/thread_local.h
@@ -36,7 +36,7 @@
 #if BLINK_HEAP_HIDE_THREAD_LOCAL_IN_LIBRARY
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"
 #else
-#if defined(OS_WIN)
-+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
+-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC))
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "initial-exec"
- #elif defined(OS_ANDROID)
+ #elif BUILDFLAG(IS_ANDROID)
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"
--- a/patch/patches/linux_ui_ozone.patch
+++ b/patch/patches/linux_ui_ozone.patch
@@ -1,8 +1,8 @@
 diff --git ui/ozone/BUILD.gn ui/ozone/BUILD.gn
-index 1a8ac4adbe961..473b6b89309d2 100644
+index d85d01f06f021..1e77d60e2592e 100644
 --- ui/ozone/BUILD.gn
 +++ ui/ozone/BUILD.gn
-@@ -369,6 +369,8 @@ action("generate_test_support_constructor_list") {
+@@ -381,6 +381,8 @@ action("generate_test_support_constructor_list") {
   ]
 
   deps = [ ":generate_ozone_platform_list" ]
--- 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 d1140d7945a2d..a3b894aa4f6b0 100644
+index 1bfea3ac4470c..75a3695c2cfd5 100644
 --- base/message_loop/message_pump_win.cc
 +++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@
--- a/patch/patches/mime_handler_view_guest_1565_2727.patch
+++ b/patch/patches/mime_handler_view_guest_1565_2727.patch
@@ -12,7 +12,7 @@ index 2c29b5c5c96b9..9ba3aaa327478 100644
   virtual ~WebContentsView() = default;
 
 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 2a8095bb93264..2ee0f179d1002 100644
+index 0b01120f6a605..d957af9b94e94 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
@@ -210,6 +210,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -48,7 +48,7 @@ index 2a8095bb93264..2ee0f179d1002 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 1b388778aac14..0ac4a5294dfa1 100644
+index ef6faf317dd41..8675c305d489c 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
@@ -143,6 +143,7 @@ class MimeHandlerViewGuest
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@@ -10,24 +10,24 @@ 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 affbbf4c11723..e003f694aa5ac 100644
+index 3faca2e98f4ac..c6729030a53cc 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
-@@ -591,7 +591,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
+@@ -1750,7 +1750,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
   // Read cookies whenever allow_credentials() is true, even if the PrivacyMode
   // is being overridden by NetworkDelegate and will eventually block them, as
   // blocked cookies still need to be logged in that case.
-  if (cookie_store && request_->allow_credentials()) {
-+  if (cookie_store && request_->allow_credentials() &&
-+      !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES)) {
-     bool force_ignore_site_for_cookies =
-         request_->force_ignore_site_for_cookies();
-     if (cookie_store->cookie_access_delegate() &&
+-  return request_->context()->cookie_store() && request_->allow_credentials();
+  return request_->context()->cookie_store() && request_->allow_credentials() &&
+         !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES);
+ }
+ 
+ bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const {
 diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
-index f14c99863eb3f..51679008ead55 100644
+index 87868727a7822..a30035aeb00cc 100644
 --- services/network/public/cpp/resource_request.cc
 +++ services/network/public/cpp/resource_request.cc
-@@ -265,7 +265,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
+@@ -264,7 +264,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
 }
 
 bool ResourceRequest::SendsCookies() const {
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@@ -41,10 +41,10 @@ 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 7436238cd110e..bbc937f1c14df 100644
+index 03e318b14025f..0428c5d4b92b1 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -3107,6 +3107,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
+@@ -3112,6 +3112,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
       GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
 }
 
@@ -57,10 +57,10 @@ index 7436238cd110e..bbc937f1c14df 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 785cf70788ddb..fc72ea7bb0d7b 100644
+index 5cc97c9c8305b..0a7869e4df266 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
-@@ -776,6 +776,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -779,6 +779,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   void ProgressFlingIfNeeded(base::TimeTicks current_time);
   void StopFling();
--- 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 dbfae7b5e3d2c..bf18a6fbddf6d 100644
+index 673ed00dc33c8..e7c82dc4dddb0 100644
 --- chrome/browser/download/download_prefs.cc
 +++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@
@@ -46,10 +46,10 @@ index 332fbc21aa0e3..1286fc203d6cd 100644
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/task_manager/web_contents_tags.h"
 diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
-index c759b7a7c9d19..c63900f5d1686 100644
+index 9ed04fffa69c2..f2a3402b9ba6a 100644
 --- chrome/browser/printing/print_view_manager_base.cc
 +++ chrome/browser/printing/print_view_manager_base.cc
-@@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO(
+@@ -219,12 +219,13 @@ void UpdatePrintSettingsOnIO(
     mojom::PrintManagerHost::UpdatePrintSettingsCallback callback,
     scoped_refptr<PrintQueriesQueue> queue,
     base::Value job_settings,
@@ -66,7 +66,7 @@ index c759b7a7c9d19..c63900f5d1686 100644
   }
   auto* printer_query_ptr = printer_query.get();
   printer_query_ptr->SetSettings(
-@@ -675,6 +676,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -646,6 +647,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
       job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
   }
 
@@ -74,7 +74,7 @@ index c759b7a7c9d19..c63900f5d1686 100644
   auto callback_wrapper =
       base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
                      weak_ptr_factory_.GetWeakPtr(), std::move(callback));
-@@ -682,7 +684,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -653,7 +655,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
       FROM_HERE,
       base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
                      std::move(callback_wrapper), queue_,
@@ -86,7 +86,7 @@ index c759b7a7c9d19..c63900f5d1686 100644
 #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 
 diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
-index aa7915ac042fe..ab4d9a8ac6e24 100644
+index 2661776307f77..b9edc98619c29 100644
 --- chrome/browser/printing/print_view_manager_base.h
 +++ chrome/browser/printing/print_view_manager_base.h
@@ -146,9 +146,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
@@ -116,7 +116,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 8c5ba47779d24..91a70d8715f33 100644
+index f6098966f5b34..da78289b66155 100644
 --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
 +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -13,6 +13,7 @@
@@ -291,7 +291,7 @@ index 46c8b1d08b075..1ee95cd7c3240 100644
   base::FilePath GetSaveLocation() const;
 
 diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-index da70f602899a9..ca99c7d2ec09f 100644
+index b32c9d1760b69..ad65de16ba0d2 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,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 c7a7f857a28d0..9479a7874ea3b 100644
+index 7dbb9aea759e4..b1485a731f559 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
@@ -136,6 +136,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
--- a/patch/patches/renderer_host_1070713.patch
+++ b/patch/patches/renderer_host_1070713.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
-index 950fbd61f3a95..27064eb0a26bf 100644
+index 56c08919ab626..f8b7f586e2dd8 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -643,6 +643,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
+@@ -644,6 +644,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
 }
 
 void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
--- a/patch/patches/resource_bundle_2512.patch
+++ b/patch/patches/resource_bundle_2512.patch
@@ -1,8 +1,8 @@
 diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
-index 45dbcdb991f95..1f021598f6c8d 100644
+index fff568d679b89..7b5f224b390a0 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
-@@ -873,6 +873,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
+@@ -902,6 +902,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
     : delegate_(delegate),
       locale_resources_data_lock_(new base::Lock),
       max_scale_factor_(k100Percent) {
@@ -15,7 +15,7 @@ index 45dbcdb991f95..1f021598f6c8d 100644
   mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kMangleLocalizedStrings);
 }
-@@ -882,6 +888,11 @@ ResourceBundle::~ResourceBundle() {
+@@ -911,6 +917,11 @@ ResourceBundle::~ResourceBundle() {
   UnloadLocaleResources();
 }
 
@@ -28,10 +28,10 @@ index 45dbcdb991f95..1f021598f6c8d 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 5e53e16ce105d..56ad14da6dc5b 100644
+index f2728d3dd9f10..00836556951b4 100644
 --- ui/base/resource/resource_bundle.h
 +++ ui/base/resource/resource_bundle.h
-@@ -208,6 +208,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
+@@ -216,6 +216,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
   ResourceBundle(const ResourceBundle&) = delete;
   ResourceBundle& operator=(const ResourceBundle&) = delete;
 
--- 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 20d613c480ce5..1753448bff5ce 100644
+index a819dcf960a4c..968554d7bb0c1 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -5,6 +5,7 @@
@@ -10,7 +10,7 @@ index 20d613c480ce5..1753448bff5ce 100644
 #include <set>
 #include <utility>
 
-@@ -678,10 +679,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
+@@ -702,10 +703,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
 void RenderWidgetHostViewAura::UpdateBackgroundColor() {
   DCHECK(GetBackgroundColor());
 
@@ -27,7 +27,7 @@ index 20d613c480ce5..1753448bff5ce 100644
 }
 
 absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
-@@ -2167,6 +2170,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -2210,6 +2213,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
   // This needs to happen only after |window_| has been initialized using
   // Init(), because it needs to have the layer.
   window_->SetEmbedFrameSinkId(frame_sink_id_);
--- 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 d89552afd9c8f..7f2da3945aa3b 100644
+index 86cb596c6a4f2..e4f45f5b1c2fa 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@@ -10,7 +10,7 @@ index d89552afd9c8f..7f2da3945aa3b 100644
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
-@@ -718,7 +719,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -734,7 +735,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
 
   // Configure on-disk storage for non-OTR profiles. OTR profiles just use
   // default behavior (in memory storage, default sizes).
@@ -31,10 +31,10 @@ index d89552afd9c8f..7f2da3945aa3b 100644
     PrefService* local_state = g_browser_process->local_state();
     // Configure the HTTP cache path and size.
     base::FilePath base_cache_path;
-@@ -746,7 +759,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
-       network_context_params->http_cache_max_size =
-           local_state->GetInteger(prefs::kDiskCacheSize);
-     }
+@@ -747,7 +760,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+         base_cache_path.Append(chrome::kCacheDirname);
+     network_context_params->http_cache_max_size =
+         local_state->GetInteger(prefs::kDiskCacheSize);
 +  }
 
 +  if (!in_memory) {
@@ -42,10 +42,10 @@ index d89552afd9c8f..7f2da3945aa3b 100644
         ::network::mojom::NetworkContextFilePaths::New();
 
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index 0aaef609b0709..ab1a8e96fdb30 100644
+index 2885d39d1f6e5..bd373d28498c7 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
-@@ -545,6 +545,25 @@ void CookieMonster::SetCookieableSchemes(
+@@ -547,6 +547,25 @@ void CookieMonster::SetCookieableSchemes(
   MaybeRunCookieCallback(std::move(callback), true);
 }
 
@@ -72,10 +72,10 @@ index 0aaef609b0709..ab1a8e96fdb30 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 1ed421b60d526..d65d32b4c0ca0 100644
+index 5ba0bcac86588..8efbece455f2b 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
-@@ -205,6 +205,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
+@@ -207,6 +207,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
   CookieChangeDispatcher& GetChangeDispatcher() override;
   void SetCookieableSchemes(const std::vector<std::string>& schemes,
                             SetCookieableSchemesCallback callback) override;
@@ -85,10 +85,10 @@ index 1ed421b60d526..d65d32b4c0ca0 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 8631b10535c7d..7c4c518ee5b3d 100644
+index 4dbe5fd1b2c11..ef797ae9b858c 100644
 --- net/cookies/cookie_store.h
 +++ net/cookies/cookie_store.h
-@@ -155,6 +155,11 @@ class NET_EXPORT CookieStore {
+@@ -161,6 +161,11 @@ class NET_EXPORT CookieStore {
   // Transfer ownership of a CookieAccessDelegate.
   void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
 
@@ -101,10 +101,10 @@ index 8631b10535c7d..7c4c518ee5b3d 100644
   // reset to null.
   const CookieAccessDelegate* cookie_access_delegate() const {
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index f0660ffa8bd4d..4eb14790b8979 100644
+index f5df9b6c27e9f..ea02e2b379f3a 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
-@@ -324,14 +324,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
+@@ -366,14 +366,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
 void CookieManager::AllowFileSchemeCookies(
     bool allow,
     AllowFileSchemeCookiesCallback callback) {
@@ -123,10 +123,10 @@ index f0660ffa8bd4d..4eb14790b8979 100644
 
 void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index abcf825d8049a..552d8403fa0a8 100644
+index 8ff62f92ed6ef..9af2e737a9c01 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
-@@ -2216,17 +2216,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2286,17 +2286,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         network_service_->network_quality_estimator());
   }
 
@@ -157,7 +157,7 @@ index abcf825d8049a..552d8403fa0a8 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 d7c10e5a55bf0..958c2c27211f7 100644
+index 3d5779c980ff7..9d0e0a58ec64d 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
@@ -330,6 +330,9 @@ struct NetworkContextParams {
--- a/patch/patches/services_network_2718.patch
+++ b/patch/patches/services_network_2718.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
-index 6df863b5fbc90..6b98a515af9f8 100644
+index 4104bde55093c..8992ed51a47d1 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
-@@ -490,10 +490,6 @@ class LoginHandlerDelegate {
+@@ -494,10 +494,6 @@ class LoginHandlerDelegate {
     }
 
     WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index 6df863b5fbc90..6b98a515af9f8 100644
 
     // WeakPtr is not strictly necessary here due to OnRequestCancelled.
     creating_login_delegate_ = true;
-@@ -545,12 +541,6 @@ void OnAuthRequiredContinuation(
+@@ -549,12 +545,6 @@ void OnAuthRequiredContinuation(
     mojo::PendingRemote<network::mojom::AuthChallengeResponder>
         auth_challenge_responder,
     base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@@ -26,7 +26,7 @@ index 6df863b5fbc90..6b98a515af9f8 100644
   new LoginHandlerDelegate(
       std::move(auth_challenge_responder), std::move(web_contents_getter),
       auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
-@@ -2729,8 +2719,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -2737,8 +2727,12 @@ void StoragePartitionImpl::GetQuotaSettings(
     return;
   }
 
@@ -40,7 +40,7 @@ index 6df863b5fbc90..6b98a515af9f8 100644
       storage::GetDefaultDeviceInfoHelper(), std::move(callback));
 }
 
-@@ -2740,9 +2734,12 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -2748,9 +2742,12 @@ void StoragePartitionImpl::InitNetworkContext() {
   cert_verifier::mojom::CertVerifierCreationParamsPtr
       cert_verifier_creation_params =
           cert_verifier::mojom::CertVerifierCreationParams::New();
--- a/patch/patches/storage_incognito_2289.patch
+++ b/patch/patches/storage_incognito_2289.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
-index df1a7ae70bdc3..10e9a0b3b881a 100644
+index a74178f2d4246..8098034a38333 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(
+@@ -121,7 +121,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
 
     // If we're not incognito mode, schedule all of our file tasks to enable
     // disk on the storage context.
@@ -13,7 +13,7 @@ index df1a7ae70bdc3..10e9a0b3b881a 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 967c0ea22204d..e1a64c68e00f8 100644
+index b0ebdaa0156cf..45ea1eba1cb79 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
@@ -129,7 +129,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@@ -36,7 +36,7 @@ index 967c0ea22204d..e1a64c68e00f8 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 b430ebb66bb5f..8fc54d2e7d713 100644
+index 160c24ce6e6cc..336aee0b8a0e3 100644
 --- content/public/browser/storage_partition_config.cc
 +++ content/public/browser/storage_partition_config.cc
@@ -7,6 +7,7 @@
@@ -47,7 +47,7 @@ index b430ebb66bb5f..8fc54d2e7d713 100644
 #include "base/strings/string_number_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "url/gurl.h"
-@@ -37,7 +38,8 @@ StoragePartitionConfig& StoragePartitionConfig::operator=(
+@@ -22,7 +23,8 @@ StoragePartitionConfig& StoragePartitionConfig::operator=(
 // static
 StoragePartitionConfig StoragePartitionConfig::CreateDefault(
     BrowserContext* browser_context) {
@@ -58,7 +58,7 @@ index b430ebb66bb5f..8fc54d2e7d713 100644
 
 // static
 diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
-index 842886e2fce98..b77e43ea07458 100644
+index 74423c6f847d4..d1ea3420ec7d3 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 5404ededf7722..aadd1faff7d63 100644
+index 107516329273e..d55bdef0a8e63 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
@@ -61,6 +61,8 @@
--- a/patch/patches/views_1749_2102.patch
+++ b/patch/patches/views_1749_2102.patch
@@ -238,10 +238,10 @@ index 8132b9b9a1c75..4f78f6f41c77f 100644
   std::unique_ptr<SelectionController> selection_controller_;
 
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 2571ad8b9cbb9..77ffb9f214b34 100644
+index 5fdf8d2f9e9a0..7e8fa45de94bc 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -2868,8 +2868,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
+@@ -2869,8 +2869,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
@@ -256,7 +256,7 @@ index 2571ad8b9cbb9..77ffb9f214b34 100644
   MenuItemView* to_select = nullptr;
   if (!item->GetSubmenu()->GetMenuItems().empty())
     to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
-@@ -2888,8 +2893,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2889,8 +2894,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
 void MenuController::CloseSubmenu() {
   MenuItemView* item = state_.item;
   DCHECK(item);
@@ -269,7 +269,7 @@ index 2571ad8b9cbb9..77ffb9f214b34 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 9c1542e1f4f0f..548fc8e87d520 100644
+index 7101143c63803..058da34d3499e 100644
 --- ui/views/controls/menu/menu_delegate.h
 +++ ui/views/controls/menu/menu_delegate.h
@@ -73,6 +73,22 @@ class VIEWS_EXPORT MenuDelegate {
@@ -295,7 +295,7 @@ index 9c1542e1f4f0f..548fc8e87d520 100644
   // The tooltip shown for the menu item. This is invoked when the user
   // hovers over the item, and no tooltip text has been set for that item.
   virtual std::u16string GetTooltipText(int id,
-@@ -211,6 +227,11 @@ class VIEWS_EXPORT MenuDelegate {
+@@ -201,6 +217,11 @@ class VIEWS_EXPORT MenuDelegate {
                                        bool* has_mnemonics,
                                        MenuButton** button);
 
@@ -308,10 +308,10 @@ index 9c1542e1f4f0f..548fc8e87d520 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 20f678de0dcbf..4668a984ddcea 100644
+index 497b0af4513c0..475046fe5f0c8 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
-@@ -1084,6 +1084,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
+@@ -1091,6 +1091,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
     spilling_rect.set_y(spilling_rect.y() - corner_radius_);
     spilling_rect.set_height(spilling_rect.height() + corner_radius_);
     canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@@ -327,7 +327,7 @@ index 20f678de0dcbf..4668a984ddcea 100644
   } else if (paint_as_selected) {
     gfx::Rect item_bounds = GetLocalBounds();
     if (type_ == Type::kActionableSubMenu) {
-@@ -1151,6 +1160,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
+@@ -1158,6 +1167,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
 }
 
 SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@@ -339,7 +339,7 @@ index 20f678de0dcbf..4668a984ddcea 100644
 +  }
 +
   style::TextContext context =
-       GetMenuController() && GetMenuController()->use_touchable_layout()
+       GetMenuController() && GetMenuController()->use_ash_system_ui_layout()
           ? style::CONTEXT_TOUCH_MENU
 diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
 index fb5d5e6a79a3f..a336b5a74d6a1 100644
@@ -449,7 +449,7 @@ index b7c7474fb5910..ce3e14071f0c6 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 86bb005ff2c81..397d34be23dcb 100644
+index 7706c76090589..980de1f486d0c 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 86bb005ff2c81..397d34be23dcb 100644
       content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
 
 diff --git ui/views/view.h ui/views/view.h
-index bc6f04c6d2b1b..be4a0c8ad6695 100644
+index 837eb95c28b04..7dc148522b5ef 100644
 --- ui/views/view.h
 +++ ui/views/view.h
@@ -21,6 +21,7 @@
--- a/patch/patches/views_widget.patch
+++ b/patch/patches/views_widget.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index 1eb2b692c59d3..e48e4618bbc7b 100644
+index 5fd8cb63f589d..cabf4b90d8078 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -606,6 +606,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
+@@ -617,6 +617,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
   return screen_infos_.current().device_scale_factor;
 }
 
@@ -18,7 +18,7 @@ index 1eb2b692c59d3..e48e4618bbc7b 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 0c21c3b6e2a4b..bf50bce147881 100644
+index abdd3cf7d93ab..a506724f8520b 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;
@@ -49,7 +49,7 @@ index 0c21c3b6e2a4b..bf50bce147881 100644
   // Called by the TextInputManager to notify the view about being removed from
   // the list of registered views, i.e., TextInputManager is no longer tracking
   // TextInputState from this view. The RWHV should reset |text_input_manager_|
-@@ -407,6 +414,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -410,6 +417,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                            const gfx::Rect& bounds,
                            const gfx::Rect& anchor_rect) = 0;
 
@@ -62,9 +62,9 @@ index 0c21c3b6e2a4b..bf50bce147881 100644
   // Sets the cursor for this view to the one associated with the specified
   // cursor_type.
   virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -638,6 +651,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
- 
-   raw_ptr<TooltipObserver> tooltip_observer_for_testing_ = nullptr;
+@@ -647,6 +660,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+   // to all displays.
+   gfx::Size system_cursor_size_;
 
 +  // True if the widget has a external parent view/window outside of the
 +  // Chromium-controlled view/window hierarchy.
@@ -73,7 +73,7 @@ index 0c21c3b6e2a4b..bf50bce147881 100644
  private:
   FRIEND_TEST_ALL_PREFIXES(
       BrowserSideFlingBrowserTest,
-@@ -659,10 +676,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -668,10 +685,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
 
   void SynchronizeVisualProperties();
 
@@ -151,10 +151,10 @@ index d213587450f06..3fde9a9ce47d5 100644
 #if BUILDFLAG(IS_MAC)
   // 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 549190ed1823a..8532cf8511570 100644
--- ui/platform_window/x11/x11_window.cc
-+++ ui/platform_window/x11/x11_window.cc
+diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
+index 15b5f6ff21d3f..2e2a89424cc3e 100644
+--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1710,7 +1710,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
   req.border_pixel = 0;
 
@@ -179,11 +179,11 @@ index 7c352dd0d992d..516623a91b0e1 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 a41611a5d66a2..e39a12c85686d 100644
+index 5ec1e84223896..520e802dcf5a2 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-@@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
-                                                     escape_behavior);
+@@ -244,6 +244,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
+   return result;
 }
 
 +gfx::Rect DesktopWindowTreeHostLinux::GetWindowBoundsInScreen() const {
@@ -201,7 +201,7 @@ index a41611a5d66a2..e39a12c85686d 100644
 void DesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
   // In Windows, the native events sent to chrome are separated into client
   // and non-client versions of events, which we record on our LocatedEvent
-@@ -372,6 +384,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
+@@ -385,6 +397,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
 
   properties->wayland_app_id = params.wayland_app_id;
 
@@ -211,10 +211,10 @@ index a41611a5d66a2..e39a12c85686d 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 e9a126e30da2a..e2d068ba5f592 100644
+index 3207a31d2b0d6..1bf291143420d 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-@@ -86,6 +86,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
   ui::PinnedModeExtension* GetPinnedModeExtension();
   const ui::PinnedModeExtension* GetPinnedModeExtension() const;
 
@@ -223,7 +223,7 @@ index e9a126e30da2a..e2d068ba5f592 100644
  protected:
   // Overridden from DesktopWindowTreeHost:
   void Init(const Widget::InitParams& params) override;
-@@ -95,6 +97,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -94,6 +96,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
       const gfx::Vector2d& drag_offset,
       Widget::MoveLoopSource source,
       Widget::MoveLoopEscapeBehavior escape_behavior) override;
@@ -232,7 +232,7 @@ index e9a126e30da2a..e2d068ba5f592 100644
 
   // PlatformWindowDelegate:
   void DispatchEvent(ui::Event* event) override;
-@@ -152,6 +156,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -151,6 +155,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
   // destroyed.
   static std::list<gfx::AcceleratedWidget>* open_windows_;
 
@@ -258,10 +258,10 @@ index 1c9525d4d4302..f6e54a3362848 100644
 
   // Calculate initial bounds.
 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 7323cb11296e9..7876f7d208bd1 100644
+index a1de50d6b0f69..53c42fc120c4a 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -180,8 +180,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
+@@ -181,8 +181,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
                         native_widget_delegate_);
 
   HWND parent_hwnd = nullptr;
@@ -275,7 +275,7 @@ index 7323cb11296e9..7876f7d208bd1 100644
 
   remove_standard_frame_ = params.remove_standard_frame;
   has_non_client_view_ = Widget::RequiresNonClientView(params.type);
-@@ -988,11 +992,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
+@@ -989,11 +993,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
 }
 
 void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@@ -294,10 +294,10 @@ index 7323cb11296e9..7876f7d208bd1 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 7511694b58e56..eb7d82b4d520e 100644
+index 444581249014a..5defa787d25cd 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-@@ -322,6 +322,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
+@@ -323,6 +323,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
   // True if the window should have the frame removed.
   bool remove_standard_frame_;
 
@@ -309,10 +309,10 @@ index 7511694b58e56..eb7d82b4d520e 100644
   // a reference.
   raw_ptr<corewm::TooltipWin> tooltip_;
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index 0e20d424e46c5..8d394e3e2f10a 100644
+index 71300e03598b2..45622129b15ea 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
-@@ -341,7 +341,8 @@ void Widget::Init(InitParams params) {
+@@ -338,7 +338,8 @@ void Widget::Init(InitParams params) {
   }
 
   params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -345,7 +345,7 @@ index 0e20d424e46c5..8d394e3e2f10a 100644
   }
 
   native_theme_observation_.Observe(GetNativeTheme());
-@@ -1407,10 +1416,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
+@@ -1411,10 +1420,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
 }
 
 gfx::Size Widget::GetMinimumSize() const {
@@ -363,10 +363,10 @@ index 0e20d424e46c5..8d394e3e2f10a 100644
 }
 
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index 0bcdee12f8539..200e0a1b0770b 100644
+index a5718171b5e40..b2695eb41b65a 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
-@@ -329,6 +329,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -336,6 +336,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
     // the concept with bubble anchoring a la BubbleDialogDelegateView.
     gfx::NativeView parent = nullptr;
 
@@ -404,10 +404,10 @@ index b10784dce1f69..4a6acf542dece 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 302915bac66a4..0bbed4079bfaf 100644
+index bf32a083d0f08..156b257d6fb75 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -3126,10 +3126,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3133,10 +3133,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
   } else if (event.type() == ui::ET_MOUSEWHEEL) {
     ui::MouseWheelEvent mouse_wheel_event(msg);
     // Reroute the mouse wheel to the window under the pointer if applicable.
--- a/patch/patches/viz_osr_2575.patch
+++ b/patch/patches/viz_osr_2575.patch
@@ -80,7 +80,7 @@ index 309422bcf8581..759549f3046f4 100644
  private:
   const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index c92e6d2ad10fb..a1d74b50e244b 100644
+index 03a9986ff94bc..5a5c35c35db25 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
@@ -221,6 +221,8 @@ viz_component("service") {
@@ -183,10 +183,10 @@ index e7e67ee824b2a..bb044cff83f58 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 9f7583e424057..c301c518dd8ec 100644
+index b2f873919d686..5250a6be86cc3 100644
 --- services/viz/privileged/mojom/compositing/display_private.mojom
 +++ services/viz/privileged/mojom/compositing/display_private.mojom
-@@ -89,12 +89,14 @@ interface DisplayPrivate {
+@@ -97,12 +97,14 @@ interface DisplayPrivate {
 };
 
 interface DisplayClient {
@@ -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 383aff3755d4b..a5b2a79d3a724 100644
+index 8b74e1d2a4631..e0a68b5265af7 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
@@ -30,7 +30,9 @@
@@ -252,7 +252,7 @@ index 383aff3755d4b..a5b2a79d3a724 100644
   // Sets the root of the layer tree drawn by this Compositor. The root layer
   // must have no parent. The compositor's root layer is reset if the root layer
   // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -453,6 +466,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -467,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
 
   std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
 
--- a/patch/patches/web_contents_1257_1565.patch
+++ b/patch/patches/web_contents_1257_1565.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index bf235e7493dd0..1f0eb81769b56 100644
+index 96ced4715eed9..1094a4e9ec0a4 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -2979,6 +2979,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3040,6 +3040,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
       site_instance.get(), params.renderer_initiated_creation,
       params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
 
@@ -15,7 +15,7 @@ index bf235e7493dd0..1f0eb81769b56 100644
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -2989,6 +2995,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3050,6 +3056,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
     view_.reset(CreateWebContentsView(this, delegate,
                                       &render_view_host_delegate_view_));
   }
@@ -23,7 +23,7 @@ index bf235e7493dd0..1f0eb81769b56 100644
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
-@@ -3853,6 +3860,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3915,6 +3922,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   // objects.
   create_params.renderer_initiated_creation = !is_new_browsing_instance;
 
@@ -39,7 +39,7 @@ index bf235e7493dd0..1f0eb81769b56 100644
   std::unique_ptr<WebContentsImpl> new_contents;
   if (!is_guest) {
     create_params.context = view_->GetNativeView();
-@@ -7625,6 +7641,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
+@@ -7726,6 +7742,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
     // frames).
     SetFocusedFrameTree(node->frame_tree());
   }
@@ -50,10 +50,10 @@ index bf235e7493dd0..1f0eb81769b56 100644
 
 void WebContentsImpl::DidCallFocus() {
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index b980a289bd530..3b33291faa4b9 100644
+index ad5c13965f1cc..169a309335ea0 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
-@@ -92,10 +92,12 @@ class BrowserContext;
+@@ -93,10 +93,12 @@ class BrowserContext;
 class BrowserPluginGuestDelegate;
 class RenderFrameHost;
 class RenderViewHost;
@@ -66,7 +66,7 @@ index b980a289bd530..3b33291faa4b9 100644
 class WebUI;
 struct DropData;
 struct MHTMLGenerationParams;
-@@ -233,6 +235,10 @@ class WebContents : public PageNavigator,
+@@ -234,6 +236,10 @@ class WebContents : public PageNavigator,
     network::mojom::WebSandboxFlags starting_sandbox_flags =
         network::mojom::WebSandboxFlags::kNone;
 
@@ -78,7 +78,7 @@ index b980a289bd530..3b33291faa4b9 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 58e977220a5d9..17c8e137c4f61 100644
+index f889d0bf33cf2..db7a1c6f736ca 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
@@ -57,10 +57,12 @@ class EyeDropperListener;
@@ -94,8 +94,8 @@ index 58e977220a5d9..17c8e137c4f61 100644
 struct ContextMenuParams;
 struct DropData;
 struct MediaPlayerWatchTime;
-@@ -343,6 +345,14 @@ class CONTENT_EXPORT WebContentsDelegate {
-       const StoragePartitionId& partition_id,
+@@ -339,6 +341,14 @@ class CONTENT_EXPORT WebContentsDelegate {
+       const StoragePartitionConfig& partition_config,
       SessionStorageNamespace* session_storage_namespace);
 
 +  virtual void GetCustomWebContentsView(
@@ -110,10 +110,10 @@ index 58e977220a5d9..17c8e137c4f61 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 469b98f8405d2..980fed8e97ea1 100644
+index b68d706fe204c..173206fcd95f6 100644
 --- content/public/browser/web_contents_observer.h
 +++ content/public/browser/web_contents_observer.h
-@@ -778,6 +778,10 @@ class CONTENT_EXPORT WebContentsObserver {
+@@ -772,6 +772,10 @@ class CONTENT_EXPORT WebContentsObserver {
   // WebContents has gained/lost focus.
   virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}
 
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@@ -1,8 +1,8 @@
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index f545c18c2e142..26757184a79d5 100644
+index d188491afffbd..a68b78b5132f1 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
-@@ -865,6 +865,11 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -872,6 +872,11 @@ class BLINK_PLATFORM_EXPORT Platform {
       const WebURL& url,
       blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {}
 
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -11,7 +11,7 @@ index 14d4a00293ab0..fc574edaaa2ad 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 87e3d73b791eb..7cc3388b38c3f 100644
+index d8f8d3114361d..01879d8feceea 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -247,8 +247,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -30,7 +30,7 @@ index 87e3d73b791eb..7cc3388b38c3f 100644
 }
 
 namespace {
-@@ -556,6 +561,7 @@ WebViewImpl::WebViewImpl(
+@@ -559,6 +564,7 @@ WebViewImpl::WebViewImpl(
       chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
       minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
       maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@@ -39,10 +39,10 @@ index 87e3d73b791eb..7cc3388b38c3f 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 25f9a9fc617d7..8c59629d4cfa1 100644
+index 5107ef421138e..7660b1c3287c1 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.h
 +++ third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -133,7 +133,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -134,7 +134,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   static HashSet<WebViewImpl*>& AllInstances();
   // Returns true if popup menus should be rendered by the browser, false if
   // they should be rendered by WebKit (which is the default).
@@ -52,7 +52,7 @@ index 25f9a9fc617d7..8c59629d4cfa1 100644
 
   // Returns whether frames under this WebView are backed by a compositor.
   bool does_composite() const { return does_composite_; }
-@@ -799,6 +800,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -801,6 +802,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   float fake_page_scale_animation_page_scale_factor_ = 0.f;
   bool fake_page_scale_animation_use_anchor_ = false;
 
@@ -62,10 +62,10 @@ index 25f9a9fc617d7..8c59629d4cfa1 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 c442ddf0d214c..56bf5066688d3 100644
+index dc5f2b7966770..ac01b405f144f 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
-@@ -889,7 +889,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
+@@ -904,7 +904,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
 PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                            HTMLSelectElement& select) {
   NotifyPopupOpeningObservers();
--- 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 a09a1c38dc293..bd28d427873a9 100644
+index e1e151f58d06f..7ee1d16fa9ffc 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 @@
@@ -10,15 +10,17 @@ index a09a1c38dc293..bd28d427873a9 100644
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-@@ -22,6 +23,7 @@
+@@ -19,14 +20,17 @@
+ #include "base/system/sys_info.h"
+ #include "base/task/post_task.h"
+ #include "base/task/thread_pool.h"
+#include "base/threading/thread_restrictions.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/browser_process.h"
- #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h"
- #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h"
-@@ -29,6 +31,7 @@
+ #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/sync_service_factory.h"
 #include "chrome/common/channel_info.h"
@@ -26,7 +28,7 @@ index a09a1c38dc293..bd28d427873a9 100644
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_internals_util.h"
 #include "components/sync/driver/sync_service.h"
-@@ -334,7 +337,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
+@@ -331,7 +335,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
   response->emplace(kOsVersionTag, os_version);
 #endif
 
@@ -38,8 +40,8 @@ index a09a1c38dc293..bd28d427873a9 100644
 +  }
   PopulateExtensionInfoLogs(response.get());
   PopulatePowerApiLogs(response.get());
-   PopulateDataReductionProxyLogs(response.get());
-@@ -414,6 +421,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
+ #if BUILDFLAG(IS_WIN)
+@@ -410,6 +418,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
   if (!profile)
     return;
 
@@ -52,7 +54,7 @@ index a09a1c38dc293..bd28d427873a9 100644
   extensions::ExtensionRegistry* extension_registry =
       extensions::ExtensionRegistry::Get(profile);
   std::string extensions_list;
-@@ -521,6 +534,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
+@@ -504,6 +518,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
 #if BUILDFLAG(IS_WIN)
 void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
     SystemLogsResponse* response) {
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,13 +0,0 @@
-diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 2e9301625477b..d941840163cb1 100644
--- chrome/app/generated_resources.grd
-+++ chrome/app/generated_resources.grd
-@@ -5424,7 +5424,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.">
-        <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked by enterprise policy
-+        <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is not allowed
-       </message>
-       <message name="IDS_PLUGIN_BLOCKED_NO_LOADING" desc="The placeholder text for a blocked plugin that cannot be manually loaded by the user.">
-         <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked