From 2e04182b7a887ce8cb656f0ffc4294ad43239b93 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 7 Mar 2019 20:21:13 -0500
Subject: [PATCH] Update to Chromium version 73.0.3683.60

---
 CHROMIUM_BUILD_COMPATIBILITY.txt              |  2 +-
 patch/patches/browser_plugin_guest_1565.patch |  2 +-
 patch/patches/chrome_browser.patch            |  8 ++--
 patch/patches/content_2015.patch              | 14 +++----
 patch/patches/extensions_1947.patch           |  6 +--
 patch/patches/linux_gtk_2014.patch            |  8 ++--
 patch/patches/prefs_content_1161.patch        |  2 +-
 .../print_header_footer_1478_1565.patch       | 42 +++++++++----------
 patch/patches/rwh_background_color_1984.patch |  2 +-
 patch/patches/storage_partition_1973.patch    | 28 ++++++-------
 ...views_widget_180_1481_1565_1677_1749.patch |  4 +-
 patch/patches/web_contents_1257_1565.patch    |  8 ++--
 patch/patches/webkit_popups.patch             |  2 +-
 patch/patches/webview_plugin_2020.patch       |  2 +-
 14 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index 2b01f7c52..ed1d0c3b0 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/73.0.3683.27'
+  'chromium_checkout': 'refs/tags/73.0.3683.60'
 }
diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch
index 42c626b18..d49ae119c 100644
--- a/patch/patches/browser_plugin_guest_1565.patch
+++ b/patch/patches/browser_plugin_guest_1565.patch
@@ -37,7 +37,7 @@ index fa03ea14330e..c1bd1b67ce21 100644
  
    attached_ = true;
 diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
-index a97648ef717b..b82895c89f77 100644
+index de100cad56f2..32fc6c09ca14 100644
 --- content/browser/frame_host/interstitial_page_impl.cc
 +++ content/browser/frame_host/interstitial_page_impl.cc
 @@ -632,7 +632,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch
index e2bb27be5..335540c62 100644
--- a/patch/patches/chrome_browser.patch
+++ b/patch/patches/chrome_browser.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 1b12e3b97384..8e214412a53d 100644
+index 5f188cf2d300..97a9a83a96ef 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
 @@ -8,6 +8,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 1b12e3b97384..8e214412a53d 100644
  import("//chrome/common/features.gni")
  import("//components/feature_engagement/features.gni")
  import("//components/feed/features.gni")
