Update to Chromium version 117.0.5938.0 (#1181205)

2025-03-05 20:29:24 +01:00 · 2023-08-09 17:17:17 -04:00 · 2023-08-09 17:17:17 -04:00 · a4b27a7248
commit a4b27a7248
parent 52cb08b973
93 changed files with 496 additions and 481 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -1157,8 +1157,6 @@ source_set("libcef_static") {
      "//chrome/app/chrome_main_mac.h",
      "//chrome/app/chrome_main_mac.mm",
    ]
-
-    configs += [ "//build/config/compiler:enable_arc" ]
  }

  if (ozone_platform_x11) {
@ -1607,7 +1605,6 @@ if (is_mac) {

    configs += [
      ":libcef_autogen_config",
-      "//build/config/compiler:enable_arc",
    ]

    # We don't link the framework so just use the path from the main executable.
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/117.0.5895.0'
+  'chromium_checkout': 'refs/tags/117.0.5938.0'
 }
--- a/include/cef_api_hash.h
+++ b/include/cef_api_hash.h
@ -42,13 +42,13 @@
 // way that may cause binary incompatibility with other builds. The universal
 // hash value will change if any platform is affected whereas the platform hash
 // values will change only if that particular platform is affected.
-#define CEF_API_HASH_UNIVERSAL "fa8cc34484fbca804b3b308446b2c144a0936003"
+#define CEF_API_HASH_UNIVERSAL "a86f6076488c08805e6d0038c8935604fd32507c"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "c75b851a2b1000f42c9fd47065902d7500d036ec"
+#define CEF_API_HASH_PLATFORM "bf9b8fe7fee80a5ec3b46427e8b3a4b29afca1ce"
 #elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "67b3ee05c5c6243dedd1bcf061fe3c39c11d97e3"
+#define CEF_API_HASH_PLATFORM "e57a71ffed7a2ef3b8b5725dec90799057a017e9"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "4da79d99f6eb7c7773e52da9f78a7c66f72c9c6d"
+#define CEF_API_HASH_PLATFORM "bb78503cd459091d26ac7876599c975e8f718705"
 #endif

 #ifdef __cplusplus
--- a/include/internal/cef_types.h
+++ b/include/internal/cef_types.h
@ -2624,6 +2624,11 @@ typedef struct _cef_pdf_print_settings_t {
  /// |header_template|.
  ///
  cef_string_t footer_template;
+
+  ///
+  /// Set to true (1) to generate tagged (accessible) PDF.
+  ///
+  int generate_tagged_pdf;
 } cef_pdf_print_settings_t;

 ///
--- a/include/internal/cef_types_content_settings.h
+++ b/include/internal/cef_types_content_settings.h
@ -343,6 +343,12 @@ typedef enum {
  /// Used to indicate whether HTTPS-First Mode is enabled on the hostname.
  CEF_CONTENT_SETTING_TYPE_HTTPS_ENFORCED,

+  /// Stores per origin metadata for cookie controls.
+  CEF_CONTENT_SETTING_TYPE_COOKIE_CONTROLS_METADATA,
+
+  /// Setting for supporting 3PCD.
+  CEF_CONTENT_SETTING_TYPE_TPCD_SUPPORT,
+
  CEF_CONTENT_SETTING_TYPE_NUM_TYPES,
 } cef_content_setting_types_t;

--- a/include/internal/cef_types_wrappers.h
+++ b/include/internal/cef_types_wrappers.h
@ -680,6 +680,8 @@ struct CefPdfPrintSettingsTraits {
                   &target->header_template, copy);
    cef_string_set(src->footer_template.str, src->footer_template.length,
                   &target->footer_template, copy);
+
+    target->generate_tagged_pdf = src->generate_tagged_pdf;
  }
 };

