Update to Chromium version 60.0.3112.113

CHROMIUM_BUILD_COMPATIBILITY.txt

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

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 16599b1..e489af1 100644
+index 16599b12409c..e489af16f4d1 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.h
 +++ content/browser/renderer_host/browser_compositor_view_mac.h
 @@ -51,9 +51,11 @@ class BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -15,7 +15,7 @@ index 16599b1..e489af1 100644
  
    void DidCreateNewRendererCompositorFrameSink(
 diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
-index 4121584..c821275 100644
+index 4121584c970f..c82127536fca 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ content/browser/renderer_host/browser_compositor_view_mac.mm
 @@ -202,6 +202,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {

patch/patches/browser_frame_host_guest_1687.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/frame_host/render_widget_host_view_guest.cc content/browser/frame_host/render_widget_host_view_guest.cc
-index b7e4883..2dfd11e 100644
+index b7e4883f030e..2dfd11ec94bb 100644
 --- content/browser/frame_host/render_widget_host_view_guest.cc
 +++ content/browser/frame_host/render_widget_host_view_guest.cc
 @@ -246,13 +246,14 @@ void RenderWidgetHostViewGuest::Destroy() {

patch/patches/browser_plugin_guest_1565.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
-index e05acc6..c5e82a9 100644
+index e05acc6ca6dc..c5e82a9484a2 100644
 --- content/browser/browser_plugin/browser_plugin_guest.cc
 +++ content/browser/browser_plugin/browser_plugin_guest.cc
 @@ -322,14 +322,20 @@ void BrowserPluginGuest::InitInternal(
@@ -36,7 +36,7 @@ index e05acc6..c5e82a9 100644
    }
  
 diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
-index 60dce63..1126c41 100644
+index 60dce63f16d3..1126c41ea8fe 100644
 --- content/browser/frame_host/interstitial_page_impl.cc
 +++ content/browser/frame_host/interstitial_page_impl.cc
 @@ -610,7 +610,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
@@ -49,7 +49,7 @@ index 60dce63..1126c41 100644
    render_view_host_->GetMainFrame()->AllowBindings(
        BINDINGS_POLICY_DOM_AUTOMATION);
 diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
-index e4401f8..f2fdb9b 100644
+index e4401f85bf3f..f2fdb9be0d5c 100644
 --- content/browser/web_contents/web_contents_view.h
 +++ content/browser/web_contents/web_contents_view.h
 @@ -86,13 +86,9 @@ class WebContentsView {
@@ -69,7 +69,7 @@ index e4401f8..f2fdb9b 100644
    // Creates a new View that holds a popup and receives messages for it.
    virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
 diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc
-index 84b906e..ec0d014 100644
+index 84b906e8b965..ec0d014b7ae8 100644
 --- content/browser/web_contents/web_contents_view_aura.cc
 +++ content/browser/web_contents/web_contents_view_aura.cc
 @@ -846,7 +846,8 @@ void WebContentsViewAura::CreateView(
@@ -91,7 +91,7 @@ index 84b906e..ec0d014 100644
        g_create_render_widget_host_view
            ? g_create_render_widget_host_view(render_widget_host,
 diff --git content/browser/web_contents/web_contents_view_aura.h content/browser/web_contents/web_contents_view_aura.h
-index c52692e..63402a6 100644
+index c52692ed1634..63402a66e44a 100644
 --- content/browser/web_contents/web_contents_view_aura.h
 +++ content/browser/web_contents/web_contents_view_aura.h
 @@ -118,7 +118,7 @@ class CONTENT_EXPORT WebContentsViewAura
@@ -104,7 +104,7 @@ index c52692e..63402a6 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_child_frame.cc content/browser/web_contents/web_contents_view_child_frame.cc
-index d10fbca..18df45f 100644
+index d10fbca3c81e..18df45f5b778 100644
 --- content/browser/web_contents/web_contents_view_child_frame.cc
 +++ content/browser/web_contents/web_contents_view_child_frame.cc
 @@ -94,7 +94,7 @@ void WebContentsViewChildFrame::CreateView(const gfx::Size& initial_size,
@@ -117,7 +117,7 @@ index d10fbca..18df45f 100644
  }
  
 diff --git content/browser/web_contents/web_contents_view_child_frame.h content/browser/web_contents/web_contents_view_child_frame.h
-index 86ce68b..fd21e5a 100644
+index 86ce68bfbe69..fd21e5a7f12b 100644
 --- content/browser/web_contents/web_contents_view_child_frame.h
 +++ content/browser/web_contents/web_contents_view_child_frame.h
 @@ -39,7 +39,7 @@ class WebContentsViewChildFrame : public WebContentsView,
@@ -130,7 +130,7 @@ index 86ce68b..fd21e5a 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_guest.cc content/browser/web_contents/web_contents_view_guest.cc
-index 702a579..2acceda 100644
+index 702a579c19a8..2acceda336b3 100644
 --- content/browser/web_contents/web_contents_view_guest.cc
 +++ content/browser/web_contents/web_contents_view_guest.cc
 @@ -72,6 +72,8 @@ void WebContentsViewGuest::GetScreenInfo(ScreenInfo* screen_info) const {
@@ -185,7 +185,7 @@ index 702a579..2acceda 100644
  
  RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
 diff --git content/browser/web_contents/web_contents_view_guest.h content/browser/web_contents/web_contents_view_guest.h
-index 0102d7e..b89d66c 100644
+index 0102d7ee960b..b89d66c025cf 100644
 --- content/browser/web_contents/web_contents_view_guest.h
 +++ content/browser/web_contents/web_contents_view_guest.h
 @@ -58,7 +58,7 @@ class WebContentsViewGuest : public WebContentsView,
@@ -198,7 +198,7 @@ index 0102d7e..b89d66c 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h
-index b0a1a1d..12fce1d3 100644
+index b0a1a1d99593..12fce1d3f5fb 100644
 --- content/browser/web_contents/web_contents_view_mac.h
 +++ content/browser/web_contents/web_contents_view_mac.h
 @@ -91,7 +91,7 @@ class WebContentsViewMac : public WebContentsView,
@@ -211,7 +211,7 @@ index b0a1a1d..12fce1d3 100644
        RenderWidgetHost* render_widget_host) override;
    void SetPageTitle(const base::string16& title) override;
 diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
-index ebd0ce3..64a9d85 100644
+index ebd0ce35c1c1..64a9d8525b9e 100644
 --- content/browser/web_contents/web_contents_view_mac.mm
 +++ content/browser/web_contents/web_contents_view_mac.mm
 @@ -352,7 +352,8 @@ void WebContentsViewMac::CreateView(
@@ -233,7 +233,7 @@ index ebd0ce3..64a9d85 100644
        g_create_render_widget_host_view
            ? g_create_render_widget_host_view(render_widget_host,
 diff --git content/public/browser/browser_plugin_guest_delegate.h content/public/browser/browser_plugin_guest_delegate.h
-index 61662f4..6a4648f 100644
+index 61662f4bab77..6a4648fb76ff 100644
 --- content/public/browser/browser_plugin_guest_delegate.h
 +++ content/public/browser/browser_plugin_guest_delegate.h
 @@ -19,6 +19,7 @@ namespace content {
@@ -256,7 +256,7 @@ index 61662f4..6a4648f 100644
    // reported from the guest renderer should be ignored. The reported value
    // from the guest renderer is incorrect in situations where BrowserPlugin is
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 255217d..1571064 100644
+index 255217dc252d..15710641cba3 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -174,6 +174,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -288,7 +288,7 @@ index 255217d..1571064 100644
      WebContents* source,
      const content::OpenURLParams& params) {
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index f3fb783..642342c 100644
+index f3fb78307bc8..642342cfff43 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 @@ -87,6 +87,10 @@ class MimeHandlerViewGuest :
@@ -303,7 +303,7 @@ index f3fb783..642342c 100644
    content::WebContents* OpenURLFromTab(
        content::WebContents* source,
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
-index 0928bf2..e954278 100644
+index 0928bf2f44da..e9542785ec8a 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
 @@ -6,9 +6,9 @@

patch/patches/chrome_profile.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/profiles/incognito_helpers.cc chrome/browser/profiles/incognito_helpers.cc
-index 6155e96..2125a436 100644
+index 6155e9606d67..2125a436c87e 100644
 --- chrome/browser/profiles/incognito_helpers.cc
 +++ chrome/browser/profiles/incognito_helpers.cc
 @@ -8,13 +8,35 @@
@@ -39,7 +39,7 @@ index 6155e96..2125a436 100644
  }
  
 diff --git chrome/browser/profiles/incognito_helpers.h chrome/browser/profiles/incognito_helpers.h
-index 4b43013..169ca47 100644
+index 4b430133e16f..169ca4765907 100644
 --- chrome/browser/profiles/incognito_helpers.h
 +++ chrome/browser/profiles/incognito_helpers.h
 @@ -11,6 +11,19 @@ class BrowserContext;
@@ -63,7 +63,7 @@ index 4b43013..169ca47 100644
  content::BrowserContext* GetBrowserContextRedirectedInIncognito(
      content::BrowserContext* context);
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index 5753fec..cc23f06 100644
+index 5753fecbe39f..cc23f0662993 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
 @@ -95,7 +95,7 @@ class ProfileManager : public base::NonThreadSafe,

patch/patches/chrome_widevine.patch

@@ -1,5 +1,5 @@
 diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
-index b7429b1..a65dfbf 100644
+index b7429b126490..a65dfbfb7709 100644
 --- chrome/common/chrome_content_client.cc
 +++ chrome/common/chrome_content_client.cc
 @@ -81,7 +81,7 @@

patch/patches/compositor_1368.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
-index 409df107..e1df182 100644
+index 409df107103e..e1df1826410e 100644
 --- content/browser/compositor/gpu_process_transport_factory.cc
 +++ content/browser/compositor/gpu_process_transport_factory.cc
 @@ -240,6 +240,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
@@ -17,7 +17,7 @@ index 409df107..e1df182 100644
    if (command_line->HasSwitch(switches::kHeadless))
      return base::WrapUnique(new cc::SoftwareOutputDevice);
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index 54a104a..ba76d90 100644
+index 54a104ae7619..ba76d902d4ea 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
 @@ -18,6 +18,7 @@

patch/patches/content_1129_2015.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
-index ecc7952..69ef4b4 100644
+index ecc79522d5ae..69ef4b40ccd9 100644
 --- chrome/browser/download/download_target_determiner.cc
 +++ chrome/browser/download/download_target_determiner.cc
 @@ -476,8 +476,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
@@ -14,7 +14,7 @@ index ecc7952..69ef4b4 100644
      // The GetPlugins call causes the plugin list to be refreshed. Once that's
      // done we can retry the GetPluginInfo call. We break out of this cycle
 diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
-index 1783a10..b380ef8 100644
+index 1783a101aa02..b380ef826ff7 100644
 --- chrome/browser/plugins/chrome_plugin_service_filter.cc
 +++ chrome/browser/plugins/chrome_plugin_service_filter.cc
 @@ -179,6 +179,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -26,7 +26,7 @@ index 1783a10..b380ef8 100644
      content::WebPluginInfo* plugin) {
    base::AutoLock auto_lock(lock_);
 diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h
-index f8b651f..ec39f8d 100644
+index f8b651f1ddc4..ec39f8d7dc85 100644
 --- chrome/browser/plugins/chrome_plugin_service_filter.h
 +++ chrome/browser/plugins/chrome_plugin_service_filter.h
 @@ -71,6 +71,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
@@ -38,7 +38,7 @@ index f8b651f..ec39f8d 100644
                           content::WebPluginInfo* plugin) override;
  
 diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc
-index 8c31c98..beef4cb 100644
+index 8c31c98cf439..beef4cb9d3ae 100644
 --- chrome/browser/plugins/plugin_info_message_filter.cc
 +++ chrome/browser/plugins/plugin_info_message_filter.cc
 @@ -451,8 +451,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
@@ -53,7 +53,7 @@ index 8c31c98..beef4cb 100644
      }
    }
 diff --git chrome/browser/ui/cocoa/drag_util.mm chrome/browser/ui/cocoa/drag_util.mm
-index fd8c993..7f70c96 100644
+index fd8c99386bdd..7f70c965ce49 100644
 --- chrome/browser/ui/cocoa/drag_util.mm
 +++ chrome/browser/ui/cocoa/drag_util.mm
 @@ -54,7 +54,7 @@ BOOL IsSupportedFileURL(Profile* profile, const GURL& url) {
@@ -66,7 +66,7 @@ index fd8c993..7f70c96 100644
  }
  
 diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-index ea5764b..ae06854 100644
+index ea5764be19f4..ae06854189cd 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 @@ -585,6 +585,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
@@ -78,7 +78,7 @@ index ea5764b..ae06854 100644
                mime_type, false, NULL, &plugin, NULL));
  }
 diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
-index 578c05b..b2d2687 100644
+index 578c05b0c757..b2d26876b4bd 100644
 --- content/browser/frame_host/navigation_handle_impl.cc
 +++ content/browser/frame_host/navigation_handle_impl.cc
 @@ -299,12 +299,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -95,7 +95,7 @@ index 578c05b..b2d2687 100644
  }
  
 diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
-index 747f19a..642a86d 100644
+index 747f19a594c2..642a86d8e60b 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
 @@ -881,10 +881,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
@@ -133,7 +133,7 @@ index 747f19a..642a86d 100644
  void RenderFrameHostImpl::OnRequestOverlayRoutingToken() {
    // Make sure that we have a token.
 diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h
-index 1d1de6e..bd05959 100644
+index 1d1de6edf081..bd05959f98bb 100644
 --- content/browser/frame_host/render_frame_host_impl.h
 +++ content/browser/frame_host/render_frame_host_impl.h
 @@ -801,8 +801,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -147,7 +147,7 @@ index 1d1de6e..bd05959 100644
                                          mojo::ScopedMessagePipeHandle pipe);
  #endif
 diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
-index bbbb37d..1fa30da 100644
+index bbbb37d8917d..1fa30da1385b 100644
 --- content/browser/frame_host/render_frame_message_filter.cc
 +++ content/browser/frame_host/render_frame_message_filter.cc
 @@ -449,6 +449,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
@@ -209,7 +209,7 @@ index bbbb37d..1fa30da 100644
  
  void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin(
 diff --git content/browser/frame_host/render_frame_message_filter.h content/browser/frame_host/render_frame_message_filter.h
-index 3f49cc4..c593146 100644
+index 3f49cc40b6d9..c593146686f2 100644
 --- content/browser/frame_host/render_frame_message_filter.h
 +++ content/browser/frame_host/render_frame_message_filter.h
 @@ -124,13 +124,16 @@ class CONTENT_EXPORT RenderFrameMessageFilter
@@ -230,7 +230,7 @@ index 3f49cc4..c593146 100644
                         const std::string& mime_type,
                         bool* found,
 diff --git content/browser/loader/mime_sniffing_resource_handler.cc content/browser/loader/mime_sniffing_resource_handler.cc
-index 11adad4..283f116 100644
+index 11adad470477..283f11625851 100644
 --- content/browser/loader/mime_sniffing_resource_handler.cc
 +++ content/browser/loader/mime_sniffing_resource_handler.cc
 @@ -519,8 +519,8 @@ bool MimeSniffingResourceHandler::CheckForPluginHandler(
@@ -245,7 +245,7 @@ index 11adad4..283f116 100644
    if (stale) {
      // Refresh the plugins asynchronously.
 diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
-index 4bdfa1d..cf9b916 100644
+index 4bdfa1d5455f..cf9b9166ae43 100644
 --- content/browser/plugin_service_impl.cc
 +++ content/browser/plugin_service_impl.cc
 @@ -242,6 +242,7 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
@@ -267,7 +267,7 @@ index 4bdfa1d..cf9b916 100644
        if (actual_mime_type)
          *actual_mime_type = mime_types[i];
 diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h
-index 85b64da..e77f1bb 100644
+index 85b64dad4b90..e77f1bb5a1c2 100644
 --- content/browser/plugin_service_impl.h
 +++ content/browser/plugin_service_impl.h
 @@ -64,6 +64,7 @@ class CONTENT_EXPORT PluginServiceImpl
@@ -279,7 +279,7 @@ index 85b64da..e77f1bb 100644
                       const std::string& mime_type,
                       bool allow_wildcard,
 diff --git content/common/frame_messages.h content/common/frame_messages.h
-index 7077b9a..5fa68b1 100644
+index 7077b9a6cefe..5fa68b1b1bdd 100644
 --- content/common/frame_messages.h
 +++ content/common/frame_messages.h
 @@ -1298,8 +1298,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -317,7 +317,7 @@ index 7077b9a..5fa68b1 100644
  // Adding a new message? Stick to the sort order above: first platform
  // independent FrameMsg, then ifdefs for platform specific FrameMsg, then
 diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc
-index e9b8930..42e3aec 100644
+index e9b89307ad89..42e3aec266e0 100644
 --- content/ppapi_plugin/ppapi_blink_platform_impl.cc
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -213,6 +213,7 @@ std::unique_ptr<blink::WebURLLoader> PpapiBlinkPlatformImpl::CreateURLLoader() {
@@ -329,7 +329,7 @@ index e9b8930..42e3aec 100644
      blink::WebPluginListBuilder* builder) {
    NOTREACHED();
 diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h
-index 84d29a5..3541ff0 100644
+index 84d29a5ae84a..3541ff0650be 100644
 --- content/ppapi_plugin/ppapi_blink_platform_impl.h
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
 @@ -45,6 +45,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -341,7 +341,7 @@ index 84d29a5..3541ff0 100644
                       blink::WebPluginListBuilder*) override;
    blink::WebData LoadResource(const char* name) override;
 diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h
-index ac05c13..762262b 100644
+index ac05c13b1df8..762262bff01a 100644
 --- content/public/browser/plugin_service.h
 +++ content/public/browser/plugin_service.h
 @@ -74,6 +74,7 @@ class PluginService {
@@ -353,7 +353,7 @@ index ac05c13..762262b 100644
                               const std::string& mime_type,
                               bool allow_wildcard,
 diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h
-index 3b610b1..7c439e0 100644
+index 3b610b1f554e..7c439e060779 100644
 --- content/public/browser/plugin_service_filter.h
 +++ content/public/browser/plugin_service_filter.h
 @@ -33,6 +33,7 @@ class PluginServiceFilter {
@@ -365,7 +365,7 @@ index 3b610b1..7c439e0 100644
                                   WebPluginInfo* plugin) = 0;
  
 diff --git content/public/renderer/content_renderer_client.cc content/public/renderer/content_renderer_client.cc
-index 02565ee..de8fa6e 100644
+index 02565ee6d990..de8fa6e7d535 100644
 --- content/public/renderer/content_renderer_client.cc
 +++ content/public/renderer/content_renderer_client.cc
 @@ -104,7 +104,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -385,7 +385,7 @@ index 02565ee..de8fa6e 100644
    return false;
  }
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index 0e554ba..8ac5c54 100644
+index 0e554ba8467a..8ac5c5428a5c 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
 @@ -75,6 +75,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -415,7 +415,7 @@ index 0e554ba..8ac5c54 100644
    // built in media player for the given |url|. Defaults to false.
    virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
 diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h
-index ebf4cd4..27a9df4 100644
+index ebf4cd4b118c..27a9df408783 100644
 --- content/public/renderer/render_frame_observer.h
 +++ content/public/renderer/render_frame_observer.h
 @@ -115,6 +115,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -429,7 +429,7 @@ index ebf4cd4..27a9df4 100644
    virtual void FocusedNodeChanged(const blink::WebNode& node) {}
  
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 2fd389c..8aa049b6 100644
+index 2fd389c96cb5..8aa049b62e8e 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
 @@ -2902,7 +2902,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -472,7 +472,7 @@ index 2fd389c..8aa049b6 100644
    Referrer referrer(
        RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 574acb3..924d6cf 100644
+index 574acb32ff2a..924d6cf35e5d 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
 @@ -756,6 +756,8 @@ void RenderThreadImpl::Init(
@@ -485,7 +485,7 @@ index 574acb3..924d6cf 100644
        *base::CommandLine::ForCurrentProcess(), switches::kSingleProcess);
  
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index a540286..41b19d4 100644
+index a54028632b2d..41b19d41472a 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
 @@ -738,6 +738,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -507,7 +507,7 @@ index a540286..41b19d4 100644
      builder->AddPlugin(WebString::FromUTF16(plugin.name),
                         WebString::FromUTF16(plugin.desc),
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index b931470..af3719a 100644
+index b931470c95ce..af3719abb371 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
 @@ -124,6 +124,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -519,7 +519,7 @@ index b931470..af3719a 100644
                       blink::WebPluginListBuilder* builder) override;
    blink::WebPublicSuffixList* PublicSuffixList() override;
 diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc
-index 3a48c59..d10ef64 100644
+index 3a48c59b7e3e..d10ef64adbba 100644
 --- content/shell/browser/shell_plugin_service_filter.cc
 +++ content/shell/browser/shell_plugin_service_filter.cc
 @@ -18,6 +18,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
@@ -531,7 +531,7 @@ index 3a48c59..d10ef64 100644
      WebPluginInfo* plugin) {
    return plugin->name == base::ASCIIToUTF16("Blink Test Plugin") ||
 diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h
-index 7767a62..8a95377 100644
+index 7767a620a9fd..8a95377f5f3b 100644
 --- content/shell/browser/shell_plugin_service_filter.h
 +++ content/shell/browser/shell_plugin_service_filter.h
 @@ -21,6 +21,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
@@ -543,7 +543,7 @@ index 7767a62..8a95377 100644
                           WebPluginInfo* plugin) override;
  
 diff --git content/test/fake_plugin_service.cc content/test/fake_plugin_service.cc
-index 6746b9f..8634ada 100644
+index 6746b9f16e7e..8634ada48d57 100644
 --- content/test/fake_plugin_service.cc
 +++ content/test/fake_plugin_service.cc
 @@ -29,6 +29,7 @@ bool FakePluginService::GetPluginInfo(int render_process_id,
@@ -555,7 +555,7 @@ index 6746b9f..8634ada 100644
                                        const std::string& mime_type,
                                        bool allow_wildcard,
 diff --git content/test/fake_plugin_service.h content/test/fake_plugin_service.h
-index db23a83..57a4c536 100644
+index db23a83ed079..57a4c536118c 100644
 --- content/test/fake_plugin_service.h
 +++ content/test/fake_plugin_service.h
 @@ -30,6 +30,7 @@ class FakePluginService : public PluginService {
@@ -567,7 +567,7 @@ index db23a83..57a4c536 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 7150daf..69fcc9e 100644
+index 7150daf1402c..69fcc9e7442b 100644
 --- content/test/test_blink_web_unit_test_support.cc
 +++ content/test/test_blink_web_unit_test_support.cc
 @@ -289,6 +289,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
@@ -579,7 +579,7 @@ index 7150daf..69fcc9e 100644
      blink::WebPluginListBuilder* builder) {
    builder->AddPlugin("pdf", "pdf", "pdf-files");
 diff --git content/test/test_blink_web_unit_test_support.h content/test/test_blink_web_unit_test_support.h
-index 78b7d2c..62a52cb 100644
+index 78b7d2cf4c02..62a52cbc905f 100644
 --- content/test/test_blink_web_unit_test_support.h
 +++ content/test/test_blink_web_unit_test_support.h
 @@ -68,6 +68,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {

patch/patches/content_pepper_flash_1586.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
-index 6f03077..c61fed3 100644
+index 6f030773518c..c61fed3ab2f2 100644
 --- content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
 +++ content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
 @@ -55,7 +55,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(

patch/patches/crashpad_1995.patch

@@ -1,5 +1,5 @@
 diff --git build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
-index 4d385dd..1b51f2d 100644
+index 4d385dd5512b..1b51f2d17491 100644
 --- build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
 +++ build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
 @@ -2,6 +2,8 @@
@@ -31,7 +31,7 @@ index 4d385dd..1b51f2d 100644
      cflags = [ "/wd4201" ]
    }
 diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
-index e9578be..2561824 100644
+index e9578be2cd28..2561824f984b 100644
 --- chrome/common/crash_keys.cc
 +++ chrome/common/crash_keys.cc
 @@ -4,6 +4,8 @@
@@ -90,7 +90,7 @@ index e9578be..2561824 100644
  
  void SetActiveExtensions(const std::set<std::string>& extensions) {
 diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
-index 93fb0b0..3e543d2 100644
+index 93fb0b07ec1e..3e543d211ff3 100644
 --- chrome/common/crash_keys.h
 +++ chrome/common/crash_keys.h
 @@ -22,10 +22,18 @@ class CommandLine;
@@ -113,7 +113,7 @@ index 93fb0b0..3e543d2 100644
  // on the given |command_line|.
  void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
 diff --git chrome_elf/BUILD.gn chrome_elf/BUILD.gn
-index c8197e9..21ad726 100644
+index c8197e919e95..21ad726a223e 100644
 --- chrome_elf/BUILD.gn
 +++ chrome_elf/BUILD.gn
 @@ -7,6 +7,7 @@
@@ -169,7 +169,7 @@ index c8197e9..21ad726 100644
      "//components/crash/content/app:app",
      "//components/crash/core/common",  # crash_keys
 diff --git chrome_elf/crash/crash_helper.cc chrome_elf/crash/crash_helper.cc
-index c658fa9..8c4a145 100644
+index c658fa949b7c..8c4a145d1d9a 100644
 --- chrome_elf/crash/crash_helper.cc
 +++ chrome_elf/crash/crash_helper.cc
 @@ -11,12 +11,17 @@
@@ -203,7 +203,7 @@ index c658fa9..8c4a145 100644
    g_crash_helper_enabled = true;
    return true;
 diff --git components/crash/content/app/breakpad_linux.cc components/crash/content/app/breakpad_linux.cc
-index 0d3de65..a1b8b09 100644
+index 0d3de65043a0..a1b8b092f23a 100644
 --- components/crash/content/app/breakpad_linux.cc
 +++ components/crash/content/app/breakpad_linux.cc
 @@ -29,6 +29,7 @@
@@ -281,7 +281,7 @@ index 0d3de65..a1b8b09 100644
  void InitNonBrowserCrashReporterForAndroid(const std::string& process_type) {
    SanitizationInfo sanitization_info;
 diff --git components/crash/content/app/breakpad_linux.h components/crash/content/app/breakpad_linux.h
-index 0160f62..b732498 100644
+index 0160f6284561..b732498f86ab 100644
 --- components/crash/content/app/breakpad_linux.h
 +++ components/crash/content/app/breakpad_linux.h
 @@ -16,6 +16,9 @@ namespace breakpad {
@@ -295,7 +295,7 @@ index 0160f62..b732498 100644
  extern void InitCrashKeysForTesting();
  
 diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc
-index 2e9ee28..de53f59 100644
+index 2e9ee28e1b00..de53f5927143 100644
 --- components/crash/content/app/crash_reporter_client.cc
 +++ components/crash/content/app/crash_reporter_client.cc
 @@ -88,11 +88,12 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
@@ -364,7 +364,7 @@ index 2e9ee28..de53f59 100644
 -
  }  // namespace crash_reporter
 diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h
-index 9f69c19..2abaee00 100644
+index 9f69c193dda2..2abaee004c47 100644
 --- components/crash/content/app/crash_reporter_client.h
 +++ components/crash/content/app/crash_reporter_client.h
 @@ -8,6 +8,7 @@
@@ -390,14 +390,14 @@ index 9f69c19..2abaee00 100644
    virtual base::FilePath GetReporterLogFilename();
  
    // Custom crash minidump handler after the minidump is generated.
-@@ -119,6 +121,7 @@ class CrashReporterClient {
+@@ -118,6 +120,7 @@ class CrashReporterClient {
+   // WARNING: this handler runs in a compromised context. It may not call into
    // libc nor allocate memory normally.
    virtual bool HandleCrashDump(const char* crashdump_filename);
- #endif
 +#endif
+ #endif
  
    // The location where minidump files should be written. Returns true if
-   // |crash_dir| was set. Windows has to use base::string16 because this code
 @@ -197,6 +200,23 @@ class CrashReporterClient {
  
    // Returns true if breakpad should run in the given process type.
@@ -423,7 +423,7 @@ index 9f69c19..2abaee00 100644
  
  }  // namespace crash_reporter
 diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc
-index dcec346..6272df6 100644
+index dcec34684352..6272df65bd0d 100644
 --- components/crash/content/app/crashpad.cc
 +++ components/crash/content/app/crashpad.cc
 @@ -142,7 +142,8 @@ void InitializeCrashpadImpl(bool initial_client,
@@ -437,7 +437,7 @@ index dcec346..6272df6 100644
          crashpad::TriState::kDisabled);
    }
 diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm
-index 3bae07e..b2bee0e 100644
+index 3bae07e14c69..b2bee0ee1572 100644
 --- components/crash/content/app/crashpad_mac.mm
 +++ components/crash/content/app/crashpad_mac.mm
 @@ -16,11 +16,14 @@
@@ -538,7 +538,7 @@ index 3bae07e..b2bee0e 100644
            handler_path, database_path, metrics_path, url, process_annotations,
            arguments, true, false);
 diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc
-index 94a350f..09fce54 100644
+index 94a350f4b5a4..09fce540a054 100644
 --- components/crash/content/app/crashpad_win.cc
 +++ components/crash/content/app/crashpad_win.cc
 @@ -33,8 +33,8 @@ void GetPlatformCrashpadAnnotations(
@@ -608,7 +608,7 @@ index 94a350f..09fce54 100644
  
      if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
 diff --git content/browser/frame_host/debug_urls.cc content/browser/frame_host/debug_urls.cc
-index bcf53d5..d4f070b 100644
+index bcf53d5960e4..d4f070b19cd8 100644
 --- content/browser/frame_host/debug_urls.cc
 +++ content/browser/frame_host/debug_urls.cc
 @@ -139,7 +139,9 @@ bool HandleDebugURL(const GURL& url, ui::PageTransition transition) {

patch/patches/crashpad_tp_1995.patch

@@ -1,5 +1,5 @@
 diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
-index 3aaaeee..d99fcb4 100644
+index 3aaaeee5d07f..d99fcb418d9e 100644
 --- third_party/crashpad/crashpad/client/prune_crash_reports.cc
 +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
 @@ -67,13 +67,19 @@ void PruneCrashReportDatabase(CrashReportDatabase* database,
@@ -26,7 +26,7 @@ index 3aaaeee..d99fcb4 100644
  
  static const time_t kSecondsInDay = 60 * 60 * 24;
 diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
-index 6dac5f3..34f5ee1 100644
+index 6dac5f3002b3..34f5ee111d3d 100644
 --- third_party/crashpad/crashpad/client/prune_crash_reports.h
 +++ third_party/crashpad/crashpad/client/prune_crash_reports.h
 @@ -57,7 +57,8 @@ class PruneCondition {
@@ -40,7 +40,7 @@ index 6dac5f3..34f5ee1 100644
    virtual ~PruneCondition() {}
  
 diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
-index 15d16f2..5e8eadf 100644
+index 15d16f2e0928..5e8eadfd3ad1 100644
 --- third_party/crashpad/crashpad/client/settings.cc
 +++ third_party/crashpad/crashpad/client/settings.cc
 @@ -38,7 +38,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
@@ -130,7 +130,7 @@ index 15d16f2..5e8eadf 100644
  Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
      FileHandle file,
 diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
-index b64f74f..0c3c22e 100644
+index b64f74fbaf28..0c3c22e215b6 100644
 --- third_party/crashpad/crashpad/client/settings.h
 +++ third_party/crashpad/crashpad/client/settings.h
 @@ -102,6 +102,11 @@ class Settings {
@@ -146,7 +146,7 @@ index b64f74f..0c3c22e 100644
    struct Data;
  
 diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
-index c769efe..daec6cd 100644
+index c769efed5c54..daec6cd17f37 100644
 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
 +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
 @@ -89,7 +89,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
@@ -177,7 +177,7 @@ index c769efe..daec6cd 100644
    //! \brief Attempts to upload a crash report.
    //!
 diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
-index e6d05e2..93e5eb1 100644
+index e6d05e22b639..93e5eb17f7c5 100644
 --- third_party/crashpad/crashpad/handler/handler_main.cc
 +++ third_party/crashpad/crashpad/handler/handler_main.cc
 @@ -35,8 +35,10 @@

patch/patches/font_family_cache_1501.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
-index 743448d..0a9f350 100644
+index 743448d8744a..0a9f35025a8b 100644
 --- chrome/browser/font_family_cache.h
 +++ chrome/browser/font_family_cache.h
 @@ -20,6 +20,8 @@ class Profile;

patch/patches/gn_config.patch

@@ -1,5 +1,5 @@
 diff --git .gn .gn
-index c91f911..bd906bc 100644
+index c91f91148cf0..bd906bc2e851 100644
 --- .gn
 +++ .gn
 @@ -261,6 +261,8 @@ exec_script_whitelist =
@@ -12,7 +12,7 @@ index c91f911..bd906bc 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 9429718..1f8c486 100644
+index 94297185eddd..1f8c4866a48a 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -154,6 +154,7 @@ group("gn_all") {
@@ -24,7 +24,7 @@ index 9429718..1f8c486 100644
        "//chrome/test:unit_tests",
        "//components:components_browsertests",
 diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
-index 982fbe8..e757be46 100644
+index 982fbe8d3f0d..e757be4688f1 100644
 --- build/config/win/visual_studio_version.gni
 +++ build/config/win/visual_studio_version.gni
 @@ -12,9 +12,8 @@ declare_args() {
@@ -56,7 +56,7 @@ index 982fbe8..e757be46 100644
 +         "studio path")
  }
 diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
-index e8b0849..0bfc676 100644
+index e8b08495745c..0bfc67619941 100644
 --- build/toolchain/win/setup_toolchain.py
 +++ build/toolchain/win/setup_toolchain.py
 @@ -132,18 +132,20 @@ def _LoadToolchainEnv(cpu, sdk_dir):
@@ -91,7 +91,7 @@ index e8b0849..0bfc676 100644
  
  
 diff --git build/vs_toolchain.py build/vs_toolchain.py
-index bb8f96c..6902237 100755
+index bb8f96c4e52c..690223784382 100755
 --- build/vs_toolchain.py
 +++ build/vs_toolchain.py
 @@ -79,11 +79,18 @@ def SetEnvironmentAndGetRuntimeDllDirs():
@@ -114,7 +114,7 @@ index bb8f96c..6902237 100755
      # directory in order to run binaries locally, but they are needed in order
      # to create isolates or the mini_installer. Copying them to the output
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index 1f9a1fc..aa69e8c 100644
+index 1f9a1fc9a687..aa69e8c98648 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
 @@ -245,7 +245,7 @@ template("chrome_paks") {
@@ -127,7 +127,7 @@ index 1f9a1fc..aa69e8c 100644
        if (is_mac) {
          output_locales = locales_as_mac_outputs
 diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
-index 2afab1a..c8791ea 100644
+index 2afab1a3c6a3..c8791ea51be2 100644
 --- chrome/installer/mini_installer/BUILD.gn
 +++ chrome/installer/mini_installer/BUILD.gn
 @@ -128,7 +128,7 @@ template("generate_mini_installer") {

patch/patches/gritsettings.patch

@@ -1,5 +1,5 @@
 diff --git tools/gritsettings/resource_ids tools/gritsettings/resource_ids
-index 25abc65..04e8eab 100644
+index 25abc655bf84..04e8eab17596 100644
 --- tools/gritsettings/resource_ids
 +++ tools/gritsettings/resource_ids
 @@ -371,4 +371,11 @@

patch/patches/ime_1610.patch

@@ -1,5 +1,5 @@
 diff --git ui/base/ime/input_method_win.cc ui/base/ime/input_method_win.cc
-index e2bb528..3e851e5 100644
+index e2bb52868157..3e851e5dbe03 100644
 --- ui/base/ime/input_method_win.cc
 +++ ui/base/ime/input_method_win.cc
 @@ -682,8 +682,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {

patch/patches/linux_build.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
-index 7df1d0c..3dd3209 100644
+index 7df1d0c511c1..3dd32090eb8d 100644
 --- chrome/browser/ui/libgtkui/gtk_ui.cc
 +++ chrome/browser/ui/libgtkui/gtk_ui.cc
 @@ -320,8 +320,12 @@ float GetRawDeviceScaleFactor() {

patch/patches/message_loop_443_1992243003.patch

@@ -1,5 +1,5 @@
 diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h
-index fa25e78..cd62826 100644
+index fa25e78f6d38..cd62826e366d 100644
 --- base/message_loop/message_loop.h
 +++ base/message_loop/message_loop.h
 @@ -288,6 +288,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
@@ -33,7 +33,7 @@ index fa25e78..cd62826 100644
    // if type_ is TYPE_CUSTOM and pump_ is null.
    MessagePumpFactoryCallback pump_factory_;
 diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
-index 6f48da1..e427941 100644
+index 6f48da1c744e..e427941bfd06 100644
 --- base/message_loop/message_pump_win.cc
 +++ base/message_loop/message_pump_win.cc
 @@ -366,20 +366,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {

patch/patches/net_filter_515.patch

@@ -1,5 +1,5 @@
 diff --git net/base/network_delegate.h net/base/network_delegate.h
-index eaa1e30..18b486d 100644
+index eaa1e3061c64..18b486d3e35a 100644
 --- net/base/network_delegate.h
 +++ net/base/network_delegate.h
 @@ -16,6 +16,7 @@
@@ -22,7 +22,7 @@ index eaa1e30..18b486d 100644
    // This is the interface for subclasses of NetworkDelegate to implement. These
    // member functions will be called by the respective public notification
 diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc
-index 050ba28..05684c8 100644
+index 050ba283f66a..05684c8d67da 100644
 --- net/url_request/url_request_job.cc
 +++ net/url_request/url_request_job.cc
 @@ -499,6 +499,12 @@ void URLRequestJob::NotifyHeadersComplete() {

patch/patches/net_security_expiration_1994.patch

@@ -1,5 +1,5 @@
 diff --git net/cert/ct_policy_enforcer.cc net/cert/ct_policy_enforcer.cc
-index 42f631e..b02edb0 100644
+index 42f631eaa53d..b02edb027b94 100644
 --- net/cert/ct_policy_enforcer.cc
 +++ net/cert/ct_policy_enforcer.cc
 @@ -36,15 +36,6 @@ namespace net {
@@ -33,7 +33,7 @@ index 42f631e..b02edb0 100644
 +
  }  // namespace net
 diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
-index 7111970..f751d6c 100644
+index 7111970e29d6..f751d6c6a923 100644
 --- net/cert/ct_policy_enforcer.h
 +++ net/cert/ct_policy_enforcer.h
 @@ -101,6 +101,17 @@ class NET_EXPORT CTPolicyEnforcer {
@@ -55,7 +55,7 @@ index 7111970..f751d6c 100644
  
  }  // namespace net
 diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
-index 3971eb3..fa4df80 100644
+index 3971eb387429..fa4df8080e7c 100644
 --- net/http/transport_security_state.cc
 +++ net/http/transport_security_state.cc
 @@ -1504,8 +1504,10 @@ void TransportSecurityState::SetShouldRequireCTForTesting(bool* required) {
@@ -72,7 +72,7 @@ index 3971eb3..fa4df80 100644
    // We consider built-in information to be timely for 10 weeks.
    return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
 diff --git net/http/transport_security_state.h net/http/transport_security_state.h
-index 7ce883a..80b1ae0 100644
+index 7ce883a952a2..80b1ae091efe 100644
 --- net/http/transport_security_state.h
 +++ net/http/transport_security_state.h
 @@ -572,6 +572,10 @@ class NET_EXPORT TransportSecurityState

patch/patches/net_urlrequest_1327.patch

@@ -1,5 +1,5 @@
 diff --git net/url_request/url_request.h net/url_request/url_request.h
-index 95a2667..68d7bfb 100644
+index 95a26676dcae..68d7bfb95914 100644
 --- net/url_request/url_request.h
 +++ net/url_request/url_request.h
 @@ -657,10 +657,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),

patch/patches/pdfium_print_549365.patch

@@ -1,5 +1,5 @@
 diff --git BUILD.gn BUILD.gn
-index 5802752..94c247e 100644
+index 5802752af..94c247e04 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -222,6 +222,10 @@ static_library("pdfium") {
@@ -14,7 +14,7 @@ index 5802752..94c247e 100644
  
  static_library("test_support") {
 diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp
-index f20e8ab..bc34b85 100644
+index f20e8ab9f..bc34b858d 100644
 --- fpdfsdk/fpdfview.cpp
 +++ fpdfsdk/fpdfview.cpp
 @@ -35,6 +35,7 @@

patch/patches/prefs_content_1161.patch

@@ -1,5 +1,5 @@
 diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
-index e0f025b..b691251 100644
+index e0f025b87b62..b69125110799 100644
 --- content/public/common/common_param_traits_macros.h
 +++ content/public/common/common_param_traits_macros.h
 @@ -207,6 +207,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -11,7 +11,7 @@ index e0f025b..b691251 100644
    IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
    IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
 diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
-index 1e00ba5..d829b4f 100644
+index 1e00ba53c4af..d829b4f8bdc5 100644
 --- content/public/common/web_preferences.cc
 +++ content/public/common/web_preferences.cc
 @@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
@@ -23,7 +23,7 @@ index 1e00ba5..d829b4f 100644
        inert_visual_viewport(false),
        record_whole_document(false),
 diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
-index 41f7a69..d04e476 100644
+index 41f7a69d1d71..d04e476ab383 100644
 --- content/public/common/web_preferences.h
 +++ content/public/common/web_preferences.h
 @@ -191,6 +191,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -35,7 +35,7 @@ index 41f7a69..d04e476 100644
    bool inert_visual_viewport;
    bool record_whole_document;
 diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
-index d9a7e20..a1e971c 100644
+index d9a7e20f21cc..a1e971c14ba5 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
 @@ -1400,6 +1400,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(

patch/patches/print_header_footer_1478_1565.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/cocoa/applescript/tab_applescript.mm chrome/browser/ui/cocoa/applescript/tab_applescript.mm
-index 0cd84f3..2f872dd 100644
+index 0cd84f38c229..2f872dd3dfe2 100644
 --- chrome/browser/ui/cocoa/applescript/tab_applescript.mm
 +++ chrome/browser/ui/cocoa/applescript/tab_applescript.mm
 @@ -9,7 +9,6 @@
@@ -41,7 +41,7 @@ index 0cd84f3..2f872dd 100644
  
  - (void)handlesSaveScriptCommand:(NSScriptCommand*)command {
 diff --git chrome/common/chrome_utility_printing_messages.h chrome/common/chrome_utility_printing_messages.h
-index f5712a7..11c0366 100644
+index f5712a7a5bb8..11c03661412b 100644
 --- chrome/common/chrome_utility_printing_messages.h
 +++ chrome/common/chrome_utility_printing_messages.h
 @@ -26,7 +26,6 @@
@@ -61,7 +61,7 @@ index f5712a7..11c0366 100644
    IPC_STRUCT_TRAITS_MEMBER(printer_capabilities)
    IPC_STRUCT_TRAITS_MEMBER(caps_mime_type)
 diff --git components/printing/common/print_messages.cc components/printing/common/print_messages.cc
-index de03634..76ee3a7 100644
+index de036345130c..76ee3a748007 100644
 --- components/printing/common/print_messages.cc
 +++ components/printing/common/print_messages.cc
 @@ -105,7 +105,6 @@ void PrintMsg_PrintPages_Params::Reset() {
@@ -78,7 +78,7 @@ index de03634..76ee3a7 100644
  }
 -#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 diff --git components/printing/common/print_messages.h components/printing/common/print_messages.h
-index 32b0451..9ccb733 100644
+index 32b0451b60dd..9ccb7332bec6 100644
 --- components/printing/common/print_messages.h
 +++ components/printing/common/print_messages.h
 @@ -74,7 +74,6 @@ struct PrintMsg_PrintPages_Params {
@@ -198,7 +198,7 @@ index 32b0451..9ccb733 100644
                      PrintHostMsg_SetOptionsFromDocument_Params /* params */)
 -#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 diff --git components/printing/renderer/print_web_view_helper.cc components/printing/renderer/print_web_view_helper.cc
-index 829b2dc..df3fc29 100644
+index 829b2dc1c65e..df3fc296ae7c 100644
 --- components/printing/renderer/print_web_view_helper.cc
 +++ components/printing/renderer/print_web_view_helper.cc
 @@ -320,7 +320,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
@@ -405,7 +405,7 @@ index 829b2dc..df3fc29 100644
  PrintWebViewHelper::PrintPreviewContext::PrintPreviewContext()
      : total_page_count_(0),
 diff --git components/printing/renderer/print_web_view_helper.h components/printing/renderer/print_web_view_helper.h
-index c4339d4..433fb26 100644
+index c4339d474adb..433fb26ae269 100644
 --- components/printing/renderer/print_web_view_helper.h
 +++ components/printing/renderer/print_web_view_helper.h
 @@ -153,9 +153,7 @@ class PrintWebViewHelper
@@ -486,7 +486,7 @@ index c4339d4..433fb26 100644
    bool is_loading_;
    bool is_scripted_preview_delayed_;
 diff --git components/printing/renderer/print_web_view_helper_mac.mm components/printing/renderer/print_web_view_helper_mac.mm
-index a00cfa0..4608dc0 100644
+index a00cfa0a95f1..4608dc001172 100644
 --- components/printing/renderer/print_web_view_helper_mac.mm
 +++ components/printing/renderer/print_web_view_helper_mac.mm
 @@ -76,7 +76,6 @@ void PrintWebViewHelper::PrintPagesInternal(

patch/patches/printing_context_2196.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index 07850f5..2127e49 100644
+index 07850f544b6a..2127e4969ce1 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
 @@ -121,6 +121,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
@@ -11,7 +11,7 @@ index 07850f5..2127e49 100644
  
  PrintJobWorker::~PrintJobWorker() {
 diff --git printing/printing_context.h printing/printing_context.h
-index 7054654..ed5b664 100644
+index 7054654260a7..ed5b664f86a7 100644
 --- printing/printing_context.h
 +++ printing/printing_context.h
 @@ -127,6 +127,13 @@ class PRINTING_EXPORT PrintingContext {

patch/patches/render_view_host_impl_1392.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_view_host_impl.h content/browser/renderer_host/render_view_host_impl.h
-index c36ebdd..48aa3571 100644
+index c36ebdd04698..48aa3571b85f 100644
 --- content/browser/renderer_host/render_view_host_impl.h
 +++ content/browser/renderer_host/render_view_host_impl.h
 @@ -154,6 +154,7 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,

patch/patches/render_widget_latency_2060.patch

@@ -1,5 +1,5 @@
 diff --git ui/latency/latency_histogram_macros.h ui/latency/latency_histogram_macros.h
-index 77e3eee..f8dd635 100644
+index 77e3eeef70ba..f8dd6350c120 100644
 --- ui/latency/latency_histogram_macros.h
 +++ ui/latency/latency_histogram_macros.h
 @@ -10,8 +10,7 @@

patch/patches/renderer_preferences_util_545103.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
-index 7296a04..c702d31 100644
+index 7296a04a56cc..c702d3178eb6 100644
 --- chrome/browser/renderer_preferences_util.cc
 +++ chrome/browser/renderer_preferences_util.cc
 @@ -32,7 +32,8 @@

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 e327836..17f65e1 100644
+index e32783644331..17f65e18b181 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -747,8 +747,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(

patch/patches/sandbox_2220.patch

@@ -1,5 +1,5 @@
 diff --git base/allocator/BUILD.gn base/allocator/BUILD.gn
-index 6ebbc11..b667064 100644
+index 6ebbc1163e5c..b66706466572 100644
 --- base/allocator/BUILD.gn
 +++ base/allocator/BUILD.gn
 @@ -15,8 +15,7 @@ declare_args() {

patch/patches/service_factory_1680.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/spellchecker/spellcheck_factory.cc chrome/browser/spellchecker/spellcheck_factory.cc
-index 9d94c21..990046f 100644
+index 9d94c21c4201..990046f0a8bf 100644
 --- chrome/browser/spellchecker/spellcheck_factory.cc
 +++ chrome/browser/spellchecker/spellcheck_factory.cc
 @@ -17,6 +17,13 @@
@@ -26,7 +26,7 @@ index 9d94c21..990046f 100644
  
  SpellcheckServiceFactory::SpellcheckServiceFactory()
 diff --git chrome/browser/spellchecker/spellcheck_factory.h chrome/browser/spellchecker/spellcheck_factory.h
-index e8eb9f7..2e1b7cf 100644
+index e8eb9f7e8aa6..2e1b7cf84081 100644
 --- chrome/browser/spellchecker/spellcheck_factory.h
 +++ chrome/browser/spellchecker/spellcheck_factory.h
 @@ -7,7 +7,7 @@
@@ -48,7 +48,7 @@ index e8eb9f7..2e1b7cf 100644
    SpellcheckServiceFactory();
    ~SpellcheckServiceFactory() override;
 diff --git chrome/browser/supervised_user/supervised_user_settings_service_factory.cc chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
-index 173ac31..473e561 100644
+index 173ac3132161..473e56161cca 100644
 --- chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
 +++ chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
 @@ -9,6 +9,13 @@
@@ -75,7 +75,7 @@ index 173ac31..473e561 100644
  
  SupervisedUserSettingsServiceFactory::SupervisedUserSettingsServiceFactory()
 diff --git chrome/browser/supervised_user/supervised_user_settings_service_factory.h chrome/browser/supervised_user/supervised_user_settings_service_factory.h
-index 2907619..f941fba 100644
+index 2907619549ba..f941fba363b5 100644
 --- chrome/browser/supervised_user/supervised_user_settings_service_factory.h
 +++ chrome/browser/supervised_user/supervised_user_settings_service_factory.h
 @@ -5,7 +5,7 @@
@@ -97,7 +97,7 @@ index 2907619..f941fba 100644
  
    SupervisedUserSettingsServiceFactory();
 diff --git chrome/browser/ui/prefs/prefs_tab_helper.cc chrome/browser/ui/prefs/prefs_tab_helper.cc
-index 175e4db..e5361c5 100644
+index 175e4db36ae2..e5361c596b17 100644
 --- chrome/browser/ui/prefs/prefs_tab_helper.cc
 +++ chrome/browser/ui/prefs/prefs_tab_helper.cc
 @@ -11,8 +11,8 @@

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 8667ae7..8418e52 100644
+index 8667ae76348b..8418e52b710f 100644
 --- services/service_manager/embedder/main.cc
 +++ services/service_manager/embedder/main.cc
 @@ -325,13 +325,30 @@ int RunService(MainDelegate* delegate) {
@@ -136,7 +136,7 @@ index 8667ae7..8418e52 100644
  }
  
 diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h
-index e86697a..771acd8 100644
+index e86697a26d0f..771acd80a3e1 100644
 --- services/service_manager/embedder/main.h
 +++ services/service_manager/embedder/main.h
 @@ -5,9 +5,15 @@
@@ -178,7 +178,7 @@ index e86697a..771acd8 100644
  }  // namespace service_manager
  
 diff --git services/service_manager/embedder/set_process_title.cc services/service_manager/embedder/set_process_title.cc
-index 80b9a0a..5162354 100644
+index 80b9a0ab2ffc..5162354006b0 100644
 --- services/service_manager/embedder/set_process_title.cc
 +++ services/service_manager/embedder/set_process_title.cc
 @@ -44,7 +44,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {

patch/patches/storage_partition_1973.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
-index e9ad038..2a10c80 100644
+index e9ad038d9f8f..2a10c80a2f03 100644
 --- content/browser/appcache/appcache_internals_ui.cc
 +++ content/browser/appcache/appcache_internals_ui.cc
 @@ -369,8 +369,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
@@ -14,7 +14,7 @@ index e9ad038..2a10c80 100644
  }
  
 diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
-index 92a2e89..e4cacfe 100644
+index 92a2e8941c0f..e4cacfed1952 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.cc
 +++ content/browser/blob_storage/chrome_blob_storage_context.cc
 @@ -76,6 +76,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -30,7 +30,7 @@ index 92a2e89..e4cacfe 100644
      BrowserContext* context) {
    if (!context->GetUserData(kBlobStorageContextKeyName)) {
 diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
-index ad4a2a2..7c4212c 100644
+index ad4a2a2c58a5..7c4212c63b69 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.h
 +++ content/browser/blob_storage/chrome_blob_storage_context.h
 @@ -45,6 +45,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -42,7 +42,7 @@ index ad4a2a2..7c4212c 100644
        BrowserContext* browser_context);
  
 diff --git content/browser/bluetooth/web_bluetooth_service_impl.cc content/browser/bluetooth/web_bluetooth_service_impl.cc
-index 36d4ea7..f696c5b 100644
+index 36d4ea7d63ac..f696c5be0d8f 100644
 --- content/browser/bluetooth/web_bluetooth_service_impl.cc
 +++ content/browser/bluetooth/web_bluetooth_service_impl.cc
 @@ -1194,9 +1194,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
@@ -58,7 +58,7 @@ index 36d4ea7..f696c5b 100644
        partition->GetBluetoothAllowedDevicesMap();
    return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index 0f23bbe..b21982f 100644
+index 0f23bbece4ea..b21982f717b5 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
 @@ -125,7 +125,14 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -90,7 +90,7 @@ index 0f23bbe..b21982f 100644
    CHECK(GetUserData(kMojoWasInitialized))
        << "Attempting to destroy a BrowserContext that never called "
 diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc
-index 31abe59..849745c 100644
+index 31abe59123ef..849745cd5403 100644
 --- content/browser/devtools/protocol/service_worker_handler.cc
 +++ content/browser/devtools/protocol/service_worker_handler.cc
 @@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
@@ -107,7 +107,7 @@ index 31abe59..849745c 100644
  
    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
 diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
-index f32156a..c2373f8 100644
+index f32156a4074b..c2373f84c2c2 100644
 --- content/browser/loader/navigation_url_loader_network_service.cc
 +++ content/browser/loader/navigation_url_loader_network_service.cc
 @@ -196,8 +196,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -122,7 +122,7 @@ index f32156a..c2373f8 100644
                              request_info_->frame_tree_node_id),
                   base::Passed(std::move(loader_associated_request)),
 diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
-index 73f3cba..55d488b 100644
+index 73f3cbac6682..55d488b0f3aa 100644
 --- content/browser/payments/payment_app_provider_impl.cc
 +++ content/browser/payments/payment_app_provider_impl.cc
 @@ -153,8 +153,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -152,7 +152,7 @@ index 73f3cba..55d488b 100644
    BrowserThread::PostTask(
        BrowserThread::IO, FROM_HERE,
 diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
-index 7db804c..4ce5bcf 100644
+index 7db804cc0fc2..4ce5bcf80f74 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -483,7 +483,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -358,7 +358,7 @@ index 7db804c..4ce5bcf 100644
            browser_context, partition, is_for_guests_only);
      }
 diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
-index 861012f..5221a19 100644
+index 861012ff196a..5221a19d70da 100644
 --- content/browser/renderer_host/render_process_host_impl.h
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -81,7 +81,6 @@ class RenderWidgetHostImpl;
@@ -392,7 +392,7 @@ index 861012f..5221a19 100644
    // The observers watching our lifetime.
    base::ObserverList<RenderProcessHostObserver> observers_;
 diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
-index 58a6de1..4835648 100644
+index 58a6de1bd4f7..48356486831e 100644
 --- content/browser/storage_partition_impl.h
 +++ content/browser/storage_partition_impl.h
 @@ -110,12 +110,11 @@ class CONTENT_EXPORT  StoragePartitionImpl
@@ -440,7 +440,7 @@ index 58a6de1..4835648 100644
    struct DataDeletionHelper;
    struct QuotaManagedDataDeletionHelper;
 diff --git content/browser/streams/stream_context.cc content/browser/streams/stream_context.cc
-index 22e3c06..883114d 100644
+index 22e3c0620c74..883114d11e42 100644
 --- content/browser/streams/stream_context.cc
 +++ content/browser/streams/stream_context.cc
 @@ -22,6 +22,11 @@ namespace content {
@@ -456,7 +456,7 @@ index 22e3c06..883114d 100644
    if (!context->GetUserData(kStreamContextKeyName)) {
      scoped_refptr<StreamContext> stream = new StreamContext();
 diff --git content/browser/streams/stream_context.h content/browser/streams/stream_context.h
-index 075ae3e..57fb5fd 100644
+index 075ae3e7431e..57fb5fd2c4a8 100644
 --- content/browser/streams/stream_context.h
 +++ content/browser/streams/stream_context.h
 @@ -29,6 +29,7 @@ class StreamContext
@@ -468,7 +468,7 @@ index 075ae3e..57fb5fd 100644
  
    void InitializeOnIOThread();
 diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc
-index e85627c..3f55353 100644
+index e85627cb907a..3f55353b2f9b 100644
 --- content/browser/webui/web_ui_url_loader_factory.cc
 +++ content/browser/webui/web_ui_url_loader_factory.cc
 @@ -18,7 +18,6 @@
@@ -508,7 +508,7 @@ index e85627c..3f55353 100644
  
    DISALLOW_COPY_AND_ASSIGN(WebUIURLLoaderFactory);
 diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
-index 7a895f2..687da7c 100644
+index 7a895f23a7d3..687da7ce0aba 100644
 --- content/public/browser/browser_context.h
 +++ content/public/browser/browser_context.h
 @@ -185,6 +185,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -536,7 +536,7 @@ index 7a895f2..687da7c 100644
  
    // Registers per-browser-context services to be loaded in the browser process
 diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
-index 60e5c7d..14f50b3 100644
+index 60e5c7dc3574..14f50b3475fa 100644
 --- content/public/browser/storage_partition.h
 +++ content/public/browser/storage_partition.h
 @@ -13,6 +13,7 @@

patch/patches/supports_user_data_1710.patch

@@ -1,5 +1,5 @@
 diff --git base/supports_user_data.h base/supports_user_data.h
-index 56522e2..b945297 100644
+index 56522e263932..b9452972674d 100644
 --- base/supports_user_data.h
 +++ base/supports_user_data.h
 @@ -37,9 +37,9 @@ class BASE_EXPORT SupportsUserData {

patch/patches/swiftshader_729532.patch

@@ -1,5 +1,5 @@
 diff --git BUILD.gn BUILD.gn
-index 694942a..52a78e8 100644
+index 694942a7..52a78e89 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -12,6 +12,8 @@

patch/patches/ui_dragdrop_355390.patch

@@ -1,5 +1,5 @@
 diff --git ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
-index 2e4b975..d0cb122 100644
+index 2e4b975ec3d5..d0cb122970b6 100644
 --- ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
 +++ ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
 @@ -162,7 +162,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,

patch/patches/underlay_1051.patch

@@ -1,5 +1,5 @@
 diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h
-index d673c31..806d134 100644
+index d673c31a0f31..806d1341567b 100644
 --- ui/base/cocoa/underlay_opengl_hosting_window.h
 +++ ui/base/cocoa/underlay_opengl_hosting_window.h
 @@ -12,7 +12,7 @@

patch/patches/views_1749_2102.patch

@@ -1,5 +1,5 @@
 diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
-index 0755f27..0322b8c 100644
+index 0755f2752f1d..0322b8c638e7 100644
 --- ui/base/models/menu_model.h
 +++ ui/base/models/menu_model.h
 @@ -15,6 +15,7 @@
@@ -39,7 +39,7 @@ index 0755f27..0322b8c 100644
    virtual void MenuWillShow() {}
  
 diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
-index 97b6c8f..84b9387 100644
+index 97b6c8fb82f3..84b93871c95d 100644
 --- ui/gfx/render_text.cc
 +++ ui/gfx/render_text.cc
 @@ -567,6 +567,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
@@ -78,7 +78,7 @@ index 97b6c8f..84b9387 100644
  }
  
 diff --git ui/gfx/render_text.h ui/gfx/render_text.h
-index 00fe00c..bc4fd59 100644
+index 00fe00c8e734..bc4fd59abcf4 100644
 --- ui/gfx/render_text.h
 +++ ui/gfx/render_text.h
 @@ -312,6 +312,10 @@ class GFX_EXPORT RenderText {
@@ -102,7 +102,7 @@ index 00fe00c..bc4fd59 100644
  };
  
 diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
-index 68e5b60..3861921 100644
+index 68e5b60b90ed..386192193f4f 100644
 --- ui/views/animation/ink_drop_host_view.h
 +++ ui/views/animation/ink_drop_host_view.h
 @@ -130,6 +130,8 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
@@ -115,7 +115,7 @@ index 68e5b60..3861921 100644
    class InkDropGestureHandler;
    friend class InkDropGestureHandler;
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index f049ca8..631fd16 100644
+index f049ca8a057d..631fd1638704 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
 @@ -192,6 +192,7 @@ gfx::Size LabelButton::CalculatePreferredSize() const {
@@ -140,7 +140,7 @@ index f049ca8..631fd16 100644
    const gfx::Size previous_image_size(image_->GetPreferredSize());
    UpdateImage();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index a608594..fadd999 100644
+index a608594ca51a..fadd999ec6fc 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
 @@ -109,6 +109,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
@@ -154,7 +154,7 @@ index a608594..fadd999 100644
    ImageView* image() const { return image_; }
    Label* label() const { return label_; }
 diff --git ui/views/controls/button/menu_button.cc ui/views/controls/button/menu_button.cc
-index 74188e4..541397e 100644
+index 74188e44dc53..541397e473fc 100644
 --- ui/views/controls/button/menu_button.cc
 +++ ui/views/controls/button/menu_button.cc
 @@ -194,7 +194,7 @@ void MenuButton::OnPaint(gfx::Canvas* canvas) {
@@ -187,7 +187,7 @@ index 74188e4..541397e 100644
 +
  }  // namespace views
 diff --git ui/views/controls/button/menu_button.h ui/views/controls/button/menu_button.h
-index 0d4af71..6c70762 100644
+index 0d4af712d404..6c70762739e3 100644
 --- ui/views/controls/button/menu_button.h
 +++ ui/views/controls/button/menu_button.h
 @@ -57,6 +57,9 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
@@ -211,7 +211,7 @@ index 0d4af71..6c70762 100644
    // The time is used for simulating menu behavior for the menu button; that
    // is, if the menu is shown and the button is pressed, we need to close the
 diff --git ui/views/controls/label.cc ui/views/controls/label.cc
-index c5e3fc5..753bbf5 100644
+index c5e3fc5e4d6f..753bbf501a17 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
 @@ -26,6 +26,7 @@
@@ -281,7 +281,7 @@ index c5e3fc5..753bbf5 100644
  }
  
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index 0881558..be413f3 100644
+index 0881558cacb2..be413f3420c2 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
 @@ -144,6 +144,10 @@ class VIEWS_EXPORT Label : public View,
@@ -304,7 +304,7 @@ index 0881558..be413f3 100644
    // TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is
    // closed.
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index 7c44dd17..2da694b 100644
+index 7c44dd17258f..2da694b8b49b 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
 @@ -2259,8 +2259,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -335,7 +335,7 @@ index 7c44dd17..2da694b 100644
      SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
    else if (item->GetParentMenuItem()->GetParentMenuItem())
 diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
-index 4dea63f..ef50b71 100644
+index 4dea63f9f286..ef50b710c5af 100644
 --- ui/views/controls/menu/menu_delegate.h
 +++ ui/views/controls/menu/menu_delegate.h
 @@ -10,6 +10,7 @@
@@ -382,7 +382,7 @@ index 4dea63f..ef50b71 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 5b15552..5c0fdbe 100644
+index 5b15552fc8fc..5c0fdbe7c128 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
 @@ -761,7 +761,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
@@ -414,7 +414,7 @@ index 5b15552..5c0fdbe 100644
        minor ? ui::NativeTheme::kColorId_MenuItemSubtitleColor
              : ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor;
 diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
-index 06a9d3c..c602a13 100644
+index 06a9d3cfda9b..c602a13efd6a 100644
 --- ui/views/controls/menu/menu_model_adapter.cc
 +++ ui/views/controls/menu/menu_model_adapter.cc
 @@ -245,6 +245,77 @@ void MenuModelAdapter::SelectionChanged(MenuItemView* menu) {
@@ -496,7 +496,7 @@ index 06a9d3c..c602a13 100644
    // Look up the menu model for this menu.
    const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
 diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
-index 0ac493c..741769e 100644
+index 0ac493c3c6a0..741769e90eb0 100644
 --- ui/views/controls/menu/menu_model_adapter.h
 +++ ui/views/controls/menu/menu_model_adapter.h
 @@ -76,6 +76,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {
@@ -521,7 +521,7 @@ index 0ac493c..741769e 100644
    void WillHideMenu(MenuItemView* menu) override;
    void OnMenuClosed(MenuItemView* menu) override;
 diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
-index a0a74eb..cf2044b 100644
+index a0a74eb97e8e..cf2044ba2b9b 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
 @@ -184,6 +184,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -537,7 +537,7 @@ index a0a74eb..cf2044b 100644
        content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
  
 diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc
-index 117a268..6065c73 100644
+index 117a268df4d5..6065c73fd230 100644
 --- ui/views/test/ui_controls_factory_desktop_aurax11.cc
 +++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
 @@ -146,10 +146,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
@@ -552,7 +552,7 @@ index 117a268..6065c73 100644
        // Move the cursor because EnterNotify/LeaveNotify are generated with the
        // current mouse position as a result of XGrabPointer()
 diff --git ui/views/view.h ui/views/view.h
-index 9c78e19..8e03434 100644
+index 9c78e1967ce6..8e034342e3c9 100644
 --- ui/views/view.h
 +++ ui/views/view.h
 @@ -18,6 +18,7 @@

patch/patches/views_widget_180_1481_1565_1677_1749.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index 98460d7..ffbfa04f 100644
+index 98460d7a89e9..ffbfa04f40b6 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
 @@ -298,6 +298,14 @@ void RenderWidgetHostViewBase::FocusedNodeTouched(
@@ -18,7 +18,7 @@ index 98460d7..ffbfa04f 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 fd1e999..0e794a9 100644
+index fd1e9993179c..0e794a902fdd 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
 @@ -72,6 +72,7 @@ class BrowserAccessibilityDelegate;
@@ -73,7 +73,7 @@ index fd1e999..0e794a9 100644
    gfx::Rect current_display_area_;
  
 diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
-index 0401ce6..99e85e9 100644
+index 0401ce699cc8..99e85e908805 100644
 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
 @@ -28,6 +28,10 @@
@@ -87,10 +87,11 @@ index 0401ce6..99e85e9 100644
  #if defined(OS_WIN)
  #include "content/browser/frame_host/render_frame_host_impl.h"
  #include "content/public/common/context_menu_params.h"
-@@ -847,6 +851,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
+@@ -846,6 +850,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
+         ::SetFocus(hwnd);
      }
    }
- #endif
++#endif
 +#if defined(OS_LINUX)
 +  if (host_view_->HasExternalParent() &&
 +      window_ && window_->delegate()->CanFocus()) {
@@ -98,12 +99,11 @@ index 0401ce6..99e85e9 100644
 +    if (host)
 +      host->Show();
 +  }
-+#endif
+ #endif
    // TODO(wjmaclean): can host_ ever be null?
    if (host_ && set_focus_on_mouse_down_or_key_event_) {
-     set_focus_on_mouse_down_or_key_event_ = false;
 diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
-index e295ef2..dcce231 100644
+index e295ef252fab..dcce231ad71b 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
 @@ -234,6 +234,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -122,7 +122,7 @@ index e295ef2..dcce231 100644
    // Return the accelerated widget which hosts the CALayers that draw the
    // content of the view in GetNativeView. This may be null.
 diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
-index f772f64..7d13f9f 100644
+index f772f64d656e..7d13f9f81b6c 100644
 --- ui/views/widget/desktop_aura/desktop_screen_win.cc
 +++ ui/views/widget/desktop_aura/desktop_screen_win.cc
 @@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(
@@ -135,7 +135,7 @@ index f772f64..7d13f9f 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 e99be28..4d3fec5 100644
+index e99be28d8785..4d3fec5bda8d 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -85,6 +85,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@@ -179,7 +179,7 @@ index e99be28..4d3fec5 100644
  
  bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 12d0616..ec5742a 100644
+index 12d061646707..ec5742a366f7 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 @@ -256,6 +256,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -194,7 +194,7 @@ index 12d0616..ec5742a 100644
    // a reference.
    corewm::TooltipWin* tooltip_;
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
-index a501112..04645cd 100644
+index a5011125472d..04645cdd25f2 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 @@ -198,6 +198,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -279,7 +279,7 @@ index a501112..04645cd 100644
      case FocusOut:
        OnFocusEvent(xev->type == FocusIn, event->xfocus.mode,
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
-index 757b780..45d57ae 100644
+index 757b7808e08c..45d57ae57988 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 @@ -87,6 +87,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -327,7 +327,7 @@ index 757b780..45d57ae 100644
    base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_;
  
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index fbce29e..0538a4c 100644
+index fbce29ee69aa..0538a4c1ee4f 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
 @@ -131,6 +131,7 @@ Widget::InitParams::InitParams(Type type)
@@ -362,7 +362,7 @@ index fbce29e..0538a4c 100644
    // This must come after SetContentsView() or it might not be able to find
    // the correct NativeTheme (on Linux). See http://crbug.com/384492
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index 63fcb9d..7237ae6 100644
+index 63fcb9d611e8..7237ae60007f 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
 @@ -253,6 +253,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -374,7 +374,7 @@ index 63fcb9d..7237ae6 100644
      // the NativeWidget may specify a default size. If the parent is specified,
      // |bounds| is in the parent's coordinate system. If the parent is not
 diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
-index 3c67457..e34a9a6 100644
+index 3c67457a6421..e34a9a6b9f41 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
 @@ -2670,8 +2670,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,

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 1dd2465..5e77e8c 100644
+index 1dd24658e82f..5e77e8c29fb0 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
 @@ -1692,6 +1692,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -58,7 +58,7 @@ index 1dd2465..5e77e8c 100644
    // Now that the RenderView has been created, we need to tell it its size.
    if (rwh_view)
 diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
-index fa0afb5..d677b31 100644
+index fa0afb545df9..d677b310e5ec 100644
 --- content/public/browser/web_contents.cc
 +++ content/public/browser/web_contents.cc
 @@ -29,7 +29,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
@@ -73,7 +73,7 @@ index fa0afb5..d677b31 100644
  
  WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index 930880c..41ba462 100644
+index 930880ca54f8..41ba4622b203 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
 @@ -67,9 +67,11 @@ class PageState;
@@ -100,7 +100,7 @@ index 930880c..41ba462 100644
  
    // Creates a new WebContents.
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index 9176c4b..7d73b9d 100644
+index 9176c4bcee6c..7d73b9decda2 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
 @@ -43,10 +43,12 @@ class ColorChooser;

patch/patches/webkit_plugin_info_2015.patch

@@ -1,5 +1,5 @@
 diff --git third_party/WebKit/Source/core/dom/DOMImplementation.cpp third_party/WebKit/Source/core/dom/DOMImplementation.cpp
-index 372b21d..78107f3 100644
+index 372b21d40782..78107f391847 100644
 --- third_party/WebKit/Source/core/dom/DOMImplementation.cpp
 +++ third_party/WebKit/Source/core/dom/DOMImplementation.cpp
 @@ -242,10 +242,11 @@ Document* DOMImplementation::createDocument(const String& type,
@@ -17,7 +17,7 @@ index 372b21d..78107f3 100644
                                                          .Top()
                                                          .GetSecurityContext()
 diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
-index 97a5393..21da4ee 100644
+index 97a5393d40b4..21da4ee7d27c 100644
 --- third_party/WebKit/Source/core/frame/LocalFrame.cpp
 +++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
 @@ -930,7 +930,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -30,7 +30,7 @@ index 97a5393..21da4ee 100644
  }
  
 diff --git third_party/WebKit/Source/core/page/Page.cpp third_party/WebKit/Source/core/page/Page.cpp
-index 6dc4b21..41d56b5 100644
+index 6dc4b2180bc2..41d56b50887b 100644
 --- third_party/WebKit/Source/core/page/Page.cpp
 +++ third_party/WebKit/Source/core/page/Page.cpp
 @@ -289,16 +289,30 @@ void Page::RefreshPlugins() {
@@ -72,7 +72,7 @@ index 6dc4b21..41d56b5 100644
  
  void Page::SetValidationMessageClient(ValidationMessageClient* client) {
 diff --git third_party/WebKit/Source/core/page/Page.h third_party/WebKit/Source/core/page/Page.h
-index e644faa..2fe0d37 100644
+index e644faaeae13..2fe0d37974c9 100644
 --- third_party/WebKit/Source/core/page/Page.h
 +++ third_party/WebKit/Source/core/page/Page.h
 @@ -132,7 +132,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -96,7 +96,7 @@ index e644faa..2fe0d37 100644
    EditorClient* const editor_client_;
    SpellCheckerClient* const spell_checker_client_;
 diff --git third_party/WebKit/Source/platform/plugins/PluginData.cpp third_party/WebKit/Source/platform/plugins/PluginData.cpp
-index 03618f6..5ac59e8 100644
+index 03618f6a3d96..5ac59e858c9d 100644
 --- third_party/WebKit/Source/platform/plugins/PluginData.cpp
 +++ third_party/WebKit/Source/platform/plugins/PluginData.cpp
 @@ -30,11 +30,12 @@
@@ -126,7 +126,7 @@ index 03618f6..5ac59e8 100644
  }
  
 diff --git third_party/WebKit/Source/platform/plugins/PluginData.h third_party/WebKit/Source/platform/plugins/PluginData.h
-index cdf3381..671f17c 100644
+index cdf3381cedec..671f17c752a1 100644
 --- third_party/WebKit/Source/platform/plugins/PluginData.h
 +++ third_party/WebKit/Source/platform/plugins/PluginData.h
 @@ -52,8 +52,9 @@ class PLATFORM_EXPORT PluginData : public RefCounted<PluginData> {
@@ -157,7 +157,7 @@ index cdf3381..671f17c 100644
  };
  
 diff --git third_party/WebKit/public/platform/Platform.h third_party/WebKit/public/platform/Platform.h
-index f7360bf6..f7599cc 100644
+index f7360bf6cb93..f7599ccd143c 100644
 --- third_party/WebKit/public/platform/Platform.h
 +++ third_party/WebKit/public/platform/Platform.h
 @@ -363,6 +363,7 @@ class BLINK_PLATFORM_EXPORT Platform {

patch/patches/webkit_popups.patch

@@ -1,5 +1,5 @@
 diff --git third_party/WebKit/Source/core/exported/WebViewBase.h third_party/WebKit/Source/core/exported/WebViewBase.h
-index ed45829..a43bd1e 100644
+index ed4582968a2c..a43bd1e3fac5 100644
 --- third_party/WebKit/Source/core/exported/WebViewBase.h
 +++ third_party/WebKit/Source/core/exported/WebViewBase.h
 @@ -151,7 +151,7 @@ class WebViewBase : public WebView, public RefCounted<WebViewBase> {
@@ -12,7 +12,7 @@ index ed45829..a43bd1e 100644
    virtual GraphicsLayer* RootGraphicsLayer() = 0;
    virtual void RegisterViewportLayersWithCompositor() = 0;
 diff --git third_party/WebKit/Source/web/ChromeClientImpl.cpp third_party/WebKit/Source/web/ChromeClientImpl.cpp
-index 9ff6994..d310a87 100644
+index 9ff6994c1267..d310a8750cb3 100644
 --- third_party/WebKit/Source/web/ChromeClientImpl.cpp
 +++ third_party/WebKit/Source/web/ChromeClientImpl.cpp
 @@ -928,7 +928,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
@@ -25,7 +25,7 @@ index 9ff6994..d310a87 100644
  
    DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
 diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp
-index 3e58637..6d89fa1 100644
+index 3e586378a0d6..6d89fa162e84 100644
 --- third_party/WebKit/Source/web/WebViewImpl.cpp
 +++ third_party/WebKit/Source/web/WebViewImpl.cpp
 @@ -354,6 +354,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -55,7 +55,7 @@ index 3e58637..6d89fa1 100644
  
  void WebViewImpl::SetBackgroundColorOverride(WebColor color) {
 diff --git third_party/WebKit/Source/web/WebViewImpl.h third_party/WebKit/Source/web/WebViewImpl.h
-index 591da9f..df2c787 100644
+index 591da9f40545..df2c787f935b 100644
 --- third_party/WebKit/Source/web/WebViewImpl.h
 +++ third_party/WebKit/Source/web/WebViewImpl.h
 @@ -357,7 +357,8 @@ class WEB_EXPORT WebViewImpl final
@@ -78,7 +78,7 @@ index 591da9f..df2c787 100644
    TransformationMatrix device_emulation_transform_;
  
 diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h
-index e790df6..4e57f29 100644
+index e790df6eb89b..4e57f29f2883 100644
 --- third_party/WebKit/public/web/WebView.h
 +++ third_party/WebKit/public/web/WebView.h
 @@ -398,6 +398,7 @@ class WebView : protected WebWidget {

patch/patches/webui_2037.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/webui/net_internals/net_internals_ui.cc chrome/browser/ui/webui/net_internals/net_internals_ui.cc
-index 2fa6e2a..f7bb035 100644
+index 2fa6e2ae7576..f7bb03539496 100644
 --- chrome/browser/ui/webui/net_internals/net_internals_ui.cc
 +++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc
 @@ -526,8 +526,7 @@ void NetInternalsMessageHandler::OnGetSessionNetworkStats(
@@ -47,7 +47,7 @@ index 2fa6e2a..f7bb035 100644
    // Add entries for ongoing network objects.
    CreateNetLogEntriesForActiveObjects(contexts, this);
 diff --git content/browser/resource_context_impl.cc content/browser/resource_context_impl.cc
-index 141a083..b16b4d6 100644
+index 141a08305332..b16b4d61988d 100644
 --- content/browser/resource_context_impl.cc
 +++ content/browser/resource_context_impl.cc
 @@ -58,6 +58,10 @@ URLDataManagerBackend* GetURLDataManagerForResourceContext(
@@ -62,7 +62,7 @@ index 141a083..b16b4d6 100644
    ResourceContext* resource_context = browser_context->GetResourceContext();
  
 diff --git content/browser/resource_context_impl.h content/browser/resource_context_impl.h
-index 903cc54..56ee4ea 100644
+index 903cc543a242..56ee4ea7bfb4 100644
 --- content/browser/resource_context_impl.h
 +++ content/browser/resource_context_impl.h
 @@ -28,6 +28,8 @@ CONTENT_EXPORT StreamContext* GetStreamContextForResourceContext(
@@ -75,23 +75,23 @@ index 903cc54..56ee4ea 100644
  CONTENT_EXPORT void InitializeResourceContext(BrowserContext* browser_context);
  
 diff --git content/browser/webui/url_data_manager.cc content/browser/webui/url_data_manager.cc
-index 5681ff5..7d96c24 100644
+index 5681ff549fd4..7d96c24fab2f 100644
 --- content/browser/webui/url_data_manager.cc
 +++ content/browser/webui/url_data_manager.cc
-@@ -153,6 +153,11 @@ void URLDataManager::UpdateWebUIDataSource(
+@@ -152,6 +152,11 @@ void URLDataManager::UpdateWebUIDataSource(
+       ->UpdateWebUIDataSource(source_name, std::move(update));
  }
  
- // static
++// static
 +const void* URLDataManager::GetUserDataKey() {
 +  return kURLDataManagerKeyName;
 +}
 +
-+// static
+ // static
  bool URLDataManager::IsScheduledForDeletion(
      const URLDataSourceImpl* data_source) {
-   base::AutoLock lock(g_delete_lock.Get());
 diff --git content/browser/webui/url_data_manager.h content/browser/webui/url_data_manager.h
-index 5ceb74d..0c584d6 100644
+index 5ceb74d411fc..0c584d6e69b5 100644
 --- content/browser/webui/url_data_manager.h
 +++ content/browser/webui/url_data_manager.h
 @@ -69,6 +69,8 @@ class CONTENT_EXPORT URLDataManager : public base::SupportsUserData::Data {

patch/patches/webview_plugin_2020.patch

@@ -1,5 +1,5 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index c79a92e..e619f31 100644
+index c79a92e22949..e619f312b701 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
 @@ -5158,7 +5158,7 @@ Keep your key file in a safe place. You will need it to create new versions of y

patch/patches/zlib.patch

@@ -1,5 +1,5 @@
 diff --git third_party/zlib/contrib/minizip/unzip.c third_party/zlib/contrib/minizip/unzip.c
-index 199b472..be42478 100644
+index 199b4723fcfc..be424783fece 100644
 --- third_party/zlib/contrib/minizip/unzip.c
 +++ third_party/zlib/contrib/minizip/unzip.c
 @@ -69,7 +69,7 @@