-@@ -1732,6 +1733,7 @@ jumbo_split_static_library("browser") {
+@@ -1734,6 +1735,7 @@ jumbo_split_static_library("browser") {
      "//base:i18n",
      "//base/allocator:buildflags",
      "//cc",
@@ -18,7 +18,7 @@ index 1b12e3b97384..8e214412a53d 100644
      "//chrome:extra_resources",
      "//chrome:resources",
      "//chrome:strings",
-@@ -2020,6 +2022,10 @@ jumbo_split_static_library("browser") {
+@@ -2022,6 +2024,10 @@ jumbo_split_static_library("browser") {
      ]
    }
  
@@ -29,7 +29,7 @@ index 1b12e3b97384..8e214412a53d 100644
    if (is_android) {
      sources += [
        "after_startup_task_utils_android.cc",
-@@ -3716,7 +3722,7 @@ jumbo_split_static_library("browser") {
+@@ -3720,7 +3726,7 @@ jumbo_split_static_library("browser") {
      ]
    }
  
diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch
index 8d81800a9..e90593f36 100644
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@@ -64,7 +64,7 @@ index ebf8531af849..fff277b7e62b 100644
  }
  
 diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
-index 244992176f0f..a238f052d468 100644
+index 9381de48eafa..dfcdcb29feb5 100644
 --- content/browser/frame_host/navigation_handle_impl.cc
 +++ content/browser/frame_host/navigation_handle_impl.cc
 @@ -391,12 +391,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -81,7 +81,7 @@ index 244992176f0f..a238f052d468 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 b4a3b637fa67..bc7b8a4a39c9 100644
+index 75069cf3ad35..27657e669453 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
 @@ -2153,6 +2153,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -92,7 +92,7 @@ index b4a3b637fa67..bc7b8a4a39c9 100644
    }
  
    frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
-@@ -4846,9 +4847,9 @@ void RenderFrameHostImpl::CommitNavigation(
+@@ -4850,9 +4851,9 @@ void RenderFrameHostImpl::CommitNavigation(
        DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) ||
               base::FeatureList::IsEnabled(
                   blink::features::kServiceWorkerServicification));
@@ -105,10 +105,10 @@ index b4a3b637fa67..bc7b8a4a39c9 100644
            FROM_HERE, {BrowserThread::IO},
            base::BindOnce(&PrefetchURLLoaderService::GetFactory,
 diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
-index 789c40612628..17c30e0b5d57 100644
+index ec1c286b4218..1155fe29166b 100644
 --- content/browser/frame_host/render_frame_message_filter.cc
 +++ content/browser/frame_host/render_frame_message_filter.cc
-@@ -699,6 +699,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
+@@ -705,6 +705,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
  void RenderFrameMessageFilter::OnGetPluginInfo(
      int render_frame_id,
      const GURL& url,
@@ -116,7 +116,7 @@ index 789c40612628..17c30e0b5d57 100644
      const url::Origin& main_frame_origin,
      const std::string& mime_type,
      bool* found,
-@@ -710,8 +711,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
+@@ -716,8 +717,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
    bool allow_wildcard = true;
    *found = plugin_service_->GetPluginInfo(
        render_process_id_, render_frame_id, resource_context_, url,
@@ -363,7 +363,7 @@ index 5b45214bdb34..8d654d142309 100644
  
  void RenderFrameImpl::WillCommitProvisionalLoad() {
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 44df5d5461c7..b3a7d92a547e 100644
+index f376c3cbbce1..8618d73fe1e3 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
 @@ -815,6 +815,8 @@ void RenderThreadImpl::Init() {
diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch
index 83f43cc34..08aeea842 100644
--- a/patch/patches/extensions_1947.patch
+++ b/patch/patches/extensions_1947.patch
@@ -27,10 +27,10 @@ index 9e81f0a33ede..b796e79ae7ef 100644
    auto* browser_context = web_contents->GetBrowserContext();
  
 diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
-index dce34d553156..e42e6bc5e1af 100644
+index f9f8e5204d1d..e35a65860293 100644
 --- content/browser/frame_host/render_frame_host_manager.cc
 +++ content/browser/frame_host/render_frame_host_manager.cc
-@@ -955,10 +955,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
+@@ -953,10 +953,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 dce34d553156..e42e6bc5e1af 100644
      return true;
    }
  
-@@ -1097,7 +1098,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
+@@ -1095,7 +1096,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
  
    // Double-check that the new SiteInstance is associated with the right
    // BrowserContext.
diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch
index 83906277d..6760259d5 100644
--- a/patch/patches/linux_gtk_2014.patch
+++ b/patch/patches/linux_gtk_2014.patch
@@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644
  
  void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
 diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
-index 101b6f34dce7..1d750d40565d 100644
+index 7644572ee8fb..c54d24fa17ae 100644
 --- chrome/test/BUILD.gn
 +++ chrome/test/BUILD.gn
-@@ -3965,7 +3965,7 @@ test("unit_tests") {
+@@ -3966,7 +3966,7 @@ test("unit_tests") {
        "../browser/ui/input_method/input_method_engine_unittest.cc",
      ]
    }
@@ -80,7 +80,7 @@ index 101b6f34dce7..1d750d40565d 100644
      sources +=
          [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
      deps += [ "//build/config/linux/gtk" ]
-@@ -3986,7 +3986,7 @@ test("unit_tests") {
+@@ -3987,7 +3987,7 @@ test("unit_tests") {
    if (use_gio) {
      configs += [ "//build/linux:gio_config" ]
    }
@@ -89,7 +89,7 @@ index 101b6f34dce7..1d750d40565d 100644
      deps += [ "//chrome/browser/ui/libgtkui" ]
    }
  
-@@ -4988,7 +4988,7 @@ if (!is_android) {
+@@ -4989,7 +4989,7 @@ if (!is_android) {
            # suites, it seems like one or another starts timing out too.
            "../browser/ui/views/keyboard_access_browsertest.cc",
          ]
diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch
index 485bdb8d3..98d8c6fa8 100644
--- a/patch/patches/prefs_content_1161.patch
+++ b/patch/patches/prefs_content_1161.patch
@@ -35,7 +35,7 @@ index 52edd1acaa28..a508264986d8 100644
    bool record_whole_document;
  
 diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
-index 676b344fe809..e816955e4c60 100644
+index eb0a039e0fa1..bcbab452eb14 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
 @@ -1013,6 +1013,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch
index 44e501e08..b2f51e6af 100644
--- a/patch/patches/print_header_footer_1478_1565.patch
+++ b/patch/patches/print_header_footer_1478_1565.patch
@@ -242,18 +242,18 @@ index 1802034a6e15..ae0d479ecafa 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 cd9306860bba..3b7b505aff73 100644
+index d51abda693de..42a7ff5066ed 100644
 --- components/printing/renderer/print_render_frame_helper.cc
 +++ components/printing/renderer/print_render_frame_helper.cc
-@@ -351,7 +351,6 @@ bool IsPrintingFrameset(const blink::WebLocalFrame* frame) {
-          frame->GetDocument().Body().TagName().Equals("FRAMESET");
+@@ -345,7 +345,6 @@ bool IsPrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
+   return plugin && plugin->SupportsPaginatedPrint();
  }
  
 -#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
  // Returns true if the current destination printer is PRINT_TO_PDF.
  bool IsPrintToPdfRequested(const base::DictionaryValue& job_settings) {
    bool print_to_pdf = false;
-@@ -373,7 +372,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
+@@ -367,7 +366,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
    }
    return frame_has_custom_page_size_style;
  }
@@ -261,7 +261,7 @@ index cd9306860bba..3b7b505aff73 100644
  
  #if BUILDFLAG(ENABLE_PRINTING)
  // Disable scaling when either:
-@@ -428,7 +426,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
+@@ -422,7 +420,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
               : PRINTABLE_AREA_MARGINS;
  }
  
@@ -269,7 +269,7 @@ index cd9306860bba..3b7b505aff73 100644
  gfx::Size GetPdfPageSize(const gfx::Size& page_size, int dpi) {
    return gfx::Size(ConvertUnit(page_size.width(), dpi, kPointsPerInch),
                     ConvertUnit(page_size.height(), dpi, kPointsPerInch));
-@@ -475,7 +472,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
+@@ -469,7 +466,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
    }
    return blink::kWebPrintScalingOptionFitToPrintableArea;
  }
@@ -277,7 +277,7 @@ index cd9306860bba..3b7b505aff73 100644
  
  // Helper function to scale and round an integer value with a double valued
  // scaling.
-@@ -1106,10 +1102,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1100,10 +1096,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      return;
  
    if (g_is_preview_enabled) {
@@ -288,7 +288,7 @@ index cd9306860bba..3b7b505aff73 100644
    } else {
      auto weak_this = weak_ptr_factory_.GetWeakPtr();
      web_frame->DispatchBeforePrintEvent();
-@@ -1137,13 +1131,11 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
+@@ -1131,13 +1125,11 @@ 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)
@@ -302,7 +302,7 @@ index cd9306860bba..3b7b505aff73 100644
      IPC_MESSAGE_HANDLER(PrintMsg_PrintFrameContent, OnPrintFrameContent)
      IPC_MESSAGE_HANDLER(PrintMsg_SetPrintingEnabled, OnSetPrintingEnabled)
      IPC_MESSAGE_UNHANDLED(handled = false)
-@@ -1223,7 +1215,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
+@@ -1217,7 +1209,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
    ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
  }
  
@@ -310,7 +310,7 @@ index cd9306860bba..3b7b505aff73 100644
  void PrintRenderFrameHelper::OnPrintPreview(
      const base::DictionaryValue& settings) {
    if (ipc_nesting_level_ > 1)
-@@ -1489,7 +1480,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor(
+@@ -1482,7 +1473,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor(
        printable_height / static_cast<double>(uniform_page_size.height);
    return static_cast<int>(100.0f * std::min(scale_width, scale_height));
  }
@@ -318,7 +318,7 @@ index cd9306860bba..3b7b505aff73 100644
  
  void PrintRenderFrameHelper::OnPrintingDone(bool success) {
    if (ipc_nesting_level_ > 1)
-@@ -1504,7 +1494,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
+@@ -1497,7 +1487,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
    is_printing_enabled_ = enabled;
  }
  
@@ -326,7 +326,7 @@ index cd9306860bba..3b7b505aff73 100644
  void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
    if (ipc_nesting_level_ > 1)
      return;
-@@ -1515,7 +1504,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1508,7 +1497,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
    // that instead.
    auto plugin = delegate_->GetPdfElement(frame);
    if (!plugin.IsNull()) {
@@ -336,7 +336,7 @@ index cd9306860bba..3b7b505aff73 100644
      return;
    }
    print_preview_context_.InitWithFrame(frame);
-@@ -1527,7 +1518,6 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1520,7 +1511,6 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
  void PrintRenderFrameHelper::OnClosePrintPreviewDialog() {
    print_preview_context_.source_frame()->DispatchAfterPrintEvent();
  }
@@ -344,7 +344,7 @@ index cd9306860bba..3b7b505aff73 100644
  
  void PrintRenderFrameHelper::OnPrintFrameContent(
      const PrintMsg_PrintFrame_Params& params) {
-@@ -1611,11 +1601,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1604,11 +1594,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
    print_node_in_progress_ = true;
  
@@ -357,7 +357,7 @@ index cd9306860bba..3b7b505aff73 100644
    } else {
      // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
      // its |context_menu_node_|.
-@@ -1696,13 +1684,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1684,13 +1672,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
  void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
    int cookie =
        print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
@@ -371,7 +371,7 @@ index cd9306860bba..3b7b505aff73 100644
    switch (result) {
      case OK:
        break;
-@@ -1717,7 +1703,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1705,7 +1691,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
        }
        break;
  
@@ -379,7 +379,7 @@ index cd9306860bba..3b7b505aff73 100644
      case FAIL_PREVIEW:
        if (!is_print_ready_metafile_sent_) {
          if (notify_browser_of_print_failure_) {
-@@ -1735,7 +1720,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1723,7 +1708,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
                                                                 cookie, ids));
        print_preview_context_.Failed(false);
        break;
@@ -387,7 +387,7 @@ index cd9306860bba..3b7b505aff73 100644
    }
    prep_frame_view_.reset();
    print_pages_params_.reset();
-@@ -1908,7 +1892,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
+@@ -1896,7 +1880,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
    return true;
  }
  
@@ -395,7 +395,7 @@ index cd9306860bba..3b7b505aff73 100644
  bool PrintRenderFrameHelper::SetOptionsFromPdfDocument(
      PrintHostMsg_SetOptionsFromDocument_Params* options) {
    blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
-@@ -2001,7 +1984,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
+@@ -1989,7 +1972,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
    print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
    return false;
  }
@@ -403,7 +403,7 @@ index cd9306860bba..3b7b505aff73 100644
  
  void PrintRenderFrameHelper::GetPrintSettingsFromUser(
      blink::WebLocalFrame* frame,
-@@ -2153,7 +2135,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
+@@ -2141,7 +2123,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
    return true;
  }
  
@@ -411,7 +411,7 @@ index cd9306860bba..3b7b505aff73 100644
  void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
    if (is_scripted_preview_delayed_) {
      is_scripted_preview_delayed_ = false;
-@@ -2279,7 +2260,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
+@@ -2267,7 +2248,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
    Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params, ids));
    return true;
  }
diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch
index 52739bc99..4d8cbbe4f 100644
--- a/patch/patches/rwh_background_color_1984.patch
+++ b/patch/patches/rwh_background_color_1984.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index cffe3954f036..a1fa27523f93 100644
+index d6a5bfc51646..0170bcc78d79 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -731,10 +731,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch
index 52b29ab67..39abb4b25 100644
--- a/patch/patches/storage_partition_1973.patch
+++ b/patch/patches/storage_partition_1973.patch
@@ -328,7 +328,7 @@ index d821dc59609c..58ff1bc59fed 100644
        partition->GetPaymentAppContext();
  
 diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
-index 2841e44002e7..de25b4bb3067 100644
+index 04f816a43b87..bd7c315d3a81 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -747,11 +747,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -376,7 +376,7 @@ index 2841e44002e7..de25b4bb3067 100644
      bool is_for_guests_only)
      : fast_shutdown_started_(false),
        deleting_soon_(false),
-@@ -1609,10 +1608,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1610,10 +1609,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
        permission_service_context_(new PermissionServiceContext(this)),
        indexed_db_factory_(new IndexedDBDispatcherHost(
            id_,
@@ -391,7 +391,7 @@ index 2841e44002e7..de25b4bb3067 100644
            id_)),
        channel_connected_(false),
        sent_render_process_ready_(false),
-@@ -1646,7 +1647,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1647,7 +1648,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
    }
  
    push_messaging_manager_.reset(new PushMessagingManager(
@@ -401,7 +401,7 @@ index 2841e44002e7..de25b4bb3067 100644
  
    AddObserver(indexed_db_factory_.get());
    AddObserver(service_worker_dispatcher_host_.get());
-@@ -1976,6 +1978,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
+@@ -1977,6 +1979,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
  
  void RenderProcessHostImpl::CreateMessageFilters() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -417,7 +417,7 @@ index 2841e44002e7..de25b4bb3067 100644
    MediaInternals* media_internals = MediaInternals::GetInstance();
    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
    // from guests.
-@@ -2015,10 +2026,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -2016,10 +2027,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
                     media_request_context));
  
      resource_message_filter_ = new ResourceMessageFilter(
@@ -430,7 +430,7 @@ index 2841e44002e7..de25b4bb3067 100644
          storage_partition_impl_->GetPrefetchURLLoaderService(),
          browser_context->GetSharedCorsOriginAccessList(),
          std::move(get_contexts_callback),
-@@ -2027,8 +2038,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -2028,8 +2039,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
      AddFilter(resource_message_filter_.get());
    }
  
@@ -440,7 +440,7 @@ index 2841e44002e7..de25b4bb3067 100644
  
    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
    AddFilter(peer_connection_tracker_host_.get());
-@@ -2045,10 +2055,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -2046,10 +2056,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    AddFilter(new TraceMessageFilter(GetID()));
    AddFilter(new ResolveProxyMsgHelper(GetID()));
@@ -451,7 +451,7 @@ index 2841e44002e7..de25b4bb3067 100644
  }
  
  void RenderProcessHostImpl::BindCacheStorage(
-@@ -2060,7 +2066,8 @@ void RenderProcessHostImpl::BindCacheStorage(
+@@ -2061,7 +2067,8 @@ void RenderProcessHostImpl::BindCacheStorage(
      cache_storage_dispatcher_host_ =
          base::MakeRefCounted<CacheStorageDispatcherHost>();
      cache_storage_dispatcher_host_->Init(
@@ -461,7 +461,7 @@ index 2841e44002e7..de25b4bb3067 100644
    }
    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
    // thread entirely.
-@@ -2268,7 +2275,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -2269,7 +2276,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
  
    registry->AddInterface(base::BindRepeating(
        &CodeCacheHostImpl::Create, GetID(),
@@ -471,7 +471,7 @@ index 2841e44002e7..de25b4bb3067 100644
        base::RetainedRef(
            storage_partition_impl_->GetGeneratedCodeCacheContext())));
  
-@@ -2280,7 +2288,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -2281,7 +2289,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
  
    registry->AddInterface(base::BindRepeating(
        &AppCacheDispatcherHost::Create,
@@ -481,7 +481,7 @@ index 2841e44002e7..de25b4bb3067 100644
        GetID()));
  
    AddUIThreadInterface(
-@@ -2326,6 +2335,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -2327,6 +2336,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
      plugin_registry_.reset(
          new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
    }
@@ -492,7 +492,7 @@ index 2841e44002e7..de25b4bb3067 100644
        &PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get())));
  #endif
 diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
-index 9cbb089496aa..9236e3833c39 100644
+index 1d6fb2e65926..f029c71de154 100644
 --- content/browser/renderer_host/render_process_host_impl.h
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -101,7 +101,6 @@ class ServiceWorkerDispatcherHost;
@@ -512,7 +512,7 @@ index 9cbb089496aa..9236e3833c39 100644
        SiteInstance* site_instance,
        bool is_for_guests_only);
  
-@@ -515,7 +514,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -518,7 +517,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Use CreateRenderProcessHost() instead of calling this constructor
    // directly.
    RenderProcessHostImpl(BrowserContext* browser_context,
@@ -521,7 +521,7 @@ index 9cbb089496aa..9236e3833c39 100644
                          bool is_for_guests_only);
  
    // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
-@@ -781,10 +780,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -784,10 +783,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // The globally-unique identifier for this RPH.
    const int id_;
  
diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch
index 99156cf0e..2bc5ed152 100644
--- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch
+++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch
@@ -135,7 +135,7 @@ index f772f64d656e..7d13f9f81b6c 100644
    return host ? host->GetAcceleratedWidget() : NULL;
  }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index e43193ea912c..457f019db4c4 100644