--- a/libcef/browser/alloy/alloy_content_browser_client.cc
+++ b/libcef/browser/alloy/alloy_content_browser_client.cc
@ -736,6 +736,7 @@ void AlloyContentBrowserClient::AllowCertificateError(
 }

 base::OnceClosure AlloyContentBrowserClient::SelectClientCertificate(
+    content::BrowserContext* browser_context,
    content::WebContents* web_contents,
    net::SSLCertRequestInfo* cert_request_info,
    net::ClientCertIdentityList client_certs,
@ -1352,7 +1353,7 @@ void AlloyContentBrowserClient::GetMediaDeviceIDSalt(
  bool allowed = cookie_settings->IsFullCookieAccessAllowed(
      url, site_for_cookies, top_frame_origin,
      cookie_settings->SettingOverridesForStorage());
-  auto* salt_service =
+  media_device_salt::MediaDeviceSaltService* salt_service =
      MediaDeviceSaltServiceFactory::GetInstance()->GetForBrowserContext(
          browser_context);
  if (!salt_service) {
@ -1360,7 +1361,8 @@ void AlloyContentBrowserClient::GetMediaDeviceIDSalt(
    return;
  }

-  salt_service->GetSalt(base::BindOnce(std::move(callback), allowed));
+  salt_service->GetSalt(rfh->GetStorageKey(),
+                        base::BindOnce(std::move(callback), allowed));
 }

 void AlloyContentBrowserClient::OnWebContentsCreated(
--- a/libcef/browser/alloy/alloy_content_browser_client.h
+++ b/libcef/browser/alloy/alloy_content_browser_client.h
@ -89,6 +89,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
      base::OnceCallback<void(content::CertificateRequestResultType)> callback)
      override;
  base::OnceClosure SelectClientCertificate(
+      content::BrowserContext* browser_context,
      content::WebContents* web_contents,
      net::SSLCertRequestInfo* cert_request_info,
      net::ClientCertIdentityList client_certs,
--- a/libcef/browser/devtools/devtools_manager_delegate.cc
+++ b/libcef/browser/devtools/devtools_manager_delegate.cc
@ -128,7 +128,9 @@ CefDevToolsManagerDelegate::CefDevToolsManagerDelegate() {}
 CefDevToolsManagerDelegate::~CefDevToolsManagerDelegate() {}

 scoped_refptr<content::DevToolsAgentHost>
-CefDevToolsManagerDelegate::CreateNewTarget(const GURL& url, bool for_tab) {
+CefDevToolsManagerDelegate::CreateNewTarget(
+    const GURL& url,
+    content::DevToolsManagerDelegate::TargetType target_type) {
  // This is reached when the user selects "Open link in new tab" from the
  // DevTools interface.
  // TODO(cef): Consider exposing new API to support this.
--- a/libcef/browser/devtools/devtools_manager_delegate.h
+++ b/libcef/browser/devtools/devtools_manager_delegate.h
@ -27,7 +27,7 @@ class CefDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
  // DevToolsManagerDelegate implementation.
  scoped_refptr<content::DevToolsAgentHost> CreateNewTarget(
      const GURL& url,
-      bool for_tab) override;
+      content::DevToolsManagerDelegate::TargetType target_type) override;
  std::string GetDiscoveryPageHTML() override;
  bool HasBundledFrontendResources() override;
 };
--- a/libcef/browser/extensions/api/tabs/tabs_api.cc
+++ b/libcef/browser/extensions/api/tabs/tabs_api.cc
@ -205,13 +205,6 @@ bool TabsUpdateFunction::UpdateURL(const std::string& url_string,
    return false;
  }

-  const bool is_javascript_scheme = url.SchemeIs(url::kJavaScriptScheme);
-  // JavaScript URLs are forbidden in chrome.tabs.update().
-  if (is_javascript_scheme) {
-    *error = tabs_constants::kJavaScriptUrlsNotAllowedInTabsUpdate;
-    return false;
-  }
-
  content::NavigationController::LoadURLParams load_params(url);

  // Treat extension-initiated navigations as renderer-initiated so that the URL
--- a/libcef/browser/extensions/extensions_browser_client.cc
+++ b/libcef/browser/extensions/extensions_browser_client.cc
@ -168,6 +168,11 @@ content::BrowserContext* CefExtensionsBrowserClient::GetContextForOriginalOnly(
  return context;
 }

+bool CefExtensionsBrowserClient::AreExtensionsDisabledForContext(
+    content::BrowserContext* context) {
+  return false;
+}
+
 bool CefExtensionsBrowserClient::IsGuestSession(BrowserContext* context) const {
  return false;
 }
--- a/libcef/browser/extensions/extensions_browser_client.h
+++ b/libcef/browser/extensions/extensions_browser_client.h
@ -48,6 +48,8 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
  content::BrowserContext* GetContextForOriginalOnly(
      content::BrowserContext* context,
      bool force_guest_profile) override;
+  bool AreExtensionsDisabledForContext(
+      content::BrowserContext* context) override;
  bool IsGuestSession(content::BrowserContext* context) const override;
  bool IsExtensionIncognitoEnabled(
      const std::string& extension_id,
--- a/libcef/browser/menu_model_impl.cc
+++ b/libcef/browser/menu_model_impl.cc
@ -37,8 +37,6 @@ class CefSimpleMenuModel : public ui::MenuModel {
  CefSimpleMenuModel& operator=(const CefSimpleMenuModel&) = delete;

  // MenuModel methods.
-  bool HasIcons() const override { return false; }
-
  size_t GetItemCount() const override { return impl_->GetCount(); }

  ItemType GetTypeAt(size_t index) const override {
--- a/libcef/browser/native/browser_platform_delegate_native_linux.cc
+++ b/libcef/browser/native/browser_platform_delegate_native_linux.cc
@ -260,7 +260,8 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeLinux::TranslateUiKeyEvent(
  base::TimeTicks time_stamp = GetEventTimeStamp();

  if (key_event.type == KEYEVENT_CHAR) {
-    return ui::KeyEvent(character, key_code, dom_code, flags, time_stamp);
+    return ui::KeyEvent::FromCharacter(character, key_code, dom_code, flags,
+                                       time_stamp);
  }

  ui::EventType type = ui::ET_UNKNOWN;
--- a/libcef/browser/native/browser_platform_delegate_native_mac.mm
+++ b/libcef/browser/native/browser_platform_delegate_native_mac.mm
@ -30,10 +30,6 @@
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/gfx/geometry/rect.h"

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 // Wrapper NSView for the native view. Necessary to destroy the browser when
 // the view is deleted.
@interface CefBrowserHostView : NSView {
--- a/libcef/browser/native/browser_platform_delegate_native_win.cc
+++ b/libcef/browser/native/browser_platform_delegate_native_win.cc
@ -437,8 +437,8 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeWin::TranslateUiKeyEvent(
  base::TimeTicks time_stamp = GetEventTimeStamp();

  if (key_event.type == KEYEVENT_CHAR) {
-    return ui::KeyEvent(key_event.windows_key_code /* character */, key_code,
-                        dom_code, flags, time_stamp);
+    return ui::KeyEvent::FromCharacter(/*character=*/key_event.windows_key_code,
+                                       key_code, dom_code, flags, time_stamp);
  }

  ui::EventType type = ui::ET_UNKNOWN;
--- a/libcef/browser/native/cursor_util_mac.mm
+++ b/libcef/browser/native/cursor_util_mac.mm
@ -7,10 +7,6 @@

 #import "ui/base/cocoa/cursor_utils.h"

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace cursor_util {

 namespace {
--- a/libcef/browser/native/javascript_dialog_runner_mac.mm
+++ b/libcef/browser/native/javascript_dialog_runner_mac.mm
@ -12,10 +12,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/url_formatter/elide_url.h"

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 // Helper object that receives the notification that the dialog/sheet is
 // going away. Is responsible for cleaning itself up.
@interface CefJavaScriptDialogHelper : NSObject <NSAlertDelegate> {
--- a/libcef/browser/native/menu_runner_mac.mm
+++ b/libcef/browser/native/menu_runner_mac.mm
@ -11,10 +11,6 @@
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/gfx/geometry/point.h"

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 CefMenuRunnerMac::CefMenuRunnerMac() {}

 CefMenuRunnerMac::~CefMenuRunnerMac() {}
--- a/libcef/browser/osr/osr_accessibility_util.cc
+++ b/libcef/browser/osr/osr_accessibility_util.cc
@ -106,7 +106,7 @@ struct PopulateAxNodeAttributes {
      case ax::mojom::IntAttribute::kTableRowIndex:
      case ax::mojom::IntAttribute::kActivedescendantId:
      case ax::mojom::IntAttribute::kInPageLinkTargetId:
-      case ax::mojom::IntAttribute::kErrormessageId:
+      case ax::mojom::IntAttribute::kErrormessageIdDeprecated:
      case ax::mojom::IntAttribute::kDOMNodeId:
      case ax::mojom::IntAttribute::kDropeffect:
      case ax::mojom::IntAttribute::kMemberOfId:
--- a/libcef/browser/osr/render_widget_host_view_osr.cc
+++ b/libcef/browser/osr/render_widget_host_view_osr.cc
@ -1796,15 +1796,17 @@ void CefRenderWidgetHostViewOSR::RequestImeCompositionUpdate(

 void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
    const gfx::Range& range,
-    const std::vector<gfx::Rect>& character_bounds) {
+    const absl::optional<std::vector<gfx::Rect>>& character_bounds,
+    const absl::optional<std::vector<gfx::Rect>>& line_bounds) {
  if (browser_impl_.get()) {
    CefRange cef_range(range.start(), range.end());
    CefRenderHandler::RectList rcList;

-    for (size_t i = 0; i < character_bounds.size(); ++i) {
-      rcList.push_back(CefRect(character_bounds[i].x(), character_bounds[i].y(),
-                               character_bounds[i].width(),
-                               character_bounds[i].height()));
+    if (character_bounds.has_value()) {
+      for (auto& rect : character_bounds.value()) {
+        rcList.push_back(
+            CefRect(rect.x(), rect.y(), rect.width(), rect.height()));
+      }
    }

    CefRefPtr<CefRenderHandler> handler =
--- a/libcef/browser/osr/render_widget_host_view_osr.h
+++ b/libcef/browser/osr/render_widget_host_view_osr.h
@ -181,7 +181,8 @@ class CefRenderWidgetHostViewOSR
  viz::SurfaceId GetCurrentSurfaceId() const override;
  void ImeCompositionRangeChanged(
      const gfx::Range& range,
-      const std::vector<gfx::Rect>& character_bounds) override;
+      const absl::optional<std::vector<gfx::Rect>>& character_bounds,
+      const absl::optional<std::vector<gfx::Rect>>& line_bounds) override;
  std::unique_ptr<content::SyntheticGestureTarget>
  CreateSyntheticGestureTarget() override;
  bool TransformPointToCoordSpaceForView(
--- a/libcef/browser/osr/touch_selection_controller_client_osr.cc
+++ b/libcef/browser/osr/touch_selection_controller_client_osr.cc
@ -181,6 +181,17 @@ void CefTouchSelectionControllerClientOSR::OnSwipeToMoveCursorEnd() {
  OnSelectionEvent(ui::INSERTION_HANDLE_DRAG_STOPPED);
 }

+void CefTouchSelectionControllerClientOSR::OnClientHitTestRegionUpdated(
+    ui::TouchSelectionControllerClient* client) {
+  if (client != active_client_ || !rwhv_->selection_controller() ||
+      rwhv_->selection_controller()->active_status() ==
+          ui::TouchSelectionController::INACTIVE) {
+    return;
+  }
+
+  active_client_->DidScroll();
+}
+
 void CefTouchSelectionControllerClientOSR::UpdateClientSelectionBounds(
    const gfx::SelectionBound& start,
    const gfx::SelectionBound& end) {
--- a/libcef/browser/osr/touch_selection_controller_client_osr.h
+++ b/libcef/browser/osr/touch_selection_controller_client_osr.h
@ -72,6 +72,8 @@ class CefTouchSelectionControllerClientOSR
  void DidStopFlinging() override;
  void OnSwipeToMoveCursorBegin() override;
  void OnSwipeToMoveCursorEnd() override;
+  void OnClientHitTestRegionUpdated(
+      ui::TouchSelectionControllerClient* client) override;
  void UpdateClientSelectionBounds(
      const gfx::SelectionBound& start,
      const gfx::SelectionBound& end,
--- a/libcef/browser/permission_prompt.cc
+++ b/libcef/browser/permission_prompt.cc
@ -125,6 +125,9 @@ class CefPermissionPrompt : public permissions::PermissionPrompt {
      const override {
    return permissions::PermissionPromptDisposition::CUSTOM_MODAL_DIALOG;
  }
+  absl::optional<gfx::Rect> GetViewBoundsInScreen() const override {
+    return absl::nullopt;
+  }

 private:
  // We don't expose AcceptThisTime() because it's a special case for
--- a/libcef/browser/printing/print_util.cc
+++ b/libcef/browser/printing/print_util.cc
@ -117,8 +117,8 @@ void PrintToPDF(content::WebContents* web_contents,
          !!settings.print_background, scale, paper_width, paper_height,
          margin_top, margin_bottom, margin_left, margin_right,
          CefString(&settings.header_template),
-          CefString(&settings.footer_template),
-          !!settings.prefer_css_page_size);
+          CefString(&settings.footer_template), !!settings.prefer_css_page_size,
+          !!settings.generate_tagged_pdf);

  if (absl::holds_alternative<std::string>(print_pages_params)) {
    LOG(ERROR) << "PrintToPDF failed with error: "
--- a/libcef/browser/views/native_widget_mac.mm
+++ b/libcef/browser/views/native_widget_mac.mm
@ -17,10 +17,6 @@
 #import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
 #import "ui/views/cocoa/native_widget_mac_ns_window_host.h"

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace {

 AppShimHost* GetHostForBrowser(Browser* browser) {
--- a/libcef/common/util_linux.cc
+++ b/libcef/common/util_linux.cc
@ -23,7 +23,9 @@ void OverrideChildProcessPath() {
  }

  // Used by ChildProcessHost::GetChildPath and PlatformCrashpadInitialization.
-  base::PathService::Override(content::CHILD_PROCESS_EXE, child_process_path);
+  base::PathService::OverrideAndCreateIfNeeded(
+      content::CHILD_PROCESS_EXE, child_process_path, /*is_absolute=*/true,
+      /*create=*/false);
 }

 }  // namespace
--- a/libcef/common/util_mac.mm
+++ b/libcef/common/util_mac.mm
@ -76,7 +76,9 @@ void OverrideChildProcessPath() {
  }

  // Used by ChildProcessHost::GetChildPath and PlatformCrashpadInitialization.
-  base::PathService::Override(content::CHILD_PROCESS_EXE, child_process_path);
+  base::PathService::OverrideAndCreateIfNeeded(
+      content::CHILD_PROCESS_EXE, child_process_path, /*is_absolute=*/true,
+      /*create=*/false);
 }

 }  // namespace
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@ -650,12 +650,6 @@ patches = [
    # https://bugs.chromium.org/p/chromium/issues/detail?id=1467329
    'name': 'mac_keyboard_conversion_1467329'
  },
-  {
-    # win: Fix implicit conversion changes signedness error with
-    # cef_sandbox build.
-    # https://chromium-review.googlesource.com/c/chromium/src/+/4718245
-    'name': 'base_escape_4718245'
-  },
  {
    # win: Add support for "force-light-mode" command-line option.
    # https://github.com/chromiumembedded/cef/issues/3534
--- a/patch/patches/base_command_line_1872.patch
+++ b/patch/patches/base_command_line_1872.patch
@ -1,5 +1,5 @@
 diff --git base/command_line.cc base/command_line.cc
-index 7e702dcc64a6e..8797d14382e39 100644
+index d762b168a9ccf..f58b4f783df16 100644
 --- base/command_line.cc
 +++ base/command_line.cc
@@ -346,11 +346,10 @@ void CommandLine::AppendSwitchNative(StringPiece switch_string,
--- a/patch/patches/base_escape_4718245.patch
+++ b/patch/patches/base_escape_4718245.patch
@ -1,14 +0,0 @@
-diff --git base/strings/escape.cc base/strings/escape.cc
-index d303ead90bc7d..d03da4c2ef2f6 100644
--- base/strings/escape.cc
-+++ base/strings/escape.cc
-@@ -443,8 +443,7 @@ std::string UnescapeURLWithAdjustmentsImpl(
-     if (!ShouldUnescapeCodePoint(rules, code_point)) {
-       // If it's a valid UTF-8 character, but not safe to unescape, copy all
-       // bytes directly.
-      result.append(escaped_text.begin() + i,
-                    escaped_text.begin() + i + 3 * unescaped.length());
-+      result.append(escaped_text.substr(i, 3 * unescaped.length()));
-       i += unescaped.length() * 3;
-       continue;
-     }
--- a/patch/patches/base_sandbox_2743.patch
+++ b/patch/patches/base_sandbox_2743.patch
@ -1,5 +1,5 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index aa7f2d6b3f2ff..439d648f7a7a5 100644
+index 6e6f24e479cce..2e1632ce35865 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
@@ -40,6 +40,7 @@ import("//build/config/ui.gni")
@ -10,7 +10,7 @@ index aa7f2d6b3f2ff..439d648f7a7a5 100644
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 
-@@ -1492,7 +1493,11 @@ component("base") {
+@@ -1500,7 +1501,11 @@ component("base") {
     "hash/md5_constexpr_internal.h",
     "hash/sha1.h",
   ]
@ -23,7 +23,7 @@ index aa7f2d6b3f2ff..439d648f7a7a5 100644
     sources += [
       "hash/md5_nacl.cc",
       "hash/md5_nacl.h",
-@@ -1898,6 +1903,12 @@ component("base") {
+@@ -1907,6 +1912,12 @@ component("base") {
       defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
     }
 
@ -37,10 +37,10 @@ index aa7f2d6b3f2ff..439d648f7a7a5 100644
       "cfgmgr32.lib",
       "ntdll.lib",
 diff --git base/allocator/dispatcher/dispatcher.cc base/allocator/dispatcher/dispatcher.cc
-index 2d4f17ea2a301..ff2ccafd53056 100644
+index 616e2e89af7d3..2a2993e74d53a 100644
 --- base/allocator/dispatcher/dispatcher.cc
 +++ base/allocator/dispatcher/dispatcher.cc
-@@ -12,6 +12,7 @@
+@@ -10,6 +10,7 @@
 #include "base/check.h"
 #include "base/dcheck_is_on.h"
 #include "base/no_destructor.h"
@ -48,7 +48,7 @@ index 2d4f17ea2a301..ff2ccafd53056 100644
 
 #if DCHECK_IS_ON()
 #include <atomic>
-@@ -31,7 +32,7 @@ struct Dispatcher::Impl {
+@@ -33,7 +34,7 @@ struct Dispatcher::Impl {
   }
 
   void Reset() {
--- a/patch/patches/base_sandbox_3519.patch
+++ b/patch/patches/base_sandbox_3519.patch
@ -33,7 +33,7 @@ index 641bbaf2c7576..afdd641e38452 100644
 // Generic container overload.
 template <typename Range>
 diff --git base/win/registry.cc base/win/registry.cc
-index 4b3c3d75a2bb4..2869b29a410b9 100644
+index 9e67b3596356e..0ba2136d91e36 100644
 --- base/win/registry.cc
 +++ base/win/registry.cc
@@ -13,6 +13,14 @@
@ -49,14 +49,5 @@ index 4b3c3d75a2bb4..2869b29a410b9 100644
 +#endif
 +
 #include "base/check_op.h"
- #include "base/containers/fixed_flat_map.h"
 #include "base/functional/callback.h"
-@@ -314,7 +322,7 @@ class ExportDerived {
-             {"RegSetValueExW", reinterpret_cast<void**>(&reg_set_value_ex_)},
-         });
- 
-    auto* entry = kMap.find(name);
-+    auto entry = kMap.find(name);
-     if (entry == kMap.end()) {
-       return true;
-     }
+ #include "base/notreached.h"
--- a/patch/patches/base_test_4396276.patch
+++ b/patch/patches/base_test_4396276.patch
@ -1,8 +1,8 @@
 diff --git base/test/BUILD.gn base/test/BUILD.gn
-index 93d9c1e810bfb..5a3fdee5eb0dc 100644
+index e89151a223001..d268f2efcfab4 100644
 --- base/test/BUILD.gn
 +++ base/test/BUILD.gn
-@@ -177,11 +177,6 @@ static_library("test_support") {
+@@ -181,11 +181,6 @@ static_library("test_support") {
 
   if (enable_base_tracing) {
     public_deps += [ "//third_party/perfetto:perfetto_test_support" ]
@ -14,7 +14,7 @@ index 93d9c1e810bfb..5a3fdee5eb0dc 100644
     if (is_ios) {
       deps += [
         ":test_trace_processor+bundle",
-@@ -527,7 +522,7 @@ if (enable_base_tracing) {
+@@ -524,7 +519,7 @@ if (enable_base_tracing) {
   # processor depends on dev_sqlite. The two share the same symbols but have
   # different implementations, so we need to hide dev_sqlite in this shared
   # library even in non-component builds to prevent duplicate symbols.
@ -23,7 +23,7 @@ index 93d9c1e810bfb..5a3fdee5eb0dc 100644
   if (is_ios) {
     _target_type = "ios_framework_bundle"
   }
-@@ -536,6 +531,8 @@ if (enable_base_tracing) {
+@@ -533,6 +528,8 @@ if (enable_base_tracing) {
     defines = [ "TEST_TRACE_PROCESSOR_IMPL" ]
     testonly = true
     sources = [
@ -32,7 +32,7 @@ index 93d9c1e810bfb..5a3fdee5eb0dc 100644
       "test_trace_processor_export.h",
       "test_trace_processor_impl.cc",
       "test_trace_processor_impl.h",
-@@ -553,33 +550,6 @@ if (enable_base_tracing) {
+@@ -550,33 +547,6 @@ if (enable_base_tracing) {
       output_name = "TestTraceProcessor"
       bundle_deps_filter = [ "//third_party/icu:icudata" ]
     }
@ -88,10 +88,10 @@ index f5191b804bc07..aadb7d66ba4c3 100644
 +
 #endif  // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
 diff --git content/shell/BUILD.gn content/shell/BUILD.gn
-index 5d381713fe246..69da944902eb8 100644
+index 903bbb1a8b5ab..d8169dafa81c4 100644
 --- content/shell/BUILD.gn
 +++ content/shell/BUILD.gn
-@@ -833,7 +833,6 @@ if (is_mac) {
+@@ -838,7 +838,6 @@ if (is_mac) {
       # Specify a sensible install_name for static builds. The library is
       # dlopen()ed so this is not used to resolve the module.
       ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name" ]
--- a/patch/patches/browser_security_policy_1081397.patch
+++ b/patch/patches/browser_security_policy_1081397.patch
@ -1,5 +1,5 @@
 diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
-index 701cf15750948..7756094d3e341 100644
+index ccc2e7da62b79..f3b31e1196988 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
@@ -1860,6 +1860,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
@ -20,10 +20,10 @@ index 701cf15750948..7756094d3e341 100644
 
           // Make an exception to allow most visited tiles to commit in
 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
-index 2f5bd34117ebb..29fd80e61f399 100644
+index da87a4f823d6f..d244a7c11537e 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
-@@ -7320,10 +7320,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
+@@ -7325,10 +7325,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
   bool use_opaque_origin =
       (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
       network::mojom::WebSandboxFlags::kOrigin;
@ -47,9 +47,9 @@ index 2f5bd34117ebb..29fd80e61f399 100644
   }
 
   return origin_and_debug_info;
-@@ -7353,6 +7365,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
-       GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
-           SandboxFlagsToCommit());
+@@ -7434,6 +7446,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
+       DetermineInitiatorRelationship(initiator_rfh,
+                                      frame_tree_node_->current_frame_host()));
 
 +  if (origin_with_debug_info.first.opaque() &&
 +      origin_with_debug_info.second.find("cef_nonstandard") !=
--- a/patch/patches/browser_web_ui_controller_factory.patch
+++ b/patch/patches/browser_web_ui_controller_factory.patch
@ -13,10 +13,10 @@ index 9d9c17ffd6474..4eb79c65369af 100644
 };
 
 diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h
-index 19777632921fc..a22db4c49fd84 100644
+index a80034506bf45..4bda477df0558 100644
 --- content/public/browser/webui_config_map.h
 +++ content/public/browser/webui_config_map.h
-@@ -60,6 +60,10 @@ class CONTENT_EXPORT WebUIConfigMap {
+@@ -61,6 +61,10 @@ class CONTENT_EXPORT WebUIConfigMap {
   // Returns the size of the map, i.e. how many WebUIConfigs are registered.
   size_t GetSizeForTesting() { return configs_map_.size(); }
 
--- 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 5d5b2c7ffebed..b9ac264ff8094 100644
+index 46a1fcea63c6f..2dec894abe729 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -2044,8 +2044,6 @@ config("thin_archive") {
+@@ -2062,8 +2062,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 dcf3e7327e022..99dd2617e437a 100644
+index d2207552c449f..1acd7fda6147d 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@ -10,7 +10,7 @@ index dcf3e7327e022..99dd2617e437a 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/downgrade/buildflags.gni")
 import("//chrome/common/features.gni")
-@@ -1973,6 +1974,7 @@ static_library("browser") {
+@@ -1978,6 +1979,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//cc",
@ -18,7 +18,7 @@ index dcf3e7327e022..99dd2617e437a 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -2568,6 +2570,10 @@ static_library("browser") {
+@@ -2595,6 +2597,10 @@ static_library("browser") {
     ]
   }
 
--- a/patch/patches/chrome_browser_background_mode_1100085.patch
+++ b/patch/patches/chrome_browser_background_mode_1100085.patch
@ -38,7 +38,7 @@ index 9e6860e20ed98..130e74f099c83 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 4a3df6ee2764c..87e12a5e3a6ca 100644
+index 43d7af86dbd67..cf7bcafbaa129 100644
 --- chrome/browser/browser_process_impl.h
 +++ chrome/browser/browser_process_impl.h
@@ -185,8 +185,8 @@ class BrowserProcessImpl : public BrowserProcess,
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
   return false;
 }
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index c2b27aea9b244..021203f3a67cc 100644
+index cc4fbda7ddfa8..c7278ef3d7ff7 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@ -24,7 +24,7 @@ index c2b27aea9b244..021203f3a67cc 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//chromeos/ash/components/assistant/assistant.gni")
-@@ -376,6 +377,10 @@ static_library("ui") {
+@@ -380,6 +381,10 @@ static_library("ui") {
     "//build/config/compiler:wexit_time_destructors",
   ]
 
@ -35,7 +35,7 @@ index c2b27aea9b244..021203f3a67cc 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
-@@ -400,6 +405,7 @@ static_library("ui") {
+@@ -404,6 +409,7 @@ static_library("ui") {
     "//build:chromeos_buildflags",
     "//build/config/chromebox_for_meetings:buildflags",
     "//cc/paint",
@ -43,7 +43,7 @@ index c2b27aea9b244..021203f3a67cc 100644
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/app:chrome_dll_resources",
-@@ -2646,6 +2652,8 @@ static_library("ui") {
+@@ -2683,6 +2689,8 @@ static_library("ui") {
       "views/apps/app_dialog/app_block_dialog_view.h",
       "views/apps/app_dialog/app_pause_dialog_view.cc",
       "views/apps/app_dialog/app_pause_dialog_view.h",
@ -52,7 +52,7 @@ index c2b27aea9b244..021203f3a67cc 100644
       "views/apps/app_info_dialog/arc_app_info_links_panel.cc",
       "views/apps/app_info_dialog/arc_app_info_links_panel.h",
       "views/apps/chrome_app_window_client_views_chromeos.cc",
-@@ -4524,8 +4532,6 @@ static_library("ui") {
+@@ -4573,8 +4581,6 @@ static_library("ui") {
       "views/accessibility/theme_tracking_non_accessible_image_view.h",
       "views/apps/app_dialog/app_dialog_view.cc",
       "views/apps/app_dialog/app_dialog_view.h",
@ -61,7 +61,7 @@ index c2b27aea9b244..021203f3a67cc 100644
       "views/apps/app_info_dialog/app_info_dialog_container.cc",
       "views/apps/app_info_dialog/app_info_dialog_container.h",
       "views/apps/app_info_dialog/app_info_dialog_views.cc",
-@@ -6165,6 +6171,7 @@ static_library("ui") {
+@@ -6226,6 +6232,7 @@ static_library("ui") {
   if (enable_printing) {
     deps += [
       "//components/printing/browser",
@ -70,10 +70,10 @@ index c2b27aea9b244..021203f3a67cc 100644
     ]
   }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index 9125b6d7e3e87..9140a9cf4ca7d 100644
+index 501783a57a06e..5a90cf466eed1 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
-@@ -264,6 +264,25 @@
+@@ -263,6 +263,25 @@
 #include "components/captive_portal/content/captive_portal_tab_helper.h"
 #endif
 
@ -99,7 +99,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_browser_window_helper.h"
 #endif
-@@ -511,6 +530,13 @@ Browser::Browser(const CreateParams& params)
+@@ -505,6 +524,13 @@ Browser::Browser(const CreateParams& params)
 
   tab_strip_model_->AddObserver(this);
 
@ -113,7 +113,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
   location_bar_model_ = std::make_unique<LocationBarModelImpl>(
       location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
 
-@@ -651,6 +677,12 @@ Browser::~Browser() {
+@@ -645,6 +671,12 @@ Browser::~Browser() {
   // away so they don't try and call back to us.
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
@ -126,7 +126,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-@@ -1381,6 +1413,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1380,6 +1412,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
   if (exclusive_access_manager_->HandleUserKeyEvent(event))
     return content::KeyboardEventProcessingResult::HANDLED;
 
@ -141,7 +141,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
   return window()->PreHandleKeyboardEvent(event);
 }
 
-@@ -1388,8 +1428,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1387,8 +1427,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                   const NativeWebKeyboardEvent& event) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -244,7 +244,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
 }
 
 void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
-@@ -2011,11 +2101,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -2017,11 +2107,15 @@ void Browser::EnterFullscreenModeForTab(
     const blink::mojom::FullscreenOptions& options) {
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
@ -260,7 +260,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2205,6 +2299,15 @@ void Browser::RequestMediaAccessPermission(
+@@ -2211,6 +2305,15 @@ void Browser::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     content::MediaResponseCallback callback) {
@ -276,7 +276,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
   const extensions::Extension* extension =
       GetExtensionForOrigin(profile_, request.security_origin);
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
-@@ -2753,13 +2856,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
+@@ -2762,13 +2865,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
 // Browser, Getters for UI (private):
 
 StatusBubble* Browser::GetStatusBubble() {
@ -298,7 +298,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
   return window_ ? window_->GetStatusBubble() : nullptr;
 }
 
-@@ -2893,6 +3003,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+@@ -2902,6 +3012,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
     BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
     web_contents_collection_.StopObserving(web_contents);
   }
@ -308,7 +308,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
 
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index b0fdd85964754..f86896354ec6f 100644
+index 9fceed57deff5..bc0058f0b1db2 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@ -319,7 +319,7 @@ index b0fdd85964754..f86896354ec6f 100644
 #include "chrome/browser/tab_contents/web_contents_collection.h"
 #include "chrome/browser/themes/theme_service_observer.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
-@@ -49,6 +50,10 @@
+@@ -48,6 +49,10 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
@ -330,9 +330,9 @@ index b0fdd85964754..f86896354ec6f 100644
 #if BUILDFLAG(IS_ANDROID)
 #error This file should only be included on desktop.
 #endif
-@@ -324,6 +329,11 @@ class Browser : public TabStripModelObserver,
-     double initial_aspect_ratio = 1.0;
-     bool lock_aspect_ratio = false;
+@@ -322,6 +327,11 @@ class Browser : public TabStripModelObserver,
+     // Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
+     absl::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
 
 +#if BUILDFLAG(ENABLE_CEF)
 +    // Opaque CEF-specific configuration. Will be propagated to new Browsers.
@ -342,8 +342,8 @@ index b0fdd85964754..f86896354ec6f 100644
    private:
     friend class Browser;
     friend class WindowSizerChromeOSTest;
-@@ -399,6 +409,13 @@ class Browser : public TabStripModelObserver,
-     force_skip_warning_user_on_close_ = force_skip_warning_user_on_close;
+@@ -403,6 +413,13 @@ class Browser : public TabStripModelObserver,
+     update_ui_immediately_for_testing_ = true;
   }
 
 +  // Return true if CEF will expose the toolbar to the client. This value is
@ -356,7 +356,7 @@ index b0fdd85964754..f86896354ec6f 100644
   // Accessors ////////////////////////////////////////////////////////////////
 
   const CreateParams& create_params() const { return create_params_; }
-@@ -472,6 +489,12 @@ class Browser : public TabStripModelObserver,
+@@ -476,6 +493,12 @@ class Browser : public TabStripModelObserver,
 
   base::WeakPtr<Browser> AsWeakPtr();
 
@ -369,7 +369,7 @@ index b0fdd85964754..f86896354ec6f 100644
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
-@@ -867,11 +890,19 @@ class Browser : public TabStripModelObserver,
+@@ -869,11 +892,19 @@ class Browser : public TabStripModelObserver,
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -389,7 +389,7 @@ index b0fdd85964754..f86896354ec6f 100644
   void BeforeUnloadFired(content::WebContents* source,
                          bool proceed,
                          bool* proceed_to_fire_unload) override;
-@@ -1279,6 +1310,8 @@ class Browser : public TabStripModelObserver,
+@@ -1281,6 +1312,8 @@ class Browser : public TabStripModelObserver,
   const std::string initial_workspace_;
   bool initial_visible_on_all_workspaces_state_;
 
@ -398,7 +398,7 @@ index b0fdd85964754..f86896354ec6f 100644
   CreationSource creation_source_ = CreationSource::kUnknown;
 
   UnloadController unload_controller_;
-@@ -1343,6 +1376,10 @@ class Browser : public TabStripModelObserver,
+@@ -1348,6 +1381,10 @@ class Browser : public TabStripModelObserver,
       extension_browser_window_helper_;
 #endif
 
@ -410,7 +410,7 @@ index b0fdd85964754..f86896354ec6f 100644
 
   // The opener browser of the document picture-in-picture browser. Null if the
 diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
-index d4f4ba7efd1be..4b0834aceed14 100644
+index 88edd87bcb2d0..26f9d74bd4ed9 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
@@ -556,6 +556,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
--- a/patch/patches/chrome_browser_content_settings.patch
+++ b/patch/patches/chrome_browser_content_settings.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
-index a07ea61672f8d..e9d0666011add 100644
+index 6f842a7535a56..faaee032e82bd 100644
 --- chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -9,6 +9,7 @@
--- 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 bb4d4e74f20d5..72bb071a6a4b5 100644
+index 6083c04105cf9..a77ebeff46a70 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -333,6 +333,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -341,6 +341,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
   return callback.get();
 }
 
@ -16,7 +16,7 @@ index bb4d4e74f20d5..72bb071a6a4b5 100644
 enum class UmaEnumIdLookupType {
   GeneralEnumId,
   ContextSpecificEnumId,
-@@ -584,6 +591,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -588,6 +595,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
     return 1;
 
@ -27,11 +27,10 @@ index bb4d4e74f20d5..72bb071a6a4b5 100644
   id = CollapseCommandsForUMA(id);
   const auto& map = GetIdcToUmaMap(type);
   auto it = map.find(id);
-@@ -812,6 +823,14 @@ RenderViewContextMenu::RenderViewContextMenu(
- #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
+@@ -816,6 +827,14 @@ RenderViewContextMenu::RenderViewContextMenu(
   pdf_ocr_submenu_model_ = std::make_unique<ui::SimpleMenuModel>(this);
 #endif  // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
-+
+ 
 +  auto* cb = GetMenuCreatedCallback();
 +  if (!cb->is_null()) {
 +    first_observer_ = cb->Run(this);
@ -39,10 +38,11 @@ index bb4d4e74f20d5..72bb071a6a4b5 100644
 +      observers_.AddObserver(first_observer_.get());
 +    }
 +  }
+
+   observers_.AddObserver(&autofill_context_menu_manager_);
 }
 
- RenderViewContextMenu::~RenderViewContextMenu() = default;
-@@ -1244,6 +1263,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1254,6 +1273,12 @@ void RenderViewContextMenu::InitMenu() {
           autofill::PopupHidingReason::kContextMenuOpened);
     }
   }
@ -55,7 +55,7 @@ index bb4d4e74f20d5..72bb071a6a4b5 100644
 }
 
 Profile* RenderViewContextMenu::GetProfile() const {
-@@ -3282,6 +3307,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
+@@ -3320,6 +3345,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
   execute_plugin_action_callback_ = std::move(cb);
 }
 
@ -69,7 +69,7 @@ index bb4d4e74f20d5..72bb071a6a4b5 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 13d339371eb18..0be7773301641 100644
+index 88034ab234827..e11cde8e1663b 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -152,6 +152,12 @@ class RenderViewContextMenu
@ -85,7 +85,7 @@ index 13d339371eb18..0be7773301641 100644
  protected:
   Profile* GetProfile() const;
 
-@@ -429,6 +435,9 @@ class RenderViewContextMenu
+@@ -433,6 +439,9 @@ class RenderViewContextMenu
   //   built.
   bool is_protocol_submenu_valid_ = false;
 
@ -132,7 +132,7 @@ index 965a283dea477..74c1ee8258485 100644
   command_executed_ = true;
   RecordUsedItem(id);
 diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
-index b1e2fd00dc0db..aa05ffd7b93c2 100644
+index b5995389e5107..26ef1e2ff42c7 100644
 --- components/renderer_context_menu/render_view_context_menu_base.h
 +++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -87,6 +87,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
--- a/patch/patches/chrome_browser_dialogs_native.patch
+++ b/patch/patches/chrome_browser_dialogs_native.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
-index 3d1c3d62953cf..b352990508904 100644
+index a293917068e9e..cf576136f1fc8 100644
 --- chrome/browser/file_select_helper.cc
 +++ chrome/browser/file_select_helper.cc
@@ -20,6 +20,7 @@
@ -10,7 +10,7 @@ index 3d1c3d62953cf..b352990508904 100644
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enterprise/connectors/common.h"
 #include "chrome/browser/platform_util.h"
-@@ -251,6 +252,13 @@ void FileSelectHelper::OnListFile(
+@@ -252,6 +253,13 @@ void FileSelectHelper::OnListFile(
 void FileSelectHelper::LaunchConfirmationDialog(
     const base::FilePath& path,
     std::vector<ui::SelectedFileInfo> selected_files) {
@ -24,7 +24,7 @@ index 3d1c3d62953cf..b352990508904 100644
   ShowFolderUploadConfirmationDialog(
       path,
       base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
-@@ -335,6 +343,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
+@@ -336,6 +344,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
   if (AbortIfWebContentsDestroyed())
     return;
 
@ -37,7 +37,7 @@ index 3d1c3d62953cf..b352990508904 100644
 #if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
   enterprise_connectors::ContentAnalysisDelegate::Data data;
   if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
-@@ -463,7 +477,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
+@@ -464,7 +478,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
 
 std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
 FileSelectHelper::GetFileTypesFromAcceptType(
@ -47,7 +47,7 @@ index 3d1c3d62953cf..b352990508904 100644
   auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
   if (accept_types.empty())
     return base_file_type;
-@@ -476,17 +491,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
+@@ -477,17 +492,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
   std::vector<base::FilePath::StringType>* extensions =
       &file_type->extensions.back();
 
@ -73,7 +73,7 @@ index 3d1c3d62953cf..b352990508904 100644
     } else {
       if (!base::IsStringASCII(accept_type))
         continue;
-@@ -497,10 +519,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
+@@ -498,10 +520,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
         description_id = IDS_AUDIO_FILES;
       else if (ascii_type == "video/*")
         description_id = IDS_VIDEO_FILES;
@ -94,7 +94,7 @@ index 3d1c3d62953cf..b352990508904 100644
     if (extensions->size() > old_extension_size)
       valid_type_count++;
   }
-@@ -525,6 +555,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
+@@ -526,6 +556,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
         l10n_util::GetStringUTF16(description_id));
   }
 
@ -110,7 +110,7 @@ index 3d1c3d62953cf..b352990508904 100644
   return file_type;
 }
 
-@@ -532,7 +571,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
+@@ -533,7 +572,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
 void FileSelectHelper::RunFileChooser(
     content::RenderFrameHost* render_frame_host,
     scoped_refptr<content::FileSelectListener> listener,
@ -120,7 +120,7 @@ index 3d1c3d62953cf..b352990508904 100644
   Profile* profile = Profile::FromBrowserContext(
       render_frame_host->GetProcess()->GetBrowserContext());
 
-@@ -551,6 +591,7 @@ void FileSelectHelper::RunFileChooser(
+@@ -552,6 +592,7 @@ void FileSelectHelper::RunFileChooser(
   // message.
   scoped_refptr<FileSelectHelper> file_select_helper(
       new FileSelectHelper(profile));
@ -128,7 +128,7 @@ index 3d1c3d62953cf..b352990508904 100644
   file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
                                      params.Clone());
 }
-@@ -602,7 +643,8 @@ void FileSelectHelper::RunFileChooser(
+@@ -603,7 +644,8 @@ void FileSelectHelper::RunFileChooser(
 }
 
 void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
@ -173,7 +173,7 @@ index 143b971ea541e..a45df89a843b0 100644
   base::WeakPtrFactory<FileSelectHelper> weak_ptr_factory_{this};
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 diff --git chrome/browser/ui/chrome_select_file_policy.h chrome/browser/ui/chrome_select_file_policy.h
-index 6e85ac927afc4..41cf347a7a2e1 100644
+index 49272553c7c53..5ba90c9a06ecf 100644
 --- chrome/browser/ui/chrome_select_file_policy.h
 +++ chrome/browser/ui/chrome_select_file_policy.h
@@ -30,6 +30,8 @@ class ChromeSelectFilePolicy : public ui::SelectFilePolicy {
@ -183,7 +183,7 @@ index 6e85ac927afc4..41cf347a7a2e1 100644
 +  content::WebContents* source_contents() const { return source_contents_; }
 +
  private:
-   raw_ptr<content::WebContents, DanglingAcrossTasks> source_contents_;
+   raw_ptr<content::WebContents, AcrossTasksDanglingUntriaged> source_contents_;
 };
 diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
 index 101e91826023b..35456ffad43f3 100644
@ -255,7 +255,7 @@ index e2c00b2ec1532..a2e8753766597 100644
   return CreateSelectFileDialog(listener, std::move(policy));
 }
 diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h
-index b27b152cf8843..765abdf241fca 100644
+index 780665236e418..9114cae0bd629 100644
 --- ui/shell_dialogs/select_file_dialog.h
 +++ ui/shell_dialogs/select_file_dialog.h
@@ -114,7 +114,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
@ -290,7 +290,7 @@ index b27b152cf8843..765abdf241fca 100644
 
@@ -236,6 +250,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
   // The listener to be notified of selection completion.
-   raw_ptr<Listener, DanglingAcrossTasks> listener_;
+   raw_ptr<Listener, AcrossTasksDanglingUntriaged> listener_;
 
 +  std::unique_ptr<SelectFilePolicy> select_file_policy_;
 +
@ -323,10 +323,10 @@ index c7acd9b05fbb8..3e95e4125fa24 100644
 
 }  // namespace ui
 diff --git ui/shell_dialogs/select_file_dialog_mac.mm ui/shell_dialogs/select_file_dialog_mac.mm
-index 7c7a929ec5c36..ef0a6328229db 100644
+index 0b8aaa3c0e4f0..fe01d3db2eabe 100644
 --- ui/shell_dialogs/select_file_dialog_mac.mm
 +++ ui/shell_dialogs/select_file_dialog_mac.mm
-@@ -106,6 +106,10 @@ void SelectFileDialogImpl::SelectFileImpl(
+@@ -102,6 +102,10 @@ void SelectFileDialogImpl::SelectFileImpl(
     mojo_window->CreateSelectFileDialog(std::move(receiver));
   } else {
     NSWindow* ns_window = gfx_window.GetNativeNSWindow();
--- a/patch/patches/chrome_browser_frame_mac.patch
+++ b/patch/patches/chrome_browser_frame_mac.patch
@ -1,16 +1,16 @@
 diff --git chrome/browser/ui/views/frame/browser_frame_mac.h chrome/browser/ui/views/frame/browser_frame_mac.h
-index 986c2b47ee1f4..c3b6806e0c20a 100644
+index a5ee05ae5f5e9..97fd2e8da450e 100644
 --- chrome/browser/ui/views/frame/browser_frame_mac.h
 +++ chrome/browser/ui/views/frame/browser_frame_mac.h
-@@ -15,6 +15,7 @@
- #error "This file requires ARC support."
- #endif
+@@ -11,6 +11,7 @@
+ #include "chrome/browser/command_observer.h"
+ #include "ui/views/widget/native_widget_mac.h"
 
 +class Browser;
 class BrowserFrame;
 class BrowserView;
 @class BrowserWindowTouchBarController;
-@@ -58,6 +59,21 @@ class BrowserFrameMac : public views::NativeWidgetMac,
+@@ -54,6 +55,21 @@ class BrowserFrameMac : public views::NativeWidgetMac,
   bool ShouldUseInitialVisibleOnAllWorkspaces() const override;
   void AnnounceTextInInProcessWindow(const std::u16string& text) override;
 
@ -33,10 +33,10 @@ index 986c2b47ee1f4..c3b6806e0c20a 100644
   ~BrowserFrameMac() override;
 
 diff --git chrome/browser/ui/views/frame/browser_frame_mac.mm chrome/browser/ui/views/frame/browser_frame_mac.mm
-index ef5f9343dc024..60cf660a8e63c 100644
+index c9a06b1b3404d..02d96a0bb1cd0 100644
 --- chrome/browser/ui/views/frame/browser_frame_mac.mm
 +++ chrome/browser/ui/views/frame/browser_frame_mac.mm
-@@ -185,7 +185,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() {
+@@ -181,7 +181,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() {
 void BrowserFrameMac::ValidateUserInterfaceItem(
     int32_t tag,
     remote_cocoa::mojom::ValidateUserInterfaceItemResult* result) {
@ -52,7 +52,7 @@ index ef5f9343dc024..60cf660a8e63c 100644
   if (!chrome::SupportsCommand(browser, tag)) {
     result->enable = false;
     return;
-@@ -313,8 +320,16 @@ bool BrowserFrameMac::WillExecuteCommand(
+@@ -309,8 +316,16 @@ bool BrowserFrameMac::WillExecuteCommand(
     int32_t command,
     WindowOpenDisposition window_open_disposition,
     bool is_before_first_responder) {
@ -70,7 +70,7 @@ index ef5f9343dc024..60cf660a8e63c 100644
   if (is_before_first_responder) {
     // The specification for this private extensions API is incredibly vague.
     // For now, we avoid triggering chrome commands prior to giving the
-@@ -345,11 +360,20 @@ bool BrowserFrameMac::ExecuteCommand(
+@@ -341,11 +356,20 @@ bool BrowserFrameMac::ExecuteCommand(
     int32_t command,
     WindowOpenDisposition window_open_disposition,
     bool is_before_first_responder) {
--- 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 9eb87425e5ce8..f5f35705a09f9 100644
+index 48e30b2833a05..2d848247b9bce 100644
 --- chrome/browser/profiles/off_the_record_profile_impl.cc
 +++ chrome/browser/profiles/off_the_record_profile_impl.cc
-@@ -659,7 +659,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
+@@ -652,7 +652,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
 #endif
   if (!profile)
     profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@ -84,10 +84,10 @@ index 946b9cb533714..80815f7feb8f8 100644
 
   // Returns whether the user has signed in this profile to an account.
 diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
-index 5320b192eca93..cba2c8b7c461b 100644
+index f3e41082fe306..abdefa172be33 100644
 --- chrome/browser/profiles/profile_impl.cc
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -1026,7 +1026,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
+@@ -1023,7 +1023,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
 
   otr_profiles_[otr_profile_id] = std::move(otr_profile);
 
@ -99,11 +99,11 @@ index 5320b192eca93..cba2c8b7c461b 100644
   return raw_otr_profile;
 }
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index fe2703aaa7a28..25bd6d48fcf3a 100644
+index ad64bc75b7383..f8eb816d6f2cf 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
-@@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
-                           base::Unretained(this)));
+@@ -394,7 +394,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
+   profile_manager_android_ = std::make_unique<ProfileManagerAndroid>(this);
 #endif
 
 -  if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
@ -112,10 +112,10 @@ index fe2703aaa7a28..25bd6d48fcf3a 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 9bb7cd968c95d..bf16634f7dfe8 100644
+index 5f471502c07a8..6a28e9452a359 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
-@@ -130,7 +130,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -134,7 +134,7 @@ class ProfileManager : public Profile::Delegate {
   // acceptable. Returns nullptr if loading the new profile fails.
   // TODO(bauerb): Migrate calls from other code to `GetProfileByPath()`, then
   // make this method private.
@ -124,7 +124,7 @@ index 9bb7cd968c95d..bf16634f7dfe8 100644
 
   // Returns regular or off-the-record profile given its profile key.
   static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
-@@ -174,7 +174,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -178,7 +178,7 @@ class ProfileManager : public Profile::Delegate {
 
   // Returns true if the profile pointer is known to point to an existing
   // profile.
--- 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 3200f0693c937..6343f021ab599 100644
+index 2731d7c8912a9..91206a1aaca39 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
@@ -32,6 +32,7 @@ static_library("safe_browsing") {
--- a/patch/patches/chrome_browser_themes.patch
+++ b/patch/patches/chrome_browser_themes.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
-index 3029367684e02..ed21af366e98f 100644
+index 31dff947be598..14138f1030822 100644
 --- chrome/browser/themes/theme_service.cc
 +++ chrome/browser/themes/theme_service.cc
@@ -30,6 +30,7 @@
@ -42,7 +42,7 @@ index 3029367684e02..ed21af366e98f 100644
   theme_syncable_service_ =
       std::make_unique<ThemeSyncableService>(profile_, this);
 diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
-index f5cd806c72a1d..3367398e7025c 100644
+index 783fd6aa20dac..8c4e51b577c5d 100644
 --- chrome/browser/themes/theme_service_factory.cc
 +++ chrome/browser/themes/theme_service_factory.cc
@@ -9,6 +9,7 @@
@ -53,7 +53,7 @@ index f5cd806c72a1d..3367398e7025c 100644
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
-@@ -34,6 +35,10 @@
+@@ -35,6 +36,10 @@
 #include "ui/linux/linux_ui_factory.h"
 #endif
 
@ -64,7 +64,7 @@ index f5cd806c72a1d..3367398e7025c 100644
 namespace {
 
 const ThemeHelper& GetThemeHelper() {
-@@ -95,7 +100,15 @@ ThemeServiceFactory::ThemeServiceFactory()
+@@ -96,7 +101,15 @@ ThemeServiceFactory::ThemeServiceFactory()
               .Build()) {
   DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
   DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
--- a/patch/patches/chrome_plugins.patch
+++ b/patch/patches/chrome_plugins.patch
@ -42,10 +42,10 @@ index 438276b719c2f..69635e429be78 100644
     const extensions::Extension* extension =
         registry->enabled_extensions().GetByID(extension_id);
 diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
-index 51e79ffb4cf1c..7b101f5ee4d56 100644
+index 8d02ca21674b1..a8984a3f5f10e 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -970,6 +970,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -974,6 +974,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
 
     if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
          status == chrome::mojom::PluginStatus::kBlocked) &&
@ -53,7 +53,7 @@ index 51e79ffb4cf1c..7b101f5ee4d56 100644
         content_settings_agent_delegate->IsPluginTemporarilyAllowed(
             identifier)) {
       status = chrome::mojom::PluginStatus::kAllowed;
-@@ -1132,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1136,7 +1137,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
         render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
             plugin_auth_host.BindNewEndpointAndPassReceiver());
         plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -63,7 +63,7 @@ index 51e79ffb4cf1c..7b101f5ee4d56 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlocked: {
-@@ -1141,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1145,7 +1147,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
         placeholder->AllowLoading();
         RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -73,7 +73,7 @@ index 51e79ffb4cf1c..7b101f5ee4d56 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -1151,7 +1154,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1155,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                        group_name));
         RenderThread::Get()->RecordAction(
             UserMetricsAction("Plugin_BlockedByPolicy"));
--- 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 7d38a8100bff2..8b2f259b9039e 100644
+index 5bf67204d5006..b4a5e6f6f23f1 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -18,7 +18,7 @@ index 7d38a8100bff2..8b2f259b9039e 100644
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
-@@ -236,6 +238,10 @@ static_library("renderer") {
+@@ -237,6 +239,10 @@ static_library("renderer") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@ -1,5 +1,5 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 306634c473672..008ed0b1eca39 100644
+index 8f79337633de1..448727560a263 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
@@ -40,6 +40,7 @@
@ -10,7 +10,7 @@ index 306634c473672..008ed0b1eca39 100644
 #include "chrome/browser/buildflags.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_resource_bundle_helper.h"
-@@ -519,6 +520,8 @@ struct MainFunction {
+@@ -518,6 +519,8 @@ struct MainFunction {
 
 // Initializes the user data dir. Must be called before InitializeLocalState().
 void InitializeUserDataDir(base::CommandLine* command_line) {
@ -30,7 +30,7 @@ index 306634c473672..008ed0b1eca39 100644
 absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
     InvokedIn invoked_in) {
   DCHECK(base::ThreadPoolInstance::Get());
-@@ -885,7 +892,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
+@@ -870,7 +877,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
 
   if (base::FeatureList::IsEnabled(
           features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
@ -40,15 +40,15 @@ index 306634c473672..008ed0b1eca39 100644
 #if BUILDFLAG(IS_ANDROID)
     record =
         base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
-@@ -1321,6 +1329,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1305,6 +1313,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
 +  if (!cef::IsChromeRuntimeEnabled()) {
   crash_reporter::InitializeCrashKeys();
 
- #if BUILDFLAG(IS_POSIX)
-@@ -1331,6 +1340,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -1332,6 +1341,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitMacCrashReporter(command_line, process_type);
   SetUpInstallerPreferences(command_line);
 #endif
@ -56,7 +56,7 @@ index 306634c473672..008ed0b1eca39 100644
 
 #if BUILDFLAG(IS_WIN)
   child_process_logging::Init();
-@@ -1525,6 +1535,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1526,6 +1536,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
     CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
   }
 
@ -64,7 +64,7 @@ index 306634c473672..008ed0b1eca39 100644
 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
-@@ -1568,6 +1579,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1569,6 +1580,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
   crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -72,7 +72,7 @@ index 306634c473672..008ed0b1eca39 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybePatchGdiGetFontData();
-@@ -1687,6 +1699,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1688,6 +1700,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@ -80,7 +80,7 @@ index 306634c473672..008ed0b1eca39 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 =
-@@ -1709,6 +1722,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1710,6 +1723,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -88,7 +88,7 @@ index 306634c473672..008ed0b1eca39 100644
 }
 
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1806,6 +1820,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
+@@ -1807,6 +1821,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
                               channel == version_info::Channel::DEV);
   const bool gwp_asan_boost_sampling = is_canary_dev || is_browser_process;
 
@ -96,7 +96,7 @@ index 306634c473672..008ed0b1eca39 100644
   memory_system::Initializer()
       .SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
       .SetProfilingClientParameters(channel,
-@@ -1815,5 +1830,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
+@@ -1816,5 +1831,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
                                memory_system::DispatcherParameters::
                                    AllocationTraceRecorderInclusion::kDynamic,
                                process_type)
@ -126,7 +126,7 @@ index dad9f981d2e01..29baaf84465a0 100644
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
   std::unique_ptr<chromeos::LacrosService> lacros_service_;
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index a0e5294e27b74..4b32afdb405e1 100644
+index 0d6a6dda5d33f..6293ad095f9d9 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@ -137,7 +137,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/active_use_util.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -1554,7 +1555,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1552,7 +1553,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   }
 #endif  // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
 
@ -146,7 +146,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
   // Handle special early return paths (which couldn't be processed even earlier
   // as they require the process singleton to be held) first.
 
-@@ -1601,7 +1602,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1599,7 +1600,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
     return content::RESULT_CODE_NORMAL_EXIT;
 #endif  // BUILDFLAG(IS_WIN)
   }
@ -155,7 +155,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
 
 #if BUILDFLAG(IS_WIN)
   // Check if there is any machine level Chrome installed on the current
-@@ -1655,12 +1656,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1653,12 +1654,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
         browser_process_->local_state());
   }
 
@ -170,7 +170,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
 
 #if BUILDFLAG(IS_ANDROID)
   page_info::SetPageInfoClient(new ChromePageInfoClient());
-@@ -1806,6 +1809,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1804,6 +1807,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@ -181,7 +181,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
   // This step is costly and is already measured in
   // Startup.StartupBrowserCreator_Start.
   // See the comment above for an explanation of |process_command_line|.
-@@ -1844,11 +1851,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1842,11 +1849,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 
     // Create the RunLoop for MainMessageLoopRun() to use and transfer
     // ownership of the browser's lifetime to the BrowserProcess.
@ -197,7 +197,7 @@ index a0e5294e27b74..4b32afdb405e1 100644
 #endif  // !BUILDFLAG(IS_ANDROID)
 
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index ad3976cb46454..b49f7467156ed 100644
+index c09da3b85e58f..36d0c1a52a44b 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
@@ -17,6 +17,7 @@
@ -208,7 +208,7 @@ index ad3976cb46454..b49f7467156ed 100644
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_listener.h"
 #include "chrome/browser/browser_process.h"
-@@ -118,6 +119,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -114,6 +115,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
   }
 #endif  // !BUILDFLAG(CHROME_FOR_TESTING)
 
@ -216,7 +216,7 @@ index ad3976cb46454..b49f7467156ed 100644
   // Create the app delegate by requesting the shared AppController.
   CHECK_EQ(nil, NSApp.delegate);
   AppController* app_controller = AppController.sharedController;
-@@ -126,6 +128,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -122,6 +124,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
   chrome::BuildMainMenu(NSApp, app_controller,
                         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
   [app_controller mainMenuCreated];
@ -224,7 +224,7 @@ index ad3976cb46454..b49f7467156ed 100644
 
   ui::WarmScreenCapture();
 
-@@ -184,5 +187,7 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
+@@ -180,5 +183,7 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
 }
 
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@ -233,10 +233,10 @@ index ad3976cb46454..b49f7467156ed 100644
 +#endif
 }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 577b267f601c9..0731b3c7c2a9a 100644
+index 974e3c37047e1..ce3f7084e6458 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@ -265,7 +265,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
 // static
 void ChromeContentBrowserClient::RegisterLocalStatePrefs(
     PrefRegistrySimple* registry) {
-@@ -4370,9 +4378,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -4409,9 +4417,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                           &search::HandleNewTabURLReverseRewrite);
 #endif  // BUILDFLAG(IS_ANDROID)
 
@ -277,7 +277,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
 }
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
-@@ -6421,7 +6431,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
+@@ -6450,7 +6460,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
 #endif
 }
 
@ -286,7 +286,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -6439,6 +6449,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
+@@ -6468,6 +6478,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
     network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
     network_context_params->accept_language = GetApplicationLocale();
   }
@ -295,7 +295,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
 }
 
 std::vector<base::FilePath>
-@@ -7479,10 +7491,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
+@@ -7497,10 +7509,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
   const auto now = base::TimeTicks::Now();
   const auto timeout = GetKeepaliveTimerTimeout(context);
   keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -308,7 +308,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
         FROM_HERE, keepalive_deadline_ - now,
         base::BindOnce(
             &ChromeContentBrowserClient::OnKeepaliveTimerFired,
-@@ -7501,7 +7513,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
+@@ -7519,7 +7531,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
   --num_keepalive_requests_;
   if (num_keepalive_requests_ == 0) {
     DVLOG(1) << "Stopping the keepalive timer";
@ -318,7 +318,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
     // This deletes the keep alive handle attached to the timer function and
     // unblock the shutdown sequence.
   }
-@@ -7637,7 +7650,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
+@@ -7661,7 +7674,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
   const auto now = base::TimeTicks::Now();
   const auto then = keepalive_deadline_;
   if (now < then) {
@ -328,7 +328,7 @@ index 577b267f601c9..0731b3c7c2a9a 100644
         base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
                        weak_factory_.GetWeakPtr(),
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index 586092a7e7265..405df5e535f51 100644
+index c7bbd6519e0cd..3dfc22b5a548c 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
@@ -137,6 +137,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -340,7 +340,7 @@ index 586092a7e7265..405df5e535f51 100644
   // TODO(https://crbug.com/787567): This file is about calls from content/ out
   // to chrome/ to get values or notify about events, but both of these
   // functions are from chrome/ to chrome/ and don't involve content/ at all.
-@@ -639,7 +641,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -640,7 +642,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       override;
   void OnNetworkServiceCreated(
       network::mojom::NetworkService* network_service) override;
@ -349,7 +349,7 @@ index 586092a7e7265..405df5e535f51 100644
       content::BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
-@@ -1062,7 +1064,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -1072,7 +1074,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
 
 #if !BUILDFLAG(IS_ANDROID)
   uint64_t num_keepalive_requests_ = 0;
@ -359,7 +359,7 @@ index 586092a7e7265..405df5e535f51 100644
 #endif
 
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index d31fb76db85de..6c5cdb0526c01 100644
+index 1944adea64d4c..4b590c1a665a3 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -13,6 +13,7 @@
@ -370,7 +370,7 @@ index d31fb76db85de..6c5cdb0526c01 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -180,6 +181,10 @@
+@@ -181,6 +182,10 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
@ -381,7 +381,7 @@ index d31fb76db85de..6c5cdb0526c01 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -1578,6 +1583,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1636,6 +1641,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
   // This is intentionally last.
   RegisterLocalStatePrefsForMigration(registry);
@ -393,7 +393,7 @@ index d31fb76db85de..6c5cdb0526c01 100644
 }
 
 // Register prefs applicable to all profiles.
-@@ -1984,6 +1994,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2046,6 +2056,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
                               const std::string& locale) {
   RegisterProfilePrefs(registry, locale);
 
--- 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 02cc754da4225..58b21e3918231 100644
+index 38fe556ecb2f7..86e38031e026a 100644
 --- chrome/browser/ui/browser_command_controller.cc
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -400,6 +400,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -401,6 +401,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
   // choose to not implement CommandUpdaterDelegate inside this class and
   // therefore command_updater_ doesn't have the delegate set).
   if (!SupportsCommand(id) || !IsCommandEnabled(id)) {
@ -10,7 +10,7 @@ index 02cc754da4225..58b21e3918231 100644
     return false;
   }
 
-@@ -416,6 +417,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -417,6 +418,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
   DCHECK(command_updater_.IsCommandEnabled(id))
       << "Invalid/disabled command " << id;
 
@ -24,7 +24,7 @@ index 02cc754da4225..58b21e3918231 100644
   // The order of commands in this switch statement must match the function
   // declaration order in browser.h!
   switch (id) {
-@@ -1147,11 +1155,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
+@@ -1148,11 +1156,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
 // BrowserCommandController, private:
 
 bool BrowserCommandController::IsShowingMainUI() {
@ -41,10 +41,10 @@ index 02cc754da4225..58b21e3918231 100644
 
 bool BrowserCommandController::IsWebAppOrCustomTab() const {
 diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
-index 1e7083240e30c..dcac39ae73469 100644
+index 499c6aef7b3be..507a95d177980 100644
 --- chrome/browser/ui/toolbar/app_menu_model.cc
 +++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -585,6 +585,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
+@@ -590,6 +590,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
   }
 }
 
@ -102,7 +102,7 @@ index 1e7083240e30c..dcac39ae73469 100644
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
-@@ -1315,7 +1366,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
+@@ -1370,7 +1421,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
@ -111,7 +111,7 @@ index 1e7083240e30c..dcac39ae73469 100644
   GlobalError* error =
       GlobalErrorServiceFactory::GetForProfile(browser_->profile())
           ->GetGlobalErrorByMenuItemCommandID(command_id);
-@@ -1330,6 +1381,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
+@@ -1385,6 +1436,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
   }
 }
 
@ -142,7 +142,7 @@ index 1e7083240e30c..dcac39ae73469 100644
 bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
   if ((command_id == IDC_RECENT_TABS_MENU) ||
       (command_id == AppMenuModel::kMinRecentTabsCommandId)) {
-@@ -1497,11 +1572,15 @@ void AppMenuModel::Build() {
+@@ -1555,11 +1630,15 @@ void AppMenuModel::Build() {
                                        kDefaultIconSize));
   }
 
@ -163,7 +163,7 @@ index 1e7083240e30c..dcac39ae73469 100644
 
   AddItemWithStringId(IDC_PRINT, IDS_PRINT);
 
-@@ -1572,9 +1651,13 @@ void AppMenuModel::Build() {
+@@ -1640,9 +1719,13 @@ void AppMenuModel::Build() {
                          kMoreToolsMenuItem);
 
   if (!features::IsChromeRefresh2023()) {
@ -180,7 +180,7 @@ index 1e7083240e30c..dcac39ae73469 100644
   }
 
   if (!features::IsChromeRefresh2023()) {
-@@ -1656,6 +1739,11 @@ void AppMenuModel::Build() {
+@@ -1724,6 +1807,11 @@ void AppMenuModel::Build() {
     SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
   }
 
@ -193,10 +193,10 @@ index 1e7083240e30c..dcac39ae73469 100644
 }
 
 diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
-index 4d50034fc658d..a23a871f7f17d 100644
+index fe6f250d169a3..606cbd2e248b3 100644
 --- chrome/browser/ui/toolbar/app_menu_model.h
 +++ chrome/browser/ui/toolbar/app_menu_model.h
-@@ -195,6 +195,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
+@@ -202,6 +202,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
   void ExecuteCommand(int command_id, int event_flags) override;
   bool IsCommandIdChecked(int command_id) const override;
   bool IsCommandIdEnabled(int command_id) const override;
@ -204,7 +204,7 @@ index 4d50034fc658d..a23a871f7f17d 100644
   bool IsCommandIdAlerted(int command_id) const override;
   bool GetAcceleratorForCommandId(int command_id,
                                   ui::Accelerator* accelerator) const override;
-@@ -227,6 +228,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
+@@ -234,6 +235,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
   // took to select the command.
   void LogMenuMetrics(int command_id);
 
@ -231,10 +231,10 @@ index 59024587ef6b7..0c30aa71768cf 100644
 
 void FindBarHost::RegisterAccelerators() {
 diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
-index 235307773037f..56a5af5e44bd6 100644
+index dad33e7ccfaa8..d1a644672d8e2 100644
 --- chrome/browser/ui/views/frame/browser_frame.cc
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -90,15 +90,23 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant(
+@@ -91,15 +91,23 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant(
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
@ -260,7 +260,7 @@ index 235307773037f..56a5af5e44bd6 100644
 }
 
 BrowserFrame::~BrowserFrame() {}
-@@ -193,6 +201,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
+@@ -194,6 +202,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
 }
 
 int BrowserFrame::GetTopInset() const {
@ -273,7 +273,7 @@ index 235307773037f..56a5af5e44bd6 100644
   return browser_frame_view_->GetTopInset(false);
 }
 
-@@ -209,6 +223,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
+@@ -210,6 +224,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
 }
 
 bool BrowserFrame::UseCustomFrame() const {
@ -282,7 +282,7 @@ index 235307773037f..56a5af5e44bd6 100644
   return native_browser_frame_->UseCustomFrame();
 }
 
-@@ -222,20 +238,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
+@@ -223,20 +239,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
 
 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
                                       ui::WindowShowState* show_state) const {
@ -313,7 +313,7 @@ index 235307773037f..56a5af5e44bd6 100644
   browser_frame_view_->OnBrowserViewInitViewsComplete();
 }
 
-@@ -315,6 +341,8 @@ ui::ColorProviderKey::ThemeInitializerSupplier* BrowserFrame::GetCustomTheme()
+@@ -316,6 +342,8 @@ ui::ColorProviderKey::ThemeInitializerSupplier* BrowserFrame::GetCustomTheme()
 }
 
 void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@ -322,16 +322,16 @@ index 235307773037f..56a5af5e44bd6 100644
   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
   chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                            IsVisibleOnAllWorkspaces());
-@@ -426,6 +454,8 @@ void BrowserFrame::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
+@@ -427,6 +455,8 @@ void BrowserFrame::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
 
 ui::ColorProviderKey BrowserFrame::GetColorProviderKey() const {
   auto key = Widget::GetColorProviderKey();
 +  if (!browser_view_)
 +    return key;
 
-   // color_mode.
-   [this, &key]() {
-@@ -580,5 +610,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
+   key.app_controller = browser_view_->browser()->app_controller();
+ 
+@@ -584,5 +614,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
 }
 
 bool BrowserFrame::IsIncognitoBrowser() const {
@ -355,10 +355,10 @@ index 77ca1dbf118f9..c60711991d093 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 7005d2c0be663..8d55893627837 100644
+index 261dfb8562dbd..650a2847fb6c8 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -327,11 +327,10 @@ using content::NativeWebKeyboardEvent;
+@@ -336,11 +336,10 @@ using content::NativeWebKeyboardEvent;
 using content::WebContents;
 using web_modal::WebContentsModalDialogHost;
 
@ -373,7 +373,7 @@ index 7005d2c0be663..8d55893627837 100644
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // UMA histograms that record animation smoothness for tab loading animation.
-@@ -800,11 +799,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
+@@ -838,11 +837,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
@ -397,7 +397,7 @@ index 7005d2c0be663..8d55893627837 100644
   SetShowIcon(
       ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
 
-@@ -848,7 +858,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -886,7 +896,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   }
 
   browser_->tab_strip_model()->AddObserver(this);
@ -405,7 +405,7 @@ index 7005d2c0be663..8d55893627837 100644
 
   // Top container holds tab strip region and toolbar and lives at the front of
   // the view hierarchy.
-@@ -904,8 +913,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -942,8 +951,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
       devtools_web_view_, contents_web_view_));
 
@ -423,7 +423,7 @@ index 7005d2c0be663..8d55893627837 100644
 
   contents_separator_ =
       top_container_->AddChildView(std::make_unique<ContentsSeparator>());
-@@ -1089,12 +1105,14 @@ gfx::Size BrowserView::GetWebAppFrameToolbarPreferredSize() const {
+@@ -1129,12 +1145,14 @@ gfx::Size BrowserView::GetWebAppFrameToolbarPreferredSize() const {
 
 #if BUILDFLAG(IS_MAC)
 bool BrowserView::UsesImmersiveFullscreenMode() const {
@ -440,7 +440,7 @@ index 7005d2c0be663..8d55893627837 100644
 }
 
 bool BrowserView::UsesImmersiveFullscreenTabbedMode() const {
-@@ -1820,6 +1838,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
+@@ -1884,6 +1902,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
   if (immersive_mode_controller_->IsEnabled())
     return false;
 
@ -449,7 +449,7 @@ index 7005d2c0be663..8d55893627837 100644
   return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
 }
 
-@@ -2817,7 +2837,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
+@@ -2887,7 +2907,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
 }
 
 DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -459,7 +459,7 @@ index 7005d2c0be663..8d55893627837 100644
   if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
     return download_button->bubble_controller();
   return nullptr;
-@@ -3353,7 +3374,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
+@@ -3423,7 +3444,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
   if (top_container()->parent() == this)
     return;
 
@ -469,7 +469,7 @@ index 7005d2c0be663..8d55893627837 100644
   top_container()->DestroyLayer();
   AddChildViewAt(top_container(), 0);
   EnsureFocusOrder();
-@@ -3928,8 +3950,10 @@ void BrowserView::Layout() {
+@@ -3994,8 +4016,10 @@ void BrowserView::Layout() {
 
   // TODO(jamescook): Why was this in the middle of layout code?
   toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -480,9 +480,9 @@ index 7005d2c0be663..8d55893627837 100644
 +  if (frame()->GetFrameView())
 +    frame()->GetFrameView()->UpdateMinimumSize();
 
-   // Some of the situations when the BrowserView is laid out are:
-   // - Enter/exit immersive fullscreen mode.
-@@ -3995,6 +4019,11 @@ void BrowserView::AddedToWidget() {
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   // In chromeOS ash we round the bottom two corners of the browser frame by
+@@ -4073,6 +4097,11 @@ void BrowserView::AddedToWidget() {
   SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
 #endif
 
@ -494,7 +494,7 @@ index 7005d2c0be663..8d55893627837 100644
   toolbar_->Init();
 
   // TODO(pbos): Investigate whether the side panels should be creatable when
-@@ -4042,13 +4071,9 @@ void BrowserView::AddedToWidget() {
+@@ -4120,13 +4149,9 @@ void BrowserView::AddedToWidget() {
 
   EnsureFocusOrder();
 
@ -510,7 +510,7 @@ index 7005d2c0be663..8d55893627837 100644
   using_native_frame_ = frame_->ShouldUseNativeFrame();
 
   MaybeInitializeWebUITabStrip();
-@@ -4453,7 +4478,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
+@@ -4544,7 +4569,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
   // Undo our anti-jankiness hacks and force a re-layout.
   in_process_fullscreen_ = false;
   ToolbarSizeChanged(false);
@ -520,7 +520,7 @@ index 7005d2c0be663..8d55893627837 100644
 }
 
 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
-@@ -4822,6 +4848,8 @@ Profile* BrowserView::GetProfile() {
+@@ -4915,6 +4941,8 @@ Profile* BrowserView::GetProfile() {
 }
 
 void BrowserView::UpdateUIForTabFullscreen() {
@ -529,7 +529,7 @@ index 7005d2c0be663..8d55893627837 100644
   frame()->GetFrameView()->UpdateFullscreenTopUI();
 }
 
-@@ -4844,6 +4872,8 @@ void BrowserView::HideDownloadShelf() {
+@@ -4937,6 +4965,8 @@ void BrowserView::HideDownloadShelf() {
 }
 
 bool BrowserView::CanUserExitFullscreen() const {
@ -539,13 +539,13 @@ index 7005d2c0be663..8d55893627837 100644
 }
 
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index e149a732b5d06..b8ae00f1e44b8 100644
+index 58f128d2217a0..c8dd2a4a5a940 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
-@@ -124,11 +124,16 @@ class BrowserView : public BrowserWindow,
-                     public webapps::AppBannerManager::Observer {
-  public:
-   METADATA_HEADER(BrowserView);
+@@ -136,11 +136,16 @@ class BrowserView : public BrowserWindow,
+     kUnknown
+   };
+ 
 +  BrowserView();
   explicit BrowserView(std::unique_ptr<Browser> browser);
 +  void InitBrowser(std::unique_ptr<Browser> browser);
@ -559,7 +559,7 @@ index e149a732b5d06..b8ae00f1e44b8 100644
   void set_frame(BrowserFrame* frame) {
     frame_ = frame;
     paint_as_active_subscription_ =
-@@ -788,6 +793,12 @@ class BrowserView : public BrowserWindow,
+@@ -810,6 +815,12 @@ class BrowserView : public BrowserWindow,
     return web_app_frame_toolbar();
   }
 
@ -618,10 +618,10 @@ index 8267a265a8e10..ee08f18e96a34 100644
 
 ContentsWebView::~ContentsWebView() {
 diff --git chrome/browser/ui/views/page_action/page_action_icon_controller.cc chrome/browser/ui/views/page_action/page_action_icon_controller.cc
-index 09e828d1e079e..7f42618d67e77 100644
+index 723a2840bd988..975152c988917 100644
 --- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
 +++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
-@@ -94,6 +94,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
+@@ -96,6 +96,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
   };
 
   for (PageActionIconType type : params.types_enabled) {
@ -681,9 +681,18 @@ index dc792bea0ab88..e02cdd3214b1d 100644
 }
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index c9e50271f2716..063e5b353f0a3 100644
+index 55c2762426eaa..d2a6f69ad70aa 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
+@@ -182,7 +182,7 @@ class TabstripLikeBackground : public views::Background {
+   void Paint(gfx::Canvas* canvas, views::View* view) const override {
+     bool painted = TopContainerBackground::PaintThemeCustomImage(
+         canvas, view, browser_view_, /*translate_view_coordinates=*/false);
+-    if (!painted) {
+    if (!painted && browser_view_->frame()->GetFrameView()) {
+       SkColor frame_color =
+           browser_view_->frame()->GetFrameView()->GetFrameColor(
+               BrowserFrameActiveState::kUseCurrent);
@@ -208,12 +208,13 @@ class ToolbarView::ContainerView : public views::View {
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
--- 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 f4f583be8fba9..a2ed253f3724d 100644
+index 5634cbee2987c..88e2be9d6b2c1 100644
 --- content/browser/devtools/devtools_http_handler.cc
 +++ content/browser/devtools/devtools_http_handler.cc
@@ -588,7 +588,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@ -12,10 +12,10 @@ index f4f583be8fba9..a2ed253f3724d 100644
     version.Set("V8-Version", V8_VERSION_STRING);
     std::string host = info.GetHeaderValue("host");
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index cfac536ad9eed..f47e947b6c972 100644
+index 9add88b4b9900..230bfa11d1a8c 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
-@@ -755,6 +755,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
+@@ -772,6 +772,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
           resource_request_->has_user_gesture, initiating_origin,
           initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
 
@ -34,10 +34,10 @@ index cfac536ad9eed..f47e947b6c972 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 13db98964e657..eb2dc54600e34 100644
+index af623d96cb4a0..e16569d6b5fcb 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
-@@ -1024,7 +1024,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
+@@ -1029,7 +1029,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
 void ContentBrowserClient::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {}
 
@ -46,7 +46,7 @@ index 13db98964e657..eb2dc54600e34 100644
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -1033,6 +1033,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
+@@ -1038,6 +1038,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
         cert_verifier_creation_params) {
   network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
   network_context_params->accept_language = "en-us,en";
@ -55,10 +55,10 @@ index 13db98964e657..eb2dc54600e34 100644
 
 std::vector<base::FilePath>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index 421df3e1f6d23..4448cc23084a8 100644
+index 5fec5acd6fac3..9f80d1f91d0b5 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
-@@ -38,6 +38,7 @@
+@@ -40,6 +40,7 @@
 #include "content/public/browser/mojo_binder_policy_map.h"
 #include "content/public/browser/privacy_sandbox_invoking_api.h"
 #include "content/public/browser/storage_partition_config.h"
@ -66,7 +66,7 @@ index 421df3e1f6d23..4448cc23084a8 100644
 #include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
 #include "content/public/common/page_visibility_state.h"
 #include "content/public/common/window_container_type.mojom-forward.h"
-@@ -1890,7 +1891,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1896,7 +1897,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.
@ -75,7 +75,7 @@ index 421df3e1f6d23..4448cc23084a8 100644
       BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
-@@ -2102,6 +2103,19 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -2108,6 +2109,19 @@ class CONTENT_EXPORT ContentBrowserClient {
       RenderFrameHost* initiator_document,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
 
@ -95,7 +95,7 @@ index 421df3e1f6d23..4448cc23084a8 100644
   // Creates an OverlayWindow to be used for video or Picture-in-Picture.
   // This window will house the content shown when in Picture-in-Picture mode.
   // This will return a new OverlayWindow.
-@@ -2158,6 +2172,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -2164,6 +2178,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Used as part of the user agent string.
   virtual std::string GetProduct();
 
@ -132,10 +132,10 @@ index a4130ad4dc815..b303f6c8768b7 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 9bdebf527329f..fd5f9daba2c4e 100644
+index d1f8638d39085..e45b9989362ab 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -620,6 +620,8 @@ void RenderThreadImpl::Init() {
+@@ -622,6 +622,8 @@ void RenderThreadImpl::Init() {
       GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
           blink::URLLoaderThrottleProviderType::kFrame);
 
@ -145,7 +145,7 @@ index 9bdebf527329f..fd5f9daba2c4e 100644
       base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
                           base::Unretained(this)));
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 1b248fb88e20b..1ef54fc4ce963 100644
+index 91bf7695e6cc5..fd21906e967b9 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
@@ -946,6 +946,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@ -179,10 +179,10 @@ index 587565fa2fd5d..d68eeea7e842e 100644
   // plus eTLD+1, such as https://google.com), or to a more specific origin.
   void SetIsLockedToSite();
 diff --git content/shell/browser/shell_content_browser_client.cc content/shell/browser/shell_content_browser_client.cc
-index cb7a832f8f5bd..9186ce40026f6 100644
+index c49be4358db79..7e08c90887f82 100644
 --- content/shell/browser/shell_content_browser_client.cc
 +++ content/shell/browser/shell_content_browser_client.cc
-@@ -666,7 +666,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+@@ -668,7 +668,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
         // BUILDFLAG(IS_ANDROID)
 
@ -191,7 +191,7 @@ index cb7a832f8f5bd..9186ce40026f6 100644
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -675,6 +675,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
+@@ -677,6 +677,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
         cert_verifier_creation_params) {
   ConfigureNetworkContextParamsForShell(context, network_context_params,
                                         cert_verifier_creation_params);
@ -200,10 +200,10 @@ index cb7a832f8f5bd..9186ce40026f6 100644
 
 std::vector<base::FilePath>
 diff --git content/shell/browser/shell_content_browser_client.h content/shell/browser/shell_content_browser_client.h
-index 70ae93fd9301d..c8d6caa49ff2d 100644
+index 32966a5dcf3e6..0954d033d0f4b 100644
 --- content/shell/browser/shell_content_browser_client.h
 +++ content/shell/browser/shell_content_browser_client.h
-@@ -129,7 +129,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
+@@ -130,7 +130,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
         // BUILDFLAG(IS_ANDROID)
   device::GeolocationManager* GetGeolocationManager() override;
@ -213,10 +213,10 @@ index 70ae93fd9301d..c8d6caa49ff2d 100644
       bool in_memory,
       const base::FilePath& relative_partition_path,
 diff --git headless/lib/browser/headless_content_browser_client.cc headless/lib/browser/headless_content_browser_client.cc
-index ebdf4bcc2cbc8..3b4d19fae70d3 100644
+index eb4a7fdec40d7..741094edff3cb 100644
 --- headless/lib/browser/headless_content_browser_client.cc
 +++ headless/lib/browser/headless_content_browser_client.cc
-@@ -297,7 +297,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
+@@ -299,7 +299,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
   return true;
 }
 
@ -225,7 +225,7 @@ index ebdf4bcc2cbc8..3b4d19fae70d3 100644
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -307,6 +307,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
+@@ -309,6 +309,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
   HeadlessBrowserContextImpl::From(context)->ConfigureNetworkContextParams(
       in_memory, relative_partition_path, network_context_params,
       cert_verifier_creation_params);
@ -234,10 +234,10 @@ index ebdf4bcc2cbc8..3b4d19fae70d3 100644
 
 std::string HeadlessContentBrowserClient::GetProduct() {
 diff --git headless/lib/browser/headless_content_browser_client.h headless/lib/browser/headless_content_browser_client.h
-index be37373d3d4e8..6741578a5f1b8 100644
+index aee1b9b88171b..e1f05c20027e1 100644
 --- headless/lib/browser/headless_content_browser_client.h
 +++ headless/lib/browser/headless_content_browser_client.h
-@@ -79,7 +79,7 @@ class HeadlessContentBrowserClient : public content::ContentBrowserClient {
+@@ -80,7 +80,7 @@ class HeadlessContentBrowserClient : public content::ContentBrowserClient {
       const url::Origin& top_frame_origin,
       const url::Origin& accessing_origin) override;
 
--- a/patch/patches/content_main_654986.patch
+++ b/patch/patches/content_main_654986.patch
@ -1,5 +1,5 @@
 diff --git content/app/content_main.cc content/app/content_main.cc
-index 3062f57603321..d8532c9c2eabb 100644
+index 6c672cdc421bd..048282646af69 100644
 --- content/app/content_main.cc
 +++ content/app/content_main.cc
@@ -173,11 +173,8 @@ ContentMainParams::~ContentMainParams() = default;
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@ -1,5 +1,5 @@
 diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
-index e2cb049c1ce6c..8c2b6242894b3 100644
+index 37e2d2a50aa2c..bb6ac82cd9cb7 100644
 --- chrome/chrome_elf/BUILD.gn
 +++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@
@ -349,7 +349,7 @@ index 99efa6b245b99..008eb397332c2 100644
                               annotations, arguments, false, false));
   } else {
 diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
-index d7351f4a912b3..6f1577533d3e9 100644
+index e6c1805bfd52f..7eeceee06338a 100644
 --- components/crash/core/app/crashpad_mac.mm
 +++ components/crash/core/app/crashpad_mac.mm
@@ -17,11 +17,14 @@
@ -367,7 +367,7 @@ index d7351f4a912b3..6f1577533d3e9 100644
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "third_party/crashpad/crashpad/client/crashpad_info.h"
-@@ -43,15 +46,25 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
+@@ -39,15 +42,25 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
     std::map<std::string, std::string> process_annotations;
     @autoreleasepool {
       NSBundle* outer_bundle = base::apple::OuterBundle();
@ -399,7 +399,7 @@ index d7351f4a912b3..6f1577533d3e9 100644
 
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
       // Empty means stable.
-@@ -82,12 +95,20 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
+@@ -78,12 +91,20 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
         }
       }
 
@ -425,7 +425,7 @@ index d7351f4a912b3..6f1577533d3e9 100644
     }  // @autoreleasepool
     return process_annotations;
   }();
-@@ -147,10 +168,10 @@ bool PlatformCrashpadInitialization(
+@@ -143,10 +164,10 @@ bool PlatformCrashpadInitialization(
 
   if (initial_client) {
     @autoreleasepool {
@ -440,7 +440,7 @@ index d7351f4a912b3..6f1577533d3e9 100644
 
       // Is there a way to recover if this fails?
       CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
-@@ -179,6 +200,12 @@ bool PlatformCrashpadInitialization(
+@@ -175,6 +196,12 @@ bool PlatformCrashpadInitialization(
             "--reset-own-crash-exception-port-to-system-default");
       }
 
--- 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 20a84c114dc8c..1474217f0c5e2 100644
+index 2ab34ff2fc8a5..da93f514dd265 100644
 --- components/embedder_support/user_agent_utils.cc
 +++ components/embedder_support/user_agent_utils.cc
@@ -18,6 +18,7 @@
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@ -60,7 +60,7 @@ index cead7cfa14bae..24142c2e4896f 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 30d6c2e509ae8..8240b0b078869 100644
+index a1e0b689174b8..87908c22f7189 100644
 --- extensions/browser/extension_host.cc
 +++ extensions/browser/extension_host.cc
@@ -62,11 +62,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@ -131,10 +131,10 @@ index 30d6c2e509ae8..8240b0b078869 100644
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
 
 diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
-index 20002c3204d18..a3795d86d1f96 100644
+index 9754668feabbf..0fe27053dffcd 100644
 --- extensions/browser/extension_host.h
 +++ extensions/browser/extension_host.h
-@@ -59,6 +59,12 @@ class ExtensionHost : public DeferredStartRenderHost,
+@@ -61,6 +61,12 @@ class ExtensionHost : public DeferredStartRenderHost,
                 content::SiteInstance* site_instance,
                 const GURL& url,
                 mojom::ViewType host_type);
@ -147,7 +147,7 @@ index 20002c3204d18..a3795d86d1f96 100644
 
   ExtensionHost(const ExtensionHost&) = delete;
   ExtensionHost& operator=(const ExtensionHost&) = delete;
-@@ -69,7 +75,7 @@ class ExtensionHost : public DeferredStartRenderHost,
+@@ -71,7 +77,7 @@ class ExtensionHost : public DeferredStartRenderHost,
   const Extension* extension() const { return extension_; }
 
   const std::string& extension_id() const { return extension_id_; }
@ -156,7 +156,7 @@ index 20002c3204d18..a3795d86d1f96 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_; }
-@@ -216,7 +222,8 @@ class ExtensionHost : public DeferredStartRenderHost,
+@@ -222,7 +228,8 @@ class ExtensionHost : public DeferredStartRenderHost,
   raw_ptr<content::BrowserContext> browser_context_;
 
   // The host for our HTML content.
@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
 }
 
 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
-index b70ec0a3bec7e..bb4280ff00696 100644
+index c8b79578252a9..fbfac71f6a861 100644
 --- extensions/browser/extensions_browser_client.h
 +++ extensions/browser/extensions_browser_client.h
@@ -32,6 +32,7 @@
@ -217,7 +217,7 @@ index b70ec0a3bec7e..bb4280ff00696 100644
 class ExtensionHostDelegate;
 class ExtensionSet;
 class ExtensionSystem;
-@@ -257,6 +259,14 @@ class ExtensionsBrowserClient {
+@@ -263,6 +265,14 @@ class ExtensionsBrowserClient {
   virtual std::unique_ptr<ExtensionHostDelegate>
   CreateExtensionHostDelegate() = 0;
 
@ -233,10 +233,10 @@ index b70ec0a3bec7e..bb4280ff00696 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 ac0da20879dc1..46e1eabeccab3 100644
+index c9e90b66d739d..cb3e3345a6f30 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
-@@ -377,9 +377,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
+@@ -379,9 +379,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
     return true;  // TODO(kalman): return false here? It might break things...
 
   DVLOG(1) << "CreateBackgroundHost " << extension->id();
--- a/patch/patches/font_family_cache_1501.patch
+++ b/patch/patches/font_family_cache_1501.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
-index 6ec531bbc4f0d..df9e376fa9f05 100644
+index d4a32438bd20d..7e1d40e973333 100644
 --- chrome/browser/font_family_cache.h
 +++ chrome/browser/font_family_cache.h
@@ -19,6 +19,8 @@ class Profile;
--- a/patch/patches/gn_config.patch
+++ b/patch/patches/gn_config.patch
@ -1,8 +1,8 @@
 diff --git .gn .gn
-index a9b0a5a827fc8..9a0fd388756f3 100644
+index 16bf620b7c2ee..37d7ab18e670b 100644
 --- .gn
 +++ .gn
-@@ -151,6 +151,8 @@ exec_script_whitelist =
+@@ -145,6 +145,8 @@ exec_script_whitelist =
       "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
       "//chrome/version.gni",
 
@ -12,7 +12,7 @@ index a9b0a5a827fc8..9a0fd388756f3 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index acd08b3cc7ef4..98f64fb279c4e 100644
+index dfcf0ad823868..6e041f3f6eb1f 100644
 --- BUILD.gn
 +++ BUILD.gn
@@ -19,6 +19,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -76,7 +76,7 @@ index 1da479dd5eebc..ff9c7e467997c 100644
 -  visual_studio_runtime_dirs = []
 }
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index e90116935b87d..805c3b54b17f7 100644
+index 98d206b764d92..ae9a84745e761 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")
--- 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 36e9375a7b656..c4c0d46c2b227 100644
+index a327136986b82..f66880032ec61 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -1192,6 +1192,15 @@
+@@ -1200,6 +1200,15 @@
   # END "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
 
--- a/patch/patches/libxml_visibility.patch
+++ b/patch/patches/libxml_visibility.patch
@ -1,5 +1,5 @@
 diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn
-index 48840f40a3d19..c6a172fded049 100644
+index aab483d6b00ce..ed3c1e10a7fe7 100644
 --- third_party/libxml/BUILD.gn
 +++ third_party/libxml/BUILD.gn
@@ -140,6 +140,7 @@ static_library("libxml") {
--- a/patch/patches/linux_assets_path_1936.patch
+++ b/patch/patches/linux_assets_path_1936.patch
@ -1,8 +1,8 @@
 diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
-index 1b4f9c8e3b79a..0a6e83421a6d6 100644
+index 31ccdd899b06f..06a432a5a179e 100644
 --- content/browser/child_process_launcher_helper_linux.cc
 +++ content/browser/child_process_launcher_helper_linux.cc
-@@ -183,7 +183,7 @@ ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() {
+@@ -184,7 +184,7 @@ ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() {
 base::File OpenFileToShare(const base::FilePath& path,
                            base::MemoryMappedFile::Region* region) {
   base::FilePath exe_dir;
--- a/patch/patches/linux_bluetooth_1319006.patch
+++ b/patch/patches/linux_bluetooth_1319006.patch
@ -1,5 +1,5 @@
 diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
-index f619de1d332d7..4ea25b48a27eb 100644
+index 4885f927ae2b8..5e7d3e61391bf 100644
 --- device/bluetooth/BUILD.gn
 +++ device/bluetooth/BUILD.gn
@@ -46,10 +46,12 @@ source_set("deprecated_experimental_mojo") {
--- a/patch/patches/linux_glib_deprecated_volatile.patch
+++ b/patch/patches/linux_glib_deprecated_volatile.patch
@ -1,8 +1,8 @@
 diff --git ui/accessibility/platform/BUILD.gn ui/accessibility/platform/BUILD.gn
-index 0d3fdc9b8cdff..e76f7ab4129ae 100644
+index 4e23c38763184..162f8b453f4ac 100644
 --- ui/accessibility/platform/BUILD.gn
 +++ ui/accessibility/platform/BUILD.gn
-@@ -289,6 +289,10 @@ component("platform") {
+@@ -287,6 +287,10 @@ component("platform") {
       if (use_gio) {
         configs += [ "//build/linux:gio_config" ]
       }
@ -14,7 +14,7 @@ index 0d3fdc9b8cdff..e76f7ab4129ae 100644
   }
 }
 diff --git ui/gtk/BUILD.gn ui/gtk/BUILD.gn
-index 76ab8c9765bec..8bc3cdd0fec96 100644
+index f4c5a2bcebbb7..5faf19980b1bd 100644
 --- ui/gtk/BUILD.gn
 +++ ui/gtk/BUILD.gn
@@ -174,4 +174,8 @@ component("gtk") {
--- a/patch/patches/linux_printing_context.patch
+++ b/patch/patches/linux_printing_context.patch
@ -76,12 +76,12 @@ index 29db798e8b171..f8b9546b90321 100644
 }
 
 diff --git ui/linux/linux_ui.h ui/linux/linux_ui.h
-index 82d40cb5fa1b9..0a08bec8a6e61 100644
+index a47134d7fa672..4fef62bbec3ee 100644
 --- ui/linux/linux_ui.h
 +++ ui/linux/linux_ui.h
-@@ -18,6 +18,10 @@
- #include "build/chromecast_buildflags.h"
+@@ -19,6 +19,10 @@
 #include "printing/buildflags/buildflags.h"
+ #include "ui/gfx/geometry/rect.h"
 
 +#if BUILDFLAG(ENABLE_PRINTING)
 +#include "printing/printing_context_linux.h"  // nogncheck
@ -90,9 +90,9 @@ index 82d40cb5fa1b9..0a08bec8a6e61 100644
 // The main entrypoint into Linux toolkit specific code. GTK/QT code should only
 // be executed behind this interface.
 
-@@ -60,9 +64,27 @@ class TextEditCommandAuraLinux;
- class WindowButtonOrderObserver;
- class WindowFrameProvider;
+@@ -92,9 +96,27 @@ inline DisplayConfig::DisplayConfig(DisplayConfig&& other) = default;
+ inline DisplayConfig& DisplayConfig::operator=(DisplayConfig&& other) = default;
+ inline DisplayConfig::~DisplayConfig() = default;
 
 +class COMPONENT_EXPORT(LINUX_UI) PrintingContextLinuxDelegate {
 + public:
@ -119,7 +119,7 @@ index 82d40cb5fa1b9..0a08bec8a6e61 100644
  public:
   // Describes the window management actions that could be taken in response to
   // a middle click in the non client area.
-@@ -129,14 +151,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
+@@ -161,14 +183,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
   // Returns a map of KeyboardEvent code to KeyboardEvent key values.
   virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;
 
--- a/patch/patches/mac_event_observer_2539.patch
+++ b/patch/patches/mac_event_observer_2539.patch
@ -1,8 +1,8 @@
 diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm
-index 38740d438e263..7657fa28bfcb9 100644
+index d7f32cb53ea3a..2bab5de59657f 100644
 --- content/browser/scheduler/responsiveness/native_event_observer_mac.mm
 +++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm
-@@ -15,13 +15,15 @@
+@@ -11,13 +11,15 @@
 namespace content::responsiveness {
 
 void NativeEventObserver::RegisterObserver() {
--- a/patch/patches/mac_fling_scheduler_2540.patch
+++ b/patch/patches/mac_fling_scheduler_2540.patch
@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm
-index 063ccc809ee9b..61b80c72b8a26 100644
+index 50ed39df38044..7839bdaf7b7e5 100644
 --- content/browser/renderer_host/input/fling_scheduler_mac.mm
 +++ content/browser/renderer_host/input/fling_scheduler_mac.mm
-@@ -30,6 +30,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
+@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
       return nullptr;
   }
 
--- a/patch/patches/mac_keyboard_conversion_1467329.patch
+++ b/patch/patches/mac_keyboard_conversion_1467329.patch
@ -1,8 +1,8 @@
 diff --git ui/events/keycodes/keyboard_code_conversion_mac.mm ui/events/keycodes/keyboard_code_conversion_mac.mm
-index 0d8befe370520..93e324e5e3784 100644
+index 23a5e234f7030..0bcc9e3fb2eb1 100644
 --- ui/events/keycodes/keyboard_code_conversion_mac.mm
 +++ ui/events/keycodes/keyboard_code_conversion_mac.mm
-@@ -939,7 +939,7 @@ DomKey DomKeyFromNSEvent(NSEvent* event) {
+@@ -935,7 +935,7 @@ DomKey DomKeyFromNSEvent(NSEvent* event) {
       return DomKeyFromKeyCode(event.keyCode);
     }
     default:
--- a/patch/patches/mac_platform_style_bubble_893292.patch
+++ b/patch/patches/mac_platform_style_bubble_893292.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-index 7e8bcef6d5bd9..6cd5df220ff5f 100644
+index ff271cd2ae544..f6aa2a185348f 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -1018,8 +1018,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
+@@ -1021,8 +1021,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
           ->GetDisplayNearestPoint(anchor_rect.CenterPoint())
           .work_area();
   int available_space = screen_space.bottom() - anchor_rect.bottom();
@ -14,10 +14,10 @@ index 7e8bcef6d5bd9..6cd5df220ff5f 100644
       std::max(available_space, anchor_rect.y() - screen_space.y());
 #endif
 diff --git ui/views/style/platform_style_mac.mm ui/views/style/platform_style_mac.mm
-index 4a695e7bab33e..5421e39cd5a9c 100644
+index 753e5b22ae10f..2d513bfb2e8e7 100644
 --- ui/views/style/platform_style_mac.mm
 +++ ui/views/style/platform_style_mac.mm
-@@ -47,7 +47,7 @@ const bool PlatformStyle::kTableViewSupportsKeyboardNavigationByCell = false;
+@@ -43,7 +43,7 @@ const bool PlatformStyle::kTableViewSupportsKeyboardNavigationByCell = false;
 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
 const bool PlatformStyle::kUseRipples = false;
 const bool PlatformStyle::kInactiveWidgetControlsAppearDisabled = true;
--- a/patch/patches/message_pump_mac_2495.patch
+++ b/patch/patches/message_pump_mac_2495.patch
@ -1,8 +1,8 @@
 diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
-index 36d9430360c8f..c1e0b2d533f6d 100644
+index 442fceb2a6627..5d48b075bae86 100644
 --- base/message_loop/message_pump_mac.mm
 +++ base/message_loop/message_pump_mac.mm
-@@ -758,7 +758,8 @@ void MessagePumpUIApplication::Detach() {
+@@ -754,7 +754,8 @@ void MessagePumpUIApplication::Detach() {
 #else
 
 ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@ -12,7 +12,7 @@ index 36d9430360c8f..c1e0b2d533f6d 100644
   DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
   // Pumping events in private runloop modes is known to interact badly with
   // app modal windows like NSAlert.
-@@ -769,7 +770,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
+@@ -765,7 +766,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
 }
 
 ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@ -10,10 +10,10 @@ index 4fc3870bcfbc8..24c6d32d4a8d8 100644
 +// This load will not send any cookies. For CEF usage.
 +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 19)
 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
-index b421bab92706a..a47cfb17cec23 100644
+index d748009dece6f..b88a28c870f8a 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
-@@ -1764,7 +1764,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
+@@ -1761,7 +1761,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.
--- a/patch/patches/net_test_server_3798752.patch
+++ b/patch/patches/net_test_server_3798752.patch
@ -1,8 +1,8 @@
 diff --git net/test/embedded_test_server/embedded_test_server.cc net/test/embedded_test_server/embedded_test_server.cc
-index 8a1f7c56a000a..2be7d42e7e6b6 100644
+index 336d1ef2ad7fc..e4abe8d2cf9fd 100644
 --- net/test/embedded_test_server/embedded_test_server.cc
 +++ net/test/embedded_test_server/embedded_test_server.cc
-@@ -988,7 +988,7 @@ bool EmbeddedTestServer::PostTaskToIOThreadAndWait(base::OnceClosure closure) {
+@@ -978,7 +978,7 @@ bool EmbeddedTestServer::PostTaskToIOThreadAndWait(base::OnceClosure closure) {
   if (!base::CurrentThread::Get())
     temporary_loop = std::make_unique<base::SingleThreadTaskExecutor>();
 
@ -11,7 +11,7 @@ index 8a1f7c56a000a..2be7d42e7e6b6 100644
   if (!io_thread_->task_runner()->PostTaskAndReply(
           FROM_HERE, std::move(closure), run_loop.QuitClosure())) {
     return false;
-@@ -1015,7 +1015,7 @@ bool EmbeddedTestServer::PostTaskToIOThreadAndWaitWithResult(
+@@ -1005,7 +1005,7 @@ bool EmbeddedTestServer::PostTaskToIOThreadAndWaitWithResult(
   if (!base::CurrentThread::Get())
     temporary_loop = std::make_unique<base::SingleThreadTaskExecutor>();
 
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@ -41,10 +41,10 @@ index afefe3cd83dee..6668463247644 100644
 
 }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index f54d14751b488..2200fb38120fa 100644
+index 55364bf0f6313..4b233c9f9ade5 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -3237,6 +3237,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
+@@ -3244,6 +3244,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
       GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
 }
 
@ -57,10 +57,10 @@ index f54d14751b488..2200fb38120fa 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 e74883df0950b..cee6677e3875e 100644
+index 401123216fccc..b677c24c094e4 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
-@@ -795,6 +795,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -798,6 +798,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 33c15415b9574..fa8ca952ca658 100644
+index 578e66a7e8209..e25eff9c4e6d5 100644
 --- chrome/browser/download/download_prefs.cc
 +++ chrome/browser/download/download_prefs.cc
@@ -23,6 +23,7 @@
@ -21,7 +21,7 @@ index 33c15415b9574..fa8ca952ca658 100644
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
-@@ -357,6 +362,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
+@@ -360,6 +365,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
 // static
 DownloadPrefs* DownloadPrefs::FromBrowserContext(
     content::BrowserContext* context) {
--- a/patch/patches/renderer_host_1070713.patch
+++ b/patch/patches/renderer_host_1070713.patch
@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
-index 421a0b8ba291a..96fb53d746a7a 100644
+index 830307d5113f2..3d6959dfff18e 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -707,6 +707,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
--- 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 774f0b5289a4b..7e7f3a03e655c 100644
+index 3604fa07ff1c4..baf2f2d6507df 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
-@@ -934,6 +934,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
+@@ -944,6 +944,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
     : delegate_(delegate),
       locale_resources_data_lock_(new base::Lock),
       max_scale_factor_(k100Percent) {
@ -15,7 +15,7 @@ index 774f0b5289a4b..7e7f3a03e655c 100644
   mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kMangleLocalizedStrings);
 }
-@@ -943,6 +949,11 @@ ResourceBundle::~ResourceBundle() {
+@@ -953,6 +959,11 @@ ResourceBundle::~ResourceBundle() {
   UnloadLocaleResources();
 }
 
--- 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 fc773d1601a7f..bd1b616cd75cd 100644
+index 628724f3cc5c9..3a26148fac2a7 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -6,6 +6,7 @@
@ -10,7 +10,7 @@ index fc773d1601a7f..bd1b616cd75cd 100644
 #include <set>
 #include <utility>
 
-@@ -728,10 +729,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
+@@ -739,10 +740,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
 void RenderWidgetHostViewAura::UpdateBackgroundColor() {
   DCHECK(GetBackgroundColor());
 
@ -26,8 +26,8 @@ index fc773d1601a7f..bd1b616cd75cd 100644
 +  }
 }
 
- absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
-@@ -2288,6 +2291,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+ #if BUILDFLAG(IS_WIN)
+@@ -2355,6 +2358,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/screen_1443650.patch
+++ b/patch/patches/screen_1443650.patch
@ -19,10 +19,10 @@ index b74a058c4034e..441ccadf6a729 100644
 
 bool Screen::GetDisplayWithDisplayId(int64_t display_id,
 diff --git ui/display/win/screen_win.cc ui/display/win/screen_win.cc
-index ec87a93c5c91a..293485b488193 100644
+index f02d58195a931..baed756a0e2fe 100644
 --- ui/display/win/screen_win.cc
 +++ ui/display/win/screen_win.cc
-@@ -579,7 +579,7 @@ gfx::Rect ScreenWin::ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
+@@ -580,7 +580,7 @@ gfx::Rect ScreenWin::ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
       gfx::PointF(pixel_bounds.origin()), screen_win_display));
   const float scale_factor =
       1.0f / screen_win_display.display().device_scale_factor();
@ -31,7 +31,7 @@ index ec87a93c5c91a..293485b488193 100644
 }
 
 // static
-@@ -594,7 +594,7 @@ gfx::Rect ScreenWin::DIPToScreenRect(HWND hwnd, const gfx::Rect& dip_bounds) {
+@@ -595,7 +595,7 @@ gfx::Rect ScreenWin::DIPToScreenRect(HWND hwnd, const gfx::Rect& dip_bounds) {
   const gfx::Point origin =
       display::win::DIPToScreenPoint(dip_bounds.origin(), screen_win_display);
   const float scale_factor = screen_win_display.display().device_scale_factor();
--- a/patch/patches/services_network_2622.patch
+++ b/patch/patches/services_network_2622.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-index d4eaf8445a0cf..c4351e2afcf74 100644
+index 3579ed4022aa7..79942570d3b50 100644
 --- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
 +++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -23,6 +23,7 @@
@ -21,7 +21,7 @@ index d4eaf8445a0cf..c4351e2afcf74 100644
   // If the corresponding Connector policy isn't set, don't perform scans.
   if (!service || !service->IsConnectorEnabled(connector))
 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
-index a8843129e84f8..65c60b1c5eca5 100644
+index e45e4487be0a3..1112475211b1c 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@ -32,7 +32,7 @@ index a8843129e84f8..65c60b1c5eca5 100644
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
-@@ -298,8 +299,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
+@@ -323,8 +324,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
                           base::Unretained(this)));
   cookie_settings_ = CookieSettingsFactory::GetForProfile(profile);
   cookie_settings_observation_.Observe(cookie_settings_.get());
@ -45,7 +45,7 @@ index a8843129e84f8..65c60b1c5eca5 100644
 
   DisableQuicIfNotAllowed();
 
-@@ -794,9 +797,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -837,9 +840,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
   network_context_params->cookie_manager_params =
       CreateCookieManagerParams(profile_, *cookie_settings_);
 
@ -73,7 +73,7 @@ index a8843129e84f8..65c60b1c5eca5 100644
     PrefService* local_state = g_browser_process->local_state();
     // Configure the HTTP cache path and size.
     base::FilePath base_cache_path;
-@@ -805,15 +825,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -848,15 +868,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
         local_state->GetFilePath(prefs::kDiskCacheDir);
     if (!disk_cache_dir.empty())
       base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName());
@ -114,10 +114,10 @@ index 77522f65b7b6e..51cc2d60d4b8d 100644
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index c2232a9d25f81..e60de1cba9df9 100644
+index c192d0e171ebe..15266a51e3031 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
-@@ -554,6 +554,25 @@ void CookieMonster::SetCookieableSchemes(
+@@ -552,6 +552,25 @@ void CookieMonster::SetCookieableSchemes(
   MaybeRunCookieCallback(std::move(callback), true);
 }
 
@ -144,7 +144,7 @@ index c2232a9d25f81..e60de1cba9df9 100644
 void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
-index 6086953c99f55..bdec277059a97 100644
+index 3ca2c691cfd00..a148193f96a0e 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
@@ -208,6 +208,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@ -173,7 +173,7 @@ index 61fd008fc067e..73909be088278 100644
   // reset to null.
   const CookieAccessDelegate* cookie_access_delegate() const {
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index eb8a44a1e8ef9..4da584e1e179c 100644
+index abe47939a03ce..b7e86d0af8a6f 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
@@ -292,14 +292,9 @@ void CookieManager::AllowFileSchemeCookies(
@ -195,10 +195,10 @@ index eb8a44a1e8ef9..4da584e1e179c 100644
 
 void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index 1361678479bcf..636db3369c5cc 100644
+index c5f4244e73195..f9b19d23c0466 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
-@@ -2363,16 +2363,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2401,16 +2401,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         network_service_->network_quality_estimator());
   }
 
@ -227,10 +227,10 @@ index 1361678479bcf..636db3369c5cc 100644
       base::FeatureList::IsEnabled(features::kFledgePst)) {
     trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
 diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
-index 0be4cf9c74e82..387c3b133bef0 100644
+index e1385ffd42940..12f3193bb31d4 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
-@@ -374,6 +374,9 @@ struct NetworkContextParams {
+@@ -371,6 +371,9 @@ struct NetworkContextParams {
   // cookies. Otherwise it should be false.
   bool persist_session_cookies = false;
 
--- 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 005de7ebb48f3..1ccc2fb5bd195 100644
+index 6eb273a7efe22..f5e4079a0a66b 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
-@@ -507,10 +507,6 @@ class LoginHandlerDelegate {
+@@ -535,10 +535,6 @@ class LoginHandlerDelegate {
     }
 
     WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index 005de7ebb48f3..1ccc2fb5bd195 100644
 
     // WeakPtr is not strictly necessary here due to OnRequestCancelled.
     creating_login_delegate_ = true;
-@@ -562,12 +558,6 @@ void OnAuthRequiredContinuation(
+@@ -590,12 +586,6 @@ void OnAuthRequiredContinuation(
     mojo::PendingRemote<network::mojom::AuthChallengeResponder>
         auth_challenge_responder,
     base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index 005de7ebb48f3..1ccc2fb5bd195 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,
-@@ -3214,8 +3204,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -3235,8 +3225,12 @@ void StoragePartitionImpl::GetQuotaSettings(
     return;
   }
 
@ -40,7 +40,7 @@ index 005de7ebb48f3..1ccc2fb5bd195 100644
       storage::GetDefaultDeviceInfoHelper(), std::move(callback));
 }
 
-@@ -3225,9 +3219,12 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -3246,9 +3240,12 @@ void StoragePartitionImpl::InitNetworkContext() {
   cert_verifier::mojom::CertVerifierCreationParamsPtr
       cert_verifier_creation_params =
           cert_verifier::mojom::CertVerifierCreationParams::New();
--- 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 da966a58b11be..81b0199b4b6e5 100644
+index 1ddaeafd2779a..4feee8b931fd4 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
@@ -64,6 +64,8 @@
--- a/patch/patches/views_1749_2102_3330.patch
+++ b/patch/patches/views_1749_2102_3330.patch
@ -1,5 +1,5 @@
 diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
-index 704d47d68d7f5..950ba03efdba8 100644
+index a6d70c71a1b3a..1b628f5284409 100644
 --- ui/base/models/menu_model.h
 +++ ui/base/models/menu_model.h
@@ -17,8 +17,11 @@
@ -14,7 +14,7 @@ index 704d47d68d7f5..950ba03efdba8 100644
 }
 
 namespace ui {
-@@ -152,6 +155,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel
+@@ -147,6 +150,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel
   // |event_flags| is a bit mask of ui::EventFlags.
   virtual void ActivatedAt(size_t index, int event_flags);
 
@ -43,10 +43,10 @@ index 704d47d68d7f5..950ba03efdba8 100644
   virtual void MenuWillShow() {}
 
 diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
-index 17d8659f9c6fd..a6348c2ce453d 100644
+index 794b77e9eca3e..636589ae29c20 100644
 --- ui/gfx/render_text.cc
 +++ ui/gfx/render_text.cc
-@@ -665,6 +665,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
+@@ -667,6 +667,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
   }
 }
 
@ -61,7 +61,7 @@ index 17d8659f9c6fd..a6348c2ce453d 100644
 void RenderText::SetDisplayRect(const Rect& r) {
   if (r != display_rect_) {
     display_rect_ = r;
-@@ -2034,6 +2042,19 @@ void RenderText::OnTextAttributeChanged() {
+@@ -2036,6 +2044,19 @@ void RenderText::OnTextAttributeChanged() {
 
   layout_text_up_to_date_ = false;
 
@ -119,10 +119,10 @@ index c1c0631071a11..aa2c01ebce43e 100644
   friend class test::InkDropHostTestApi;
 
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index d6f4bdecfb441..cb7467bc661ea 100644
+index c2a8637c2c1c7..d641d08a1a9fc 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
-@@ -557,6 +557,12 @@ void LabelButton::OnThemeChanged() {
+@@ -561,6 +561,12 @@ void LabelButton::OnThemeChanged() {
   SchedulePaint();
 }
 
@ -136,10 +136,10 @@ index d6f4bdecfb441..cb7467bc661ea 100644
   Button::StateChanged(old_state);
   ResetLabelEnabledColor();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index d1ef026687694..d7efbe0338065 100644
+index 8dbd918f09528..06fad642642c4 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
-@@ -152,6 +152,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
+@@ -155,6 +155,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
   ui::NativeTheme::State GetForegroundThemeState(
       ui::NativeTheme::ExtraParams* params) const override;
 
@ -240,10 +240,10 @@ index 711dc633bffc2..0fa2626150de2 100644
   std::unique_ptr<SelectionController> selection_controller_;
 
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 7816e1fe32d9a..733a8c0c5cedf 100644
+index 3f81597c41a3e..b281eb2e7ac65 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -563,7 +563,8 @@ void MenuController::Run(Widget* parent,
+@@ -564,7 +564,8 @@ void MenuController::Run(Widget* parent,
                          MenuAnchorPosition position,
                          bool context_menu,
                          bool is_nested_drag,
@ -253,7 +253,7 @@ index 7816e1fe32d9a..733a8c0c5cedf 100644
   exit_type_ = ExitType::kNone;
   possible_drag_ = false;
   drag_in_progress_ = false;
-@@ -608,6 +609,7 @@ void MenuController::Run(Widget* parent,
+@@ -609,6 +610,7 @@ void MenuController::Run(Widget* parent,
       owner_->AddObserver(this);
 
     native_view_for_gestures_ = native_view_for_gestures;
@ -261,7 +261,7 @@ index 7816e1fe32d9a..733a8c0c5cedf 100644
 
     // Only create a MenuPreTargetHandler for non-nested menus. Nested menus
     // will use the existing one.
-@@ -2228,6 +2230,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
+@@ -2233,6 +2235,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
     params.do_capture = do_capture;
     params.native_view_for_gestures = native_view_for_gestures_;
     params.owned_window_anchor = anchor;
@ -269,7 +269,7 @@ index 7816e1fe32d9a..733a8c0c5cedf 100644
     if (item->GetParentMenuItem()) {
       params.context = item->GetWidget();
       // (crbug.com/1414232) The item to be open is a submenu. Make sure
-@@ -2938,8 +2941,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
+@@ -2936,8 +2939,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
@ -284,7 +284,7 @@ index 7816e1fe32d9a..733a8c0c5cedf 100644
 
   // Show the sub-menu.
   SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
-@@ -2959,8 +2967,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2957,8 +2965,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
 void MenuController::CloseSubmenu() {
   MenuItemView* item = state_.item;
   DCHECK(item);
@ -297,10 +297,10 @@ index 7816e1fe32d9a..733a8c0c5cedf 100644
     SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
   else if (item->GetParentMenuItem()->GetParentMenuItem())
 diff --git ui/views/controls/menu/menu_controller.h ui/views/controls/menu/menu_controller.h
-index 1334ad5a759dd..3ee525615683f 100644
+index 4c3cda2db0400..7383b2c97de2e 100644
 --- ui/views/controls/menu/menu_controller.h
 +++ ui/views/controls/menu/menu_controller.h
-@@ -140,7 +140,9 @@ class VIEWS_EXPORT MenuController
+@@ -138,7 +138,9 @@ class VIEWS_EXPORT MenuController
            MenuAnchorPosition position,
            bool context_menu,
            bool is_nested_drag,
@ -311,7 +311,7 @@ index 1334ad5a759dd..3ee525615683f 100644
 
   bool for_drop() const { return for_drop_; }
 
-@@ -723,6 +725,8 @@ class VIEWS_EXPORT MenuController
+@@ -722,6 +724,8 @@ class VIEWS_EXPORT MenuController
   // RunType::SEND_GESTURE_EVENTS_TO_OWNER is set.
   gfx::NativeView native_view_for_gestures_ = gfx::NativeView();
 
@ -396,10 +396,10 @@ index c048ab2aa5ae4..810f62eed6676 100644
 
   explicit MenuHost(SubmenuView* submenu);
 diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
-index dd34e0072ffa7..d45ed6a33251c 100644
+index 35419b44bcf81..8e268dd4274e5 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
-@@ -1087,6 +1087,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
+@@ -1043,6 +1043,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);
@ -415,7 +415,7 @@ index dd34e0072ffa7..d45ed6a33251c 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) {
+@@ -1109,6 +1118,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
 }
 
 SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -430,7 +430,7 @@ index dd34e0072ffa7..d45ed6a33251c 100644
   // use the default color.
   if (!paint_as_selected && foreground_color_id_.has_value()) {
 diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
-index 5ae6f3805ebd3..0c6361eac037a 100644
+index 887f471c4db69..5d097994cbf72 100644
 --- ui/views/controls/menu/menu_model_adapter.cc
 +++ ui/views/controls/menu/menu_model_adapter.cc
@@ -4,6 +4,7 @@
@ -441,7 +441,7 @@ index 5ae6f3805ebd3..0c6361eac037a 100644
 #include <list>
 #include <memory>
 #include <utility>
-@@ -222,6 +223,76 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
+@@ -225,6 +226,76 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
   return model->IsItemCheckedAt(index);
 }
 
@ -519,10 +519,10 @@ index 5ae6f3805ebd3..0c6361eac037a 100644
   // Look up the menu model for this menu.
   const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
 diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
-index eaae7fd7a3607..bfc69d7fc86e1 100644
+index a8354c0699920..9b5deb522c29a 100644
 --- ui/views/controls/menu/menu_model_adapter.h
 +++ ui/views/controls/menu/menu_model_adapter.h
-@@ -88,6 +88,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
+@@ -89,6 +89,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
   bool IsCommandEnabled(int id) const override;
   bool IsCommandVisible(int id) const override;
   bool IsItemChecked(int id) const override;
@ -578,7 +578,7 @@ index 562b67396f27f..7679dbd79e565 100644
 
   // Returns true if we're in a nested run loop running the menu.
 diff --git ui/views/controls/menu/menu_runner_impl.cc ui/views/controls/menu/menu_runner_impl.cc
-index c2513d2889a2b..5dfef1af49685 100644
+index e82249ad5e887..3a7429bcaf9f1 100644
 --- ui/views/controls/menu/menu_runner_impl.cc
 +++ ui/views/controls/menu/menu_runner_impl.cc
@@ -117,6 +117,7 @@ void MenuRunnerImpl::RunMenuAt(Widget* parent,
@ -639,10 +639,10 @@ index e6587d2208a13..c2c72f7edb89c 100644
   void Cancel() override;
   base::TimeTicks GetClosingEventTime() const override;
 diff --git ui/views/controls/menu/menu_runner_impl_cocoa.h ui/views/controls/menu/menu_runner_impl_cocoa.h
-index 68c01b93a973a..543c1bf139d4d 100644
+index 2056016df3098..6c6467f5a719e 100644
 --- ui/views/controls/menu/menu_runner_impl_cocoa.h
 +++ ui/views/controls/menu/menu_runner_impl_cocoa.h
-@@ -46,6 +46,7 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
+@@ -42,6 +42,7 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
       MenuAnchorPosition anchor,
       int32_t run_types,
       gfx::NativeView native_view_for_gestures,
@ -651,10 +651,10 @@ index 68c01b93a973a..543c1bf139d4d 100644
   void Cancel() override;
   base::TimeTicks GetClosingEventTime() const override;
 diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
-index 8bbf8104fdb46..ecbcd0f9ef3cc 100644
+index 9d148ed4bd5f1..6a4c407165190 100644
 --- ui/views/controls/menu/menu_runner_impl_cocoa.mm
 +++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
-@@ -194,6 +194,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
+@@ -190,6 +190,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
     MenuAnchorPosition anchor,
     int32_t run_types,
     gfx::NativeView native_view_for_gestures,
@ -676,10 +676,10 @@ index cf696fbcf0714..5c48fd7410b88 100644
 
   // Hides and cancels the menu.
 diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
-index 76bb4863858fb..feb949470219d 100644
+index a80ff0b70cab9..b37fed46d6cbd 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
-@@ -257,6 +257,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
+@@ -246,6 +246,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
   scroll_down_button_ = background_view_->AddChildView(
       std::make_unique<MenuScrollButton>(content_view, false));
 
@ -716,7 +716,7 @@ index 187e55af5d7be..3a980d26fdaae 100644
 #if !BUILDFLAG(IS_CHROMEOS_LACROS)
   if (root_location != root_current_location &&
 diff --git ui/views/view.h ui/views/view.h
-index ffec4f9971210..b5f7d0aa3126c 100644
+index 6891cfa1f7ce3..5eaa9fb195a3d 100644
 --- ui/views/view.h
 +++ ui/views/view.h
@@ -21,6 +21,7 @@
@ -727,7 +727,7 @@ index ffec4f9971210..b5f7d0aa3126c 100644
 #include "build/build_config.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/skia/include/core/SkPath.h"
-@@ -286,7 +287,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -283,7 +284,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
                           public ui::EventTarget,
                           public ui::EventHandler,
                           public ui::PropertyHandler,
--- 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 f1d50fba17a0a..0ee633dfd0a9d 100644
+index c099a8701b7e0..4baf820ea9647 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -641,6 +641,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
+@@ -648,6 +648,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
   return scale_override_for_capture_;
 }
 
@ -18,7 +18,7 @@ index f1d50fba17a0a..0ee633dfd0a9d 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 aed9a4aaa7c9f..ca312b74c79e4 100644
+index eed8db485e54b..80eeba983a573 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -71,6 +71,7 @@ class CursorManager;
@ -29,7 +29,7 @@ index aed9a4aaa7c9f..ca312b74c79e4 100644
 class SyntheticGestureTarget;
 class TextInputManager;
 class TouchSelectionControllerClientManager;
-@@ -135,6 +136,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -150,6 +151,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                         const gfx::Size& max_size) override;
   void DisableAutoResize(const gfx::Size& new_size) override;
   float GetDeviceScaleFactor() const final;
@ -38,7 +38,7 @@ index aed9a4aaa7c9f..ca312b74c79e4 100644
   TouchSelectionControllerClientManager*
   GetTouchSelectionControllerClientManager() override;
   ui::mojom::VirtualKeyboardMode GetVirtualKeyboardMode() override;
-@@ -171,6 +174,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -186,6 +189,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
   // Called when screen information or native widget bounds change.
   virtual void UpdateScreenInfo();
 
@ -49,7 +49,7 @@ index aed9a4aaa7c9f..ca312b74c79e4 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_|
-@@ -424,6 +431,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -441,6 +448,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                            const gfx::Rect& bounds,
                            const gfx::Rect& anchor_rect) = 0;
 
@ -62,7 +62,7 @@ index aed9a4aaa7c9f..ca312b74c79e4 100644
   // Sets the cursor for this view to the one specified.
   virtual void UpdateCursor(const ui::Cursor& cursor) = 0;
 
-@@ -672,6 +685,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -696,6 +709,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
   // to all displays.
   gfx::Size system_cursor_size_;
 
@ -73,7 +73,7 @@ index aed9a4aaa7c9f..ca312b74c79e4 100644
  private:
   FRIEND_TEST_ALL_PREFIXES(
       BrowserSideFlingBrowserTest,
-@@ -693,10 +710,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -717,10 +734,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
 
   void SynchronizeVisualProperties();
 
@ -359,7 +359,7 @@ index 2e4bacce52a45..76916c5d21cb9 100644
   // the implementation of ::ShowCursor() is based on a counter, so making this
   // member static ensures that ::ShowCursor() is always called exactly once
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index 2b52ad2f63bd6..db0059cc38055 100644
+index ce7b498ca6bf9..ea7226f91831c 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
@@ -368,7 +368,8 @@ void Widget::Init(InitParams params) {
@ -395,7 +395,7 @@ index 2b52ad2f63bd6..db0059cc38055 100644
   }
 
   if (base::FeatureList::IsEnabled(features::kWidgetLayering)) {
-@@ -1605,10 +1614,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
+@@ -1611,10 +1620,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
 }
 
 gfx::Size Widget::GetMinimumSize() const {
@ -413,7 +413,7 @@ index 2b52ad2f63bd6..db0059cc38055 100644
 }
 
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index 51017b6f5dd9a..62fb61fc142ad 100644
+index 745d643b1a878..f20c04ce8683a 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
@@ -351,6 +351,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -426,7 +426,7 @@ index 51017b6f5dd9a..62fb61fc142ad 100644
     // the NativeWidget may specify a default size. If the parent is specified,
     // |bounds| is in the parent's coordinate system. If the parent is not
 diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
-index cc74cc5f60ce1..d2698e765db76 100644
+index 6982b27ace7ae..c25a505d62e20 100644
 --- ui/views/widget/widget_delegate.h
 +++ ui/views/widget/widget_delegate.h
@@ -375,6 +375,10 @@ class VIEWS_EXPORT WidgetDelegate
@ -455,7 +455,7 @@ index 3b9b00b7d79ae..e759e3c1a9f34 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 bb3e9c6759cef..e3a83f0060dc3 100644
+index a386fb0594530..edc5dc99de31d 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
@@ -953,8 +953,12 @@ bool HWNDMessageHandler::IsActive() const {
@ -472,7 +472,7 @@ index bb3e9c6759cef..e3a83f0060dc3 100644
 }
 
 bool HWNDMessageHandler::IsMinimized() const {
-@@ -3339,10 +3343,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3346,10 +3350,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 8af69cac78b74..9f74e511c263d 100644
  private:
   const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index 7d16c747af4b8..d42e3636c4101 100644
+index ade4e4973a0e9..1846d8a34b9ff 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
@@ -228,6 +228,8 @@ viz_component("service") {
--- 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 3c66272f91029..c7dab0ee2a534 100644
+index 1caf3d1f032c4..d561f8aad9386 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -3269,6 +3269,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3323,6 +3323,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
       params.main_frame_name, GetOpener(), primary_main_frame_policy,
       base::UnguessableToken::Create());
 
@ -15,7 +15,7 @@ index 3c66272f91029..c7dab0ee2a534 100644
   std::unique_ptr<WebContentsViewDelegate> delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -3279,6 +3285,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3333,6 +3339,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
     view_ = CreateWebContentsView(this, std::move(delegate),
                                   &render_view_host_delegate_view_);
   }
@ -23,7 +23,7 @@ index 3c66272f91029..c7dab0ee2a534 100644
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
-@@ -3468,6 +3475,9 @@ void WebContentsImpl::RenderWidgetCreated(
+@@ -3522,6 +3529,9 @@ void WebContentsImpl::RenderWidgetCreated(
   OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
                         "render_widget_host", render_widget_host);
   created_widgets_.insert(render_widget_host);
@ -33,7 +33,7 @@ index 3c66272f91029..c7dab0ee2a534 100644
 }
 
 void WebContentsImpl::RenderWidgetDeleted(
-@@ -4220,6 +4230,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4274,6 +4284,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
     create_params.picture_in_picture_options = *(params.pip_options);
   }
 
@ -49,7 +49,7 @@ index 3c66272f91029..c7dab0ee2a534 100644
   // Check whether there is an available prerendered page for this navigation if
   // this is not for guest. If it exists, take WebContents pre-created for
   // hosting the prerendered page instead of creating new WebContents.
-@@ -8155,6 +8174,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
+@@ -8231,6 +8250,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
     // frames).
     SetFocusedFrameTree(&node->frame_tree());
   }
@ -60,10 +60,10 @@ index 3c66272f91029..c7dab0ee2a534 100644
 
 void WebContentsImpl::DidCallFocus() {
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index 71466f62c10d1..b55b37bbf8c9c 100644
+index f80a1a82e14a0..19d600603e2a4 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
-@@ -97,10 +97,12 @@ class BrowserContext;
+@@ -98,10 +98,12 @@ class BrowserContext;
 class BrowserPluginGuestDelegate;
 class RenderFrameHost;
 class RenderViewHost;
@ -76,7 +76,7 @@ index 71466f62c10d1..b55b37bbf8c9c 100644
 class WebUI;
 struct DropData;
 struct MHTMLGenerationParams;
-@@ -243,6 +245,10 @@ class WebContents : public PageNavigator,
+@@ -244,6 +246,10 @@ class WebContents : public PageNavigator,
     network::mojom::WebSandboxFlags starting_sandbox_flags =
         network::mojom::WebSandboxFlags::kNone;
 
@ -88,7 +88,7 @@ index 71466f62c10d1..b55b37bbf8c9c 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 c5bda327264c3..4b82e0c9ff345 100644
+index 791cd97dd0c45..0b155dd240f57 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
@@ -59,9 +59,11 @@ class EyeDropperListener;
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@ -11,10 +11,10 @@ index 8a18ecf567cd3..9697d43bbbfb9 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 980108560a9d0..0ae00d2c70526 100644
+index f4bd3d4fa8d85..21ee67dbae410 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
+@@ -249,8 +249,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
   g_should_use_external_popup_menus = use_external_popup_menus;
 }
 
@ -30,7 +30,7 @@ index 980108560a9d0..0ae00d2c70526 100644
 }
 
 namespace {
-@@ -571,6 +576,7 @@ WebViewImpl::WebViewImpl(
+@@ -584,6 +589,7 @@ WebViewImpl::WebViewImpl(
       chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
       minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
       maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@ -62,7 +62,7 @@ index 6a180620e00c7..09d11bfd3c83f 100644
   gfx::Transform 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 37f49afb2d01c..3b6aef63e31fc 100644
+index 1c03e9e20199a..946f36adcb131 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -917,7 +917,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
--- a/patch/patches/webui_2037.patch
+++ b/patch/patches/webui_2037.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
-index 844803229c2ca..5dde2357e8951 100644
+index ce7ee517b04db..0cc6bf2f2d775 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
@@ -19,10 +19,12 @@
@ -15,7 +15,7 @@ index 844803229c2ca..5dde2357e8951 100644
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/google/google_brand.h"
-@@ -400,7 +402,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
+@@ -401,7 +403,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
   response->emplace(kOsVersionTag, os_version);
 #endif
 
@ -28,7 +28,7 @@ index 844803229c2ca..5dde2357e8951 100644
   PopulateExtensionInfoLogs(response.get());
   PopulatePowerApiLogs(response.get());
 #if BUILDFLAG(IS_WIN)
-@@ -478,8 +484,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
+@@ -481,8 +487,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
   if (!profile)
     return;
 
@ -41,7 +41,7 @@ index 844803229c2ca..5dde2357e8951 100644
   std::string extensions_list;
   for (const scoped_refptr<const extensions::Extension>& extension :
        extension_registry->enabled_extensions()) {
-@@ -583,6 +593,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
+@@ -586,6 +596,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
 #if BUILDFLAG(IS_WIN)
 void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
     SystemLogsResponse* response) {
@ -51,22 +51,23 @@ index 844803229c2ca..5dde2357e8951 100644
   bool result =
       base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
 diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
-index 2565fae8b1433..9ca16abf99c92 100644
+index 1cf8e8840a22b..79be0f2825288 100644
 --- chrome/browser/memory_details.cc
 +++ chrome/browser/memory_details.cc
-@@ -294,8 +294,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
-     if (render_process_host) {
+@@ -298,9 +298,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+                 render_process_host->GetBrowserContext())) {
       content::BrowserContext* context =
           render_process_host->GetBrowserContext();
 +
 +      // May be nullptr if using CEF Alloy with extensions disabled.
       extensions::ExtensionRegistry* extension_registry =
           extensions::ExtensionRegistry::Get(context);
+-      DCHECK(extension_registry);
 +      if (extension_registry) {
       extension_set = &extension_registry->enabled_extensions();
       extensions::ProcessMap* process_map =
           extensions::ProcessMap::Get(context);
-@@ -311,6 +314,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -317,6 +319,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
           break;
         }
       }
--- a/patch/patches/win_light_mode_3534.patch
+++ b/patch/patches/win_light_mode_3534.patch
@ -32,10 +32,10 @@ index 325bc70b6ba97..6ba7f2f2becf6 100644
   return (dark_mode_support.allow_dark_mode_for_app ||
           dark_mode_support.set_preferred_app_mode) &&
 diff --git ui/native_theme/native_theme_win.cc ui/native_theme/native_theme_win.cc
-index 87807be3558a2..7b069213cfea6 100644
+index d3f9fcbed28f9..94673728a3e11 100644
 --- ui/native_theme/native_theme_win.cc
 +++ ui/native_theme/native_theme_win.cc
-@@ -628,7 +628,7 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
+@@ -637,7 +637,7 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
 
 NativeTheme::PreferredColorScheme
 NativeThemeWin::CalculatePreferredColorScheme() const {
@ -44,7 +44,7 @@ index 87807be3558a2..7b069213cfea6 100644
     return NativeTheme::CalculatePreferredColorScheme();
 
   // According to the spec, the preferred color scheme for web content is 'dark'
-@@ -1581,7 +1581,7 @@ void NativeThemeWin::RegisterThemeRegkeyObserver() {
+@@ -1591,7 +1591,7 @@ void NativeThemeWin::RegisterThemeRegkeyObserver() {
 
 void NativeThemeWin::UpdateDarkModeStatus() {
   bool dark_mode_enabled = false;
--- a/patch/patches/win_sandbox_3210.patch
+++ b/patch/patches/win_sandbox_3210.patch
@ -1,8 +1,8 @@
 diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
-index 490ecf09ab473..58340ea8a3921 100644
+index 2ee0182088f41..5fdde1ea4f94a 100644
 --- sandbox/policy/win/sandbox_win.cc
 +++ sandbox/policy/win/sandbox_win.cc
-@@ -975,6 +975,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
+@@ -982,6 +982,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
     const base::HandlesToInheritVector& handles_to_inherit,
     SandboxDelegate* delegate,
     base::Process* process) {
--- a/tests/ceftests/CMakeLists.txt.in
+++ b/tests/ceftests/CMakeLists.txt.in
@ -117,6 +117,16 @@ endif()
 #

 if(OS_MAC)
+  option(OPTION_USE_ARC "Build with ARC (automatic Reference Counting) on macOS." ON)
+  if(OPTION_USE_ARC)
+    list(APPEND CEF_COMPILER_FLAGS
+      -fobjc-arc
+      )
+    set_target_properties(${target} PROPERTIES
+      CLANG_ENABLE_OBJC_ARC "YES"
+      )
+  endif()
+
  # Output path for the main app bundle.
  set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")

--- a/tests/ceftests/run_all_unittests_mac.mm
+++ b/tests/ceftests/run_all_unittests_mac.mm
@ -5,8 +5,10 @@
 #include "include/cef_app.h"
 #import "include/cef_application_mac.h"

+#if !__has_feature(objc_arc)
 // Memory AutoRelease pool.
 static NSAutoreleasePool* g_autopool = nil;
+#endif

 // Provide the CefAppProtocol implementation required by CEF.
@interface TestApplication : NSApplication <CefAppProtocol> {
@ -31,14 +33,18 @@ static NSAutoreleasePool* g_autopool = nil;
@end

 void PlatformInit() {
+#if !__has_feature(objc_arc)
  // Initialize the AutoRelease pool.
  g_autopool = [[NSAutoreleasePool alloc] init];
+#endif

  // Initialize the TestApplication instance.
  [TestApplication sharedApplication];
 }

 void PlatformCleanup() {
+#if !__has_feature(objc_arc)
  // Release the AutoRelease pool.
  [g_autopool release];
+#endif
 }
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@ -928,6 +928,7 @@ if platform == 'windows':
      cef_sandbox_lib,
      'obj\\sandbox\\common\\*.obj',
      'obj\\sandbox\\win\\sandbox.lib',
+      'obj\\sandbox\\win\\service_resolver\\*.obj',
      'obj\\third_party\\abseil-cpp\\absl\\base\\**\\*.obj',
      'obj\\third_party\\abseil-cpp\\absl\\debugging\\**\\*.obj',
      'obj\\third_party\\abseil-cpp\\absl\\numeric\\**\\*.obj',