Update to Chromium version 98.0.4758.0 (#950365)

2025-02-16 20:20:51 +01:00 · 2021-12-16 17:35:54 -05:00 · 2021-12-16 17:35:54 -05:00 · dfc0131516
commit dfc0131516
parent b76badd958
109 changed files with 785 additions and 798 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -96,6 +96,7 @@
 import("//base/allocator/allocator.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
+import("//build/config/ozone.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
@ -306,7 +307,7 @@ group("cef") {
    ":libcef_static_unittests",
  ]

-  if (!is_linux || use_x11) {
+  if (!is_linux || ozone_platform_x11) {
    deps += [ ":cefclient" ]
  }
 }
@ -983,7 +984,7 @@ static_library("libcef_static") {
      "libcef/browser/printing/print_dialog_linux.h",
    ]

-    if (use_x11) {
+    if (ozone_platform_x11) {
      sources += [
        "libcef/browser/native/window_x11.cc",
        "libcef/browser/native/window_x11.h",
@ -995,7 +996,7 @@ static_library("libcef_static") {
      "//third_party/fontconfig",
    ]

-    if (is_linux && !use_x11) {
+    if (is_linux && !ozone_platform_x11) {
      deps += [
        "//third_party/angle:libEGL",
      ]
@ -1027,7 +1028,7 @@ static_library("libcef_static") {
    deps += [ "//third_party/crashpad/crashpad/handler" ]
  }

-  if (use_x11) {
+  if (ozone_platform_x11) {
    deps += [ "//ui/events/devices/x11" ]
  }

@ -1201,7 +1202,7 @@ static_library("libcef_static") {
          "//ui/ozone:generate_test_support_constructor_list",
        ]

-        if (use_x11) {
+        if (ozone_platform_x11) {
          sources += [
            # Support for UI input events.
            # Part of //ui/base/x:test_support which is testingonly.
@ -2249,7 +2250,7 @@ if (is_mac) {
      sources += includes_linux +
                 gypi_paths2.cefsimple_sources_linux

-      if (use_x11) {
+      if (ozone_platform_x11) {
        libs = [
          "X11",
        ]
@ -2309,7 +2310,7 @@ if (is_mac) {
      sources += gypi_paths2.shared_sources_linux +
                 gypi_paths2.ceftests_sources_linux

-      if (use_x11) {
+      if (ozone_platform_x11) {
        libs = [
          "X11",
        ]
--- 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/97.0.4692.0'
+  'chromium_checkout': 'refs/tags/98.0.4758.0'
 }
--- a/include/base/cef_macros.h
+++ b/include/base/cef_macros.h
@ -34,7 +34,7 @@

 #if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/macros.h"
+#include "base/ignore_result.h"

 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
--- a/libcef/browser/alloy/alloy_browser_host_impl.cc
+++ b/libcef/browser/alloy/alloy_browser_host_impl.cc
@ -1123,8 +1123,8 @@ void AlloyBrowserHostImpl::AddNewContents(
 }

 void AlloyBrowserHostImpl::LoadingStateChanged(content::WebContents* source,
-                                               bool to_different_document) {
-  contents_delegate_->LoadingStateChanged(source, to_different_document);
+                                               bool should_show_loading_ui) {
+  contents_delegate_->LoadingStateChanged(source, should_show_loading_ui);
 }

 void AlloyBrowserHostImpl::CloseContents(content::WebContents* source) {
--- a/libcef/browser/alloy/alloy_browser_host_impl.h
+++ b/libcef/browser/alloy/alloy_browser_host_impl.h
@ -212,7 +212,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase,
                      bool user_gesture,
                      bool* was_blocked) override;
  void LoadingStateChanged(content::WebContents* source,
-                           bool to_different_document) override;
+                           bool should_show_loading_ui) override;
  void CloseContents(content::WebContents* source) override;
  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
  bool DidAddMessageToConsole(content::WebContents* source,
--- a/libcef/browser/alloy/alloy_browser_main.cc
+++ b/libcef/browser/alloy/alloy_browser_main.cc
@ -41,9 +41,12 @@
 #include "third_party/widevine/cdm/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"

-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(OS_LINUX)
+#include "ui/ozone/buildflags.h"
+#if defined(USE_AURA) && BUILDFLAG(OZONE_PLATFORM_X11)
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
+#endif

 #if defined(USE_AURA)
 #include "ui/aura/env.h"
@ -84,8 +87,8 @@
 #endif

 AlloyBrowserMainParts::AlloyBrowserMainParts(
-    const content::MainFunctionParams& parameters)
-    : BrowserMainParts(), devtools_delegate_(nullptr) {}
+    content::MainFunctionParams parameters)
+    : BrowserMainParts(), parameters_(std::move(parameters)) {}

 AlloyBrowserMainParts::~AlloyBrowserMainParts() {
  constrained_window::SetConstrainedWindowViewsClient(nullptr);
@ -120,9 +123,11 @@ void AlloyBrowserMainParts::ToolkitInitialized() {
 }

 void AlloyBrowserMainParts::PreCreateMainMessageLoop() {
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(OS_LINUX)
+#if defined(USE_AURA) && BUILDFLAG(OZONE_PLATFORM_X11)
  ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
+#endif

 #if defined(OS_WIN)
  // Initialize the OSCrypt.
--- a/libcef/browser/alloy/alloy_browser_main.h
+++ b/libcef/browser/alloy/alloy_browser_main.h
@ -13,10 +13,7 @@
 #include "build/build_config.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_main_parts.h"
-
-namespace content {
-struct MainFunctionParams;
-}
+#include "content/public/common/main_function_params.h"

 namespace extensions {
 class ExtensionsBrowserClient;
@ -45,7 +42,7 @@ class CefDevToolsDelegate;

 class AlloyBrowserMainParts : public content::BrowserMainParts {
 public:
-  explicit AlloyBrowserMainParts(const content::MainFunctionParams& parameters);
+  explicit AlloyBrowserMainParts(content::MainFunctionParams parameters);

  AlloyBrowserMainParts(const AlloyBrowserMainParts&) = delete;
  AlloyBrowserMainParts& operator=(const AlloyBrowserMainParts&) = delete;
@ -82,8 +79,10 @@ class AlloyBrowserMainParts : public content::BrowserMainParts {
  void PlatformInitialize();
 #endif  // defined(OS_WIN)

+  content::MainFunctionParams parameters_;
+
  CefRefPtr<CefRequestContextImpl> global_request_context_;
-  CefDevToolsDelegate* devtools_delegate_;  // Deletes itself.
+  CefDevToolsDelegate* devtools_delegate_ = nullptr;  // Deletes itself.

  std::unique_ptr<extensions::ExtensionsClient> extensions_client_;
  std::unique_ptr<extensions::ExtensionsBrowserClient>
--- a/libcef/browser/alloy/alloy_content_browser_client.cc
+++ b/libcef/browser/alloy/alloy_content_browser_client.cc
@ -46,8 +46,8 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/ignore_result.h"
 #include "base/json/json_reader.h"
-#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_restrictions.h"
@ -508,8 +508,8 @@ AlloyContentBrowserClient::~AlloyContentBrowserClient() = default;

 std::unique_ptr<content::BrowserMainParts>
 AlloyContentBrowserClient::CreateBrowserMainParts(
-    const content::MainFunctionParams& parameters) {
-  browser_main_parts_ = new AlloyBrowserMainParts(parameters);
+    content::MainFunctionParams parameters) {
+  browser_main_parts_ = new AlloyBrowserMainParts(std::move(parameters));
  return base::WrapUnique(browser_main_parts_);
 }

--- a/libcef/browser/alloy/alloy_content_browser_client.h
+++ b/libcef/browser/alloy/alloy_content_browser_client.h
@ -35,7 +35,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {

  // ContentBrowserClient implementation.
  std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) override;
+      content::MainFunctionParams parameters) override;
  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
  bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
                               const GURL& site_url) override;
--- a/libcef/browser/alloy/chrome_browser_process_alloy.cc
+++ b/libcef/browser/alloy/chrome_browser_process_alloy.cc
@ -142,11 +142,6 @@ ChromeBrowserProcessAlloy::network_quality_tracker() {
  return nullptr;
 }

-WatchDogThread* ChromeBrowserProcessAlloy::watchdog_thread() {
-  NOTREACHED();
-  return nullptr;
-}
-
 ProfileManager* ChromeBrowserProcessAlloy::profile_manager() {
  DCHECK(context_initialized_);
  return profile_manager_.get();
@ -347,7 +342,7 @@ ChromeBrowserProcessAlloy::component_updater() {
      component_updater::MakeChromeComponentUpdaterConfigurator(
          base::CommandLine::ForCurrentProcess(),
          g_browser_process->local_state()),
-      std::move(scheduler));
+      std::move(scheduler), /*brand=*/std::string());

  return component_updater_.get();
 }
--- a/libcef/browser/alloy/chrome_browser_process_alloy.h
+++ b/libcef/browser/alloy/chrome_browser_process_alloy.h
@ -52,7 +52,6 @@ class ChromeBrowserProcessAlloy : public BrowserProcess {
  metrics::MetricsService* metrics_service() override;
  SystemNetworkContextManager* system_network_context_manager() override;
  network::NetworkQualityTracker* network_quality_tracker() override;
-  WatchDogThread* watchdog_thread() override;
  ProfileManager* profile_manager() override;
  PrefService* local_state() override;
  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory()
--- a/libcef/browser/alloy/chrome_profile_alloy.cc
+++ b/libcef/browser/alloy/chrome_profile_alloy.cc
@ -108,10 +108,6 @@ const Profile* ChromeProfileAlloy::GetOriginalProfile() const {
  return this;
 }

-bool ChromeProfileAlloy::IsSupervised() const {
-  return false;
-}
-
 bool ChromeProfileAlloy::IsChild() const {
  return false;
 }
--- a/libcef/browser/alloy/chrome_profile_alloy.h
+++ b/libcef/browser/alloy/chrome_profile_alloy.h
@ -39,7 +39,6 @@ class ChromeProfileAlloy : public Profile {
  bool HasAnyOffTheRecordProfile() override;
  Profile* GetOriginalProfile() override;
  const Profile* GetOriginalProfile() const override;
-  bool IsSupervised() const override;
  bool IsChild() const override;
  ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
  bool IsSameOrParent(Profile* profile) override;
--- a/libcef/browser/browser_contents_delegate.cc
+++ b/libcef/browser/browser_contents_delegate.cc
@ -91,7 +91,7 @@ content::WebContents* CefBrowserContentsDelegate::OpenURLFromTab(

 void CefBrowserContentsDelegate::LoadingStateChanged(
    content::WebContents* source,
-    bool to_different_document) {
+    bool should_show_loading_ui) {
  const int current_index =
      source->GetController().GetLastCommittedEntryIndex();
  const int max_index = source->GetController().GetEntryCount() - 1;
--- a/libcef/browser/browser_contents_delegate.h
+++ b/libcef/browser/browser_contents_delegate.h
@ -88,7 +88,7 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate,
      content::WebContents* source,
      const content::OpenURLParams& params) override;
  void LoadingStateChanged(content::WebContents* source,
-                           bool to_different_document) override;
+                           bool should_show_loading_ui) override;
  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
  bool DidAddMessageToConsole(content::WebContents* source,
                              blink::mojom::ConsoleMessageLevel log_level,
--- a/libcef/browser/browser_host_base.cc
+++ b/libcef/browser/browser_host_base.cc
@ -13,8 +13,8 @@
 #include "libcef/common/frame_util.h"
 #include "libcef/common/net/url_util.h"

+#include "base/ignore_result.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "components/favicon/core/favicon_url.h"
--- a/libcef/browser/chrome/chrome_browser_delegate.cc
+++ b/libcef/browser/chrome/chrome_browser_delegate.cc
@ -144,9 +144,9 @@ content::WebContents* ChromeBrowserDelegate::OpenURLFromTab(
 }

 void ChromeBrowserDelegate::LoadingStateChanged(content::WebContents* source,
-                                                bool to_different_document) {
+                                                bool should_show_loading_ui) {
  if (auto delegate = GetDelegateForWebContents(source)) {
-    delegate->LoadingStateChanged(source, to_different_document);
+    delegate->LoadingStateChanged(source, should_show_loading_ui);
  }
 }

--- a/libcef/browser/chrome/chrome_browser_delegate.h
+++ b/libcef/browser/chrome/chrome_browser_delegate.h
@ -70,7 +70,7 @@ class ChromeBrowserDelegate : public cef::BrowserDelegate {
      content::WebContents* source,
      const content::OpenURLParams& params) override;
  void LoadingStateChanged(content::WebContents* source,
-                           bool to_different_document) override;
+                           bool should_show_loading_ui) override;
  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
  bool DidAddMessageToConsole(content::WebContents* source,
                              blink::mojom::ConsoleMessageLevel log_level,
--- a/libcef/browser/chrome/chrome_content_browser_client_cef.cc
+++ b/libcef/browser/chrome/chrome_content_browser_client_cef.cc
@ -24,7 +24,7 @@
 #include "libcef/common/command_line_impl.h"

 #include "base/command_line.h"
-#include "base/macros.h"
+#include "base/ignore_result.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/net/system_network_context_manager.h"
@ -69,9 +69,9 @@ ChromeContentBrowserClientCef::~ChromeContentBrowserClientCef() = default;

 std::unique_ptr<content::BrowserMainParts>
 ChromeContentBrowserClientCef::CreateBrowserMainParts(
-    const content::MainFunctionParams& parameters) {
+    content::MainFunctionParams parameters) {
  auto main_parts =
-      ChromeContentBrowserClient::CreateBrowserMainParts(parameters);
+      ChromeContentBrowserClient::CreateBrowserMainParts(std::move(parameters));
  browser_main_parts_ = new ChromeBrowserMainExtraPartsCef;
  static_cast<ChromeBrowserMainParts*>(main_parts.get())
      ->AddParts(
--- a/libcef/browser/chrome/chrome_content_browser_client_cef.h
+++ b/libcef/browser/chrome/chrome_content_browser_client_cef.h
@ -27,7 +27,7 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {

  // ChromeContentBrowserClient overrides.
  std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) override;
+      content::MainFunctionParams parameters) override;
  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                      int child_process_id) override;
  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
--- a/libcef/browser/download_manager_delegate.cc
+++ b/libcef/browser/download_manager_delegate.cc
@ -12,8 +12,8 @@

 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/ignore_result.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
--- a/libcef/browser/extensions/extension_view_host.cc
+++ b/libcef/browser/extensions/extension_view_host.cc
@ -7,9 +7,7 @@
 #include "libcef/browser/browser_platform_delegate.h"
 #include "libcef/browser/extensions/extension_host_delegate.h"

-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/browser/notification_types.h"
 #include "extensions/browser/process_util.h"
 #include "third_party/blink/public/common/input/web_gesture_event.h"

@ -47,9 +45,8 @@ void CefExtensionViewHost::LoadInitialURL() {
                                                     browser_context()) ==
      process_util::PersistentBackgroundPageState::kNotReady) {
    // Make sure the background page loads before any others.
-    registrar_.Add(this,
-                   extensions::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
-                   content::Source<Extension>(extension()));
+    host_registry_observation_.Observe(
+        ExtensionHostRegistry::Get(browser_context()));
    return;
  }

@ -80,14 +77,22 @@ WebContents* CefExtensionViewHost::GetVisibleWebContents() const {
  return nullptr;
 }

-void CefExtensionViewHost::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY);
+void CefExtensionViewHost::OnExtensionHostDocumentElementAvailable(
+    content::BrowserContext* host_browser_context,
+    ExtensionHost* extension_host) {
+  DCHECK(extension_host->extension());
+  if (host_browser_context != browser_context() ||
+      extension_host->extension() != extension() ||
+      extension_host->extension_host_type() !=
+          mojom::ViewType::kExtensionBackgroundPage) {
+    return;
+  }
+
  DCHECK_EQ(process_util::PersistentBackgroundPageState::kReady,
            process_util::GetPersistentBackgroundPageState(*extension(),
                                                           browser_context()));
+  // We only needed to wait for the background page to load, so stop observing.
+  host_registry_observation_.Reset();
  LoadInitialURL();
 }

--- a/libcef/browser/extensions/extension_view_host.h
+++ b/libcef/browser/extensions/extension_view_host.h
@ -7,9 +7,9 @@

 #include <memory>

-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "base/scoped_observation.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/extension_host_registry.h"

 class AlloyBrowserHostImpl;

@ -24,7 +24,7 @@ namespace extensions {
 // page. Object lifespan is managed by AlloyBrowserHostImpl. Based on
 // chrome/browser/extensions/extension_view_host.h.
 class CefExtensionViewHost : public ExtensionHost,
-                             public content::NotificationObserver {
+                             public ExtensionHostRegistry::Observer {
 public:
  CefExtensionViewHost(AlloyBrowserHostImpl* browser,
                       const Extension* extension,
@ -51,13 +51,15 @@ class CefExtensionViewHost : public ExtensionHost,
  // extensions::ExtensionFunctionDispatcher::Delegate methods:
  content::WebContents* GetVisibleWebContents() const override;

-  // content::NotificationObserver methods:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // ExtensionHostRegistry::Observer methods:
+  void OnExtensionHostDocumentElementAvailable(
+      content::BrowserContext* browser_context,
+      ExtensionHost* extension_host) override;

 private:
-  content::NotificationRegistrar registrar_;
+  base::ScopedObservation<ExtensionHostRegistry,
+                          ExtensionHostRegistry::Observer>
+      host_registry_observation_{this};
 };

 }  // namespace extensions
--- a/libcef/browser/main_runner.cc
+++ b/libcef/browser/main_runner.cc
@ -157,12 +157,13 @@ class CefUIThread : public base::PlatformThread::Delegate {
  }

  void InitializeBrowserRunner(
-      const content::MainFunctionParams& main_function_params) {
+      content::MainFunctionParams main_function_params) {
    // Use our own browser process runner.
    browser_runner_ = content::BrowserMainRunner::Create();

    // Initialize browser process state. Uses the current thread's message loop.
-    int exit_code = browser_runner_->Initialize(main_function_params);
+    int exit_code =
+        browser_runner_->Initialize(std::move(main_function_params));
    CHECK_EQ(exit_code, -1);
  }

@ -335,22 +336,23 @@ int CefMainRunner::RunAsHelperProcess(const CefMainArgs& args,
 #endif

  // Execute the secondary process.
-  content::ContentMainParams params(main_delegate->GetContentMainDelegate());
+  content::ContentMainParams main_params(
+      main_delegate->GetContentMainDelegate());
 #if defined(OS_WIN)
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
+  sandbox::SandboxInterfaceInfo sandbox_info = {nullptr};
  if (windows_sandbox_info == nullptr) {
    content::InitializeSandboxInfo(&sandbox_info);
    windows_sandbox_info = &sandbox_info;
  }

-  params.instance = args.instance;
-  params.sandbox_info =
+  main_params.instance = args.instance;
+  main_params.sandbox_info =
      static_cast<sandbox::SandboxInterfaceInfo*>(windows_sandbox_info);
 #else
-  params.argc = args.argc;
-  params.argv = const_cast<const char**>(args.argv);
+  main_params.argc = args.argc;
+  main_params.argv = const_cast<const char**>(args.argv);
 #endif
-  result = content::ContentMain(params);
+  result = content::ContentMain(std::move(main_params));

  main_delegate->AfterExecuteProcess();

@ -364,25 +366,26 @@ int CefMainRunner::ContentMainInitialize(const CefMainArgs& args,

  // Initialize the content runner.
  main_runner_ = content::ContentMainRunner::Create();
-  main_params_ = std::make_unique<content::ContentMainParams>(
+  content::ContentMainParams main_params(
      main_delegate_->GetContentMainDelegate());

 #if defined(OS_WIN)
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
+  sandbox::SandboxInterfaceInfo sandbox_info = {nullptr};
  if (windows_sandbox_info == nullptr) {
    windows_sandbox_info = &sandbox_info;
    *no_sandbox = true;
  }

-  main_params_->instance = args.instance;
-  main_params_->sandbox_info =
+  main_params.instance = args.instance;
+  main_params.sandbox_info =
      static_cast<sandbox::SandboxInterfaceInfo*>(windows_sandbox_info);
 #else
-  main_params_->argc = args.argc;
-  main_params_->argv = const_cast<const char**>(args.argv);
+  main_params.argc = args.argc;
+  main_params.argv = const_cast<const char**>(args.argv);
 #endif

-  return content::ContentMainInitialize(*main_params_, main_runner_.get());
+  return content::ContentMainInitialize(std::move(main_params),
+                                        main_runner_.get());
 }

 bool CefMainRunner::ContentMainRun(bool* initialized,
@ -396,8 +399,7 @@ bool CefMainRunner::ContentMainRun(bool* initialized,

    if (!CreateUIThread(base::BindOnce(
            [](CefMainRunner* runner, base::WaitableEvent* event) {
-              content::ContentMainRun(*runner->main_params_,
-                                      runner->main_runner_.get());
+              content::ContentMainRun(runner->main_runner_.get());
              event->Signal();
            },
            base::Unretained(this),
@ -411,7 +413,7 @@ bool CefMainRunner::ContentMainRun(bool* initialized,
    uithread_startup_event.Wait();
  } else {
    *initialized = true;
-    content::ContentMainRun(*main_params_, main_runner_.get());
+    content::ContentMainRun(main_runner_.get());
  }

  if (CEF_CURRENTLY_ON_UIT()) {
@ -433,7 +435,7 @@ void CefMainRunner::PreBrowserMain() {
 }

 int CefMainRunner::RunMainProcess(
-    const content::MainFunctionParams& main_function_params) {
+    content::MainFunctionParams main_function_params) {
  if (!multi_threaded_message_loop_) {
    // Use our own browser process runner.
    browser_runner_ = content::BrowserMainRunner::Create();
@ -441,13 +443,14 @@ int CefMainRunner::RunMainProcess(
    // Initialize browser process state. Results in a call to
    // AlloyBrowserMain::PreBrowserMain() which creates the UI message
    // loop.
-    int exit_code = browser_runner_->Initialize(main_function_params);
+    int exit_code =
+        browser_runner_->Initialize(std::move(main_function_params));
    if (exit_code >= 0)
      return exit_code;
  } else {
    // Running on the separate UI thread.
    DCHECK(ui_thread_);
-    ui_thread_->InitializeBrowserRunner(main_function_params);
+    ui_thread_->InitializeBrowserRunner(std::move(main_function_params));
  }

  return 0;
@ -504,9 +507,8 @@ void CefMainRunner::FinalizeShutdown(base::OnceClosure finalize_shutdown) {
  }

  // Shut down the content runner.
-  content::ContentMainShutdown(*main_params_, main_runner_.get());
+  content::ContentMainShutdown(main_runner_.get());

-  main_params_.reset();
  main_runner_.reset();

  std::move(finalize_shutdown).Run();
--- a/libcef/browser/main_runner.h
+++ b/libcef/browser/main_runner.h
@ -20,7 +20,6 @@ class WaitableEvent;

 namespace content {
 class ContentMainRunner;
-struct ContentMainParams;
 }  // namespace content

 class CefUIThread;
@ -64,8 +63,7 @@ class CefMainRunner : public CefMainRunnerHandler {

  // CefMainRunnerHandler methods:
  void PreBrowserMain() override;
-  int RunMainProcess(
-      const content::MainFunctionParams& main_function_params) override;
+  int RunMainProcess(content::MainFunctionParams main_function_params) override;

  // Create the UI thread when running with multi-threaded message loop mode.
  bool CreateUIThread(base::OnceClosure setup_callback);
@ -86,7 +84,6 @@ class CefMainRunner : public CefMainRunnerHandler {

  std::unique_ptr<CefMainRunnerDelegate> main_delegate_;
  std::unique_ptr<content::ContentMainRunner> main_runner_;
-  std::unique_ptr<content::ContentMainParams> main_params_;

  std::unique_ptr<content::BrowserMainRunner> browser_runner_;
  std::unique_ptr<CefUIThread> ui_thread_;
--- a/libcef/browser/menu_manager.cc
+++ b/libcef/browser/menu_manager.cc
@ -13,8 +13,8 @@
 #include "libcef/common/app_manager.h"

 #include "base/compiler_specific.h"
+#include "base/ignore_result.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "cef/grit/cef_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/render_frame_host.h"
--- a/libcef/browser/native/browser_platform_delegate_native_linux.cc
+++ b/libcef/browser/native/browser_platform_delegate_native_linux.cc
@ -23,7 +23,7 @@
 #include "ui/gfx/font_render_params.h"
 #include "ui/views/widget/widget.h"

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
 #include "libcef/browser/native/window_x11.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 #endif
@ -56,7 +56,7 @@ bool CefBrowserPlatformDelegateNativeLinux::CreateHostWindow() {
  gfx::Rect rect(window_info_.bounds.x, window_info_.bounds.y,
                 window_info_.bounds.width, window_info_.bounds.height);

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  DCHECK(!window_x11_);

  x11::Window parent_window = x11::Window::None;
@ -88,7 +88,7 @@ bool CefBrowserPlatformDelegateNativeLinux::CreateHostWindow() {
  window_widget_->Show();

  window_x11_->Show();
-#endif  // defined(USE_X11)
+#endif  // BUILDFLAG(OZONE_PLATFORM_X11)

  // As an additional requirement on Linux, we must set the colors for the
  // render widgets in webkit.
@ -116,7 +116,7 @@ bool CefBrowserPlatformDelegateNativeLinux::CreateHostWindow() {
 }

 void CefBrowserPlatformDelegateNativeLinux::CloseHostWindow() {
-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (window_x11_)
    window_x11_->Close();
 #endif
@ -143,14 +143,14 @@ void CefBrowserPlatformDelegateNativeLinux::SetFocus(bool setFocus) {
    web_contents_->Focus();
  }

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (window_x11_) {
    // Give native focus to the DesktopNativeWidgetAura for the root window.
    // Needs to be done via the ::Window so that keyboard focus is assigned
    // correctly.
    window_x11_->Focus();
  }
-#endif  // defined(USE_X11)
+#endif  // BUILDFLAG(OZONE_PLATFORM_X11)
 }

 void CefBrowserPlatformDelegateNativeLinux::NotifyMoveOrResizeStarted() {
@ -160,7 +160,7 @@ void CefBrowserPlatformDelegateNativeLinux::NotifyMoveOrResizeStarted() {
  if (!web_contents_)
    return;

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (!window_x11_)
    return;

@ -178,16 +178,16 @@ void CefBrowserPlatformDelegateNativeLinux::NotifyMoveOrResizeStarted() {
  content::RenderWidgetHostImpl::From(
      web_contents_->GetRenderViewHost()->GetWidget())
      ->SendScreenRects();
-#endif  // defined(USE_X11)
+#endif  // BUILDFLAG(OZONE_PLATFORM_X11)
 }

 void CefBrowserPlatformDelegateNativeLinux::SizeTo(int width, int height) {
-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (window_x11_) {
    window_x11_->SetBounds(
        gfx::Rect(window_x11_->bounds().origin(), gfx::Size(width, height)));
  }
-#endif  // defined(USE_X11)
+#endif  // BUILDFLAG(OZONE_PLATFORM_X11)
 }

 gfx::Point CefBrowserPlatformDelegateNativeLinux::GetScreenPoint(
@ -195,7 +195,7 @@ gfx::Point CefBrowserPlatformDelegateNativeLinux::GetScreenPoint(
  if (windowless_handler_)
    return windowless_handler_->GetParentScreenPoint(view);

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (!window_x11_)
    return view;

@ -205,7 +205,7 @@ gfx::Point CefBrowserPlatformDelegateNativeLinux::GetScreenPoint(
  const gfx::Rect& bounds_in_screen = window_x11_->GetBoundsInScreen();
  return gfx::Point(bounds_in_screen.x() + view.x(),
                    bounds_in_screen.y() + view.y());
-#else  // !defined(USE_X11)
+#else  // !BUILDFLAG(OZONE_PLATFORM_X11)
  return gfx::Point();
 #endif
 }
--- a/libcef/browser/native/browser_platform_delegate_native_linux.h
+++ b/libcef/browser/native/browser_platform_delegate_native_linux.h
@ -7,7 +7,9 @@

 #include "libcef/browser/native/browser_platform_delegate_native_aura.h"

-#if defined(USE_X11)
+#include "ui/ozone/buildflags.h"
+
+#if BUILDFLAG(OZONE_PLATFORM_X11)
 class CefWindowX11;
 #endif

@ -50,7 +52,7 @@ class CefBrowserPlatformDelegateNativeLinux
  // associated root window is destroyed.
  views::Widget* window_widget_;

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  CefWindowX11* window_x11_ = nullptr;
 #endif
 };
--- a/libcef/browser/native/cursor_util_linux.cc
+++ b/libcef/browser/native/cursor_util_linux.cc
@ -5,11 +5,12 @@
 #include "libcef/browser/native/cursor_util.h"

 #include "ui/base/cursor/cursor_factory.h"
+#include "ui/ozone/buildflags.h"

-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
 #include "ui/base/x/x11_cursor.h"
 #elif defined(USE_OZONE)
-#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
+#include "ui/ozone/common/bitmap_cursor.h"
 #endif

 namespace cursor_util {
@ -23,13 +24,13 @@ cef_cursor_handle_t GetPlatformCursor(ui::mojom::CursorType type) {
 }

 cef_cursor_handle_t ToCursorHandle(scoped_refptr<ui::PlatformCursor> cursor) {
-#if defined(USE_X11)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  // See https://crbug.com/1029142 for background.
  return static_cast<cef_cursor_handle_t>(
      ui::X11Cursor::FromPlatformCursor(cursor)->xcursor());
 #elif defined(USE_OZONE)
  return static_cast<cef_cursor_handle_t>(
-      ui::BitmapCursorOzone::FromPlatformCursor(cursor)->platform_data());
+      ui::BitmapCursor::FromPlatformCursor(cursor)->platform_data());
 #else
  return 0;
 #endif
--- a/libcef/browser/native/cursor_util_win.cc
+++ b/libcef/browser/native/cursor_util_win.cc
@ -9,7 +9,7 @@
 #include "libcef/common/app_manager.h"

 #include "ui/base/cursor/mojom/cursor_type.mojom.h"
-#include "ui/base/cursor/win/win_cursor.h"
+#include "ui/base/win/win_cursor.h"
 #include "ui/resources/grit/ui_unscaled_resources.h"

 namespace cursor_util {
--- a/libcef/browser/net_service/cookie_helper.cc
+++ b/libcef/browser/net_service/cookie_helper.cc
@ -85,13 +85,13 @@ void LoadCookiesOnUIThread(
    content::BrowserContext* browser_context,
    const GURL& url,
    const net::CookieOptions& options,
-    const net::CookiePartitionKeychain& cookie_partition_keychain,
+    net::CookiePartitionKeyCollection cookie_partition_key_collection,
    const AllowCookieCallback& allow_cookie_callback,
    DoneCookieCallback done_callback) {
  CEF_REQUIRE_UIT();
  GetCookieManager(browser_context)
      ->GetCookieList(
-          url, options, cookie_partition_keychain,
+          url, options, cookie_partition_key_collection,
          base::BindOnce(GetCookieListCallback, allow_cookie_callback,
                         std::move(done_callback)));
 }
@ -203,7 +203,8 @@ void LoadCookies(content::BrowserContext* browser_context,
  CEF_POST_TASK(
      CEF_UIT,
      base::BindOnce(LoadCookiesOnUIThread, browser_context, request.url,
-                     GetCookieOptions(request), net::CookiePartitionKeychain(),
+                     GetCookieOptions(request),
+                     net::CookiePartitionKeyCollection(),
                     allow_cookie_callback, std::move(done_callback)));
 }

--- a/libcef/browser/net_service/cookie_manager_impl.cc
+++ b/libcef/browser/net_service/cookie_manager_impl.cc
@ -257,7 +257,7 @@ bool CefCookieManagerImpl::VisitUrlCookiesInternal(
    return false;

  GetCookieManager(browser_context)
-      ->GetCookieList(url, options, net::CookiePartitionKeychain(),
+      ->GetCookieList(url, options, net::CookiePartitionKeyCollection(),
                      base::BindOnce(&GetCookiesCallbackImpl, visitor,
                                     browser_context_getter_));
  return true;
--- a/libcef/browser/net_service/proxy_url_loader_factory.cc
+++ b/libcef/browser/net_service/proxy_url_loader_factory.cc
@ -14,7 +14,7 @@

 #include "base/barrier_closure.h"
 #include "base/command_line.h"
-#include "base/macros.h"
+#include "base/ignore_result.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
 #include "content/public/browser/browser_context.h"
--- a/libcef/browser/osr/render_widget_host_view_osr.cc
+++ b/libcef/browser/osr/render_widget_host_view_osr.cc
@ -337,7 +337,8 @@ bool CefRenderWidgetHostViewOSR::IsSurfaceAvailableForCopy() {
             : false;
 }

-void CefRenderWidgetHostViewOSR::Show() {
+void CefRenderWidgetHostViewOSR::ShowWithVisibility(
+    content::PageVisibilityState) {
  if (is_showing_)
    return;

@ -851,6 +852,27 @@ viz::FrameSinkId CefRenderWidgetHostViewOSR::GetRootFrameSinkId() {
  return compositor_ ? compositor_->frame_sink_id() : viz::FrameSinkId();
 }

+void CefRenderWidgetHostViewOSR::NotifyHostAndDelegateOnWasShown(
+    blink::mojom::RecordContentToVisibleTimeRequestPtr visible_time_request) {
+  // We don't call RenderWidgetHostViewBase::OnShowWithPageVisibility, so this
+  // method should not be called.
+  NOTREACHED();
+}
+
+void CefRenderWidgetHostViewOSR::RequestPresentationTimeFromHostOrDelegate(
+    blink::mojom::RecordContentToVisibleTimeRequestPtr visible_time_request) {
+  // We don't call RenderWidgetHostViewBase::OnShowWithPageVisibility, so this
+  // method should not be called.
+  NOTREACHED();
+}
+
+void CefRenderWidgetHostViewOSR::
+    CancelPresentationTimeRequestForHostAndDelegate() {
+  // We don't call RenderWidgetHostViewBase::OnShowWithPageVisibility, so this
+  // method should not be called.
+  NOTREACHED();
+}
+
 std::unique_ptr<content::SyntheticGestureTarget>
 CefRenderWidgetHostViewOSR::CreateSyntheticGestureTarget() {
  return std::make_unique<CefSyntheticGestureTargetOSR>(host());
@ -910,7 +932,7 @@ void CefRenderWidgetHostViewOSR::OnRenderFrameMetadataChangedAfterActivation(
    video_consumer_->SizeChanged(metadata.viewport_size_in_pixels);
  }

-  gfx::Vector2dF root_scroll_offset;
+  gfx::PointF root_scroll_offset;
  if (metadata.root_scroll_offset) {
    root_scroll_offset = *metadata.root_scroll_offset;
  }
--- a/libcef/browser/osr/render_widget_host_view_osr.h
+++ b/libcef/browser/osr/render_widget_host_view_osr.h
@ -29,6 +29,7 @@
 #include "content/public/browser/render_frame_metadata_provider.h"
 #include "content/public/common/widget_type.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/blink/public/mojom/widget/record_content_to_visible_time_request.mojom-forward.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
 #include "ui/compositor/compositor.h"
@ -61,10 +62,6 @@ class CefSoftwareOutputDeviceOSR;
 class CefVideoConsumerOSR;
 class CefWebContentsViewOSR;

-#if defined(USE_X11)
-class CefWindowX11;
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // CefRenderWidgetHostViewOSR
 //
@ -116,7 +113,8 @@ class CefRenderWidgetHostViewOSR
  bool HasFocus() override;
  uint32_t GetCaptureSequenceNumber() const override;
  bool IsSurfaceAvailableForCopy() override;
-  void Show() override;
+  void ShowWithVisibility(
+      content::PageVisibilityState page_visibility) override;
  void Hide() override;
  bool IsShowing() override;
  void EnsureSurfaceSynchronizedForWebTest() override;
@ -189,6 +187,13 @@ class CefRenderWidgetHostViewOSR
  const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
  const viz::FrameSinkId& GetFrameSinkId() const override;
  viz::FrameSinkId GetRootFrameSinkId() override;
+  void NotifyHostAndDelegateOnWasShown(
+      blink::mojom::RecordContentToVisibleTimeRequestPtr visible_time_request)
+      override;
+  void RequestPresentationTimeFromHostOrDelegate(
+      blink::mojom::RecordContentToVisibleTimeRequestPtr visible_time_request)
+      override;
+  void CancelPresentationTimeRequestForHostAndDelegate() override;

  void OnFrameComplete(const viz::BeginFrameAck& ack);

@ -396,7 +401,7 @@ class CefRenderWidgetHostViewOSR
  bool pinch_zoom_enabled_;

  // The last scroll offset of the view.
-  gfx::Vector2dF last_scroll_offset_;
+  gfx::PointF last_scroll_offset_;
  bool is_scroll_offset_changed_pending_ = false;

  content::MouseWheelPhaseHandler mouse_wheel_phase_handler_;
--- a/libcef/browser/osr/video_consumer_osr.cc
+++ b/libcef/browser/osr/video_consumer_osr.cc
@ -30,8 +30,7 @@ class ScopedVideoFrameDone {

 CefVideoConsumerOSR::CefVideoConsumerOSR(CefRenderWidgetHostViewOSR* view)
    : view_(view), video_capturer_(view->CreateVideoCapturer()) {
-  video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
-                             gfx::ColorSpace::CreateREC709());
+  video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB);

  // Always use the highest resolution within constraints that doesn't exceed
  // the source size.
@ -46,7 +45,7 @@ CefVideoConsumerOSR::~CefVideoConsumerOSR() = default;

 void CefVideoConsumerOSR::SetActive(bool active) {
  if (active) {
-    video_capturer_->Start(this);
+    video_capturer_->Start(this, viz::mojom::BufferFormatPreference::kDefault);
  } else {
    video_capturer_->Stop();
  }
@ -81,17 +80,25 @@ void CefVideoConsumerOSR::RequestRefreshFrame(
 //   the rest of the frame having been letterboxed to adhere to resolution
 //   constraints.
 void CefVideoConsumerOSR::OnFrameCaptured(
-    base::ReadOnlySharedMemoryRegion data,
-    ::media::mojom::VideoFrameInfoPtr info,
+    media::mojom::VideoBufferHandlePtr data,
+    media::mojom::VideoFrameInfoPtr info,
    const gfx::Rect& content_rect,
    mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
        callbacks) {
  ScopedVideoFrameDone scoped_done(std::move(callbacks));

-  if (!data.IsValid())
-    return;
+  CHECK(data->is_read_only_shmem_region());
+  base::ReadOnlySharedMemoryRegion& shmem_region =
+      data->get_read_only_shmem_region();

-  base::ReadOnlySharedMemoryMapping mapping = data.Map();
+  // The |data| parameter is not nullable and mojo type mapping for
+  // `base::ReadOnlySharedMemoryRegion` defines that nullable version of it is
+  // the same type, with null check being equivalent to IsValid() check. Given
+  // the above, we should never be able to receive a read only shmem region that
+  // is not valid - mojo will enforce it for us.
+  DCHECK(shmem_region.IsValid());
+
+  base::ReadOnlySharedMemoryMapping mapping = shmem_region.Map();
  if (!mapping.IsValid()) {
    DLOG(ERROR) << "Shared memory mapping failed.";
    return;
--- a/libcef/browser/osr/video_consumer_osr.h
+++ b/libcef/browser/osr/video_consumer_osr.h
@ -25,8 +25,8 @@ class CefVideoConsumerOSR : public viz::mojom::FrameSinkVideoConsumer {
 private:
  // viz::mojom::FrameSinkVideoConsumer implementation.
  void OnFrameCaptured(
-      base::ReadOnlySharedMemoryRegion data,
-      ::media::mojom::VideoFrameInfoPtr info,
+      media::mojom::VideoBufferHandlePtr data,
+      media::mojom::VideoFrameInfoPtr info,
      const gfx::Rect& content_rect,
      mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
          callbacks) override;
--- a/libcef/browser/prefs/browser_prefs.cc
+++ b/libcef/browser/prefs/browser_prefs.cc
@ -20,14 +20,13 @@
 #include "base/task/thread_pool.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-#include "chrome/browser/component_updater/chrome_component_updater_configurator.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/media/router/media_router_feature.h"
-#include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/net/profile_network_context_service.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/plugins/plugin_info_host_impl.h"
+#include "chrome/browser/prefetch/prefetch_prefs.h"
 #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
 #include "chrome/browser/printing/print_preview_sticky_settings.h"
 #include "chrome/browser/profiles/profile.h"
@ -40,6 +39,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/certificate_transparency/pref_names.h"
+#include "components/component_updater/component_updater_service.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/flags_ui/pref_service_flags_storage.h"
@ -231,8 +231,7 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,
  update_client::RegisterPrefs(registry.get());

  if (!profile) {
-    component_updater::RegisterPrefsForChromeComponentUpdaterConfigurator(
-        registry.get());
+    component_updater::RegisterComponentUpdateServicePrefs(registry.get());
    SystemNetworkContextManager::RegisterPrefs(registry.get());
 #if defined(OS_WIN)
    OSCrypt::RegisterLocalPrefs(registry.get());
@ -264,12 +263,12 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,

    // Default profile preferences.
    AccessibilityUIMessageHandler::RegisterProfilePrefs(registry.get());
-    chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry.get());
    extensions::ExtensionPrefs::RegisterProfilePrefs(registry.get());
    HostContentSettingsMap::RegisterProfilePrefs(registry.get());
    language::LanguagePrefs::RegisterProfilePrefs(registry.get());
    media_router::RegisterProfilePrefs(registry.get());
    MediaDeviceIDSalt::RegisterProfilePrefs(registry.get());
+    prefetch::RegisterPredictionOptionsProfilePrefs(registry.get());
    ProfileNetworkContextService::RegisterProfilePrefs(registry.get());
    safe_browsing::RegisterProfilePrefs(registry.get());
    RegisterProfilePrefs(registry.get());
--- a/libcef/browser/prefs/renderer_prefs.cc
+++ b/libcef/browser/prefs/renderer_prefs.cc
@ -69,9 +69,6 @@ void SetChromePrefs(Profile* profile, blink::web_pref::WebPreferences& web) {
  FontFamilyCache::FillFontFamilyMap(profile,
                                     prefs::kWebKitFantasyFontFamilyMap,
                                     &web.fantasy_font_family_map);
-  FontFamilyCache::FillFontFamilyMap(profile,
-                                     prefs::kWebKitPictographFontFamilyMap,
-                                     &web.pictograph_font_family_map);

  web.default_font_size = prefs->GetInteger(prefs::kWebKitDefaultFontSize);
  web.default_fixed_font_size =
--- a/libcef/browser/views/window_view.cc
+++ b/libcef/browser/views/window_view.cc
@ -13,9 +13,12 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/native_frame_view.h"

-#if defined(OS_LINUX) && defined(USE_X11)
+#if defined(OS_LINUX)
+#include "ui/ozone/buildflags.h"
+#if BUILDFLAG(OZONE_PLATFORM_X11)
 #include "ui/base/x/x11_util.h"
 #endif
+#endif

 #if defined(OS_WIN)
 #include "ui/display/screen.h"
@ -343,13 +346,15 @@ void CefWindowView::CreateWidget() {
    DCHECK(widget->widget_delegate()->CanActivate());
  }

-#if defined(OS_LINUX) && defined(USE_X11)
+#if defined(OS_LINUX)
+#if BUILDFLAG(OZONE_PLATFORM_X11)
  if (is_frameless_) {
    auto window = view_util::GetWindowHandle(widget);
    DCHECK(window);
    ui::SetUseOSWindowFrame(static_cast<x11::Window>(window), false);
  }
-#endif  // defined(OS_LINUX) && defined(USE_X11)
+#endif
+#endif
 }

 CefRefPtr<CefWindow> CefWindowView::GetCefWindow() const {
--- a/libcef/common/alloy/alloy_main_delegate.cc
+++ b/libcef/common/alloy/alloy_main_delegate.cc
@ -17,7 +17,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/macros.h"
+#include "base/ignore_result.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@ -381,14 +381,14 @@ void AlloyMainDelegate::SandboxInitialized(const std::string& process_type) {
                                           chrome_pdf::PPP_ShutdownModule);
 }

-int AlloyMainDelegate::RunProcess(
+absl::variant<int, content::MainFunctionParams> AlloyMainDelegate::RunProcess(
    const std::string& process_type,
-    const content::MainFunctionParams& main_function_params) {
+    content::MainFunctionParams main_function_params) {
  if (process_type.empty()) {
-    return runner_->RunMainProcess(main_function_params);
+    return runner_->RunMainProcess(std::move(main_function_params));
  }

-  return -1;
+  return std::move(main_function_params);
 }

 void AlloyMainDelegate::ProcessExiting(const std::string& process_type) {
--- a/libcef/common/alloy/alloy_main_delegate.h
+++ b/libcef/common/alloy/alloy_main_delegate.h
@ -47,9 +47,9 @@ class AlloyMainDelegate : public content::ContentMainDelegate,
  bool BasicStartupComplete(int* exit_code) override;
  void PreSandboxStartup() override;
  void SandboxInitialized(const std::string& process_type) override;
-  int RunProcess(
+  absl::variant<int, content::MainFunctionParams> RunProcess(
      const std::string& process_type,
-      const content::MainFunctionParams& main_function_params) override;
+      content::MainFunctionParams main_function_params) override;
  void ProcessExiting(const std::string& process_type) override;
 #if defined(OS_LINUX)
  void ZygoteForked() override;
--- a/libcef/common/chrome/chrome_main_delegate_cef.cc
+++ b/libcef/common/chrome/chrome_main_delegate_cef.cc
@ -14,8 +14,8 @@
 #include "libcef/renderer/chrome/chrome_content_renderer_client_cef.h"

 #include "base/command_line.h"
+#include "base/ignore_result.h"
 #include "base/lazy_instance.h"
-#include "base/macros.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/embedder_support/switches.h"
 #include "content/public/common/content_switches.h"
@ -168,14 +168,16 @@ void ChromeMainDelegateCef::PreBrowserMain() {
  runner_->PreBrowserMain();
 }

-int ChromeMainDelegateCef::RunProcess(
+absl::variant<int, content::MainFunctionParams>
+ChromeMainDelegateCef::RunProcess(
    const std::string& process_type,
-    const content::MainFunctionParams& main_function_params) {
+    content::MainFunctionParams main_function_params) {
  if (process_type.empty()) {
-    return runner_->RunMainProcess(main_function_params);
+    return runner_->RunMainProcess(std::move(main_function_params));
  }

-  return ChromeMainDelegate::RunProcess(process_type, main_function_params);
+  return ChromeMainDelegate::RunProcess(process_type,
+                                        std::move(main_function_params));
 }

 #if defined(OS_LINUX)
--- a/libcef/common/chrome/chrome_main_delegate_cef.h
+++ b/libcef/common/chrome/chrome_main_delegate_cef.h
@ -39,9 +39,9 @@ class ChromeMainDelegateCef : public ChromeMainDelegate,
  bool BasicStartupComplete(int* exit_code) override;
  void PreSandboxStartup() override;
  void PreBrowserMain() override;
-  int RunProcess(
+  absl::variant<int, content::MainFunctionParams> RunProcess(
      const std::string& process_type,
-      const content::MainFunctionParams& main_function_params) override;
+      content::MainFunctionParams main_function_params) override;
 #if defined(OS_LINUX)
  void ZygoteForked() override;
 #endif
--- a/libcef/common/main_runner_handler.h
+++ b/libcef/common/main_runner_handler.h
@ -15,7 +15,7 @@ class CefMainRunnerHandler {
 public:
  virtual void PreBrowserMain() = 0;
  virtual int RunMainProcess(
-      const content::MainFunctionParams& main_function_params) = 0;
+      content::MainFunctionParams main_function_params) = 0;

 protected:
  virtual ~CefMainRunnerHandler() {}
--- a/libcef/common/time_impl.cc
+++ b/libcef/common/time_impl.cc
@ -4,7 +4,7 @@

 #include "libcef/common/time_util.h"

-#include "base/macros.h"
+#include "base/ignore_result.h"

 #if defined(OS_WIN)
 #include <limits>
--- a/libcef/renderer/alloy/url_loader_throttle_provider_impl.h
+++ b/libcef/renderer/alloy/url_loader_throttle_provider_impl.h
@ -19,6 +19,9 @@ class CefURLLoaderThrottleProviderImpl
  explicit CefURLLoaderThrottleProviderImpl(
      blink::URLLoaderThrottleProviderType type);

+  CefURLLoaderThrottleProviderImpl& operator=(
+      const CefURLLoaderThrottleProviderImpl&) = delete;
+
  ~CefURLLoaderThrottleProviderImpl() override;

  // blink::URLLoaderThrottleProvider implementation.
@ -37,8 +40,6 @@ class CefURLLoaderThrottleProviderImpl
  blink::URLLoaderThrottleProviderType type_;

  THREAD_CHECKER(thread_checker_);
-
-  DISALLOW_ASSIGN(CefURLLoaderThrottleProviderImpl);
 };

 #endif  // CEF_LIBCEF_RENDERER_ALLOY_URL_LOADER_THROTTLE_PROVIDER_IMPL_H_
--- a/libcef/renderer/blink_glue.cc
+++ b/libcef/renderer/blink_glue.cc
@ -17,7 +17,6 @@

 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_evaluation_result.h"
-#include "third_party/blink/renderer/bindings/core/v8/script_source_code.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/element.h"
@ -184,17 +183,13 @@ v8::Local<v8::Value> ExecuteV8ScriptAndReturnValue(
  if (!frame)
    return v8::Local<v8::Value>();

-  const blink::ScriptSourceCode ssc = blink::ScriptSourceCode(
-      source, blink::ScriptSourceLocationType::kInternal,
-      nullptr, /* cache_handler */
-      blink::KURL(source_url),
+  auto* script = blink::ClassicScript::Create(
+      source, blink::KURL(source_url), blink::KURL(source_url),
+      blink::ScriptFetchOptions(), blink::ScriptSourceLocationType::kInternal,
+      blink::SanitizeScriptErrors::kDoNotSanitize, /*cache_handler=*/nullptr,
      WTF::TextPosition(WTF::OrdinalNumber::FromOneBasedInt(start_line),
                        WTF::OrdinalNumber::FromZeroBasedInt(0)));

-  auto* script = blink::MakeGarbageCollected<blink::ClassicScript>(
-      ssc, ssc.Url(), blink::ScriptFetchOptions(),
-      blink::SanitizeScriptErrors::kDoNotSanitize);
-
  // The Rethrow() message is unused due to kDoNotSanitize but it still needs
  // to be non-nullopt for exceptions to be re-thrown as expected.
  auto result = blink::V8ScriptRunner::CompileAndRunScript(
--- a/libcef/renderer/frame_impl.cc
+++ b/libcef/renderer/frame_impl.cc
@ -488,12 +488,11 @@ void CefFrameImpl::SendJavaScript(const std::u16string& jsCode,
      __FUNCTION__,
      base::BindOnce(
          [](const std::u16string& jsCode, const std::string& scriptUrl,
-             int32_t startLine, blink::WebLocalFrame* frame) {
-            frame->ExecuteScript(
-                blink::WebScriptSource(blink::WebString::FromUTF16(jsCode),
-                                       GURL(scriptUrl), startLine));
+             blink::WebLocalFrame* frame) {
+            frame->ExecuteScript(blink::WebScriptSource(
+                blink::WebString::FromUTF16(jsCode), GURL(scriptUrl)));
          },
-          jsCode, scriptUrl, startLine));
+          jsCode, scriptUrl));
 }

 void CefFrameImpl::LoadRequest(cef::mojom::RequestParamsPtr params) {
--- a/libcef/renderer/render_manager.cc
+++ b/libcef/renderer/render_manager.cc
@ -28,7 +28,7 @@
 #include "libcef/renderer/v8_impl.h"

 #include "base/command_line.h"
-#include "base/macros.h"
+#include "base/ignore_result.h"
 #include "base/strings/string_number_conversions.h"
 #include "cef/libcef/common/mojom/cef.mojom.h"
 #include "content/public/common/content_switches.h"
--- a/patch/patches/base_sandbox_2743.patch
+++ b/patch/patches/base_sandbox_2743.patch
@ -1,8 +1,8 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index 7c1c51e1a468e..0ccb2cebd2832 100644
+index b534e4f3c02e9..0f162c348e2d9 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
-@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
+@@ -35,6 +35,7 @@ import("//build/config/ui.gni")
 import("//build/nocompile.gni")
 import("//build/timestamp.gni")
 import("//build_overrides/build.gni")
@ -10,7 +10,7 @@ index 7c1c51e1a468e..0ccb2cebd2832 100644
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
-@@ -1784,7 +1785,11 @@ component("base") {
+@@ -1823,7 +1824,11 @@ component("base") {
     "hash/md5_constexpr_internal.h",
     "hash/sha1.h",
   ]
@ -23,7 +23,7 @@ index 7c1c51e1a468e..0ccb2cebd2832 100644
     sources += [
       "hash/md5_nacl.cc",
       "hash/md5_nacl.h",
-@@ -2036,6 +2041,12 @@ component("base") {
+@@ -2072,6 +2077,12 @@ component("base") {
       defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
     }
 
--- a/patch/patches/browser_scheduler.patch
+++ b/patch/patches/browser_scheduler.patch
@ -1,8 +1,8 @@
 diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
-index 1b3d5cfdfc484..9ad7de56ca84f 100644
+index fdb236eb7df33..56e74f94e4494 100644
 --- content/browser/scheduler/browser_task_executor.cc
 +++ content/browser/scheduler/browser_task_executor.cc
-@@ -315,7 +315,7 @@ BrowserTaskExecutor::OnUserInputStart() {
+@@ -310,7 +310,7 @@ BrowserTaskExecutor::OnUserInputStart() {
 
 // static
 void BrowserTaskExecutor::Shutdown() {
--- a/patch/patches/browser_security_policy_1081397.patch
+++ b/patch/patches/browser_security_policy_1081397.patch
@ -1,8 +1,8 @@
 diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
-index 85a68f06ccc71..a57f47d70084b 100644
+index 2cf191150882d..81e7d98700fed 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
-@@ -1770,6 +1770,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
+@@ -1704,6 +1704,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
             // DeclarativeApiTest.PersistRules.
             if (actual_process_lock.matches_scheme(url::kDataScheme))
               return true;
@ -20,10 +20,10 @@ index 85a68f06ccc71..a57f47d70084b 100644
 
           // TODO(wjmaclean): We should update the ProcessLock comparison API
 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
-index 75c69841ae368..5f3f082c8775d 100644
+index 702428def0788..7056ce4e1c670 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
-@@ -5793,6 +5793,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
+@@ -5906,6 +5906,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
     network::mojom::WebSandboxFlags sandbox_flags) {
   // Calculate an approximation of the origin. The sandbox/csp are ignored.
   url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@ -36,7 +36,7 @@ index 75c69841ae368..5f3f082c8775d 100644
 
   // Apply sandbox flags.
   // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
-@@ -5826,6 +5832,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
+@@ -5939,6 +5945,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
   if (IsSameDocument() || IsPageActivation())
     return GetRenderFrameHost()->GetLastCommittedOrigin();
 
--- 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 bc3de06d0255b..ed84c1120d19d 100644
+index 8048ec5e84c96..c4bfe444dd08a 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -1765,8 +1765,6 @@ config("thin_archive") {
+@@ -1793,8 +1793,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 803485153c7fb..f334eccf6bd13 100644
+index 9a8b9fe835e74..9663c04f79f2e 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index 803485153c7fb..f334eccf6bd13 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/downgrade/buildflags.gni")
 import("//chrome/common/features.gni")
-@@ -1944,6 +1945,7 @@ static_library("browser") {
+@@ -1934,6 +1935,7 @@ static_library("browser") {
     "//build:os_buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//cc",
@ -18,7 +18,7 @@ index 803485153c7fb..f334eccf6bd13 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -2553,6 +2555,10 @@ static_library("browser") {
+@@ -2562,6 +2564,10 @@ static_library("browser") {
     deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
   }
 
--- a/patch/patches/chrome_browser_background_mode_1100085.patch
+++ b/patch/patches/chrome_browser_background_mode_1100085.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
-index f091754b8d814..7bf45f611e8ac 100644
+index 263369df25cae..40998f2de3ecc 100644
 --- chrome/browser/browser_process.h
 +++ chrome/browser/browser_process.h
-@@ -206,9 +206,9 @@ class BrowserProcess {
+@@ -201,9 +201,9 @@ class BrowserProcess {
   virtual DownloadStatusUpdater* download_status_updater() = 0;
   virtual DownloadRequestLimiter* download_request_limiter() = 0;
 
@ -14,10 +14,10 @@ index f091754b8d814..7bf45f611e8ac 100644
       std::unique_ptr<BackgroundModeManager> manager) = 0;
 #endif
 diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
-index 9a2c1534cb690..1f2eb75dd575a 100644
+index eeb32e6249290..fb4778a2936c8 100644
 --- chrome/browser/browser_process_impl.cc
 +++ chrome/browser/browser_process_impl.cc
-@@ -1006,18 +1006,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
+@@ -996,18 +996,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
   return download_request_limiter_.get();
 }
 
@ -38,10 +38,10 @@ index 9a2c1534cb690..1f2eb75dd575a 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 6f97b256d2227..bd8d318684cf7 100644
+index 9d28c95c4a3de..2c199baa80a1a 100644
 --- chrome/browser/browser_process_impl.h
 +++ chrome/browser/browser_process_impl.h
-@@ -184,8 +184,8 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -183,8 +183,8 @@ class BrowserProcessImpl : public BrowserProcess,
   void SetApplicationLocale(const std::string& actual_locale) override;
   DownloadStatusUpdater* download_status_updater() override;
   DownloadRequestLimiter* download_request_limiter() override;
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@ -13,10 +13,10 @@ index 9e534ff1683f1..de406f5879be0 100644
   return false;
 }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index 030680ad08612..2dc5a81b00618 100644
+index 8f6301f12fb2b..ff584e38b1874 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
-@@ -267,6 +267,20 @@
+@@ -264,6 +264,20 @@
 #include "components/captive_portal/content/captive_portal_tab_helper.h"
 #endif
 
@ -37,7 +37,7 @@ index 030680ad08612..2dc5a81b00618 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_browser_window_helper.h"
 #endif
-@@ -499,6 +513,13 @@ Browser::Browser(const CreateParams& params)
+@@ -500,6 +514,13 @@ Browser::Browser(const CreateParams& params)
 
   tab_strip_model_->AddObserver(this);
 
@ -51,7 +51,7 @@ index 030680ad08612..2dc5a81b00618 100644
   location_bar_model_ = std::make_unique<LocationBarModelImpl>(
       location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
 
-@@ -1321,6 +1342,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1322,6 +1343,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
   if (exclusive_access_manager_->HandleUserKeyEvent(event))
     return content::KeyboardEventProcessingResult::HANDLED;
 
@ -66,7 +66,7 @@ index 030680ad08612..2dc5a81b00618 100644
   return window()->PreHandleKeyboardEvent(event);
 }
 
-@@ -1328,8 +1357,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1329,8 +1358,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                   const NativeWebKeyboardEvent& event) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -87,7 +87,7 @@ index 030680ad08612..2dc5a81b00618 100644
 }
 
 bool Browser::TabsNeedBeforeUnloadFired() {
-@@ -1550,6 +1589,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
+@@ -1535,6 +1574,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
     return window->OpenURLFromTab(source, params);
   }
 
@ -102,7 +102,7 @@ index 030680ad08612..2dc5a81b00618 100644
   NavigateParams nav_params(this, params.url, params.transition);
   nav_params.FillNavigateParamsFromOpenURLParams(params);
   nav_params.source_contents = source;
-@@ -1649,6 +1696,15 @@ void Browser::AddNewContents(WebContents* source,
+@@ -1634,6 +1681,15 @@ void Browser::AddNewContents(WebContents* source,
                                                         source, disposition);
   }
 
@ -118,16 +118,16 @@ index 030680ad08612..2dc5a81b00618 100644
   chrome::AddWebContents(this, source, std::move(new_contents), target_url,
                          disposition, initial_rect);
 }
-@@ -1667,6 +1723,8 @@ void Browser::LoadingStateChanged(WebContents* source,
-                                   bool to_different_document) {
+@@ -1652,6 +1708,8 @@ void Browser::LoadingStateChanged(WebContents* source,
+                                   bool should_show_loading_ui) {
   ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
-   UpdateWindowForLoadingStateChanged(source, to_different_document);
+   UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
 +
-+  CALL_CEF_DELEGATE(LoadingStateChanged, source, to_different_document);
+  CALL_CEF_DELEGATE(LoadingStateChanged, source, should_show_loading_ui);
 }
 
 void Browser::CloseContents(WebContents* source) {
-@@ -1694,6 +1752,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
+@@ -1679,6 +1737,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
 }
 
 void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -136,7 +136,7 @@ index 030680ad08612..2dc5a81b00618 100644
   if (!GetStatusBubble())
     return;
 
-@@ -1701,6 +1761,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+@@ -1686,6 +1746,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
     GetStatusBubble()->SetURL(url);
 }
 
@ -154,7 +154,7 @@ index 030680ad08612..2dc5a81b00618 100644
 void Browser::ContentsMouseEvent(WebContents* source,
                                  bool motion,
                                  bool exited) {
-@@ -1817,6 +1888,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
+@@ -1802,6 +1873,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
 
   // Make the tab show up in the task manager.
   task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -165,7 +165,7 @@ index 030680ad08612..2dc5a81b00618 100644
 }
 
 void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
-@@ -1859,6 +1934,8 @@ void Browser::RendererResponsive(
+@@ -1846,6 +1921,8 @@ void Browser::RendererResponsive(
 void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
   if (web_contents == tab_strip_model_->GetActiveWebContents())
     UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@ -174,7 +174,7 @@ index 030680ad08612..2dc5a81b00618 100644
 }
 
 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
-@@ -1898,11 +1975,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -1892,11 +1969,15 @@ void Browser::EnterFullscreenModeForTab(
     const blink::mojom::FullscreenOptions& options) {
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
@ -190,7 +190,7 @@ index 030680ad08612..2dc5a81b00618 100644
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2745,6 +2826,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+@@ -2739,6 +2820,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
     content_translate_driver->RemoveTranslationObserver(this);
     BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
   }
@ -200,7 +200,7 @@ index 030680ad08612..2dc5a81b00618 100644
 
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index 0c31ee896f98e..2e24c282103ac 100644
+index 10e4e2021cb39..7b727fecc3a48 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@ -222,7 +222,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
 #if defined(OS_ANDROID)
 #error This file should only be included on desktop.
 #endif
-@@ -291,6 +296,11 @@ class Browser : public TabStripModelObserver,
+@@ -292,6 +297,11 @@ class Browser : public TabStripModelObserver,
     // maximizable.
     bool can_maximize = true;
 
@ -234,7 +234,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
    private:
     friend class Browser;
     friend class WindowSizerChromeOSTest;
-@@ -358,6 +368,13 @@ class Browser : public TabStripModelObserver,
+@@ -359,6 +369,13 @@ class Browser : public TabStripModelObserver,
     return creation_source_ == CreationSource::kSessionRestore;
   }
 
@ -248,7 +248,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
   // Accessors ////////////////////////////////////////////////////////////////
 
   const CreateParams& create_params() const { return create_params_; }
-@@ -431,6 +448,12 @@ class Browser : public TabStripModelObserver,
+@@ -432,6 +449,12 @@ class Browser : public TabStripModelObserver,
 
   base::WeakPtr<Browser> AsWeakPtr();
 
@ -261,7 +261,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
-@@ -798,6 +821,11 @@ class Browser : public TabStripModelObserver,
+@@ -796,6 +819,11 @@ class Browser : public TabStripModelObserver,
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -273,7 +273,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
   void ContentsMouseEvent(content::WebContents* source,
                           bool motion,
                           bool exited) override;
-@@ -1190,6 +1218,8 @@ class Browser : public TabStripModelObserver,
+@@ -1191,6 +1219,8 @@ class Browser : public TabStripModelObserver,
   const std::string initial_workspace_;
   bool initial_visible_on_all_workspaces_state_;
 
@ -282,7 +282,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
   CreationSource creation_source_ = CreationSource::kUnknown;
 
   UnloadController unload_controller_;
-@@ -1247,6 +1277,10 @@ class Browser : public TabStripModelObserver,
+@@ -1252,6 +1282,10 @@ class Browser : public TabStripModelObserver,
       extension_browser_window_helper_;
 #endif
 
@ -294,10 +294,10 @@ index 0c31ee896f98e..2e24c282103ac 100644
 
   // The following factory is used for chrome update coalescing.
 diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
-index fe7825b8253d3..1e0f20e653266 100644
+index 7086ea81b8504..6d81f99416b73 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
-@@ -451,6 +451,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
+@@ -452,6 +452,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
   std::unique_ptr<WebContents> target_contents =
       WebContents::Create(create_params);
 
--- a/patch/patches/chrome_browser_content_settings.patch
+++ b/patch/patches/chrome_browser_content_settings.patch
@ -56,10 +56,10 @@ index 22fdc95ba9c3f..2a0e3cc7f65c8 100644
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   SupervisedUserSettingsService* supervised_service =
 diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
-index c88d87dc4c5f0..5f6d19e50c304 100644
+index f0720efc9e90a..dafbe3e606326 100644
 --- components/content_settings/renderer/content_settings_agent_impl.cc
 +++ components/content_settings/renderer/content_settings_agent_impl.cc
-@@ -170,7 +170,7 @@ ContentSetting GetContentSettingFromRulesImpl(
+@@ -167,7 +167,7 @@ ContentSetting GetContentSettingFromRulesImpl(
       return rule.GetContentSetting();
     }
   }
--- 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 965687102de1a..e6588160367d6 100644
+index c1e556eb29076..280e50f8faafe 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -285,6 +285,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -286,6 +286,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
   return callback.get();
 }
 
@ -16,7 +16,7 @@ index 965687102de1a..e6588160367d6 100644
 enum class UmaEnumIdLookupType {
   GeneralEnumId,
   ContextSpecificEnumId,
-@@ -498,6 +505,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -499,6 +506,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
     return 1;
 
@ -27,7 +27,7 @@ index 965687102de1a..e6588160367d6 100644
   id = CollapseCommandsForUMA(id);
   const auto& map = GetIdcToUmaMap(type);
   auto it = map.find(id);
-@@ -680,6 +691,14 @@ RenderViewContextMenu::RenderViewContextMenu(
+@@ -693,6 +704,14 @@ RenderViewContextMenu::RenderViewContextMenu(
   system_app_ = GetBrowser() && GetBrowser()->app_controller()
                     ? GetBrowser()->app_controller()->system_app()
                     : nullptr;
@ -42,7 +42,7 @@ index 965687102de1a..e6588160367d6 100644
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() = default;
-@@ -1038,6 +1057,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1051,6 +1070,12 @@ void RenderViewContextMenu::InitMenu() {
   // menu, meaning that each menu item added/removed in this function will cause
   // it to visibly jump on the screen (see b/173569669).
   AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index 965687102de1a..e6588160367d6 100644
 }
 
 Profile* RenderViewContextMenu::GetProfile() const {
-@@ -2870,6 +2895,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
+@@ -2875,6 +2900,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
   execute_plugin_action_callback_ = std::move(cb);
 }
 
@ -65,14 +65,14 @@ index 965687102de1a..e6588160367d6 100644
 +  *GetMenuCreatedCallback() = cb;
 +}
 +
- ProtocolHandlerRegistry::ProtocolHandlerList
+ custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList
 RenderViewContextMenu::GetHandlersForLinkUrl() {
-   ProtocolHandlerRegistry::ProtocolHandlerList handlers =
+   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 1e776354a073d..dcbe1b14c4e75 100644
+index 7384ceed05f0e..3ded5bd48208f 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -124,6 +124,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
+@@ -126,6 +126,12 @@ class RenderViewContextMenu
       base::OnceCallback<void(content::RenderFrameHost*,
                               blink::mojom::PluginActionType)> cb);
 
@ -85,7 +85,7 @@ index 1e776354a073d..dcbe1b14c4e75 100644
  protected:
   Profile* GetProfile() const;
 
-@@ -326,6 +332,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
+@@ -329,6 +335,9 @@ class RenderViewContextMenu
   //   built.
   bool is_protocol_submenu_valid_ = false;
 
@ -96,10 +96,10 @@ index 1e776354a073d..dcbe1b14c4e75 100644
   // "Use enhanced spell check" items.
   std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
 diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
-index 413fbf44e4547..2cc82a103013e 100644
+index c3a9924cdb8da..58e66c1ca842a 100644
 --- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
 +++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
-@@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
+@@ -137,6 +137,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
 bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accel) const {
@ -132,7 +132,7 @@ index eb360c977683c..57d1d80b4dc83 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 bd36610e71183..a77e1cb2e4167 100644
+index 0dc1c3e553566..a4e7d7b91a89f 100644
 --- components/renderer_context_menu/render_view_context_menu_base.h
 +++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -86,6 +86,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
--- a/patch/patches/chrome_browser_extensions.patch
+++ b/patch/patches/chrome_browser_extensions.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
-index e3c5941a4ac67..6ae2b8fc39a0b 100644
+index 501b3500c8554..893665faa6c76 100644
 --- chrome/browser/extensions/api/chrome_extensions_api_client.cc
 +++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -14,6 +14,7 @@
@ -10,7 +10,7 @@ index e3c5941a4ac67..6ae2b8fc39a0b 100644
 #include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.h"
 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
 #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h"
-@@ -76,6 +77,10 @@
+@@ -75,6 +76,10 @@
 #include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h"
 #endif
 
@ -21,7 +21,7 @@ index e3c5941a4ac67..6ae2b8fc39a0b 100644
 #if BUILDFLAG(ENABLE_PDF)
 #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
 #include "components/pdf/browser/pdf_web_contents_helper.h"
-@@ -300,6 +305,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
+@@ -296,6 +301,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
 std::unique_ptr<MimeHandlerViewGuestDelegate>
 ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
     MimeHandlerViewGuest* guest) const {
--- a/patch/patches/chrome_browser_net_export.patch
+++ b/patch/patches/chrome_browser_net_export.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index 711454d213148..5a8a0d53c16f1 100644
+index cb8ecf2f81cb2..d3bdde2216222 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index 711454d213148..5a8a0d53c16f1 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//chromeos/assistant/assistant.gni")
-@@ -365,6 +366,10 @@ static_library("ui") {
+@@ -369,6 +370,10 @@ static_library("ui") {
     "//build/config/compiler:wexit_time_destructors",
   ]
 
@ -21,7 +21,7 @@ index 711454d213148..5a8a0d53c16f1 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
-@@ -387,6 +392,7 @@ static_library("ui") {
+@@ -391,6 +396,7 @@ static_library("ui") {
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//cc/paint",
@ -29,7 +29,7 @@ index 711454d213148..5a8a0d53c16f1 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -5066,6 +5072,7 @@ static_library("ui") {
+@@ -5181,6 +5187,7 @@ static_library("ui") {
   if (enable_basic_printing) {
     deps += [
       "//components/printing/browser",
@ -38,7 +38,7 @@ index 711454d213148..5a8a0d53c16f1 100644
     ]
   }
 diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
-index b75dec8d7d0ab..00eb11e9f937c 100644
+index ec205a3f05457..2af432bc6908a 100644
 --- chrome/browser/ui/webui/net_export_ui.cc
 +++ chrome/browser/ui/webui/net_export_ui.cc
@@ -22,6 +22,7 @@
@ -72,7 +72,7 @@ index b75dec8d7d0ab..00eb11e9f937c 100644
 +#endif
 +
   // Cached pointer to SystemNetworkContextManager's NetExportFileWriter.
-   net_log::NetExportFileWriter* file_writer_;
+   raw_ptr<net_log::NetExportFileWriter> file_writer_;
 
@@ -235,6 +247,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
   if (UsingMobileUI()) {
--- a/patch/patches/chrome_browser_profile_menu.patch
+++ b/patch/patches/chrome_browser_profile_menu.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
-index f235f69b4d940..2e5bbf4502117 100644
+index 58a47365168bb..f8910f44040c4 100644
 --- chrome/browser/profiles/profile_window.cc
 +++ chrome/browser/profiles/profile_window.cc
-@@ -272,7 +272,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
+@@ -271,7 +271,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
       *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
       return;
     case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
@ -14,10 +14,10 @@ index f235f69b4d940..2e5bbf4502117 100644
                               : profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
 diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
-index 38970b9869c05..35dd0be0030ed 100644
+index aff0b0d4c57d0..7b2c37b6ed9e3 100644
 --- chrome/browser/ui/views/profiles/incognito_menu_view.cc
 +++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
-@@ -38,7 +38,9 @@
+@@ -37,7 +37,9 @@
 IncognitoMenuView::IncognitoMenuView(views::Button* anchor_button,
                                      Browser* browser)
     : ProfileMenuViewBase(anchor_button, browser) {
@ -29,10 +29,10 @@ index 38970b9869c05..35dd0be0030ed 100644
 
   chrome::RecordDialogCreation(
 diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-index 2e51405eed232..47202c3caceeb 100644
+index fab7ddd1a2f89..b389929034d1f 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -512,7 +512,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
+@@ -513,7 +513,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
 
   ProfileMenuViewBase* bubble = nullptr;
   if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
--- a/patch/patches/chrome_browser_profiles.patch
+++ b/patch/patches/chrome_browser_profiles.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
-index 9022569bd6b32..06cb80bf601ef 100644
+index 059eb9b6d118e..86a37ba85a273 100644
 --- chrome/browser/profiles/off_the_record_profile_impl.cc
 +++ chrome/browser/profiles/off_the_record_profile_impl.cc
-@@ -620,7 +620,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
+@@ -616,7 +616,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
 #endif
   if (!profile)
     profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@ -14,10 +14,10 @@ index 9022569bd6b32..06cb80bf601ef 100644
 }
 
 diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
-index 77c15d82fb04e..791ee83161633 100644
+index a13f2fda30aac..be31fb170ee6b 100644
 --- chrome/browser/profiles/profile.cc
 +++ chrome/browser/profiles/profile.cc
-@@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
+@@ -84,6 +84,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
 
 namespace {
 
@ -25,7 +25,7 @@ index 77c15d82fb04e..791ee83161633 100644
 const char kDevToolsOTRProfileIDPrefix[] = "Devtools::BrowserContext";
 const char kMediaRouterOTRProfileIDPrefix[] = "MediaRouter::Presentation";
 const char kTestOTRProfileIDPrefix[] = "Test::OTR";
-@@ -97,6 +98,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
+@@ -98,6 +99,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
   // DevTools::BrowserContext and MediaRouter::Presentation are an
   // exception to this ban.
   return *this == PrimaryID() ||
@ -34,7 +34,7 @@ index 77c15d82fb04e..791ee83161633 100644
          base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix,
                           base::CompareCase::SENSITIVE) ||
          base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix,
-@@ -118,6 +121,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
+@@ -119,6 +122,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
       base::GUID::GenerateRandomV4().AsLowercaseString().c_str()));
 }
 
@ -52,7 +52,7 @@ index 77c15d82fb04e..791ee83161633 100644
 Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
   return CreateUnique(kDevToolsOTRProfileIDPrefix);
 diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
-index 1466666f50f4e..704fda78a1842 100644
+index 641a2444dd08a..be03f030d5ffe 100644
 --- chrome/browser/profiles/profile.h
 +++ chrome/browser/profiles/profile.h
@@ -98,6 +98,10 @@ class Profile : public content::BrowserContext {
@ -66,7 +66,7 @@ index 1466666f50f4e..704fda78a1842 100644
     // Creates a unique OTR profile id to be used for DevTools browser contexts.
     static OTRProfileID CreateUniqueForDevTools();
 
-@@ -483,6 +487,8 @@ class Profile : public content::BrowserContext {
+@@ -480,6 +484,8 @@ class Profile : public content::BrowserContext {
 
   virtual void RecordPrimaryMainFrameNavigation() = 0;
 
@ -75,7 +75,7 @@ index 1466666f50f4e..704fda78a1842 100644
  protected:
   // Creates an OffTheRecordProfile which points to this Profile.
   static std::unique_ptr<Profile> CreateOffTheRecordProfile(
-@@ -494,8 +500,6 @@ class Profile : public content::BrowserContext {
+@@ -491,8 +497,6 @@ class Profile : public content::BrowserContext {
   static PrefStore* CreateExtensionPrefStore(Profile*,
                                              bool incognito_pref_store);
 
@ -85,7 +85,7 @@ index 1466666f50f4e..704fda78a1842 100644
   virtual bool IsSignedIn() = 0;
 
 diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
-index 9d99f3fd9a703..93fade3dc13f0 100644
+index 98c0522cc5e9b..dcb28df56ef4f 100644
 --- chrome/browser/profiles/profile_impl.cc
 +++ chrome/browser/profiles/profile_impl.cc
@@ -994,7 +994,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@ -100,10 +100,10 @@ index 9d99f3fd9a703..93fade3dc13f0 100644
   return raw_otr_profile;
 }
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index 9263de5dec839..caab6922b8dcb 100644
+index feacaf4e4e6d7..116a93b90e2a5 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
-@@ -499,7 +499,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
+@@ -496,7 +496,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
                           base::Unretained(this)));
 #endif
 
@ -113,10 +113,10 @@ index 9263de5dec839..caab6922b8dcb 100644
 }
 
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index fca117d60623e..a3c29f0f9c0c2 100644
+index 35bc427430d76..2c79b8c174fd1 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
-@@ -123,7 +123,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -126,7 +126,7 @@ class ProfileManager : public Profile::Delegate {
   // acceptable. Returns null if creation of the new profile fails.
   // TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
   // make this method private.
@ -125,7 +125,7 @@ index fca117d60623e..a3c29f0f9c0c2 100644
 
   // Returns regular or off-the-record profile given its profile key.
   static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
-@@ -155,7 +155,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -158,7 +158,7 @@ class ProfileManager : public Profile::Delegate {
 
   // Returns true if the profile pointer is known to point to an existing
   // profile.
@ -135,7 +135,7 @@ index fca117d60623e..a3c29f0f9c0c2 100644
   // Returns the directory where the first created profile is stored,
   // relative to the user data directory currently in use.
 diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
-index 6602171b1c29b..f49d57df645fd 100644
+index 92ea233746f67..c4415290613e3 100644
 --- chrome/browser/profiles/renderer_updater.cc
 +++ chrome/browser/profiles/renderer_updater.cc
@@ -8,6 +8,7 @@
@ -154,7 +154,7 @@ index 6602171b1c29b..f49d57df645fd 100644
 +    identity_manager_ = nullptr;
 +  } else {
   identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
-   identity_manager_observation_.Observe(identity_manager_);
+   identity_manager_observation_.Observe(identity_manager_.get());
 +  }
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   oauth2_login_manager_ =
--- 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 05b55cf0f5a0b..1505fceabdcc6 100644
+index ebf319ae6be67..24a3c73c2d230 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
@@ -26,6 +26,7 @@ static_library("safe_browsing") {
--- a/patch/patches/chrome_browser_themes.patch
+++ b/patch/patches/chrome_browser_themes.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
-index 54bff316490a5..fa472b2c9cd61 100644
+index 68feae7de79d7..986fc1510b6f5 100644
 --- chrome/browser/themes/theme_service.cc
 +++ chrome/browser/themes/theme_service.cc
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
 #include "base/task/thread_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
@ -10,7 +10,7 @@ index 54bff316490a5..fa472b2c9cd61 100644
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
-@@ -62,6 +63,10 @@
+@@ -63,6 +64,10 @@
 #include "ui/base/layout.h"
 #include "ui/color/color_provider.h"
 
@ -21,7 +21,7 @@ index 54bff316490a5..fa472b2c9cd61 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "base/scoped_observation.h"
 #include "extensions/browser/extension_registry_observer.h"
-@@ -348,11 +353,19 @@ void ThemeService::Init() {
+@@ -349,11 +354,19 @@ void ThemeService::Init() {
   // OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
   // constructed in time to observe the corresponding events.
 #if BUILDFLAG(ENABLE_EXTENSIONS)
--- a/patch/patches/chrome_plugins.patch
+++ b/patch/patches/chrome_plugins.patch
@ -125,10 +125,10 @@ index 8c2547056ec26..2ab3252dca708 100644
   // that the X-Frame-Options protection mechanism is set to either DENY or
   // SAMEORIGIN.
 diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
-index 14c199c88ba6a..a4bb52c01c2f5 100644
+index 7c601387ea0ec..03b0f494dd7e9 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -947,6 +947,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -937,6 +937,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
 
     if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
          status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 14c199c88ba6a..a4bb52c01c2f5 100644
         content_settings_agent_delegate->IsPluginTemporarilyAllowed(
             identifier)) {
       status = chrome::mojom::PluginStatus::kAllowed;
-@@ -1148,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1138,7 +1139,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
         render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
             plugin_auth_host.BindNewEndpointAndPassReceiver());
         plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 14c199c88ba6a..a4bb52c01c2f5 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlocked: {
-@@ -1157,7 +1159,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1147,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
         placeholder->AllowLoading();
         RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -156,7 +156,7 @@ index 14c199c88ba6a..a4bb52c01c2f5 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -1167,7 +1170,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1157,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                        group_name));
         RenderThread::Get()->RecordAction(
             UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 14c199c88ba6a..a4bb52c01c2f5 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedNoLoading: {
-@@ -1175,7 +1179,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1165,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             IDR_BLOCKED_PLUGIN_HTML,
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
                                        group_name));
@ -176,11 +176,32 @@ index 14c199c88ba6a..a4bb52c01c2f5 100644
         break;
       }
     }
+diff --git content/browser/browser_plugin/browser_plugin_embedder.h content/browser/browser_plugin/browser_plugin_embedder.h
+index f2f7e4228f134..e724b36143238 100644
+--- content/browser/browser_plugin/browser_plugin_embedder.h
+++ content/browser/browser_plugin/browser_plugin_embedder.h
+@@ -15,6 +15,7 @@
+ #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_
+ 
+ #include "base/memory/raw_ptr.h"
+#include "content/common/content_export.h"
+ 
+ namespace content {
+ 
+@@ -26,7 +27,7 @@ struct NativeWebKeyboardEvent;
+ 
+ // TODO(wjmaclean): Get rid of "BrowserPlugin" in the name of this class.
+ // Perhaps "WebContentsEmbedderDelegate" would be better?
+-class BrowserPluginEmbedder {
+class CONTENT_EXPORT BrowserPluginEmbedder {
+  public:
+   BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
+   BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
 diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
-index 567d0f56294f8..1526e57fc0aeb 100644
+index 8b87024388168..86a22f66e1cba 100644
 --- content/browser/browser_plugin/browser_plugin_guest.h
 +++ content/browser/browser_plugin/browser_plugin_guest.h
-@@ -117,6 +117,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
+@@ -116,6 +116,8 @@ class BrowserPluginGuest : public GuestHost, public WebContentsObserver {
 
   gfx::Point GetScreenCoordinates(const gfx::Point& relative_position) const;
 
--- a/patch/patches/chrome_pref_watcher.patch
+++ b/patch/patches/chrome_pref_watcher.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h
-index 78d5b763970c2..de98bd0b325b1 100644
+index 8d9cc4fd0ba86..09af446a550db 100644
 --- chrome/browser/ui/prefs/pref_watcher.h
 +++ chrome/browser/ui/prefs/pref_watcher.h
-@@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService {
+@@ -30,10 +30,10 @@ class PrefWatcher : public KeyedService {
   void RegisterRendererPreferenceWatcher(
       mojo::PendingRemote<blink::mojom::RendererPreferenceWatcher> watcher);
 
--- 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 84b3ee712d563..daf84bffa9aae 100644
+index cb4edc603603b..f0b386eca2213 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -10,7 +10,7 @@ index 84b3ee712d563..daf84bffa9aae 100644
 import("//chrome/common/features.gni")
 import("//components/nacl/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
-@@ -149,6 +150,7 @@ static_library("renderer") {
+@@ -141,6 +142,7 @@ static_library("renderer") {
   deps = [
     "//base/allocator:buildflags",
     "//build:chromeos_buildflags",
@ -18,7 +18,7 @@ index 84b3ee712d563..daf84bffa9aae 100644
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
-@@ -242,6 +244,10 @@ static_library("renderer") {
+@@ -234,6 +236,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 50654aa1cecba..4e545d447109e 100644
+index cd9b3030c6f3a..1dfa03db19ca8 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
@@ -30,6 +30,7 @@
@ -10,7 +10,7 @@ index 50654aa1cecba..4e545d447109e 100644
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_resource_bundle_helper.h"
 #include "chrome/browser/defaults.h"
-@@ -388,6 +389,8 @@ struct MainFunction {
+@@ -389,6 +390,8 @@ struct MainFunction {
 
 // Initializes the user data dir. Must be called before InitializeLocalState().
 void InitializeUserDataDir(base::CommandLine* command_line) {
@ -19,7 +19,7 @@ index 50654aa1cecba..4e545d447109e 100644
 #if defined(OS_WIN)
   // Reach out to chrome_elf for the truth on the user data directory.
   // Note that in tests, this links to chrome_elf_test_stubs.
-@@ -714,7 +717,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
+@@ -720,7 +723,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
   }
 
 #if defined(OS_WIN)
@ -29,7 +29,7 @@ index 50654aa1cecba..4e545d447109e 100644
   base::sequence_manager::internal::ThreadControllerPowerMonitor::
       InitializeOnMainThread();
 #endif
-@@ -1012,6 +1017,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1018,6 +1023,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@ -37,7 +37,7 @@ index 50654aa1cecba..4e545d447109e 100644
   crash_reporter::InitializeCrashKeys();
 
 #if defined(OS_POSIX)
-@@ -1022,6 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1028,6 +1034,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitMacCrashReporter(command_line, process_type);
   SetUpInstallerPreferences(command_line);
 #endif
@ -45,7 +45,7 @@ index 50654aa1cecba..4e545d447109e 100644
 
 #if defined(OS_WIN)
   child_process_logging::Init();
-@@ -1148,6 +1155,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1154,6 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
         locale;
   }
 
@ -53,7 +53,7 @@ index 50654aa1cecba..4e545d447109e 100644
 #if defined(OS_POSIX) && !defined(OS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
-@@ -1180,6 +1188,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1186,6 +1194,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
   crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -61,7 +61,7 @@ index 50654aa1cecba..4e545d447109e 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybePatchGdiGetFontData();
-@@ -1278,6 +1287,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1284,6 +1293,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@ -69,7 +69,7 @@ index 50654aa1cecba..4e545d447109e 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 =
-@@ -1294,6 +1304,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1300,6 +1310,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -78,10 +78,10 @@ index 50654aa1cecba..4e545d447109e 100644
 
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index 98cc7f60b50f1..21d5ef9c23c7b 100644
+index a0e5e4fd7d01d..dc1fc12234d59 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
-@@ -50,6 +50,7 @@
+@@ -51,6 +51,7 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "cc/base/switches.h"
@ -89,19 +89,7 @@ index 98cc7f60b50f1..21d5ef9c23c7b 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/active_use_util.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -919,8 +920,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- #if !defined(OS_ANDROID)
-   // Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of
-   // its QuitClosure to the BrowserProcessImpl to call when it is time to exit.
-+  // CEF with the Chrome runtime will create and manage its own RunLoop.
-   DCHECK(!GetMainRunLoopInstance());
-  GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
-+  if (!cef::IsChromeRuntimeEnabled())
-+    GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
- 
-   // These members must be initialized before returning from this function.
-   // Android doesn't use StartupBrowserCreator.
-@@ -1692,11 +1695,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1700,11 +1701,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // This step is costly and is already measured in
   // Startup.StartupBrowserCreator_Start.
   // See the comment above for an explanation of |process_command_line|.
@ -117,8 +105,20 @@ index 98cc7f60b50f1..21d5ef9c23c7b 100644
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+@@ -1739,8 +1743,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+ 
+     // Create the RunLoop for MainMessageLoopRun() to use and transfer
+     // ownership of the browser's lifetime to the BrowserProcess.
+    // CEF with the Chrome runtime will create and manage its own RunLoop.
+     DCHECK(!GetMainRunLoopInstance());
+-    GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
+    if (!cef::IsChromeRuntimeEnabled())
+      GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
+     browser_process_->SetQuitClosure(
+         GetMainRunLoopInstance()->QuitWhenIdleClosure());
+   }
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index 95d1ebc190910..13cdfa52db108 100644
+index 97afd5b1ba753..40672e7c4fdf3 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644
 +#endif
 }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index c640ba0cc074e..0f099b6a88b40 100644
+index d0eaa02d9f955..ce5d9aaaf4509 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@ -167,7 +167,7 @@ index c640ba0cc074e..0f099b6a88b40 100644
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -3672,9 +3673,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -3695,9 +3696,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                           &search::HandleNewTabURLReverseRewrite);
 #endif  // defined(OS_ANDROID)
 
@ -179,7 +179,7 @@ index c640ba0cc074e..0f099b6a88b40 100644
 }
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
-@@ -5302,7 +5305,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
+@@ -5312,7 +5315,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
       network_service);
 }
 
@ -188,8 +188,8 @@ index c640ba0cc074e..0f099b6a88b40 100644
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -5320,6 +5323,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
-     network_context_params->user_agent = GetUserAgent();
+@@ -5330,6 +5333,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
+     network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
     network_context_params->accept_language = GetApplicationLocale();
   }
 +
@ -198,10 +198,10 @@ index c640ba0cc074e..0f099b6a88b40 100644
 
 std::vector<base::FilePath>
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index 99ab233c779f3..0813b9156c3b5 100644
+index ba04ad2b43f10..8a557d83b4339 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -545,7 +545,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       override;
   void OnNetworkServiceCreated(
       network::mojom::NetworkService* network_service) override;
@ -211,7 +211,7 @@ index 99ab233c779f3..0813b9156c3b5 100644
       bool in_memory,
       const base::FilePath& relative_partition_path,
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index a55c24300b40b..47369c7079e6f 100644
+index f2a12d0545a6d..44f49da8fd22e 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@ -222,7 +222,7 @@ index a55c24300b40b..47369c7079e6f 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -164,6 +165,10 @@
+@@ -163,6 +164,10 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
@ -233,7 +233,7 @@ index a55c24300b40b..47369c7079e6f 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -1214,6 +1219,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1203,6 +1208,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   SessionDataService::RegisterProfilePrefs(registry);
 #endif
 
--- a/patch/patches/chrome_runtime_views.patch
+++ b/patch/patches/chrome_runtime_views.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
-index 4571235afb4fa..af507323d9097 100644
+index 408fcb87b6bf3..4efc0e48dcb5a 100644
 --- chrome/browser/ui/browser_command_controller.cc
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -369,8 +369,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -368,8 +368,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
   // CommandUpdaterDelegate and CommandUpdater declare this function so we
   // choose to not implement CommandUpdaterDelegate inside this class and
   // therefore command_updater_ doesn't have the delegate set).
@ -14,7 +14,7 @@ index 4571235afb4fa..af507323d9097 100644
 
   // No commands are enabled if there is not yet any selected tab.
   // TODO(pkasting): It seems like we should not need this, because either
-@@ -980,11 +982,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
+@@ -979,11 +981,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
 // BrowserCommandController, private:
 
 bool BrowserCommandController::IsShowingMainUI() {
@ -115,10 +115,10 @@ index 28cb0acd5a55d..f22ac22d04245 100644
     // or not we always use the dark ui instance.
     if (base::FeatureList::IsEnabled(
 diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
-index d32af8b258530..b883d7204ecec 100644
+index 6a1e9abbc66aa..aa9e3ebe2599c 100644
 --- chrome/browser/ui/views/frame/browser_frame.h
 +++ chrome/browser/ui/views/frame/browser_frame.h
-@@ -54,7 +54,9 @@ enum class TabDragKind {
+@@ -53,7 +53,9 @@ enum class TabDragKind {
 // This is a virtual interface that allows system specific browser frames.
 class BrowserFrame : public views::Widget, public views::ContextMenuController {
  public:
@ -129,10 +129,10 @@ index d32af8b258530..b883d7204ecec 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 2fd995c53c6c7..ab53c371ff540 100644
+index 3c6fcbebb84bb..db469505c4ab2 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -290,11 +290,10 @@ using content::WebContents;
+@@ -291,11 +291,10 @@ using content::WebContents;
 using views::ColumnSet;
 using web_modal::WebContentsModalDialogHost;
 
@ -147,7 +147,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // UMA histograms that record animation smoothness for tab loading animation.
-@@ -676,11 +675,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
+@@ -677,11 +676,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
@ -171,7 +171,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
   SetShowIcon(::ShouldShowWindowIcon(browser_.get()));
 
   // In forced app mode, all size controls are always disabled. Otherwise, use
-@@ -694,7 +704,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -695,7 +705,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   }
 
   browser_->tab_strip_model()->AddObserver(this);
@ -179,7 +179,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
 
   // Top container holds tab strip region and toolbar and lives at the front of
   // the view hierarchy.
-@@ -740,8 +749,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -741,8 +750,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
       devtools_web_view_, contents_web_view_));
 
@ -193,11 +193,11 @@ index 2fd995c53c6c7..ab53c371ff540 100644
 +    // Update state that depends on the above flag.
 +    browser_->command_controller()->FullscreenStateChanged();
 +  }
-+  top_container_->AddChildView(base::WrapUnique(toolbar_));
+  top_container_->AddChildView(base::WrapUnique(toolbar_.get()));
 
   contents_separator_ =
       top_container_->AddChildView(std::make_unique<ContentsSeparator>());
-@@ -1603,6 +1619,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
+@@ -1579,6 +1595,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
   if (immersive_mode_controller_->IsEnabled())
     return false;
 
@ -206,7 +206,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
   return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
 }
 
-@@ -2741,7 +2759,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
+@@ -2725,7 +2743,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
 }
 
 void BrowserView::ReparentTopContainerForEndOfImmersive() {
@ -216,7 +216,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
   top_container()->DestroyLayer();
   AddChildViewAt(top_container(), 0);
   EnsureFocusOrder();
-@@ -3200,8 +3219,10 @@ void BrowserView::Layout() {
+@@ -3214,8 +3233,10 @@ void BrowserView::Layout() {
 
   // TODO(jamescook): Why was this in the middle of layout code?
   toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -229,7 +229,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
 
   // Some of the situations when the BrowserView is laid out are:
   // - Enter/exit immersive fullscreen mode.
-@@ -3264,6 +3285,11 @@ void BrowserView::AddedToWidget() {
+@@ -3278,6 +3299,11 @@ void BrowserView::AddedToWidget() {
   SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
 #endif
 
@ -241,7 +241,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
   toolbar_->Init();
 
   // TODO(pbos): Manage this either inside SidePanel or the corresponding button
-@@ -3313,13 +3339,9 @@ void BrowserView::AddedToWidget() {
+@@ -3330,13 +3356,9 @@ void BrowserView::AddedToWidget() {
 
   EnsureFocusOrder();
 
@ -258,7 +258,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644
 
   MaybeInitializeWebUITabStrip();
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index 9c99d9de95f54..91933cf820fe8 100644
+index 6eea8b4b899e2..4dc56c94baa3f 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
@ -278,9 +278,9 @@ index 9c99d9de95f54..91933cf820fe8 100644
   void set_frame(BrowserFrame* frame) { frame_ = frame; }
   BrowserFrame* frame() const { return frame_; }
 
-@@ -698,6 +703,12 @@ class BrowserView : public BrowserWindow,
-     return accessibility_focus_highlight_.get();
-   }
+@@ -705,6 +710,12 @@ class BrowserView : public BrowserWindow,
+       const std::map<std::string, std::string>& extra_data) override;
+ #endif
 
 + protected:
 +  virtual ToolbarView* OverrideCreateToolbar(Browser* browser,
@ -292,10 +292,10 @@ index 9c99d9de95f54..91933cf820fe8 100644
   // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
   // interface to keep these two classes decoupled and testable.
 diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
-index c8b67cf98846a..bad018719d95b 100644
+index 1d22e4b057c6c..d73b547f09e0b 100644
 --- chrome/browser/ui/views/frame/browser_view_layout.cc
 +++ chrome/browser/ui/views/frame/browser_view_layout.cc
-@@ -39,6 +39,10 @@
+@@ -40,6 +40,10 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
@ -306,7 +306,7 @@ index c8b67cf98846a..bad018719d95b 100644
 using views::View;
 using web_modal::WebContentsModalDialogHost;
 using web_modal::ModalDialogHostObserver;
-@@ -457,6 +461,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
+@@ -458,6 +462,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
 
 int BrowserViewLayout::LayoutToolbar(int top) {
   TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar");
@ -319,10 +319,10 @@ index c8b67cf98846a..bad018719d95b 100644
   bool toolbar_visible = delegate_->IsToolbarVisible();
   int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
 diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-index 745f4e89e5775..234d6dfed0c26 100644
+index 504c0b746006d..f0952bad35e91 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-@@ -558,37 +558,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
+@@ -559,37 +559,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
 }
 
 bool BrowserTabStripController::IsFrameCondensed() const {
@ -377,7 +377,7 @@ index 745f4e89e5775..234d6dfed0c26 100644
 }
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index f9688138a7e87..03835b5e28506 100644
+index d11554470129d..e854e476c297b 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -167,12 +167,13 @@ auto& GetViewCommandMap() {
@ -406,10 +406,10 @@ index f9688138a7e87..03835b5e28506 100644
   size_animation_.Reset(1);
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
-index 1da8e4f42dc99..3c86aad64f014 100644
+index 8b929587548ec..835a665380277 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.h
 +++ chrome/browser/ui/views/toolbar/toolbar_view.h
-@@ -91,7 +91,8 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -92,7 +92,8 @@ class ToolbarView : public views::AccessiblePaneView,
                 // needs to be displayed.
   };
 
--- a/patch/patches/component_build.patch
+++ b/patch/patches/component_build.patch
@ -1,8 +1,8 @@
 diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
-index b1c7f6ed1b779..60b9cf0a9479f 100644
+index fdfb95294c3c5..e7d6aab0c673e 100644
 --- content/browser/devtools/devtools_instrumentation.h
 +++ content/browser/devtools/devtools_instrumentation.h
-@@ -95,7 +95,7 @@ bool ApplyUserAgentMetadataOverrides(
+@@ -96,7 +96,7 @@ bool ApplyUserAgentMetadataOverrides(
     FrameTreeNode* frame_tree_node,
     absl::optional<blink::UserAgentMetadata>* override_out);
 
@ -11,12 +11,33 @@ index b1c7f6ed1b779..60b9cf0a9479f 100644
     RenderFrameHostImpl* rfh,
     bool is_navigation,
     bool is_download,
+diff --git content/browser/renderer_host/input/mouse_wheel_phase_handler.h content/browser/renderer_host/input/mouse_wheel_phase_handler.h
+index 5206955ca2609..3ae147e0edf58 100644
+--- content/browser/renderer_host/input/mouse_wheel_phase_handler.h
+++ content/browser/renderer_host/input/mouse_wheel_phase_handler.h
+@@ -8,6 +8,7 @@
+ #include "base/memory/raw_ptr.h"
+ #include "base/timer/timer.h"
+ #include "content/browser/renderer_host/render_widget_host_delegate.h"
+#include "content/common/content_export.h"
+ #include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
+ #include "third_party/blink/public/mojom/input/input_event_result.mojom-shared.h"
+ 
+@@ -50,7 +51,7 @@ enum class FirstScrollUpdateAckState {
+ // The MouseWheelPhaseHandler is responsible for adding the proper phase to
+ // wheel events. Phase information is necessary for wheel scrolling since it
+ // shows the start and end of a scrolling sequence.
+-class MouseWheelPhaseHandler {
+class CONTENT_EXPORT MouseWheelPhaseHandler {
+  public:
+   MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view);
+ 
 diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
-index 1f05fa3562f48..2295e442f590a 100644
+index 3f0f719a192db..5fb3754cced7e 100644
 --- content/browser/renderer_host/input/synthetic_gesture_target_base.h
 +++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
@@ -9,6 +9,7 @@
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 +#include "content/common/content_export.h"
@ -47,18 +68,18 @@ index 57072bf1263ae..0a93446e4d21c 100644
 blink::mojom::V8CacheOptions GetV8CacheOptions();
 
 diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
-index c4d5cb83938e1..954c1c213e4a8 100644
+index b54d43016f306..b26a292893de8 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
-@@ -33,6 +33,7 @@ component("controller") {
+@@ -32,6 +32,7 @@ component("controller") {
+ 
   configs += [
-     "//build/config/compiler:noshadowing",
     "//build/config/compiler:wexit_time_destructors",
 +    "//cef/libcef/features:config",
     "//third_party/blink/renderer:config",
     "//third_party/blink/renderer:inside_blink",
     "//third_party/blink/renderer:non_test_config",
-@@ -58,6 +59,8 @@ component("controller") {
+@@ -57,6 +58,8 @@ component("controller") {
     "performance_manager/v8_detailed_memory_reporter_impl.h",
     "performance_manager/v8_worker_memory_reporter.cc",
     "performance_manager/v8_worker_memory_reporter.h",
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@ -1,8 +1,8 @@
 diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
-index 687de58ebbf49..b2588b21b2462 100644
+index 3c2d16c7135d8..5dc02effff2ca 100644
 --- content/browser/devtools/devtools_http_handler.cc
 +++ content/browser/devtools/devtools_http_handler.cc
-@@ -575,7 +575,7 @@ void DevToolsHttpHandler::OnJsonRequest(
+@@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest(
     version.SetString("Protocol-Version",
                       DevToolsAgentHost::GetProtocolVersion());
     version.SetString("WebKit-Version", GetWebKitVersion());
@ -12,10 +12,10 @@ index 687de58ebbf49..b2588b21b2462 100644
                       GetContentClient()->browser()->GetUserAgent());
     version.SetString("V8-Version", V8_VERSION_STRING);
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index 20748b3098d8b..f6a7e94f8d0af 100644
+index 6ed02d4244d45..68dff171001c7 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
-@@ -660,6 +660,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
+@@ -672,6 +672,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
           resource_request_->has_user_gesture, initiating_origin,
           &loader_factory);
 
@ -30,7 +30,7 @@ index 20748b3098d8b..f6a7e94f8d0af 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 85f0857a66fd6..00ff3cb1cfaec 100644
+index b8b933d0160db..d450ef6ff5cc2 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@ -42,7 +42,7 @@ index 85f0857a66fd6..00ff3cb1cfaec 100644
 
 #include <utility>
 
-@@ -867,7 +867,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
+@@ -876,7 +876,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
 void ContentBrowserClient::OnNetworkServiceCreated(
     network::mojom::NetworkService* network_service) {}
 
@ -51,16 +51,16 @@ index 85f0857a66fd6..00ff3cb1cfaec 100644
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -876,6 +876,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
+@@ -885,6 +885,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
         cert_verifier_creation_params) {
-   network_context_params->user_agent = GetUserAgent();
+   network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
   network_context_params->accept_language = "en-us,en";
 +  return true;
 }
 
 std::vector<base::FilePath>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index ec5a3515a248f..637e4edfc2738 100644
+index 4a3bbba844366..f5795c3ae1ce4 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
@@ -33,6 +33,7 @@
@ -69,9 +69,9 @@ index ec5a3515a248f..637e4edfc2738 100644
 #include "content/public/browser/storage_partition_config.h"
 +#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_browser_interface_broker_registry.h"
+ #include "content/public/common/main_function_params.h"
 #include "content/public/common/page_visibility_state.h"
- #include "content/public/common/window_container_type.mojom-forward.h"
-@@ -1619,7 +1620,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1632,7 +1633,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.
@ -80,7 +80,7 @@ index ec5a3515a248f..637e4edfc2738 100644
       BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
-@@ -1803,6 +1804,15 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1816,6 +1817,15 @@ class CONTENT_EXPORT ContentBrowserClient {
       const absl::optional<url::Origin>& initiating_origin,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
 
@ -96,7 +96,7 @@ index ec5a3515a248f..637e4edfc2738 100644
   // Creates an OverlayWindow to be used for Picture-in-Picture. This window
   // will house the content shown when in Picture-in-Picture mode. This will
   // return a new OverlayWindow.
-@@ -1880,6 +1890,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1893,6 +1903,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Used as part of the user agent string.
   virtual std::string GetProduct();
 
@ -104,14 +104,14 @@ index ec5a3515a248f..637e4edfc2738 100644
 +  // purposes with external tools like Selenium.
 +  virtual std::string GetChromeProduct() { return GetProduct(); }
 +
-   // Returns the user agent.Content may cache this value.
+   // Returns the user agent. This can also return the reduced user agent, based
+   // on blink::features::kUserAgentReduction. Content may cache this value.
   virtual std::string GetUserAgent();
- 
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index 0b098038d2f56..bd85dbf2727c1 100644
+index 4352aada84d7f..94c5ae19f9297 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
-@@ -86,6 +86,9 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -87,6 +87,9 @@ class CONTENT_EXPORT ContentRendererClient {
   // binding requests from RenderProcessHost::BindReceiver().
   virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
 
@ -121,7 +121,7 @@ index 0b098038d2f56..bd85dbf2727c1 100644
   // Notifies that a new RenderFrame has been created.
   virtual void RenderFrameCreated(RenderFrame* render_frame) {}
 
-@@ -297,6 +300,10 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -298,6 +301,10 @@ class CONTENT_EXPORT ContentRendererClient {
   // This method may invalidate the frame.
   virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
 
@ -133,10 +133,10 @@ index 0b098038d2f56..bd85dbf2727c1 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 4f7ea9bd9117e..3e325c0514de0 100644
+index e59425121af67..bf5c890e1c184 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -663,6 +663,8 @@ void RenderThreadImpl::Init() {
+@@ -639,6 +639,8 @@ void RenderThreadImpl::Init() {
       GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
           blink::URLLoaderThrottleProviderType::kFrame);
 
@ -146,10 +146,10 @@ index 4f7ea9bd9117e..3e325c0514de0 100644
       &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
 
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 6616ad76bc307..95524ec98ce5c 100644
+index df9f357a597c7..34241332a3614 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -1086,6 +1086,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
+@@ -1083,6 +1083,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
 
 //------------------------------------------------------------------------------
 
@ -166,12 +166,12 @@ index 6616ad76bc307..95524ec98ce5c 100644
 RendererBlinkPlatformImpl::GetCodeCacheHost() {
   base::AutoLock lock(code_cache_host_lock_);
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index 745204f21d304..87b7767fcba68 100644
+index cba574c571ded..715e59464ade7 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -262,6 +262,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
-       const blink::WebURL& url,
+@@ -260,6 +260,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
+   base::PlatformThreadId GetIOThreadId() const override;
 
 +  void DevToolsAgentAttached() override;
 +  void DevToolsAgentDetached() override;
--- a/patch/patches/content_main_654986.patch
+++ b/patch/patches/content_main_654986.patch
@ -1,19 +1,17 @@
 diff --git content/app/content_main.cc content/app/content_main.cc
-index a26c5c2e053ed..c88c4c1b81f9b 100644
+index 5ad6c026e9d05..1277d9c959c31 100644
 --- content/app/content_main.cc
 +++ content/app/content_main.cc
-@@ -216,18 +216,10 @@ void InitializeMojo(mojo::core::Configuration* config) {
- 
- }  // namespace
+@@ -224,16 +224,10 @@ ContentMainParams::~ContentMainParams() = default;
+ ContentMainParams::ContentMainParams(ContentMainParams&&) = default;
+ ContentMainParams& ContentMainParams::operator=(ContentMainParams&&) = default;
 
 -// This function must be marked with NO_STACK_PROTECTOR or it may crash on
 -// return, see the --change-stack-guard-on-fork command line flag.
 -int NO_STACK_PROTECTOR
-RunContentProcess(const ContentMainParams& params,
+-RunContentProcess(ContentMainParams params,
 -                  ContentMainRunner* content_main_runner) {
-  ContentMainParams content_main_params(params);
-
-+int ContentMainInitialize(ContentMainParams& params,
+int ContentMainInitialize(ContentMainParams params,
 +                          ContentMainRunner* content_main_runner) {
   int exit_code = -1;
   base::debug::GlobalActivityTracker* tracker = nullptr;
@ -23,7 +21,7 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 
   // A flag to indicate whether Main() has been called before. On Android, we
   // may re-run Main() without restarting the browser process. This flag
-@@ -309,12 +301,6 @@ RunContentProcess(const ContentMainParams& params,
+@@ -317,12 +311,6 @@ RunContentProcess(ContentMainParams params,
 #endif
 
 #if defined(OS_MAC)
@ -32,24 +30,15 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 -    // Each "main" needs to flush this pool right before it goes into its main
 -    // event loop to get rid of the cruft.
 -    autorelease_pool = std::make_unique<base::mac::ScopedNSAutoreleasePool>();
-    content_main_params.autorelease_pool = autorelease_pool.get();
+-    params.autorelease_pool = autorelease_pool.get();
     InitializeMac();
 #endif
 
-@@ -328,7 +314,7 @@ RunContentProcess(const ContentMainParams& params,
- 
-     ui::RegisterPathProvider();
-     tracker = base::debug::GlobalActivityTracker::Get();
-    exit_code = content_main_runner->Initialize(content_main_params);
-+    exit_code = content_main_runner->Initialize(params);
- 
-     if (exit_code >= 0) {
-       if (tracker) {
-@@ -387,8 +373,19 @@ RunContentProcess(const ContentMainParams& params,
+@@ -395,8 +383,18 @@ RunContentProcess(ContentMainParams params,
 
   if (IsSubprocess())
     CommonSubprocessInit();
-  exit_code = content_main_runner->Run(params.minimal_browser_mode);
+-  exit_code = content_main_runner->Run();
 
 +  return exit_code;
 +}
@ -57,16 +46,15 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 +// This function must be marked with NO_STACK_PROTECTOR or it may crash on
 +// return, see the --change-stack-guard-on-fork command line flag.
 +int NO_STACK_PROTECTOR
-+ContentMainRun(ContentMainParams& params,
-+               ContentMainRunner* content_main_runner) {
-+  int exit_code = content_main_runner->Run(params.minimal_browser_mode);
+ContentMainRun(ContentMainRunner* content_main_runner) {
+  int exit_code = content_main_runner->Run();
 +
 +  base::debug::GlobalActivityTracker* tracker =
 +      base::debug::GlobalActivityTracker::Get();
   if (tracker) {
     if (exit_code == 0) {
       tracker->SetProcessPhaseIfEnabled(
-@@ -400,20 +397,51 @@ RunContentProcess(const ContentMainParams& params,
+@@ -408,14 +406,41 @@ RunContentProcess(ContentMainParams params,
     }
   }
 
@ -76,10 +64,7 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 +  return exit_code;
 +}
 
-+// This function must be marked with NO_STACK_PROTECTOR or it may crash on
-+// return, see the --change-stack-guard-on-fork command line flag.
-+void ContentMainShutdown(ContentMainParams& params,
-+                         ContentMainRunner* content_main_runner) {
+void ContentMainShutdown(ContentMainRunner* content_main_runner) {
 #if !defined(OS_ANDROID)
   content_main_runner->Shutdown();
 #endif
@ -88,7 +73,7 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 +// This function must be marked with NO_STACK_PROTECTOR or it may crash on
 +// return, see the --change-stack-guard-on-fork command line flag.
 +int NO_STACK_PROTECTOR
-+RunContentProcess(ContentMainParams& params,
+RunContentProcess(ContentMainParams params,
 +                  ContentMainRunner* content_main_runner) {
 +#if defined(OS_MAC)
 +  // We need this pool for all the objects created before we get to the event
@ -100,30 +85,22 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644
 +  params.autorelease_pool = autorelease_pool.get();
 +#endif
 +
-+  int exit_code = ContentMainInitialize(params, content_main_runner);
+  int exit_code = ContentMainInitialize(std::move(params), content_main_runner);
 +  if (exit_code >= 0)
 +    return exit_code;
-+  exit_code = ContentMainRun(params, content_main_runner);
+  exit_code = ContentMainRun(content_main_runner);
 +
 +#if defined(OS_MAC)
 +  params.autorelease_pool = nullptr;
 +  autorelease_pool.reset();
 +#endif
-+
-+  ContentMainShutdown(params, content_main_runner);
 
+  ContentMainShutdown(content_main_runner);
   return exit_code;
 }
 
- // This function must be marked with NO_STACK_PROTECTOR or it may crash on
- // return, see the --change-stack-guard-on-fork command line flag.
-int NO_STACK_PROTECTOR ContentMain(const ContentMainParams& params) {
-+int NO_STACK_PROTECTOR ContentMain(ContentMainParams& params) {
-   auto runner = ContentMainRunner::Create();
-   return RunContentProcess(params, runner.get());
- }
 diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
-index 6b59da3a0d069..4db71e0402eef 100644
+index 9b3e3ca0cf6c9..b973e494e7fca 100644
 --- content/app/content_main_runner_impl.cc
 +++ content/app/content_main_runner_impl.cc
@@ -45,6 +45,7 @@
@ -134,7 +111,7 @@ index 6b59da3a0d069..4db71e0402eef 100644
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-@@ -1167,6 +1168,11 @@ void ContentMainRunnerImpl::Shutdown() {
+@@ -1190,6 +1191,11 @@ void ContentMainRunnerImpl::Shutdown() {
   is_shutdown_ = true;
 }
 
@ -147,26 +124,26 @@ index 6b59da3a0d069..4db71e0402eef 100644
 std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() {
   return ContentMainRunnerImpl::Create();
 diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
-index 4bf0a0b27192a..73784107fc682 100644
+index 07404dfc2af12..f2ff3f14120e4 100644
 --- content/app/content_main_runner_impl.h
 +++ content/app/content_main_runner_impl.h
-@@ -39,7 +39,7 @@ class ContentMainDelegate;
+@@ -31,7 +31,7 @@ namespace content {
+ class ContentClient;
 class MojoIpcSupport;
- struct ContentMainParams;
 
 -class ContentMainRunnerImpl : public ContentMainRunner {
 +class CONTENT_EXPORT ContentMainRunnerImpl : public ContentMainRunner {
  public:
   static std::unique_ptr<ContentMainRunnerImpl> Create();
 
-@@ -57,6 +57,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
-   int Run(bool start_minimal_browser) override;
+@@ -50,6 +50,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
+   int Run() override;
   void Shutdown() override;
 
 +  void ShutdownOnUIThread();
 +
  private:
-   int RunBrowser(MainFunctionParams& main_function_params,
+   int RunBrowser(MainFunctionParams main_function_params,
                  bool start_minimal_browser);
 diff --git content/common/set_process_title.cc content/common/set_process_title.cc
 index 8b829a4887739..a69a088697287 100644
@ -182,33 +159,20 @@ index 8b829a4887739..a69a088697287 100644
   if (main_argv)
     setproctitle_init(main_argv);
 diff --git content/public/app/content_main.h content/public/app/content_main.h
-index 97aac3d0c7584..fc795ae0287f9 100644
+index f86051cf640ae..de4fa65c05bdf 100644
 --- content/public/app/content_main.h
 +++ content/public/app/content_main.h
-@@ -68,7 +68,16 @@ struct ContentMainParams {
- #endif
+@@ -93,6 +93,13 @@ struct CONTENT_EXPORT ContentMainParams {
+   }
 };
 
-CONTENT_EXPORT int RunContentProcess(const ContentMainParams& params,
 +// Split RunContentProcess() into separate stages.
 +CONTENT_EXPORT int ContentMainInitialize(
-+    ContentMainParams& params,
+    ContentMainParams params,
 +    ContentMainRunner* content_main_runner);
-+CONTENT_EXPORT int ContentMainRun(ContentMainParams& params,
-+                                  ContentMainRunner* content_main_runner);
-+CONTENT_EXPORT void ContentMainShutdown(ContentMainParams& params,
-+                                        ContentMainRunner* content_main_runner);
+CONTENT_EXPORT int ContentMainRun(ContentMainRunner* content_main_runner);
+CONTENT_EXPORT void ContentMainShutdown(ContentMainRunner* content_main_runner);
 +
-+CONTENT_EXPORT int RunContentProcess(ContentMainParams& params,
+ CONTENT_EXPORT int RunContentProcess(ContentMainParams params,
                                      ContentMainRunner* content_main_runner);
 
- #if defined(OS_ANDROID)
-@@ -91,7 +100,7 @@ ContentMainDelegate* GetContentMainDelegate();
- // initial setup for every process. The embedder has a chance to customize
- // startup using the ContentMainDelegate interface. The embedder can also pass
- // in null for |delegate| if they don't want to override default startup.
-CONTENT_EXPORT int ContentMain(const ContentMainParams& params);
-+CONTENT_EXPORT int ContentMain(ContentMainParams& params);
- #endif
- 
- }  // namespace content
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@ -1,5 +1,5 @@
 diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
-index 9b08e23e921b0..49182504ae361 100644
+index 3fe0b9b74ae0a..38987ce169308 100644
 --- chrome/chrome_elf/BUILD.gn
 +++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@
@ -121,10 +121,10 @@ index 68ddd337e4dfa..687e869afd5c7 100644
 
 void SetActiveExtensions(const std::set<std::string>& extensions) {
 diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
-index bcf172e645a23..f879aa745adfc 100644
+index e2d53ac83dde0..6ac76e407a748 100644
 --- chrome/common/crash_keys.h
 +++ chrome/common/crash_keys.h
-@@ -17,6 +17,10 @@ class CommandLine;
+@@ -16,6 +16,10 @@ class CommandLine;
 
 namespace crash_keys {
 
@ -136,7 +136,7 @@ index bcf172e645a23..f879aa745adfc 100644
 // on the given |command_line|.
 void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
 diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
-index 93d05b949c26c..9d307988b6713 100644
+index ec5b5b9b4da3b..b18daaa090059 100644
 --- components/crash/core/app/breakpad_linux.cc
 +++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
@ -145,8 +145,8 @@ index 93d05b949c26c..9d307988b6713 100644
 #include "base/debug/dump_without_crashing.h"
 +#include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
+ #include "base/ignore_result.h"
 #include "base/lazy_instance.h"
- #include "base/linux_util.h"
@@ -721,7 +722,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
   info.process_type_length = 7;
   info.distro = base::g_linux_distro;
@ -366,10 +366,10 @@ index 39557cce47443..236806090021a 100644
 
 }  // namespace crash_reporter
 diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
-index 40648c1166d8e..3270c3816b120 100644
+index ea9ec2be09943..0c7ba2af97c0f 100644
 --- components/crash/core/app/crashpad.cc
 +++ components/crash/core/app/crashpad.cc
-@@ -155,7 +155,8 @@ bool InitializeCrashpadImpl(bool initial_client,
+@@ -154,7 +154,8 @@ bool InitializeCrashpadImpl(bool initial_client,
   // fallback. Forwarding is turned off for debug-mode builds even for the
   // browser process, because the system's crash reporter can take a very long
   // time to chew on symbols.
--- a/patch/patches/crashpad_tp_1995.patch
+++ b/patch/patches/crashpad_tp_1995.patch
@ -146,7 +146,7 @@ index d17f357ed458c..4740bb776125d 100644
   struct Data;
 
 diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
-index f66da69a4cedb..01c6d05fdb446 100644
+index 0fe4760db7fe2..042af7247712c 100644
 --- third_party/crashpad/crashpad/handler/BUILD.gn
 +++ third_party/crashpad/crashpad/handler/BUILD.gn
@@ -12,6 +12,7 @@
@ -184,10 +184,10 @@ index f66da69a4cedb..01c6d05fdb446 100644
 
   if (crashpad_is_win) {
 diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
-index 60f172b6c8017..f3fac02aac2e4 100644
+index 3872e1142f002..16a58f5af6a5a 100644
 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
 +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
-@@ -264,6 +264,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
+@@ -261,6 +261,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
   if (minidump_process_snapshot.Initialize(reader)) {
     parameters =
         BreakpadHTTPFormParametersFromMinidump(&minidump_process_snapshot);
@ -197,7 +197,7 @@ index 60f172b6c8017..f3fac02aac2e4 100644
 
   if (!reader->SeekSet(start_offset)) {
 diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
-index 1a88a087b5357..5688d7f46c9d9 100644
+index 7649ae0db45d8..4b2d2f9667b5e 100644
 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
 +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -15,6 +15,7 @@
@ -207,8 +207,8 @@ index 1a88a087b5357..5688d7f46c9d9 100644
 +#include <map>
 #include <memory>
 #include <string>
- 
-@@ -106,7 +107,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
+ #include <unordered_map>
+@@ -107,7 +108,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //! It is expected to only be called from the same thread that called Start().
   void Stop() override;
 
@ -217,7 +217,7 @@ index 1a88a087b5357..5688d7f46c9d9 100644
   //! \brief The result code from UploadReport().
   enum class UploadResult {
     //! \brief The crash report was uploaded successfully.
-@@ -134,7 +135,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
+@@ -135,7 +136,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //! object was constructed with \a watch_pending_reports, it will also scan
   //! the crash report database for other pending reports, and process those as
   //! well.
@ -226,7 +226,7 @@ index 1a88a087b5357..5688d7f46c9d9 100644
 
   //! \brief Processes a single pending report from the database.
   //!
-@@ -148,7 +149,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
+@@ -149,7 +150,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //! remain in the “pending” state. If the upload fails and no more retries are
   //! desired, or report upload is disabled, it will be marked as “completed” in
   //! the database without ever having been uploaded.
@ -235,7 +235,7 @@ index 1a88a087b5357..5688d7f46c9d9 100644
 
   //! \brief Attempts to upload a crash report.
   //!
-@@ -165,6 +166,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
+@@ -166,6 +167,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   UploadResult UploadReport(const CrashReportDatabase::UploadReport* report,
                             std::string* response_body);
 
--- a/patch/patches/embedder_product_override.patch
+++ b/patch/patches/embedder_product_override.patch
@ -1,8 +1,8 @@
 diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
-index 79ea44500f6e7..f1c4da868f12e 100644
+index 1876f324468dc..f22b44017b38a 100644
 --- components/embedder_support/user_agent_utils.cc
 +++ components/embedder_support/user_agent_utils.cc
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
 #include "base/version.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
@ -10,16 +10,16 @@ index 79ea44500f6e7..f1c4da868f12e 100644
 #include "components/embedder_support/switches.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/prefs/pref_service.h"
-@@ -189,6 +190,12 @@ const blink::UserAgentBrandList& GetBrandVersionList(
- }  // namespace
+@@ -234,6 +235,12 @@ const blink::UserAgentBrandList& GetBrandFullVersionList(
+ }
 
- std::string GetProduct() {
+ std::string GetProduct(const bool allow_version_override) {
 +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 +  if (command_line->HasSwitch(switches::kUserAgentProductAndVersion)) {
 +    return command_line->GetSwitchValueASCII(
 +        switches::kUserAgentProductAndVersion);
 +  }
 +
-   if (base::FeatureList::IsEnabled(
+   if (allow_version_override &&
+       base::FeatureList::IsEnabled(
           blink::features::kForceMajorVersion100InUserAgent))
-     return "Chrome/" + GetM100VersionNumber();
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@ -60,10 +60,10 @@ index 5c903a13a14ed..c85964a7bab17 100644
   std::unique_ptr<StreamContainer> stream_container(
       new StreamContainer(tab_id, embedded, handler_url, extension_id,
 diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
-index 790ee41f5be0d..adcc503b592f3 100644
+index 3e827fcf45ae4..e1790599da17b 100644
 --- extensions/browser/extension_host.cc
 +++ extensions/browser/extension_host.cc
-@@ -62,11 +62,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
+@@ -60,11 +60,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
   DCHECK(host_type == mojom::ViewType::kExtensionBackgroundPage ||
          host_type == mojom::ViewType::kExtensionDialog ||
          host_type == mojom::ViewType::kExtensionPopup);
@ -79,7 +79,7 @@ index 790ee41f5be0d..adcc503b592f3 100644
   main_frame_host_ = host_contents_->GetMainFrame();
 
   // Listen for when an extension is unloaded from the same profile, as it may
-@@ -81,6 +82,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
+@@ -79,6 +80,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
   ExtensionHostRegistry::Get(browser_context_)->ExtensionHostCreated(this);
 }
 
@ -125,7 +125,7 @@ index 790ee41f5be0d..adcc503b592f3 100644
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
 
 diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
-index 9a479775963fc..e3e24dca23594 100644
+index f88183071e861..a05302a7a2f0b 100644
 --- extensions/browser/extension_host.h
 +++ extensions/browser/extension_host.h
@@ -53,6 +53,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@ -151,7 +151,7 @@ index 9a479775963fc..e3e24dca23594 100644
   content::RenderProcessHost* render_process_host() const;
   bool has_loaded_once() const { return has_loaded_once_; }
@@ -189,7 +195,8 @@ class ExtensionHost : public DeferredStartRenderHost,
-   content::BrowserContext* browser_context_;
+   raw_ptr<content::BrowserContext> browser_context_;
 
   // The host for our HTML content.
 -  std::unique_ptr<content::WebContents> host_contents_;
@ -161,7 +161,7 @@ index 9a479775963fc..e3e24dca23594 100644
   // A pointer to the current or speculative main frame in `host_contents_`. We
   // can't access this frame through the `host_contents_` directly as it does
 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
-index 0d21ebc927042..a08ebcbafc252 100644
+index 564a62eb00beb..5f29a54e92169 100644
 --- extensions/browser/extensions_browser_client.h
 +++ extensions/browser/extensions_browser_client.h
@@ -27,6 +27,7 @@
@ -196,10 +196,10 @@ index 0d21ebc927042..a08ebcbafc252 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 60d33c01de75b..6387238ef497f 100644
+index bee1c92ce2b69..31e6d5587de2a 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
-@@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
+@@ -391,9 +391,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 514fb3aabe50e..6a034b3699a75 100644
+index 7235413382341..38490e32f7b91 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,5 +1,5 @@
 diff --git .gn .gn
-index e2e2dcebcdcdb..35443d0e2af1a 100644
+index fdde78244eb3d..ff26203773839 100644
 --- .gn
 +++ .gn
@@ -160,6 +160,8 @@ exec_script_whitelist =
@ -12,7 +12,7 @@ index e2e2dcebcdcdb..35443d0e2af1a 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 8b6f4bf90557a..6071a3a625a8c 100644
+index 7bb204910c41c..5ec046f0c1e3b 100644
 --- BUILD.gn
 +++ BUILD.gn
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -79,7 +79,7 @@ index d2266b28b33f8..a7ff6d9b68f38 100644
 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
 +
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index faedbc470f68c..bb084da13544c 100644
+index 32eb89f02d799..a2baacc70957d 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
@@ -4,6 +4,7 @@
@ -102,7 +102,7 @@ index faedbc470f68c..bb084da13544c 100644
       sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]
       deps += [ "//extensions:extensions_browser_resources" ]
 diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
-index 3425f1fef4917..edc0dc42bdb7d 100644
+index 7e6722603df99..0607f2e18c421 100644
 --- chrome/chrome_repack_locales.gni
 +++ chrome/chrome_repack_locales.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@ -113,7 +113,7 @@ index 3425f1fef4917..edc0dc42bdb7d 100644
 import("//extensions/buildflags/buildflags.gni")
 import("//tools/grit/repack.gni")
 
-@@ -93,6 +94,10 @@ template("chrome_repack_locales") {
+@@ -95,6 +96,10 @@ template("chrome_repack_locales") {
           [ "${root_gen_dir}/chromeos/strings/chromeos_strings_" ]
       deps += [ "//chromeos/strings" ]
     }
--- 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 dda65e37e4db1..faf5d99f87e5d 100644
+index 20c0a7835ce97..f54233b73a2d4 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -895,6 +895,15 @@
+@@ -905,6 +905,15 @@
   # END "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
 
--- a/patch/patches/linux_assets_path_1936.patch
+++ b/patch/patches/linux_assets_path_1936.patch
@ -24,28 +24,6 @@ index 7022a65e03578..c9aaf5d76e4a1 100644
     base::FilePath sandbox_candidate = exe_dir.AppendASCII("chrome-sandbox");
     if (base::PathExists(sandbox_candidate))
       sandbox_binary = sandbox_candidate;
-diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
-index 016046d6caa4f..116e4919cda08 100644
--- ui/gl/init/gl_initializer_linux_x11.cc
-+++ ui/gl/init/gl_initializer_linux_x11.cc
-@@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {
-   if (implementation == kGLImplementationSwiftShaderGL) {
- #if BUILDFLAG(ENABLE_SWIFTSHADER)
-     base::FilePath module_path;
-    if (!base::PathService::Get(base::DIR_MODULE, &module_path))
-+    if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
-       return false;
-     module_path = module_path.Append("swiftshader/");
- 
-@@ -94,7 +94,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {
-   } else if (implementation == kGLImplementationEGLANGLE) {
- #if !BUILDFLAG(USE_STATIC_ANGLE)
-     base::FilePath module_path;
-    if (!base::PathService::Get(base::DIR_MODULE, &module_path))
-+    if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
-       return false;
- 
-     const char kGLESv2ANGLELibraryName[] = "libGLESv2.so";
 diff --git ui/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
 index e028d8cf8dec6..d172832589534 100644
 --- ui/ozone/common/egl_util.cc
--- a/patch/patches/linux_ui_ozone.patch
+++ b/patch/patches/linux_ui_ozone.patch
@ -1,8 +1,8 @@
 diff --git ui/ozone/BUILD.gn ui/ozone/BUILD.gn
-index 9cd6dc2cb2cbd..8c535634bf7d2 100644
+index 3fde8b3379e2e..5966cefc752ee 100644
 --- ui/ozone/BUILD.gn
 +++ ui/ozone/BUILD.gn
-@@ -355,6 +355,8 @@ action("generate_test_support_constructor_list") {
+@@ -356,6 +356,8 @@ action("generate_test_support_constructor_list") {
   ]
 
   deps = [ ":generate_ozone_platform_list" ]
--- a/patch/patches/message_loop.patch
+++ b/patch/patches/message_loop.patch
@ -1,5 +1,5 @@
 diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
-index 2c8d83d2424d9..ae9f7229a51cf 100644
+index d1140d7945a2d..a3b894aa4f6b0 100644
 --- base/message_loop/message_pump_win.cc
 +++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@
@ -30,10 +30,10 @@ index 2c8d83d2424d9..ae9f7229a51cf 100644
   }
   if (has_msg)
 diff --git base/task/current_thread.cc base/task/current_thread.cc
-index 9641285fde742..51cc852fcc165 100644
+index 718ba706b977c..aaa993ee8775b 100644
 --- base/task/current_thread.cc
 +++ base/task/current_thread.cc
-@@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver(
+@@ -49,6 +49,8 @@ void CurrentThread::AddDestructionObserver(
 
 void CurrentThread::RemoveDestructionObserver(
     DestructionObserver* destruction_observer) {
@ -43,12 +43,12 @@ index 9641285fde742..51cc852fcc165 100644
   current_->RemoveDestructionObserver(destruction_observer);
 }
 diff --git base/task/current_thread.h base/task/current_thread.h
-index b69284cd85576..111185c0ab9a8 100644
+index 7ca1e0ee2cef9..40fd430d1885a 100644
 --- base/task/current_thread.h
 +++ base/task/current_thread.h
-@@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread {
-   // posted tasks.
-   void SetAddQueueTimeToTasks(bool enable);
+@@ -130,6 +130,12 @@ class BASE_EXPORT CurrentThread {
+   // to run. There can only be one OnNextIdleCallback at a time.
+   void RegisterOnNextIdleCallback(OnceClosure on_next_idle_callback);
 
 +#if defined(OS_WIN)
 +  void set_os_modal_loop(bool os_modal_loop) { os_modal_loop_ = os_modal_loop; }
@ -59,7 +59,7 @@ index b69284cd85576..111185c0ab9a8 100644
   // Enables nested task processing in scope of an upcoming native message loop.
   // Some unwanted message loops may occur when using common controls or printer
   // functions. Hence, nested task processing is disabled by default to avoid
-@@ -192,6 +198,13 @@ class BASE_EXPORT CurrentThread {
+@@ -195,6 +201,13 @@ class BASE_EXPORT CurrentThread {
   friend class web::WebTaskEnvironment;
 
   sequence_manager::internal::SequenceManagerImpl* current_;
--- a/patch/patches/mime_handler_view_guest_1565_2727.patch
+++ b/patch/patches/mime_handler_view_guest_1565_2727.patch
@ -1,15 +1,15 @@
 diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
-index a48a7be8932e0..7c8492a9e6f62 100644
+index dd068f90aecef..7f942d7f44361 100644
 --- content/browser/web_contents/web_contents_view.h
 +++ content/browser/web_contents/web_contents_view.h
-@@ -22,7 +22,7 @@ struct DropData;
+@@ -21,7 +21,7 @@ struct DropData;
 // The WebContentsView is an interface that is implemented by the platform-
 // dependent web contents views. The WebContents uses this interface to talk to
 // them.
 -class WebContentsView {
 +class CONTENT_EXPORT WebContentsView {
  public:
-   virtual ~WebContentsView() {}
+   virtual ~WebContentsView() = default;
 
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 index ded1894a7d1d7..6ea82766e8e87 100644
@ -48,10 +48,10 @@ index ded1894a7d1d7..6ea82766e8e87 100644
     WebContents* source,
     const content::OpenURLParams& params) {
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index b47ce186faba9..2f80ab128b4e0 100644
+index 4c0820c60e765..68a499da10e80 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-@@ -144,6 +144,7 @@ class MimeHandlerViewGuest
+@@ -143,6 +143,7 @@ class MimeHandlerViewGuest
   void EmbedderFullscreenToggled(bool entered_fullscreen) final;
   bool ZoomPropagatesFromEmbedderToGuest() const final;
   bool ShouldDestroyOnDetach() const final;
@ -59,7 +59,7 @@ index b47ce186faba9..2f80ab128b4e0 100644
 
   // WebContentsDelegate implementation.
   content::WebContents* OpenURLFromTab(
-@@ -202,6 +203,7 @@ class MimeHandlerViewGuest
+@@ -201,6 +202,7 @@ class MimeHandlerViewGuest
       content::ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE};
   int embedder_widget_routing_id_ = MSG_ROUTING_NONE;
 
@ -68,18 +68,19 @@ index b47ce186faba9..2f80ab128b4e0 100644
   bool is_embedder_fullscreen_ = false;
   bool plugin_can_save_ = false;
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
-index 5d4bff64cbe16..b085c2ef1f7c5 100644
+index d97b054a8d6c7..9fd96a8f7826d 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
-@@ -8,6 +8,7 @@
+@@ -7,6 +7,8 @@
+ 
 #include <string>
 
- #include "base/macros.h"
 +#include "content/public/browser/web_contents.h"
- 
+
 namespace content {
 class RenderFrameHost;
-@@ -27,6 +28,14 @@ class MimeHandlerViewGuestDelegate {
+ struct ContextMenuParams;
+@@ -25,6 +27,14 @@ class MimeHandlerViewGuestDelegate {
 
   virtual ~MimeHandlerViewGuestDelegate() {}
 
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@ -10,10 +10,10 @@ index 96d1a51ec1078..e8120a818b1f2 100644
 +// This load will not send any cookies. For CEF usage.
 +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
-index 2e1817d58e838..e06bad87e88a1 100644
+index dc5c2d9ab617b..9d88970660678 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
-@@ -588,7 +588,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
+@@ -561,7 +561,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
   // 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.
@ -24,10 +24,10 @@ index 2e1817d58e838..e06bad87e88a1 100644
         request_->force_ignore_site_for_cookies();
     if (cookie_store->cookie_access_delegate() &&
 diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
-index da7f97cf0ec17..9b305323df042 100644
+index f14c99863eb3f..51679008ead55 100644
 --- services/network/public/cpp/resource_request.cc
 +++ services/network/public/cpp/resource_request.cc
-@@ -266,7 +266,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
+@@ -265,7 +265,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
 }
 
 bool ResourceRequest::SendsCookies() const {
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
 
 }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index e36c419fcffac..ec518d5893249 100644
+index 367c17952131a..d15bd1e82577e 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -3076,6 +3076,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
+@@ -3098,6 +3098,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
       GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
 }
 
@ -57,10 +57,10 @@ index e36c419fcffac..ec518d5893249 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 5c533dae5c058..738dfa89027ec 100644
+index da4223e064f94..7567102173983 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
-@@ -769,6 +769,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -777,6 +777,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
@ -34,7 +34,7 @@ index a45799d6fc9ee..d884e88e754cc 100644
 }
 
 diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
-index 434d4781e2342..2bdd03803c6f8 100644
+index 96929c4158ce5..68bacf03a27ff 100644
 --- chrome/browser/printing/print_preview_dialog_controller.cc
 +++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -15,6 +15,7 @@
@ -43,60 +43,20 @@ index 434d4781e2342..2bdd03803c6f8 100644
 #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/features.h"
 #include "chrome/browser/browser_process.h"
- #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/printing/print_view_manager.h"
-@@ -404,8 +405,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
-   content::HostZoomMap::Get(preview_dialog->GetSiteInstance())
-       ->SetZoomLevelForHostAndScheme(print_url.scheme(), print_url.host(), 0);
-   PrintViewManager::CreateForWebContents(preview_dialog);
-+
-+#if !BUILDFLAG(ENABLE_CEF)
-   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
-       preview_dialog);
-+#endif
- 
-   // Add an entry to the map.
-   preview_dialog_map_[preview_dialog] = initiator;
+ #include "chrome/browser/task_manager/web_contents_tags.h"
 diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
-index c3388853baa3c..dcbf66193ea23 100644
+index c9f1502da55d8..874c95c2db26c 100644
 --- chrome/browser/printing/print_view_manager_base.cc
 +++ chrome/browser/printing/print_view_manager_base.cc
-@@ -21,6 +21,7 @@
- #include "base/timer/timer.h"
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
-+#include "cef/libcef/features/runtime.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chrome_notification_types.h"
- #include "chrome/browser/printing/print_job.h"
-@@ -58,6 +59,10 @@
- #include "printing/printing_features.h"
- #endif
- 
-+#if BUILDFLAG(ENABLE_CEF)
-+#include "cef/libcef/browser/printing/print_view_manager.h"
-+#endif
-+
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- #include "chrome/browser/printing/print_error_dialog.h"
- #include "chrome/browser/printing/print_view_manager.h"
-@@ -217,8 +222,13 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-   content::WebContents* web_contents =
-       GetWebContentsForRenderFrame(render_process_id, render_frame_id);
-  return web_contents ? PrintViewManager::FromWebContents(web_contents)
-                      : nullptr;
-+  if (!web_contents)
-+    return nullptr;
-+#if BUILDFLAG(ENABLE_CEF)
-+  if (cef::IsAlloyRuntimeEnabled())
-+    return CefPrintViewManager::FromWebContents(web_contents);
-+#endif
-+  return PrintViewManager::FromWebContents(web_contents);
- }
- 
- void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
-@@ -274,8 +284,7 @@ void UpdatePrintSettingsOnIO(
+@@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO(
+     mojom::PrintManagerHost::UpdatePrintSettingsCallback callback,
+     scoped_refptr<PrintQueriesQueue> queue,
+     base::Value job_settings,
+-    base::WeakPtr<PrintViewManagerBase> manager) {
+    base::WeakPtr<PrintViewManagerBase> manager,
+    int process_id,
+    int routing_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   std::unique_ptr<PrinterQuery> printer_query = queue->PopPrinterQuery(cookie);
   if (!printer_query) {
@ -106,20 +66,39 @@ index c3388853baa3c..dcbf66193ea23 100644
   }
   auto* printer_query_ptr = printer_query.get();
   printer_query_ptr->SetSettings(
+@@ -667,6 +668,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+       job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
+   }
+ 
+  content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
+   auto callback_wrapper =
+       base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
+                      weak_ptr_factory_.GetWeakPtr(), std::move(callback));
+@@ -674,7 +676,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
+       FROM_HERE,
+       base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
+                      std::move(callback_wrapper), queue_,
+-                     std::move(job_settings), weak_ptr_factory_.GetWeakPtr()));
+                     std::move(job_settings), weak_ptr_factory_.GetWeakPtr(),
+                     render_frame_host->GetProcess()->GetID(),
+                     render_frame_host->GetRoutingID()));
+ }
+ #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
+ 
 diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
-index 0efcaba73efa2..4625a2895048d 100644
+index 5771a3ebd7614..acec0bea2841b 100644
 --- chrome/browser/printing/print_view_manager_base.h
 +++ chrome/browser/printing/print_view_manager_base.h
-@@ -149,9 +149,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
+@@ -150,9 +150,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
   // Manages the low-level talk to the printer.
   scoped_refptr<PrintJob> print_job_;
 
 - private:
 -  friend class TestPrintViewManager;
 -
-   // content::NotificationObserver implementation.
-   void Observe(int type,
-                const content::NotificationSource& source,
+   // content::WebContentsObserver implementation.
+   void RenderFrameHostStateChanged(
+       content::RenderFrameHost* render_frame_host,
 diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
 index 920f646f06484..76c0b5e5ee04b 100644
 --- chrome/browser/resources/print_preview/ui/destination_dialog.html
@ -137,7 +116,7 @@ index 920f646f06484..76c0b5e5ee04b 100644
       $i18n{cancel}
     </cr-button>
 diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
-index 1b6b4e93b45d2..b51f277453529 100644
+index 8c5ba47779d24..69dff1ae88000 100644
 --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
 +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -26,6 +26,8 @@
@ -161,7 +140,7 @@ index 1b6b4e93b45d2..b51f277453529 100644
 
 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() = default;
 diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
-index 8933bc14bdefe..796b8827692c3 100644
+index c4442eabef9b9..4196fdb4281cd 100644
 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
 +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -21,6 +21,7 @@
@ -183,7 +162,7 @@ index 8933bc14bdefe..796b8827692c3 100644
 namespace printing {
 
 namespace {
-@@ -411,16 +416,18 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
+@@ -414,16 +419,18 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
     service->GetRemote<crosapi::mojom::DriveIntegrationService>()
         ->GetMountPointPath(
             base::BindOnce(&PdfPrinterHandler::OnSaveLocationReady,
@ -204,7 +183,7 @@ index 8933bc14bdefe..796b8827692c3 100644
     const base::FilePath& default_filename,
     bool prompt_user,
     const base::FilePath& path) {
-@@ -438,10 +445,27 @@ void PdfPrinterHandler::OnSaveLocationReady(
+@@ -441,10 +448,27 @@ void PdfPrinterHandler::OnSaveLocationReady(
   // If the directory is empty there is no reason to create it or use the
   // default location.
   if (path.empty()) {
@ -232,7 +211,7 @@ index 8933bc14bdefe..796b8827692c3 100644
   // Get default download directory. This will be used as a fallback if the
   // save directory does not exist.
   DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(profile_);
-@@ -449,8 +473,7 @@ void PdfPrinterHandler::OnSaveLocationReady(
+@@ -452,8 +476,7 @@ void PdfPrinterHandler::OnSaveLocationReady(
   base::ThreadPool::PostTaskAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
       base::BindOnce(&SelectSaveDirectory, path, default_path),
@ -242,7 +221,7 @@ index 8933bc14bdefe..796b8827692c3 100644
 }
 
 void PdfPrinterHandler::PostPrintToPdfTask() {
-@@ -496,6 +519,36 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
+@@ -499,6 +522,36 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
       platform_util::GetTopLevel(preview_web_contents_->GetNativeView()), NULL);
 }
 
@ -280,10 +259,10 @@ index 8933bc14bdefe..796b8827692c3 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   drive::DriveIntegrationService* drive_service =
 diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
-index b3a6eaa270877..aa4e84fea1387 100644
+index 46c8b1d08b075..1ee95cd7c3240 100644
 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
 +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
-@@ -11,6 +11,7 @@
+@@ -12,6 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/chromeos_buildflags.h"
@ -291,7 +270,7 @@ index b3a6eaa270877..aa4e84fea1387 100644
 #include "chrome/browser/ui/webui/print_preview/printer_handler.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
-@@ -94,10 +95,20 @@ class PdfPrinterHandler : public PrinterHandler,
+@@ -95,10 +96,20 @@ class PdfPrinterHandler : public PrinterHandler,
   void OnDirectorySelected(const base::FilePath& filename,
                            const base::FilePath& directory);
 
@ -314,10 +293,10 @@ index b3a6eaa270877..aa4e84fea1387 100644
   base::FilePath GetSaveLocation() const;
 
 diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-index 05b1c96ce17dc..c5025271210fa 100644
+index f35a751173b05..0c96bc1d7ce96 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@ -325,7 +304,7 @@ index 05b1c96ce17dc..c5025271210fa 100644
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/printing/background_printing_manager.h"
-@@ -98,6 +99,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
+@@ -97,6 +98,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
 const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
 #endif
 
@ -339,7 +318,7 @@ index 05b1c96ce17dc..c5025271210fa 100644
 constexpr char kInvalidArgsForDidStartPreview[] =
     "Invalid arguments for DidStartPreview";
 constexpr char kInvalidPageNumberForDidPreviewPage[] =
-@@ -343,7 +351,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
+@@ -342,7 +350,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
                     chrome::kCloudPrintCertificateErrorLearnMoreURL);
 
 #if !defined(OS_CHROMEOS)
--- a/patch/patches/printing_context_2196.patch
+++ b/patch/patches/printing_context_2196.patch
@ -1,9 +1,9 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index 4b508191cf196..3c91214e09a69 100644
+index d8f67ab511648..707ca0f50328b 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
-@@ -148,6 +148,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
-           PrintingContext::Create(printing_context_delegate_.get())),
+@@ -142,6 +142,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
+                                   ShouldPrintingContextSkipSystemCalls())),
       thread_("Printing_Worker") {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 +  printing_context_->set_render_ids(render_process_id, render_frame_id);
@ -11,10 +11,10 @@ index 4b508191cf196..3c91214e09a69 100644
 
 PrintJobWorker::~PrintJobWorker() {
 diff --git printing/printing_context.h printing/printing_context.h
-index b28af89c67f88..53f107bf413fa 100644
+index 7d937e7e3f19d..be49a65eeed94 100644
 --- printing/printing_context.h
 +++ printing/printing_context.h
-@@ -143,6 +143,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -177,6 +177,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
 
   int job_id() const { return job_id_; }
 
@ -28,14 +28,14 @@ index b28af89c67f88..53f107bf413fa 100644
  protected:
   explicit PrintingContext(Delegate* delegate);
 
-@@ -170,6 +177,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
- 
+@@ -221,6 +228,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
   // The job id for the current job. The value is 0 if no jobs are active.
   int job_id_;
-+
+ 
 +  // Routing IDs for the frame that owns this object.
 +  int render_process_id_ = 0;
 +  int render_frame_id_ = 0;
- };
- 
- }  // namespace printing
+
+  private:
+ #if BUILDFLAG(ENABLE_OOP_PRINTING)
+   // If this instance of PrintingContext should skip making any system calls
--- 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 621a961ba0d44..18eae69091d70 100644
+index 2d918fcf473d6..9f9b81727062d 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -630,6 +630,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
--- 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 1b4d235071561..e5c795b4ab0b7 100644
+index 27adbaa00ac5e..066ad65042fb8 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
-@@ -890,6 +890,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
+@@ -873,6 +873,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
     : delegate_(delegate),
       locale_resources_data_lock_(new base::Lock),
       max_scale_factor_(k100Percent) {
@ -15,7 +15,7 @@ index 1b4d235071561..e5c795b4ab0b7 100644
   mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kMangleLocalizedStrings);
 }
-@@ -899,6 +905,11 @@ ResourceBundle::~ResourceBundle() {
+@@ -882,6 +888,11 @@ ResourceBundle::~ResourceBundle() {
   UnloadLocaleResources();
 }
 
@ -28,10 +28,10 @@ index 1b4d235071561..e5c795b4ab0b7 100644
 void ResourceBundle::InitSharedInstance(Delegate* delegate) {
   DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
 diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
-index f192e3e05f993..bb7cb1e0fa323 100644
+index ceca1e5ed14bf..0aa84b41bdcc7 100644
 --- ui/base/resource/resource_bundle.h
 +++ ui/base/resource/resource_bundle.h
-@@ -209,6 +209,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
+@@ -208,6 +208,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
   ResourceBundle(const ResourceBundle&) = delete;
   ResourceBundle& operator=(const ResourceBundle&) = delete;
 
--- a/patch/patches/runhooks.patch
+++ b/patch/patches/runhooks.patch
@ -1,11 +1,11 @@
 diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
-index c1d2fa2ce0aa2..d1d215f35ac12 100644
+index ec9e9eeda7cb7..b58e1900de059 100644
 --- build/toolchain/win/setup_toolchain.py
 +++ build/toolchain/win/setup_toolchain.py
-@@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
-         del os.environ['INCLUDE']
-         del os.environ['LIB']
-         del os.environ['LIBPATH']
+@@ -157,13 +157,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
+           del os.environ['LIB']
+         if 'LIBPATH' in os.environ:
+           del os.environ['LIBPATH']
 -      other_path = os.path.normpath(os.path.join(
 +      script_path = os.path.normpath(os.path.join(
                                         os.environ['GYP_MSVS_OVERRIDE_PATH'],
--- a/patch/patches/rwh_background_color_1984.patch
+++ b/patch/patches/rwh_background_color_1984.patch
@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index 2b1be225cb402..c2b422f47a970 100644
+index 9bbfba2c8a3b5..93cb5605394cd 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -668,10 +668,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
+@@ -710,10 +710,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
 void RenderWidgetHostViewAura::UpdateBackgroundColor() {
   DCHECK(GetBackgroundColor());
 
@ -19,7 +19,7 @@ index 2b1be225cb402..c2b422f47a970 100644
 }
 
 absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
-@@ -2149,6 +2151,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -2194,6 +2196,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
   // This needs to happen only after |window_| has been initialized using
   // Init(), because it needs to have the layer.
   window_->SetEmbedFrameSinkId(frame_sink_id_);
--- a/patch/patches/services_network_2622.patch
+++ b/patch/patches/services_network_2622.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
-index 84efb47a4e53f..e00f8fddbb742 100644
+index 598fb5e2ee02a..85e742c8c1fec 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@ -42,10 +42,10 @@ index 84efb47a4e53f..e00f8fddbb742 100644
         ::network::mojom::NetworkContextFilePaths::New();
 
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index f0cb1076a0970..82e39282f42d3 100644
+index c39c0da541fd4..81ef64813d2ae 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
-@@ -522,6 +522,25 @@ void CookieMonster::SetCookieableSchemes(
+@@ -539,6 +539,25 @@ void CookieMonster::SetCookieableSchemes(
   MaybeRunCookieCallback(std::move(callback), true);
 }
 
@ -72,10 +72,10 @@ index f0cb1076a0970..82e39282f42d3 100644
 void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
   DCHECK(thread_checker_.CalledOnValidThread());
 diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
-index 5828ff23cdb25..d29e746701060 100644
+index 98ff48a4e7bfa..663f8496df336 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
-@@ -203,6 +203,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
+@@ -201,6 +201,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
   CookieChangeDispatcher& GetChangeDispatcher() override;
   void SetCookieableSchemes(const std::vector<std::string>& schemes,
                             SetCookieableSchemesCallback callback) override;
@ -85,10 +85,10 @@ index 5828ff23cdb25..d29e746701060 100644
   // Enables writing session cookies into the cookie database. If this this
   // method is called, it must be called before first use of the instance
 diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
-index 3a6c7c10d2638..1fd6811ab8e00 100644
+index 8631b10535c7d..7c4c518ee5b3d 100644
 --- net/cookies/cookie_store.h
 +++ net/cookies/cookie_store.h
-@@ -154,6 +154,11 @@ class NET_EXPORT CookieStore {
+@@ -155,6 +155,11 @@ class NET_EXPORT CookieStore {
   // Transfer ownership of a CookieAccessDelegate.
   void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
 
@ -101,10 +101,10 @@ index 3a6c7c10d2638..1fd6811ab8e00 100644
   // reset to null.
   const CookieAccessDelegate* cookie_access_delegate() const {
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index c09630b639542..a8b207b85a87e 100644
+index abce7aed59cdc..e89ed1d6b7afb 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
-@@ -253,14 +253,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
+@@ -290,14 +290,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
 void CookieManager::AllowFileSchemeCookies(
     bool allow,
     AllowFileSchemeCookiesCallback callback) {
@ -123,10 +123,10 @@ index c09630b639542..a8b207b85a87e 100644
 
 void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index 88a71e97b2eb1..de4a5dd25002d 100644
+index 4a3f4fe1fb97a..fc0120b23374c 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
-@@ -2160,16 +2160,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2195,16 +2195,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         network_service_->network_quality_estimator());
   }
 
@ -157,10 +157,10 @@ index 88a71e97b2eb1..de4a5dd25002d 100644
     trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
 
 diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
-index 502e989d74e8a..45893a96e7b8d 100644
+index 8cdb76c6eac2b..d98843e5cdd32 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
-@@ -315,6 +315,9 @@ struct NetworkContextParams {
+@@ -325,6 +325,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 b2737eddcda61..d23ee8daf0d76 100644
+index 2a729ea2de461..4d6bcddba181d 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
-@@ -476,10 +476,6 @@ class LoginHandlerDelegate {
+@@ -489,10 +489,6 @@ class LoginHandlerDelegate {
     }
 
     WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index b2737eddcda61..d23ee8daf0d76 100644
 
     // WeakPtr is not strictly necessary here due to OnRequestCancelled.
     creating_login_delegate_ = true;
-@@ -531,12 +527,6 @@ void OnAuthRequiredContinuation(
+@@ -544,12 +540,6 @@ void OnAuthRequiredContinuation(
     mojo::PendingRemote<network::mojom::AuthChallengeResponder>
         auth_challenge_responder,
     base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index b2737eddcda61..d23ee8daf0d76 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,
-@@ -2677,8 +2667,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -2717,8 +2707,12 @@ void StoragePartitionImpl::GetQuotaSettings(
     return;
   }
 
@ -40,7 +40,7 @@ index b2737eddcda61..d23ee8daf0d76 100644
       storage::GetDefaultDeviceInfoHelper(), std::move(callback));
 }
 
-@@ -2688,9 +2682,12 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -2728,9 +2722,12 @@ void StoragePartitionImpl::InitNetworkContext() {
   cert_verifier::mojom::CertVerifierCreationParamsPtr
       cert_verifier_creation_params =
           cert_verifier::mojom::CertVerifierCreationParams::New();
@ -52,6 +52,6 @@ index b2737eddcda61..d23ee8daf0d76 100644
 +    // Don't re-initialize the network context during shutdown.
 +    return;
 +  }
-   devtools_instrumentation::ApplyNetworkContextParamsOverrides(
-       browser_context_, context_params.get());
-   DCHECK(!context_params->cert_verifier_params)
+   // Should be initialized with existing per-profile CORS access lists.
+   DCHECK(context_params->cors_origin_access_list.empty())
+       << "NetworkContextParams::cors_origin_access_list should be populated "
--- a/patch/patches/set_resize_background_color.patch
+++ b/patch/patches/set_resize_background_color.patch
@ -1,5 +1,5 @@
 diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
-index 5afb127d4bf11..9b371085bb79f 100644
+index a87b20d3282a8..da0e84c73b36e 100644
 --- ui/views/controls/webview/webview.cc
 +++ ui/views/controls/webview/webview.cc
@@ -142,6 +142,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@ -14,10 +14,10 @@ index 5afb127d4bf11..9b371085bb79f 100644
   if (crashed_overlay_view_ == crashed_overlay_view)
     return;
 diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
-index 54c078de0363c..add83c987c3ec 100644
+index 041bcb7c9f4ae..6575739372b5d 100644
 --- ui/views/controls/webview/webview.h
 +++ ui/views/controls/webview/webview.h
-@@ -84,6 +84,10 @@ class WEBVIEW_EXPORT WebView : public View,
+@@ -85,6 +85,10 @@ class WEBVIEW_EXPORT WebView : public View,
   void EnableSizingFromWebContents(const gfx::Size& min_size,
                                    const gfx::Size& max_size);
 
--- a/patch/patches/storage_incognito_2289.patch
+++ b/patch/patches/storage_incognito_2289.patch
@ -13,10 +13,10 @@ index df1a7ae70bdc3..10e9a0b3b881a 100644
           {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
            base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index 20487c264639f..55be77eb0dd89 100644
+index 6decb2aacdfdd..011ca030011df 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
-@@ -134,7 +134,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
+@@ -130,7 +130,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
 StoragePartition* BrowserContext::GetStoragePartition(
     const StoragePartitionConfig& storage_partition_config,
     bool can_create) {
@ -25,7 +25,7 @@ index 20487c264639f..55be77eb0dd89 100644
     // An off the record profile MUST only use in memory storage partitions.
     CHECK(storage_partition_config.in_memory());
   }
-@@ -375,7 +375,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
+@@ -371,7 +371,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
   const bool kUseInMemoryDBDefault = false;
   bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
       media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,
@ -58,7 +58,7 @@ index b430ebb66bb5f..8fc54d2e7d713 100644
 
 // static
 diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
-index c96e3fad1a70f..302b2be31d8dc 100644
+index 842886e2fce98..b77e43ea07458 100644
 --- storage/browser/database/database_tracker.cc
 +++ storage/browser/database/database_tracker.cc
@@ -562,7 +562,7 @@ bool DatabaseTracker::LazyInit() {
--- a/patch/patches/trace_event.patch
+++ b/patch/patches/trace_event.patch
@ -1,8 +1,8 @@
 diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
-index b676bc5236018..7e975003f7685 100644
+index f6f346bbc56d4..4eb24caa74d5a 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
-@@ -62,6 +62,8 @@
+@@ -61,6 +61,8 @@
   X("cc")                                                                \
   X("cc.debug")                                                          \
   X("cdp.perf")                                                          \
--- a/patch/patches/views_1749_2102.patch
+++ b/patch/patches/views_1749_2102.patch
@ -1,8 +1,8 @@
 diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
-index f095bfc301151..f4eab5e49b61c 100644
+index 11f1421cc79c1..c5dbc643ae7c8 100644
 --- ui/base/models/menu_model.h
 +++ ui/base/models/menu_model.h
-@@ -14,8 +14,11 @@
+@@ -15,8 +15,11 @@
 #include "ui/base/models/menu_separator_types.h"
 #include "ui/gfx/native_widget_types.h"
 
@ -14,7 +14,7 @@ index f095bfc301151..f4eab5e49b61c 100644
 }
 
 namespace ui {
-@@ -146,6 +149,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(int index, int event_flags);
 
@ -82,7 +82,7 @@ index 99120dd6d7fb0..94f2d52787860 100644
 }
 
 diff --git ui/gfx/render_text.h ui/gfx/render_text.h
-index bb01b826dbe52..642ab5609368a 100644
+index b936fe3ed5196..f878635e34513 100644
 --- ui/gfx/render_text.h
 +++ ui/gfx/render_text.h
@@ -343,6 +343,10 @@ class GFX_EXPORT RenderText {
@ -106,10 +106,10 @@ index bb01b826dbe52..642ab5609368a 100644
 
 }  // namespace gfx
 diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
-index 7ff4204a36c35..6094f15b36470 100644
+index 7de6bdd643ad1..90994f096a0e0 100644
 --- ui/views/animation/ink_drop_host_view.h
 +++ ui/views/animation/ink_drop_host_view.h
-@@ -174,6 +174,8 @@ class VIEWS_EXPORT InkDropHost {
+@@ -175,6 +175,8 @@ class VIEWS_EXPORT InkDropHost {
   View* host_view() { return host_view_; }
   const View* host_view() const { return host_view_; }
 
@ -136,10 +136,10 @@ index 57e3a7d7e1d8c..eaccdf1cc50cc 100644
   Button::StateChanged(old_state);
   ResetLabelEnabledColor();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index 9b5389139c2fb..6111c18533564 100644
+index 75d1292ce4d49..e22a73e3771c4 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
-@@ -134,6 +134,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
+@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
   ui::NativeTheme::State GetForegroundThemeState(
       ui::NativeTheme::ExtraParams* params) const override;
 
@ -215,10 +215,10 @@ index bb2e1b4412205..493cb05b5c7fa 100644
 }
 
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index ce380322b4800..bc57b30cf59bb 100644
+index 1642bff4910d9..34b560bddae57 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
-@@ -233,6 +233,10 @@ class VIEWS_EXPORT Label : public View,
+@@ -232,6 +232,10 @@ class VIEWS_EXPORT Label : public View,
   gfx::ElideBehavior GetElideBehavior() const;
   void SetElideBehavior(gfx::ElideBehavior elide_behavior);
 
@ -229,7 +229,7 @@ index ce380322b4800..bc57b30cf59bb 100644
   // Gets/Sets the tooltip text.  Default behavior for a label (single-line) is
   // to show the full text if it is wider than its bounds.  Calling this
   // overrides the default behavior and lets you set a custom tooltip.  To
-@@ -479,6 +483,7 @@ class VIEWS_EXPORT Label : public View,
+@@ -478,6 +482,7 @@ class VIEWS_EXPORT Label : public View,
   int max_width_ = 0;
   // This is used in single-line mode.
   int max_width_single_line_ = 0;
@ -238,10 +238,10 @@ index ce380322b4800..bc57b30cf59bb 100644
   std::unique_ptr<SelectionController> selection_controller_;
 
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index b843da5f5cc2b..de07747c4a07c 100644
+index 25d5a0cc92b5f..cf85b366d15c8 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -2876,8 +2876,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
+@@ -2877,8 +2877,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
@ -256,7 +256,7 @@ index b843da5f5cc2b..de07747c4a07c 100644
   MenuItemView* to_select = nullptr;
   if (!item->GetSubmenu()->GetMenuItems().empty())
     to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
-@@ -2896,8 +2901,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2897,8 +2902,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
 void MenuController::CloseSubmenu() {
   MenuItemView* item = state_.item;
   DCHECK(item);
@ -308,10 +308,10 @@ index 9c1542e1f4f0f..548fc8e87d520 100644
   virtual int GetMaxWidthForMenu(MenuItemView* menu);
 
 diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
-index 23c49fc5325cd..98f3c89e71bcd 100644
+index 51518e199ab63..ce7a13a1fa1cb 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
-@@ -1082,6 +1082,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
+@@ -1083,6 +1083,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
     spilling_rect.set_y(spilling_rect.y() - corner_radius_);
     spilling_rect.set_height(spilling_rect.height() + corner_radius_);
     canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@ -327,7 +327,7 @@ index 23c49fc5325cd..98f3c89e71bcd 100644
   } else if (paint_as_selected) {
     gfx::Rect item_bounds = GetLocalBounds();
     if (type_ == Type::kActionableSubMenu) {
-@@ -1148,6 +1157,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
+@@ -1149,6 +1158,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
 }
 
 SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -424,7 +424,7 @@ index fb5d5e6a79a3f..a336b5a74d6a1 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 c07a9df52dd6e..b174c15ebc8b0 100644
+index b7c7474fb5910..ce3e14071f0c6 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,
@ -449,7 +449,7 @@ index c07a9df52dd6e..b174c15ebc8b0 100644
   void WillHideMenu(MenuItemView* menu) override;
   void OnMenuClosed(MenuItemView* menu) override;
 diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
-index 63578697ff8be..e29956c754794 100644
+index 2375a989af49c..67ffa4aa8fc30 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -239,6 +239,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@ -465,18 +465,18 @@ index 63578697ff8be..e29956c754794 100644
       content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
 
 diff --git ui/views/view.h ui/views/view.h
-index e567568977553..3ce5b506b1d3f 100644
+index 211ca9cb8916b..afad4c1a5b29f 100644
 --- ui/views/view.h
 +++ ui/views/view.h
-@@ -21,6 +21,7 @@
- #include "base/gtest_prod_util.h"
+@@ -22,6 +22,7 @@
 #include "base/memory/ptr_util.h"
+ #include "base/memory/raw_ptr.h"
 #include "base/strings/string_piece.h"
 +#include "base/supports_user_data.h"
 #include "build/build_config.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/skia/include/core/SkPath.h"
-@@ -269,7 +270,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -270,7 +271,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 f3168837b4e3a..3081b8bc31d4c 100644
+index 0399fd10fffc2..82fce2b5b0558 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -605,6 +605,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
+@@ -606,6 +606,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
   return screen_infos_.current().device_scale_factor;
 }
 
@ -18,7 +18,7 @@ index f3168837b4e3a..3081b8bc31d4c 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 c7b6bc3caa831..b62989e0ff470 100644
+index 7759ce1982ecf..9696bd87f8067 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -67,6 +67,7 @@ class CursorManager;
@ -29,16 +29,16 @@ index c7b6bc3caa831..b62989e0ff470 100644
 class SyntheticGestureTarget;
 class TextInputManager;
 class TouchSelectionControllerClientManager;
-@@ -131,6 +132,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -132,6 +133,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                         const gfx::Size& max_size) override;
   void DisableAutoResize(const gfx::Size& new_size) override;
-   float GetDeviceScaleFactor() final;
+   float GetDeviceScaleFactor() const final;
 +  void SetHasExternalParent(bool val) override;
 +  bool HasExternalParent() const override;
   TouchSelectionControllerClientManager*
   GetTouchSelectionControllerClientManager() override;
   bool ShouldVirtualKeyboardOverlayContent() override;
-@@ -167,6 +170,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -168,6 +171,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
   // Called when screen information or native widget bounds change.
   virtual void UpdateScreenInfo();
 
@ -49,7 +49,7 @@ index c7b6bc3caa831..b62989e0ff470 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_|
-@@ -412,6 +419,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -413,6 +420,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                            const gfx::Rect& bounds,
                            const gfx::Rect& anchor_rect) = 0;
 
@ -62,9 +62,9 @@ index c7b6bc3caa831..b62989e0ff470 100644
   // Sets the cursor for this view to the one associated with the specified
   // cursor_type.
   virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -607,6 +620,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -644,6 +657,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
 
-   TooltipObserver* tooltip_observer_for_testing_ = nullptr;
+   raw_ptr<TooltipObserver> tooltip_observer_for_testing_ = nullptr;
 
 +  // True if the widget has a external parent view/window outside of the
 +  // Chromium-controlled view/window hierarchy.
@ -73,7 +73,7 @@ index c7b6bc3caa831..b62989e0ff470 100644
  private:
   FRIEND_TEST_ALL_PREFIXES(
       BrowserSideFlingBrowserTest,
-@@ -626,10 +643,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -663,10 +680,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
 
   void SynchronizeVisualProperties();
 
@ -85,7 +85,7 @@ index c7b6bc3caa831..b62989e0ff470 100644
   // renderer process changes. This method is called before notifying
   // RenderWidgetHostImpl in order to allow the view to allocate a new
 diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
-index 5a7b77e313e46..d2e2dda962d63 100644
+index 98aca4f460df0..3988d00691d13 100644
 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -53,6 +53,10 @@ namespace {
@ -133,12 +133,12 @@ index 5a7b77e313e46..d2e2dda962d63 100644
   if (host_ && set_focus_on_mouse_down_or_key_event_) {
     set_focus_on_mouse_down_or_key_event_ = false;
 diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
-index adcf1eeaa3574..0748d570624cd 100644
+index 3b119c648e34d..7c5f5761b3905 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
@@ -253,6 +253,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
   // This must always return the same device scale factor as GetScreenInfo.
-   virtual float GetDeviceScaleFactor() = 0;
+   virtual float GetDeviceScaleFactor() const = 0;
 
 +  // Set whether the widget has a external parent view/window outside of the
 +  // Chromium-controlled view/window hierarchy.
@ -152,10 +152,10 @@ index adcf1eeaa3574..0748d570624cd 100644
   // Set the view's active state (i.e., tint state of controls).
   virtual void SetActive(bool active) = 0;
 diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
-index dd416c031e7c1..05c05ac20f6b6 100644
+index 4fa2992394329..f318cf87313bb 100644
 --- ui/platform_window/x11/x11_window.cc
 +++ ui/platform_window/x11/x11_window.cc
-@@ -1689,7 +1689,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
+@@ -1710,7 +1710,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
   req.border_pixel = 0;
 
   bounds_in_pixels_ = SanitizeBounds(bounds);
@ -179,7 +179,7 @@ index 7c352dd0d992d..516623a91b0e1 100644
   return host ? host->GetAcceleratedWidget() : nullptr;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-index 9c3dec8dfdd32..a523cceb5aed3 100644
+index 80d1019a5661b..48073dd9540e4 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@ -211,10 +211,10 @@ index 9c3dec8dfdd32..a523cceb5aed3 100644
   properties->x11_extension_delegate = this;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-index 5ac7051b4a002..84b8ceb053e75 100644
+index e9a126e30da2a..e2d068ba5f592 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-@@ -87,6 +87,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -86,6 +86,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
   ui::PinnedModeExtension* GetPinnedModeExtension();
   const ui::PinnedModeExtension* GetPinnedModeExtension() const;
 
@ -223,7 +223,7 @@ index 5ac7051b4a002..84b8ceb053e75 100644
  protected:
   // Overridden from DesktopWindowTreeHost:
   void Init(const Widget::InitParams& params) override;
-@@ -96,6 +98,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -95,6 +97,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
       const gfx::Vector2d& drag_offset,
       Widget::MoveLoopSource source,
       Widget::MoveLoopEscapeBehavior escape_behavior) override;
@ -243,10 +243,10 @@ index 5ac7051b4a002..84b8ceb053e75 100644
   base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
 };
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-index 9ac6427c25b68..b8ed488d2f9fe 100644
+index 5750a270fc4f4..de19047841809 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -217,8 +217,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
+@@ -216,8 +216,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
   if (properties.parent_widget) {
     window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
         properties.parent_widget);
@ -258,7 +258,7 @@ index 9ac6427c25b68..b8ed488d2f9fe 100644
 
   // Calculate initial bounds.
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index ec35385c2d39d..7d1b5569b274f 100644
+index d44e1caec0a36..e0a87ea6dfa19 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -181,8 +181,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@ -294,7 +294,7 @@ index ec35385c2d39d..7d1b5569b274f 100644
 
 bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 85bf0cde4ca4f..80b967931eca7 100644
+index 9432480a38e45..82c4ffa97eee4 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -322,6 +322,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@ -307,12 +307,12 @@ index 85bf0cde4ca4f..80b967931eca7 100644
 +
   // Owned by TooltipController, but we need to forward events to it so we keep
   // a reference.
-   corewm::TooltipWin* tooltip_;
+   raw_ptr<corewm::TooltipWin> tooltip_;
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index d1b197a31d078..0d3f3f2e62653 100644
+index a2627e07f3131..7acd793ca3cb3 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
-@@ -360,7 +360,8 @@ void Widget::Init(InitParams params) {
+@@ -359,7 +359,8 @@ void Widget::Init(InitParams params) {
   }
 
   params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -322,7 +322,7 @@ index d1b197a31d078..0d3f3f2e62653 100644
 
   if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
       params.type != views::Widget::InitParams::TYPE_WINDOW) {
-@@ -436,13 +437,21 @@ void Widget::Init(InitParams params) {
+@@ -435,13 +436,21 @@ void Widget::Init(InitParams params) {
 
     if (show_state == ui::SHOW_STATE_MAXIMIZED) {
       Maximize();
@ -345,7 +345,7 @@ index d1b197a31d078..0d3f3f2e62653 100644
   }
 
   native_theme_observation_.Observe(GetNativeTheme());
-@@ -1414,10 +1423,16 @@ void Widget::OnNativeWidgetDestroyed() {
+@@ -1417,10 +1426,16 @@ void Widget::OnNativeWidgetDestroyed() {
 }
 
 gfx::Size Widget::GetMinimumSize() const {
@ -363,7 +363,7 @@ index d1b197a31d078..0d3f3f2e62653 100644
 }
 
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index a2f2c0093ffda..2e4ecffc5fc17 100644
+index 52c0b91c81c41..d91ce4fd14094 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
@@ -329,6 +329,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -376,7 +376,7 @@ index a2f2c0093ffda..2e4ecffc5fc17 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 16245ed7e0b44..99592a5359fbd 100644
+index 3375d6c362923..24f36f6e5587a 100644
 --- ui/views/widget/widget_delegate.h
 +++ ui/views/widget/widget_delegate.h
@@ -381,6 +381,10 @@ class VIEWS_EXPORT WidgetDelegate {
@ -404,10 +404,10 @@ index c23259757d984..450b2610e34d1 100644
       if (native_widget_delegate->IsDialogBox()) {
         *style |= DS_MODALFRAME;
 diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
-index 53815de977e86..129986b1c1051 100644
+index 387b5a7fd9c19..51d1f8bc9e40c 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -3121,10 +3121,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3119,10 +3119,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
@ -29,10 +29,10 @@ index 3b00759e513dc..90fe332d59f5b 100644
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
-index e98a856f2dd17..deceb8745a978 100644
+index b2ad84c881ac7..c207f7b5ac831 100644
 --- components/viz/host/host_display_client.h
 +++ components/viz/host/host_display_client.h
-@@ -35,17 +35,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
+@@ -34,17 +34,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
   mojo::PendingRemote<mojom::DisplayClient> GetBoundRemote(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
@ -67,10 +67,10 @@ index b04f654fe820f..131977a36591d 100644
 
   if (!canvas_) {
 diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h
-index 894237a777fbf..4310c08b0c2cf 100644
+index 309422bcf8581..759549f3046f4 100644
 --- components/viz/host/layered_window_updater_impl.h
 +++ components/viz/host/layered_window_updater_impl.h
-@@ -39,7 +39,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
+@@ -38,7 +38,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
   // mojom::LayeredWindowUpdater implementation.
   void OnAllocatedSharedMemory(const gfx::Size& pixel_size,
                                base::UnsafeSharedMemoryRegion region) override;
@ -80,10 +80,10 @@ index 894237a777fbf..4310c08b0c2cf 100644
  private:
   const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index 1ccab1bcbbcb5..e7da4f03c3875 100644
+index fae4aae8ed31b..d29584721a4bf 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
-@@ -208,6 +208,8 @@ viz_component("service") {
+@@ -216,6 +216,8 @@ viz_component("service") {
     "transitions/transferable_resource_tracker.cc",
     "transitions/transferable_resource_tracker.h",
     "viz_service_export.h",
@ -142,10 +142,10 @@ index 583e3e2525c75..e1836039ad8a5 100644
 
   TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
 diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
-index bb929cb9ff381..ddc3707284c28 100644
+index ba0d6ca4e9004..167c4b095ff84 100644
 --- content/browser/compositor/viz_process_transport_factory.cc
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -382,8 +382,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
+@@ -383,8 +383,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
   compositor_data.display_private.reset();
   root_params->display_private =
       compositor_data.display_private.BindNewEndpointAndPassReceiver();
@ -162,10 +162,10 @@ index bb929cb9ff381..ddc3707284c28 100644
       compositor_data.display_client->GetBoundRemote(resize_task_runner_);
 
 diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
-index 986469b5c09c4..251cb9eb27ede 100644
+index ab6f00f2c8b05..d648e49cf4372 100644
 --- mojo/public/cpp/bindings/sync_call_restrictions.h
 +++ mojo/public/cpp/bindings/sync_call_restrictions.h
-@@ -43,6 +43,7 @@ class Compositor;
+@@ -42,6 +42,7 @@ class Compositor;
 }  // namespace ui
 
 namespace viz {
@ -173,7 +173,7 @@ index 986469b5c09c4..251cb9eb27ede 100644
 class GpuHostImpl;
 class HostFrameSinkManager;
 class HostGpuMemoryBufferManager;
-@@ -105,6 +106,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions {
+@@ -104,6 +105,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions {
   // For preventing frame swaps of wrong size during resize on Windows.
   // (https://crbug.com/811945)
   friend class ui::Compositor;
@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
 +  Draw(gfx.mojom.Rect damage_rect) => ();
 };
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index 8b5b2b055343e..69751904955fa 100644
+index 7e3a624f99fea..749c6acb701c2 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
@@ -30,7 +30,9 @@
@ -252,12 +252,12 @@ index 8b5b2b055343e..69751904955fa 100644
   // Sets the root of the layer tree drawn by this Compositor. The root layer
   // must have no parent. The compositor's root layer is reset if the root layer
   // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -454,6 +467,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -453,6 +466,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
 
   std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
 
 +  CompositorDelegate* delegate_ = nullptr;
 +
   // The root of the Layer tree drawn by this compositor.
-   Layer* root_layer_ = nullptr;
+   raw_ptr<Layer> root_layer_ = nullptr;
 
--- a/Show More
+++ b/Show More