+index f35f4a627542..685038053195 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -89,6 +89,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@@ -160,7 +160,7 @@ index e43193ea912c..457f019db4c4 100644
  
    remove_standard_frame_ = params.remove_standard_frame;
    has_non_client_view_ = Widget::RequiresNonClientView(params.type);
-@@ -894,11 +899,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
+@@ -891,11 +896,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
  }
  
  void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch
index b9e6ed337..0a466c021 100644
--- a/patch/patches/web_contents_1257_1565.patch
+++ b/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 bdc3ae99f2b3..f3c70ccd242a 100644
+index b0f41edaff54..5670e3b408b1 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
 @@ -2033,21 +2033,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -45,7 +45,7 @@ index bdc3ae99f2b3..f3c70ccd242a 100644
    CHECK(render_view_host_delegate_view_);
    CHECK(view_.get());
  
-@@ -2745,6 +2754,15 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2746,6 +2755,15 @@ void WebContentsImpl::CreateNewWindow(
    create_params.renderer_initiated_creation =
        main_frame_route_id != MSG_ROUTING_NONE;
  
@@ -61,7 +61,7 @@ index bdc3ae99f2b3..f3c70ccd242a 100644
    std::unique_ptr<WebContents> new_contents;
    if (!is_guest) {
      create_params.context = view_->GetNativeView();
-@@ -2777,7 +2795,7 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2778,7 +2796,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 bdc3ae99f2b3..f3c70ccd242a 100644
      }
      // Save the created window associated with the route so we can show it
      // later.
-@@ -6288,7 +6306,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
+@@ -6289,7 +6307,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
  void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
      RenderViewHost* render_view_host) {
    RenderWidgetHostViewBase* rwh_view =
diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch
index 6c6d455b7..199df6a17 100644
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -11,7 +11,7 @@ index f7f0ae5b0c70..005b4c37fc7d 100644
    // Cancels and hides the current popup (datetime, select...) if any.
    virtual void CancelPagePopup() = 0;
 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
-index 2455c3728620..3182a7999e05 100644
+index 8dde30b743eb..fb1dffbdcaa2 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -236,8 +236,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch
index d4ea31ee1..0ead6d2fd 100644
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,5 +1,5 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 3706703c4eb4..3f9d4367af44 100644
+index 1e5a91092af1..ad91c9f8ba07 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
 @@ -4563,7 +4563,7 @@ Keep your key file in a safe place. You will need it to create new versions of y