Update to Chromium version 68.0.3409.0 (#553714)

Known issues:
- Download fails with empty cache path due to https://crrev.com/950748a25f.
  Fixed in https://crrev.com/087ef223ac.

CHROMIUM_BUILD_COMPATIBILITY.txt

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

libcef/browser/browser_host_impl.cc

@@ -1077,7 +1077,7 @@ void CefBrowserHostImpl::WasResized() {
   if (!web_contents() || !platform_delegate_)
     return;
 
-  platform_delegate_->WasResized();
+  platform_delegate_->SynchronizeVisualProperties();
 }
 
 void CefBrowserHostImpl::WasHidden(bool hidden) {
@@ -1145,9 +1145,9 @@ void CefBrowserHostImpl::SendKeyEvent(const CefKeyEvent& event) {
   if (!web_contents() || !platform_delegate_)
     return;
 
-  content::NativeWebKeyboardEvent web_event(
+  content::NativeWebKeyboardEvent web_event(blink::WebInputEvent::kUndefined,
-      blink::WebInputEvent::kUndefined, blink::WebInputEvent::kNoModifiers,
+                                            blink::WebInputEvent::kNoModifiers,
-      ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
+                                            ui::EventTimeForNow());
   platform_delegate_->TranslateKeyEvent(web_event, event);
   platform_delegate_->SendKeyEvent(web_event);
 }

libcef/browser/browser_platform_delegate.h

@@ -22,14 +22,14 @@ namespace blink {
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebInputEvent;
-}
+}  // namespace blink
 
 namespace content {
 struct NativeWebKeyboardEvent;
 class RenderViewHost;
 class RenderViewHostDelegateView;
 class WebContentsView;
-}
+}  // namespace content
 
 #if defined(USE_AURA)
 namespace views {
@@ -140,7 +140,7 @@ class CefBrowserPlatformDelegate {
   virtual SkColor GetBackgroundColor() const = 0;
 
   // Notify the window that it was resized.
-  virtual void WasResized() = 0;
+  virtual void SynchronizeVisualProperties() = 0;
 
   // Send input events.
   virtual void SendKeyEvent(const content::NativeWebKeyboardEvent& event) = 0;

libcef/browser/content_browser_client.cc

@@ -1029,17 +1029,19 @@ CefContentBrowserClient::CreateClientCertStore(
 }
 
 void CefContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
-    content::RenderFrameHost* frame_host,
+    int render_process_id,
+    int render_frame_id,
     NonNetworkURLLoaderFactoryMap* factories) {
   if (!extensions::ExtensionsEnabled())
     return;
 
-  content::BrowserContext* browser_context =
+  content::RenderProcessHost* process_host =
-      frame_host->GetProcess()->GetBrowserContext();
+      content::RenderProcessHost::FromID(render_process_id);
+  content::BrowserContext* browser_context = process_host->GetBrowserContext();
   factories->emplace(
       extensions::kExtensionScheme,
       extensions::CreateExtensionNavigationURLLoaderFactory(
-          frame_host,
+          render_process_id, render_frame_id,
           extensions::ExtensionSystem::Get(browser_context)->info_map()));
 }
 
@@ -1050,10 +1052,10 @@ void CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
   if (!extensions::ExtensionsEnabled())
     return;
 
-  content::BrowserContext* browser_context =
+  content::RenderProcessHost* process_host = frame_host->GetProcess();
-      frame_host->GetProcess()->GetBrowserContext();
+  content::BrowserContext* browser_context = process_host->GetBrowserContext();
   auto factory = extensions::MaybeCreateExtensionSubresourceURLLoaderFactory(
-      frame_host, frame_url,
+      process_host->GetID(), frame_host->GetRoutingID(), frame_url,
       extensions::ExtensionSystem::Get(browser_context)->info_map());
   if (factory)
     factories->emplace(extensions::kExtensionScheme, std::move(factory));

libcef/browser/content_browser_client.h

@@ -128,7 +128,8 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
       content::ResourceContext* resource_context) override;
 
   void RegisterNonNetworkNavigationURLLoaderFactories(
-      content::RenderFrameHost* frame_host,
+      int render_process_id,
+      int render_frame_id,
       NonNetworkURLLoaderFactoryMap* factories) override;
   void RegisterNonNetworkSubresourceURLLoaderFactories(
       content::RenderFrameHost* frame_host,

libcef/browser/extensions/browser_platform_delegate_background.cc

@@ -39,7 +39,7 @@ SkColor CefBrowserPlatformDelegateBackground::GetBackgroundColor() const {
   return native_delegate_->GetBackgroundColor();
 }
 
-void CefBrowserPlatformDelegateBackground::WasResized() {
+void CefBrowserPlatformDelegateBackground::SynchronizeVisualProperties() {
   // Nothing to do here.
 }
 

libcef/browser/extensions/browser_platform_delegate_background.h

@@ -22,7 +22,7 @@ class CefBrowserPlatformDelegateBackground
   void CloseHostWindow() override;
   CefWindowHandle GetHostWindowHandle() const override;
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

libcef/browser/native/browser_platform_delegate_native.cc

@@ -20,10 +20,10 @@ SkColor CefBrowserPlatformDelegateNative::GetBackgroundColor() const {
   return background_color_;
 }
 
-void CefBrowserPlatformDelegateNative::WasResized() {
+void CefBrowserPlatformDelegateNative::SynchronizeVisualProperties() {
   content::RenderViewHost* host = browser_->web_contents()->GetRenderViewHost();
   if (host)
-    host->GetWidget()->WasResized();
+    host->GetWidget()->SynchronizeVisualProperties();
 }
 
 void CefBrowserPlatformDelegateNative::SendKeyEvent(

libcef/browser/native/browser_platform_delegate_native.h

@@ -26,7 +26,7 @@ class CefBrowserPlatformDelegateNative : public CefBrowserPlatformDelegate {
 
   // CefBrowserPlatformDelegate methods:
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

libcef/browser/native/browser_platform_delegate_native_linux.cc

@@ -383,7 +383,8 @@ void CefBrowserPlatformDelegateNativeLinux::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp
-  result.SetTimeStampSeconds(GetSystemUptime());
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromSeconds(GetSystemUptime()));
 
   result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

libcef/browser/native/browser_platform_delegate_native_mac.mm

@@ -468,7 +468,8 @@ void CefBrowserPlatformDelegateNativeMac::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp - Mac OSX specific
-  result.SetTimeStampSeconds(currentEventTimestamp());
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromSeconds(currentEventTimestamp()));
 
   result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

libcef/browser/native/browser_platform_delegate_native_win.cc

@@ -557,7 +557,8 @@ void CefBrowserPlatformDelegateNativeWin::TranslateMouseEvent(
                       TranslateModifiers(mouse_event.modifiers));
 
   // timestamp
-  result.SetTimeStampSeconds(GetMessageTime() / 1000.0);
+  result.SetTimeStamp(base::TimeTicks() +
+                      base::TimeDelta::FromMilliseconds(GetMessageTime()));
 
   result.pointer_type = blink::WebPointerProperties::PointerType::kMouse;
 }

libcef/browser/osr/browser_platform_delegate_osr.cc

@@ -72,10 +72,10 @@ SkColor CefBrowserPlatformDelegateOsr::GetBackgroundColor() const {
   return native_delegate_->GetBackgroundColor();
 }
 
-void CefBrowserPlatformDelegateOsr::WasResized() {
+void CefBrowserPlatformDelegateOsr::SynchronizeVisualProperties() {
   CefRenderWidgetHostViewOSR* view = GetOSRHostView();
   if (view)
-    view->WasResized();
+    view->SynchronizeVisualProperties();
 }
 
 void CefBrowserPlatformDelegateOsr::SendKeyEvent(

libcef/browser/osr/browser_platform_delegate_osr.h

@@ -28,7 +28,7 @@ class CefBrowserPlatformDelegateOsr
   void BrowserCreated(CefBrowserHostImpl* browser) override;
   void BrowserDestroyed(CefBrowserHostImpl* browser) override;
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

libcef/browser/osr/render_widget_host_view_osr.cc

@@ -402,7 +402,7 @@ bool CefRenderWidgetHostViewOSR::IsShowing() {
 
 void CefRenderWidgetHostViewOSR::EnsureSurfaceSynchronizedForLayoutTest() {
   ++latest_capture_sequence_number_;
-  WasResized();
+  SynchronizeVisualProperties();
 }
 
 gfx::Rect CefRenderWidgetHostViewOSR::GetViewBounds() const {
@@ -1018,7 +1018,7 @@ bool CefRenderWidgetHostViewOSR::InstallTransparency() {
   return false;
 }
 
-void CefRenderWidgetHostViewOSR::WasResized() {
+void CefRenderWidgetHostViewOSR::SynchronizeVisualProperties() {
   if (hold_resize_) {
     if (!pending_resize_)
       pending_resize_ = true;
@@ -1238,8 +1238,10 @@ void CefRenderWidgetHostViewOSR::ReleaseResize() {
   hold_resize_ = false;
   if (pending_resize_) {
     pending_resize_ = false;
-    CEF_POST_TASK(CEF_UIT, base::Bind(&CefRenderWidgetHostViewOSR::WasResized,
+    CEF_POST_TASK(
-                                      weak_ptr_factory_.GetWeakPtr()));
+        CEF_UIT,
+        base::Bind(&CefRenderWidgetHostViewOSR::SynchronizeVisualProperties,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
@@ -1254,7 +1256,8 @@ void CefRenderWidgetHostViewOSR::OnPaint(const gfx::Rect& damage_rect,
   if (!handler.get())
     return;
 
-  // Don't execute WasResized while the OnPaint callback is pending.
+  // Don't execute SynchronizeVisualProperties while the OnPaint callback is
+  // pending.
   HoldResize();
 
   gfx::Rect rect_in_bitmap(0, 0, bitmap_width, bitmap_height);
@@ -1381,14 +1384,15 @@ void CefRenderWidgetHostViewOSR::ResizeRootLayer() {
   bool resized = UpdateNSViewAndDisplay();
 #else
   bool resized = true;
-  GetDelegatedFrameHost()->WasResized(local_surface_id_, size,
+  GetDelegatedFrameHost()->SynchronizeVisualProperties(
-                                      cc::DeadlinePolicy::UseDefaultDeadline());
+      local_surface_id_, size, cc::DeadlinePolicy::UseDefaultDeadline());
 #endif
 
   // Note that |render_widget_host_| will retrieve resize parameters from the
-  // DelegatedFrameHost, so it must have WasResized called after.
+  // DelegatedFrameHost, so it must have SynchronizeVisualProperties called
+  // after.
   if (resized && render_widget_host_)
-    render_widget_host_->WasResized();
+    render_widget_host_->SynchronizeVisualProperties();
 }
 
 void CefRenderWidgetHostViewOSR::OnBeginFrameTimerTick() {

libcef/browser/osr/render_widget_host_view_osr.h

@@ -213,7 +213,7 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
 
   bool InstallTransparency();
 
-  void WasResized();
+  void SynchronizeVisualProperties();
   void OnScreenInfoChanged();
   void Invalidate(CefBrowserHost::PaintElementType type);
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event);

libcef/browser/osr/render_widget_host_view_osr_mac.mm

@@ -76,7 +76,9 @@ class MacHelper : public content::BrowserCompositorMacClient,
 
   void DestroyCompositorForShutdown() override {}
 
-  void WasResized() override { view_->render_widget_host()->WasResized(); }
+  void SynchronizeVisualProperties() override {
+    view_->render_widget_host()->SynchronizeVisualProperties();
+  }
 
  private:
   // Guaranteed to outlive this object.

libcef/browser/printing/print_view_manager_base.cc

@@ -163,7 +163,7 @@ bool CefPrintViewManagerBase::PrintJobHasDocument(int cookie) {
 void CefPrintViewManagerBase::OnComposePdfDone(
     const PrintHostMsg_DidPrintDocument_Params& params,
     mojom::PdfCompositor::Status status,
-    mojo::ScopedSharedBufferHandle handle) {
+    base::ReadOnlySharedMemoryRegion region) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (status != mojom::PdfCompositor::Status::SUCCESS) {
     DLOG(ERROR) << "Compositing pdf failed with error " << status;
@@ -173,14 +173,11 @@ void CefPrintViewManagerBase::OnComposePdfDone(
   if (!print_job_->document())
     return;
 
-  std::unique_ptr<base::SharedMemory> shared_buf =
+  scoped_refptr<base::RefCountedSharedMemoryMapping> data =
-      GetShmFromMojoHandle(std::move(handle));
+      base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(region);
-  if (!shared_buf)
+  if (!data)
     return;
 
-  size_t size = shared_buf->mapped_size();
-  auto data = base::MakeRefCounted<base::RefCountedSharedMemory>(
-      std::move(shared_buf), size);
   PrintDocument(data, params.page_size, params.content_area,
                 params.physical_offsets);
 }

libcef/browser/printing/print_view_manager_base.h

@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ -98,7 +99,7 @@ class CefPrintViewManagerBase : public content::NotificationObserver,
   // IPC message handlers for service.
   void OnComposePdfDone(const PrintHostMsg_DidPrintDocument_Params& params,
                         mojom::PdfCompositor::Status status,
-                        mojo::ScopedSharedBufferHandle handle);
+                        base::ReadOnlySharedMemoryRegion region);
 
   // Processes a NOTIFY_PRINT_JOB_EVENT notification.
   void OnNotifyPrintJobEvent(const JobEventDetails& event_details);

libcef/browser/views/browser_platform_delegate_views.cc

@@ -169,10 +169,10 @@ SkColor CefBrowserPlatformDelegateViews::GetBackgroundColor() const {
   return native_delegate_->GetBackgroundColor();
 }
 
-void CefBrowserPlatformDelegateViews::WasResized() {
+void CefBrowserPlatformDelegateViews::SynchronizeVisualProperties() {
   content::RenderViewHost* host = browser_->web_contents()->GetRenderViewHost();
   if (host)
-    host->GetWidget()->WasResized();
+    host->GetWidget()->SynchronizeVisualProperties();
 }
 
 void CefBrowserPlatformDelegateViews::SendKeyEvent(

libcef/browser/views/browser_platform_delegate_views.h

@@ -42,7 +42,7 @@ class CefBrowserPlatformDelegateViews
   void PopupBrowserCreated(CefBrowserHostImpl* new_browser,
                            bool is_devtools) override;
   SkColor GetBackgroundColor() const override;
-  void WasResized() override;
+  void SynchronizeVisualProperties() override;
   void SendKeyEvent(const content::NativeWebKeyboardEvent& event) override;
   void SendMouseEvent(const blink::WebMouseEvent& event) override;
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event) override;

patch/patches/browser_compositor_mac.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
-index d33a85adf914..ad8bd68b235e 100644
+index 6ad9f5fb334d..d7bf762314a4 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.h
 +++ content/browser/renderer_host/browser_compositor_view_mac.h
 @@ -56,11 +56,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -17,7 +17,7 @@ index d33a85adf914..ad8bd68b235e 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 0da91deadd3d..70a592bdfa6e 100644
+index 13a7da672959..28b0ab2d0e1a 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ content/browser/renderer_host/browser_compositor_view_mac.mm
 @@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
@@ -34,7 +34,7 @@ index 0da91deadd3d..70a592bdfa6e 100644
    if (recyclable_compositor_) {
      return recyclable_compositor_->accelerated_widget_mac()
 diff --git ui/accelerated_widget_mac/accelerated_widget_mac.mm ui/accelerated_widget_mac/accelerated_widget_mac.mm
-index 8306398431d9..5ab4fef9ac0f 100644
+index 97e7b502f15d..44811edbda4c 100644
 --- ui/accelerated_widget_mac/accelerated_widget_mac.mm
 +++ ui/accelerated_widget_mac/accelerated_widget_mac.mm
 @@ -71,6 +71,10 @@ void AcceleratedWidgetMac::SetNSView(AcceleratedWidgetMacNSView* view) {

patch/patches/browser_plugin_guest_1565.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
-index fe9c8f8e7332..d9b42ed87aa1 100644
+index 6508c1e0dacf..0241d11f664d 100644
 --- content/browser/browser_plugin/browser_plugin_guest.cc
 +++ content/browser/browser_plugin/browser_plugin_guest.cc
-@@ -314,8 +314,11 @@ void BrowserPluginGuest::InitInternal(
+@@ -315,8 +315,11 @@ void BrowserPluginGuest::InitInternal(
            static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
      }
  
@@ -15,7 +15,7 @@ index fe9c8f8e7332..d9b42ed87aa1 100644
  
      // Once a BrowserPluginGuest has an embedder WebContents, it's considered to
      // be attached.
-@@ -790,10 +793,19 @@ void BrowserPluginGuest::OnWillAttachComplete(
+@@ -791,10 +794,19 @@ void BrowserPluginGuest::OnWillAttachComplete(
          static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
      if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {
        web_contents_view->CreateViewForWidget(

patch/patches/chrome_browser.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 705d6a0bbe1b..b6f7efe2d6b2 100644
+index c504d191374e..10f4a146d271 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
 @@ -8,6 +8,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 705d6a0bbe1b..b6f7efe2d6b2 100644
  import("//chrome/common/features.gni")
  import("//components/feature_engagement/features.gni")
  import("//components/nacl/features.gni")
-@@ -1578,6 +1579,7 @@ jumbo_split_static_library("browser") {
+@@ -1576,6 +1577,7 @@ jumbo_split_static_library("browser") {
      "//base:i18n",
      "//base/allocator:buildflags",
      "//cc",
@@ -18,7 +18,7 @@ index 705d6a0bbe1b..b6f7efe2d6b2 100644
      "//chrome:extra_resources",
      "//chrome:resources",
      "//chrome:strings",
-@@ -1839,6 +1841,10 @@ jumbo_split_static_library("browser") {
+@@ -1837,6 +1839,10 @@ jumbo_split_static_library("browser") {
      ]
    }
  

patch/patches/chrome_plugins.patch

@@ -157,7 +157,7 @@ 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 ec423e4aa428..493ec5b44c90 100644
+index dac5ee569f80..4d32c6d2d9c5 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
 @@ -771,6 +771,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

patch/patches/chrome_renderer.patch

@@ -1,5 +1,5 @@
 diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
-index 48e5a57af58e..4cf07a05c760 100644
+index 6fd923e3e365..8e31cee51cab 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -10,7 +10,7 @@ index 48e5a57af58e..4cf07a05c760 100644
  import("//chrome/common/features.gni")
  import("//components/nacl/features.gni")
  import("//components/offline_pages/buildflags/features.gni")
-@@ -111,6 +112,7 @@ static_library("renderer") {
+@@ -110,6 +111,7 @@ static_library("renderer") {
    defines = []
  
    deps = [
@@ -18,7 +18,7 @@ index 48e5a57af58e..4cf07a05c760 100644
      "//chrome:resources",
      "//chrome:strings",
      "//chrome/common",
-@@ -174,6 +176,10 @@ static_library("renderer") {
+@@ -173,6 +175,10 @@ static_library("renderer") {
  
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
  

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 e34a0de26349..b90d1a106aff 100644
+index 9d5348d73ae1..e4b7905a7137 100644
 --- content/browser/compositor/gpu_process_transport_factory.cc
 +++ content/browser/compositor/gpu_process_transport_factory.cc
-@@ -495,9 +495,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
+@@ -496,9 +496,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
          // surfaces as they are not following the correct mode.
          DisableGpuCompositing(compositor.get());
        }

patch/patches/content_2015.patch

@@ -93,10 +93,10 @@ index 0c0c4cbb9efe..4703ce943367 100644
  }
  
 diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
-index 0ea57461ee89..5f6b5d6b089c 100644
+index b358a15ebb1f..e135a52c2b5f 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
-@@ -1549,6 +1549,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
+@@ -1543,6 +1543,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
    if (GetNavigationHandle()) {
      GetNavigationHandle()->set_net_error_code(
          static_cast<net::Error>(params.error_code));
@@ -104,7 +104,7 @@ index 0ea57461ee89..5f6b5d6b089c 100644
    }
  
    frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
-@@ -3314,9 +3315,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
+@@ -3432,9 +3433,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
        &QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_));
  
    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
@@ -117,7 +117,7 @@ index 0ea57461ee89..5f6b5d6b089c 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
-@@ -3593,9 +3594,9 @@ void RenderFrameHostImpl::CommitNavigation(
+@@ -3708,9 +3709,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;
@@ -130,7 +130,7 @@ index 0ea57461ee89..5f6b5d6b089c 100644
      if (subresource_loader_params &&
          subresource_loader_params->loader_factory_info.is_valid()) {
        // If the caller has supplied a default URLLoaderFactory override (for
-@@ -4219,8 +4220,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
+@@ -4331,8 +4332,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
    // Keep DevTools proxy lasy, i.e. closest to the network.
    RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
        this, false, false, &default_factory_request);
@@ -141,17 +141,6 @@ index 0ea57461ee89..5f6b5d6b089c 100644
    if (g_create_network_factory_callback_for_test.Get().is_null()) {
      storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
          std::move(default_factory_request), GetProcess()->GetID());
-@@ -4471,8 +4472,8 @@ void RenderFrameHostImpl::CreateWebSocket(
-     network::mojom::WebSocketRequest request) {
-   if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-     auto* context = GetSiteInstance()->GetBrowserContext();
--    auto* storage_partition = static_cast<StoragePartitionImpl*>(
--        BrowserContext::GetStoragePartition(context, GetSiteInstance()));
-+    auto* storage_partition =
-+        BrowserContext::GetStoragePartition(context, GetSiteInstance());
-     storage_partition->GetNetworkContext()->CreateWebSocket(
-         std::move(request), process_->GetID(), routing_id_,
-         last_committed_origin_);
 diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
 index 80fd7cf89578..8e965cd18a47 100644
 --- content/browser/frame_host/render_frame_message_filter.cc
@@ -285,10 +274,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 d88e6eb45030..58ed9ea3ff32 100644
+index a11c302892a1..3745a11b34dd 100644
 --- content/common/frame_messages.h
 +++ content/common/frame_messages.h
-@@ -1399,8 +1399,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
+@@ -1390,8 +1390,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.
@@ -299,7 +288,7 @@ index d88e6eb45030..58ed9ea3ff32 100644
                              url::Origin /* main_frame_origin */,
                              std::vector<content::WebPluginInfo> /* plugins */)
  
-@@ -1408,9 +1409,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
+@@ -1399,9 +1400,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.
@@ -360,7 +349,7 @@ index 3b610b1f554e..7c439e060779 100644
                                   WebPluginInfo* plugin) = 0;
  
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index f2af9c4d6625..98481ffed5b9 100644
+index e62a17b09f8e..f57d547d9e1a 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
 @@ -77,6 +77,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -399,10 +388,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 58d8ad7d5658..e486c356b2da 100644
+index 3c94a2dd53f6..99be46fdbfd3 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -3281,7 +3281,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -3278,7 +3278,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
    std::string mime_type;
    bool found = false;
    Send(new FrameHostMsg_GetPluginInfo(
@@ -412,7 +401,7 @@ index 58d8ad7d5658..e486c356b2da 100644
        params.mime_type.Utf8(), &found, &info, &mime_type));
    if (!found)
      return nullptr;
-@@ -3646,6 +3647,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
+@@ -3643,6 +3644,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
  
  void RenderFrameImpl::FrameFocused() {
    Send(new FrameHostMsg_FrameFocused(routing_id_));
@@ -422,10 +411,10 @@ index 58d8ad7d5658..e486c356b2da 100644
  
  void RenderFrameImpl::WillCommitProvisionalLoad() {
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index ca78dbcefd6a..f69265b98731 100644
+index 672cde1a8ac0..df37f689bed7 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -900,6 +900,8 @@ void RenderThreadImpl::Init(
+@@ -899,6 +899,8 @@ void RenderThreadImpl::Init(
  
    StartServiceManagerConnection();
  
@@ -435,7 +424,7 @@ index ca78dbcefd6a..f69265b98731 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 1af02be0dfbf..eeedc3b9cdb1 100644
+index 52e73b6bccea..f90f531792ab 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
 @@ -836,6 +836,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -456,7 +445,7 @@ index 1af02be0dfbf..eeedc3b9cdb1 100644
    for (const WebPluginInfo& plugin : plugins) {
      builder->AddPlugin(WebString::FromUTF16(plugin.name),
                         WebString::FromUTF16(plugin.desc),
-@@ -1401,6 +1403,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
+@@ -1385,6 +1387,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
    base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
  }
  
@@ -472,7 +461,7 @@ index 1af02be0dfbf..eeedc3b9cdb1 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 e3b802abb18e..019645e1ca5a 100644
+index cd5a9622c99c..a3f79ae5804b 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
 @@ -126,6 +126,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -483,7 +472,7 @@ index e3b802abb18e..019645e1ca5a 100644
                       const blink::WebSecurityOrigin& mainFrameOrigin,
                       blink::WebPluginListBuilder* builder) override;
    blink::WebPublicSuffixList* PublicSuffixList() override;
-@@ -252,6 +253,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -251,6 +252,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
        mojo::ScopedDataPipeConsumerHandle handle) override;
    void RequestPurgeMemory() override;
  
@@ -542,7 +531,7 @@ 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 dcb37733b01f..a32572b636da 100644
+index 4c0203d05655..ba35ffb1a3b2 100644
 --- content/test/test_blink_web_unit_test_support.cc
 +++ content/test/test_blink_web_unit_test_support.cc
 @@ -316,6 +316,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
@@ -552,7 +541,7 @@ index dcb37733b01f..a32572b636da 100644
 +    bool is_main_frame,
      const blink::WebSecurityOrigin& mainFrameOrigin,
      blink::WebPluginListBuilder* builder) {
-   builder->AddPlugin("pdf", "pdf", "pdf-files");
+   builder->AddPlugin("pdf", "pdf", "pdf-files", SkColorSetRGB(38, 38, 38));
 diff --git content/test/test_blink_web_unit_test_support.h content/test/test_blink_web_unit_test_support.h
 index c3dd2efd9318..9866732b1ebd 100644
 --- content/test/test_blink_web_unit_test_support.h

patch/patches/extensions_1947.patch

@@ -27,10 +27,10 @@ index 53c7404ef1f9..ac33df7cfe0e 100644
    auto* browser_context = web_contents->GetBrowserContext();
    StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context);
 diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
-index 33678d6f3cbf..e16bd447aea2 100644
+index b6fb23189522..ccbf05206387 100644
 --- content/browser/frame_host/render_frame_host_manager.cc
 +++ content/browser/frame_host/render_frame_host_manager.cc
-@@ -898,10 +898,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
+@@ -903,10 +903,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
    // TODO(alexmos): This check should've been enforced earlier in the
    // navigation, in chrome::Navigate().  Verify this, and then convert this to
    // a CHECK and remove the fallback.
@@ -46,7 +46,7 @@ index 33678d6f3cbf..e16bd447aea2 100644
      return true;
    }
  
-@@ -1041,7 +1042,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
+@@ -1046,7 +1047,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
  
    // Double-check that the new SiteInstance is associated with the right
    // BrowserContext.
@@ -57,7 +57,7 @@ index 33678d6f3cbf..e16bd447aea2 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 a9818834fec3..d21e360bea01 100644
+index c8dcbf0f6daa..19c162f0c76a 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
 @@ -366,6 +366,13 @@ class CONTENT_EXPORT ContentBrowserClient {

patch/patches/gn_config.patch

@@ -12,10 +12,10 @@ index 36b54aca866c..06337f3f3086 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 06c117e4e79a..6e0a66aaaf75 100644
+index ff2f6ff45105..562bea65a4a6 100644
 --- BUILD.gn
 +++ BUILD.gn
-@@ -192,6 +192,7 @@ group("gn_all") {
+@@ -191,6 +191,7 @@ group("gn_all") {
  
    if (!is_ios && !is_fuchsia) {
      deps += [
@@ -110,7 +110,7 @@ index 5f51eadb13b2..aa7ab8dbb16d 100644
  
  
 diff --git build/vs_toolchain.py build/vs_toolchain.py
-index 11e5e4c7d30f..88e8b84d23e3 100755
+index d5999f71ca7b..d630585ecd2f 100755
 --- build/vs_toolchain.py
 +++ build/vs_toolchain.py
 @@ -82,11 +82,18 @@ def SetEnvironmentAndGetRuntimeDllDirs():

patch/patches/linux_build.patch

@@ -1,5 +1,5 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index a93cc5ee5ce9..9bd6210b3a3f 100644
+index 3dbf872f7038..8bcebb8ea85e 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
 @@ -149,7 +149,7 @@ declare_args() {

patch/patches/message_loop_443_1992243003.patch

@@ -1,5 +1,5 @@
 diff --git base/message_loop/message_loop_current.h base/message_loop/message_loop_current.h
-index c2a8a731b9fb..7e9e96849d6a 100644
+index 72b0d8c6fe8c..f5df6369f269 100644
 --- base/message_loop/message_loop_current.h
 +++ base/message_loop/message_loop_current.h
 @@ -126,6 +126,16 @@ class BASE_EXPORT MessageLoopCurrent {
@@ -34,10 +34,10 @@ index c2a8a731b9fb..7e9e96849d6a 100644
  
  #if !defined(OS_NACL)
 diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
-index b145a1d54a32..9b28169050b2 100644
+index ca257370fb56..3d9b4cea21ce 100644
 --- base/message_loop/message_pump_win.cc
 +++ base/message_loop/message_pump_win.cc
-@@ -372,20 +372,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
+@@ -370,20 +370,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
  }
  
  bool MessagePumpForUI::ProcessPumpReplacementMessage() {

patch/patches/pdfium_print_549365.patch

@@ -1,5 +1,5 @@
 diff --git BUILD.gn BUILD.gn
-index 01e40f510..60907b28b 100644
+index 8107454ec..4792aca8e 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -241,6 +241,10 @@ jumbo_static_library("pdfium") {

patch/patches/prefs_content_1161.patch

@@ -35,7 +35,7 @@ index e4fc39c60fd7..f19fccf47261 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 9eed2cf9015f..96efaf3c703c 100644
+index 9a38e9ea1d02..c6f84dfb0fce 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
 @@ -1198,6 +1198,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(

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 8bbe039f4dc1..dee4f54f3c0a 100644
+index 2d2af58936f1..02e1de3220ce 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
 @@ -891,6 +891,7 @@ split_static_library("ui") {

patch/patches/printing_context_2196.patch

@@ -1,8 +1,8 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index 06a5fe2bac26..e9783f33933a 100644
+index e08f806de054..bb7f75769d4a 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
-@@ -146,6 +146,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
+@@ -145,6 +145,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
        weak_factory_(this) {
    // The object is created in the IO thread.
    DCHECK(query_->RunsTasksInCurrentSequence());

patch/patches/rwh_background_color_1984.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index 8480ce835109..f89ac2c07194 100644
+index ec3c8adcdea4..72bd8e7cc871 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -739,9 +739,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
+@@ -741,9 +741,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
      return;
    background_color_ = color;
  
@@ -17,7 +17,7 @@ index 8480ce835109..f89ac2c07194 100644
  }
  
  void RenderWidgetHostViewAura::WindowTitleChanged() {
-@@ -1883,6 +1885,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -1892,6 +1894,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
    if (frame_sink_id_.is_valid())
      window_->SetEmbedFrameSinkId(frame_sink_id_);
  

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 24551fba132e..f4b38b871f9a 100644
+index a2208dadcb9d..a9630ea9ad07 100644
 --- services/service_manager/embedder/main.cc
 +++ services/service_manager/embedder/main.cc
 @@ -300,13 +300,30 @@ int RunService(MainDelegate* delegate) {

patch/patches/storage_partition_1973.patch

@@ -14,10 +14,10 @@ index 3a34269fbc04..b3637d969367 100644
  }
  
 diff --git content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_impl.cc
-index c481fb6c0411..a9f6e7bcf7a0 100644
+index 596cfaa01092..f341bca174d5 100644
 --- content/browser/background_fetch/background_fetch_service_impl.cc
 +++ content/browser/background_fetch/background_fetch_service_impl.cc
-@@ -38,8 +38,7 @@ void BackgroundFetchServiceImpl::Create(
+@@ -39,8 +39,7 @@ void BackgroundFetchServiceImpl::Create(
        BrowserThread::IO, FROM_HERE,
        base::BindOnce(
            BackgroundFetchServiceImpl::CreateOnIoThread,
@@ -73,10 +73,10 @@ 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 15cb62d76bb0..4de29a1f11f9 100644
+index bb3d7a1f7b65..a44b32c618c0 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
-@@ -130,11 +130,18 @@ StoragePartition* GetStoragePartitionFromConfig(
+@@ -131,11 +131,18 @@ StoragePartition* GetStoragePartitionFromConfig(
    StoragePartitionImplMap* partition_map =
        GetStoragePartitionMap(browser_context);
  
@@ -98,9 +98,9 @@ index 15cb62d76bb0..4de29a1f11f9 100644
  }
  
  void SaveSessionStateOnIOThread(
-@@ -585,6 +592,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
+@@ -586,6 +593,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
  BrowserContext::BrowserContext()
-     : media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {}
+     : unique_id_(base::UnguessableToken::Create().ToString()) {}
  
 +// static
 +const void* BrowserContext::GetStoragePartitionMapUserDataKey() {
@@ -111,10 +111,10 @@ index 15cb62d76bb0..4de29a1f11f9 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 91a8bc378f3a..81b5b821b20c 100644
+index a438c95df957..b80ea1582ec3 100644
 --- content/browser/devtools/protocol/network_handler.cc
 +++ content/browser/devtools/protocol/network_handler.cc
-@@ -887,8 +887,7 @@ class BackgroundSyncRestorer {
+@@ -889,8 +889,7 @@ class BackgroundSyncRestorer {
      scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host =
          static_cast<ServiceWorkerDevToolsAgentHost*>(host.get());
      scoped_refptr<BackgroundSyncContext> sync_context =
@@ -161,10 +161,10 @@ 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 88e9a45130c4..6fec44266f2c 100644
+index 73135a675b85..4e1b9854ad9d 100644
 --- content/browser/download/download_manager_impl.cc
 +++ content/browser/download/download_manager_impl.cc
-@@ -87,9 +87,9 @@
+@@ -84,9 +84,9 @@
  namespace content {
  namespace {
  
@@ -177,7 +177,7 @@ index 88e9a45130c4..6fec44266f2c 100644
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  
    SiteInstance* site_instance = nullptr;
-@@ -99,8 +99,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
+@@ -96,8 +96,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
      if (render_frame_host_)
        site_instance = render_frame_host_->GetSiteInstance();
    }
@@ -187,7 +187,7 @@ index 88e9a45130c4..6fec44266f2c 100644
  }
  
  bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
-@@ -276,7 +275,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
+@@ -250,7 +249,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
  #endif
  
  scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@@ -196,7 +196,7 @@ index 88e9a45130c4..6fec44266f2c 100644
                                       RenderFrameHost* rfh,
                                       bool has_suggested_filename) {
    network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
-@@ -293,7 +292,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
+@@ -267,7 +266,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
      }
    }
    return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@@ -205,7 +205,7 @@ index 88e9a45130c4..6fec44266f2c 100644
        std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
  }
  
-@@ -811,8 +810,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
+@@ -597,8 +596,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
      std::unique_ptr<download::DownloadUrlParameters> params,
      uint32_t id,
      const GURL& site_url) {
@@ -216,7 +216,7 @@ index 88e9a45130c4..6fec44266f2c 100644
    params->set_url_request_context_getter(
        storage_partition->GetURLRequestContext());
    BeginDownloadInternal(std::move(params), nullptr, id, storage_partition);
-@@ -1014,7 +1013,7 @@ void DownloadManagerImpl::DownloadUrl(
+@@ -784,7 +783,7 @@ void DownloadManagerImpl::DownloadUrl(
    download::RecordDownloadCountWithSource(
        download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
        params->download_source());
@@ -225,7 +225,7 @@ index 88e9a45130c4..6fec44266f2c 100644
        GetStoragePartition(browser_context_, params->render_process_host_id(),
                            params->render_frame_host_routing_id());
    BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
-@@ -1232,7 +1231,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
+@@ -1002,7 +1001,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
        tab_referrer_url = entry->GetReferrer().url;
      }
    }
@@ -234,7 +234,7 @@ index 88e9a45130c4..6fec44266f2c 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,
-@@ -1247,7 +1246,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
+@@ -1017,7 +1016,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
      std::unique_ptr<download::DownloadUrlParameters> params,
      std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
      uint32_t id,
@@ -244,10 +244,10 @@ index 88e9a45130c4..6fec44266f2c 100644
    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 a35035ea0b4f..5fbcbb5dc937 100644
+index e7aa6cefb35c..42c2090ca161 100644
 --- content/browser/download/download_manager_impl.h
 +++ content/browser/download/download_manager_impl.h
-@@ -42,7 +42,7 @@ class InProgressDownloadManager;
+@@ -42,7 +42,7 @@ class DownloadRequestHandleInterface;
  
  namespace content {
  class ResourceContext;
@@ -256,7 +256,7 @@ index a35035ea0b4f..5fbcbb5dc937 100644
  
  class CONTENT_EXPORT DownloadManagerImpl
      : public DownloadManager,
-@@ -251,7 +251,7 @@ class CONTENT_EXPORT DownloadManagerImpl
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT DownloadManagerImpl
        std::unique_ptr<download::DownloadUrlParameters> params,
        std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
        uint32_t id,
@@ -266,10 +266,19 @@ index a35035ea0b4f..5fbcbb5dc937 100644
    void InterceptNavigationOnChecksComplete(
        ResourceRequestInfo::WebContentsGetter web_contents_getter,
 diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
-index 2713461dc3ed..7bc6ffa12a97 100644
+index b4c1232ea111..f44572270b83 100644
 --- content/browser/loader/navigation_url_loader_network_service.cc
 +++ content/browser/loader/navigation_url_loader_network_service.cc
-@@ -1196,7 +1196,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
+@@ -893,7 +893,7 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController
+     // path does as well for navigations.
+     bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
+         -1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
+-        resource_request_->url, url::Origin(), head.mime_type,
++        resource_request_->url, true, url::Origin(), head.mime_type,
+         false /* allow_wildcard */, &stale, &plugin, nullptr);
+ 
+     if (stale) {
+@@ -1260,7 +1260,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
      }
    }
  
@@ -278,7 +287,7 @@ index 2713461dc3ed..7bc6ffa12a97 100644
    non_network_url_loader_factories_[url::kFileScheme] =
        std::make_unique<FileURLLoaderFactory>(
            partition->browser_context()->GetPath(),
-@@ -1210,7 +1210,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
+@@ -1274,7 +1274,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
    DCHECK(!request_controller_);
    request_controller_ = std::make_unique<URLLoaderRequestController>(
        std::move(initial_interceptors), std::move(new_request), resource_context,
@@ -335,10 +344,10 @@ index 5d4aefd16449..b5f99bc43389 100644
        partition->GetPaymentAppContext();
  
 diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
-index 5fb571a47382..db6d16b1beaf 100644
+index a0162dcd2946..eef13b5035e9 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -735,11 +735,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
+@@ -734,11 +734,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) {
@@ -354,7 +363,7 @@ index 5fb571a47382..db6d16b1beaf 100644
  
      // Is this the default storage partition? If it isn't, then just give it its
      // own non-shared process.
-@@ -1352,7 +1351,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
+@@ -1351,7 +1350,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
  // static
  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
      BrowserContext* browser_context,
@@ -363,7 +372,7 @@ index 5fb571a47382..db6d16b1beaf 100644
      SiteInstance* site_instance,
      bool is_for_guests_only) {
    if (g_render_process_host_factory_) {
-@@ -1361,8 +1360,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
+@@ -1360,8 +1359,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
    }
  
    if (!storage_partition_impl) {
@@ -374,7 +383,7 @@ index 5fb571a47382..db6d16b1beaf 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
-@@ -1387,7 +1386,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
+@@ -1386,7 +1385,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
  
  RenderProcessHostImpl::RenderProcessHostImpl(
      BrowserContext* browser_context,
@@ -383,7 +392,7 @@ index 5fb571a47382..db6d16b1beaf 100644
      bool is_for_guests_only)
      : fast_shutdown_started_(false),
        deleting_soon_(false),
-@@ -1420,7 +1419,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1419,7 +1418,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
        indexed_db_factory_(new IndexedDBDispatcherHost(
            id_,
            storage_partition_impl_->GetURLRequestContext(),
@@ -393,7 +402,7 @@ index 5fb571a47382..db6d16b1beaf 100644
            ChromeBlobStorageContext::GetFor(browser_context_))),
        channel_connected_(false),
        sent_render_process_ready_(false),
-@@ -1455,7 +1455,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1454,7 +1454,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
    }
  
    push_messaging_manager_.reset(new PushMessagingManager(
@@ -403,7 +412,7 @@ index 5fb571a47382..db6d16b1beaf 100644
  
    AddObserver(indexed_db_factory_.get());
  #if defined(OS_MACOSX)
-@@ -1783,6 +1784,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
+@@ -1782,6 +1783,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
  
  void RenderProcessHostImpl::CreateMessageFilters() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -424,7 +433,7 @@ index 5fb571a47382..db6d16b1beaf 100644
    AddFilter(new ResourceSchedulerFilter(GetID()));
    MediaInternals* media_internals = MediaInternals::GetInstance();
    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
-@@ -1797,8 +1812,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1795,8 +1810,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        new RenderMessageFilter(
            GetID(), GetBrowserContext(), request_context.get(),
            widget_helper_.get(), media_internals,
@@ -435,7 +444,7 @@ index 5fb571a47382..db6d16b1beaf 100644
    AddFilter(render_message_filter.get());
  
    render_frame_message_filter_ = new RenderFrameMessageFilter(
-@@ -1825,10 +1840,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1823,10 +1838,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        ChromeBlobStorageContext::GetFor(browser_context);
  
    resource_message_filter_ = new ResourceMessageFilter(
@@ -448,7 +457,7 @@ index 5fb571a47382..db6d16b1beaf 100644
        storage_partition_impl_->GetPrefetchURLLoaderService(),
        std::move(get_contexts_callback),
        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-@@ -1837,8 +1852,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1835,8 +1850,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    AddFilter(
        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -458,7 +467,7 @@ index 5fb571a47382..db6d16b1beaf 100644
  
  #if BUILDFLAG(ENABLE_WEBRTC)
    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
-@@ -1860,8 +1874,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1858,8 +1872,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
        new ServiceWorkerDispatcherHost(GetID(), resource_context);
@@ -468,7 +477,7 @@ index 5fb571a47382..db6d16b1beaf 100644
    AddFilter(service_worker_filter.get());
  
  #if BUILDFLAG(ENABLE_WEBRTC)
-@@ -1873,11 +1886,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1871,11 +1884,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
    AddFilter(new TraceMessageFilter(GetID()));
    AddFilter(new ResolveProxyMsgHelper(request_context.get()));
  
@@ -481,7 +490,7 @@ index 5fb571a47382..db6d16b1beaf 100644
        resource_context, service_worker_context, browser_context);
    AddFilter(notification_message_filter_.get());
  }
-@@ -1891,7 +1901,8 @@ void RenderProcessHostImpl::BindCacheStorage(
+@@ -1889,7 +1899,8 @@ void RenderProcessHostImpl::BindCacheStorage(
      cache_storage_dispatcher_host_ =
          base::MakeRefCounted<CacheStorageDispatcherHost>();
      cache_storage_dispatcher_host_->Init(
@@ -491,7 +500,7 @@ index 5fb571a47382..db6d16b1beaf 100644
    }
    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
    // thread entirely.
-@@ -2024,7 +2035,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -2022,7 +2033,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
  
    registry->AddInterface(base::BindRepeating(
        &AppCacheDispatcherHost::Create,
@@ -502,18 +511,18 @@ index 5fb571a47382..db6d16b1beaf 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 0ea859f1c52a..c80e3a5403b7 100644
+index 4a9513bfa37c..23639d2bbf2b 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;
+@@ -88,7 +88,6 @@ class ResourceMessageFilter;
  class SiteInstance;
  class SiteInstanceImpl;
  class StoragePartition;
 -class StoragePartitionImpl;
+ struct ChildProcessTerminationInfo;
  
  #if BUILDFLAG(ENABLE_WEBRTC)
- class MediaStreamTrackMetricsHost;
+@@ -136,7 +135,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
-@@ -134,7 +133,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // null.
    static RenderProcessHost* CreateRenderProcessHost(
        BrowserContext* browser_context,
@@ -522,7 +531,7 @@ index 0ea859f1c52a..c80e3a5403b7 100644
        SiteInstance* site_instance,
        bool is_for_guests_only);
  
-@@ -441,7 +440,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -446,7 +445,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Use CreateRenderProcessHost() instead of calling this constructor
    // directly.
    RenderProcessHostImpl(BrowserContext* browser_context,
@@ -531,7 +540,7 @@ index 0ea859f1c52a..c80e3a5403b7 100644
                          bool is_for_guests_only);
  
    // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
-@@ -708,10 +707,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -717,10 +716,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // called.
    int instance_id_ = 1;
  
@@ -545,10 +554,10 @@ index 0ea859f1c52a..c80e3a5403b7 100644
    // The observers watching our lifetime.
    base::ObserverList<RenderProcessHostObserver> observers_;
 diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
-index 24bd8c4e1e28..0b33d7d17f69 100644
+index 81e1e824d0f2..4a1c11c597d9 100644
 --- content/browser/renderer_interface_binders.cc
 +++ content/browser/renderer_interface_binders.cc
-@@ -137,7 +137,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
+@@ -135,7 +135,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
    parameterized_binder_registry_.AddInterface(
        base::Bind([](payments::mojom::PaymentManagerRequest request,
                      RenderProcessHost* host, const url::Origin& origin) {
@@ -557,7 +566,7 @@ index 24bd8c4e1e28..0b33d7d17f69 100644
              ->GetPaymentAppContext()
              ->CreatePaymentManager(std::move(request));
        }));
-@@ -157,7 +157,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
+@@ -155,7 +155,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
    parameterized_binder_registry_.AddInterface(base::BindRepeating(
        [](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
           const url::Origin& origin) {
@@ -566,7 +575,7 @@ index 24bd8c4e1e28..0b33d7d17f69 100644
              ->GetLockManager()
              ->CreateService(std::move(request), origin);
        }));
-@@ -166,9 +166,10 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
+@@ -164,9 +164,10 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
    parameterized_binder_registry_.AddInterface(
        base::Bind([](blink::mojom::NotificationServiceRequest request,
                      RenderProcessHost* host, const url::Origin& origin) {
@@ -743,7 +752,7 @@ index fb7a2fe41f94..f8232c08e924 100644
  
    RenderFrameHost* render_frame_host_;
 diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
-index ddb422866966..5f0996729c1c 100644
+index 4df248003ecb..395c670dbd1e 100644
 --- content/public/browser/browser_context.h
 +++ content/public/browser/browser_context.h
 @@ -206,6 +206,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {

patch/patches/views_1749_2102.patch

@@ -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 257f71e6eaa4..1a53b4c6e2e7 100644
+index 6aa3bb538539..3bdef6759456 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
 @@ -842,7 +842,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {

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 0ebd7f5c422b..0a20af4ef696 100644
+index d6e3ba62a9d6..772baa2f5129 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -377,6 +377,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
+@@ -371,6 +371,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
    return screen_info.device_scale_factor;
  }
  
@@ -18,7 +18,7 @@ index 0ebd7f5c422b..0a20af4ef696 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 f226d2f8adc8..3c4d95f9232f 100644
+index 3293d2dd5e6d..3c1bf7a41f07 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
 @@ -80,6 +80,7 @@ class BrowserAccessibilityManager;
@@ -48,7 +48,7 @@ index f226d2f8adc8..3c4d95f9232f 100644
    TouchSelectionControllerClientManager*
    GetTouchSelectionControllerClientManager() override;
  
-@@ -426,6 +432,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -425,6 +431,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 f226d2f8adc8..3c4d95f9232f 100644
    // Sets the cursor for this view to the one associated with the specified
    // cursor_type.
    virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -596,6 +608,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -595,6 +607,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
  
    bool is_currently_scrolling_viewport_;
  

patch/patches/web_contents_1257_1565.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index fbd264add72e..d3109dd3c9c7 100644
+index 6e3f8e889e6d..8eecc7fc9692 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
 @@ -1779,21 +1779,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -70,7 +70,7 @@ index fbd264add72e..d3109dd3c9c7 100644
      }
      // Save the created window associated with the route so we can show it
      // later.
-@@ -5732,7 +5750,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
+@@ -5731,7 +5749,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
  void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
      RenderViewHost* render_view_host) {
    RenderWidgetHostViewBase* rwh_view =

patch/patches/webkit_plugin_info_2015.patch

@@ -1,5 +1,5 @@
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index 5d0201f5bd76..5044f7c84076 100644
+index 81c92786c4b3..fedd9f01d05a 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
 @@ -380,6 +380,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -10,7 +10,7 @@ index 5d0201f5bd76..5044f7c84076 100644
                               const WebSecurityOrigin& main_frame_origin,
                               WebPluginListBuilder*) {}
  
-@@ -748,6 +749,11 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -745,6 +746,11 @@ class BLINK_PLATFORM_EXPORT Platform {
    // runs during Chromium's build step).
    virtual bool IsTakingV8ContextSnapshot() { return false; }
  
@@ -23,7 +23,7 @@ index 5d0201f5bd76..5044f7c84076 100644
    Platform();
    virtual ~Platform();
 diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc
-index c80fedc37a43..3b3cf2d73511 100644
+index 8c40eef254a8..b9ac9f2a3472 100644
 --- third_party/blink/renderer/core/dom/dom_implementation.cc
 +++ third_party/blink/renderer/core/dom/dom_implementation.cc
 @@ -243,10 +243,11 @@ Document* DOMImplementation::createDocument(const String& type,
@@ -41,7 +41,7 @@ index c80fedc37a43..3b3cf2d73511 100644
                                                          .Top()
                                                          .GetSecurityContext()
 diff --git third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
-index c9bbed3722d2..76d96682fead 100644
+index ab50fed4ab5e..e8829a3b8529 100644
 --- third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
 +++ third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
 @@ -323,6 +323,8 @@ WebDevToolsAgentImpl::Session::Session(
@@ -62,7 +62,7 @@ index c9bbed3722d2..76d96682fead 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 04520b3a5427..a9a4f345386e 100644
+index 64dc367b915b..6c260db5bf90 100644
 --- third_party/blink/renderer/core/frame/local_frame.cc
 +++ third_party/blink/renderer/core/frame/local_frame.cc
 @@ -1177,7 +1177,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -149,7 +149,7 @@ index 9eae0f477b7f..51de5abb8a4c 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 5206c91bfa89..c45a2cc0f16f 100644
+index 4ef2efee07ce..c750ef5ae6b8 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>,
@@ -173,10 +173,10 @@ index 5206c91bfa89..c45a2cc0f16f 100644
    Member<ValidationMessageClient> validation_message_client_;
  
 diff --git third_party/blink/renderer/platform/plugins/plugin_data.cc third_party/blink/renderer/platform/plugins/plugin_data.cc
-index 122ad2b0fa79..869bbf71bc44 100644
+index 73d10a188b27..8af05af0dc76 100644
 --- third_party/blink/renderer/platform/plugins/plugin_data.cc
 +++ third_party/blink/renderer/platform/plugins/plugin_data.cc
-@@ -79,16 +79,18 @@ void PluginData::Trace(blink::Visitor* visitor) {
+@@ -83,16 +83,18 @@ void PluginData::Trace(blink::Visitor* visitor) {
  // static
  void PluginData::RefreshBrowserSidePluginCache() {
    PluginListBuilder builder(nullptr);
@@ -199,10 +199,10 @@ index 122ad2b0fa79..869bbf71bc44 100644
    for (PluginInfo* plugin_info : plugins_) {
      for (MimeClassInfo* mime_class_info : plugin_info->mimes_)
 diff --git third_party/blink/renderer/platform/plugins/plugin_data.h third_party/blink/renderer/platform/plugins/plugin_data.h
-index 736a244e720f..2279b0b8dd1e 100644
+index f1a78d3e0d5f..f6403f5ac018 100644
 --- third_party/blink/renderer/platform/plugins/plugin_data.h
 +++ third_party/blink/renderer/platform/plugins/plugin_data.h
-@@ -95,7 +95,8 @@ class PLATFORM_EXPORT PluginData final
+@@ -101,7 +101,8 @@ class PLATFORM_EXPORT PluginData final
    const HeapVector<Member<PluginInfo>>& Plugins() const { return plugins_; }
    const HeapVector<Member<MimeClassInfo>>& Mimes() const { return mimes_; }
    const SecurityOrigin* Origin() const { return main_frame_origin_.get(); }

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 19739bb1ff36..58c9b10c1ff5 100644
+index 57f9b8e60b80..b0fcb8681d93 100644
 --- third_party/blink/renderer/core/input/pointer_event_manager.cc
 +++ third_party/blink/renderer/core/input/pointer_event_manager.cc
-@@ -287,7 +287,7 @@ void PointerEventManager::HandlePointerInterruption(
+@@ -285,7 +285,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,8 +1,8 @@
 diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
-index d8228df7ddc2..2f05b96c8dc3 100644
+index db2e2e88c9f6..19eb6e7f3073 100644
 --- third_party/blink/public/web/web_view.h
 +++ third_party/blink/public/web/web_view.h
-@@ -357,6 +357,7 @@ class WebView : protected WebWidget {
+@@ -358,6 +358,7 @@ class WebView : protected WebWidget {
  
    // Sets whether select popup menus should be rendered by the browser.
    BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
@@ -10,7 +10,7 @@ index d8228df7ddc2..2f05b96c8dc3 100644
  
    // Hides any popup (suggestions, selects...) that might be showing.
    virtual void HidePopups() = 0;
-@@ -387,6 +388,8 @@ class WebView : protected WebWidget {
+@@ -388,6 +389,8 @@ class WebView : protected WebWidget {
                                    unsigned inactive_background_color,
                                    unsigned inactive_foreground_color) = 0;
  
@@ -20,10 +20,10 @@ index d8228df7ddc2..2f05b96c8dc3 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 4ddb6f53a697..0eb812404164 100644
+index f2a2a4d8b3e1..e349385e4ae3 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) {
+@@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
    g_should_use_external_popup_menus = use_external_popup_menus;
  }
  
@@ -39,7 +39,7 @@ index 4ddb6f53a697..0eb812404164 100644
  }
  
  namespace {
-@@ -342,6 +347,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
+@@ -343,6 +348,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,7 +48,7 @@ index 4ddb6f53a697..0eb812404164 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 b607b9168a4e..2d42d89da893 100644
+index f2a35c0426bd..cf7641477c2e 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,
@@ -80,10 +80,10 @@ index b607b9168a4e..2d42d89da893 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 2d13e950b6be..136eb209570b 100644
+index 6af373a6468c..c9b5d47d9141 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
-@@ -780,7 +780,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
+@@ -781,7 +781,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
  PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                             HTMLSelectElement& select) {
    NotifyPopupOpeningObservers();

patch/patches/webview_plugin_2020.patch

@@ -1,5 +1,5 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index dbe788831033..ee3426ec8039 100644
+index 59227ea4c439..228262b9a2d3 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
 @@ -4838,7 +4838,7 @@ Keep your key file in a safe place. You will need it to create new versions of y