Update to Chromium version 68.0.3440.0 (#561733)

BUILD.gn

@@ -674,9 +674,9 @@ static_library("libcef_static") {
     "//components/printing/browser",
     "//components/printing/common",
     "//components/printing/renderer",
-    "//components/printing/service:pdf_compositor_manifest",
-    "//components/printing/service/public/cpp:factory",
-    "//components/printing/service/public/interfaces",
+    "//components/services/pdf_compositor:pdf_compositor_manifest",
+    "//components/services/pdf_compositor/public/cpp:utils",
+    "//components/services/pdf_compositor/public/interfaces",
     "//components/proxy_config",
     "//components/update_client",
     "//components/url_formatter",

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/68.0.3433.0',
+  'chromium_checkout': 'refs/tags/68.0.3440.0',
 }

CHROMIUM_UPDATE.txt

@@ -35,10 +35,12 @@
     'chrome/browser/extensions/extension_service.*',
     'chrome/browser/printing/print_view_manager*',
     'chrome/browser/printing/printing_message_filter*',
+    'chrome/browser/profiles/profile.h',
     'chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.*',
     'chrome/common/extensions/api/*_features.json',
     'chrome/renderer/chrome_content_renderer_client.*',
     'chrome/renderer/extensions/chrome_extensions_renderer_client.*',
+    'content/browser/renderer_host/render_widget_host_view_base.*',
     'content/public/browser/render_widget_host_view.h',
     'content/public/browser/storage_partition.h',
     'content/public/browser/web_contents_delegate.h',

cef_paths2.gypi

@@ -159,7 +159,6 @@
       'tests/shared/browser/main_message_loop_std.cc',
       'tests/shared/browser/main_message_loop_std.h',
       'tests/shared/browser/resource_util.h',
-      'tests/shared/browser/resource_util.h',
     ],
     'shared_sources_common': [
       'tests/shared/common/client_app.cc',

libcef/browser/chrome_browser_process_stub.cc

@@ -317,12 +317,10 @@ ChromeBrowserProcessStub::media_file_system_registry() {
   return NULL;
 }
 
-#if BUILDFLAG(ENABLE_WEBRTC)
 WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
   NOTREACHED();
   return NULL;
 }
