Update to Chromium version 89.0.4389.0 (#843830)

- SSE3 is now required on x86 processors (see https://crbug.com/1123353).
2025-06-05 21:39:12 +02:00 · 2021-01-27 18:13:12 -05:00
parent 119415b8e9
commit 5ef0fb8ac8
118 changed files with 879 additions and 1355 deletions
--- 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 9d0250c77571..100fc4b9d860 100644
+index 4516b3575892..db53b698a7d4 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
-@@ -33,6 +33,7 @@ import("//build/config/ui.gni")
+@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
 import("//build/nocompile.gni")
 import("//build/timestamp.gni")
 import("//build_overrides/build.gni")
@@ -10,7 +10,7 @@ index 9d0250c77571..100fc4b9d860 100644
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
-@@ -1655,7 +1656,11 @@ component("base") {
+@@ -1666,7 +1667,11 @@ component("base") {
     "hash/md5_constexpr_internal.h",
     "hash/sha1.h",
   ]
@@ -23,7 +23,7 @@ index 9d0250c77571..100fc4b9d860 100644
     sources += [
       "hash/md5_nacl.cc",
       "hash/md5_nacl.h",
-@@ -1858,6 +1863,12 @@ component("base") {
+@@ -1867,6 +1872,12 @@ component("base") {
       defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
     }
 
--- 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 fed61eb62d74..af8ae804c1ff 100644
+index d403f389af0d..c8ff688fd11f 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
-@@ -1704,6 +1704,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
+@@ -1685,6 +1685,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
             // DeclarativeApiTest.PersistRules.
             if (actual_process_lock.matches_scheme(url::kDataScheme))
               return true;
@@ -13,7 +13,7 @@ index fed61eb62d74..af8ae804c1ff 100644
 +                !base::Contains(url::GetLocalSchemes(),
 +                                lock_url.scheme_piece()) &&
 +                base::Contains(schemes_okay_to_request_in_any_process_,
-+                               lock_url.scheme_piece())) {
+                               lock_url.scheme())) {
 +              return true;
 +            }
           }
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@@ -1,10 +1,10 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index 9d66490cdb55..1e4a14311524 100644
+index 5928c561b5a3..6f342bb0e036 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -1765,8 +1765,6 @@ config("thin_archive") {
-   # archive names to 16 characters, which is not what we want).
-   if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
+@@ -1779,8 +1779,6 @@ config("thin_archive") {
+   # archives.
+   if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) {
     arflags = [ "-T" ]
 -  } else if (is_win && use_lld) {
 -    arflags = [ "/llvmlibthin" ]
--- 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 16bd4c2717ee..65e309d23866 100644
+index 40c07e2d724a..1cfe14f8cd6f 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index 16bd4c2717ee..65e309d23866 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/downgrade/buildflags.gni")
 import("//chrome/common/features.gni")
-@@ -1912,6 +1913,7 @@ static_library("browser") {
+@@ -1966,6 +1967,7 @@ static_library("browser") {
     "//build:chromeos_buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//cc",
@@ -18,7 +18,7 @@ index 16bd4c2717ee..65e309d23866 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -2424,6 +2426,10 @@ static_library("browser") {
+@@ -2489,6 +2491,10 @@ static_library("browser") {
     ]
   }
 
@@ -29,7 +29,7 @@ index 16bd4c2717ee..65e309d23866 100644
   if (is_android) {
     sources += [
       "after_startup_task_utils_android.cc",
-@@ -4975,7 +4981,7 @@ static_library("browser") {
+@@ -5104,7 +5110,7 @@ static_library("browser") {
       ]
     }
 
--- 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/app_controller_mac.mm chrome/browser/app_controller_mac.mm
-index 189055ae0abb..f12df6cab7a8 100644
+index e2eb5c2c73d0..601b582c6675 100644
 --- chrome/browser/app_controller_mac.mm
 +++ chrome/browser/app_controller_mac.mm
-@@ -1144,6 +1144,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
+@@ -1194,6 +1194,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
 
 // Run a (background) application in a new tab.
 - (void)executeApplication:(id)sender {
@@ -10,7 +10,7 @@ index 189055ae0abb..f12df6cab7a8 100644
   NSInteger tag = [sender tag];
   Profile* profile = [self lastProfile];
   DCHECK(profile);
-@@ -1152,6 +1153,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
+@@ -1202,6 +1203,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
          tag < static_cast<int>(applications.size()));
   const extensions::Extension* extension = applications.GetExtension(tag);
   BackgroundModeManager::LaunchBackgroundApplication(profile, extension);
@@ -18,7 +18,7 @@ index 189055ae0abb..f12df6cab7a8 100644
 }
 
 // Same as |-commandDispatch:|, but executes commands using a disposition
-@@ -1549,6 +1551,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
+@@ -1599,6 +1601,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
   // TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
   // tests which use the mock in place of the profile-initialized model.
 
@@ -26,7 +26,7 @@ index 189055ae0abb..f12df6cab7a8 100644
   // Avoid breaking unit tests which have no profile.
   if (profile) {
     BackgroundApplicationListModel applications(profile);
-@@ -1575,6 +1578,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
+@@ -1625,6 +1628,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
       }
     }
   }
@@ -35,10 +35,10 @@ index 189055ae0abb..f12df6cab7a8 100644
   return dockMenu;
 }
 diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
-index ee9693ce0bf9..29c6bfa6baa1 100644
+index 1ea08a7ad6ae..473ebde08451 100644
 --- chrome/browser/browser_process.h
 +++ chrome/browser/browser_process.h
-@@ -206,10 +206,12 @@ class BrowserProcess {
+@@ -202,10 +202,12 @@ class BrowserProcess {
   virtual DownloadStatusUpdater* download_status_updater() = 0;
   virtual DownloadRequestLimiter* download_request_limiter() = 0;
 
@@ -52,10 +52,10 @@ index ee9693ce0bf9..29c6bfa6baa1 100644
   // Returns the StatusTray, which provides an API for displaying status icons
   // in the system status tray. Returns NULL if status icons are not supported
 diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
-index cfa6979b9fb5..e4f584d1e549 100644
+index 35510d179897..79cdc358903c 100644
 --- chrome/browser/browser_process_impl.cc
 +++ chrome/browser/browser_process_impl.cc
-@@ -959,24 +959,19 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
+@@ -957,24 +957,19 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
   return download_request_limiter_.get();
 }
 
@@ -83,10 +83,10 @@ index cfa6979b9fb5..e4f584d1e549 100644
 StatusTray* BrowserProcessImpl::status_tray() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
-index e63afefc769d..afa0e2e59326 100644
+index 1d3c566cc59b..230c16644234 100644
 --- chrome/browser/browser_process_impl.h
 +++ chrome/browser/browser_process_impl.h
-@@ -165,9 +165,11 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -166,9 +166,11 @@ class BrowserProcessImpl : public BrowserProcess,
   void SetApplicationLocale(const std::string& actual_locale) override;
   DownloadStatusUpdater* download_status_updater() override;
   DownloadRequestLimiter* download_request_limiter() override;
@@ -99,10 +99,10 @@ index e63afefc769d..afa0e2e59326 100644
   safe_browsing::SafeBrowsingService* safe_browsing_service() override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
 diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
-index 845abd9ea9ab..29a5cfb36448 100644
+index e0cafee5eedd..06ded156be3c 100644
 --- chrome/browser/lifetime/browser_close_manager.cc
 +++ chrome/browser/lifetime/browser_close_manager.cc
-@@ -147,12 +147,14 @@ void BrowserCloseManager::CloseBrowsers() {
+@@ -148,12 +148,14 @@ void BrowserCloseManager::CloseBrowsers() {
   // exit can restore all browsers open before exiting.
   ProfileManager::ShutdownSessionServices();
 #endif
@@ -118,10 +118,10 @@ index 845abd9ea9ab..29a5cfb36448 100644
   // Make a copy of the BrowserList to simplify the case where we need to
   // destroy a Browser during the loop.
 diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc
-index 3ccad0af51e7..370475e9f5ff 100644
+index cbddcc52a8f6..02ab085c481c 100644
 --- chrome/browser/sessions/session_service.cc
 +++ chrome/browser/sessions/session_service.cc
-@@ -954,12 +954,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
+@@ -968,12 +968,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
   if (!profile() || profile()->AsTestingProfile())
     return;
 
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@@ -13,10 +13,10 @@ index ba0c5c3fc044..b4df9af95ecd 100644
   return false;
 }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index 2c9d816e1aff..a07928ddc18c 100644
+index 1dc23535c42a..4aae0399346f 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
-@@ -255,6 +255,20 @@
+@@ -257,6 +257,20 @@
 #include "components/captive_portal/content/captive_portal_tab_helper.h"
 #endif
 
@@ -37,8 +37,8 @@ index 2c9d816e1aff..a07928ddc18c 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_browser_window_helper.h"
 #endif
-@@ -477,6 +491,13 @@ Browser::Browser(const CreateParams& params)
- {
+@@ -480,6 +494,13 @@ Browser::Browser(const CreateParams& params)
+ 
   tab_strip_model_->AddObserver(this);
 
 +#if BUILDFLAG(ENABLE_CEF)
@@ -51,7 +51,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
   location_bar_model_ = std::make_unique<LocationBarModelImpl>(
       location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
 
-@@ -1335,6 +1356,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1343,6 +1364,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
   if (exclusive_access_manager_->HandleUserKeyEvent(event))
     return content::KeyboardEventProcessingResult::HANDLED;
 
@@ -66,7 +66,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
   return window()->PreHandleKeyboardEvent(event);
 }
 
-@@ -1342,8 +1371,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1350,8 +1379,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                   const NativeWebKeyboardEvent& event) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -87,7 +87,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
 }
 
 bool Browser::TabsNeedBeforeUnloadFired() {
-@@ -1572,6 +1611,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
+@@ -1579,6 +1618,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
     return window->OpenURLFromTab(source, params);
   }
 
@@ -102,7 +102,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
   NavigateParams nav_params(this, params.url, params.transition);
   nav_params.FillNavigateParamsFromOpenURLParams(params);
   nav_params.source_contents = source;
-@@ -1684,6 +1731,8 @@ void Browser::LoadingStateChanged(WebContents* source,
+@@ -1692,6 +1739,8 @@ void Browser::LoadingStateChanged(WebContents* source,
                                   bool to_different_document) {
   ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
   UpdateWindowForLoadingStateChanged(source, to_different_document);
@@ -111,7 +111,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
 }
 
 void Browser::CloseContents(WebContents* source) {
-@@ -1711,6 +1760,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
+@@ -1719,6 +1768,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
 }
 
 void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -120,7 +120,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
   if (!GetStatusBubble())
     return;
 
-@@ -1718,6 +1769,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+@@ -1726,6 +1777,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
     GetStatusBubble()->SetURL(url);
 }
 
@@ -138,7 +138,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
 void Browser::ContentsMouseEvent(WebContents* source,
                                  bool motion,
                                  bool exited) {
-@@ -1834,6 +1896,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
+@@ -1842,6 +1904,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
 
   // Make the tab show up in the task manager.
   task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -149,7 +149,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
 }
 
 void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
-@@ -1870,6 +1936,8 @@ void Browser::RendererResponsive(
+@@ -1878,6 +1944,8 @@ void Browser::RendererResponsive(
 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) {
   if (web_contents == tab_strip_model_->GetActiveWebContents())
     UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -158,7 +158,7 @@ index 2c9d816e1aff..a07928ddc18c 100644
 }
 
 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
-@@ -1916,11 +1984,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -1924,11 +1992,15 @@ void Browser::EnterFullscreenModeForTab(
     const blink::mojom::FullscreenOptions& options) {
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
@@ -174,8 +174,8 @@ index 2c9d816e1aff..a07928ddc18c 100644
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2814,6 +2886,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
-     content_translate_driver->RemoveObserver(this);
+@@ -2826,6 +2898,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+     content_translate_driver->RemoveTranslationObserver(this);
     BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
   }
 +
@@ -184,18 +184,18 @@ index 2c9d816e1aff..a07928ddc18c 100644
 
 void Browser::CloseFrame() {
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index afd852999cd7..a2d2df4838f7 100644
+index 7287ec00c3f5..93df2551fab7 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
-@@ -21,6 +21,7 @@
- #include "base/strings/string16.h"
+@@ -22,6 +22,7 @@
 #include "base/timer/elapsed_timer.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
+ #include "chrome/browser/profiles/scoped_profile_keep_alive.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
- #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
-@@ -56,6 +57,10 @@
+@@ -58,6 +59,10 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
@@ -206,7 +206,7 @@ index afd852999cd7..a2d2df4838f7 100644
 #if defined(OS_ANDROID)
 #error This file should only be included on desktop.
 #endif
-@@ -259,6 +264,11 @@ class Browser : public TabStripModelObserver,
+@@ -269,6 +274,11 @@ class Browser : public TabStripModelObserver,
     // User-set title of this browser window, if there is one.
     std::string user_title;
 
@@ -218,7 +218,7 @@ index afd852999cd7..a2d2df4838f7 100644
    private:
     friend class Browser;
     friend class WindowSizerChromeOSTest;
-@@ -377,6 +387,12 @@ class Browser : public TabStripModelObserver,
+@@ -386,6 +396,12 @@ class Browser : public TabStripModelObserver,
     return &signin_view_controller_;
   }
 
@@ -231,7 +231,7 @@ index afd852999cd7..a2d2df4838f7 100644
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
-@@ -762,6 +778,11 @@ class Browser : public TabStripModelObserver,
+@@ -770,6 +786,11 @@ class Browser : public TabStripModelObserver,
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -243,7 +243,7 @@ index afd852999cd7..a2d2df4838f7 100644
   void ContentsMouseEvent(content::WebContents* source,
                           bool motion,
                           bool exited) override;
-@@ -1229,6 +1250,10 @@ class Browser : public TabStripModelObserver,
+@@ -1240,6 +1261,10 @@ class Browser : public TabStripModelObserver,
       extension_browser_window_helper_;
 #endif
 
@@ -255,10 +255,10 @@ index afd852999cd7..a2d2df4838f7 100644
 
   // Stores the list of browser windows showing via a menu.
 diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
-index 9e3369185322..95abb6f37561 100644
+index 4bf854459b2c..20e348eb9293 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
-@@ -435,6 +435,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
+@@ -453,6 +453,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
   std::unique_ptr<WebContents> target_contents =
       WebContents::Create(create_params);
 
@@ -273,7 +273,7 @@ index 9e3369185322..95abb6f37561 100644
   // tab helpers, so the entire set of tab helpers needs to be set up
   // immediately.
 diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
-index 6f917199c655..bf7802b8d707 100644
+index 899b0e532c45..2fad68ec3e51 100644
 --- chrome/browser/ui/browser_tabstrip.cc
 +++ chrome/browser/ui/browser_tabstrip.cc
@@ -30,9 +30,13 @@ void AddTabAt(Browser* browser,
--- a/patch/patches/chrome_browser_content_settings.patch
+++ b/patch/patches/chrome_browser_content_settings.patch
@@ -54,10 +54,10 @@ index cf62b79358e1..4fe90fde38ff 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 c932b27c6ab2..862c2205d12c 100644
+index b6b38ab9a251..048c6f8c544f 100644
 --- components/content_settings/renderer/content_settings_agent_impl.cc
 +++ components/content_settings/renderer/content_settings_agent_impl.cc
-@@ -176,7 +176,7 @@ ContentSetting GetContentSettingFromRulesImpl(
+@@ -172,7 +172,7 @@ ContentSetting GetContentSettingFromRulesImpl(
       return rule.GetContentSetting();
     }
   }
--- a/patch/patches/chrome_browser_net_export.patch
+++ b/patch/patches/chrome_browser_net_export.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index d4de7dc10b2a..f5b030de54f0 100644
+index afee70a01862..e49e769b6366 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
-@@ -11,6 +11,7 @@ import("//build/config/features.gni")
+@@ -12,6 +12,7 @@ import("//build/config/features.gni")
 import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
@@ -10,7 +10,7 @@ index d4de7dc10b2a..f5b030de54f0 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//chromeos/assistant/assistant.gni")
-@@ -323,6 +324,10 @@ static_library("ui") {
+@@ -327,6 +328,10 @@ static_library("ui") {
     "//build/config/compiler:wexit_time_destructors",
   ]
 
@@ -21,15 +21,15 @@ index d4de7dc10b2a..f5b030de54f0 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
-@@ -344,6 +349,7 @@ static_library("ui") {
-     "//base/allocator:buildflags",
+@@ -349,6 +354,7 @@ static_library("ui") {
     "//build:branding_buildflags",
+     "//build:chromeos_buildflags",
     "//cc/paint",
 +    "//cef/libcef/features",
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -1531,6 +1537,7 @@ static_library("ui") {
+@@ -1553,6 +1559,7 @@ static_library("ui") {
       "//components/page_load_metrics/browser",
       "//components/performance_manager:site_data_proto",
       "//components/printing/browser",
@@ -37,7 +37,7 @@ index d4de7dc10b2a..f5b030de54f0 100644
       "//components/profile_metrics",
       "//components/reading_list/features:flags",
       "//components/safe_browsing/core/common:safe_browsing_policy_handler",
-@@ -3299,7 +3306,9 @@ static_library("ui") {
+@@ -3370,7 +3377,9 @@ static_library("ui") {
           "views/frame/browser_desktop_window_tree_host_platform.h",
         ]
       }
@@ -46,10 +46,10 @@ index d4de7dc10b2a..f5b030de54f0 100644
 +        sources += [ "views/frame/native_browser_frame_factory_ozone.cc" ]
 +      }
     }
-     if (is_linux) {
+     if (is_linux || is_chromeos_lacros) {
       sources += [
 diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
-index f27414c41891..5ff3bfa8f724 100644
+index a23323638a17..7bbfb9964415 100644
 --- chrome/browser/ui/webui/net_export_ui.cc
 +++ chrome/browser/ui/webui/net_export_ui.cc
@@ -21,6 +21,7 @@
@@ -85,7 +85,7 @@ index f27414c41891..5ff3bfa8f724 100644
   // Cached pointer to SystemNetworkContextManager's NetExportFileWriter.
   net_log::NetExportFileWriter* file_writer_;
 
-@@ -231,6 +243,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
+@@ -230,6 +242,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
   if (UsingMobileUI()) {
     StartNetLog(base::FilePath());
   } else {
@@ -99,7 +99,7 @@ index f27414c41891..5ff3bfa8f724 100644
     base::FilePath initial_dir = last_save_dir.Pointer()->empty() ?
         DownloadPrefs::FromBrowserContext(
             web_ui()->GetWebContents()->GetBrowserContext())->DownloadPath() :
-@@ -247,6 +266,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
+@@ -246,6 +265,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
   std::unique_ptr<base::DictionaryValue> ui_thread_polled_data(
       new base::DictionaryValue());
 
@@ -107,7 +107,7 @@ index f27414c41891..5ff3bfa8f724 100644
   Profile* profile = Profile::FromWebUI(web_ui());
   SetIfNotNull(ui_thread_polled_data.get(), "prerenderInfo",
                chrome_browser_net::GetPrerenderInfo(profile));
-@@ -256,6 +276,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
+@@ -255,6 +275,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
   SetIfNotNull(ui_thread_polled_data.get(), "serviceProviders",
                chrome_browser_net::GetWindowsServiceProviders());
 #endif
@@ -115,7 +115,7 @@ index f27414c41891..5ff3bfa8f724 100644
 
   file_writer_->StopNetLog(std::move(ui_thread_polled_data));
 }
-@@ -373,6 +394,42 @@ void NetExportMessageHandler::ShowSelectFileDialog(
+@@ -372,6 +393,42 @@ void NetExportMessageHandler::ShowSelectFileDialog(
       &file_type_info, 0, base::FilePath::StringType(), owning_window, nullptr);
 }
 
--- a/patch/patches/chrome_browser_product_override.patch
+++ b/patch/patches/chrome_browser_product_override.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 957a3e09113f..1d8a5bdac349 100644
+index 19c5989c8b67..e85ce53a22a1 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -1052,10 +1052,6 @@ void LaunchURL(const GURL& url,
+@@ -1067,10 +1067,6 @@ void LaunchURL(const GURL& url,
   }
 }
 
@@ -13,7 +13,7 @@ index 957a3e09113f..1d8a5bdac349 100644
 void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
   // |allowlist| combines pref/policy + cmdline switch in the browser process.
   // For renderer and utility (e.g. NetworkService) processes the switch is the
-@@ -1234,6 +1230,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
+@@ -1258,6 +1254,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
   return *greased_brand_version_list;
 }
 
@@ -29,10 +29,10 @@ index 957a3e09113f..1d8a5bdac349 100644
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUserAgent)) {
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index c6f87c148d16..bdc93db224d0 100644
+index 3ef2329ac8a6..3e3ede99e042 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -101,7 +101,8 @@ class ChromeXrIntegrationClient;
+@@ -108,7 +108,8 @@ class ChromeXrIntegrationClient;
 }
 #endif
 
--- a/patch/patches/chrome_browser_profiles.patch
+++ b/patch/patches/chrome_browser_profiles.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index 8af99f57cd5e..3801b8dc79af 100644
+index 102a4c5ce183..a6ce775156b4 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
-@@ -368,7 +368,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
+@@ -390,7 +390,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
                  content::NotificationService::AllSources());
 
@@ -12,10 +12,10 @@ index 8af99f57cd5e..3801b8dc79af 100644
 }
 
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index ccbe94c5b66b..834a01d6be84 100644
+index 1be24b4ee39c..4288383cb2a8 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
-@@ -103,7 +103,7 @@ class ProfileManager : public content::NotificationObserver,
+@@ -106,7 +106,7 @@ class ProfileManager : public content::NotificationObserver,
   // acceptable. Returns null if creation of the new profile fails.
   // TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
   // make this method private.
@@ -24,7 +24,7 @@ index ccbe94c5b66b..834a01d6be84 100644
 
   // Returns regular or off-the-record profile given its profile key.
   static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
-@@ -136,7 +136,7 @@ class ProfileManager : public content::NotificationObserver,
+@@ -139,7 +139,7 @@ class ProfileManager : public content::NotificationObserver,
 
   // Returns true if the profile pointer is known to point to an existing
   // profile.
@@ -33,7 +33,7 @@ index ccbe94c5b66b..834a01d6be84 100644
 
   // Returns the directory where the first created profile is stored,
   // relative to the user data directory currently in use.
-@@ -145,7 +145,7 @@ class ProfileManager : public content::NotificationObserver,
+@@ -148,7 +148,7 @@ class ProfileManager : public content::NotificationObserver,
   // Get the Profile last used (the Profile to which owns the most recently
   // focused window) with this Chrome build. If no signed profile has been
   // stored in Local State, hand back the Default profile.
@@ -43,29 +43,27 @@ index ccbe94c5b66b..834a01d6be84 100644
   // Get the path of the last used profile, or if that's undefined, the default
   // profile.
 diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
-index 4eb91c80e57a..02373b149bde 100644
+index 04bbd816692b..1af61cacc5cb 100644
 --- chrome/browser/profiles/renderer_updater.cc
 +++ chrome/browser/profiles/renderer_updater.cc
-@@ -7,6 +7,7 @@
- #include <utility>
+@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
-@@ -57,8 +58,12 @@ void GetGuestViewDefaultContentSettingRules(
+@@ -58,8 +59,12 @@ void GetGuestViewDefaultContentSettingRules(
 
 RendererUpdater::RendererUpdater(Profile* profile)
     : profile_(profile), identity_manager_observer_(this) {
-  identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
-  identity_manager_observer_.Add(identity_manager_);
 +  if (cef::IsAlloyRuntimeEnabled()) {
 +    identity_manager_ = nullptr;
 +  } else {
-+    identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
-+    identity_manager_observer_.Add(identity_manager_);
+   identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
+   identity_manager_observer_.Add(identity_manager_);
 +  }
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
   oauth2_login_manager_ =
       chromeos::OAuth2LoginManagerFactory::GetForProfile(profile_);
--- a/patch/patches/chrome_browser_safe_browsing.patch
+++ b/patch/patches/chrome_browser_safe_browsing.patch
@@ -1,12 +1,12 @@
 diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
-index 1cab7756e96f..77a8bdde7d62 100644
+index ae8aef3a076c..f7e6a91047ef 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
-@@ -256,6 +256,7 @@ static_library("safe_browsing") {
-         "//chrome/common/safe_browsing:download_type_util",
-         "//chrome/services/file_util/public/cpp",
-         "//components/content_settings/core/browser",
-+        "//components/gcm_driver:gcm_buildflags",
-         "//components/language/core/common",
-         "//components/prefs",
-         "//components/safe_browsing/core:client_model_proto",
+@@ -23,6 +23,7 @@ static_library("safe_browsing") {
+     "//chrome/common:constants",
+     "//components/browser_sync",
+     "//components/enterprise/common:strings",
+    "//components/gcm_driver:gcm_buildflags",
+     "//components/keyed_service/content",
+     "//components/language/core/browser",
+     "//components/page_info",
--- a/patch/patches/chrome_browser_sharesheet_1123388.patch
+++ b/patch/patches/chrome_browser_sharesheet_1123388.patch
@@ -1,26 +1,27 @@
 diff --git chrome/browser/sharesheet/sharesheet_service_delegate.cc chrome/browser/sharesheet/sharesheet_service_delegate.cc
-index 1ddf613c138f..00c497b67533 100644
+index 0b22a38aefb2..c7be7da822f6 100644
 --- chrome/browser/sharesheet/sharesheet_service_delegate.cc
 +++ chrome/browser/sharesheet/sharesheet_service_delegate.cc
-@@ -21,8 +21,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
-     content::WebContents* web_contents,
+@@ -19,8 +19,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
+     gfx::NativeWindow native_window,
     SharesheetService* sharesheet_service)
-     : id_(id),
+     : native_window_(native_window),
 +#if defined(OS_CHROMEOS)
       sharesheet_bubble_view_(
-           std::make_unique<SharesheetBubbleView>(web_contents, this)),
+           std::make_unique<SharesheetBubbleView>(native_window, this)),
 +#endif
       sharesheet_service_(sharesheet_service) {}
 
 SharesheetServiceDelegate::~SharesheetServiceDelegate() = default;
-@@ -31,18 +33,24 @@ void SharesheetServiceDelegate::ShowBubble(
-     std::vector<TargetInfo> targets,
-     apps::mojom::IntentPtr intent,
-     sharesheet::CloseCallback close_callback) {
+@@ -36,21 +38,27 @@ void SharesheetServiceDelegate::ShowBubble(
+     }
+     return;
+   }
 +#if defined(OS_CHROMEOS)
   sharesheet_bubble_view_->ShowBubble(std::move(targets), std::move(intent),
                                       std::move(close_callback));
 +#endif
+   is_bubble_open_ = true;
 }
 
 void SharesheetServiceDelegate::OnBubbleClosed(
@@ -28,7 +29,9 @@ index 1ddf613c138f..00c497b67533 100644
 +#if defined(OS_CHROMEOS)
   sharesheet_bubble_view_.release();
 +#endif
-   sharesheet_service_->OnBubbleClosed(id_, active_action);
+   sharesheet_service_->OnBubbleClosed(native_window_, active_action);
+   // This object is now deleted and nothing can be accessed any more.
+   // Therefore there is no need to set is_bubble_open_ to false.
 }
 
 void SharesheetServiceDelegate::OnActionLaunched() {
@@ -38,7 +41,7 @@ index 1ddf613c138f..00c497b67533 100644
 }
 
 void SharesheetServiceDelegate::OnTargetSelected(
-@@ -66,11 +74,15 @@ void SharesheetServiceDelegate::SetSharesheetSize(const int& width,
+@@ -74,11 +82,15 @@ void SharesheetServiceDelegate::SetSharesheetSize(const int& width,
                                                   const int& height) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
@@ -55,12 +58,12 @@ index 1ddf613c138f..00c497b67533 100644
 
 const gfx::VectorIcon* SharesheetServiceDelegate::GetVectorIcon(
 diff --git chrome/browser/sharesheet/sharesheet_service_delegate.h chrome/browser/sharesheet/sharesheet_service_delegate.h
-index e957b2c39772..80d9dc7b6c76 100644
+index 164a3a35a3f5..82b8c15820c9 100644
 --- chrome/browser/sharesheet/sharesheet_service_delegate.h
 +++ chrome/browser/sharesheet/sharesheet_service_delegate.h
-@@ -64,7 +64,9 @@ class SharesheetServiceDelegate : public SharesheetController {
-  private:
-   const uint32_t id_;
+@@ -65,7 +65,9 @@ class SharesheetServiceDelegate : public SharesheetController {
+   gfx::NativeWindow native_window_;
+ 
   base::string16 active_action_;
 +#if defined(OS_CHROMEOS)
   std::unique_ptr<SharesheetBubbleView> sharesheet_bubble_view_;
--- a/patch/patches/chrome_browser_themes.patch
+++ b/patch/patches/chrome_browser_themes.patch
@@ -42,18 +42,18 @@ index 08cafea4eb1c..e21eff668695 100644
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
 
 diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
-index caec77bbe3ba..92a813acc008 100644
+index 4f82e3d34746..b485befab711 100644
 --- chrome/browser/themes/theme_service_factory.cc
 +++ chrome/browser/themes/theme_service_factory.cc
-@@ -6,6 +6,7 @@
- 
+@@ -7,6 +7,7 @@
 #include "base/no_destructor.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-@@ -27,6 +28,10 @@
+@@ -30,6 +31,10 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
@@ -64,7 +64,7 @@ index caec77bbe3ba..92a813acc008 100644
 namespace {
 
 const ThemeHelper& GetThemeHelper() {
-@@ -70,7 +75,15 @@ ThemeServiceFactory::ThemeServiceFactory()
+@@ -73,7 +78,15 @@ ThemeServiceFactory::ThemeServiceFactory()
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
   DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
--- a/patch/patches/chrome_plugins.patch
+++ b/patch/patches/chrome_plugins.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
-index 1d19e684d0c2..382423f3f2ce 100644
+index dfa34db9255e..0a79d11c7e0c 100644
 --- chrome/browser/plugins/plugin_info_host_impl.cc
 +++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -82,7 +82,7 @@ index 1d19e684d0c2..382423f3f2ce 100644
   if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
     *status = chrome::mojom::PluginStatus::kAllowed;
     return;
-@@ -345,17 +368,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
+@@ -344,17 +367,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
     return false;
   }
 
@@ -127,7 +127,7 @@ index 1d19e684d0c2..382423f3f2ce 100644
   bool enabled = i < matching_plugins.size();
   if (!enabled) {
 diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
-index c78907c1d4ea..8297fa6a0162 100644
+index e547d5f00617..831d5794ecde 100644
 --- chrome/browser/plugins/plugin_utils.cc
 +++ chrome/browser/plugins/plugin_utils.cc
@@ -5,6 +5,7 @@
@@ -149,7 +149,7 @@ index c78907c1d4ea..8297fa6a0162 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
-@@ -168,6 +173,12 @@ base::flat_map<std::string, std::string>
+@@ -77,6 +82,12 @@ base::flat_map<std::string, std::string>
 PluginUtils::GetMimeTypeToExtensionIdMap(
     content::BrowserContext* browser_context) {
   base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
@@ -163,10 +163,10 @@ index c78907c1d4ea..8297fa6a0162 100644
   Profile* profile = Profile::FromBrowserContext(browser_context);
   const std::vector<std::string>& allowlist =
 diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
-index c1870b0f56ef..d32b8d54fb3f 100644
+index ce40f0039fe0..c8cbecb61455 100644
 --- chrome/common/google_url_loader_throttle.cc
 +++ chrome/common/google_url_loader_throttle.cc
-@@ -7,12 +7,17 @@
+@@ -7,6 +7,7 @@
 #include "base/feature_list.h"
 #include "base/metrics/histogram_functions.h"
 #include "build/build_config.h"
@@ -174,8 +174,9 @@ index c1870b0f56ef..d32b8d54fb3f 100644
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/net/safe_search_util.h"
 #include "components/google/core/common/google_util.h"
- #include "net/base/url_util.h"
+@@ -14,6 +15,10 @@
 #include "services/network/public/mojom/url_response_head.mojom.h"
+ #include "services/network/public/mojom/x_frame_options.mojom.h"
 
 +#if BUILDFLAG(ENABLE_CEF)
 +#include "cef/libcef/common/extensions/extensions_util.h"
@@ -184,7 +185,7 @@ index c1870b0f56ef..d32b8d54fb3f 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "extensions/common/extension_urls.h"
 #endif
-@@ -152,6 +157,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
+@@ -153,6 +158,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
     const GURL& response_url,
     network::mojom::URLResponseHead* response_head,
     bool* defer) {
@@ -193,14 +194,14 @@ index c1870b0f56ef..d32b8d54fb3f 100644
 +    return;
 +#endif
 +
-   // Built-in additional protection for the chrome web store origin.
-   GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
-   if (response_url.SchemeIsHTTPOrHTTPS() &&
+   // Built-in additional protection for the chrome web store origin by ensuring
+   // 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 7dbbe8742ca4..01a8b2e3eb24 100644
+index a1c26dfbd5cc..aaf96b069c32 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -831,6 +831,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -848,6 +848,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
 
     if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
          status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -208,7 +209,7 @@ index 7dbbe8742ca4..01a8b2e3eb24 100644
         content_settings_agent_delegate->IsPluginTemporarilyAllowed(
             identifier)) {
       status = chrome::mojom::PluginStatus::kAllowed;
-@@ -1029,7 +1030,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1046,7 +1047,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
         render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
             plugin_auth_host.BindNewEndpointAndPassReceiver());
         plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -218,7 +219,7 @@ index 7dbbe8742ca4..01a8b2e3eb24 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlocked: {
-@@ -1038,7 +1040,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1055,7 +1057,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
         placeholder->AllowLoading();
         RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -228,7 +229,7 @@ index 7dbbe8742ca4..01a8b2e3eb24 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -1048,7 +1051,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1065,7 +1068,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                        group_name));
         RenderThread::Get()->RecordAction(
             UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -238,7 +239,7 @@ index 7dbbe8742ca4..01a8b2e3eb24 100644
         break;
       }
       case chrome::mojom::PluginStatus::kBlockedNoLoading: {
-@@ -1056,7 +1060,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1073,7 +1077,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             IDR_BLOCKED_PLUGIN_HTML,
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
                                        group_name));
@@ -248,31 +249,13 @@ index 7dbbe8742ca4..01a8b2e3eb24 100644
         break;
       }
       case chrome::mojom::PluginStatus::kComponentUpdateRequired: {
-diff --git chrome/renderer/plugins/chrome_plugin_placeholder.cc chrome/renderer/plugins/chrome_plugin_placeholder.cc
-index f1370e70cc04..2109770d03e7 100644
--- chrome/renderer/plugins/chrome_plugin_placeholder.cc
-+++ chrome/renderer/plugins/chrome_plugin_placeholder.cc
-@@ -356,8 +356,11 @@ void ChromePluginPlaceholder::OnBlockedContent(
- 
-   if (status ==
-       content::RenderFrame::PeripheralContentStatus::CONTENT_STATUS_TINY) {
-    content_settings::ContentSettingsAgentImpl::Get(render_frame())
-        ->DidBlockContentType(ContentSettingsType::PLUGINS);
-+      content_settings::ContentSettingsAgentImpl *content_settings_agent =
-+          content_settings::ContentSettingsAgentImpl::Get(render_frame());
-+      if (content_settings_agent) {
-+        content_settings_agent->DidBlockContentType(ContentSettingsType::PLUGINS);
-+      }
-   }
- 
-   std::string message = base::StringPrintf(
 diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
-index 347c1f83b873..9d77ef57274d 100644
+index 06b6875bd37e..13c197b532ad 100644
 --- content/browser/browser_plugin/browser_plugin_guest.h
 +++ content/browser/browser_plugin/browser_plugin_guest.h
-@@ -127,6 +127,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
-   void EmbedderSystemDragEnded();
-   void EndSystemDragIfApplicable();
+@@ -115,6 +115,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
+ 
+   gfx::Point GetScreenCoordinates(const gfx::Point& relative_position) const;
 
 +  WebContentsImpl* owner_web_contents() const { return owner_web_contents_; }
 +
--- a/patch/patches/chrome_renderer.patch
+++ b/patch/patches/chrome_renderer.patch
@@ -1,24 +1,24 @@
 diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
-index fb7fa9ff4ed2..cf7be804968e 100644
+index 6a837ad9df98..7abef83f2a47 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
-@@ -4,6 +4,7 @@
- 
+@@ -5,6 +5,7 @@
 import("//build/config/buildflags_paint_preview.gni")
+ import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/features.gni")
 +import("//cef/libcef/features/features.gni")
 import("//chrome/common/features.gni")
 import("//components/nacl/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
-@@ -137,6 +138,7 @@ static_library("renderer") {
- 
+@@ -145,6 +146,7 @@ static_library("renderer") {
   deps = [
     "//base/allocator:buildflags",
+     "//build:chromeos_buildflags",
 +    "//cef/libcef/features",
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
-@@ -218,6 +220,10 @@ static_library("renderer") {
+@@ -226,6 +228,10 @@ static_library("renderer") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@@ -1,16 +1,16 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index d9a02faddd91..09a349fcf2b8 100644
+index db85b6b2fcf5..bcf6867e8f4e 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
-@@ -27,6 +27,7 @@
- #include "base/time/time.h"
+@@ -28,6 +28,7 @@
 #include "base/trace_event/trace_event_impl.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_resource_bundle_helper.h"
 #include "chrome/browser/defaults.h"
-@@ -378,6 +379,8 @@ struct MainFunction {
+@@ -381,6 +382,8 @@ struct MainFunction {
 
 // Initializes the user data dir. Must be called before InitializeLocalState().
 void InitializeUserDataDir(base::CommandLine* command_line) {
@@ -19,7 +19,7 @@ index d9a02faddd91..09a349fcf2b8 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.
-@@ -644,7 +647,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
+@@ -658,7 +661,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
   }
 
 #if defined(OS_WIN)
@@ -29,7 +29,7 @@ index d9a02faddd91..09a349fcf2b8 100644
   base::sequence_manager::internal::ThreadControllerPowerMonitor::
       InitializeOnMainThread();
 #endif
-@@ -926,6 +931,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -943,6 +948,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@@ -37,7 +37,7 @@ index d9a02faddd91..09a349fcf2b8 100644
   crash_reporter::InitializeCrashKeys();
 
 #if defined(OS_POSIX)
-@@ -936,6 +942,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -953,6 +959,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitMacCrashReporter(command_line, process_type);
   SetUpInstallerPreferences(command_line);
 #endif
@@ -45,7 +45,7 @@ index d9a02faddd91..09a349fcf2b8 100644
 
 #if defined(OS_WIN)
   child_process_logging::Init();
-@@ -1058,6 +1065,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1075,6 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
         locale;
   }
 
@@ -53,7 +53,7 @@ index d9a02faddd91..09a349fcf2b8 100644
 #if defined(OS_POSIX) && !defined(OS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
-@@ -1090,6 +1098,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1107,6 +1115,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 d9a02faddd91..09a349fcf2b8 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybeInitializeGDI();
-@@ -1188,6 +1197,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1205,6 +1214,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@@ -69,7 +69,7 @@ index d9a02faddd91..09a349fcf2b8 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 =
-@@ -1204,6 +1214,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1221,6 +1231,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@@ -78,7 +78,7 @@ index d9a02faddd91..09a349fcf2b8 100644
 
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index 195da4bea79f..5f2c60e63623 100644
+index fee4d5f1a8ca..2e4fb506d851 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@
@@ -89,7 +89,7 @@ index 195da4bea79f..5f2c60e63623 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/active_use_util.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -893,8 +894,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -902,8 +903,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.
@@ -101,7 +101,7 @@ index 195da4bea79f..5f2c60e63623 100644
 
   // These members must be initialized before returning from this function.
   // Android doesn't use StartupBrowserCreator.
-@@ -1615,11 +1618,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1634,11 +1637,13 @@ 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|.
@@ -113,9 +113,9 @@ index 195da4bea79f..5f2c60e63623 100644
                               last_opened_profiles);
 -  if (started) {
 +  if (started && g_run_loop) {
- #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-     // Initialize autoupdate timer. Timer callback costs basically nothing
-     // when browser is not in persistent mode, so it's OK to let it ride on
+ // 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))
 diff --git chrome/browser/notifications/notification_platform_bridge_mac.mm chrome/browser/notifications/notification_platform_bridge_mac.mm
 index 9e8fcb9f9f91..2a9eaca0fb0d 100644
 --- chrome/browser/notifications/notification_platform_bridge_mac.mm
--- a/patch/patches/chrome_widevine.patch
+++ b/patch/patches/chrome_widevine.patch
@@ -1,5 +1,5 @@
 diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
-index fa726c5a60fa..b84dd523542b 100644
+index 71bc09b46ad6..ddf0da9b330e 100644
 --- third_party/widevine/cdm/BUILD.gn
 +++ third_party/widevine/cdm/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/buildflag_header.gni")
--- a/patch/patches/component_build.patch
+++ b/patch/patches/component_build.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
-index 1d6121a4ba08..8e6735eca670 100644
+index 36ab5d592ecb..e61236132220 100644
 --- content/browser/devtools/devtools_instrumentation.h
 +++ content/browser/devtools/devtools_instrumentation.h
@@ -12,6 +12,7 @@
@@ -55,10 +55,10 @@ index 57072bf1263a..0a93446e4d21 100644
 blink::mojom::V8CacheOptions GetV8CacheOptions();
 
 diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
-index c5647d2dc509..1314c30b60c7 100644
+index 8ca399274164..d241798f4f28 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
-@@ -26,6 +26,7 @@ component("controller") {
+@@ -29,6 +29,7 @@ component("controller") {
   configs += [
     "//build/config/compiler:noshadowing",
     "//build/config/compiler:wexit_time_destructors",
@@ -66,7 +66,7 @@ index c5647d2dc509..1314c30b60c7 100644
     "//third_party/blink/renderer:config",
     "//third_party/blink/renderer:inside_blink",
     "//third_party/blink/renderer:non_test_config",
-@@ -50,6 +51,8 @@ component("controller") {
+@@ -53,6 +54,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",
@@ -76,7 +76,7 @@ index c5647d2dc509..1314c30b60c7 100644
 
   if (is_linux || is_chromeos) {
 diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
-index 4a2d0348caeb..42742d24ebed 100644
+index 86bbf620ff0d..6c06b461c6da 100644
 --- ui/events/keycodes/BUILD.gn
 +++ ui/events/keycodes/BUILD.gn
@@ -19,6 +19,8 @@ source_set("xkb") {
@@ -87,7 +87,7 @@ index 4a2d0348caeb..42742d24ebed 100644
 +
   deps = [
     "//base",
-     "//ui/events:dom_keycode_converter",
+     "//build:chromeos_buildflags",
 diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h
 index a1f9b78704fb..c7d3558251d9 100644
 --- ui/events/keycodes/keyboard_code_conversion_xkb.h
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
-index cdeecb35a998..1615185f2a65 100644
+index 21ab45886df2..ee7394fd10eb 100644
 --- chrome/browser/download/download_target_determiner.cc
 +++ chrome/browser/download/download_target_determiner.cc
@@ -660,7 +660,7 @@ void IsHandledBySafePlugin(int render_process_id,
@@ -12,7 +12,7 @@ index cdeecb35a998..1615185f2a65 100644
   if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
     // The GetPlugins call causes the plugin list to be refreshed. Once that's
 diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
-index e0437a2c3479..82896ca9e261 100644
+index c2bd9b8c3131..d1283cf3d9b2 100644
 --- chrome/browser/plugins/chrome_plugin_service_filter.cc
 +++ chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -132,6 +132,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -62,7 +62,7 @@ index 88fa7da1411e..98d0ea7650ed 100644
 #endif
 
 diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
-index f66e6bca5e2b..c99998449b6b 100644
+index 962bb7e2de76..40fc7e92c7cb 100644
 --- content/browser/devtools/devtools_http_handler.cc
 +++ content/browser/devtools/devtools_http_handler.cc
@@ -570,7 +570,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -75,10 +75,10 @@ index f66e6bca5e2b..c99998449b6b 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 69c7f35e8b6e..0a549792040b 100644
+index 2b0f1c354cf2..2d2dde9412c3 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
-@@ -633,6 +633,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
+@@ -611,6 +611,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
           resource_request_->has_user_gesture,
           resource_request_->request_initiator, &loader_factory);
 
@@ -92,7 +92,7 @@ index 69c7f35e8b6e..0a549792040b 100644
       if (loader_factory) {
         factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
             std::move(loader_factory));
-@@ -834,7 +841,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
+@@ -814,7 +821,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
       frame_tree_node->current_frame_host()->GetProcess()->GetID();
   int routing_id = frame_tree_node->current_frame_host()->GetRoutingID();
   bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
@@ -102,10 +102,10 @@ index 69c7f35e8b6e..0a549792040b 100644
 
   if (stale) {
 diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
-index 7caf00713119..3a4058a247be 100644
+index 68fe71981ceb..1b9aa078b517 100644
 --- content/browser/plugin_service_impl.cc
 +++ content/browser/plugin_service_impl.cc
-@@ -276,6 +276,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
+@@ -266,6 +266,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
 bool PluginServiceImpl::GetPluginInfo(int render_process_id,
                                       int render_frame_id,
                                       const GURL& url,
@@ -113,7 +113,7 @@ index 7caf00713119..3a4058a247be 100644
                                       const url::Origin& main_frame_origin,
                                       const std::string& mime_type,
                                       bool allow_wildcard,
-@@ -293,7 +294,8 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
+@@ -283,7 +284,8 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
   for (size_t i = 0; i < plugins.size(); ++i) {
     if (!filter_ ||
         filter_->IsPluginAvailable(render_process_id, render_frame_id, url,
@@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 100644
                           const std::vector<WebPluginInfo>& all_plugins);
 
 diff --git content/browser/renderer_host/render_frame_message_filter.cc content/browser/renderer_host/render_frame_message_filter.cc
-index ad253601284f..13c689ff7e5e 100644
+index 9cc3d077d14b..94af64f0c960 100644
 --- content/browser/renderer_host/render_frame_message_filter.cc
 +++ content/browser/renderer_host/render_frame_message_filter.cc
-@@ -194,6 +194,7 @@ void RenderFrameMessageFilter::OverrideThreadForMessage(
+@@ -144,6 +144,7 @@ void RenderFrameMessageFilter::OverrideThreadForMessage(
 void RenderFrameMessageFilter::OnGetPluginInfo(
     int render_frame_id,
     const GURL& url,
@@ -199,7 +199,7 @@ index ad253601284f..13c689ff7e5e 100644
     const url::Origin& main_frame_origin,
     const std::string& mime_type,
     bool* found,
-@@ -201,8 +202,9 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
+@@ -151,8 +152,9 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
     std::string* actual_mime_type) {
   bool allow_wildcard = true;
   *found = plugin_service_->GetPluginInfo(
@@ -212,11 +212,11 @@ index ad253601284f..13c689ff7e5e 100644
 
 void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin(
 diff --git content/browser/renderer_host/render_frame_message_filter.h content/browser/renderer_host/render_frame_message_filter.h
-index ff2ee2302d2a..e4db2bc08b5a 100644
+index 100c3936190c..b6a37c4220d9 100644
 --- content/browser/renderer_host/render_frame_message_filter.h
 +++ content/browser/renderer_host/render_frame_message_filter.h
-@@ -75,6 +75,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter {
- #if BUILDFLAG(ENABLE_PLUGINS)
+@@ -66,6 +66,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter {
+ 
   void OnGetPluginInfo(int render_frame_id,
                        const GURL& url,
 +                       bool is_main_frame,
@@ -224,10 +224,10 @@ index ff2ee2302d2a..e4db2bc08b5a 100644
                        const std::string& mime_type,
                        bool* found,
 diff --git content/common/frame_messages.h content/common/frame_messages.h
-index 34e40d5fd8eb..aef36ad96a5a 100644
+index 4bb04980b544..4e1e448a8bfc 100644
 --- content/common/frame_messages.h
 +++ content/common/frame_messages.h
-@@ -440,9 +440,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
+@@ -249,9 +249,10 @@ IPC_MESSAGE_ROUTED2(FrameMsg_CustomContextMenuAction,
 // type. If there is no matching plugin, |found| is false.
 // |actual_mime_type| is the actual mime type supported by the
 // found plugin.
@@ -240,31 +240,31 @@ index 34e40d5fd8eb..aef36ad96a5a 100644
                             std::string /* mime_type */,
                             bool /* found */,
 diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
-index 3a2957836151..b3a3a2c7a649 100644
+index 4438e0417b3c..cdc59afa7f54 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
 // declarations instead of including more headers. If that is infeasible, adjust
 // the limit. For more info, see
 // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
-#pragma clang max_tokens_here 910000
-+// #pragma clang max_tokens_here 910000
+-#pragma clang max_tokens_here 830000
+// #pragma clang max_tokens_here 830000
 
 #include <utility>
 
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index ce69e43769b2..ce91333894e5 100644
+index df6e463d1518..68ab6d8748eb 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
-@@ -30,6 +30,7 @@
- #include "content/public/browser/certificate_request_result_type.h"
+@@ -32,6 +32,7 @@
 #include "content/public/browser/generated_code_cache_settings.h"
+ #include "content/public/browser/mojo_binder_policy_map.h"
 #include "content/public/browser/storage_partition_config.h"
 +#include "content/public/browser/web_contents.h"
 #include "content/public/common/page_visibility_state.h"
 #include "content/public/common/window_container_type.mojom-forward.h"
 #include "device/vr/buildflags/buildflags.h"
-@@ -1678,6 +1679,14 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1686,6 +1687,14 @@ class CONTENT_EXPORT ContentBrowserClient {
       const base::Optional<url::Origin>& initiating_origin,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
 
@@ -279,7 +279,7 @@ index ce69e43769b2..ce91333894e5 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.
-@@ -1749,6 +1758,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1757,6 +1766,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Used as part of the user agent string.
   virtual std::string GetProduct();
 
@@ -315,7 +315,7 @@ index 98c59005599e..69752184745d 100644
                                  WebPluginInfo* plugin) = 0;
 
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index e9def973e93c..1fe148c4f429 100644
+index a4695ba832fc..3eb41cb569b1 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
@@ -85,6 +85,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -328,7 +328,7 @@ index e9def973e93c..1fe148c4f429 100644
   // Notifies that a new RenderFrame has been created.
   virtual void RenderFrameCreated(RenderFrame* render_frame) {}
 
-@@ -308,6 +311,10 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -301,6 +304,10 @@ class CONTENT_EXPORT ContentRendererClient {
   // This method may invalidate the frame.
   virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
 
@@ -340,10 +340,10 @@ index e9def973e93c..1fe148c4f429 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 340642fd854c..c031facf8897 100644
+index fcb99889673b..9d50aa58f325 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -3737,7 +3737,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -3639,7 +3639,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
   std::string mime_type;
   bool found = false;
   Send(new FrameHostMsg_GetPluginInfo(
@@ -354,10 +354,10 @@ index 340642fd854c..c031facf8897 100644
   if (!found)
     return nullptr;
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index a4240c7c75a3..df18416ac09e 100644
+index aa1fc3821b47..922aacc8f08e 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -624,6 +624,8 @@ void RenderThreadImpl::Init() {
+@@ -609,6 +609,8 @@ void RenderThreadImpl::Init() {
       GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
           URLLoaderThrottleProviderType::kFrame);
 
@@ -367,10 +367,10 @@ index a4240c7c75a3..df18416ac09e 100644
       &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
 
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 1fa872443617..758812fbb3a2 100644
+index d21f7e95c856..98f3739e60fc 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -974,6 +974,15 @@ void RendererBlinkPlatformImpl::SetActiveURL(const blink::WebURL& url,
+@@ -996,6 +996,15 @@ void RendererBlinkPlatformImpl::SetActiveURL(const blink::WebURL& url,
 
 //------------------------------------------------------------------------------
 
@@ -387,10 +387,10 @@ index 1fa872443617..758812fbb3a2 100644
   if (!code_cache_host_) {
     code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index 0bbe077c86a7..723dca391001 100644
+index c8470ab1919a..2c000a557a0a 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -213,6 +213,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -218,6 +218,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
   void SetActiveURL(const blink::WebURL& url,
                     const blink::WebString& top_url) override;
 
--- a/patch/patches/content_main_654986.patch
+++ b/patch/patches/content_main_654986.patch
@@ -94,10 +94,10 @@ index 2aba28d210db..5413f08af93d 100644
   return RunContentProcess(params, runner.get());
 }
 diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
-index 6f5d40dd324d..8fa1397f0353 100644
+index 811017f5d455..00e4020dea17 100644
 --- content/app/content_main_runner_impl.cc
 +++ content/app/content_main_runner_impl.cc
-@@ -46,6 +46,7 @@
+@@ -48,6 +48,7 @@
 #include "base/task/post_task.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "base/threading/hang_watcher.h"
@@ -105,7 +105,7 @@ index 6f5d40dd324d..8fa1397f0353 100644
 #include "base/trace_event/trace_event.h"
 #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "components/download/public/common/download_task_runner.h"
-@@ -589,7 +590,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
+@@ -629,7 +630,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
 #else  // !OS_WIN
 
 #if defined(OS_MAC)
@@ -114,7 +114,7 @@ index 6f5d40dd324d..8fa1397f0353 100644
 #endif  // defined(OS_MAC)
 
 #if defined(OS_ANDROID)
-@@ -1039,6 +1040,11 @@ void ContentMainRunnerImpl::Shutdown() {
+@@ -1089,6 +1090,11 @@ void ContentMainRunnerImpl::Shutdown() {
   is_shutdown_ = true;
 }
 
@@ -127,11 +127,11 @@ index 6f5d40dd324d..8fa1397f0353 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 30d5515b3af8..d59b4779afef 100644
+index 86c624e53cf9..090171f7db22 100644
 --- content/app/content_main_runner_impl.h
 +++ content/app/content_main_runner_impl.h
@@ -39,7 +39,7 @@ class ContentMainDelegate;
- class ServiceManagerEnvironment;
+ class MojoIpcSupport;
 struct ContentMainParams;
 
 -class ContentMainRunnerImpl : public ContentMainRunner {
@@ -140,14 +140,14 @@ index 30d5515b3af8..d59b4779afef 100644
   static std::unique_ptr<ContentMainRunnerImpl> Create();
 
@@ -53,6 +53,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
-   int Run(bool start_service_manager_only) override;
+   int Run(bool start_minimal_browser) override;
   void Shutdown() override;
 
 +  void ShutdownOnUIThread();
 +
  private:
-   int RunServiceManager(MainFunctionParams& main_function_params,
-                         bool start_service_manager_only);
+   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 8b829a488773..a69a08869728 100644
 --- content/common/set_process_title.cc
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@@ -81,7 +81,7 @@ index 886372e11489..ad3bc2242883 100644
   g_crash_helper_enabled = true;
   return true;
 diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
-index e71c5e51118b..1dca5b2c378f 100644
+index b84f727c9dc6..817df167e5a6 100644
 --- chrome/common/crash_keys.cc
 +++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@
@@ -93,7 +93,7 @@ index e71c5e51118b..1dca5b2c378f 100644
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
-@@ -27,7 +29,7 @@
+@@ -28,7 +30,7 @@
 namespace crash_keys {
 
 // Return true if we DON'T want to upload this flag to the crash server.
@@ -102,7 +102,7 @@ index e71c5e51118b..1dca5b2c378f 100644
   static const char* const kIgnoreSwitches[] = {
     switches::kEnableLogging,
     switches::kFlagSwitchesBegin,
-@@ -80,7 +82,7 @@ static bool IsBoringSwitch(const std::string& flag) {
+@@ -81,7 +83,7 @@ static bool IsBoringSwitch(const std::string& flag) {
 }
 
 void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
@@ -127,7 +127,7 @@ index bcf172e645a2..f879aa745adf 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 9d8370ef035f..9950cd16660e 100644
+index 9e850c0380b8..e06d0a26617a 100644
 --- components/crash/core/app/breakpad_linux.cc
 +++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
@@ -138,7 +138,7 @@ index 9d8370ef035f..9950cd16660e 100644
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/linux_util.h"
-@@ -718,7 +719,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
+@@ -719,7 +720,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
   info.process_type_length = 7;
   info.distro = base::g_linux_distro;
   info.distro_length = my_strlen(base::g_linux_distro);
@@ -147,7 +147,7 @@ index 9d8370ef035f..9950cd16660e 100644
   info.process_start_time = g_process_start_time;
   info.oom_size = base::g_oom_size;
   info.pid = g_pid;
-@@ -1732,10 +1733,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
+@@ -1733,10 +1734,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
     GetCrashReporterClient()->GetProductNameAndVersion(&product_name, &version);
 
     writer.AddBoundary();
@@ -169,7 +169,7 @@ index 9d8370ef035f..9950cd16660e 100644
     if (info.pid > 0) {
       char pid_value_buf[kUint64StringSize];
       uint64_t pid_value_len = my_uint64_len(info.pid);
-@@ -1852,6 +1862,9 @@ void HandleCrashDump(const BreakpadInfo& info) {
+@@ -1853,6 +1863,9 @@ void HandleCrashDump(const BreakpadInfo& info) {
         crash_reporter::internal::TransitionalCrashKeyStorage;
     CrashKeyStorage::Iterator crash_key_iterator(*info.crash_keys);
     const CrashKeyStorage::Entry* entry;
@@ -179,7 +179,7 @@ index 9d8370ef035f..9950cd16660e 100644
     while ((entry = crash_key_iterator.Next())) {
       size_t key_size, value_size;
       // Check for malformed messages.
-@@ -1862,7 +1875,13 @@ void HandleCrashDump(const BreakpadInfo& info) {
+@@ -1863,7 +1876,13 @@ void HandleCrashDump(const BreakpadInfo& info) {
                        ? CrashKeyStorage::value_size - 1
                        : my_strlen(entry->value);
 
@@ -349,10 +349,10 @@ index aaa9ad1d58d7..14b98b2e6598 100644
 
 }  // namespace crash_reporter
 diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
-index e1c66df6cecf..681dd496292e 100644
+index 64ca38330be7..4de20a66cd99 100644
 --- components/crash/core/app/crashpad.cc
 +++ components/crash/core/app/crashpad.cc
-@@ -151,7 +151,8 @@ void InitializeCrashpadImpl(bool initial_client,
+@@ -152,7 +152,8 @@ void 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 5761c6b965b5..aee4e6c96033 100644
   struct Data;
 
 diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
-index 623c833fed68..af28fce9edfc 100644
+index 1d5951e8fc00..599dde825883 100644
 --- third_party/crashpad/crashpad/handler/BUILD.gn
 +++ third_party/crashpad/crashpad/handler/BUILD.gn
@@ -12,6 +12,7 @@
@@ -177,8 +177,8 @@ index 623c833fed68..af28fce9edfc 100644
   public_deps = [
@@ -77,6 +89,7 @@ static_library("handler") {
     "../snapshot",
+     "../third_party/mini_chromium:chromeos_buildflags",
     "../tools:tool_support",
-     "//build:chromeos_buildflags",
 +    "//cef/libcef/features",
   ]
 
@@ -248,7 +248,7 @@ index 2ec1147d2620..8ff9a72e0bd7 100644
   //! \brief Calls ProcessPendingReports() in response to ReportPending() having
   //!     been called on any thread, as well as periodically on a timer.
 diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
-index d00026605537..0fa0cacbbae2 100644
+index 737ee4e09f67..f5a8727f7e6b 100644
 --- third_party/crashpad/crashpad/handler/handler_main.cc
 +++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -39,6 +39,7 @@
@@ -277,7 +277,7 @@ index d00026605537..0fa0cacbbae2 100644
 +  int max_uploads;
 +  int max_database_size;
 +  int max_database_age;
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   bool use_cros_crash_reporter = false;
   base::FilePath minidump_dir_for_tests;
@@ -577,6 +585,9 @@ int HandlerMain(int argc,
@@ -287,7 +287,7 @@ index d00026605537..0fa0cacbbae2 100644
 +    kOptionMaxUploads,
 +    kOptionMaxDatabaseSize,
 +    kOptionMaxDatabaseAge,
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     kOptionUseCrosCrashReporter,
     kOptionMinidumpDirForTests,
@@ -678,6 +689,9 @@ int HandlerMain(int argc,
@@ -325,7 +325,7 @@ index d00026605537..0fa0cacbbae2 100644
 +        }
 +        break;
 +      }
- #if BUILDFLAG(IS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       case kOptionUseCrosCrashReporter: {
         options.use_cros_crash_reporter = true;
@@ -982,8 +1017,14 @@ int HandlerMain(int argc,
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@@ -132,10 +132,18 @@ index 11bfec21cc9f..416de61f85fa 100644
   // A weak pointer to the current or pending RenderViewHost. We don't access
   // this through the host_contents because we want to deal with the pending
 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
-index 1702638ab5b9..49de950d83d8 100644
+index c2d194ec21be..3a7354f648ed 100644
 --- extensions/browser/extensions_browser_client.h
 +++ extensions/browser/extensions_browser_client.h
-@@ -63,6 +63,7 @@ class ComponentExtensionResourceManager;
+@@ -27,6 +27,7 @@
+ #include "ui/base/page_transition_types.h"
+ 
+ class ExtensionFunctionRegistry;
+class GURL;
+ class PrefService;
+ 
+ namespace base {
+@@ -62,6 +63,7 @@ class ComponentExtensionResourceManager;
 class Extension;
 class ExtensionCache;
 class ExtensionError;
@@ -143,7 +151,7 @@ index 1702638ab5b9..49de950d83d8 100644
 class ExtensionHostDelegate;
 class ExtensionSet;
 class ExtensionSystem;
-@@ -205,6 +206,14 @@ class ExtensionsBrowserClient {
+@@ -204,6 +206,14 @@ class ExtensionsBrowserClient {
   virtual std::unique_ptr<ExtensionHostDelegate>
   CreateExtensionHostDelegate() = 0;
 
@@ -159,10 +167,10 @@ index 1702638ab5b9..49de950d83d8 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 f41d44299518..41e892cdf240 100644
+index 337921842180..c78e1d114a12 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
-@@ -411,9 +411,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
+@@ -395,9 +395,16 @@ 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/gn_config.patch
+++ b/patch/patches/gn_config.patch
@@ -1,8 +1,8 @@
 diff --git .gn .gn
-index aed1fea955bd..3c5036a04706 100644
+index 0c25000917fb..cdaf3a6799c2 100644
 --- .gn
 +++ .gn
-@@ -290,6 +290,8 @@ exec_script_whitelist =
+@@ -275,6 +275,8 @@ exec_script_whitelist =
 
       "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
 
@@ -12,10 +12,10 @@ index aed1fea955bd..3c5036a04706 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 85198646cd31..6c1dbf6921a2 100644
+index 86c82ac5cf8a..e355bb940181 100644
 --- BUILD.gn
 +++ BUILD.gn
-@@ -232,6 +232,7 @@ group("gn_all") {
+@@ -234,6 +234,7 @@ group("gn_all") {
 
   if (!is_ios && !is_fuchsia) {
     deps += [
@@ -56,18 +56,18 @@ index 982fbe8d3f0d..e757be4688f1 100644
 +         "studio path")
 }
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index 4a475a66ebdf..9fcb9853f71d 100644
+index 6ad9c87a3adf..33716990c792 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
-@@ -3,6 +3,7 @@
- # found in the LICENSE file.
+@@ -4,6 +4,7 @@
 
+ import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/locales.gni")
 +import("//cef/libcef/features/features.gni")
 import("//chrome/browser/buildflags.gni")
+ import("//chrome/browser/resources/pdf/ink/ink.gni")
 import("//chrome/common/features.gni")
- import("//chromeos/components/media_app_ui/media_app_ui.gni")
-@@ -332,6 +333,7 @@ template("chrome_paks") {
+@@ -344,6 +345,7 @@ template("chrome_paks") {
     }
   }
 
@@ -75,7 +75,7 @@ index 4a475a66ebdf..9fcb9853f71d 100644
   chrome_repack_locales("${target_name}_locales") {
     forward_variables_from(invoker,
                            [
-@@ -354,14 +356,17 @@ template("chrome_paks") {
+@@ -366,14 +368,17 @@ template("chrome_paks") {
       output_locales = locales
     }
   }
@@ -95,7 +95,7 @@ index 4a475a66ebdf..9fcb9853f71d 100644
       public_deps += [ ":${target_name}_200_percent" ]
     }
 diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
-index a75484da690f..107e42c68592 100644
+index 5f5cb1c752f2..ef0a01caf9cd 100644
 --- chrome/installer/mini_installer/BUILD.gn
 +++ chrome/installer/mini_installer/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
@@ -106,18 +106,18 @@ index a75484da690f..107e42c68592 100644
 import("//chrome/process_version_rc_template.gni")
 import("//components/nacl/features.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
-@@ -144,11 +145,13 @@ template("generate_mini_installer") {
-     inputs = [
-       "$chrome_dll_file",
-       "$root_out_dir/chrome.exe",
-      "$root_out_dir/locales/en-US.pak",
-       "$root_out_dir/setup.exe",
-       "//chrome/tools/build/win/makecab.py",
-       release_file,
-     ]
-+    if (!enable_cef) {
-+      inputs += [ "$root_out_dir/locales/en-US.pak" ]
-+    }
+@@ -122,11 +123,13 @@ python2_action("mini_installer_archive") {
+   inputs = [
+     "$root_out_dir/chrome.dll",
+     "$root_out_dir/chrome.exe",
+-    "$root_out_dir/locales/en-US.pak",
+     "$root_out_dir/setup.exe",
+     "//chrome/tools/build/win/makecab.py",
+     release_file,
+   ]
+  if (!enable_cef) {
+    inputs += [ "$root_out_dir/locales/en-US.pak" ]
+  }
 
-     outputs = [
-       # See also chrome.packed.7z conditionally added below.
+   outputs = [
+     # See also chrome.packed.7z conditionally added below.
--- 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 cb06259b198c..c5e4c54de5b8 100644
+index 1343d7c03b07..79843c9d7ae7 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -685,4 +685,13 @@
+@@ -703,4 +703,13 @@
   # Please read the header and find the right section above instead.
 
   # Resource ids starting at 31000 are reserved for projects built on Chromium.
--- a/patch/patches/ime_1610.patch
+++ b/patch/patches/ime_1610.patch
@@ -1,5 +1,5 @@
 diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
-index fc9c8d3a0f2c..6098c4d1c9b9 100644
+index f07ce6fef458..c3d3b2eb50dd 100644
 --- ui/base/ime/win/input_method_win_base.cc
 +++ ui/base/ime/win/input_method_win_base.cc
@@ -246,8 +246,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
--- a/patch/patches/linux_assets_path_1936.patch
+++ b/patch/patches/linux_assets_path_1936.patch
@@ -25,10 +25,10 @@ index 0aaed76c1dda..517c3d8b5772 100644
     if (base::PathExists(sandbox_candidate))
       sandbox_binary = sandbox_candidate;
 diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
-index a5c030d5f3d3..a5a8c68d98c1 100644
+index fb6aab8f450c..115f88ed649e 100644
 --- ui/gl/init/gl_initializer_linux_x11.cc
 +++ ui/gl/init/gl_initializer_linux_x11.cc
-@@ -86,7 +86,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
+@@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {
   if (implementation == kGLImplementationSwiftShaderGL) {
 #if BUILDFLAG(ENABLE_SWIFTSHADER)
     base::FilePath module_path;
@@ -37,12 +37,12 @@ index a5c030d5f3d3..a5a8c68d98c1 100644
       return false;
     module_path = module_path.Append("swiftshader/");
 
-@@ -97,7 +97,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
- #endif
+@@ -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;
 
-     glesv2_path = module_path.Append(kGLESv2ANGLELibraryName);
+     const char kGLESv2ANGLELibraryName[] = "libGLESv2.so";
--- a/patch/patches/linux_poll_2466.patch
+++ b/patch/patches/linux_poll_2466.patch
@@ -1,5 +1,5 @@
 diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc
-index 4e231b615e8f..ffb027ebb0a3 100644
+index b125a023576b..2ed33e44379c 100644
 --- base/files/file_path_watcher_linux.cc
 +++ base/files/file_path_watcher_linux.cc
@@ -5,6 +5,7 @@
@@ -18,7 +18,7 @@ index 4e231b615e8f..ffb027ebb0a3 100644
 #include <fstream>
 #include <map>
 #include <memory>
-@@ -263,19 +265,16 @@ void InotifyReaderThreadDelegate::ThreadMain() {
+@@ -264,19 +266,16 @@ void InotifyReaderThreadDelegate::ThreadMain() {
   PlatformThread::SetName("inotify_reader");
 
   // Make sure the file descriptors are good for use with select().
--- a/patch/patches/mac_gpu.patch
+++ b/patch/patches/mac_gpu.patch
@@ -1,5 +1,5 @@
 diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
-index d8ad42a07552..57f725b1d088 100644
+index f659291023ac..3b8c88a37814 100644
 --- ui/gl/init/gl_initializer_mac.cc
 +++ ui/gl/init/gl_initializer_mac.cc
@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {
--- a/patch/patches/mime_handler_view_embedder_1133115.patch
+++ b/patch/patches/mime_handler_view_embedder_1133115.patch
@@ -1,13 +0,0 @@
-diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
-index 045cc6e50916..205945f06910 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
-+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
-@@ -110,7 +110,7 @@ void MimeHandlerViewEmbedder::DidFinishNavigation(
-     return;
-   // We should've deleted the MimeHandlerViewEmbedder at this point if the frame
-   // is sandboxed.
-  DCHECK(!render_frame_host_->IsSandboxed(
-+  DCHECK(!render_frame_host_ || !render_frame_host_->IsSandboxed(
-       network::mojom::WebSandboxFlags::kPlugins));
- }
- 
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@@ -10,10 +10,10 @@ index 96d1a51ec107..e8120a818b1f 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 dd533f15e3d0..3773c1b9cf2b 100644
+index 9d993cce5e0e..bc12684c73c6 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
-@@ -574,7 +574,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
+@@ -539,7 +539,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 dd533f15e3d0..3773c1b9cf2b 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 ee0150fbd6d0..03d167f6ccfd 100644
+index 355ca24e301c..3bdbde36de39 100644
 --- services/network/public/cpp/resource_request.cc
 +++ services/network/public/cpp/resource_request.cc
-@@ -128,7 +128,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
+@@ -176,7 +176,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 cc4b13a7b9c6..84f3b9ed7cf4 100644
 
 }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index 19f90228473a..46e86591c898 100644
+index e23394ae63cd..3d8e02a0b189 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2814,6 +2814,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
+@@ -2915,6 +2915,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
       GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
 }
 
@@ -57,10 +57,10 @@ index 19f90228473a..46e86591c898 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 aef170316a5e..2e1a0d1245c9 100644
+index 3dd95dcf37cb..024cc350fe96 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
-@@ -725,6 +725,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -743,6 +743,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   void ProgressFlingIfNeeded(base::TimeTicks current_time);
   void StopFling();
--- a/patch/patches/print_preview_123.patch
+++ b/patch/patches/print_preview_123.patch
@@ -1,16 +1,16 @@
 diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
-index 69a0e4c0e6fb..6751d51b8435 100644
+index 4e04a86c2d06..6d82d55acd15 100644
 --- chrome/browser/download/download_prefs.cc
 +++ chrome/browser/download/download_prefs.cc
-@@ -23,6 +23,7 @@
- #include "base/strings/sys_string_conversions.h"
+@@ -24,6 +24,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_core_service_factory.h"
 #include "chrome/browser/download/download_core_service_impl.h"
-@@ -57,6 +58,10 @@
+@@ -58,6 +59,10 @@
 #include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
 #endif
 
@@ -21,7 +21,7 @@ index 69a0e4c0e6fb..6751d51b8435 100644
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
-@@ -357,6 +362,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
+@@ -358,6 +363,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
 // static
 DownloadPrefs* DownloadPrefs::FromBrowserContext(
     content::BrowserContext* context) {
@@ -34,18 +34,18 @@ index 69a0e4c0e6fb..6751d51b8435 100644
 }
 
 diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
-index 3fadaba3336f..5ef67b35883d 100644
+index 97cae92b96fa..6acf5188e1d6 100644
 --- chrome/browser/printing/print_preview_dialog_controller.cc
 +++ chrome/browser/printing/print_preview_dialog_controller.cc
-@@ -16,6 +16,7 @@
- #include "base/strings/utf_string_conversions.h"
+@@ -17,6 +17,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
+ #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"
-@@ -451,8 +452,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
+@@ -452,8 +453,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
   content::HostZoomMap::Get(preview_dialog->GetSiteInstance())
       ->SetZoomLevelForHostAndScheme(print_url.scheme(), print_url.host(), 0);
   PrintViewManager::CreateForWebContents(preview_dialog);
@@ -58,13 +58,13 @@ index 3fadaba3336f..5ef67b35883d 100644
   // Add an entry to the map.
   preview_dialog_map_[preview_dialog] = initiator;
 diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
-index 277f2ca033d1..06465c4616a3 100644
+index ae1ab34986d1..b742e9fffaf3 100644
 --- chrome/browser/printing/print_view_manager_base.cc
 +++ chrome/browser/printing/print_view_manager_base.cc
-@@ -21,6 +21,7 @@
- #include "base/threading/thread_task_runner_handle.h"
+@@ -22,6 +22,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"
@@ -79,8 +79,8 @@ index 277f2ca033d1..06465c4616a3 100644
 +
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/print_error_dialog.h"
- #endif
-@@ -196,8 +201,11 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
+ #include "chrome/browser/printing/print_view_manager.h"
+@@ -201,8 +206,11 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::WebContents* web_contents =
       GetWebContentsForRenderFrame(render_process_id, render_frame_id);
@@ -95,10 +95,10 @@ index 277f2ca033d1..06465c4616a3 100644
 
 void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
 diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
-index e22cff218a56..6cff432e4f08 100644
+index 93103940036e..1b12b91cdf4b 100644
 --- chrome/browser/printing/print_view_manager_base.h
 +++ chrome/browser/printing/print_view_manager_base.h
-@@ -118,9 +118,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
+@@ -122,9 +122,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // Manages the low-level talk to the printer.
   scoped_refptr<PrintJob> print_job_;
 
@@ -108,22 +108,12 @@ index e22cff218a56..6cff432e4f08 100644
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
-@@ -132,6 +129,9 @@ class PrintViewManagerBase : public content::NotificationObserver,
-   // Cancels the print job.
-   void NavigationStopped() override;
- 
-+ private:
-+  friend class TestPrintViewManager;
-+
-   // printing::PrintManager:
-   void OnDidPrintDocument(
-       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 01ac8b5153e1..20f5e5b9d099 100644
+index df858712d3be..cd146ea0f26b 100644
 --- chrome/browser/resources/print_preview/ui/destination_dialog.html
 +++ chrome/browser/resources/print_preview/ui/destination_dialog.html
-@@ -133,10 +133,7 @@
-     </print-preview-provisional-destination-resolver>
+@@ -25,10 +25,7 @@
+     </print-preview-destination-list>
   </div>
   <div slot="button-container">
 -    <cr-button on-click="onManageButtonClick_">
@@ -174,18 +164,18 @@ index 3d415a60d436..807ab41ee6ef 100644
 
 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
 diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
-index c48314e52e83..f0a64a0be931 100644
+index 181a4132f1be..4344ceaf83e5 100644
 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
 +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
-@@ -20,6 +20,7 @@
- #include "base/task/thread_pool.h"
+@@ -21,6 +21,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_prefs.h"
-@@ -53,6 +54,10 @@
+@@ -54,6 +55,10 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #endif
 
@@ -196,7 +186,7 @@ index c48314e52e83..f0a64a0be931 100644
 namespace printing {
 
 namespace {
-@@ -376,10 +381,27 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
+@@ -377,10 +382,27 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
   // If the directory is empty there is no reason to create it or use the
   // default location.
   if (path.empty()) {
@@ -224,7 +214,7 @@ index c48314e52e83..f0a64a0be931 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_);
-@@ -387,8 +409,7 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
+@@ -388,8 +410,7 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
   base::ThreadPool::PostTaskAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
       base::BindOnce(&SelectSaveDirectory, path, default_path),
@@ -234,7 +224,7 @@ index c48314e52e83..f0a64a0be931 100644
 }
 
 void PdfPrinterHandler::PostPrintToPdfTask() {
-@@ -429,6 +450,40 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
+@@ -430,6 +451,40 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
       platform_util::GetTopLevel(preview_web_contents_->GetNativeView()), NULL);
 }
 
@@ -273,21 +263,21 @@ index c48314e52e83..f0a64a0be931 100644
 +#endif  // BUILDFLAG(ENABLE_CEF)
 +
 base::FilePath PdfPrinterHandler::GetSaveLocation() const {
- #if defined(OS_CHROMEOS)
+ #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 26954aeae08f..48afeb608f83 100644
+index d796486f6b74..1a7b0d23128d 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 @@
- #include "base/memory/ref_counted.h"
+@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/features.h"
 #include "chrome/browser/ui/webui/print_preview/printer_handler.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
-@@ -88,6 +89,15 @@ class PdfPrinterHandler : public PrinterHandler,
+@@ -89,6 +90,15 @@ class PdfPrinterHandler : public PrinterHandler,
   void OnDirectorySelected(const base::FilePath& filename,
                            const base::FilePath& directory);
 
@@ -304,27 +294,27 @@ index 26954aeae08f..48afeb608f83 100644
   base::FilePath GetSaveLocation() const;
 
 diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-index adf2433423a5..6bfa66b75b93 100644
+index 67aa6bc0d76e..0fecbd87423b 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
-@@ -24,6 +24,7 @@
- #include "base/memory/ref_counted_memory.h"
+@@ -25,6 +25,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/features.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/bad_message.h"
 #include "chrome/browser/browser_process.h"
-@@ -1258,7 +1259,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
+@@ -1080,7 +1081,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
     }
     return extension_printer_handler_.get();
   }
 -#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
 +#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) && !BUILDFLAG(ENABLE_CEF)
   if (printer_type == PrinterType::kPrivet &&
-       (base::FeatureList::IsEnabled(features::kForceEnablePrivetPrinting) ||
-        GetPrefs()->GetBoolean(
-@@ -1269,6 +1270,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
+       GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting)) {
+     if (!privet_printer_handler_) {
+@@ -1089,6 +1090,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
     }
     return privet_printer_handler_.get();
   }
@@ -334,7 +324,7 @@ index adf2433423a5..6bfa66b75b93 100644
 #endif
   if (printer_type == PrinterType::kPdf) {
     if (!pdf_printer_handler_) {
-@@ -1341,6 +1345,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
+@@ -1151,6 +1155,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
 }
 
 void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@@ -342,7 +332,7 @@ index adf2433423a5..6bfa66b75b93 100644
   DCHECK(!identity_manager_);
   cloud_print_enabled_ =
       !base::Contains(printer_type_deny_list_, PrinterType::kCloud) &&
-@@ -1358,6 +1363,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
+@@ -1167,6 +1172,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
 
   identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
   identity_manager_->AddObserver(this);
@@ -351,18 +341,18 @@ index adf2433423a5..6bfa66b75b93 100644
 
 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
 diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-index a1ddf703d113..b0b1f0272dd3 100644
+index fb3328d0d75b..4dd94d59e195 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-@@ -28,6 +28,7 @@
- #include "base/synchronization/lock.h"
+@@ -29,6 +29,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/printing/background_printing_manager.h"
-@@ -81,12 +82,16 @@ namespace printing {
+@@ -85,12 +86,16 @@ namespace printing {
 
 namespace {
 
@@ -372,7 +362,7 @@ index a1ddf703d113..b0b1f0272dd3 100644
 #if defined(OS_MAC)
 // U+0028 U+21E7 U+2318 U+0050 U+0029 in UTF8
 const char kBasicPrintShortcut[] = "\x28\xE2\x8c\xA5\xE2\x8C\x98\x50\x29";
- #elif !defined(OS_CHROMEOS)
+ #elif !BUILDFLAG(IS_CHROMEOS_ASH)
 const char kBasicPrintShortcut[] = "(Ctrl+Shift+P)";
 #endif
 +#endif  // !BUILDFLAG(ENABLE_CEF)
--- a/patch/patches/printing_context_2196.patch
+++ b/patch/patches/printing_context_2196.patch
@@ -1,8 +1,8 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index 8e648fa8d563..66a52ce51147 100644
+index 47a5b3c2a11e..0a37d7c1e753 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
-@@ -134,6 +134,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
+@@ -135,6 +135,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
           PrintingContext::Create(printing_context_delegate_.get())),
       thread_("Printing_Worker") {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -11,7 +11,7 @@ index 8e648fa8d563..66a52ce51147 100644
 
 PrintJobWorker::~PrintJobWorker() {
 diff --git printing/printing_context.h printing/printing_context.h
-index 896d1b26f492..59d17b49f0d3 100644
+index 268e03d2b8d4..f1b573207b88 100644
 --- printing/printing_context.h
 +++ printing/printing_context.h
@@ -134,6 +134,13 @@ class PRINTING_EXPORT PrintingContext {
--- a/patch/patches/renderer_host_1070713.patch
+++ b/patch/patches/renderer_host_1070713.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
-index d50a4f5c0c1b..25679e8a8948 100644
+index 255c259a9b35..c40021deb1fc 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -583,6 +583,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
+@@ -590,6 +590,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
 }
 
 void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
--- a/patch/patches/renderer_preferences_util_545103.patch
+++ b/patch/patches/renderer_preferences_util_545103.patch
@@ -1,23 +1,23 @@
 diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
-index ed40422ac8cf..51ca618a2f09 100644
+index a0006aa682e7..b83d42c637a6 100644
 --- chrome/browser/renderer_preferences_util.cc
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -34,7 +34,8 @@
+@@ -35,7 +35,8 @@
 #include "ui/base/cocoa/defaults_utils.h"
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
+-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
 +    defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "ui/views/linux_ui/linux_ui.h"
-@@ -153,7 +154,8 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
+@@ -154,7 +155,8 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
     prefs->caret_blink_interval = interval;
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
+-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
 +    defined(ENABLE_THEMES)
   views::LinuxUI* linux_ui = views::LinuxUI::instance();
   if (linux_ui) {
--- 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 2b24b4ce2e22..ad23c2d74f00 100644
+index 9f745407ec48..6d4ae4266371 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
-@@ -875,6 +875,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
+@@ -845,6 +845,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
     : delegate_(delegate),
       locale_resources_data_lock_(new base::Lock),
       max_scale_factor_(SCALE_FACTOR_100P) {
@@ -15,7 +15,7 @@ index 2b24b4ce2e22..ad23c2d74f00 100644
   mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kMangleLocalizedStrings);
 }
-@@ -884,6 +890,11 @@ ResourceBundle::~ResourceBundle() {
+@@ -854,6 +860,11 @@ ResourceBundle::~ResourceBundle() {
   UnloadLocaleResources();
 }
 
@@ -28,10 +28,10 @@ index 2b24b4ce2e22..ad23c2d74f00 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 51dbdfab3962..a271d60679be 100644
+index 0432b8f0965f..264759c7393d 100644
 --- ui/base/resource/resource_bundle.h
 +++ ui/base/resource/resource_bundle.h
-@@ -172,6 +172,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
+@@ -192,6 +192,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
   // Return the global resource loader instance.
   static ResourceBundle& GetSharedInstance();
 
--- 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 92e5c944d44b..f27972a4e2b7 100644
+index dd16ddb90fa9..1d70818d0eff 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -678,10 +678,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
+@@ -657,10 +657,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
 void RenderWidgetHostViewAura::UpdateBackgroundColor() {
   DCHECK(GetBackgroundColor());
 
@@ -19,10 +19,10 @@ index 92e5c944d44b..f27972a4e2b7 100644
 }
 
 base::Optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
-@@ -2056,6 +2058,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -2020,6 +2022,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.
-   if (frame_sink_id_.is_valid())
-     window_->SetEmbedFrameSinkId(frame_sink_id_);
+   window_->SetEmbedFrameSinkId(frame_sink_id_);
 +
 +  // Do this after |window_| is created to avoid crashes on Win10.
 +  // See https://crbug.com/761389.
--- a/patch/patches/services_network_2622.patch
+++ b/patch/patches/services_network_2622.patch
@@ -1,16 +1,16 @@
 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
-index ed1b0c3bad29..5ed2c290fd2b 100644
+index 0ccb74571b85..b4785ae3e875 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
-@@ -19,6 +19,7 @@
- #include "base/strings/string_split.h"
+@@ -20,6 +20,7 @@
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-@@ -661,7 +662,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -682,7 +683,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
 
   // Configure on-disk storage for non-OTR profiles. OTR profiles just use
   // default behavior (in memory storage, default sizes).
@@ -31,7 +31,7 @@ index ed1b0c3bad29..5ed2c290fd2b 100644
     PrefService* local_state = g_browser_process->local_state();
     // Configure the HTTP cache path and size.
     base::FilePath base_cache_path;
-@@ -674,7 +687,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -695,7 +708,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
         base_cache_path.Append(chrome::kCacheDirname);
     network_context_params->http_cache_max_size =
         local_state->GetInteger(prefs::kDiskCacheSize);
@@ -42,10 +42,10 @@ index ed1b0c3bad29..5ed2c290fd2b 100644
     // change.
     network_context_params->http_server_properties_path =
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index 796d855211d9..5fac1444b3d5 100644
+index 9d5391e0c853..ebc6a10466fb 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
-@@ -469,6 +469,25 @@ void CookieMonster::SetCookieableSchemes(
+@@ -471,6 +471,25 @@ void CookieMonster::SetCookieableSchemes(
   MaybeRunCookieCallback(std::move(callback), true);
 }
 
@@ -72,7 +72,7 @@ index 796d855211d9..5fac1444b3d5 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 2d45b2b113fd..fe0369aad18a 100644
+index 990869da1c30..22c047b1ea25 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
@@ -184,6 +184,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -101,10 +101,10 @@ index 5ffbe648343d..3d9a0f2e828f 100644
   virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
                                const std::string& parent_absolute_name) const;
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index 526ccf16da81..96ca62fbed3a 100644
+index f91ffe61dba5..f3482e68cd11 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
-@@ -231,14 +231,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
+@@ -230,14 +230,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
 void CookieManager::AllowFileSchemeCookies(
     bool allow,
     AllowFileSchemeCookiesCallback callback) {
@@ -123,10 +123,10 @@ index 526ccf16da81..96ca62fbed3a 100644
 
 void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index 3773583bedd0..31157bbf388a 100644
+index a75980730046..a0c104d88545 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
-@@ -1936,16 +1936,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2014,16 +2014,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         network_service_->network_quality_estimator());
   }
 
@@ -157,10 +157,10 @@ index 3773583bedd0..31157bbf388a 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 0a09398cf50e..f7452357c1f4 100644
+index 294b04445bd3..f1f81e44986f 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
-@@ -275,6 +275,9 @@ struct NetworkContextParams {
+@@ -288,6 +288,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 d5fa2604e741..1337e6369373 100644
+index 46fd3da02453..879e7a0b2275 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
-@@ -491,10 +491,6 @@ class LoginHandlerDelegate {
+@@ -495,10 +495,6 @@ class LoginHandlerDelegate {
     }
 
     WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index d5fa2604e741..1337e6369373 100644
 
     // WeakPtr is not strictly necessary here due to OnRequestCancelled.
     creating_login_delegate_ = true;
-@@ -547,12 +543,6 @@ void OnAuthRequiredContinuation(
+@@ -551,12 +547,6 @@ void OnAuthRequiredContinuation(
     mojo::PendingRemote<network::mojom::AuthChallengeResponder>
         auth_challenge_responder,
     base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@@ -26,7 +26,7 @@ index d5fa2604e741..1337e6369373 100644
   new LoginHandlerDelegate(std::move(auth_challenge_responder),
                            std::move(web_contents_getter), auth_info,
                            is_request_for_main_frame, process_id, routing_id,
-@@ -2396,8 +2386,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -2449,8 +2439,12 @@ void StoragePartitionImpl::GetQuotaSettings(
     return;
   }
 
@@ -40,7 +40,7 @@ index d5fa2604e741..1337e6369373 100644
       storage::GetDefaultDeviceInfoHelper(), std::move(callback));
 }
 
-@@ -2409,6 +2403,11 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -2462,6 +2456,11 @@ void StoragePartitionImpl::InitNetworkContext() {
   GetContentClient()->browser()->ConfigureNetworkContextParams(
       browser_context_, is_in_memory_, relative_partition_path_,
       context_params.get(), cert_verifier_creation_params.get());
--- a/patch/patches/set_resize_background_color.patch
+++ b/patch/patches/set_resize_background_color.patch
@@ -1,8 +1,8 @@
 diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc
-index f9e1aa1b455a..5795eca10540 100644
+index a5a09b31bd8d..673da74e75aa 100644
 --- ui/views/controls/native/native_view_host.cc
 +++ ui/views/controls/native/native_view_host.cc
-@@ -153,7 +153,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
+@@ -157,7 +157,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
   // It would be nice if this used some approximation of the page's
   // current background color.
   if (native_wrapper_->HasInstalledClip())
@@ -12,10 +12,10 @@ index f9e1aa1b455a..5795eca10540 100644
 
 void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) {
 diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h
-index 71cba0d714bd..82d3d6baa909 100644
+index ab2371857a00..8dccc190fa89 100644
 --- ui/views/controls/native/native_view_host.h
 +++ ui/views/controls/native/native_view_host.h
-@@ -92,6 +92,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
+@@ -95,6 +95,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
   void set_fast_resize(bool fast_resize) { fast_resize_ = fast_resize; }
   bool fast_resize() const { return fast_resize_; }
 
@@ -28,7 +28,7 @@ index 71cba0d714bd..82d3d6baa909 100644
   gfx::NativeView native_view() const { return native_view_; }
 
   void NativeViewDestroyed();
-@@ -138,6 +144,9 @@ class VIEWS_EXPORT NativeViewHost : public View {
+@@ -141,6 +147,9 @@ class VIEWS_EXPORT NativeViewHost : public View {
   // in the setter/accessor above.
   bool fast_resize_ = false;
 
@@ -39,7 +39,7 @@ index 71cba0d714bd..82d3d6baa909 100644
 };
 
 diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
-index 0168540929dd..5853796d9ef3 100644
+index 44a8fc6ef9d0..4718e6bb94ff 100644
 --- ui/views/controls/webview/webview.cc
 +++ ui/views/controls/webview/webview.cc
@@ -127,6 +127,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@@ -54,7 +54,7 @@ index 0168540929dd..5853796d9ef3 100644
   if (crashed_overlay_view_ == crashed_overlay_view)
     return;
 diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
-index 1d4d5cd5e5bb..d6c405d5f6ab 100644
+index 9604515c2d5c..e51421694752 100644
 --- ui/views/controls/webview/webview.h
 +++ ui/views/controls/webview/webview.h
@@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View,
--- a/patch/patches/storage_incognito_2289.patch
+++ b/patch/patches/storage_incognito_2289.patch
@@ -13,10 +13,10 @@ index 676c2cc22bac..e6f9642e1cba 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 de0194134356..4fa70303a0df 100644
+index de8ee48c4c74..62105a814870 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
-@@ -245,7 +245,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
+@@ -246,7 +246,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
       GetStoragePartitionMap(browser_context);
 
   auto config_to_use = storage_partition_config;
@@ -25,7 +25,7 @@ index de0194134356..4fa70303a0df 100644
     config_to_use = storage_partition_config.CopyWithInMemorySet();
 
   return partition_map->Get(config_to_use, can_create);
-@@ -555,7 +555,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
+@@ -556,7 +556,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
         kUseInMemoryDBDefault);
 
     std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
--- a/patch/patches/trace_event.patch
+++ b/patch/patches/trace_event.patch
@@ -1,5 +1,5 @@
 diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
-index fe91c29db493..8f8ddb489950 100644
+index ad3e86fb45ed..61c3db8b59d1 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
@@ -58,6 +58,8 @@
--- a/patch/patches/ui_dragdrop_355390.patch
+++ b/patch/patches/ui_dragdrop_355390.patch
@@ -1,9 +1,9 @@
 diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
-index d76cbc9d28cf..935008dc722e 100644
+index 824b980f5b31..54ae5151b4fc 100644
 --- ui/base/x/x11_os_exchange_data_provider.cc
 +++ ui/base/x/x11_os_exchange_data_provider.cc
-@@ -121,7 +121,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
-     format_map_.Insert(gfx::GetAtom(kMimeTypeMozillaURL), mem);
+@@ -122,7 +122,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
+     format_map_.Insert(x11::GetAtom(kMimeTypeMozillaURL), mem);
 
     // Set a string fallback as well.
 -    SetString(spec);
--- a/patch/patches/views_1749_2102.patch
+++ b/patch/patches/views_1749_2102.patch
@@ -43,10 +43,10 @@ index c746b37d6278..b6cebc24b73e 100644
   virtual void MenuWillShow() {}
 
 diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
-index bae9421235d5..09a602dad248 100644
+index 35ef45586f93..d094f34569c9 100644
 --- ui/gfx/render_text.cc
 +++ ui/gfx/render_text.cc
-@@ -615,6 +615,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
+@@ -617,6 +617,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
   }
 }
 
@@ -61,7 +61,7 @@ index bae9421235d5..09a602dad248 100644
 void RenderText::SetDisplayRect(const Rect& r) {
   if (r != display_rect_) {
     display_rect_ = r;
-@@ -1991,6 +1999,19 @@ void RenderText::OnTextAttributeChanged() {
+@@ -1993,6 +2001,19 @@ void RenderText::OnTextAttributeChanged() {
 
   layout_text_up_to_date_ = false;
 
@@ -71,7 +71,7 @@ index bae9421235d5..09a602dad248 100644
 +    int char_pos = -1;
 +    int char_span = 0;
 +    layout_text_ =
-+        gfx::RemoveAcceleratorChar(layout_text_, '&', &char_pos, &char_span);
+        gfx::LocateAndRemoveAcceleratorChar(layout_text_, &char_pos, &char_span);
 +    if (char_pos != -1) {
 +      gfx::Range range(char_pos, char_pos + char_span);
 +      styles_[TEXT_STYLE_UNDERLINE].ApplyValue(true, range);
@@ -106,7 +106,7 @@ index 29c589ee9fe6..aa0029552322 100644
 };
 
 diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
-index ce6581cbc3c4..c935a9cd7cff 100644
+index 8c8f77fc26db..0a9f50df07c1 100644
 --- ui/views/animation/ink_drop_host_view.h
 +++ ui/views/animation/ink_drop_host_view.h
@@ -142,6 +142,8 @@ class VIEWS_EXPORT InkDropHostView : public View {
@@ -119,7 +119,7 @@ index ce6581cbc3c4..c935a9cd7cff 100644
   // Size used for the default SquareInkDropRipple.
   static constexpr gfx::Size kDefaultInkDropSize = gfx::Size(24, 24);
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index 563bc70f4961..65c7061e66c8 100644
+index 66447b25c544..ea28dc3169fa 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
@@ -503,6 +503,12 @@ void LabelButton::OnThemeChanged() {
@@ -136,7 +136,7 @@ index 563bc70f4961..65c7061e66c8 100644
   Button::StateChanged(old_state);
   ResetLabelEnabledColor();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index 5dbf8e3e9c86..0ae8315c1b3a 100644
+index 39887eb2625c..727c1ff325f7 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -150,7 +150,7 @@ index 5dbf8e3e9c86..0ae8315c1b3a 100644
   ImageView* image() const { return image_; }
   Label* label() const { return label_; }
 diff --git ui/views/controls/label.cc ui/views/controls/label.cc
-index 70370d27c47d..4731271438ad 100644
+index 0381eb3769d4..7a06147d991c 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
@@ -49,12 +49,27 @@ enum LabelPropertyKey {
@@ -171,7 +171,7 @@ index 70370d27c47d..4731271438ad 100644
 +  if (flags & (gfx::Canvas::SHOW_PREFIX | gfx::Canvas::HIDE_PREFIX)) {
 +    int char_pos = -1;
 +    int char_span = 0;
-+    *text = gfx::RemoveAcceleratorChar(*text, '&', &char_pos, &char_span);
+    *text = gfx::LocateAndRemoveAcceleratorChar(*text, &char_pos, &char_span);
 +    if ((flags & gfx::Canvas::SHOW_PREFIX) && char_pos != -1)
 +      return gfx::Range(char_pos, char_pos + char_span);
 +  }
@@ -181,7 +181,7 @@ index 70370d27c47d..4731271438ad 100644
 }  // namespace
 
 namespace views {
-@@ -378,6 +393,15 @@ base::string16 Label::GetTooltipText() const {
+@@ -412,6 +427,15 @@ base::string16 Label::GetTooltipText() const {
   return tooltip_text_;
 }
 
@@ -197,12 +197,10 @@ index 70370d27c47d..4731271438ad 100644
 void Label::SetTooltipText(const base::string16& tooltip_text) {
   DCHECK(handles_tooltips_);
   if (tooltip_text_ == tooltip_text)
-@@ -652,7 +676,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
-   render_text->SetFontList(font_list());
-   render_text->set_shadows(GetShadows());
-   render_text->SetCursorEnabled(false);
-  render_text->SetText(GetText());
-+
+@@ -695,6 +719,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
+       render_text->SelectRange(stored_selection_range_);
+   }
+ 
 +  if (draw_strings_flags_ != 0) {
 +    base::string16 text_str = GetText();
 +    gfx::Range range = StripAcceleratorChars(draw_strings_flags_, &text_str);
@@ -211,18 +209,16 @@ index 70370d27c47d..4731271438ad 100644
 +      render_text->SetDisplayRect(bounds());
 +      render_text->ApplyStyle(gfx::TEXT_STYLE_UNDERLINE, true, range);
 +    }
-+  } else {
-+    render_text->SetText(GetText());
 +  }
 +
-   const bool multiline = GetMultiLine();
-   render_text->SetMultiline(multiline);
-   render_text->SetMaxLines(multiline ? GetMaxLines() : 0);
+   return render_text;
+ }
+ 
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index 0a6bac23a2f6..fc5becc010c1 100644
+index 2426029d6733..d12bc4568203 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
-@@ -211,6 +211,10 @@ class VIEWS_EXPORT Label : public View,
+@@ -221,6 +221,10 @@ class VIEWS_EXPORT Label : public View,
   gfx::ElideBehavior GetElideBehavior() const;
   void SetElideBehavior(gfx::ElideBehavior elide_behavior);
 
@@ -233,7 +229,7 @@ index 0a6bac23a2f6..fc5becc010c1 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
-@@ -451,6 +455,7 @@ class VIEWS_EXPORT Label : public View,
+@@ -461,6 +465,7 @@ class VIEWS_EXPORT Label : public View,
   bool collapse_when_hidden_ = false;
   int fixed_width_ = 0;
   int max_width_ = 0;
@@ -242,10 +238,10 @@ index 0a6bac23a2f6..fc5becc010c1 100644
   std::unique_ptr<SelectionController> selection_controller_;
 
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 68adbe09fa85..1e489a5edd41 100644
+index 15d30255e990..745b483213cf 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -2727,8 +2727,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
+@@ -2744,8 +2744,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
@@ -260,7 +256,7 @@ index 68adbe09fa85..1e489a5edd41 100644
   MenuItemView* to_select = nullptr;
   if (!item->GetSubmenu()->GetMenuItems().empty())
     to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
-@@ -2747,8 +2752,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2764,8 +2769,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
 void MenuController::CloseSubmenu() {
   MenuItemView* item = state_.item;
   DCHECK(item);
@@ -312,10 +308,10 @@ index 158724b4752c..c82192848584 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 38bb7252ab75..c9f86dc25b05 100644
+index 3c532ce679c7..b0ff9231929b 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
-@@ -1043,6 +1043,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
+@@ -1051,6 +1051,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);
@@ -331,7 +327,7 @@ index 38bb7252ab75..c9f86dc25b05 100644
   } else if (render_selection) {
     gfx::Rect item_bounds = GetLocalBounds();
     if (type_ == Type::kActionableSubMenu) {
-@@ -1110,6 +1119,13 @@ void MenuItemView::PaintMinorIconAndText(
+@@ -1118,6 +1127,13 @@ void MenuItemView::PaintMinorIconAndText(
 }
 
 SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {
@@ -453,7 +449,7 @@ index 78f832fd3acf..cb030c991614 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 4771d1d6e859..ed9f1ff96928 100644
+index 5881b07244d7..a2f671b73162 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -201,6 +201,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -484,18 +480,18 @@ index 64e09ff4359a..714e8e9ff661 100644
         x11_ui_controls_test_helper_.ButtonDownMask() == 0) {
       // Move the cursor because EnterNotify/LeaveNotify are generated with the
 diff --git ui/views/view.h ui/views/view.h
-index 6fb298b16599..e2c0bdb1fcb3 100644
+index 74e3010c8162..dcca72e52aa8 100644
 --- ui/views/view.h
 +++ ui/views/view.h
-@@ -24,6 +24,7 @@
- #include "base/macros.h"
+@@ -25,6 +25,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
+ #include "base/strings/string_piece.h"
 +#include "base/supports_user_data.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_enums.mojom-forward.h"
-@@ -273,6 +274,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -272,6 +273,7 @@ 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 2c87779ffd03..8fcc0868208d 100644
+index 7a90002e09be..6ea815bd3256 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -532,6 +532,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
+@@ -525,6 +525,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
   return screen_info.device_scale_factor;
 }
 
@@ -18,10 +18,10 @@ index 2c87779ffd03..8fcc0868208d 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 1dbaa5f457cf..4408578efa24 100644
+index 63c4db6df041..4d253685cb78 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
-@@ -66,6 +66,7 @@ class CursorManager;
+@@ -64,6 +64,7 @@ class CursorManager;
 class MouseWheelPhaseHandler;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewBaseObserver;
@@ -29,7 +29,7 @@ index 1dbaa5f457cf..4408578efa24 100644
 class SyntheticGestureTarget;
 class TextInputManager;
 class TouchSelectionControllerClientManager;
-@@ -78,6 +79,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -80,6 +81,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
   float current_device_scale_factor() const {
     return current_device_scale_factor_;
   }
@@ -39,7 +39,7 @@ index 1dbaa5f457cf..4408578efa24 100644
 
   // Returns the focused RenderWidgetHost inside this |view|'s RWH.
   RenderWidgetHostImpl* GetFocusedWidget() const;
-@@ -111,6 +115,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -113,6 +117,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                         const gfx::Size& max_size) override;
   void DisableAutoResize(const gfx::Size& new_size) override;
   float GetDeviceScaleFactor() final;
@@ -48,9 +48,9 @@ index 1dbaa5f457cf..4408578efa24 100644
   TouchSelectionControllerClientManager*
   GetTouchSelectionControllerClientManager() override;
   void SetRecordContentToVisibleTimeRequest(
-@@ -417,6 +423,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
-   // helps to position the full screen widget on the correct monitor.
-   virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
+@@ -405,6 +411,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
+                            const gfx::Rect& bounds) = 0;
 
 +  // Perform all the initialization steps necessary for this object to represent
 +  // the platform widget owned by |guest_view| and embedded in
@@ -61,9 +61,9 @@ index 1dbaa5f457cf..4408578efa24 100644
   // Sets the cursor for this view to the one associated with the specified
   // cursor_type.
   virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -596,6 +608,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
-  protected:
-   ~RenderWidgetHostViewBase() override;
+@@ -580,6 +592,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+ 
+   bool is_currently_scrolling_viewport_ = false;
 
 +  // True if the widget has a external parent view/window outside of the
 +  // Chromium-controlled view/window hierarchy.
@@ -73,7 +73,7 @@ index 1dbaa5f457cf..4408578efa24 100644
   FRIEND_TEST_ALL_PREFIXES(
       BrowserSideFlingBrowserTest,
 diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
-index 9b08733085c9..419136ac2f13 100644
+index 69d909a11756..7a555229d3e5 100644
 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -37,6 +37,10 @@
@@ -87,7 +87,7 @@ index 9b08733085c9..419136ac2f13 100644
 #if defined(OS_WIN)
 #include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "ui/aura/window_tree_host.h"
-@@ -957,6 +961,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
+@@ -936,6 +940,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
     }
     return;
   }
@@ -102,7 +102,7 @@ index 9b08733085c9..419136ac2f13 100644
 #endif
   synthetic_move_position_ = center_in_screen;
 }
-@@ -986,6 +998,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
+@@ -965,6 +977,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
 }
 
 void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
@@ -140,10 +140,10 @@ index beba7a3a40b8..941acdfbff8b 100644
   // Set the view's active state (i.e., tint state of controls).
   virtual void SetActive(bool active) = 0;
 diff --git ui/base/x/x11_window.cc ui/base/x/x11_window.cc
-index 988ffa93bf2c..a7bd217b60ac 100644
+index 7fbc130d78df..6092964d846c 100644
 --- ui/base/x/x11_window.cc
 +++ ui/base/x/x11_window.cc
-@@ -263,7 +263,8 @@ void XWindow::Init(const Configuration& config) {
+@@ -264,7 +264,8 @@ void XWindow::Init(const Configuration& config) {
   req.border_pixel = 0;
 
   bounds_in_pixels_ = SanitizeBounds(config.bounds);
@@ -154,7 +154,7 @@ index 988ffa93bf2c..a7bd217b60ac 100644
   req.y = bounds_in_pixels_.y();
   req.width = bounds_in_pixels_.width();
 diff --git ui/base/x/x11_window.h ui/base/x/x11_window.h
-index 4078ea5dc7be..25f37c487399 100644
+index efed967b24dd..ec4b19e53e6f 100644
 --- ui/base/x/x11_window.h
 +++ ui/base/x/x11_window.h
@@ -21,6 +21,7 @@
@@ -165,7 +165,7 @@ index 4078ea5dc7be..25f37c487399 100644
 #include "ui/gfx/x/event.h"
 #include "ui/gfx/x/sync.h"
 #include "ui/gfx/x/xfixes.h"
-@@ -91,6 +92,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow {
+@@ -94,6 +95,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow {
     std::string wm_class_name;
     std::string wm_class_class;
     std::string wm_role_name;
@@ -174,10 +174,10 @@ index 4078ea5dc7be..25f37c487399 100644
 
   XWindow();
 diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
-index 022864f249be..5cc2d7b3bf21 100644
+index 0cfcb1cb66e3..43adab9fec65 100644
 --- ui/platform_window/x11/x11_window.cc
 +++ ui/platform_window/x11/x11_window.cc
-@@ -92,6 +92,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
+@@ -93,6 +93,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
   config.wm_class_class = properties.wm_class_class;
   config.wm_role_name = properties.wm_role_name;
   config.activatable = properties.activatable;
@@ -186,7 +186,7 @@ index 022864f249be..5cc2d7b3bf21 100644
   config.background_color = properties.background_color;
   return config;
 diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
-index e9bb45ad238c..68f2a5ef5d0c 100644
+index 91c516429c2a..762a108fedf6 100644
 --- ui/views/widget/desktop_aura/desktop_screen_win.cc
 +++ ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -18,6 +18,8 @@ DesktopScreenWin::~DesktopScreenWin() {
@@ -199,7 +199,7 @@ index e9bb45ad238c..68f2a5ef5d0c 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 0bdc1470708b..0f1d6960f0ea 100644
+index a0f75cc909f7..aa06be74ea9c 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -187,6 +187,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -231,10 +231,10 @@ index 0bdc1470708b..0f1d6960f0ea 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 4b6a5a4476a3..c9881d4a716c 100644
+index e0339379e1a8..b31f4ac179f6 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-@@ -68,6 +68,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -66,6 +66,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
   // Disables event listening to make |dialog| modal.
   base::OnceClosure DisableEventListening();
 
@@ -243,7 +243,7 @@ index 4b6a5a4476a3..c9881d4a716c 100644
  protected:
   // Overridden from DesktopWindowTreeHost:
   void Init(const Widget::InitParams& params) override;
-@@ -78,6 +80,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -76,6 +78,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
       const gfx::Vector2d& drag_offset,
       Widget::MoveLoopSource source,
       Widget::MoveLoopEscapeBehavior escape_behavior) override;
@@ -252,7 +252,7 @@ index 4b6a5a4476a3..c9881d4a716c 100644
 
   // PlatformWindowDelegate:
   void DispatchEvent(ui::Event* event) override;
-@@ -134,6 +138,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -131,6 +135,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
   // destroyed.
   static std::list<gfx::AcceleratedWidget>* open_windows_;
 
@@ -263,7 +263,7 @@ index 4b6a5a4476a3..c9881d4a716c 100644
   base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
 
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 3b132d4d7618..bcb17600d7fa 100644
+index a40975533035..9a3f60066b5c 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -140,8 +140,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -314,10 +314,10 @@ index 0229c1c41502..992f89126f7f 100644
   // a reference.
   corewm::TooltipWin* tooltip_;
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index c27777b9e958..ef566619e55a 100644
+index 52c1d1eb59c4..ebcbd0286a7b 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
-@@ -309,7 +309,8 @@ void Widget::Init(InitParams params) {
+@@ -311,7 +311,8 @@ void Widget::Init(InitParams params) {
   parent_ = params.parent ? GetWidgetForNativeView(params.parent) : nullptr;
 
   params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -327,7 +327,7 @@ index c27777b9e958..ef566619e55a 100644
 
   if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
       params.type != views::Widget::InitParams::TYPE_WINDOW) {
-@@ -391,7 +392,12 @@ void Widget::Init(InitParams params) {
+@@ -393,7 +394,12 @@ void Widget::Init(InitParams params) {
     }
   } else if (delegate) {
     SetContentsView(delegate->TransferOwnershipOfContentsView());
@@ -341,7 +341,7 @@ index c27777b9e958..ef566619e55a 100644
   }
 
   observer_manager_.Add(GetNativeTheme());
-@@ -1175,10 +1181,16 @@ void Widget::OnNativeWidgetDestroyed() {
+@@ -1176,10 +1182,16 @@ void Widget::OnNativeWidgetDestroyed() {
 }
 
 gfx::Size Widget::GetMinimumSize() const {
@@ -359,7 +359,7 @@ index c27777b9e958..ef566619e55a 100644
 }
 
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index 97886b70e63a..cc43f791a466 100644
+index 819ea9ae89cc..1cae5eda3d5f 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
@@ -318,6 +318,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -372,10 +372,10 @@ index 97886b70e63a..cc43f791a466 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 211ac11173e7..132d12d636a2 100644
+index 0fab70037a44..7409dd2c8acc 100644
 --- ui/views/widget/widget_delegate.h
 +++ ui/views/widget/widget_delegate.h
-@@ -377,6 +377,10 @@ class VIEWS_EXPORT WidgetDelegate {
+@@ -381,6 +381,10 @@ class VIEWS_EXPORT WidgetDelegate {
   // Returns true if the title text should be centered.
   bool ShouldCenterWindowTitleText() const;
 
@@ -400,10 +400,10 @@ index 89f5b62f95df..8f6971929a12 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 5e202cabf38c..d67d5f17827f 100644
+index 4c9654191ddc..1b4cf20d8df5 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -3107,10 +3107,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3103,10 +3103,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
@@ -1,8 +1,8 @@
 diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
-index c80e6831d4af..3fd2f9e4f822 100644
+index 3b00759e513d..90fe332d59f5 100644
 --- components/viz/host/host_display_client.cc
 +++ components/viz/host/host_display_client.cc
-@@ -43,9 +43,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
+@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
 }
 #endif
 
@@ -18,7 +18,7 @@ index c80e6831d4af..3fd2f9e4f822 100644
   if (!NeedsToUseLayerWindow(widget_)) {
     DLOG(ERROR) << "HWND shouldn't be using a layered window";
     return;
-@@ -53,8 +58,8 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
+@@ -55,8 +60,8 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
 
   layered_window_updater_ =
       std::make_unique<LayeredWindowUpdaterImpl>(widget_, std::move(receiver));
@@ -26,13 +26,13 @@ index c80e6831d4af..3fd2f9e4f822 100644
 #endif
 +}
 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {
+ // 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 521ea99a35da..47d0ae89cdf1 100644
+index 5e260e13762f..1ccff27f2fdb 100644
 --- components/viz/host/host_display_client.h
 +++ components/viz/host/host_display_client.h
-@@ -31,17 +31,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
+@@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
   mojo::PendingRemote<mojom::DisplayClient> GetBoundRemote(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
@@ -51,8 +51,8 @@ index 521ea99a35da..47d0ae89cdf1 100644
       mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
 -#endif
 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
 diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc
 index b04f654fe820..131977a36591 100644
 --- components/viz/host/layered_window_updater_impl.cc
@@ -80,10 +80,10 @@ index 1026b739d283..fe562ab60ce9 100644
  private:
   const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index 92acbc3a25c6..5493e97f9160 100644
+index c66d791c7c9a..5c98ae02d8b7 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
-@@ -176,6 +176,8 @@ viz_component("service") {
+@@ -180,6 +180,8 @@ viz_component("service") {
     "surfaces/surface_reference.cc",
     "surfaces/surface_reference.h",
     "viz_service_export.h",
@@ -93,18 +93,18 @@ index 92acbc3a25c6..5493e97f9160 100644
 
   defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
 diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 54686950a28c..a62178180d51 100644
+index 79c800e77a16..c1593b597325 100644
 --- components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ components/viz/service/display_embedder/output_surface_provider_impl.cc
-@@ -15,6 +15,7 @@
- #include "base/threading/thread_task_runner_handle.h"
+@@ -16,6 +16,7 @@
 #include "build/chromecast_buildflags.h"
+ #include "build/chromeos_buildflags.h"
 #include "cc/base/switches.h"
 +#include "cef/libcef/browser/osr/software_output_device_proxy.h"
 #include "components/viz/common/display/renderer_settings.h"
 #include "components/viz/common/frame_sinks/begin_frame_source.h"
 #include "components/viz/service/display/display_compositor_memory_and_task_controller.h"
-@@ -244,6 +245,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
+@@ -245,6 +246,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
   if (headless_)
     return std::make_unique<SoftwareOutputDevice>();
 
@@ -142,10 +142,10 @@ index 2bb30e5318b6..535535dd6c10 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 18f8a89820e5..ac4fec9fd947 100644
+index 11ac1649ed0f..ab4aaf5e69b1 100644
 --- content/browser/compositor/viz_process_transport_factory.cc
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -407,8 +407,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
+@@ -414,8 +414,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
   compositor_data.display_private.reset();
   root_params->display_private =
       compositor_data.display_private.BindNewEndpointAndPassReceiver();
@@ -162,10 +162,10 @@ index 18f8a89820e5..ac4fec9fd947 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 c9a75d59b7eb..e4cf92fe15e8 100644
+index 4ff82130b358..6c2e3e4d3e9b 100644
 --- mojo/public/cpp/bindings/sync_call_restrictions.h
 +++ mojo/public/cpp/bindings/sync_call_restrictions.h
-@@ -29,6 +29,7 @@ class Compositor;
+@@ -33,6 +33,7 @@ class Compositor;
 
 namespace viz {
 class HostFrameSinkManager;
@@ -173,7 +173,7 @@ index c9a75d59b7eb..e4cf92fe15e8 100644
 }
 
 namespace mojo {
-@@ -81,6 +82,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions {
+@@ -86,6 +87,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,20 +214,20 @@ index 6b7fbb6cf13d..e2af75168cb9 100644
 +  Draw(gfx.mojom.Rect damage_rect) => ();
 };
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index dc011fe48e2a..60743cbaa548 100644
+index e1db8f745c07..6d94047788bf 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
-@@ -25,7 +25,9 @@
- #include "cc/trees/layer_tree_host_single_thread_client.h"
+@@ -27,7 +27,9 @@
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/surfaces/frame_sink_id.h"
+ #include "components/viz/common/surfaces/subtree_capture_id.h"
 +#include "components/viz/host/host_display_client.h"
 #include "components/viz/host/host_frame_sink_client.h"
 +#include "components/viz/service/display/software_output_device.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom-forward.h"
 #include "third_party/skia/include/core/SkColor.h"
-@@ -128,6 +130,14 @@ class COMPOSITOR_EXPORT ContextFactory {
+@@ -133,6 +135,14 @@ class COMPOSITOR_EXPORT ContextFactory {
   virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0;
 };
 
@@ -242,7 +242,7 @@ index dc011fe48e2a..60743cbaa548 100644
 // Compositor object to take care of GPU painting.
 // A Browser compositor object is responsible for generating the final
 // displayable form of pixels comprising a single widget's contents. It draws an
-@@ -162,6 +172,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
+@@ -167,6 +177,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
   // Schedules a redraw of the layer tree associated with this compositor.
   void ScheduleDraw();
 
@@ -252,7 +252,7 @@ index dc011fe48e2a..60743cbaa548 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
-@@ -430,6 +443,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
+@@ -435,6 +448,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
 
   std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
 
--- a/patch/patches/web_contents_1257_1565.patch
+++ b/patch/patches/web_contents_1257_1565.patch
@@ -1,8 +1,8 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index cef3171a9987..7819fd0cafbe 100644
+index 496c36479799..ecbf2d55fe89 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -2744,7 +2744,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2724,7 +2724,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
   // main frame - let's do the same thing here.
   std::string unique_name;
   frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -16,7 +16,7 @@ index cef3171a9987..7819fd0cafbe 100644
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -2755,6 +2761,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2735,6 +2741,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
     view_.reset(CreateWebContentsView(this, delegate,
                                       &render_view_host_delegate_view_));
   }
@@ -24,7 +24,7 @@ index cef3171a9987..7819fd0cafbe 100644
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
-@@ -3576,6 +3583,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3550,6 +3557,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
   // objects.
   create_params.renderer_initiated_creation = !is_new_browsing_instance;
 
@@ -40,7 +40,7 @@ index cef3171a9987..7819fd0cafbe 100644
   std::unique_ptr<WebContentsImpl> new_contents;
   if (!is_guest) {
     create_params.context = view_->GetNativeView();
-@@ -7432,6 +7448,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
+@@ -7451,6 +7467,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
     // This is an outermost WebContents.
     SetAsFocusedWebContentsIfNecessary();
   }
@@ -64,7 +64,7 @@ index f1dcf53ea481..192f7c0ddd04 100644
 
 WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index 0270206115ff..dc4ff89b5003 100644
+index 05efddc8d80f..29e01d78cf3c 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
@@ -87,8 +87,10 @@ class BrowserContext;
@@ -90,7 +90,7 @@ index 0270206115ff..dc4ff89b5003 100644
     // the value that'll be returned by GetLastActiveTime(). If this is left
     // default initialized then the value is not passed on to the WebContents
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index 775591c60fc9..341c55df8f1e 100644
+index 21d30d1b60ba..4b8eadb8fbb7 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
@@ -60,10 +60,12 @@ class EyeDropperListener;
@@ -122,10 +122,10 @@ index 775591c60fc9..341c55df8f1e 100644
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
-index 6f9a949f9e67..4719562a34e9 100644
+index 9ab0a264e9ec..ac9b1ea02aa5 100644
 --- content/public/browser/web_contents_observer.h
 +++ content/public/browser/web_contents_observer.h
-@@ -605,6 +605,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
+@@ -609,6 +609,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
   // WebContents has gained/lost focus.
   virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}
 
--- a/patch/patches/web_url_loader_cancel_1617042.patch
+++ b/patch/patches/web_url_loader_cancel_1617042.patch
@@ -1,16 +1,16 @@
 diff --git content/renderer/loader/web_url_loader_impl.h content/renderer/loader/web_url_loader_impl.h
-index 71ddc4cd98aa..714d1612e4eb 100644
+index 883a088152d5..578f64c3bdc5 100644
 --- content/renderer/loader/web_url_loader_impl.h
 +++ content/renderer/loader/web_url_loader_impl.h
-@@ -99,6 +99,7 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
+@@ -102,6 +102,7 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper,
       blink::WebURLLoaderClient* client) override;
 +  void Cancel() override;
-   void SetDefersLoading(bool value) override;
+   void SetDefersLoading(DeferType value) override;
   void DidChangePriority(blink::WebURLRequest::Priority new_priority,
                          int intra_priority_value) override;
-@@ -109,8 +110,6 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
+@@ -112,8 +113,6 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
   class Context;
   class RequestPeerImpl;
 
@@ -20,7 +20,7 @@ index 71ddc4cd98aa..714d1612e4eb 100644
 
   DISALLOW_COPY_AND_ASSIGN(WebURLLoaderImpl);
 diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
-index 18f605fdf283..760e690ac3d2 100644
+index 2db7b64b7948..fc77260fc9c0 100644
 --- third_party/blink/public/platform/web_url_loader.h
 +++ third_party/blink/public/platform/web_url_loader.h
@@ -94,6 +94,10 @@ class WebURLLoader {
@@ -31,6 +31,6 @@ index 18f605fdf283..760e690ac3d2 100644
 +  // the client.
 +  virtual void Cancel() {}
 +
-   // Suspends/resumes an asynchronous load.
-   virtual void SetDefersLoading(bool) = 0;
- 
+   // |kDeferred| is when an asynchronous load is suspended.
+   // |kDeferredWithBackForwardCache| is when an asynchronous load is suspended
+   // with BackForwardCache, and BackForwardCache entry can be evicted when
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@@ -10,10 +10,10 @@ index ff7a8ed89e94..77f44956ff22 100644
 +  GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
 };
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index 358f3c1d004c..43204c5d6d88 100644
+index e43136e0621f..59a8d59fcc64 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
-@@ -754,6 +754,11 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -773,6 +773,11 @@ class BLINK_PLATFORM_EXPORT Platform {
   // unset pass an empty WebURL and WebString.
   virtual void SetActiveURL(const WebURL& url, const WebString& top_url) {}
 
@@ -26,10 +26,10 @@ index 358f3c1d004c..43204c5d6d88 100644
   static void InitializeMainThreadCommon(Platform* platform,
                                          std::unique_ptr<Thread> main_thread);
 diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc
-index d49dc7cb85d5..dc4af48a458d 100644
+index 570678bc648c..42d979f2a496 100644
 --- third_party/blink/renderer/core/dom/document_init.cc
 +++ third_party/blink/renderer/core/dom/document_init.cc
-@@ -182,11 +182,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) {
+@@ -180,11 +180,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) {
   // frame()->tree().top()->securityContext() returns nullptr.
   // For that reason, the origin must be retrieved directly from |url|.
   if (frame->IsMainFrame())
@@ -44,12 +44,12 @@ index d49dc7cb85d5..dc4af48a458d 100644
 
 DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
 diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
-index 4315a68fb8d5..efcf6760b52e 100644
+index aa8952f06c9d..1fed8c0efe80 100644
 --- third_party/blink/renderer/core/frame/local_frame.cc
 +++ third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1795,7 +1795,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1811,7 +1811,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
 PluginData* LocalFrame::GetPluginData() const {
-   if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
+   if (!Loader().AllowPlugins())
     return nullptr;
 -  return GetPage()->GetPluginData(
 +  return GetPage()->GetPluginData(IsMainFrame(),
@@ -85,10 +85,10 @@ index 0608c4defc6d..54eaa2197957 100644
 
 void DevToolsSession::DispatchProtocolCommand(
 diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
-index 5e42e49edcef..85932795bc65 100644
+index 022b95ec4ecc..ba58b796e35e 100644
 --- third_party/blink/renderer/core/page/page.cc
 +++ third_party/blink/renderer/core/page/page.cc
-@@ -220,7 +220,8 @@ Page::Page(PageClients& page_clients)
+@@ -212,7 +212,8 @@ Page::Page(PageClients& page_clients)
           MakeGarbageCollected<OverscrollController>(GetVisualViewport(),
                                                      GetChromeClient())),
       link_highlight_(MakeGarbageCollected<LinkHighlight>(*this)),
@@ -98,7 +98,7 @@ index 5e42e49edcef..85932795bc65 100644
       // TODO(pdr): Initialize |validation_message_client_| lazily.
       validation_message_client_(
           MakeGarbageCollected<ValidationMessageClientImpl>(*this)),
-@@ -400,21 +401,41 @@ void Page::InitialStyleChanged() {
+@@ -395,21 +396,41 @@ void Page::InitialStyleChanged() {
   }
 }
 
@@ -149,7 +149,7 @@ index 5e42e49edcef..85932795bc65 100644
       page->NotifyPluginsChanged();
     }
   }
-@@ -930,7 +951,8 @@ void Page::Trace(Visitor* visitor) const {
+@@ -921,7 +942,8 @@ void Page::Trace(Visitor* visitor) const {
   visitor->Trace(link_highlight_);
   visitor->Trace(spatial_navigation_controller_);
   visitor->Trace(main_frame_);
@@ -157,13 +157,13 @@ index 5e42e49edcef..85932795bc65 100644
 +  visitor->Trace(plugin_data_main_frame_);
 +  visitor->Trace(plugin_data_sub_frame_);
   visitor->Trace(validation_message_client_);
-   visitor->Trace(agent_metrics_collector_);
   visitor->Trace(plugins_changed_observers_);
+   visitor->Trace(next_related_page_);
 diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
-index 65b72a9867bc..98569071f8b9 100644
+index e15111958f06..bfa43194b03b 100644
 --- third_party/blink/renderer/core/page/page.h
 +++ third_party/blink/renderer/core/page/page.h
-@@ -153,7 +153,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
+@@ -152,7 +152,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
   ViewportDescription GetViewportDescription() const;
 
   // Returns the plugin data associated with |main_frame_origin|.
@@ -173,7 +173,7 @@ index 65b72a9867bc..98569071f8b9 100644
 
   // Resets the plugin data for all pages in the renderer process and notifies
   // PluginsChangedObservers.
-@@ -437,7 +438,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
+@@ -434,7 +435,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
   const Member<LinkHighlight> link_highlight_;
   Member<SpatialNavigationController> spatial_navigation_controller_;
 
--- a/patch/patches/webkit_popups_and_background.patch
+++ b/patch/patches/webkit_popups_and_background.patch
@@ -1,8 +1,8 @@
 diff --git third_party/blink/common/web_preferences/web_preferences.cc third_party/blink/common/web_preferences/web_preferences.cc
-index 030a534b2fd1..934abdbc22e6 100644
+index 758b0b1616ec..b35748d8180c 100644
 --- third_party/blink/common/web_preferences/web_preferences.cc
 +++ third_party/blink/common/web_preferences/web_preferences.cc
-@@ -149,6 +149,7 @@ WebPreferences::WebPreferences()
+@@ -151,6 +151,7 @@ WebPreferences::WebPreferences()
       animation_policy(
           blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAllowed),
       user_gesture_required_for_presentation(true),
@@ -11,10 +11,10 @@ index 030a534b2fd1..934abdbc22e6 100644
       text_track_margin_percentage(0.0f),
       immersive_mode_enabled(false),
 diff --git third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 945a58c91efa..b5bee8f615ef 100644
+index ac2cb47de75e..1e38517a1544 100644
 --- third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -273,6 +273,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -155,6 +155,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
       data.accelerated_video_decode_enabled();
   out->user_gesture_required_for_presentation =
       data.user_gesture_required_for_presentation();
@@ -23,10 +23,10 @@ index 945a58c91efa..b5bee8f615ef 100644
   out->text_track_margin_percentage = data.text_track_margin_percentage();
   out->immersive_mode_enabled = data.immersive_mode_enabled();
 diff --git third_party/blink/public/common/web_preferences/web_preferences.h third_party/blink/public/common/web_preferences/web_preferences.h
-index e2fb2d1d46d3..0783c9145510 100644
+index 64444803e75f..740d03e7eb7b 100644
 --- third_party/blink/public/common/web_preferences/web_preferences.h
 +++ third_party/blink/public/common/web_preferences/web_preferences.h
-@@ -172,6 +172,8 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -175,6 +175,8 @@ struct BLINK_COMMON_EXPORT WebPreferences {
 
   bool user_gesture_required_for_presentation;
 
@@ -36,10 +36,10 @@ index e2fb2d1d46d3..0783c9145510 100644
 
   // These fields specify the foreground and background color for WebVTT text
 diff --git third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index c40048e55b16..1e5843fc33d2 100644
+index c071879cdc2e..9c11650a6045 100644
 --- third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-@@ -476,6 +476,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -455,6 +455,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
     return r.user_gesture_required_for_presentation;
   }
 
@@ -52,10 +52,10 @@ index c40048e55b16..1e5843fc33d2 100644
     return r.text_tracks_enabled;
   }
 diff --git third_party/blink/public/mojom/webpreferences/web_preferences.mojom third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 52fbf5b35bb4..2bbcf1c4d78d 100644
+index 519b354f7a0e..103472abbb39 100644
 --- third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-@@ -219,6 +219,8 @@ struct WebPreferences {
+@@ -225,6 +225,8 @@ struct WebPreferences {
 
   bool user_gesture_required_for_presentation;
 
@@ -65,10 +65,10 @@ index 52fbf5b35bb4..2bbcf1c4d78d 100644
 
   // These fields specify the foreground and background color for WebVTT text
 diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
-index 500f7da6e87a..3cbe35f670a5 100644
+index fb648cda4e1a..15bb56c8ae4f 100644
 --- third_party/blink/public/web/web_view.h
 +++ third_party/blink/public/web/web_view.h
-@@ -336,6 +336,7 @@ class WebView {
+@@ -310,6 +310,7 @@ class WebView {
 
   // Sets whether select popup menus should be rendered by the browser.
   BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
@@ -77,7 +77,7 @@ index 500f7da6e87a..3cbe35f670a5 100644
   // Cancels and hides the current popup (datetime, select...) if any.
   virtual void CancelPagePopup() = 0;
 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
-index 1ae768c752dd..5a92897f830e 100644
+index 68688f094a68..9eaabb3431e2 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -238,8 +238,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -96,7 +96,7 @@ index 1ae768c752dd..5a92897f830e 100644
 }
 
 namespace {
-@@ -540,6 +545,7 @@ WebViewImpl::WebViewImpl(
+@@ -541,6 +546,7 @@ WebViewImpl::WebViewImpl(
       chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
       minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
       maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@@ -104,7 +104,7 @@ index 1ae768c752dd..5a92897f830e 100644
       does_composite_(does_composite),
       fullscreen_controller_(std::make_unique<FullscreenController>(this)),
       receiver_(this,
-@@ -1801,6 +1807,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1752,6 +1758,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
 
   RuntimeEnabledFeatures::SetTranslateServiceEnabled(
       prefs.translate_service_available);
@@ -114,7 +114,7 @@ index 1ae768c752dd..5a92897f830e 100644
 
 void WebViewImpl::ThemeChanged() {
 diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
-index 165699ca8d92..d0db1ed1869a 100644
+index 83a2e96325de..48af36ac385a 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.h
 +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -126,7 +126,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -127,7 +127,7 @@ index 165699ca8d92..d0db1ed1869a 100644
 
   // Returns whether frames under this WebView are backed by a compositor.
   bool does_composite() const { return does_composite_; }
-@@ -711,6 +712,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -721,6 +722,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   float fake_page_scale_animation_page_scale_factor_ = 0.f;
   bool fake_page_scale_animation_use_anchor_ = false;
 
@@ -137,10 +137,10 @@ index 165699ca8d92..d0db1ed1869a 100644
   TransformationMatrix device_emulation_transform_;
 
 diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
-index 4eddfdf0921a..555fb3a95139 100644
+index d31dd9eb8419..3014c9223aef 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
-@@ -805,7 +805,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
+@@ -802,7 +802,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
 PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                            HTMLSelectElement& select) {
   NotifyPopupOpeningObservers();
--- a/patch/patches/webui_2037.patch
+++ b/patch/patches/webui_2037.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
-index 3267d8a52c8b..b01878a54539 100644
+index b001aa3db63f..dd2743ca0afc 100644
 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
 +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -10,6 +10,7 @@
@@ -10,15 +10,15 @@ index 3267d8a52c8b..b01878a54539 100644
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-@@ -21,6 +22,7 @@
- #include "base/task/thread_pool.h"
+@@ -22,6 +23,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 +#include "cef/libcef/features/runtime.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h"
-@@ -28,6 +30,7 @@
+@@ -29,6 +31,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/channel_info.h"
@@ -26,7 +26,7 @@ index 3267d8a52c8b..b01878a54539 100644
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_internals_util.h"
 #include "components/sync/driver/sync_service.h"
-@@ -343,7 +346,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
+@@ -342,7 +345,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
   response->emplace(kOsVersionTag, os_version);
 #endif
 
@@ -39,7 +39,7 @@ index 3267d8a52c8b..b01878a54539 100644
   PopulateExtensionInfoLogs(response.get());
   PopulatePowerApiLogs(response.get());
   PopulateDataReductionProxyLogs(response.get());
-@@ -418,6 +425,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
+@@ -417,6 +424,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
   if (!profile)
     return;
 
@@ -52,7 +52,7 @@ index 3267d8a52c8b..b01878a54539 100644
   extensions::ExtensionRegistry* extension_registry =
       extensions::ExtensionRegistry::Get(profile);
   std::string extensions_list;
-@@ -525,6 +538,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
+@@ -524,6 +537,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
 #if defined(OS_WIN)
 void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
     SystemLogsResponse* response) {
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,8 +1,8 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 8adfdcf49184..4bd1f967575c 100644
+index 3a1f50cb713c..e915ab4ee03a 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
-@@ -5085,7 +5085,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5083,7 +5083,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         </message>
       </if>
       <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
--- a/patch/patches/win_rt_2274.patch
+++ b/patch/patches/win_rt_2274.patch
@@ -1,8 +1,8 @@
 diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
-index eef1a60d348e..eabb92072c2c 100644
+index 8ae341c38aac..c67b5acc89e7 100644
 --- sandbox/policy/win/sandbox_win.cc
 +++ sandbox/policy/win/sandbox_win.cc
-@@ -1003,8 +1003,11 @@ ResultCode SandboxWin::StartSandboxedProcess(
+@@ -1004,8 +1004,11 @@ ResultCode SandboxWin::StartSandboxedProcess(
   }
   // TODO(wfh): Relax strict handle checks for network process until root cause
   // for this crash can be resolved. See https://crbug.com/939590.