-#endif
 
 network_time::NetworkTimeTracker*
 ChromeBrowserProcessStub::network_time_tracker() {

libcef/browser/chrome_browser_process_stub.h

@@ -96,9 +96,7 @@ class ChromeBrowserProcessStub : public BrowserProcess,
   component_updater::SupervisedUserWhitelistInstaller*
   supervised_user_whitelist_installer() override;
   MediaFileSystemRegistry* media_file_system_registry() override;
-#if BUILDFLAG(ENABLE_WEBRTC)
   WebRtcLogUploader* webrtc_log_uploader() override;
-#endif
   network_time::NetworkTimeTracker* network_time_tracker() override;
   gcm::GCMDriver* gcm_driver() override;
   shell_integration::DefaultWebClientState CachedDefaultWebClientState()

libcef/browser/chrome_profile_stub.cc

@@ -75,11 +75,6 @@ ChromeProfileStub::GetRequestContextForExtensions() {
   return GetRequestContext();
 }
 
-net::SSLConfigService* ChromeProfileStub::GetSSLConfigService() {
-  NOTREACHED();
-  return NULL;
-}
-
 bool ChromeProfileStub::IsSameProfile(Profile* profile) {
   NOTREACHED();
   return false;

libcef/browser/chrome_profile_stub.h

@@ -34,7 +34,6 @@ class ChromeProfileStub : public Profile {
   ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
   PrefService* GetOffTheRecordPrefs() override;
   net::URLRequestContextGetter* GetRequestContextForExtensions() override;
-  net::SSLConfigService* GetSSLConfigService() override;
   bool IsSameProfile(Profile* profile) override;
   base::Time GetStartTime() const override;
   base::FilePath last_selected_directory() override;

libcef/browser/content_browser_client.cc

@@ -52,7 +52,7 @@
 #include "chrome/services/printing/public/mojom/constants.mojom.h"
 #include "components/navigation_interception/intercept_navigation_throttle.h"
 #include "components/navigation_interception/navigation_params.h"
-#include "components/printing/service/public/interfaces/pdf_compositor.mojom.h"
+#include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
@@ -599,7 +599,8 @@ void CefContentBrowserClient::SiteInstanceDeleting(
 }
 
 void CefContentBrowserClient::RegisterInProcessServices(
-    StaticServiceMap* services) {
+    StaticServiceMap* services,
+    content::ServiceManagerConnection* connection) {
   {
     // For spell checking.
     service_manager::EmbeddedServiceInfo info;

libcef/browser/content_browser_client.h

@@ -51,7 +51,9 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   bool IsHandledURL(const GURL& url) override;
   void SiteInstanceGotProcess(content::SiteInstance* site_instance) override;
   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-  void RegisterInProcessServices(StaticServiceMap* services) override;
+  void RegisterInProcessServices(
+      StaticServiceMap* services,
+      content::ServiceManagerConnection* connection) override;
   void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
   std::unique_ptr<base::Value> GetServiceManifestOverlay(
       base::StringPiece name) override;

libcef/browser/extensions/api/tabs/tabs_api.cc

@@ -180,8 +180,8 @@ bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage(std::string* error) {
 
   // NOTE: This can give the wrong answer due to race conditions, but it is OK,
   // we check again in the renderer.
-  if (!extension()->permissions_data()->CanAccessPage(
-          extension(), effective_document_url, execute_tab_id_, error)) {
+  if (!extension()->permissions_data()->CanAccessPage(effective_document_url,
+                                                      execute_tab_id_, error)) {
     if (is_about_url &&
         extension()->permissions_data()->active_permissions().HasAPIPermission(
             APIPermission::kTab)) {

libcef/browser/osr/osr_accessibility_util.cc

@@ -170,6 +170,12 @@ struct PopulateAxNodeAttributes {
           attributes->SetString(ToString(attr.first), ToString(state));
         }
       } break;
+      case ax::mojom::IntAttribute::kTextPosition: {
+        auto state = static_cast<ax::mojom::TextPosition>(attr.second);
+        if (ax::mojom::TextPosition::kNone != state) {
+          attributes->SetString(ToString(attr.first), ToString(state));
+        }
+      } break;
       case ax::mojom::IntAttribute::kTextStyle: {
         auto text_style = static_cast<ax::mojom::TextStyle>(attr.second);
         if (text_style == ax::mojom::TextStyle::kNone)

libcef/browser/osr/render_widget_host_view_osr.cc

@@ -471,7 +471,7 @@ void CefRenderWidgetHostViewOSR::DidCreateNewRendererCompositorFrameSink(
 void CefRenderWidgetHostViewOSR::SubmitCompositorFrame(
     const viz::LocalSurfaceId& local_surface_id,
     viz::CompositorFrame frame,
-    viz::mojom::HitTestRegionListPtr hit_test_region_list) {
+    base::Optional<viz::HitTestRegionList> hit_test_region_list) {
   TRACE_EVENT0("libcef", "CefRenderWidgetHostViewOSR::OnSwapCompositorFrame");
 
   if (frame.metadata.root_scroll_offset != last_scroll_offset_) {

libcef/browser/osr/render_widget_host_view_osr.h

@@ -132,7 +132,7 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
   void SubmitCompositorFrame(
       const viz::LocalSurfaceId& local_surface_id,
       viz::CompositorFrame frame,
-      viz::mojom::HitTestRegionListPtr hit_test_region_list) override;
+      base::Optional<viz::HitTestRegionList> hit_test_region_list) override;
   void ClearCompositorFrame() override;
   void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
                    const gfx::Rect& pos) override;

libcef/browser/prefs/renderer_prefs.cc

@@ -301,14 +301,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kEnableDoNotTrack, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
-#if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
   registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
   registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
                                content::kWebRTCIPHandlingDefault);
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
-#endif
 
 #if !defined(OS_MACOSX)
   registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true);

libcef/browser/printing/print_view_manager_base.cc

@@ -33,8 +33,8 @@
 #include "components/printing/browser/print_composite_client.h"
 #include "components/printing/browser/print_manager_utils.h"
 #include "components/printing/common/print_messages.h"
-#include "components/printing/service/public/cpp/pdf_service_mojo_types.h"
-#include "components/printing/service/public/cpp/pdf_service_mojo_utils.h"
+#include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_types.h"
+#include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"

libcef/browser/printing/print_view_manager_base.h

@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "components/prefs/pref_member.h"
 #include "components/printing/browser/print_manager.h"
-#include "components/printing/service/public/interfaces/pdf_compositor.mojom.h"
+#include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "mojo/public/cpp/system/platform_handle.h"

libcef/renderer/extensions/extensions_renderer_client.cc

@@ -181,11 +181,11 @@ void CefExtensionsRendererClient::WillSendRequest(
                        content::RenderFrame::FromWebFrame(frame))
                        ->tab_id();
       GURL request_url(url);
-      if (extension->permissions_data()->GetPageAccess(extension, request_url,
-                                                       tab_id, nullptr) ==
+      if (extension->permissions_data()->GetPageAccess(request_url, tab_id,
+                                                       nullptr) ==
               extensions::PermissionsData::PageAccess::kAllowed ||
           extension->permissions_data()->GetContentScriptAccess(
-              extension, request_url, tab_id, nullptr) ==
+              request_url, tab_id, nullptr) ==
               extensions::PermissionsData::PageAccess::kAllowed) {
         *attach_same_site_cookies = true;
       }

libcef/utility/content_utility_client.cc

@@ -10,8 +10,8 @@
 #include "build/build_config.h"
 #include "chrome/services/printing/printing_service.h"
 #include "chrome/services/printing/public/mojom/constants.mojom.h"
-#include "components/printing/service/public/cpp/pdf_compositor_service_factory.h"
-#include "components/printing/service/public/interfaces/pdf_compositor.mojom.h"
+#include "components/services/pdf_compositor/public/cpp/pdf_compositor_service_factory.h"
+#include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
 #include "content/public/child/child_thread.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/simple_connection_filter.h"

patch/patch.cfg

@@ -363,4 +363,9 @@ patches = [
     # https://bitbucket.org/chromiumembedded/cef/issues/2398
     'name': 'mac_gpu_2398',
   },
+  {
+    # Fix crash in CookieMonsterChangeDispatcher::Subscription destructor.
+    # https://bugs.chromium.org/p/chromium/issues/detail?id=729800#c48
+    'name': 'net_cookies_729800',
+  },
 ]

patch/patches/browser_compositor_mac.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
-index 3f720471d006..c9ab4c924b1b 100644
+index bc9eba153a6a..f6d2856e8eab 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.h
 +++ content/browser/renderer_host/browser_compositor_view_mac.h
-@@ -56,6 +56,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
+@@ -58,6 +58,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
  
    // These will not return nullptr until Destroy is called.
    DelegatedFrameHost* GetDelegatedFrameHost();
@@ -10,7 +10,7 @@ index 3f720471d006..c9ab4c924b1b 100644
  
    // Ensure that the currect compositor frame be cleared (even if it is
    // potentially visible).
-@@ -67,6 +68,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
+@@ -69,6 +70,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
    // no valid frame is available.
    const gfx::CALayerParams* GetLastCALayerParams() const;
  
@@ -19,10 +19,10 @@ index 3f720471d006..c9ab4c924b1b 100644
    void DidCreateNewRendererCompositorFrameSink(
        viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
 diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
-index affefec39dd6..c0359a5ce62b 100644
+index bc1492dee443..7ebf4188f2c8 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ content/browser/renderer_host/browser_compositor_view_mac.mm
-@@ -247,6 +247,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
+@@ -240,6 +240,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
      g_spare_recyclable_compositors.Get().clear();
  }
  

patch/patches/browser_plugin_guest_1565.patch

@@ -37,7 +37,7 @@ index a0bc9305e62d..0c8d42c55302 100644
  
    attached_ = true;
 diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
-index f7340d1f5d4c..d2cdb73e8db9 100644
+index 7c55f52cb49a..fa1c85a86ed5 100644
 --- content/browser/frame_host/interstitial_page_impl.cc
 +++ content/browser/frame_host/interstitial_page_impl.cc
 @@ -619,7 +619,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
@@ -208,10 +208,10 @@ index 4a06fe5f6880..ecad941c2638 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h
-index 968c5157ab41..22aad9fbafa4 100644
+index 4640550b8484..efa2496b6317 100644
 --- content/browser/web_contents/web_contents_view_mac.h
 +++ content/browser/web_contents/web_contents_view_mac.h
-@@ -89,7 +89,7 @@ class WebContentsViewMac : public WebContentsView,
+@@ -93,7 +93,7 @@ class WebContentsViewMac : public WebContentsView,
                    gfx::NativeView context) override;
    RenderWidgetHostViewBase* CreateViewForWidget(
        RenderWidgetHost* render_widget_host,
@@ -221,7 +221,7 @@ index 968c5157ab41..22aad9fbafa4 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
-index 8cd612e1f03a..5cf012b31bda 100644
+index 00b2d2a729da..cb8a81ed8ee2 100644
 --- content/browser/web_contents/web_contents_view_mac.mm
 +++ content/browser/web_contents/web_contents_view_mac.mm
 @@ -348,7 +348,8 @@ void WebContentsViewMac::CreateView(

patch/patches/chrome_browser.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 7407d48e9104..8c4f03f2f551 100644
+index b8a22d99f3cf..da1d8cfcf86a 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
 @@ -8,6 +8,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 7407d48e9104..8c4f03f2f551 100644
  import("//chrome/common/features.gni")
  import("//components/feature_engagement/features.gni")
  import("//components/feed/features.gni")
-@@ -1595,6 +1596,7 @@ jumbo_split_static_library("browser") {
+@@ -1594,6 +1595,7 @@ jumbo_split_static_library("browser") {
      "//base:i18n",
      "//base/allocator:buildflags",
      "//cc",
@@ -18,7 +18,7 @@ index 7407d48e9104..8c4f03f2f551 100644
      "//chrome:extra_resources",
      "//chrome:resources",
      "//chrome:strings",
-@@ -1861,6 +1863,10 @@ jumbo_split_static_library("browser") {
+@@ -1860,6 +1862,10 @@ jumbo_split_static_library("browser") {
      ]
    }
  

patch/patches/chrome_plugins.patch

@@ -157,10 +157,10 @@ index 484e07af5a98..0e62e20095c7 100644
    // If we broke out of the loop, we have found an enabled plugin.
    bool enabled = i < matching_plugins.size();
 diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
-index dac5ee569f80..4d32c6d2d9c5 100644
+index 64a3c7982c9f..a336bbd7f98b 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -771,6 +771,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -765,6 +765,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
  
      if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
           status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -168,7 +168,7 @@ index dac5ee569f80..4d32c6d2d9c5 100644
          observer->IsPluginTemporarilyAllowed(identifier)) {
        status = chrome::mojom::PluginStatus::kAllowed;
      }
-@@ -958,7 +959,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -952,7 +953,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
          render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
              &plugin_auth_host);
          plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -178,7 +178,7 @@ index dac5ee569f80..4d32c6d2d9c5 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlocked: {
-@@ -967,7 +969,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -961,7 +963,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
              l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
          placeholder->AllowLoading();
          RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -188,7 +188,7 @@ index dac5ee569f80..4d32c6d2d9c5 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -977,7 +980,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -971,7 +974,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                         group_name));
          RenderThread::Get()->RecordAction(
              UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -198,7 +198,7 @@ index dac5ee569f80..4d32c6d2d9c5 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlockedNoLoading: {
-@@ -985,7 +989,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -979,7 +983,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
              IDR_BLOCKED_PLUGIN_HTML,
              l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
                                         group_name));

patch/patches/component_build_1617.patch

@@ -1,10 +1,10 @@
 diff --git content/app/content_service_manager_main_delegate.h content/app/content_service_manager_main_delegate.h
-index 4393a8fac233..860715e86900 100644
+index a6ab54a14bc9..93a38abe55d2 100644
 --- content/app/content_service_manager_main_delegate.h
 +++ content/app/content_service_manager_main_delegate.h
-@@ -16,7 +16,8 @@ namespace content {
+@@ -18,7 +18,8 @@ namespace content {
  
- class ContentMainRunner;
+ class ContentMainRunnerImpl;
  
 -class ContentServiceManagerMainDelegate : public service_manager::MainDelegate {
 +class CONTENT_EXPORT ContentServiceManagerMainDelegate :
@@ -13,7 +13,7 @@ index 4393a8fac233..860715e86900 100644
    explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
    ~ContentServiceManagerMainDelegate() override;
 diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
-index 3df8b9c94f17..a16461d8d729 100644
+index 20d1994e156e..45102558569f 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
 @@ -25,6 +25,7 @@ component("controller") {
@@ -24,12 +24,12 @@ index 3df8b9c94f17..a16461d8d729 100644
      "//third_party/blink/renderer:config",
      "//third_party/blink/renderer:inside_blink",
      "//third_party/blink/renderer:non_test_config",
-@@ -45,6 +46,8 @@ component("controller") {
+@@ -43,6 +44,8 @@ component("controller") {
+     "controller_export.h",
+     "dev_tools_frontend_impl.cc",
      "dev_tools_frontend_impl.h",
-     "oom_intervention_impl.cc",
-     "oom_intervention_impl.h",
 +    "//cef/libcef/renderer/blink_glue.cc",
 +    "//cef/libcef/renderer/blink_glue.h",
    ]
  
-   if (is_mac) {
+   if (is_android) {

patch/patches/compositor_1368.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
-index 1eae7a5d3354..999afbf1cc60 100644
+index e679dbb02a81..d90a276fc0e1 100644
 --- content/browser/compositor/gpu_process_transport_factory.cc
 +++ content/browser/compositor/gpu_process_transport_factory.cc
-@@ -514,10 +514,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
+@@ -507,10 +507,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
          // surfaces as they are not following the correct mode.
          DisableGpuCompositing(compositor.get());
        }

patch/patches/content_2015.patch

@@ -38,10 +38,10 @@ index 133145db74bf..021ab307ee2a 100644
                           content::WebPluginInfo* plugin) override;
  
 diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
-index d05027d09165..d3f57f6d96d7 100644
+index 41a8b316e884..62077f2e8a4e 100644
 --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
 +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
-@@ -53,7 +53,7 @@ PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(
+@@ -54,7 +54,7 @@ PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(
    content::ResourceContext* resource_context =
        handle->GetWebContents()->GetBrowserContext()->GetResourceContext();
    if (filter->IsPluginAvailable(process_id, routing_id, resource_context,
@@ -94,10 +94,10 @@ index b23698013a09..d60eb48c6efd 100644
                  "WillFailRequest state should come before WillProcessResponse");
    return render_frame_host_;
 diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
-index e16c62d0f36d..73698f6847a6 100644
+index 2ef1f5b667fa..c0296f748648 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
-@@ -1552,6 +1552,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
+@@ -1568,6 +1568,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
    if (GetNavigationHandle()) {
      GetNavigationHandle()->set_net_error_code(
          static_cast<net::Error>(params.error_code));
@@ -105,7 +105,7 @@ index e16c62d0f36d..73698f6847a6 100644
    }
  
    frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
-@@ -3317,9 +3318,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
+@@ -3328,9 +3329,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
  
    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
@@ -118,20 +118,20 @@ index e16c62d0f36d..73698f6847a6 100644
      // TODO(https://crbug.com/813479): Investigate why we need to explicitly
      // specify task runner for BrowserThread::IO here.
      // Bind calls to the BindRegistry should come on to the IO thread by
-@@ -3594,9 +3595,9 @@ void RenderFrameHostImpl::CommitNavigation(
+@@ -3606,9 +3607,9 @@ void RenderFrameHostImpl::CommitNavigation(
      // however only do this for cross-document navigations, because the
      // alternative would be redundant effort.
      network::mojom::URLLoaderFactoryPtrInfo default_factory_info;
 -    StoragePartitionImpl* storage_partition =
 -        static_cast<StoragePartitionImpl*>(BrowserContext::GetStoragePartition(
--            GetSiteInstance()->GetBrowserContext(), GetSiteInstance()));
+-            browser_context, GetSiteInstance()));
 +    StoragePartition* storage_partition =
 +        BrowserContext::GetStoragePartition(
-+            GetSiteInstance()->GetBrowserContext(), GetSiteInstance());
++            browser_context, GetSiteInstance());
      if (subresource_loader_params &&
          subresource_loader_params->loader_factory_info.is_valid()) {
        // If the caller has supplied a default URLLoaderFactory override (for
-@@ -4265,8 +4266,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
+@@ -4300,8 +4301,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
    RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
        this, false /* is_navigation */, false /* is_download */,
        &default_factory_request);
@@ -141,7 +141,7 @@ index e16c62d0f36d..73698f6847a6 100644
 +      BrowserContext::GetStoragePartition(context, GetSiteInstance());
    if (g_create_network_factory_callback_for_test.Get().is_null()) {
      storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
-         std::move(default_factory_request), GetProcess()->GetID());
+         std::move(default_factory_request), std::move(params));
 diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
 index 91bf248a67a5..ede635e9ef44 100644
 --- content/browser/frame_host/render_frame_message_filter.cc
@@ -275,10 +275,10 @@ index 4e11056a3dc9..973ad50975e1 100644
                       const std::string& mime_type,
                       bool allow_wildcard,
 diff --git content/common/frame_messages.h content/common/frame_messages.h
-index f6d2a1f492f3..6cdeb0aa8bcb 100644
+index 3ed93bdae0e3..c03780d69cfb 100644
 --- content/common/frame_messages.h
 +++ content/common/frame_messages.h
-@@ -1393,8 +1393,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
+@@ -1363,8 +1363,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
  
  // Used to get the list of plugins. |main_frame_origin| is used to handle
  // exceptions for plugin content settings.
@@ -289,7 +289,7 @@ index f6d2a1f492f3..6cdeb0aa8bcb 100644
                              url::Origin /* main_frame_origin */,
                              std::vector<content::WebPluginInfo> /* plugins */)
  
-@@ -1402,9 +1403,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
+@@ -1372,9 +1373,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
  // type. If there is no matching plugin, |found| is false.
  // |actual_mime_type| is the actual mime type supported by the
  // found plugin.
@@ -350,10 +350,10 @@ index 3b610b1f554e..7c439e060779 100644
                                   WebPluginInfo* plugin) = 0;
  
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index 59aba6d7b4a2..ee51dd460f32 100644
+index 6dd2589d653a..2a604fb6b14f 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
-@@ -76,6 +76,9 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -74,6 +74,9 @@ class CONTENT_EXPORT ContentRendererClient {
    // Notifies us that the RenderThread has been created.
    virtual void RenderThreadStarted() {}
  
@@ -363,7 +363,7 @@ index 59aba6d7b4a2..ee51dd460f32 100644
    // Notifies that a new RenderFrame has been created.
    virtual void RenderFrameCreated(RenderFrame* render_frame) {}
  
-@@ -358,6 +361,10 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -351,6 +354,10 @@ class CONTENT_EXPORT ContentRendererClient {
    // This method may invalidate the frame.
    virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
  
@@ -389,10 +389,10 @@ index 74a031ad10c3..3b3f9e292f4b 100644
    virtual void FocusedNodeChanged(const blink::WebNode& node) {}
  
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 013bc7b2833b..8789a6b3a4e8 100644
+index fd8ec4750c17..714c46e6f3ed 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -3250,7 +3250,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -3253,7 +3253,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
    std::string mime_type;
    bool found = false;
    Send(new FrameHostMsg_GetPluginInfo(
@@ -402,7 +402,7 @@ index 013bc7b2833b..8789a6b3a4e8 100644
        params.mime_type.Utf8(), &found, &info, &mime_type));
    if (!found)
      return nullptr;
-@@ -3606,6 +3607,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
+@@ -3610,6 +3611,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
  
  void RenderFrameImpl::FrameFocused() {
    Send(new FrameHostMsg_FrameFocused(routing_id_));
@@ -412,10 +412,10 @@ index 013bc7b2833b..8789a6b3a4e8 100644
  
  void RenderFrameImpl::WillCommitProvisionalLoad() {
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 64d044cafe64..78d24df85614 100644
+index 1e68c2fee634..75d5dfade01f 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -884,6 +884,8 @@ void RenderThreadImpl::Init(
+@@ -876,6 +876,8 @@ void RenderThreadImpl::Init(
  
    StartServiceManagerConnection();
  
@@ -425,10 +425,10 @@ index 64d044cafe64..78d24df85614 100644
        base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest,
                   base::Unretained(this)));
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 14d17e4257f4..65362ec1c609 100644
+index 4205c92765af..5541af8b7b7e 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -764,6 +764,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
+@@ -767,6 +767,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
  
  void RendererBlinkPlatformImpl::GetPluginList(
      bool refresh,
@@ -436,7 +436,7 @@ index 14d17e4257f4..65362ec1c609 100644
      const blink::WebSecurityOrigin& mainFrameOrigin,
      blink::WebPluginListBuilder* builder) {
  #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -771,7 +772,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
+@@ -774,7 +775,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
    if (!plugin_refresh_allowed_)
      refresh = false;
    RenderThread::Get()->Send(
@@ -446,7 +446,7 @@ index 14d17e4257f4..65362ec1c609 100644
    for (const WebPluginInfo& plugin : plugins) {
      builder->AddPlugin(WebString::FromUTF16(plugin.name),
                         WebString::FromUTF16(plugin.desc),
-@@ -1287,6 +1289,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
+@@ -1264,6 +1266,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
    base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
  }
  
@@ -462,10 +462,10 @@ index 14d17e4257f4..65362ec1c609 100644
    if (!web_database_host_) {
      web_database_host_ = blink::mojom::ThreadSafeWebDatabaseHostPtr::Create(
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index 325f0382d858..d3eab3839f9a 100644
+index ecb5ce6d6aa0..0733b16b5cd3 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -120,6 +120,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -122,6 +122,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    viz::FrameSinkId GenerateFrameSinkId() override;
  
    void GetPluginList(bool refresh,
@@ -473,7 +473,7 @@ index 325f0382d858..d3eab3839f9a 100644
                       const blink::WebSecurityOrigin& mainFrameOrigin,
                       blink::WebPluginListBuilder* builder) override;
    blink::WebPublicSuffixList* PublicSuffixList() override;
-@@ -239,6 +240,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -241,6 +242,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
        mojo::ScopedDataPipeConsumerHandle handle) override;
    void RequestPurgeMemory() override;
  
@@ -532,10 +532,10 @@ index 84bed37848d9..1a66c0757437 100644
                       const std::string& mime_type,
                       bool allow_wildcard,
 diff --git content/test/test_blink_web_unit_test_support.cc content/test/test_blink_web_unit_test_support.cc
-index 5b474d9f8c65..33be6755d2ea 100644
+index 84fcd3a10415..230ad9a26961 100644
 --- content/test/test_blink_web_unit_test_support.cc
 +++ content/test/test_blink_web_unit_test_support.cc
-@@ -338,6 +338,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
+@@ -336,6 +336,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
  
  void TestBlinkWebUnitTestSupport::GetPluginList(
      bool refresh,

patch/patches/crashpad_1995.patch

@@ -402,7 +402,7 @@ index c6a98292bb5e..7cf360d3b340 100644
          ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
    }
 diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm
-index 91aaa801f951..1f138f38487d 100644
+index f06d903c2f41..6ec1442323e9 100644
 --- components/crash/content/app/crashpad_mac.mm
 +++ components/crash/content/app/crashpad_mac.mm
 @@ -16,11 +16,14 @@
@@ -420,41 +420,24 @@ index 91aaa801f951..1f138f38487d 100644
  #include "third_party/crashpad/crashpad/client/crash_report_database.h"
  #include "third_party/crashpad/crashpad/client/crashpad_client.h"
  #include "third_party/crashpad/crashpad/client/crashpad_info.h"
-@@ -73,9 +76,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
- 
-   if (initial_client) {
-     @autoreleasepool {
--      base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
--      base::FilePath handler_path =
--          framework_bundle_path.Append("Helpers").Append("crashpad_handler");
-+      // Use the same subprocess helper exe.
-+      base::FilePath handler_path;
-+      base::PathService::Get(content::CHILD_PROCESS_EXE, &handler_path);
-+      DCHECK(!handler_path.empty());
- 
-       // Is there a way to recover if this fails?
-       CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
-@@ -87,16 +91,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
-       // crash server won't have symbols for any other build types.
-       std::string url = "https://clients2.google.com/cr/report";
- #else
--      std::string url;
-+      std::string url = crash_reporter_client->GetCrashServerURL();
- #endif
- 
-       std::map<std::string, std::string> process_annotations;
- 
-+      const char* product_name = "";
-+      const char* product_version = "";
-+      crash_reporter_client->GetProductNameAndVersion(&product_name,
-+                                                      &product_version);
+@@ -36,12 +39,25 @@ namespace {
+ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
+   static std::map<std::string, std::string> annotations = []() -> auto {
+     std::map<std::string, std::string> process_annotations;
 +
+     @autoreleasepool {
        NSBundle* outer_bundle = base::mac::OuterBundle();
 -      NSString* product = base::mac::ObjCCast<NSString>([outer_bundle
 -          objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
 -      process_annotations["prod"] =
 -          base::SysNSStringToUTF8(product).append("_Mac");
 +
++      CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
++      const char* product_name = "";
++      const char* product_version = "";
++      crash_reporter_client->GetProductNameAndVersion(&product_name,
++                                                      &product_version);
++
 +      if (strlen(product_name) == 0) {
 +        NSString* product = base::mac::ObjCCast<NSString>([outer_bundle
 +            objectForInfoDictionaryKey:base::mac::CFToNSCast(
@@ -467,7 +450,7 @@ index 91aaa801f951..1f138f38487d 100644
  
  #if defined(GOOGLE_CHROME_BUILD)
        // Empty means stable.
-@@ -112,12 +127,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
+@@ -57,12 +73,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
          process_annotations["channel"] = "";
        }
  
@@ -486,10 +469,33 @@ index 91aaa801f951..1f138f38487d 100644
  
 -      process_annotations["plat"] = std::string("OS X");
 +      process_annotations["platform"] = std::string("macos");
+     }  // @autoreleasepool
+     return process_annotations;
+   }();
+@@ -119,9 +139,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
+ 
+   if (initial_client) {
+     @autoreleasepool {
+-      base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
+-      base::FilePath handler_path =
+-          framework_bundle_path.Append("Helpers").Append("crashpad_handler");
++      // Use the same subprocess helper exe.
++      base::FilePath handler_path;
++      base::PathService::Get(content::CHILD_PROCESS_EXE, &handler_path);
++      DCHECK(!handler_path.empty());
+ 
+       // Is there a way to recover if this fails?
+       CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
+@@ -133,7 +154,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
+       // crash server won't have symbols for any other build types.
+       std::string url = "https://clients2.google.com/cr/report";
+ #else
+-      std::string url;
++      std::string url = crash_reporter_client->GetCrashServerURL();
+ #endif
  
        std::vector<std::string> arguments;
- 
-@@ -139,6 +158,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
+@@ -156,6 +177,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
              "--reset-own-crash-exception-port-to-system-default");
        }
  
@@ -500,8 +506,8 @@ index 91aaa801f951..1f138f38487d 100644
 +      crash_reporter_client->GetCrashOptionalArguments(&arguments);
 +
        bool result = GetCrashpadClient().StartHandler(
-           handler_path, database_path, metrics_path, url, process_annotations,
-           arguments, true, false);
+           handler_path, database_path, metrics_path, url,
+           GetProcessSimpleAnnotations(), arguments, true, false);
 diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc
 index 8b0edef1b594..22555bb9dc77 100644
 --- components/crash/content/app/crashpad_win.cc

patch/patches/devtools_product_2300.patch

@@ -12,10 +12,10 @@ index c9187e774953..72dc4a43c3f0 100644
      version.SetString("V8-Version", V8_VERSION_STRING);
      std::string host = info.headers["host"];
 diff --git content/public/common/content_client.h content/public/common/content_client.h
-index caf91a31abb9..492d12fbbfda 100644
+index 528fd6abf6a6..a45793539166 100644
 --- content/public/common/content_client.h
 +++ content/public/common/content_client.h
-@@ -148,6 +148,10 @@ class CONTENT_EXPORT ContentClient {
+@@ -150,6 +150,10 @@ class CONTENT_EXPORT ContentClient {
    // Used as part of the user agent string.
    virtual std::string GetProduct() const;
  
@@ -24,5 +24,5 @@ index caf91a31abb9..492d12fbbfda 100644
 +  virtual std::string GetChromeProduct() const { return GetProduct(); }
 +
    // Returns the user agent.  Content may cache this value.
+   // TODO(yhirano): Move this to ContentBrowserClient.
    virtual std::string GetUserAgent() const;
- 

patch/patches/extensions_1947.patch

@@ -57,10 +57,10 @@ index 7f6e27181267..26080b6d61e0 100644
    // If |new_instance| is a new SiteInstance for a subframe that requires a
    // dedicated process, set its process reuse policy so that such subframes are
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index d6799f4e2d07..d8b3cc177c44 100644
+index e9c6b810e050..e5dbbc6dbc02 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
-@@ -372,6 +372,13 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -373,6 +373,13 @@ class CONTENT_EXPORT ContentBrowserClient {
    // Returns true if error page should be isolated in its own process.
    virtual bool ShouldIsolateErrorPage(bool in_main_frame);
  

patch/patches/gn_config.patch

@@ -12,10 +12,10 @@ index 65c8804cc47c..f3a9a704abec 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 29915efe706f..68e11a68576d 100644
+index 378aa8822bec..5fddd6adbf28 100644
 --- BUILD.gn
 +++ BUILD.gn
-@@ -192,6 +192,7 @@ group("gn_all") {
+@@ -193,6 +193,7 @@ group("gn_all") {
  
    if (!is_ios && !is_fuchsia) {
      deps += [

patch/patches/linux_build.patch

@@ -1,10 +1,10 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index ed5e65477539..14142d80161e 100644
+index 83337d52e4b9..384edb6623a4 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -153,7 +153,7 @@ declare_args() {
+@@ -155,7 +155,7 @@ declare_args() {
              !(is_android && use_order_profiling) &&
-             ((use_lld && !is_nacl) ||
+             (use_lld ||
               (use_gold &&
 -              ((!is_android && linux_use_bundled_binutils) || is_chromeos ||
 +              ((!is_android && linux_use_bundled_binutils && current_cpu != "x86") || is_chromeos ||

patch/patches/message_loop_443_1992243003.patch

@@ -1,8 +1,8 @@
 diff --git base/message_loop/message_loop_current.h base/message_loop/message_loop_current.h
-index 3631a8ff2b81..988b3edb404b 100644
+index c5016dcf20a2..cf1db622f8fb 100644
 --- base/message_loop/message_loop_current.h
 +++ base/message_loop/message_loop_current.h
-@@ -126,6 +126,16 @@ class BASE_EXPORT MessageLoopCurrent {
+@@ -120,6 +120,16 @@ class BASE_EXPORT MessageLoopCurrent {
    void AddTaskObserver(TaskObserver* task_observer);
    void RemoveTaskObserver(TaskObserver* task_observer);
  
@@ -19,7 +19,7 @@ index 3631a8ff2b81..988b3edb404b 100644
    // Enables or disables the recursive task processing. This happens in the case
    // of recursive message loops. Some unwanted message loops may occur when
    // using common controls or printer functions. By default, recursive task
-@@ -194,6 +204,13 @@ class BASE_EXPORT MessageLoopCurrent {
+@@ -188,6 +198,13 @@ class BASE_EXPORT MessageLoopCurrent {
    explicit MessageLoopCurrent(MessageLoop* current) : current_(current) {}
  
    MessageLoop* const current_;

patch/patches/net_cookies_729800.patch

@@ -0,0 +1,14 @@
+diff --git net/cookies/cookie_monster_change_dispatcher.cc net/cookies/cookie_monster_change_dispatcher.cc
+index 2eadab6ca652..79fd1f0b6f58 100644
+--- net/cookies/cookie_monster_change_dispatcher.cc
++++ net/cookies/cookie_monster_change_dispatcher.cc
+@@ -51,7 +51,8 @@ CookieMonsterChangeDispatcher::Subscription::Subscription(
+ CookieMonsterChangeDispatcher::Subscription::~Subscription() {
+   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+ 
+-  change_dispatcher_->UnlinkSubscription(this);
++  if (change_dispatcher_)
++    change_dispatcher_->UnlinkSubscription(this);
+ }
+ 
+ void CookieMonsterChangeDispatcher::Subscription::DispatchChange(

patch/patches/pdfium_print_549365.patch

@@ -1,5 +1,5 @@
 diff --git BUILD.gn BUILD.gn
-index 784642042..ea62b408b 100644
+index 0535423d8..8fdbc5c84 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -244,6 +244,10 @@ jumbo_static_library("pdfium") {

patch/patches/prefs_content_1161.patch

@@ -1,8 +1,8 @@
 diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
-index c241d7b56549..081e1a3c6a81 100644
+index e3c46fdf48c7..8ca2e54e13a3 100644
 --- content/public/common/common_param_traits_macros.h
 +++ content/public/common/common_param_traits_macros.h
-@@ -187,6 +187,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
+@@ -189,6 +189,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
    IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
    IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
    IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@@ -11,10 +11,10 @@ index c241d7b56549..081e1a3c6a81 100644
    IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
    IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
 diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
-index a288caad850e..b4518162ec1e 100644
+index c5f6d0b03ba6..4951f816e407 100644
 --- content/public/common/web_preferences.cc
 +++ content/public/common/web_preferences.cc
-@@ -176,6 +176,7 @@ WebPreferences::WebPreferences()
+@@ -178,6 +178,7 @@ WebPreferences::WebPreferences()
        spatial_navigation_enabled(false),
        use_solid_color_scrollbars(false),
        navigate_on_drag_drop(true),
@@ -35,10 +35,10 @@ index a1e9fba06a66..c37d89755744 100644
    bool record_whole_document;
    SavePreviousDocumentResources save_previous_document_resources;
 diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
-index f17c11ec869d..493c8117fb7e 100644
+index 4aba7a9e290e..3a26dab9d31d 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
-@@ -1204,6 +1204,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
+@@ -1194,6 +1194,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
      blink::WebView* web_view,
      CompositorDependencies* compositor_deps) {
    ApplyWebPreferences(prefs, web_view);

patch/patches/print_header_footer_1478_1565.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index 78dd59c790a9..a7eacdf4c193 100644
+index 3b9eb8dc8ca7..c37db3071302 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
 @@ -894,6 +894,7 @@ split_static_library("ui") {
@@ -242,10 +242,10 @@ index cd3fe2986af2..6b377d0ad476 100644
  
  #endif  // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
 diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc
-index 633afea83efa..e223a05baaad 100644
+index af18233bc509..56da4e5a3ed9 100644
 --- components/printing/renderer/print_render_frame_helper.cc
 +++ components/printing/renderer/print_render_frame_helper.cc
-@@ -329,7 +329,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
+@@ -338,7 +338,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
    return plugin && plugin->SupportsPaginatedPrint();
  }
  
@@ -253,7 +253,7 @@ index 633afea83efa..e223a05baaad 100644
  // Returns true if the current destination printer is PRINT_TO_PDF.
  bool IsPrintToPdfRequested(const base::DictionaryValue& job_settings) {
    bool print_to_pdf = false;
-@@ -351,7 +350,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
+@@ -360,7 +359,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
    }
    return frame_has_custom_page_size_style;
  }
@@ -261,7 +261,7 @@ index 633afea83efa..e223a05baaad 100644
  
  #if BUILDFLAG(ENABLE_PRINTING)
  // Disable scaling when either:
-@@ -406,7 +404,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
+@@ -415,7 +413,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
               : PRINTABLE_AREA_MARGINS;
  }
  
@@ -269,7 +269,7 @@ index 633afea83efa..e223a05baaad 100644
  bool FitToPageEnabled(const base::DictionaryValue& job_settings) {
    bool fit_to_paper_size = false;
    if (!job_settings.GetBoolean(kSettingFitToPageEnabled, &fit_to_paper_size)) {
-@@ -448,7 +445,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
+@@ -457,7 +454,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
    }
    return blink::kWebPrintScalingOptionFitToPrintableArea;
  }
@@ -277,7 +277,7 @@ index 633afea83efa..e223a05baaad 100644
  
  // Helper function to scale and round an integer value with a double valued
  // scaling.
-@@ -952,6 +948,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper(
+@@ -970,6 +966,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper(
        notify_browser_of_print_failure_(true),
        delegate_(std::move(delegate)),
        print_node_in_progress_(false),
@@ -285,7 +285,7 @@ index 633afea83efa..e223a05baaad 100644
        is_loading_(false),
        is_scripted_preview_delayed_(false),
        ipc_nesting_level_(0),
-@@ -1013,10 +1010,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1031,10 +1028,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      return;
  
    if (g_is_preview_enabled) {
@@ -296,7 +296,7 @@ index 633afea83efa..e223a05baaad 100644
    } else {
      auto weak_this = weak_ptr_factory_.GetWeakPtr();
      web_frame->DispatchBeforePrintEvent();
-@@ -1044,10 +1039,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
+@@ -1062,10 +1057,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
    IPC_BEGIN_MESSAGE_MAP(PrintRenderFrameHelper, message)
      IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
      IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
@@ -308,7 +308,7 @@ index 633afea83efa..e223a05baaad 100644
      IPC_MESSAGE_HANDLER(PrintMsg_ClosePrintPreviewDialog,
                          OnClosePrintPreviewDialog)
  #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -1129,7 +1124,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
+@@ -1147,7 +1142,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
    ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
  }
  
@@ -316,23 +316,7 @@ index 633afea83efa..e223a05baaad 100644
  void PrintRenderFrameHelper::OnPrintPreview(
      const base::DictionaryValue& settings) {
    if (ipc_nesting_level_ > 1)
-@@ -1314,7 +1308,6 @@ bool PrintRenderFrameHelper::CreatePreviewDocument() {
-   return true;
- }
- 
--#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- bool PrintRenderFrameHelper::RenderPreviewPage(
-     int page_number,
-     const PrintMsg_Print_Params& print_params) {
-@@ -1342,7 +1335,6 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
-           print_params.printed_doc_type);
-   return PreviewPageRendered(page_number, std::move(metafile));
- }
--#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
- 
- bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
-   DCHECK(!is_print_ready_metafile_sent_);
-@@ -1370,7 +1362,6 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
+@@ -1388,7 +1382,6 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
    Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params));
    return true;
  }
@@ -340,7 +324,7 @@ index 633afea83efa..e223a05baaad 100644
  
  void PrintRenderFrameHelper::OnPrintingDone(bool success) {
    if (ipc_nesting_level_ > 1)
-@@ -1385,7 +1376,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
+@@ -1403,7 +1396,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
    is_printing_enabled_ = enabled;
  }
  
@@ -348,7 +332,7 @@ index 633afea83efa..e223a05baaad 100644
  void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
    if (ipc_nesting_level_ > 1)
      return;
-@@ -1396,7 +1386,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1414,7 +1406,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
    // that instead.
    auto plugin = delegate_->GetPdfElement(frame);
    if (!plugin.IsNull()) {
@@ -358,7 +342,7 @@ index 633afea83efa..e223a05baaad 100644
      return;
    }
    print_preview_context_.InitWithFrame(frame);
-@@ -1405,10 +1397,11 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1423,6 +1417,7 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
                            : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
  }
  
@@ -366,12 +350,7 @@ index 633afea83efa..e223a05baaad 100644
  void PrintRenderFrameHelper::OnClosePrintPreviewDialog() {
    print_preview_context_.source_frame()->DispatchAfterPrintEvent();
  }
--#endif
-+#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
- 
- void PrintRenderFrameHelper::OnPrintFrameContent(
-     const PrintMsg_PrintFrame_Params& params) {
-@@ -1492,11 +1485,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1510,11 +1505,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
    print_node_in_progress_ = true;
  
@@ -384,7 +363,7 @@ index 633afea83efa..e223a05baaad 100644
    } else {
      // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
      // its |context_menu_node_|.
-@@ -1586,7 +1577,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1604,7 +1597,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
        }
        break;
  
@@ -392,7 +371,7 @@ index 633afea83efa..e223a05baaad 100644
      case FAIL_PREVIEW:
        if (!is_print_ready_metafile_sent_) {
          if (notify_browser_of_print_failure_) {
-@@ -1603,7 +1593,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1621,7 +1613,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
                                                                 cookie));
        print_preview_context_.Failed(false);
        break;
@@ -400,7 +379,7 @@ index 633afea83efa..e223a05baaad 100644
    }
    prep_frame_view_.reset();
    print_pages_params_.reset();
-@@ -1771,7 +1760,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
+@@ -1793,7 +1784,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
    return true;
  }
  
@@ -408,7 +387,7 @@ index 633afea83efa..e223a05baaad 100644
  bool PrintRenderFrameHelper::SetOptionsFromPdfDocument(
      PrintHostMsg_SetOptionsFromDocument_Params* options) {
    blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
-@@ -1865,7 +1853,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
+@@ -1887,7 +1877,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
    print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
    return false;
  }
@@ -416,7 +395,7 @@ index 633afea83efa..e223a05baaad 100644
  
  void PrintRenderFrameHelper::GetPrintSettingsFromUser(
      blink::WebLocalFrame* frame,
-@@ -2021,7 +2008,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
+@@ -2044,7 +2033,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
    return true;
  }
  
@@ -424,7 +403,7 @@ index 633afea83efa..e223a05baaad 100644
  void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
    if (is_scripted_preview_delayed_) {
      is_scripted_preview_delayed_ = false;
-@@ -2144,7 +2130,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
+@@ -2167,7 +2155,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
    Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
    return true;
  }
@@ -433,10 +412,10 @@ index 633afea83efa..e223a05baaad 100644
  PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext()
      : total_page_count_(0),
 diff --git components/printing/renderer/print_render_frame_helper.h components/printing/renderer/print_render_frame_helper.h
-index cccd932eb993..ed7893a67e7a 100644
+index 46da03048dfb..c6b185b951fc 100644
 --- components/printing/renderer/print_render_frame_helper.h
 +++ components/printing/renderer/print_render_frame_helper.h
-@@ -145,10 +145,8 @@ class PrintRenderFrameHelper
+@@ -149,10 +149,8 @@ class PrintRenderFrameHelper
      OK,
      FAIL_PRINT_INIT,
      FAIL_PRINT,
@@ -447,7 +426,7 @@ index cccd932eb993..ed7893a67e7a 100644
    };
  
    // These values are persisted to logs. Entries should not be renumbered and
-@@ -184,9 +182,9 @@ class PrintRenderFrameHelper
+@@ -188,9 +186,9 @@ class PrintRenderFrameHelper
    // Message handlers ---------------------------------------------------------
    void OnPrintPages();
    void OnPrintForSystemDialog();
@@ -458,7 +437,7 @@ index cccd932eb993..ed7893a67e7a 100644
    void OnClosePrintPreviewDialog();
  #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void OnPrintFrameContent(const PrintMsg_PrintFrame_Params& params);
-@@ -202,7 +200,6 @@ class PrintRenderFrameHelper
+@@ -206,7 +204,6 @@ class PrintRenderFrameHelper
    // Update |ignore_css_margins_| based on settings.
    void UpdateFrameMarginsCssInfo(const base::DictionaryValue& settings);
  
@@ -466,7 +445,7 @@ index cccd932eb993..ed7893a67e7a 100644
    // Prepare frame for creating preview document.
    void PrepareFrameForPreviewDocument();
  
-@@ -219,7 +216,6 @@ class PrintRenderFrameHelper
+@@ -223,7 +220,6 @@ class PrintRenderFrameHelper
  
    // Finalize the print ready preview document.
    bool FinalizePrintReadyDocument();
@@ -474,7 +453,7 @@ index cccd932eb993..ed7893a67e7a 100644
  
    // Enable/Disable printing.
    void OnSetPrintingEnabled(bool enabled);
-@@ -247,7 +243,6 @@ class PrintRenderFrameHelper
+@@ -251,7 +247,6 @@ class PrintRenderFrameHelper
                                const blink::WebNode& node,
                                int* number_of_pages);
  
@@ -482,7 +461,7 @@ index cccd932eb993..ed7893a67e7a 100644
    // Set options for print preset from source PDF document.
    bool SetOptionsFromPdfDocument(
        PrintHostMsg_SetOptionsFromDocument_Params* options);
-@@ -258,7 +253,6 @@ class PrintRenderFrameHelper
+@@ -262,7 +257,6 @@ class PrintRenderFrameHelper
    bool UpdatePrintSettings(blink::WebLocalFrame* frame,
                             const blink::WebNode& node,
                             const base::DictionaryValue& passed_job_settings);
@@ -490,7 +469,7 @@ index cccd932eb993..ed7893a67e7a 100644
  
    // Get final print settings from the user.
    // WARNING: |this| may be gone after this method returns.
-@@ -340,7 +334,6 @@ class PrintRenderFrameHelper
+@@ -347,7 +341,6 @@ class PrintRenderFrameHelper
    bool IsScriptInitiatedPrintAllowed(blink::WebLocalFrame* frame,
                                       bool user_initiated);
  
@@ -498,7 +477,7 @@ index cccd932eb993..ed7893a67e7a 100644
    // Shows scripted print preview when options from plugin are available.
    void ShowScriptedPrintPreview();
  
-@@ -359,7 +352,6 @@ class PrintRenderFrameHelper
+@@ -366,7 +359,6 @@ class PrintRenderFrameHelper
    // Returns true if print preview should continue, false on failure.
    bool PreviewPageRendered(int page_number,
                             std::unique_ptr<PdfMetafileSkia> metafile);
@@ -506,7 +485,7 @@ index cccd932eb993..ed7893a67e7a 100644
  
    void SetPrintPagesParams(const PrintMsg_PrintPages_Params& settings);
  
-@@ -513,6 +505,7 @@ class PrintRenderFrameHelper
+@@ -520,6 +512,7 @@ class PrintRenderFrameHelper
    ScriptingThrottler scripting_throttler_;
  
    bool print_node_in_progress_;
@@ -514,10 +493,10 @@ index cccd932eb993..ed7893a67e7a 100644
    PrintPreviewContext print_preview_context_;
    bool is_loading_;
    bool is_scripted_preview_delayed_;
-diff --git components/printing_strings.grdp components/printing_strings.grdp
+diff --git components/printing_component_strings.grdp components/printing_component_strings.grdp
 index f157cbaec42e..5e3c3caa2aa2 100644
---- components/printing_strings.grdp
-+++ components/printing_strings.grdp
+--- components/printing_component_strings.grdp
++++ components/printing_component_strings.grdp
 @@ -1,10 +1,8 @@
  <?xml version="1.0" encoding="utf-8"?>
  <grit-part>

patch/patches/renderer_preferences_util_545103.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
-index ef6eeb91a9e5..72e5fbcc1883 100644
+index e0fa371f0a8a..7309acfc729d 100644
 --- chrome/browser/renderer_preferences_util.cc
 +++ chrome/browser/renderer_preferences_util.cc
 @@ -32,7 +32,8 @@
@@ -12,7 +12,7 @@ index ef6eeb91a9e5..72e5fbcc1883 100644
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -136,7 +137,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
+@@ -132,7 +133,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
      prefs->caret_blink_interval = interval;
  #endif
  

patch/patches/rwh_background_color_1984.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index 64cf9df83085..23745cd77082 100644
+index aefe11960955..7d5cdbead3f8 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -726,10 +726,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
@@ -19,7 +19,7 @@ index 64cf9df83085..23745cd77082 100644
  }
  
  void RenderWidgetHostViewAura::WindowTitleChanged() {
-@@ -1925,6 +1927,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -1924,6 +1926,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
    if (frame_sink_id_.is_valid())
      window_->SetEmbedFrameSinkId(frame_sink_id_);
  

patch/patches/service_factory_1680.patch

@@ -97,7 +97,7 @@ index 2907619549ba..f941fba363b5 100644
  
    SupervisedUserSettingsServiceFactory();
 diff --git chrome/browser/ui/prefs/prefs_tab_helper.cc chrome/browser/ui/prefs/prefs_tab_helper.cc
-index 5486b8e15cb4..9015c41f1f81 100644
+index c778758ced62..80d84ef4f6a6 100644
 --- chrome/browser/ui/prefs/prefs_tab_helper.cc
 +++ chrome/browser/ui/prefs/prefs_tab_helper.cc
 @@ -11,8 +11,8 @@
@@ -110,7 +110,7 @@ index 5486b8e15cb4..9015c41f1f81 100644
  #include "base/strings/string_number_conversions.h"
  #include "base/strings/string_util.h"
  #include "base/strings/stringprintf.h"
-@@ -392,12 +392,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
+@@ -389,12 +389,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
          GetInstance()->GetServiceForBrowserContext(profile, true));
    }
  
@@ -125,7 +125,7 @@ index 5486b8e15cb4..9015c41f1f81 100644
  
    PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
        "PrefWatcher",
-@@ -418,6 +416,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
+@@ -415,6 +413,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
    }
  };
  

patch/patches/service_manager_654986.patch

@@ -1,5 +1,5 @@
 diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
-index a2208dadcb9d..a9630ea9ad07 100644
+index fdff39ef3345..60f8a1dc7545 100644
 --- services/service_manager/embedder/main.cc
 +++ services/service_manager/embedder/main.cc
 @@ -300,13 +300,30 @@ int RunService(MainDelegate* delegate) {
@@ -86,7 +86,7 @@ index a2208dadcb9d..a9630ea9ad07 100644
    switch (process_type) {
      case ProcessType::kDefault:
        NOTREACHED();
-@@ -453,6 +464,8 @@ int Main(const MainParams& params) {
+@@ -460,6 +471,8 @@ int Main(const MainParams& params) {
        break;
    }
  
@@ -95,7 +95,7 @@ index a2208dadcb9d..a9630ea9ad07 100644
    if (tracker) {
      if (exit_code == 0) {
        tracker->SetProcessPhaseIfEnabled(
-@@ -464,13 +477,38 @@ int Main(const MainParams& params) {
+@@ -471,13 +484,38 @@ int Main(const MainParams& params) {
      }
    }
  

patch/patches/storage_partition_1973.patch

@@ -73,7 +73,7 @@ index cda94e43e866..84fde20fdce2 100644
        partition->GetBluetoothAllowedDevicesMap();
    return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index af7cced24feb..6a228c204912 100644
+index 69271e39f274..529af0b12e20 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
 @@ -131,11 +131,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -98,7 +98,7 @@ index af7cced24feb..6a228c204912 100644
  }
  
  void SaveSessionStateOnIOThread(
-@@ -566,6 +573,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
+@@ -564,6 +571,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
  BrowserContext::BrowserContext()
      : unique_id_(base::UnguessableToken::Create().ToString()) {}
  
@@ -111,10 +111,10 @@ index af7cced24feb..6a228c204912 100644
    CHECK(GetUserData(kMojoWasInitialized))
        << "Attempting to destroy a BrowserContext that never called "
 diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc
-index 114a65623106..be16268a89f5 100644
+index b8ea9fc92052..a27ec3fb7607 100644
 --- content/browser/devtools/protocol/network_handler.cc
 +++ content/browser/devtools/protocol/network_handler.cc
-@@ -900,8 +900,7 @@ class BackgroundSyncRestorer {
+@@ -902,8 +902,7 @@ class BackgroundSyncRestorer {
      scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host =
          static_cast<ServiceWorkerDevToolsAgentHost*>(host.get());
      scoped_refptr<BackgroundSyncContext> sync_context =
@@ -161,7 +161,7 @@ index ec9ab86d0ca6..0fe5219f1e84 100644
    base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
  
 diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
-index eb14d255d48b..ecea6e42e595 100644
+index 081c7a2c2f13..0699f88da38b 100644
 --- content/browser/download/download_manager_impl.cc
 +++ content/browser/download/download_manager_impl.cc
 @@ -84,9 +84,9 @@
@@ -205,27 +205,7 @@ index eb14d255d48b..ecea6e42e595 100644
        std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
  }
  
-@@ -597,8 +596,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
-     std::unique_ptr<download::DownloadUrlParameters> params,
-     uint32_t id,
-     const GURL& site_url) {
--  StoragePartitionImpl* storage_partition = static_cast<StoragePartitionImpl*>(
--      BrowserContext::GetStoragePartitionForSite(browser_context_, site_url));
-+  StoragePartition* storage_partition =
-+      BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
-   params->set_url_request_context_getter(
-       storage_partition->GetURLRequestContext());
-   BeginDownloadInternal(std::move(params), nullptr /* blob_data_handle */,
-@@ -787,7 +786,7 @@ void DownloadManagerImpl::DownloadUrl(
-   download::RecordDownloadCountWithSource(
-       download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
-       params->download_source());
--  StoragePartitionImpl* storage_partition =
-+  StoragePartition* storage_partition =
-       GetStoragePartition(browser_context_, params->render_process_host_id(),
-                           params->render_frame_host_routing_id());
-   BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
-@@ -1005,7 +1004,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
+@@ -1004,7 +1003,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
        tab_referrer_url = entry->GetReferrer().url;
      }
    }
@@ -234,42 +214,24 @@ index eb14d255d48b..ecea6e42e595 100644
        GetStoragePartition(browser_context_, render_process_id, render_frame_id);
    in_progress_manager_->InterceptDownloadFromNavigation(
        std::move(resource_request), render_process_id, render_frame_id, site_url,
-@@ -1020,7 +1019,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
-     std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
-     scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
-     uint32_t id,
--    StoragePartitionImpl* storage_partition) {
-+    StoragePartition* storage_partition) {
-   // Check if the renderer is permitted to request the requested URL.
-   if (params->render_process_host_id() >= 0 &&
-       !CanRequestURLFromRenderer(params->render_process_host_id(),
-diff --git content/browser/download/download_manager_impl.h content/browser/download/download_manager_impl.h
-index b62b8ae7eb8a..3f4d01b03ebb 100644
---- content/browser/download/download_manager_impl.h
-+++ content/browser/download/download_manager_impl.h
-@@ -42,7 +42,7 @@ class DownloadRequestHandleInterface;
- 
- namespace content {
- class ResourceContext;
--class StoragePartitionImpl;
-+class StoragePartition;
- 
- class CONTENT_EXPORT DownloadManagerImpl
-     : public DownloadManager,
-@@ -247,7 +247,7 @@ class CONTENT_EXPORT DownloadManagerImpl
-       std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
-       scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
-       uint32_t id,
--      StoragePartitionImpl* storage_partition);
-+      StoragePartition* storage_partition);
- 
-   void InterceptNavigationOnChecksComplete(
-       ResourceRequestInfo::WebContentsGetter web_contents_getter,
+@@ -1050,10 +1049,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
+         base::MakeRefCounted<BlobDownloadURLLoaderFactoryGetter>(
+             params->url(), std::move(blob_data_handle));
+   } else {
+-    StoragePartitionImpl* storage_partition =
+-        static_cast<StoragePartitionImpl*>(
+-            BrowserContext::GetStoragePartitionForSite(browser_context_,
+-                                                       site_url));
++    StoragePartition* storage_partition =
++        BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
+     url_loader_factory_getter =
+         CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
+   }
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index 8b06869fa95a..073d006b4e5d 100644
+index 3dc150704988..4fb316246c4a 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
-@@ -938,7 +938,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
+@@ -936,7 +936,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
      // path does as well for navigations.
      bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
          -1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@@ -278,16 +240,16 @@ index 8b06869fa95a..073d006b4e5d 100644
          false /* allow_wildcard */, &stale, &plugin, nullptr);
  
      if (stale) {
-@@ -1292,7 +1292,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
-     }
-   }
+@@ -1263,7 +1263,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
  
+   network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
+   network::mojom::URLLoaderFactoryRequest proxied_factory_request;
 -  auto* partition = static_cast<StoragePartitionImpl*>(storage_partition);
 +  auto* partition = storage_partition;
-   non_network_url_loader_factories_[url::kFileScheme] =
-       std::make_unique<FileURLLoaderFactory>(
-           partition->browser_context()->GetPath(),
-@@ -1306,7 +1306,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
+   if (frame_tree_node) {
+     // |frame_tree_node| may be null in some unit test environments.
+     GetContentClient()
+@@ -1311,7 +1311,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
    DCHECK(!request_controller_);
    request_controller_ = std::make_unique<URLLoaderRequestController>(
        std::move(initial_interceptors), std::move(new_request), resource_context,
@@ -344,10 +306,10 @@ index dd0af046aec4..f5ad5b37c1f3 100644
        partition->GetPaymentAppContext();
  
 diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
-index f41a38484759..3ff02d0fa2e1 100644
+index deece35f627d..2c29eaf50bc9 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -730,11 +730,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
+@@ -721,11 +721,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
    // Gets the correct render process to use for this SiteInstance.
    RenderProcessHost* GetProcessHost(SiteInstance* site_instance,
                                      bool is_for_guests_only) {
@@ -363,7 +325,7 @@ index f41a38484759..3ff02d0fa2e1 100644
  
      // Is this the default storage partition? If it isn't, then just give it its
      // own non-shared process.
-@@ -1341,7 +1340,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
+@@ -1332,7 +1331,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
  // static
  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
      BrowserContext* browser_context,
@@ -372,7 +334,7 @@ index f41a38484759..3ff02d0fa2e1 100644
      SiteInstance* site_instance,
      bool is_for_guests_only) {
    if (g_render_process_host_factory_) {
-@@ -1350,8 +1349,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
+@@ -1341,8 +1340,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
    }
  
    if (!storage_partition_impl) {
@@ -383,7 +345,7 @@ index f41a38484759..3ff02d0fa2e1 100644
    }
    // If we've made a StoragePartition for guests (e.g., for the <webview> tag),
    // stash the Site URL on it. This way, when we start a service worker inside
-@@ -1376,7 +1375,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
+@@ -1367,7 +1366,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
  
  RenderProcessHostImpl::RenderProcessHostImpl(
      BrowserContext* browser_context,
@@ -392,7 +354,7 @@ index f41a38484759..3ff02d0fa2e1 100644
      bool is_for_guests_only)
      : fast_shutdown_started_(false),
        deleting_soon_(false),
-@@ -1409,7 +1408,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1400,7 +1399,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
        indexed_db_factory_(new IndexedDBDispatcherHost(
            id_,
            storage_partition_impl_->GetURLRequestContext(),
@@ -402,7 +364,7 @@ index f41a38484759..3ff02d0fa2e1 100644
            ChromeBlobStorageContext::GetFor(browser_context_))),
        channel_connected_(false),
        sent_render_process_ready_(false),
-@@ -1444,7 +1444,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1435,7 +1435,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
    }
  
    push_messaging_manager_.reset(new PushMessagingManager(
@@ -412,7 +374,7 @@ index f41a38484759..3ff02d0fa2e1 100644
  
    AddObserver(indexed_db_factory_.get());
  #if defined(OS_MACOSX)
-@@ -1772,6 +1773,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
+@@ -1768,6 +1769,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
  
  void RenderProcessHostImpl::CreateMessageFilters() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -430,7 +392,7 @@ index f41a38484759..3ff02d0fa2e1 100644
    AddFilter(new ResourceSchedulerFilter(GetID()));
    MediaInternals* media_internals = MediaInternals::GetInstance();
    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
-@@ -1785,8 +1797,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1781,8 +1793,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        new RenderMessageFilter(
            GetID(), GetBrowserContext(), request_context.get(),
            widget_helper_.get(), media_internals,
@@ -441,7 +403,7 @@ index f41a38484759..3ff02d0fa2e1 100644
    AddFilter(render_message_filter.get());
  
    render_frame_message_filter_ = new RenderFrameMessageFilter(
-@@ -1813,10 +1825,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1809,10 +1821,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        ChromeBlobStorageContext::GetFor(browser_context);
  
    resource_message_filter_ = new ResourceMessageFilter(
@@ -454,7 +416,7 @@ index f41a38484759..3ff02d0fa2e1 100644
        storage_partition_impl_->GetPrefetchURLLoaderService(),
        std::move(get_contexts_callback),
        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-@@ -1825,8 +1837,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1821,8 +1833,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    AddFilter(
        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -462,19 +424,19 @@ index f41a38484759..3ff02d0fa2e1 100644
 -      storage_partition_impl_->GetDOMStorageContext()));
 +  AddFilter(new DOMStorageMessageFilter(dom_storage_context));
  
- #if BUILDFLAG(ENABLE_WEBRTC)
    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
-@@ -1846,8 +1857,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+   AddFilter(peer_connection_tracker_host_.get());
+@@ -1840,8 +1851,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
-   scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
-       new ServiceWorkerDispatcherHost(GetID(), resource_context);
+   auto service_worker_filter =
+       base::MakeRefCounted<ServiceWorkerDispatcherHost>(GetID());
 -  service_worker_filter->Init(
 -      storage_partition_impl_->GetServiceWorkerContext());
 +  service_worker_filter->Init(service_worker_context);
    AddFilter(service_worker_filter.get());
  
- #if BUILDFLAG(ENABLE_WEBRTC)
-@@ -1858,10 +1868,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+   p2p_socket_dispatcher_host_ = new P2PSocketDispatcherHost(
+@@ -1850,10 +1860,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    AddFilter(new TraceMessageFilter(GetID()));
    AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@@ -485,7 +447,7 @@ index f41a38484759..3ff02d0fa2e1 100644
  }
  
  void RenderProcessHostImpl::BindCacheStorage(
-@@ -1873,7 +1879,8 @@ void RenderProcessHostImpl::BindCacheStorage(
+@@ -1865,7 +1871,8 @@ void RenderProcessHostImpl::BindCacheStorage(
      cache_storage_dispatcher_host_ =
          base::MakeRefCounted<CacheStorageDispatcherHost>();
      cache_storage_dispatcher_host_->Init(
@@ -495,7 +457,7 @@ index f41a38484759..3ff02d0fa2e1 100644
    }
    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
    // thread entirely.
-@@ -2006,7 +2013,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -1996,7 +2003,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
  
    registry->AddInterface(base::BindRepeating(
        &AppCacheDispatcherHost::Create,
@@ -506,18 +468,18 @@ index f41a38484759..3ff02d0fa2e1 100644
  
    AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
 diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
-index 3d2cc7cb7e0c..f20125fced66 100644
+index 60a1958f3ca9..922e2100f7c9 100644
 --- content/browser/renderer_host/render_process_host_impl.h
 +++ content/browser/renderer_host/render_process_host_impl.h
-@@ -87,7 +87,6 @@ class ResourceMessageFilter;
+@@ -89,7 +89,6 @@ class ResourceMessageFilter;
  class SiteInstance;
  class SiteInstanceImpl;
  class StoragePartition;
 -class StoragePartitionImpl;
  struct ChildProcessTerminationInfo;
  
- #if BUILDFLAG(ENABLE_WEBRTC)
-@@ -135,7 +134,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+ typedef base::Thread* (*RendererMainThreadFactoryFunction)(
+@@ -132,7 +131,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // null.
    static RenderProcessHost* CreateRenderProcessHost(
        BrowserContext* browser_context,
@@ -526,7 +488,7 @@ index 3d2cc7cb7e0c..f20125fced66 100644
        SiteInstance* site_instance,
        bool is_for_guests_only);
  
-@@ -440,7 +439,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -435,7 +434,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Use CreateRenderProcessHost() instead of calling this constructor
    // directly.
    RenderProcessHostImpl(BrowserContext* browser_context,
@@ -535,7 +497,7 @@ index 3d2cc7cb7e0c..f20125fced66 100644
                          bool is_for_guests_only);
  
    // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
-@@ -707,10 +706,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -700,10 +699,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // called.
    int instance_id_ = 1;
  
@@ -608,10 +570,10 @@ index 4b08ffd8b662..a09bdc7cb892 100644
                             std::move(client), creation_context_type,
                             blink::MessagePortChannel(std::move(message_port)));
 diff --git content/browser/shared_worker/shared_worker_service_impl.cc content/browser/shared_worker/shared_worker_service_impl.cc
-index 5b5d3a790ebb..d5af1985df27 100644
+index 8140ae678d37..245d0bffd69e 100644
 --- content/browser/shared_worker/shared_worker_service_impl.cc
 +++ content/browser/shared_worker/shared_worker_service_impl.cc
-@@ -206,8 +206,8 @@ void SharedWorkerServiceImpl::CreateWorker(
+@@ -253,8 +253,8 @@ void SharedWorkerServiceImpl::CreateWorker(
          BrowserThread::IO, FROM_HERE,
          base::BindOnce(
              &CreateScriptLoaderOnIO,
@@ -619,7 +581,7 @@ index 5b5d3a790ebb..d5af1985df27 100644
 -                ->url_loader_factory_getter(),
 +            base::WrapRefCounted(service_worker_context_->storage_partition()
 +                ->url_loader_factory_getter()),
-             service_worker_context_, process_id,
+             std::move(factory_bundle), service_worker_context_, process_id,
              base::BindOnce(&SharedWorkerServiceImpl::StartWorker,
                             weak_factory_.GetWeakPtr(), std::move(instance),
 diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
@@ -726,12 +688,12 @@ index 075ae3e7431e..57fb5fd2c4a8 100644
  
    void InitializeOnIOThread();
 diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc
-index 187bde2d1cca..b86e9c943f01 100644
+index baa74f4c5e5e..3d5ebb876ea1 100644
 --- content/browser/webui/web_ui_url_loader_factory.cc
 +++ content/browser/webui/web_ui_url_loader_factory.cc
-@@ -20,13 +20,13 @@
+@@ -19,13 +19,13 @@
+ #include "content/browser/blob_storage/chrome_blob_storage_context.h"
  #include "content/browser/frame_host/render_frame_host_impl.h"
- #include "content/browser/histogram_internals_url_loader.h"
  #include "content/browser/resource_context_impl.h"
 -#include "content/browser/storage_partition_impl.h"
  #include "content/browser/webui/network_error_url_loader.h"
@@ -744,7 +706,7 @@ index 187bde2d1cca..b86e9c943f01 100644
  #include "content/public/browser/web_contents.h"
  #include "content/public/browser/web_contents_observer.h"
  #include "content/public/common/url_constants.h"
-@@ -319,9 +319,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
+@@ -313,9 +313,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
    const std::string& scheme() const { return scheme_; }
  
   private:
@@ -785,7 +747,7 @@ index b5cad2b73640..da041c3faf19 100644
        std::map<std::string, service_manager::EmbeddedServiceInfo>;
  
 diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
-index db26f7cfcef9..b358ff381eeb 100644
+index 28e2c251a117..5eb3ea81db32 100644
 --- content/public/browser/storage_partition.h
 +++ content/public/browser/storage_partition.h
 @@ -14,6 +14,7 @@
@@ -833,7 +795,7 @@ index db26f7cfcef9..b358ff381eeb 100644
    virtual IndexedDBContext* GetIndexedDBContext() = 0;
    virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
    virtual SharedWorkerService* GetSharedWorkerService() = 0;
-@@ -223,6 +241,27 @@ class CONTENT_EXPORT StoragePartition {
+@@ -224,6 +242,27 @@ class CONTENT_EXPORT StoragePartition {
    // Wait until all deletions tasks are finished. For test use only.
    virtual void WaitForDeletionTasksForTesting() = 0;
  

patch/patches/views_1749_2102.patch

@@ -154,7 +154,7 @@ index b2323dae3d9e..4b9546ca1a61 100644
    ImageView* image() const { return image_; }
    Label* label() const;
 diff --git ui/views/controls/button/menu_button.cc ui/views/controls/button/menu_button.cc
-index 4b4c769910e3..d5ac9e531200 100644
+index 7f38894e57c6..e5b073877ff0 100644
 --- ui/views/controls/button/menu_button.cc
 +++ ui/views/controls/button/menu_button.cc
 @@ -178,7 +178,7 @@ bool MenuButton::IsTriggerableEventType(const ui::Event& event) {
@@ -175,7 +175,7 @@ index 4b4c769910e3..d5ac9e531200 100644
                  kMenuMarkerPaddingRight);
    }
  
-@@ -407,4 +407,10 @@ int MenuButton::GetMaximumScreenXCoordinate() {
+@@ -408,4 +408,10 @@ int MenuButton::GetMaximumScreenXCoordinate() {
    return monitor_bounds.right() - 1;
  }
  
@@ -295,10 +295,10 @@ index 1d35afeda78f..333f9c0f778d 100644
    std::unique_ptr<SelectionController> selection_controller_;
  
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 5ee38baa45f9..fa0f8a090fa7 100644
+index 00590f09d91f..028a0af16d5e 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -2408,8 +2408,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
+@@ -2410,8 +2410,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
  
  void MenuController::OpenSubmenuChangeSelectionIfCan() {
    MenuItemView* item = pending_state_.item;
@@ -313,7 +313,7 @@ index 5ee38baa45f9..fa0f8a090fa7 100644
    MenuItemView* to_select = NULL;
    if (item->GetSubmenu()->GetMenuItemCount() > 0)
      to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
-@@ -2424,8 +2429,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2426,8 +2431,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
  void MenuController::CloseSubmenu() {
    MenuItemView* item = state_.item;
    DCHECK(item);
@@ -373,7 +373,7 @@ index 4dea63f9f286..ef50b710c5af 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 b410d39d786e..f0efe213acb8 100644
+index 22a219b46605..a475cb45b03f 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
 @@ -900,7 +900,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
@@ -543,7 +543,7 @@ index 9e16b4c88177..3d660e406709 100644
        // Move the cursor because EnterNotify/LeaveNotify are generated with the
        // current mouse position as a result of XGrabPointer()
 diff --git ui/views/view.h ui/views/view.h
-index 463438a3d774..39894b612984 100644
+index cbc9e1866b46..65a12cf2ec98 100644
 --- ui/views/view.h
 +++ ui/views/view.h
 @@ -19,6 +19,7 @@

patch/patches/views_widget_180_1481_1565_1677_1749.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 705bc2a1dd4d..5ddd0cf5af8d 100644
+index d52e0e45d4e1..4cc91095d9c9 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -415,6 +415,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
+@@ -422,6 +422,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
    return screen_info.device_scale_factor;
  }
  
@@ -18,10 +18,10 @@ index 705bc2a1dd4d..5ddd0cf5af8d 100644
    return renderer_frame_number_;
  }
 diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
-index f02cd3ca380a..84ae0c9eebf8 100644
+index be17cb811c58..d06168e39008 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
-@@ -83,6 +83,7 @@ class CursorManager;
+@@ -84,6 +84,7 @@ class CursorManager;
  class MouseWheelPhaseHandler;
  class RenderWidgetHostImpl;
  class RenderWidgetHostViewBaseObserver;
@@ -29,7 +29,7 @@ index f02cd3ca380a..84ae0c9eebf8 100644
  class SyntheticGestureTarget;
  class TextInputManager;
  class TouchSelectionControllerClientManager;
-@@ -104,6 +105,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -105,6 +106,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
    float current_device_scale_factor() const {
      return current_device_scale_factor_;
    }
@@ -39,7 +39,7 @@ index f02cd3ca380a..84ae0c9eebf8 100644
  
    // Returns the focused RenderWidgetHost inside this |view|'s RWH.
    RenderWidgetHostImpl* GetFocusedWidget() const;
-@@ -137,6 +141,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -139,6 +143,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
    void DisableAutoResize(const gfx::Size& new_size) override;
    bool IsScrollOffsetAtTop() const override;
    float GetDeviceScaleFactor() const final;
@@ -48,7 +48,7 @@ index f02cd3ca380a..84ae0c9eebf8 100644
    TouchSelectionControllerClientManager*
    GetTouchSelectionControllerClientManager() override;
  
-@@ -446,6 +452,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -454,6 +460,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
    // helps to position the full screen widget on the correct monitor.
    virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
  
@@ -61,7 +61,7 @@ index f02cd3ca380a..84ae0c9eebf8 100644
    // Sets the cursor for this view to the one associated with the specified
    // cursor_type.
    virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -635,6 +647,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -651,6 +663,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
  
    bool use_viz_hit_test_ = false;
  
@@ -103,10 +103,10 @@ index af9912a5f02a..ce0952342e8c 100644
    // TODO(wjmaclean): can host_ ever be null?
    if (host_ && set_focus_on_mouse_down_or_key_event_) {
 diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
-index 573acec9b64e..1d3146dea051 100644
+index 0f2bbdcf4b2b..2ba0761cd680 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
-@@ -253,6 +253,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
+@@ -246,6 +246,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
    // This must always return the same device scale factor as GetScreenInfo.
    virtual float GetDeviceScaleFactor() const = 0;
  
@@ -427,10 +427,10 @@ index c7296fed234d..244d0034a1c4 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 3dfdd4b1314e..8f13dd9edf09 100644
+index cadeb2322620..ced9be6715ed 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -2800,10 +2800,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -2809,10 +2809,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.

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 d0d68b49a735..80d4cc330f5e 100644
+index dde4f26a40c3..9249b0cbb6a1 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -1784,21 +1784,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -1797,21 +1797,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
    std::string unique_name;
    frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
  
@@ -45,7 +45,7 @@ index d0d68b49a735..80d4cc330f5e 100644
    CHECK(render_view_host_delegate_view_);
    CHECK(view_.get());
  
-@@ -2405,6 +2414,15 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2418,6 +2427,15 @@ void WebContentsImpl::CreateNewWindow(
    create_params.renderer_initiated_creation =
        main_frame_route_id != MSG_ROUTING_NONE;
  
@@ -61,7 +61,7 @@ index d0d68b49a735..80d4cc330f5e 100644
    std::unique_ptr<WebContents> new_contents;
    if (!is_guest) {
      create_params.context = view_->GetNativeView();
-@@ -2435,7 +2453,7 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2448,7 +2466,7 @@ void WebContentsImpl::CreateNewWindow(
        // TODO(brettw): It seems bogus that we have to call this function on the
        // newly created object and give it one of its own member variables.
        new_view->CreateViewForWidget(
@@ -70,7 +70,7 @@ index d0d68b49a735..80d4cc330f5e 100644
      }
      // Save the created window associated with the route so we can show it
      // later.
-@@ -5735,7 +5753,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
+@@ -5742,7 +5760,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
  void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
      RenderViewHost* render_view_host) {
    RenderWidgetHostViewBase* rwh_view =
@@ -95,10 +95,10 @@ index 53d56abb35a3..d7b955f42ca5 100644
  WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
  
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index 2835d80ef446..3e9427593945 100644
+index c4a7f3173b98..d42beefe4589 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
-@@ -70,9 +70,11 @@ class BrowserPluginGuestDelegate;
+@@ -74,9 +74,11 @@ class BrowserPluginGuestDelegate;
  class InterstitialPage;
  class RenderFrameHost;
  class RenderViewHost;
@@ -109,8 +109,8 @@ index 2835d80ef446..3e9427593945 100644
 +class WebContentsView;
  struct CustomContextMenuContext;
  struct DropData;
- struct Manifest;
-@@ -175,6 +177,10 @@ class WebContents : public PageNavigator,
+ struct MHTMLGenerationParams;
+@@ -178,6 +180,10 @@ class WebContents : public PageNavigator,
  
      // Sandboxing flags set on the new WebContents.
      blink::WebSandboxFlags starting_sandbox_flags;
@@ -122,7 +122,7 @@ index 2835d80ef446..3e9427593945 100644
  
    // Creates a new WebContents.
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index 6954d351c3b8..160bd5827a5b 100644
+index 4fc457c9e413..79a6dbf5b3a5 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
 @@ -47,10 +47,12 @@ class ColorChooser;

patch/patches/webkit_plugin_info_2015.patch

@@ -1,8 +1,8 @@
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index 5eac7f13d083..9e74a22c5796 100644
+index f3ec52975650..4922837a169e 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
-@@ -357,6 +357,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -353,6 +353,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    // satisfy this call. mainFrameOrigin is used by the browser process to
    // filter plugins from the plugin list based on content settings.
    virtual void GetPluginList(bool refresh,
@@ -10,7 +10,7 @@ index 5eac7f13d083..9e74a22c5796 100644
                               const WebSecurityOrigin& main_frame_origin,
                               WebPluginListBuilder*) {}
  
-@@ -714,6 +715,11 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -704,6 +705,11 @@ class BLINK_PLATFORM_EXPORT Platform {
    // runs during Chromium's build step).
    virtual bool IsTakingV8ContextSnapshot() { return false; }
  
@@ -62,10 +62,10 @@ index f98ae01cd46d..bba0b1930bff 100644
  
  void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id,
 diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
-index 2c6e6b9dccc3..fd957c70922a 100644
+index f0c55c05da71..9f0ede2594e4 100644
 --- third_party/blink/renderer/core/frame/local_frame.cc
 +++ third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1217,7 +1217,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+@@ -1228,7 +1228,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
  PluginData* LocalFrame::GetPluginData() const {
    if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
      return nullptr;
@@ -75,10 +75,10 @@ index 2c6e6b9dccc3..fd957c70922a 100644
  }
  
 diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
-index 1c299e2ad3a8..17dc5045895a 100644
+index a6a36fb4b38b..9b3bbb8fdb9b 100644
 --- third_party/blink/renderer/core/page/page.cc
 +++ third_party/blink/renderer/core/page/page.cc
-@@ -154,7 +154,8 @@ Page::Page(PageClients& page_clients)
+@@ -152,7 +152,8 @@ Page::Page(PageClients& page_clients)
        overscroll_controller_(
            OverscrollController::Create(GetVisualViewport(), GetChromeClient())),
        main_frame_(nullptr),
@@ -88,7 +88,7 @@ index 1c299e2ad3a8..17dc5045895a 100644
        use_counter_(page_clients.chrome_client &&
                             page_clients.chrome_client->IsSVGImageChromeClient()
                         ? UseCounter::kSVGImageContext
-@@ -333,21 +334,40 @@ void Page::RefreshPlugins() {
+@@ -322,21 +323,40 @@ void Page::RefreshPlugins() {
    PluginData::RefreshBrowserSidePluginCache();
  }
  
@@ -138,7 +138,7 @@ index 1c299e2ad3a8..17dc5045895a 100644
        page->NotifyPluginsChanged();
      }
    }
-@@ -720,7 +740,8 @@ void Page::Trace(blink::Visitor* visitor) {
+@@ -708,7 +728,8 @@ void Page::Trace(blink::Visitor* visitor) {
    visitor->Trace(visual_viewport_);
    visitor->Trace(overscroll_controller_);
    visitor->Trace(main_frame_);
@@ -149,10 +149,10 @@ index 1c299e2ad3a8..17dc5045895a 100644
    visitor->Trace(use_counter_);
    visitor->Trace(plugins_changed_observers_);
 diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
-index 0f51ac4d6e62..ccaae2f1c38f 100644
+index eba08dbfa108..846ad08241bd 100644
 --- third_party/blink/renderer/core/page/page.h
 +++ third_party/blink/renderer/core/page/page.h
-@@ -138,7 +138,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
+@@ -137,7 +137,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
    ViewportDescription GetViewportDescription() const;
  
    // Returns the plugin data associated with |main_frame_origin|.
@@ -162,7 +162,7 @@ index 0f51ac4d6e62..ccaae2f1c38f 100644
  
    // Refreshes the browser-side plugin cache.
    static void RefreshPlugins();
-@@ -374,7 +375,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
+@@ -369,7 +370,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
    // longer needed.
    Member<Frame> main_frame_;
  

patch/patches/webkit_pointer_event_781966.patch

@@ -1,8 +1,8 @@
 diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
-index 79f04a72bcd1..bdc815172425 100644
+index 99194c3c383c..f5c7e7084aab 100644
 --- third_party/blink/renderer/core/input/pointer_event_manager.cc
 +++ third_party/blink/renderer/core/input/pointer_event_manager.cc
-@@ -285,7 +285,7 @@ void PointerEventManager::HandlePointerInterruption(
+@@ -284,7 +284,7 @@ void PointerEventManager::HandlePointerInterruption(
    for (auto pointer_event : canceled_pointer_events) {
      // If we are sending a pointercancel we have sent the pointerevent to some
      // target before.

patch/patches/webkit_popups.patch

@@ -1,5 +1,5 @@
 diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
-index d9cea512dfc0..5a75a1ee5205 100644
+index f7c3e651b3ce..ce3e42c6900d 100644
 --- third_party/blink/public/web/web_view.h
 +++ third_party/blink/public/web/web_view.h
 @@ -358,6 +358,7 @@ class WebView : protected WebWidget {
@@ -20,10 +20,10 @@ index d9cea512dfc0..5a75a1ee5205 100644
  
    // Call these methods before and after running a nested, modal event loop
 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
-index 8064140d0a08..98eca1ccbe64 100644
+index 80ba4c18ebc9..2f76f1e8df40 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
+@@ -248,8 +248,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
    g_should_use_external_popup_menus = use_external_popup_menus;
  }
  
@@ -39,7 +39,7 @@ index 8064140d0a08..98eca1ccbe64 100644
  }
  
  namespace {
-@@ -342,6 +347,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
+@@ -340,6 +345,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
        enable_fake_page_scale_animation_for_testing_(false),
        fake_page_scale_animation_page_scale_factor_(0),
        fake_page_scale_animation_use_anchor_(false),
@@ -48,10 +48,10 @@ index 8064140d0a08..98eca1ccbe64 100644
        suppress_next_keypress_event_(false),
        ime_accept_events_(true),
 diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
-index 8a8c01289cf2..18bc70273c4d 100644
+index 58f8ff5cc826..0decc98d44f8 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.h
 +++ third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -102,7 +102,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -105,7 +105,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    static HashSet<WebViewImpl*>& AllInstances();
    // Returns true if popup menus should be rendered by the browser, false if
    // they should be rendered by WebKit (which is the default).
@@ -61,7 +61,7 @@ index 8a8c01289cf2..18bc70273c4d 100644
  
    // WebWidget methods:
    void Close() override;
-@@ -247,7 +248,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -250,7 +251,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    HitTestResult CoreHitTestResultAt(const WebPoint&);
    void InvalidateRect(const IntRect&);
  
@@ -70,7 +70,7 @@ index 8a8c01289cf2..18bc70273c4d 100644
    void SetBaseBackgroundColorOverride(SkColor);
    void ClearBaseBackgroundColorOverride();
    void SetBackgroundColorOverride(SkColor);
-@@ -619,6 +620,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -620,6 +621,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    float fake_page_scale_animation_page_scale_factor_;
    bool fake_page_scale_animation_use_anchor_;
  
@@ -80,10 +80,10 @@ index 8a8c01289cf2..18bc70273c4d 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 6b9ce0b88e7d..4fd152419225 100644
+index 50350ccbc3f7..6b73415761a9 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
-@@ -781,7 +781,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
+@@ -774,7 +774,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
  PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                             HTMLSelectElement& select) {
    NotifyPopupOpeningObservers();

patch/patches/webui_2037.patch

@@ -1,8 +1,8 @@
 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 7742a5367ff0..0ec2381dc558 100644
+index f68368e79f85..654b7b9312e6 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
-@@ -17,6 +17,7 @@
+@@ -18,6 +18,7 @@
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/browser/sync/profile_sync_service_factory.h"
  #include "chrome/common/channel_info.h"
@@ -10,7 +10,7 @@ index 7742a5367ff0..0ec2381dc558 100644
  #include "chrome/common/pref_names.h"
  #include "components/browser_sync/profile_sync_service.h"
  #include "components/prefs/pref_service.h"
-@@ -171,6 +172,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
+@@ -225,6 +226,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
  }
  
  void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
@@ -21,7 +21,7 @@ index 7742a5367ff0..0ec2381dc558 100644
    // We are only interested in sync logs for the primary user profile.
    Profile* profile = ProfileManager::GetPrimaryUserProfile();
    if (!profile ||
-@@ -215,6 +220,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
+@@ -269,6 +274,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
    if (!profile)
      return;
  

patch/patches/webview_plugin_2020.patch

@@ -1,8 +1,8 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 46fe1e49d3f5..aea793e9ebeb 100644
+index d1d9d62e4af3..e673f8763006 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
-@@ -4660,7 +4660,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -4602,7 +4602,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.">

patch/patches/win_rt_2274.patch

@@ -1,20 +1,18 @@
 diff --git services/service_manager/sandbox/win/sandbox_win.cc services/service_manager/sandbox/win/sandbox_win.cc
-index 6c72f29ee7ce..9b0114b2cfdc 100644
+index 197090f0f500..69e1e24f41e3 100644
 --- services/service_manager/sandbox/win/sandbox_win.cc
 +++ services/service_manager/sandbox/win/sandbox_win.cc
-@@ -865,10 +865,13 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
+@@ -865,8 +865,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
  #endif
  
    // Post-startup mitigations.
 -  mitigations = sandbox::MITIGATION_STRICT_HANDLE_CHECKS |
 -                sandbox::MITIGATION_DLL_SEARCH_ORDER;
 +  mitigations = sandbox::MITIGATION_DLL_SEARCH_ORDER;
-   if (!cmd_line->HasSwitch(switches::kAllowThirdPartyModules))
-     mitigations |= sandbox::MITIGATION_FORCE_MS_SIGNED_BINS;
 +  if (!launcher_process_command_line.HasSwitch("win-rt-app")) {
 +    // Don't enable this mitigation in WinRT apps. See issue #2274.
 +    mitigations |= sandbox::MITIGATION_STRICT_HANDLE_CHECKS;
 +  }
- 
-   result = policy->SetDelayedProcessMitigations(mitigations);
-   if (result != sandbox::SBOX_ALL_OK)
+   if (!cmd_line->HasSwitch(switches::kAllowThirdPartyModules))
+     mitigations |= sandbox::MITIGATION_FORCE_MS_SIGNED_BINS;
+   if (sandbox_type == SANDBOX_TYPE_NETWORK)