Add "win-rt-app" command-line flag to disable MITIGATION_STRICT_HANDLE_CHECKS

and avoid sandboxed renderer process crash in WinRT apps (issue #2274)

CHROMIUM_BUILD_COMPATIBILITY.txt

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

libcef/browser/browser_urlrequest_impl.cc

@@ -14,6 +14,7 @@
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/response_impl.h"
+#include "libcef/common/task_runner_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -75,7 +76,7 @@ class CefURLFetcherResponseWriter : public net::URLFetcherResponseWriter {
           base::Bind(&CefURLFetcherResponseWriter::WriteOnClientThread,
                      url_request_, scoped_refptr<net::IOBuffer>(buffer),
                      num_bytes, callback,
-                     base::MessageLoop::current()->task_runner()));
+                     CefTaskRunnerImpl::GetCurrentTaskRunner()));
       return net::ERR_IO_PENDING;
     }
     return num_bytes;
@@ -135,7 +136,7 @@ class CefBrowserURLRequest::Context
         request_(request),
         client_(client),
         request_context_(request_context),
-        task_runner_(base::MessageLoop::current()->task_runner()),
+        task_runner_(CefTaskRunnerImpl::GetCurrentTaskRunner()),
         status_(UR_IO_PENDING),
         error_code_(ERR_NONE),
         upload_data_size_(0),
@@ -391,7 +392,7 @@ CefURLFetcherDelegate::~CefURLFetcherDelegate() {}
 void CefURLFetcherDelegate::OnURLFetchComplete(const net::URLFetcher* source) {
   // Complete asynchronously so as not to delete the URLFetcher while it's still
   // in the call stack.
-  base::MessageLoop::current()->task_runner()->PostTask(
+  CefTaskRunnerImpl::GetCurrentTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CefBrowserURLRequest::Context::OnComplete, context_));
 }

libcef/browser/cookie_manager_impl.cc

@@ -11,6 +11,7 @@
 #include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/net/network_delegate.h"
+#include "libcef/common/task_runner_impl.h"
 #include "libcef/common/time_util.h"
 
 #include "base/bind.h"
@@ -144,7 +145,7 @@ void CefCookieManagerImpl::GetCookieStore(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     const CookieStoreCallback& callback) {
   if (!task_runner.get())
-    task_runner = base::MessageLoop::current()->task_runner();
+    task_runner = CefTaskRunnerImpl::GetCurrentTaskRunner();
 
   if (!CEF_CURRENTLY_ON_IOT()) {
     CEF_POST_TASK(CEF_IOT, base::Bind(&CefCookieManagerImpl::GetCookieStore,

libcef/browser/menu_model_impl.cc

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "libcef/browser/thread_util.h"
+#include "libcef/common/task_runner_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -793,7 +794,7 @@ void CefMenuModelImpl::MouseOutsideMenu(const gfx::Point& screen_point) {
 
   // Allow the callstack to unwind before notifying the delegate since it may
   // result in the menu being destroyed.
-  base::MessageLoop::current()->task_runner()->PostTask(
+  CefTaskRunnerImpl::GetCurrentTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CefMenuModelImpl::OnMouseOutsideMenu, this, screen_point));
 }
@@ -804,7 +805,7 @@ void CefMenuModelImpl::UnhandledOpenSubmenu(bool is_rtl) {
 
   // Allow the callstack to unwind before notifying the delegate since it may
   // result in the menu being destroyed.
-  base::MessageLoop::current()->task_runner()->PostTask(
+  CefTaskRunnerImpl::GetCurrentTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CefMenuModelImpl::OnUnhandledOpenSubmenu, this, is_rtl));
 }
@@ -815,7 +816,7 @@ void CefMenuModelImpl::UnhandledCloseSubmenu(bool is_rtl) {
 
   // Allow the callstack to unwind before notifying the delegate since it may
   // result in the menu being destroyed.
-  base::MessageLoop::current()->task_runner()->PostTask(
+  CefTaskRunnerImpl::GetCurrentTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CefMenuModelImpl::OnUnhandledCloseSubmenu, this, is_rtl));
 }
@@ -891,7 +892,7 @@ void CefMenuModelImpl::MenuWillClose() {
   // Due to how menus work on the different platforms, ActivatedAt will be
   // called after this.  It's more convenient for the delegate to be called
   // afterwards, though, so post a task.
-  base::MessageLoop::current()->task_runner()->PostTask(
+  CefTaskRunnerImpl::GetCurrentTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&CefMenuModelImpl::OnMenuClosed, this));
 }
 

libcef/browser/native/browser_platform_delegate_native_mac.mm

@@ -417,7 +417,7 @@ void CefBrowserPlatformDelegateNativeMac::TranslateWheelEvent(
   result.SetType(blink::WebInputEvent::kMouseWheel);
 
   static const double scrollbarPixelsPerCocoaTick = 40.0;
-  result.delta_y = deltaX;
+  result.delta_x = deltaX;
   result.delta_y = deltaY;
   result.wheel_ticks_x = deltaX / scrollbarPixelsPerCocoaTick;
   result.wheel_ticks_y = deltaY / scrollbarPixelsPerCocoaTick;

libcef/browser/native/browser_platform_delegate_native_win.cc

@@ -594,7 +594,7 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
       // Allow the close.
       break;
 
-    case WM_DESTROY:
+    case WM_NCDESTROY:
       if (platform_delegate) {
         // Clear the user data pointer.
         gfx::SetWindowUserData(hwnd, NULL);
@@ -604,7 +604,7 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
         // CreateHostWindow().
         browser->WindowDestroyed();
       }
-      return 0;
+      break;
 
     case WM_SIZE:
       if (platform_delegate && platform_delegate->window_widget_) {

libcef/browser/native/window_x11.cc

@@ -314,6 +314,16 @@ uint32_t CefWindowX11::DispatchEvent(const ui::PlatformEvent& event) {
           if (!browser_ || browser_->TryCloseBrowser()) {
             // Allow the close.
             XDestroyWindow(xdisplay_, xwindow_);
+
+            xwindow_ = None;
+
+            if (browser_.get()) {
+              // Force the browser to be destroyed and release the reference
+              // added in PlatformCreateWindow().
+              browser_->WindowDestroyed();
+            }
+
+            delete this;
           }
         } else if (protocol == gfx::GetAtom(kNetWMPing)) {
           XEvent reply_event = *xev;
@@ -327,17 +337,6 @@ uint32_t CefWindowX11::DispatchEvent(const ui::PlatformEvent& event) {
       }
       break;
     }
-    case DestroyNotify:
-      xwindow_ = None;
-
-      if (browser_.get()) {
-        // Force the browser to be destroyed and release the reference added
-        // in PlatformCreateWindow().
-        browser_->WindowDestroyed();
-      }
-
-      delete this;
-      break;
     case FocusIn:
       // This message is received first followed by a "_NET_ACTIVE_WINDOW"
       // message sent to the root window. When X11DesktopHandler handles the

libcef/browser/net/url_request_context_getter_impl.cc

@@ -30,6 +30,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/net_log/chrome_net_log.h"
+#include "components/network_session_configurator/browser/network_session_configurator.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ -381,6 +382,11 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
     network_session_context.net_log = io_state_->net_log_;
 
     net::HttpNetworkSession::Params network_session_params;
+    network_session_configurator::ParseCommandLineAndFieldTrials(
+        *base::CommandLine::ForCurrentProcess(),
+        false /* is_quic_force_disabled */,
+        CefContentClient::Get()->GetUserAgent() /* quic_user_agent_id */,
+        &network_session_params);
     network_session_params.ignore_certificate_errors =
         settings_.ignore_certificate_errors ? true : false;
 

libcef/browser/pepper/browser_pepper_host_factory.cc

@@ -6,10 +6,13 @@
 
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
 #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
 #include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
+#include "chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h"
+#include "chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/message_filter_host.h"
 #include "ppapi/host/ppapi_host.h"
@@ -38,6 +41,33 @@ std::unique_ptr<ResourceHost> CefBrowserPepperHostFactory::CreateResourceHost(
   if (!host_->IsValidInstance(instance))
     return nullptr;
 
+  // Private interfaces.
+  if (host_->GetPpapiHost()->permissions().HasPermission(
+          ppapi::PERMISSION_PRIVATE)) {
+    switch (message.type()) {
+      case PpapiHostMsg_Broker_Create::ID: {
+        scoped_refptr<ResourceMessageFilter> broker_filter(
+            new chrome::PepperBrokerMessageFilter(instance, host_));
+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
+            host_->GetPpapiHost(), instance, resource, broker_filter));
+      }
+      case PpapiHostMsg_PlatformVerification_Create::ID: {
+        scoped_refptr<ResourceMessageFilter> pv_filter(
+            new chrome::PepperPlatformVerificationMessageFilter(host_,
+                                                                instance));
+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
+            host_->GetPpapiHost(), instance, resource, pv_filter));
+      }
+      case PpapiHostMsg_OutputProtection_Create::ID: {
+        scoped_refptr<ResourceMessageFilter> output_protection_filter(
+            new chrome::PepperOutputProtectionMessageFilter(host_, instance));
+        return std::unique_ptr<ResourceHost>(
+            new MessageFilterHost(host_->GetPpapiHost(), instance, resource,
+                                  output_protection_filter));
+      }
+    }
+  }
+
   // Flash interfaces.
   if (host_->GetPpapiHost()->permissions().HasPermission(
           ppapi::PERMISSION_FLASH)) {

libcef/browser/request_context_impl.cc

@@ -9,6 +9,7 @@
 #include "libcef/browser/context.h"
 #include "libcef/browser/cookie_manager_impl.h"
 #include "libcef/browser/thread_util.h"
+#include "libcef/common/task_runner_impl.h"
 #include "libcef/common/values_impl.h"
 
 #include "base/atomic_sequence_num.h"
@@ -180,7 +181,7 @@ void CefRequestContextImpl::GetBrowserContext(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     const BrowserContextCallback& callback) {
   if (!task_runner.get())
-    task_runner = base::MessageLoop::current()->task_runner();
+    task_runner = CefTaskRunnerImpl::GetCurrentTaskRunner();
   GetBrowserContextOnUIThread(task_runner, callback);
 }
 
@@ -188,7 +189,7 @@ void CefRequestContextImpl::GetRequestContextImpl(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     const RequestContextCallback& callback) {
   if (!task_runner.get())
-    task_runner = base::MessageLoop::current()->task_runner();
+    task_runner = CefTaskRunnerImpl::GetCurrentTaskRunner();
   if (request_context_getter_impl_) {
     // The browser context already exists.
     DCHECK(browser_context());

libcef/common/crash_reporter_client.cc

@@ -476,8 +476,7 @@ void CefCrashReporterClient::InitializeCrashReportingForProcess() {
         !g_crash_reporter_client->HasCrashExternalHandler();
     if (embedded_handler) {
       crash_reporter::InitializeCrashpadWithEmbeddedHandler(
-          process_type.empty(), install_static::UTF16ToUTF8(process_type),
-          std::string());
+          process_type.empty(), install_static::UTF16ToUTF8(process_type));
     } else {
       crash_reporter::InitializeCrashpad(
           process_type.empty(), install_static::UTF16ToUTF8(process_type));

libcef/common/task_runner_impl.cc

@@ -19,7 +19,7 @@ using content::BrowserThread;
 
 // static
 CefRefPtr<CefTaskRunner> CefTaskRunner::GetForCurrentThread() {
-  scoped_refptr<base::SequencedTaskRunner> task_runner =
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       CefTaskRunnerImpl::GetCurrentTaskRunner();
   if (task_runner.get())
     return new CefTaskRunnerImpl(task_runner);
@@ -28,7 +28,7 @@ CefRefPtr<CefTaskRunner> CefTaskRunner::GetForCurrentThread() {
 
 // static
 CefRefPtr<CefTaskRunner> CefTaskRunner::GetForThread(CefThreadId threadId) {
-  scoped_refptr<base::SequencedTaskRunner> task_runner =
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       CefTaskRunnerImpl::GetTaskRunner(threadId);
   if (task_runner.get())
     return new CefTaskRunnerImpl(task_runner);
@@ -40,13 +40,13 @@ CefRefPtr<CefTaskRunner> CefTaskRunner::GetForThread(CefThreadId threadId) {
 // CefTaskRunnerImpl
 
 CefTaskRunnerImpl::CefTaskRunnerImpl(
-    scoped_refptr<base::SequencedTaskRunner> task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : task_runner_(task_runner) {
   DCHECK(task_runner_.get());
 }
 
 // static
-scoped_refptr<base::SequencedTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
+scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
     CefThreadId threadId) {
   // Render process.
   if (threadId == TID_RENDERER) {
@@ -95,9 +95,9 @@ scoped_refptr<base::SequencedTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
 }
 
 // static
-scoped_refptr<base::SequencedTaskRunner>
+scoped_refptr<base::SingleThreadTaskRunner>
 CefTaskRunnerImpl::GetCurrentTaskRunner() {
-  scoped_refptr<base::SequencedTaskRunner> task_runner;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner;
 
   // For named browser process threads return the same TaskRunner as
   // GetTaskRunner(). Otherwise BelongsToThread() will return incorrect results.
@@ -133,7 +133,7 @@ bool CefTaskRunnerImpl::BelongsToCurrentThread() {
 }
 
 bool CefTaskRunnerImpl::BelongsToThread(CefThreadId threadId) {
-  scoped_refptr<base::SequencedTaskRunner> task_runner =
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       GetTaskRunner(threadId);
   return (task_runner_ == task_runner);
 }

libcef/common/task_runner_impl.h

@@ -8,18 +8,18 @@
 
 #include "include/cef_task.h"
 
-#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 
 class CefTaskRunnerImpl : public CefTaskRunner {
  public:
   explicit CefTaskRunnerImpl(
-      scoped_refptr<base::SequencedTaskRunner> task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
   // Returns the task runner associated with |threadId|.
-  static scoped_refptr<base::SequencedTaskRunner> GetTaskRunner(
+  static scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner(
       CefThreadId threadId);
   // Returns the current task runner.
-  static scoped_refptr<base::SequencedTaskRunner> GetCurrentTaskRunner();
+  static scoped_refptr<base::SingleThreadTaskRunner> GetCurrentTaskRunner();
 
   // CefTaskRunner methods:
   bool IsSame(CefRefPtr<CefTaskRunner> that) override;
@@ -29,7 +29,7 @@ class CefTaskRunnerImpl : public CefTaskRunner {
   bool PostDelayedTask(CefRefPtr<CefTask> task, int64 delay_ms) override;
 
  private:
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   IMPLEMENT_REFCOUNTING(CefTaskRunnerImpl);
   DISALLOW_COPY_AND_ASSIGN(CefTaskRunnerImpl);

libcef/common/urlrequest_impl.cc

@@ -5,6 +5,7 @@
 #include "include/cef_urlrequest.h"
 #include "libcef/browser/browser_urlrequest_impl.h"
 #include "libcef/common/content_client.h"
+#include "libcef/common/task_runner_impl.h"
 #include "libcef/renderer/render_urlrequest_impl.h"
 
 #include "base/logging.h"
@@ -21,7 +22,7 @@ CefRefPtr<CefURLRequest> CefURLRequest::Create(
     return NULL;
   }
 
-  if (!base::MessageLoop::current()) {
+  if (!CefTaskRunnerImpl::GetCurrentTaskRunner()) {
     NOTREACHED() << "called on invalid thread";
     return NULL;
   }

libcef/renderer/content_renderer_client.cc

@@ -342,7 +342,7 @@ void CefContentRendererClient::DevToolsAgentDetached() {
   }
 }
 
-scoped_refptr<base::SequencedTaskRunner>
+scoped_refptr<base::SingleThreadTaskRunner>
 CefContentRendererClient::GetCurrentTaskRunner() {
   // Check if currently on the render thread.
   if (CEF_CURRENTLY_ON_RT())

libcef/renderer/content_renderer_client.h

@@ -66,7 +66,7 @@ class CefContentRendererClient : public content::ContentRendererClient,
   void OnGuestViewDestroyed(CefGuestView* guest_view);
 
   // Render thread task runner.
-  base::SequencedTaskRunner* render_task_runner() const {
+  base::SingleThreadTaskRunner* render_task_runner() const {
     return render_task_runner_.get();
   }
 
@@ -82,7 +82,7 @@ class CefContentRendererClient : public content::ContentRendererClient,
 
   // Returns the task runner for the current thread. Returns NULL if the current
   // thread is not the main render process thread.
-  scoped_refptr<base::SequencedTaskRunner> GetCurrentTaskRunner();
+  scoped_refptr<base::SingleThreadTaskRunner> GetCurrentTaskRunner();
 
   // Perform cleanup work that needs to occur before shutdown when running in
   // single-process mode. Blocks until cleanup is complete.
@@ -145,7 +145,7 @@ class CefContentRendererClient : public content::ContentRendererClient,
   // Perform cleanup work for single-process mode.
   void RunSingleProcessCleanupOnUIThread();
 
-  scoped_refptr<base::SequencedTaskRunner> render_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> render_task_runner_;
   std::unique_ptr<CefRenderThreadObserver> observer_;
   std::unique_ptr<web_cache::WebCacheImpl> web_cache_impl_;
   std::unique_ptr<SpellCheck> spellcheck_;

libcef/renderer/render_urlrequest_impl.cc

@@ -8,6 +8,7 @@
 
 #include "libcef/common/request_impl.h"
 #include "libcef/common/response_impl.h"
+#include "libcef/common/task_runner_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -72,7 +73,7 @@ class CefRenderURLRequest::Context
       : url_request_(url_request),
         request_(request),
         client_(client),
-        task_runner_(base::MessageLoop::current()->task_runner()),
+        task_runner_(CefTaskRunnerImpl::GetCurrentTaskRunner()),
         status_(UR_IO_PENDING),
         error_code_(ERR_NONE),
         upload_data_size_(0),

libcef/renderer/v8_impl.cc

@@ -152,7 +152,7 @@ class CefV8IsolateManager {
   }
 
   v8::Isolate* isolate() const { return isolate_; }
-  scoped_refptr<base::SequencedTaskRunner> task_runner() const {
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner() const {
     return task_runner_;
   }
 
@@ -162,7 +162,7 @@ class CefV8IsolateManager {
 
  private:
   v8::Isolate* isolate_;
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   typedef std::map<int, scoped_refptr<CefV8ContextState>> ContextMap;
   ContextMap context_map_;

libcef/renderer/v8_impl.h

@@ -14,7 +14,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "v8/include/v8.h"
 
 class CefTrackNode;
@@ -103,7 +103,7 @@ class CefV8HandleBase
   bool BelongsToCurrentThread() const;
 
   v8::Isolate* isolate() const { return isolate_; }
-  scoped_refptr<base::SequencedTaskRunner> task_runner() const {
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner() const {
     return task_runner_;
   }
 
@@ -120,7 +120,7 @@ class CefV8HandleBase
 
  protected:
   v8::Isolate* isolate_;
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   scoped_refptr<CefV8ContextState> context_state_;
 };
 

patch/patch.cfg

@@ -279,6 +279,9 @@ patches = [
   {
     # Fix white flash during browser creation.
     # https://bitbucket.org/chromiumembedded/cef/issues/1984
+    #
+    # Windows: Fix crash during window creation.
+    # https://bugs.chromium.org/p/chromium/issues/detail?id=761389
     'name': 'rwh_background_color_1984',
   },
   {
@@ -314,6 +317,14 @@ patches = [
   {
     # Linux: Fix build errors related to dependency versions.
     # https://chromium-review.googlesource.com/c/590271/
+    #
+    # Linux: Fix 32-bit build fails with ld.gold: internal error in
+    # get_section_contents, at icf.cc:467
+    # https://bitbucket.org/chromiumembedded/cef/issues/2256
+    #
+    # Linux: Fix undefined reference to
+    # safe_browsing::SettingsResetPromptController::ShowSettingsResetPrompt
+    # https://bitbucket.org/chromiumembedded/cef/issues/2240
     'name': 'linux_build',
   },
   {
@@ -323,8 +334,20 @@ patches = [
     'path': 'third_party/angle/',
   },
   {
-    # macOS: Add missing availability annotations for 10.12 SDK.
-    # https://bugs.chromium.org/p/chromium/issues/detail?id=747693
-    'name': 'mac_build_747693',
+    # Fix ERROR:service_manager.cc(158) Connection InterfaceProviderSpec
+    # prevented service: content_plugin from binding interface:
+    # memory_instrumentation::mojom::Coordinator exposed by: content_browser
+    # https://bugs.chromium.org/p/chromium/issues/detail?id=713806
+    'name': 'content_manifest_713806',
+  },
+  {
+    # Windows: Remove get_syzygy_binaries.py build action.
+    # https://bitbucket.org/chromiumembedded/cef/issues/2258
+    'name': 'DEPS',
+  },
+  {
+    # Don't enable sandbox::MITIGATION_STRICT_HANDLE_CHECKS in WinRT apps.
+    # https://bitbucket.org/chromiumembedded/cef/issues/2274
+    'name': 'win_rt_2274',
   },
 ]

patch/patches/DEPS.patch

@@ -0,0 +1,41 @@
+diff --git DEPS DEPS
+index 0139fde15203..c4c89809dfad 100644
+--- DEPS
++++ DEPS
+@@ -644,20 +644,22 @@ hooks = [
+     'name':
+       'drmemory'
+   },
+-  {
+-    'action': [
+-      'python',
+-      'src/build/get_syzygy_binaries.py',
+-      '--output-dir=src/third_party/syzygy/binaries',
+-      '--revision=190dbfe74c6f5b5913820fa66d9176877924d7c5',
+-      '--overwrite',
+-      '--copy-dia-binaries'
+-    ],
+-    'pattern':
+-      '.',
+-    'name':
+-      'syzygy-binaries'
+-  },
++  # This action fails on Windows builders, see
++  # https://bitbucket.org/chromiumembedded/cef/issues/2258
++  #{
++  #  'action': [
++  #    'python',
++  #    'src/build/get_syzygy_binaries.py',
++  #    '--output-dir=src/third_party/syzygy/binaries',
++  #    '--revision=190dbfe74c6f5b5913820fa66d9176877924d7c5',
++  #    '--overwrite',
++  #    '--copy-dia-binaries'
++  #  ],
++  #  'pattern':
++  #    '.',
++  #  'name':
++  #    'syzygy-binaries'
++  #},
+   {
+     'action': [
+       'python',

patch/patches/angle_697758.patch

@@ -1,5 +1,5 @@
 diff --git src/libGLESv2.gypi src/libGLESv2.gypi
-index e0167d7..937dda0 100644
+index e0167d7a6..937dda05c 100644
 --- src/libGLESv2.gypi
 +++ src/libGLESv2.gypi
 @@ -36,8 +36,6 @@

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 da3c2c7..93ed93d 100644
+index da3c2c764fab..93ed93d0e090 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.h
 +++ content/browser/renderer_host/browser_compositor_view_mac.h
 @@ -50,9 +50,11 @@ class BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -15,7 +15,7 @@ index da3c2c7..93ed93d 100644
  
    void DidCreateNewRendererCompositorFrameSink(
 diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
-index 278c702..686bfb5 100644
+index 278c7021a2f1..686bfb5b1caf 100644
 --- content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ content/browser/renderer_host/browser_compositor_view_mac.mm
 @@ -204,6 +204,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 d221c6c..f3d5ad4 100644
+index d221c6cf3028..f3d5ad4b177e 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,8 +1,8 @@
 diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
-index b4eae88..bfb3887 100644
+index 964c9a093a3b..6bbe57ec3f31 100644
 --- content/browser/browser_plugin/browser_plugin_guest.cc
 +++ content/browser/browser_plugin/browser_plugin_guest.cc
-@@ -336,14 +336,20 @@ void BrowserPluginGuest::InitInternal(
+@@ -330,8 +330,11 @@ void BrowserPluginGuest::InitInternal(
            static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
      }
  
@@ -15,17 +15,7 @@ index b4eae88..bfb3887 100644
  
      // Once a BrowserPluginGuest has an embedder WebContents, it's considered to
      // be attached.
-     owner_web_contents_ = owner_web_contents;
--    if (new_view)
-+    if (new_view) {
-       new_view->OnGuestAttached(owner_web_contents_->GetView());
-+      if (delegate_)
-+        delegate_->OnGuestAttached(owner_web_contents_->GetView());
-+    }
-   }
- 
-   RendererPreferences* renderer_prefs =
-@@ -834,7 +840,8 @@ void BrowserPluginGuest::OnWillAttachComplete(
+@@ -828,10 +831,19 @@ void BrowserPluginGuest::OnWillAttachComplete(
          static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
      if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {
        web_contents_view->CreateViewForWidget(
@@ -35,8 +25,19 @@ index b4eae88..bfb3887 100644
      }
    }
  
++  if (delegate_) {
++    // Notify the delegate here instead of in InitInternal because InitInternal
++    // will now be called from Init before GuestViewBase::CompleteInit has set
++    // web_contents() to the guest WebContents. This behavior change is due to
++    // https://crrev.com/07263b56.
++    delegate_->OnGuestAttached(embedder_web_contents->GetView());
++  }
++
+   InitInternal(params, embedder_web_contents);
+ 
+   attached_ = true;
 diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
-index de0043f..7699c2f 100644
+index de0043f4638b..7699c2fffd03 100644
 --- content/browser/frame_host/interstitial_page_impl.cc
 +++ content/browser/frame_host/interstitial_page_impl.cc
 @@ -609,7 +609,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
@@ -49,7 +50,7 @@ index de0043f..7699c2f 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..20b8560 100644
+index e4401f85bf3f..20b85609a23f 100644
 --- content/browser/web_contents/web_contents_view.h
 +++ content/browser/web_contents/web_contents_view.h
 @@ -24,7 +24,7 @@ struct ScreenInfo;
@@ -78,7 +79,7 @@ index e4401f8..20b8560 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 a99e043..f1ef7cb 100644
+index a99e04390ef0..f1ef7cbd1b89 100644
 --- content/browser/web_contents/web_contents_view_aura.cc
 +++ content/browser/web_contents/web_contents_view_aura.cc
 @@ -844,7 +844,8 @@ void WebContentsViewAura::CreateView(
@@ -100,7 +101,7 @@ index a99e043..f1ef7cb 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 bb49288..603f18a 100644
+index bb492884e223..603f18a00c58 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
@@ -113,7 +114,7 @@ index bb49288..603f18a 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 eb309e7..e69e6df 100644
+index eb309e725c24..e69e6dfd2d82 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,
@@ -126,7 +127,7 @@ index eb309e7..e69e6df 100644
  }
  
 diff --git content/browser/web_contents/web_contents_view_child_frame.h content/browser/web_contents/web_contents_view_child_frame.h
-index 18d45ee..6aa738d 100644
+index 18d45eea524f..6aa738daf5b5 100644
 --- content/browser/web_contents/web_contents_view_child_frame.h
 +++ content/browser/web_contents/web_contents_view_child_frame.h
 @@ -40,7 +40,7 @@ class WebContentsViewChildFrame : public WebContentsView,
@@ -139,7 +140,7 @@ index 18d45ee..6aa738d 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 0256869..da7a9b8 100644
+index 025686922ade..da7a9b88cabc 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 {
@@ -194,7 +195,7 @@ index 0256869..da7a9b8 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 464ea8f..0d3118d 100644
+index 464ea8f780e4..0d3118df538a 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,
@@ -207,7 +208,7 @@ index 464ea8f..0d3118d 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 34945ac..542042c 100644
+index 34945ac13173..542042c9b3d4 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,
@@ -220,7 +221,7 @@ index 34945ac..542042c 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 f256f69..fbf2726 100644
+index f256f6964553..fbf272601889 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(
@@ -242,7 +243,7 @@ index f256f69..fbf2726 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 ef0ff9d6f67b..4eab513ba4ce 100644
 --- content/public/browser/browser_plugin_guest_delegate.h
 +++ content/public/browser/browser_plugin_guest_delegate.h
 @@ -19,6 +19,7 @@ namespace content {
@@ -253,7 +254,7 @@ index 61662f4..6a4648f 100644
  
  // Objects implement this interface to get notified about changes in the guest
  // WebContents and to provide necessary functionality.
-@@ -78,6 +79,10 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
+@@ -72,6 +73,10 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
    // content module.
    virtual void SetGuestHost(GuestHost* guest_host) {}
  
@@ -265,7 +266,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 9e8563fb9555..21d222240559 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(
@@ -277,8 +278,8 @@ index 255217d..1571064 100644
    callback.Run(WebContents::Create(params));
  }
  
-@@ -194,6 +196,18 @@ bool MimeHandlerViewGuest::ZoomPropagatesFromEmbedderToGuest() const {
-   return false;
+@@ -198,6 +200,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const {
+   return true;
  }
  
 +void MimeHandlerViewGuest::OnGuestAttached(
@@ -297,12 +298,12 @@ 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 9ca244e6d07b..9da2d51e248d 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 :
-   void DidInitialize(const base::DictionaryValue& create_params) final;
+@@ -88,6 +88,10 @@ class MimeHandlerViewGuest :
    bool ZoomPropagatesFromEmbedderToGuest() const final;
+   bool ShouldDestroyOnDetach() const final;
  
 +  // content::BrowserPluginGuestDelegate implementation
 +  void OnGuestAttached(content::WebContentsView* parent_view) override;
@@ -312,7 +313,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,20 +63,20 @@ index 4b43013..169ca47 100644
  content::BrowserContext* GetBrowserContextRedirectedInIncognito(
      content::BrowserContext* context);
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index 00635b8..d15278e 100644
+index b9515c144000..378f10a5b3ff 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
 @@ -375,7 +375,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
        chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
        content::NotificationService::AllSources());
-
+ 
 -  if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
 +  if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled())
      profile_shortcut_manager_.reset(ProfileShortcutManager::Create(
                                      this));
  }
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index b3fa180..81adaea 100644
+index b3fa18058e70..81adaea19b71 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
 @@ -94,7 +94,7 @@ class ProfileManager : public content::NotificationObserver,

patch/patches/chrome_widevine.patch

@@ -1,5 +1,5 @@
 diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
-index 05e23a6..051dab3 100644
+index 05e23a6d53ea..051dab3cfd02 100644
 --- chrome/common/chrome_content_client.cc
 +++ chrome/common/chrome_content_client.cc
 @@ -82,7 +82,7 @@

patch/patches/component_build_1617.patch

@@ -1,5 +1,5 @@
 diff --git content/app/content_service_manager_main_delegate.h content/app/content_service_manager_main_delegate.h
-index 7563ce4..6c59474 100644
+index 7563ce48bf5e..6c594749d57b 100644
 --- content/app/content_service_manager_main_delegate.h
 +++ content/app/content_service_manager_main_delegate.h
 @@ -16,7 +16,8 @@ namespace content {
@@ -13,7 +13,7 @@ index 7563ce4..6c59474 100644
    explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
    ~ContentServiceManagerMainDelegate() override;
 diff --git third_party/WebKit/Source/web/BUILD.gn third_party/WebKit/Source/web/BUILD.gn
-index 148b260..b08bb89 100644
+index 148b260eb482..b08bb897cb46 100644
 --- third_party/WebKit/Source/web/BUILD.gn
 +++ third_party/WebKit/Source/web/BUILD.gn
 @@ -15,6 +15,7 @@ component("web") {

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 0e405ef..f2ecb56 100644
+index 0e405efc281f..f2ecb568d396 100644
 --- content/browser/compositor/gpu_process_transport_factory.cc
 +++ content/browser/compositor/gpu_process_transport_factory.cc
 @@ -239,6 +239,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
@@ -17,7 +17,7 @@ index 0e405ef..f2ecb56 100644
    if (command_line->HasSwitch(switches::kHeadless))
      return base::WrapUnique(new cc::SoftwareOutputDevice);
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index 163fbb0..bb8dea8 100644
+index 163fbb01646c..bb8dea8886b9 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 43bbb3a..7c03fdc 100644
+index 43bbb3ac2920..7c03fdc0f10e 100644
 --- chrome/browser/download/download_target_determiner.cc
 +++ chrome/browser/download/download_target_determiner.cc
 @@ -477,8 +477,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
@@ -14,7 +14,7 @@ index 43bbb3a..7c03fdc 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 176b1bc..3e91d67 100644
+index 176b1bc3b1b5..3e91d67a267c 100644
 --- chrome/browser/plugins/plugin_info_message_filter.cc
 +++ chrome/browser/plugins/plugin_info_message_filter.cc
 @@ -452,8 +452,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
@@ -53,7 +53,7 @@ index 176b1bc..3e91d67 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 5ca4247..fc24263 100644
+index 5ca4247f67a3..fc2426355451 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 @@ -575,6 +575,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
@@ -78,7 +78,7 @@ index 5ca4247..fc24263 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 ec9ded6..4a0406a 100644
+index ec9ded6b49d3..4a0406a88590 100644
 --- content/browser/frame_host/navigation_handle_impl.cc
 +++ content/browser/frame_host/navigation_handle_impl.cc
 @@ -300,12 +300,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -95,7 +95,7 @@ index ec9ded6..4a0406a 100644
  }
  
 diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
-index b9f925b..eacb4167 100644
+index 346765edaef9..9a25239d30d0 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
 @@ -918,10 +918,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
@@ -133,7 +133,7 @@ index b9f925b..eacb4167 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 c3a1726..9b3922e 100644
+index c3a1726f9760..9b3922e4d7d4 100644
 --- content/browser/frame_host/render_frame_host_impl.h
 +++ content/browser/frame_host/render_frame_host_impl.h
 @@ -815,8 +815,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -147,7 +147,7 @@ index c3a1726..9b3922e 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 9b9cfbd..ae3a274 100644
+index 9b9cfbdc53cf..ae3a274feb45 100644
 --- content/browser/frame_host/render_frame_message_filter.cc
 +++ content/browser/frame_host/render_frame_message_filter.cc
 @@ -475,6 +475,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
@@ -209,7 +209,7 @@ index 9b9cfbd..ae3a274 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 20d09f5..f36d855 100644
+index 20d09f512da5..f36d8556b1ee 100644
 --- content/browser/loader/mime_sniffing_resource_handler.cc
 +++ content/browser/loader/mime_sniffing_resource_handler.cc
 @@ -494,8 +494,8 @@ bool MimeSniffingResourceHandler::CheckForPluginHandler(
@@ -245,7 +245,7 @@ index 20d09f5..f36d855 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,10 +279,10 @@ 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 168d64f..82e9385 100644
+index 80dbf7c11827..695fc9595fa2 100644
 --- content/common/frame_messages.h
 +++ content/common/frame_messages.h
-@@ -1324,8 +1324,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
+@@ -1330,8 +1330,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
  
  // Used to get the list of plugins. |main_frame_origin| is used to handle
  // exceptions for plugin content settings.
@@ -293,7 +293,7 @@ index 168d64f..82e9385 100644
                              url::Origin /* main_frame_origin */,
                              std::vector<content::WebPluginInfo> /* plugins */)
  
-@@ -1333,9 +1334,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
+@@ -1339,9 +1340,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
  // type. If there is no matching plugin, |found| is false.
  // |actual_mime_type| is the actual mime type supported by the
  // found plugin.
@@ -305,7 +305,7 @@ index 168d64f..82e9385 100644
                              url::Origin /* main_frame_origin */,
                              std::string /* mime_type */,
                              bool /* found */,
-@@ -1716,9 +1718,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply,
+@@ -1722,9 +1724,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply,
  IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply,
                      int /* nfr_request_id */,
                      float /* distance */)
@@ -317,7 +317,7 @@ index 168d64f..82e9385 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 6190e33..fbde1ba 100644
+index 6190e33669c5..fbde1baf37e6 100644
 --- content/ppapi_plugin/ppapi_blink_platform_impl.cc
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -215,6 +215,7 @@ std::unique_ptr<blink::WebURLLoader> PpapiBlinkPlatformImpl::CreateURLLoader(
@@ -329,7 +329,7 @@ index 6190e33..fbde1ba 100644
      blink::WebPluginListBuilder* builder) {
    NOTREACHED();
 diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h
-index fc83aea..9c1a4b2 100644
+index fc83aea60db7..9c1a4b237976 100644
 --- content/ppapi_plugin/ppapi_blink_platform_impl.h
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
 @@ -47,6 +47,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -341,7 +341,7 @@ index fc83aea..9c1a4b2 100644
                       blink::WebPluginListBuilder*) override;
    blink::WebData GetDataResource(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 62e2a4e..7932e91 100644
+index 62e2a4e9005e..7932e9180f6c 100644
 --- content/public/renderer/content_renderer_client.cc
 +++ content/public/renderer/content_renderer_client.cc
 @@ -110,7 +110,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -385,7 +385,7 @@ index 62e2a4e..7932e91 100644
    return false;
  }
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index 915dc35..a015048 100644
+index 915dc35107bc..a015048116ac 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
 @@ -77,6 +77,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -415,7 +415,7 @@ index 915dc35..a015048 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 48b932e..80110f9 100644
+index 48b932e878e3..80110f9efcbb 100644
 --- content/public/renderer/render_frame_observer.h
 +++ content/public/renderer/render_frame_observer.h
 @@ -116,6 +116,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -429,10 +429,10 @@ index 48b932e..80110f9 100644
    virtual void FocusedNodeChanged(const blink::WebNode& node) {}
  
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 69bb3ef..df99298 100644
+index ab1029fcda01..c1f89724da69 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -2897,7 +2897,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -2899,7 +2899,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
    std::string mime_type;
    bool found = false;
    Send(new FrameHostMsg_GetPluginInfo(
@@ -442,7 +442,7 @@ index 69bb3ef..df99298 100644
        params.mime_type.Utf8(), &found, &info, &mime_type));
    if (!found)
      return nullptr;
-@@ -3205,6 +3206,8 @@ void RenderFrameImpl::FrameDetached(blink::WebLocalFrame* frame,
+@@ -3207,6 +3208,8 @@ void RenderFrameImpl::FrameDetached(blink::WebLocalFrame* frame,
  
  void RenderFrameImpl::FrameFocused() {
    Send(new FrameHostMsg_FrameFocused(routing_id_));
@@ -451,7 +451,7 @@ index 69bb3ef..df99298 100644
  }
  
  void RenderFrameImpl::WillCommitProvisionalLoad() {
-@@ -5324,9 +5327,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
+@@ -5360,9 +5363,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
         (!IsBrowserSideNavigationEnabled() ||
          url != pending_navigation_params_->request_params.redirects[0]));
  
@@ -463,7 +463,7 @@ index 69bb3ef..df99298 100644
    // The handlenavigation API is deprecated and will be removed once
    // crbug.com/325351 is resolved.
    if (GetContentClient()->renderer()->HandleNavigation(
-@@ -5339,7 +5341,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
+@@ -5375,7 +5377,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
      }
      return blink::kWebNavigationPolicyIgnore;
    }
@@ -472,7 +472,7 @@ index 69bb3ef..df99298 100644
    Referrer referrer(
        RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index c26bd13..25e7028 100644
+index c26bd138973c..25e7028ee480 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
 @@ -772,6 +772,8 @@ void RenderThreadImpl::Init(
@@ -485,7 +485,7 @@ index c26bd13..25e7028 100644
        base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest,
                   base::Unretained(this)));
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 45fcfe8..165a5f4 100644
+index 45fcfe80a3f0..165a5f4b380d 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
 @@ -876,6 +876,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -507,7 +507,7 @@ index 45fcfe8..165a5f4 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 0ca8faf..7c81cf9 100644
+index 0ca8faf4a89d..7c81cf9f9c92 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
 @@ -125,6 +125,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -519,7 +519,7 @@ index 0ca8faf..7c81cf9 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 c19d608..3dce54d 100644
+index c19d608cc3e1..3dce54daf1cb 100644
 --- content/test/test_blink_web_unit_test_support.cc
 +++ content/test/test_blink_web_unit_test_support.cc
 @@ -290,6 +290,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
@@ -579,7 +579,7 @@ index c19d608..3dce54d 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 556242d..61853c2 100644
+index 556242d76fa9..61853c2df547 100644
 --- content/test/test_blink_web_unit_test_support.h
 +++ content/test/test_blink_web_unit_test_support.h
 @@ -70,6 +70,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {

patch/patches/content_manifest_713806.patch

@@ -0,0 +1,103 @@
+diff --git content/public/app/mojo/content_browser_manifest.json content/public/app/mojo/content_browser_manifest.json
+index 31e7f8e4c31c..15a1a833011a 100644
+--- content/public/app/mojo/content_browser_manifest.json
++++ content/public/app/mojo/content_browser_manifest.json
+@@ -4,13 +4,14 @@
+   "interface_provider_specs": {
+     "service_manager:connector": {
+       "provides": {
++        // Interfaces needed by a generic client of content browser.
++        "app": [
++          "memory_instrumentation::mojom::Coordinator"
++        ],
+         "gpu": [
+           "content::mojom::FieldTrialRecorder",
+           "media::mojom::AndroidOverlayProvider"
+         ],
+-        "memory_instrumentation": [
+-          "memory_instrumentation::mojom::Coordinator"
+-        ],
+         "plugin": [
+           "discardable_memory::mojom::DiscardableSharedMemoryManager",
+           "ui::mojom::Gpu"
+@@ -53,10 +54,6 @@
+         ],
+         "service_manager:service_factory": [
+           "service_manager::mojom::ServiceFactory"
+-        ],
+-        "utility": [
+-          "discardable_memory::mojom::DiscardableSharedMemoryManager",
+-          "memory_instrumentation::mojom::Coordinator"
+         ]
+       },
+       "requires": {
+@@ -66,7 +63,6 @@
+         "content_browser": [
+           "ash",
+           "display",
+-          "memory_instrumentation",
+           "url_keyed_metrics",
+           "geolocation_config"
+         ],
+diff --git content/public/app/mojo/content_gpu_manifest.json content/public/app/mojo/content_gpu_manifest.json
+index a7d05d716337..336eefdc7d17 100644
+--- content/public/app/mojo/content_gpu_manifest.json
++++ content/public/app/mojo/content_gpu_manifest.json
+@@ -15,7 +15,8 @@
+         ]
+       },
+       "requires": {
+-        "content_browser": [ "gpu", "memory_instrumentation" ],
++        "*": [ "app" ],
++        "content_browser": [ "gpu" ],
+         "device": [ "device:power_monitor" ]
+       }
+     }
+diff --git content/public/app/mojo/content_plugin_manifest.json content/public/app/mojo/content_plugin_manifest.json
+index ed8f3268cc9a..fc78b9945080 100644
+--- content/public/app/mojo/content_plugin_manifest.json
++++ content/public/app/mojo/content_plugin_manifest.json
+@@ -4,7 +4,7 @@
+   "interface_provider_specs": {
+     "service_manager:connector": {
+       "provides": {
+-        "browser": [ 
++        "browser": [
+           "content::mojom::Child",
+           "IPC::mojom::ChannelBootstrap"
+         ],
+@@ -13,6 +13,7 @@
+         ]
+       },
+       "requires": {
++        "*": [ "app" ],
+         "content_browser": [ "plugin" ],
+         "device": [ "device:power_monitor" ],
+         "ui": [ "discardable_memory" ]
+diff --git content/public/app/mojo/content_renderer_manifest.json content/public/app/mojo/content_renderer_manifest.json
+index a850e12576ab..a3d0267e8b14 100644
+--- content/public/app/mojo/content_renderer_manifest.json
++++ content/public/app/mojo/content_renderer_manifest.json
+@@ -19,7 +19,8 @@
+         ]
+       },
+       "requires": {
+-        "content_browser": [ "memory_instrumentation", "renderer" ],
++        "*": [ "app" ],
++        "content_browser": [ "renderer" ],
+         "device": [
+           "device:battery_monitor",
+           "device:power_monitor",
+diff --git content/public/app/mojo/content_utility_manifest.json content/public/app/mojo/content_utility_manifest.json
+index 3ea2993ba859..5caad0c5639b 100644
+--- content/public/app/mojo/content_utility_manifest.json
++++ content/public/app/mojo/content_utility_manifest.json
+@@ -14,7 +14,7 @@
+         ]
+       },
+       "requires": {
+-        "content_browser": [ "memory_instrumentation" ],
++        "*": [ "app" ],
+         "device": [
+           "device:power_monitor",
+           "device:time_zone_monitor"

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 4822d0d..3efc466 100644
+index 4822d0d57e44..3efc46631f4c 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 effec5c..1cd8f58 100644
+index effec5c3de01..1cd8f58cde19 100644
 --- chrome/common/crash_keys.cc
 +++ chrome/common/crash_keys.cc
 @@ -4,6 +4,8 @@
@@ -90,7 +90,7 @@ index effec5c..1cd8f58 100644
  
  void SetActiveExtensions(const std::set<std::string>& extensions) {
 diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
-index 687146e..b1b73d6 100644
+index 687146e9e92c..b1b73d6e36b2 100644
 --- chrome/common/crash_keys.h
 +++ chrome/common/crash_keys.h
 @@ -22,10 +22,18 @@ class CommandLine;
@@ -113,7 +113,7 @@ index 687146e..b1b73d6 100644
  // on the given |command_line|.
  void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
 diff --git chrome_elf/BUILD.gn chrome_elf/BUILD.gn
-index 8ae2c85..cea4a3d 100644
+index 8ae2c85d2304..cea4a3db64d3 100644
 --- chrome_elf/BUILD.gn
 +++ chrome_elf/BUILD.gn
 @@ -7,6 +7,7 @@
@@ -162,7 +162,7 @@ index 8ae2c85..cea4a3d 100644
  
  static_library("hook_util") {
 diff --git chrome_elf/crash/crash_helper.cc chrome_elf/crash/crash_helper.cc
-index 31ed150..aacbb02 100644
+index 31ed15080abd..aacbb02b93de 100644
 --- chrome_elf/crash/crash_helper.cc
 +++ chrome_elf/crash/crash_helper.cc
 @@ -11,12 +11,17 @@
@@ -196,7 +196,7 @@ index 31ed150..aacbb02 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 2199920..e6e8f58 100644
+index 2199920ee793..e6e8f58a0be0 100644
 --- components/crash/content/app/breakpad_linux.cc
 +++ components/crash/content/app/breakpad_linux.cc
 @@ -29,6 +29,7 @@
@@ -274,7 +274,7 @@ index 2199920..e6e8f58 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 4a2a429..70f3adb 100644
+index 4a2a429fc052..70f3adbc73cf 100644
 --- components/crash/content/app/breakpad_linux.h
 +++ components/crash/content/app/breakpad_linux.h
 @@ -16,6 +16,9 @@ namespace breakpad {
@@ -288,7 +288,7 @@ index 4a2a429..70f3adb 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() {
@@ -357,7 +357,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 @@
@@ -383,14 +383,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.
@@ -416,10 +416,10 @@ index 9f69c19..2abaee00 100644
  
  }  // namespace crash_reporter
 diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc
-index ede08d7..d7caf4d 100644
+index aabb8de5ac8c..9bf03a3d6ab7 100644
 --- components/crash/content/app/crashpad.cc
 +++ components/crash/content/app/crashpad.cc
-@@ -139,7 +139,8 @@ void InitializeCrashpadImpl(bool initial_client,
+@@ -138,7 +138,8 @@ void InitializeCrashpadImpl(bool initial_client,
    // fallback. Forwarding is turned off for debug-mode builds even for the
    // browser process, because the system's crash reporter can take a very long
    // time to chew on symbols.
@@ -430,7 +430,7 @@ index ede08d7..d7caf4d 100644
          crashpad::TriState::kDisabled);
    }
 diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm
-index 485c2b4..3b5f3ea 100644
+index 3bae07e14c69..b2bee0ee1572 100644
 --- components/crash/content/app/crashpad_mac.mm
 +++ components/crash/content/app/crashpad_mac.mm
 @@ -16,11 +16,14 @@
@@ -448,7 +448,7 @@ index 485c2b4..3b5f3ea 100644
  #include "third_party/crashpad/crashpad/client/crash_report_database.h"
  #include "third_party/crashpad/crashpad/client/crashpad_client.h"
  #include "third_party/crashpad/crashpad/client/crashpad_info.h"
-@@ -42,9 +45,10 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -40,9 +43,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
  
    if (initial_client) {
      @autoreleasepool {
@@ -462,7 +462,7 @@ index 485c2b4..3b5f3ea 100644
  
        // Is there a way to recover if this fails?
        CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
-@@ -56,16 +60,27 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -54,16 +58,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
        // crash server won't have symbols for any other build types.
        std::string url = "https://clients2.google.com/cr/report";
  #else
@@ -495,7 +495,7 @@ index 485c2b4..3b5f3ea 100644
  
  #if defined(GOOGLE_CHROME_BUILD)
        // Empty means stable.
-@@ -81,12 +96,16 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -79,12 +94,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
          process_annotations["channel"] = "";
        }
  
@@ -517,7 +517,7 @@ index 485c2b4..3b5f3ea 100644
  
        std::vector<std::string> arguments;
  
-@@ -108,6 +127,12 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -106,6 +125,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
              "--reset-own-crash-exception-port-to-system-default");
        }
  
@@ -531,7 +531,7 @@ index 485c2b4..3b5f3ea 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 3946d2a..175fb2e 100644
+index 2c25a0b26fd3..de075367d3bf 100644
 --- components/crash/content/app/crashpad_win.cc
 +++ components/crash/content/app/crashpad_win.cc
 @@ -33,8 +33,8 @@ void GetPlatformCrashpadAnnotations(
@@ -557,7 +557,7 @@ index 3946d2a..175fb2e 100644
  #endif
  }
  
-@@ -82,7 +82,7 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -80,7 +80,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
  #if defined(GOOGLE_CHROME_BUILD)
      std::string url = "https://clients2.google.com/cr/report";
  #else
@@ -566,7 +566,7 @@ index 3946d2a..175fb2e 100644
  #endif
  
      // Allow the crash server to be overridden for testing. If the variable
-@@ -102,13 +102,14 @@ base::FilePath PlatformCrashpadInitialization(
+@@ -100,22 +100,26 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
                crashpad::TriState::kEnabled, kIndirectMemoryLimit);
      }
  
@@ -583,10 +583,9 @@ index 3946d2a..175fb2e 100644
      if (embedded_handler) {
 -      start_arguments.push_back(std::string("--type=") +
 -                                switches::kCrashpadHandler);
-       if (!user_data_dir.empty()) {
-         start_arguments.push_back(std::string("--user-data-dir=") +
-                                   user_data_dir);
-@@ -119,9 +120,12 @@ base::FilePath PlatformCrashpadInitialization(
+       // The prefetch argument added here has to be documented in
+       // chrome_switches.cc, below the kPrefetchArgument* constants. A constant
+       // can't be used here because crashpad can't depend on Chrome.
        start_arguments.push_back("/prefetch:7");
      } else {
        base::FilePath exe_dir = exe_file.DirName();
@@ -601,7 +600,7 @@ index 3946d2a..175fb2e 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 2961f37..2ef6a30 100644
+index 2961f3739fb7..2ef6a30a395a 100644
 --- chrome/browser/font_family_cache.h
 +++ chrome/browser/font_family_cache.h
 @@ -21,6 +21,8 @@ class Profile;

patch/patches/gn_config.patch

@@ -1,5 +1,5 @@
 diff --git .gn .gn
-index 441b8ac..c3fe3b1 100644
+index 441b8ac2925e..c3fe3b155cba 100644
 --- .gn
 +++ .gn
 @@ -271,6 +271,8 @@ exec_script_whitelist =
@@ -12,7 +12,7 @@ index 441b8ac..c3fe3b1 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index d274819..191ea00 100644
+index d27481923c03..191ea009b926 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -170,6 +170,7 @@ group("gn_all") {
@@ -24,7 +24,7 @@ index d274819..191ea00 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 8150d3a..39441ef 100644
+index 8150d3a4e4ac..39441ef7ae89 100644
 --- build/toolchain/win/setup_toolchain.py
 +++ build/toolchain/win/setup_toolchain.py
 @@ -132,17 +132,21 @@ def _LoadToolchainEnv(cpu, sdk_dir):
@@ -91,7 +91,7 @@ index 8150d3a..39441ef 100644
  
  
 diff --git build/vs_toolchain.py build/vs_toolchain.py
-index 3b2c727..60e4984 100755
+index 3b2c727f51d5..60e4984c6a76 100755
 --- build/vs_toolchain.py
 +++ build/vs_toolchain.py
 @@ -79,11 +79,18 @@ def SetEnvironmentAndGetRuntimeDllDirs():
@@ -114,7 +114,7 @@ index 3b2c727..60e4984 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 a7778f9..5e3eb75a 100644
+index a7778f929afc..5e3eb75a119f 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
 @@ -252,7 +252,7 @@ template("chrome_paks") {
@@ -127,7 +127,7 @@ index a7778f9..5e3eb75a 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 9a0f5ed..9de2636 100644
+index 9a0f5ed6ab96..9de2636713c1 100644
 --- tools/gritsettings/resource_ids
 +++ tools/gritsettings/resource_ids
 @@ -380,4 +380,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 3e33b5a..6b425cc 100644
+index 3e33b5a74170..6b425cc0fbee 100644
 --- ui/base/ime/input_method_win.cc
 +++ ui/base/ime/input_method_win.cc
 @@ -688,8 +688,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {

patch/patches/linux_build.patch

@@ -1,5 +1,38 @@
+diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
+index b5d6d8fdb443..3cb6a0a719c2 100644
+--- build/config/compiler/BUILD.gn
++++ build/config/compiler/BUILD.gn
+@@ -406,7 +406,7 @@ config("compiler") {
+     # chromeos binutils has been patched with the fix, so always use icf there.
+     # The bug only affects x86 and x64, so we can still use ICF when targeting
+     # other architectures.
+-    if ((!is_android && linux_use_bundled_binutils) || is_chromeos ||
++    if ((!is_android && linux_use_bundled_binutils && current_cpu != "x86") || is_chromeos ||
+         !(current_cpu == "x86" || current_cpu == "x64")) {
+       ldflags += [ "-Wl,--icf=all" ]
+     }
+diff --git chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
+index b8e9169c0db2..eff883b03f26 100644
+--- chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
++++ chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
+@@ -57,6 +57,7 @@ bool ResetHomepageEnabled(const SettingsResetPromptModel& model) {
+ void TryToShowSettingsResetPrompt(
+     std::unique_ptr<SettingsResetPromptModel> model,
+     std::unique_ptr<BrandcodedDefaultSettings> default_settings) {
++#if defined(OS_WIN)
+   DCHECK(model);
+   DCHECK(default_settings);
+ 
+@@ -78,6 +79,7 @@ void TryToShowSettingsResetPrompt(
+   SettingsResetPromptController::ShowSettingsResetPrompt(
+       browser, new SettingsResetPromptController(std::move(model),
+                                                  std::move(default_settings)));
++#endif  // defined(OS_WIN)
+ }
+ 
+ // Will display the settings reset prompt if required and if there is at least
 diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
-index a38c6b8..bb4fa59 100644
+index a38c6b806be7..bb4fa59d7612 100644
 --- chrome/browser/ui/libgtkui/gtk_ui.cc
 +++ chrome/browser/ui/libgtkui/gtk_ui.cc
 @@ -1053,7 +1053,11 @@ float GtkUi::GetRawDeviceScaleFactor() {
@@ -15,7 +48,7 @@ index a38c6b8..bb4fa59 100644
    const float scale_factor =
        resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
 diff --git ui/accessibility/platform/ax_platform_node_auralinux.cc ui/accessibility/platform/ax_platform_node_auralinux.cc
-index c73d7a9..5fcc441 100644
+index c73d7a93abf3..5fcc441e4e7b 100644
 --- ui/accessibility/platform/ax_platform_node_auralinux.cc
 +++ ui/accessibility/platform/ax_platform_node_auralinux.cc
 @@ -474,8 +474,12 @@ void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) {

patch/patches/mac_build_747693.patch

@@ -1,118 +0,0 @@
-diff --git chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h
-index 18755d494cf3..3605076be5d1 100644
---- chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h
-+++ chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h
-@@ -8,6 +8,7 @@
- #import <Cocoa/Cocoa.h>
- #include <stddef.h>
- 
-+#include "base/mac/availability.h"
- #import "chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h"
- #import "ui/base/cocoa/touch_bar_forward_declarations.h"
- 
-@@ -38,7 +39,7 @@ class AutofillPopupViewCocoaDelegate;
- - (void)invalidateRow:(NSInteger)row;
- 
- // Creates and returns a touch bar if the popup is for credit cards.
--- (NSTouchBar*)makeTouchBar;
-+- (NSTouchBar*)makeTouchBar API_AVAILABLE(macos(10.12.2));
- 
- @end
- 
-diff --git chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm
-index 46733a165a31..2d71d4446a36 100644
---- chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm
-+++ chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm
-@@ -178,7 +178,8 @@ - (void)drawRect:(NSRect)dirtyRect {
- #pragma mark NSTouchBarDelegate implementation:
- 
- - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
--      makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
-+      makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
-+    API_AVAILABLE(macos(10.12.2)) {
-   if (![identifier hasSuffix:kCreditCardItemsTouchId])
-     return nil;
- 
-diff --git chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa_unittest.mm chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa_unittest.mm
-index aebb22367472..2e6d6be61b5f 100644
---- chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa_unittest.mm
-+++ chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa_unittest.mm
-@@ -110,31 +110,27 @@ void SetLineCount(int line_count) {
- 
- // Tests to check if the touch bar shows up properly.
- TEST_F(AutofillPopupViewCocoaUnitTest, CreditCardAutofillTouchBar) {
--  if (!base::mac::IsAtLeastOS10_12())
--    return;
--
--  // Touch bar shouldn't appear if the popup is not for credit cards.
--  autofill_popup_controller_.SetIsCreditCardField(false);
--  EXPECT_FALSE([view_ makeTouchBar]);
--
--  // Touch bar shouldn't appear if the popup is empty.
--  autofill_popup_controller_.SetIsCreditCardField(true);
--  SetLineCount(0);
--  EXPECT_FALSE([view_ makeTouchBar]);
--
--  autofill_popup_controller_.SetIsCreditCardField(true);
--  SetLineCount(3);
--  NSTouchBar* touch_bar = [view_ makeTouchBar];
--  EXPECT_TRUE(touch_bar);
--  EXPECT_TRUE([[touch_bar customizationIdentifier]
--      isEqual:ui::GetTouchBarId(kCreditCardAutofillTouchBarId)]);
-+  if (@available(macOS 10.12.2, *)) {
-+    // Touch bar shouldn't appear if the popup is not for credit cards.
-+    autofill_popup_controller_.SetIsCreditCardField(false);
-+    EXPECT_FALSE([view_ makeTouchBar]);
-+
-+    // Touch bar shouldn't appear if the popup is empty.
-+    autofill_popup_controller_.SetIsCreditCardField(true);
-+    SetLineCount(0);
-+    EXPECT_FALSE([view_ makeTouchBar]);
-+
-+    autofill_popup_controller_.SetIsCreditCardField(true);
-+    SetLineCount(3);
-+    NSTouchBar* touch_bar = [view_ makeTouchBar];
-+    EXPECT_TRUE(touch_bar);
-+    EXPECT_TRUE([[touch_bar customizationIdentifier]
-+        isEqual:ui::GetTouchBarId(kCreditCardAutofillTouchBarId)]);
-+  }
- }
- 
--// Tests that the touch bar logs into the histogram correctly.
-+// Tests that the touch bar histogram is logged correctly.
- TEST_F(AutofillPopupViewCocoaUnitTest, CreditCardAutofillTouchBarMetric) {
--  if (!base::mac::IsAtLeastOS10_12())
--    return;
--
-   {
-     base::HistogramTester histogram_tester;
-     [view_ acceptCreditCard:nil];
-diff --git chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
-index 5378abc9cc2a..f0e7d9e8c86c 100644
---- chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
-+++ chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
-@@ -235,7 +235,10 @@ - (void)loadView {
- }
- 
- - (NSTouchBar*)makeTouchBar {
--  return [touchBarController_ makeTouchBar];
-+  if (@available(macOS 10.12.2, *))
-+    return [touchBarController_ makeTouchBar];
-+
-+  return nil;
- }
- 
- - (void)ensureContentsVisibleInSuperview:(NSView*)superview {
-diff --git chrome/browser/ui/cocoa/web_textfield_touch_bar_controller.h chrome/browser/ui/cocoa/web_textfield_touch_bar_controller.h
-index c3dc305aa48e..d50a2689d9de 100644
---- chrome/browser/ui/cocoa/web_textfield_touch_bar_controller.h
-+++ chrome/browser/ui/cocoa/web_textfield_touch_bar_controller.h
-@@ -28,7 +28,7 @@
- - (void)showCreditCardAutofillForPopupView:(AutofillPopupViewCocoa*)popupView;
- 
- // Creates and returns a touch bar.
--- (NSTouchBar*)makeTouchBar;
-+- (NSTouchBar*)makeTouchBar API_AVAILABLE(macos(10.12.2));
- 
- @end
- 

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 83c3191..c4c1290a 100644
+index 83c3191b47be..c4c1290a7b60 100644
 --- base/message_loop/message_loop.h
 +++ base/message_loop/message_loop.h
 @@ -291,6 +291,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
@@ -33,7 +33,7 @@ index 83c3191..c4c1290a 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 79a94d6..19af0d1 100644
+index 79a94d6d99a2..19af0d17f9f5 100644
 --- net/base/network_delegate.h
 +++ net/base/network_delegate.h
 @@ -16,6 +16,7 @@
@@ -22,7 +22,7 @@ index 79a94d6..19af0d1 100644
    THREAD_CHECKER(thread_checker_);
  
 diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc
-index 7a776d3..84c0189 100644
+index 7a776d37d7a2..84c01897a877 100644
 --- net/url_request/url_request_job.cc
 +++ net/url_request/url_request_job.cc
 @@ -532,6 +532,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 0dd6a0d..8bc6502d 100644
+index 0dd6a0d6bc0c..8bc6502d1e6f 100644
 --- net/cert/ct_policy_enforcer.cc
 +++ net/cert/ct_policy_enforcer.cc
 @@ -35,15 +35,6 @@ namespace net {
@@ -33,7 +33,7 @@ index 0dd6a0d..8bc6502d 100644
 +
  }  // namespace net
 diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
-index b594cba..285eae8 100644
+index b594cba1a6fc..285eae814c50 100644
 --- net/cert/ct_policy_enforcer.h
 +++ net/cert/ct_policy_enforcer.h
 @@ -42,6 +42,17 @@ class NET_EXPORT CTPolicyEnforcer {
@@ -55,7 +55,7 @@ index b594cba..285eae8 100644
  
  }  // namespace net
 diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
-index 4ffe9e8..013cea5 100644
+index 4ffe9e8796f8..013cea500b3d 100644
 --- net/http/transport_security_state.cc
 +++ net/http/transport_security_state.cc
 @@ -1550,8 +1550,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
@@ -72,7 +72,7 @@ index 4ffe9e8..013cea5 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 5e75551..1d1ca02 100644
+index b4bab0db79db..6c11351b43ba 100644
 --- net/http/transport_security_state.h
 +++ net/http/transport_security_state.h
 @@ -574,6 +574,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 e529c37..9039974 100644
+index e529c370d502..9039974ce97f 100644
 --- net/url_request/url_request.h
 +++ net/url_request/url_request.h
 @@ -667,10 +667,10 @@ class NET_EXPORT URLRequest : public base::SupportsUserData {

patch/patches/pdfium_print_549365.patch

@@ -1,5 +1,5 @@
 diff --git BUILD.gn BUILD.gn
-index 80a258e..7f343f1 100644
+index 80a258ea4..7f343f173 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -227,6 +227,10 @@ static_library("pdfium") {
@@ -14,7 +14,7 @@ index 80a258e..7f343f1 100644
  
  static_library("test_support") {
 diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp
-index 7dbaf7f..3b41421 100644
+index 94cc97885..806ff3b24 100644
 --- fpdfsdk/fpdfview.cpp
 +++ fpdfsdk/fpdfview.cpp
 @@ -37,6 +37,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 95656cd..35f26f1 100644
+index 41bd254aa4b1..69e445630082 100644
 --- content/public/common/common_param_traits_macros.h
 +++ content/public/common/common_param_traits_macros.h
 @@ -205,6 +205,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -11,7 +11,7 @@ index 95656cd..35f26f1 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 767e91c..34f59fe 100644
+index d4ca2a11c2ad..47bbd21d80ea 100644
 --- content/public/common/web_preferences.cc
 +++ content/public/common/web_preferences.cc
 @@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
@@ -23,7 +23,7 @@ index 767e91c..34f59fe 100644
        record_whole_document(false),
        cookie_enabled(true),
 diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
-index 5012952..ed17a57 100644
+index 5c97e2dadfb2..0fba943595a8 100644
 --- content/public/common/web_preferences.h
 +++ content/public/common/web_preferences.h
 @@ -191,6 +191,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -35,10 +35,10 @@ index 5012952..ed17a57 100644
    bool record_whole_document;
  
 diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
-index f26cc78..fab85a3 100644
+index 9774050a6ae0..a446b25c849d 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
-@@ -1317,6 +1317,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
+@@ -1319,6 +1319,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
      blink::WebView* web_view,
      CompositorDependencies* compositor_deps) {
    ApplyWebPreferences(prefs, web_view);

patch/patches/print_header_footer_1478_1565.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/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 fd39591..fbeea6d 100644
+index fd395915885d..fbeea6df52ee 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 fd39591..fbeea6d 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 3c9dfc0..e6a3236 100644
+index 3c9dfc0d1ed3..e6a3236b008d 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 3c9dfc0..e6a3236 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 fc5e964..ed384ba 100644
+index fc5e9648a330..ed384bac8e83 100644
 --- components/printing/renderer/print_web_view_helper.h
 +++ components/printing/renderer/print_web_view_helper.h
 @@ -152,10 +152,8 @@ class PrintWebViewHelper
@@ -487,7 +487,7 @@ index fc5e964..ed384ba 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 5616013..6d3737d 100644
+index a884d985f16f..2d4df5e9b13a 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
 @@ -125,6 +125,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
@@ -11,7 +11,7 @@ index 5616013..6d3737d 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 7e0cc57..66916d4 100644
+index 7e0cc57bddb1..66916d497d76 100644
 --- content/browser/renderer_host/render_view_host_impl.h
 +++ content/browser/renderer_host/render_view_host_impl.h
 @@ -155,6 +155,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,8 +1,22 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index 91e326b..8f22548 100644
+index 1ff9dfd84764..f003b82f3b43 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -740,8 +740,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
+@@ -422,13 +422,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
+   selection_controller_client_.reset(
+       new TouchSelectionControllerClientAura(this));
+   CreateSelectionController();
+-
+-  RenderViewHost* rvh = RenderViewHost::From(host_);
+-  if (rvh) {
+-    // TODO(mostynb): actually use prefs.  Landing this as a separate CL
+-    // first to rebaseline some unreliable layout tests.
+-    ignore_result(rvh->GetWebkitPreferences());
+-  }
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -746,8 +739,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
    background_color_ = color;
  
    bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
@@ -15,3 +29,19 @@ index 91e326b..8f22548 100644
  }
  
  bool RenderWidgetHostViewAura::IsMouseLocked() {
+@@ -1929,6 +1924,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+   window_->Init(ui::LAYER_SOLID_COLOR);
+   window_->layer()->SetColor(background_color_);
+ 
++  // Do this after |window_| is created to avoid crashes on Win10.
++  // See https://crbug.com/761389.
++  RenderViewHost* rvh = RenderViewHost::From(host_);
++  if (rvh) {
++    // TODO(mostynb): actually use prefs.  Landing this as a separate CL
++    // first to rebaseline some unreliable layout tests.
++    ignore_result(rvh->GetWebkitPreferences());
++  }
++
+   if (!IsMus())
+     return;
+ 

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 a866993..520e2d9 100644
+index a86699386bd4..520e2d9d5d24 100644
 --- chrome/browser/spellchecker/spellcheck_factory.cc
 +++ chrome/browser/spellchecker/spellcheck_factory.cc
 @@ -17,6 +17,13 @@
@@ -26,7 +26,7 @@ index a866993..520e2d9 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 4d4fd0e..e5bb39ad 100644
+index 4d4fd0e7a4bb..e5bb39adc24e 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 7acf0e4..b5c0efa 100644
+index 7acf0e44fea4..b5c0efa219a5 100644
 --- services/service_manager/embedder/main.cc
 +++ services/service_manager/embedder/main.cc
 @@ -317,13 +317,30 @@ int RunService(MainDelegate* delegate) {
@@ -136,7 +136,7 @@ index 7acf0e4..b5c0efa 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 d814ea2..fa00560 100644
+index d814ea2e04c2..fa0056014c15 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.cc
 +++ content/browser/blob_storage/chrome_blob_storage_context.cc
 @@ -78,6 +78,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -30,7 +30,7 @@ index d814ea2..fa00560 100644
      BrowserContext* context) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
-index 00b6123..aa915f3 100644
+index 00b61232c391..aa915f3130d1 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.h
 +++ content/browser/blob_storage/chrome_blob_storage_context.h
 @@ -47,6 +47,8 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -43,7 +43,7 @@ index 00b6123..aa915f3 100644
    static ChromeBlobStorageContext* GetFor(
        BrowserContext* browser_context);
 diff --git content/browser/bluetooth/web_bluetooth_service_impl.cc content/browser/bluetooth/web_bluetooth_service_impl.cc
-index 4edb4da..8b8a8fc 100644
+index 4edb4da4d37c..8b8a8fc54567 100644
 --- content/browser/bluetooth/web_bluetooth_service_impl.cc
 +++ content/browser/bluetooth/web_bluetooth_service_impl.cc
 @@ -1232,9 +1232,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
@@ -59,7 +59,7 @@ index 4edb4da..8b8a8fc 100644
        partition->GetBluetoothAllowedDevicesMap();
    return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index 1dddb59..90c05c1 100644
+index 1dddb591f0ed..90c05c10fcd0 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
 @@ -125,7 +125,14 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -91,10 +91,10 @@ index 1dddb59..90c05c1 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 9ad73e7..757af27 100644
+index 9cfabe311718..43834d982e32 100644
 --- content/browser/devtools/protocol/service_worker_handler.cc
 +++ content/browser/devtools/protocol/service_worker_handler.cc
-@@ -320,10 +320,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
+@@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
    if (!base::StringToInt64(registration_id, &id))
      return CreateInvalidVersionIdErrorResponse();
  
@@ -108,7 +108,7 @@ index 9ad73e7..757af27 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 e925cdc..480663d 100644
+index e925cdc1f39b..480663d0f671 100644
 --- content/browser/loader/navigation_url_loader_network_service.cc
 +++ content/browser/loader/navigation_url_loader_network_service.cc
 @@ -371,8 +371,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -123,7 +123,7 @@ index e925cdc..480663d 100644
    BrowserThread::PostTask(
        BrowserThread::IO, FROM_HERE,
 diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
-index 6d0cdd6..57023e5 100644
+index 6d0cdd6700f1..57023e554c07 100644
 --- content/browser/payments/payment_app_provider_impl.cc
 +++ content/browser/payments/payment_app_provider_impl.cc
 @@ -157,8 +157,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -153,7 +153,7 @@ index 6d0cdd6..57023e5 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 d742f69..5200a9c 100644
+index 8f0da9c5dad7..7f3deb937cad 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -489,9 +489,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver {
@@ -184,7 +184,7 @@ index d742f69..5200a9c 100644
  
      // Is this the default storage partition? If it isn't, then just give it its
      // own non-shared process.
-@@ -1187,7 +1185,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
+@@ -1235,7 +1233,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
  // static
  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
      BrowserContext* browser_context,
@@ -193,7 +193,7 @@ index d742f69..5200a9c 100644
      SiteInstance* site_instance,
      bool is_for_guests_only) {
    if (g_render_process_host_factory_) {
-@@ -1196,8 +1194,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
+@@ -1244,8 +1242,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
    }
  
    if (!storage_partition_impl) {
@@ -204,7 +204,7 @@ index d742f69..5200a9c 100644
    }
  
    return new RenderProcessHostImpl(browser_context, storage_partition_impl,
-@@ -1207,7 +1205,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
+@@ -1255,7 +1253,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
  // static
  RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
      BrowserContext* browser_context,
@@ -213,7 +213,7 @@ index d742f69..5200a9c 100644
      SiteInstance* site_instance,
      bool is_for_guests_only) {
    RenderProcessHost* render_process_host =
-@@ -1227,7 +1225,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
+@@ -1275,7 +1273,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
  
  RenderProcessHostImpl::RenderProcessHostImpl(
      BrowserContext* browser_context,
@@ -222,7 +222,7 @@ index d742f69..5200a9c 100644
      bool is_for_guests_only)
      : fast_shutdown_started_(false),
        deleting_soon_(false),
-@@ -1260,7 +1258,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1308,7 +1306,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
        indexed_db_factory_(new IndexedDBDispatcherHost(
            id_,
            storage_partition_impl_->GetURLRequestContext(),
@@ -232,7 +232,7 @@ index d742f69..5200a9c 100644
            ChromeBlobStorageContext::GetFor(browser_context_))),
        channel_connected_(false),
        sent_render_process_ready_(false),
-@@ -1294,7 +1293,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1342,7 +1341,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
    }
  
    push_messaging_manager_.reset(new PushMessagingManager(
@@ -242,7 +242,7 @@ index d742f69..5200a9c 100644
  
    AddObserver(indexed_db_factory_.get());
  #if defined(OS_MACOSX)
-@@ -1500,7 +1500,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -1548,7 +1548,7 @@ bool RenderProcessHostImpl::Init() {
  }
  
  void RenderProcessHostImpl::EnableSendQueue() {
@@ -251,7 +251,7 @@ index d742f69..5200a9c 100644
      InitializeChannelProxy();
  }
  
-@@ -1597,6 +1597,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
+@@ -1645,6 +1645,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
  
  void RenderProcessHostImpl::CreateMessageFilters() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -274,7 +274,7 @@ index d742f69..5200a9c 100644
    AddFilter(new ResourceSchedulerFilter(GetID()));
    MediaInternals* media_internals = MediaInternals::GetInstance();
    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
-@@ -1611,8 +1627,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1659,8 +1675,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        new RenderMessageFilter(
            GetID(), GetBrowserContext(), request_context.get(),
            widget_helper_.get(), media_internals,
@@ -285,7 +285,7 @@ index d742f69..5200a9c 100644
    AddFilter(render_message_filter.get());
  
    render_frame_message_filter_ = new RenderFrameMessageFilter(
-@@ -1641,10 +1657,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1689,10 +1705,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        ChromeBlobStorageContext::GetFor(browser_context);
  
    resource_message_filter_ = new ResourceMessageFilter(
@@ -298,7 +298,7 @@ index d742f69..5200a9c 100644
        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
  
    AddFilter(resource_message_filter_.get());
-@@ -1671,10 +1687,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1719,10 +1735,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
    AddFilter(
        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
    AddFilter(new AppCacheDispatcherHost(
@@ -311,7 +311,7 @@ index d742f69..5200a9c 100644
  
  #if BUILDFLAG(ENABLE_WEBRTC)
    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(
-@@ -1713,13 +1729,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1761,13 +1777,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
        new CacheStorageDispatcherHost();
@@ -327,7 +327,7 @@ index d742f69..5200a9c 100644
    AddFilter(service_worker_filter.get());
  
    AddFilter(new SharedWorkerMessageFilter(
-@@ -1727,12 +1742,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1775,12 +1790,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        WorkerStoragePartition(
            storage_partition_impl_->GetURLRequestContext(),
            storage_partition_impl_->GetMediaURLRequestContext(),
@@ -343,7 +343,7 @@ index d742f69..5200a9c 100644
        base::Bind(&RenderWidgetHelper::GetNextRoutingID,
                   base::Unretained(widget_helper_.get()))));
  
-@@ -1748,11 +1763,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1796,11 +1811,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        GetID(), storage_partition_impl_->GetQuotaManager(),
        GetContentClient()->browser()->CreateQuotaPermissionContext()));
  
@@ -356,7 +356,7 @@ index d742f69..5200a9c 100644
        resource_context, service_worker_context, browser_context);
    AddFilter(notification_message_filter_.get());
  
-@@ -1768,6 +1780,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1816,6 +1828,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  void RenderProcessHostImpl::RegisterMojoInterfaces() {
    auto registry = base::MakeUnique<service_manager::BinderRegistry>();
  
@@ -368,7 +368,7 @@ index d742f69..5200a9c 100644
    channel_->AddAssociatedInterfaceForIOThread(
        base::Bind(&IndexedDBDispatcherHost::AddBinding,
                   base::Unretained(indexed_db_factory_.get())));
-@@ -1818,8 +1835,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -1866,8 +1883,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
    AddUIThreadInterface(
        registry.get(),
        base::Bind(&PlatformNotificationContextImpl::CreateService,
@@ -378,7 +378,7 @@ index d742f69..5200a9c 100644
                   GetID()));
    AddUIThreadInterface(
        registry.get(),
-@@ -2085,6 +2101,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() {
+@@ -2133,6 +2149,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK(!is_worker_ref_count_disabled_);
    is_worker_ref_count_disabled_ = true;
@@ -387,7 +387,7 @@ index d742f69..5200a9c 100644
      return;
    service_worker_ref_count_ = 0;
 diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
-index ede5f06..5e205fb 100644
+index c6d104c258cb..f34b09ebc4a9 100644
 --- content/browser/renderer_host/render_process_host_impl.h
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -84,7 +84,6 @@ class ResourceMessageFilter;
@@ -439,7 +439,7 @@ index ede5f06..5e205fb 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 a0df88a..d996a81 100644
+index a0df88a7ff34..d996a81bd7a0 100644
 --- content/browser/storage_partition_impl.h
 +++ content/browser/storage_partition_impl.h
 @@ -113,14 +113,13 @@ class CONTENT_EXPORT  StoragePartitionImpl
@@ -491,7 +491,7 @@ index a0df88a..d996a81 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 {
@@ -507,7 +507,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
@@ -519,7 +519,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 99bc1b3..d96d2db 100644
+index 99bc1b308993..d96d2db78183 100644
 --- content/browser/webui/web_ui_url_loader_factory.cc
 +++ content/browser/webui/web_ui_url_loader_factory.cc
 @@ -18,13 +18,13 @@
@@ -558,7 +558,7 @@ index 99bc1b3..d96d2db 100644
  
    DISALLOW_COPY_AND_ASSIGN(WebUIURLLoaderFactory);
 diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
-index 8503ee8..8f87408 100644
+index 8503ee855ee7..8f874080db46 100644
 --- content/public/browser/browser_context.h
 +++ content/public/browser/browser_context.h
 @@ -188,6 +188,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -586,7 +586,7 @@ index 8503ee8..8f87408 100644
        std::map<std::string, service_manager::EmbeddedServiceInfo>;
  
 diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
-index 60e5c7d..e90a494 100644
+index 60e5c7dc3574..e90a4944ff05 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/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 1a6e9a1..08eb800 100644
+index 1a6e9a1c7892..08eb8007c5f7 100644
 --- ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
 +++ ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
 @@ -141,7 +141,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 041c9f2..4b8beb4 100644
+index 041c9f27ee49..4b8beb4d70a8 100644
 --- ui/gfx/render_text.cc
 +++ ui/gfx/render_text.cc
 @@ -486,6 +486,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
@@ -78,7 +78,7 @@ index 041c9f2..4b8beb4 100644
  }
  
 diff --git ui/gfx/render_text.h ui/gfx/render_text.h
-index 24ea3d4..4554f12 100644
+index 24ea3d4123d5..4554f12b9eca 100644
 --- ui/gfx/render_text.h
 +++ ui/gfx/render_text.h
 @@ -275,6 +275,10 @@ class GFX_EXPORT RenderText {
@@ -102,7 +102,7 @@ index 24ea3d4..4554f12 100644
  };
  
 diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
-index 8ac475f..d052dec 100644
+index 8ac475fa752c..d052dec6acbe 100644
 --- ui/views/animation/ink_drop_host_view.h
 +++ ui/views/animation/ink_drop_host_view.h
 @@ -136,6 +136,8 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
@@ -115,7 +115,7 @@ index 8ac475f..d052dec 100644
    class InkDropGestureHandler;
    friend class InkDropGestureHandler;
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index 1d9e7b8..683d680 100644
+index 1d9e7b82cd5d..671d5782b834 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
 @@ -188,6 +188,7 @@ gfx::Size LabelButton::CalculatePreferredSize() const {
@@ -126,12 +126,13 @@ index 1d9e7b8..683d680 100644
  
    if (style_ == STYLE_BUTTON && PlatformStyle::kDefaultLabelButtonHasBoldFont) {
      // Some text appears wider when rendered normally than when rendered bold.
-@@ -399,6 +400,11 @@ std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
+@@ -399,6 +400,12 @@ std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
                     gfx::RectF(image()->GetMirroredBounds()).CenterPoint());
  }
  
 +void LabelButton::SetFontList(const gfx::FontList& font_list) {
 +  cached_normal_font_list_ = font_list;
++  cached_default_button_font_list_ = font_list;
 +  label_->SetFontList(cached_normal_font_list_);
 +}
 +
@@ -139,7 +140,7 @@ index 1d9e7b8..683d680 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 0fb0337..38397cd 100644
+index 0fb03378c74b..38397cdd6e90 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
 @@ -106,6 +106,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
@@ -153,7 +154,7 @@ index 0fb0337..38397cd 100644
    ImageView* image() const { return image_; }
    Label* label() const;
 diff --git ui/views/controls/button/menu_button.cc ui/views/controls/button/menu_button.cc
-index 0e4194e..736e2c3 100644
+index 0e4194e46254..736e2c3c940f 100644
 --- ui/views/controls/button/menu_button.cc
 +++ ui/views/controls/button/menu_button.cc
 @@ -186,7 +186,7 @@ bool MenuButton::IsTriggerableEventType(const ui::Event& event) {
@@ -186,7 +187,7 @@ index 0e4194e..736e2c3 100644
 +
  }  // namespace views
 diff --git ui/views/controls/button/menu_button.h ui/views/controls/button/menu_button.h
-index 9adbee9..1b5151a 100644
+index 9adbee938488..1b5151afebab 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 {
@@ -210,7 +211,7 @@ index 9adbee9..1b5151a 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 05c9338..3d64177 100644
+index 05c933848e54..3d641771defa 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
 @@ -26,6 +26,7 @@
@@ -280,7 +281,7 @@ index 05c9338..3d64177 100644
  }
  
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index 38eb5f3..1298fc6 100644
+index 38eb5f3cd2bc..1298fc655a79 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
 @@ -146,6 +146,10 @@ class VIEWS_EXPORT Label : public View,
@@ -303,7 +304,7 @@ index 38eb5f3..1298fc6 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 e9125d6..e0849a7 100644
+index e9125d68fbd0..e0849a76b8fb 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
 @@ -2267,8 +2267,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -334,7 +335,7 @@ index e9125d6..e0849a7 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 @@
@@ -381,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 905690f..333148c 100644
+index 905690f8d402..333148c9798f 100644
 --- ui/views/controls/menu/menu_item_view.cc
 +++ ui/views/controls/menu/menu_item_view.cc
 @@ -763,7 +763,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
@@ -413,7 +414,7 @@ index 905690f..333148c 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) {
@@ -495,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 {
@@ -520,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 08ba198..595b375 100644
+index 08ba198141b2..595b3750c544 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)
@@ -536,7 +537,7 @@ index 08ba198..595b375 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 534e0c4..974d82d 100644
+index 534e0c4cb41d..974d82da99cb 100644
 --- ui/views/test/ui_controls_factory_desktop_aurax11.cc
 +++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
 @@ -147,10 +147,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
@@ -551,7 +552,7 @@ index 534e0c4..974d82d 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 7a8a7b3..e712ef7 100644
+index 7a8a7b327ebb..e712ef7175c3 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 ebf64e9..f242f5f 100644
+index ebf64e9cd8cd..f242f5f0fd41 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 ebf64e9..f242f5f 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 9a124eb..84d1c63 100644
+index 9a124eb9377e..84d1c63a1c4a 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
 @@ -77,6 +77,7 @@ class BrowserAccessibilityManager;
@@ -73,7 +73,7 @@ index 9a124eb..84d1c63 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 ed267bc..514eade 100644
+index ed267bcdaba6..514eadee14c6 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 ed267bc..514eade 100644
  #if defined(OS_WIN)
  #include "content/browser/frame_host/render_frame_host_impl.h"
  #include "content/public/common/context_menu_params.h"
-@@ -851,6 +855,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
+@@ -850,6 +854,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 ed267bc..514eade 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 995f917..dbbd883 100644
+index 995f917d9ebc..dbbd8833b6fe 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
 @@ -236,6 +236,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -122,7 +122,7 @@ index 995f917..dbbd883 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 4d0dfbe..7ef6ace 100644
+index 4d0dfbe80e50..7ef6ace1528a 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 4d0dfbe..7ef6ace 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 3f1c7bf..2658da5 100644
+index 3f1c7bffb61f..2658da5f35cc 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 @@ -264,6 +264,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -194,7 +194,7 @@ index 3f1c7bf..2658da5 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 e8a7a79..1c1057f 100644
+index e8a7a79c5342..1c1057f702f8 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 @@ -152,6 +152,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -279,7 +279,7 @@ index e8a7a79..1c1057f 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 cb18967..0c143d2 100644
+index cb189675734f..0c143d2d40bd 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 @@ -86,6 +86,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -327,7 +327,7 @@ index cb18967..0c143d2 100644
    base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_;
  
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index 32a50e8..06d39f0 100644
+index 32a50e8860a9..06d39f0f0ed6 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
 @@ -130,6 +130,7 @@ Widget::InitParams::InitParams(Type type)
@@ -362,7 +362,7 @@ index 32a50e8..06d39f0 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,10 +374,10 @@ 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 559f968..f679144 100644
+index d8086d862d59..5c9c498b1052 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -2650,8 +2650,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -2660,8 +2660,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
      active_mouse_tracking_flags_ = 0;
    } else if (event.type() == ui::ET_MOUSEWHEEL) {
      // Reroute the mouse wheel to the window under the pointer if applicable.

patch/patches/web_contents_1257_1565.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index 13cb8a2..4bd3e2f 100644
+index d927e85156ef..99f940eca2a2 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -1698,6 +1698,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -1699,6 +1699,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
    std::string unique_name;
    frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
  
@@ -15,7 +15,7 @@ index 13cb8a2..4bd3e2f 100644
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -1708,6 +1714,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -1709,6 +1715,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
@@ -23,7 +23,7 @@ index 13cb8a2..4bd3e2f 100644
  
    if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
      view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
-@@ -2272,6 +2279,15 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2280,6 +2287,15 @@ void WebContentsImpl::CreateNewWindow(
    create_params.renderer_initiated_creation =
        main_frame_route_id != MSG_ROUTING_NONE;
  
@@ -39,7 +39,7 @@ index 13cb8a2..4bd3e2f 100644
    WebContentsImpl* new_contents = NULL;
    if (!is_guest) {
      create_params.context = view_->GetNativeView();
-@@ -2301,7 +2317,7 @@ void WebContentsImpl::CreateNewWindow(
+@@ -2309,7 +2325,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(
@@ -48,7 +48,7 @@ index 13cb8a2..4bd3e2f 100644
      }
      // Save the created window associated with the route so we can show it
      // later.
-@@ -5345,7 +5361,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
+@@ -5387,7 +5403,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
  void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
      RenderViewHost* render_view_host) {
    RenderWidgetHostViewBase* rwh_view =
@@ -58,7 +58,7 @@ index 13cb8a2..4bd3e2f 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 06f8d80..4ec9757 100644
+index 06f8d801670e..4ec9757e8f6d 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
 @@ -68,9 +68,11 @@ class PageState;
@@ -100,7 +100,7 @@ index 06f8d80..4ec9757 100644
  
    // Creates a new WebContents.
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index e62fe35..f5b9fe0 100644
+index e62fe354fb3c..f5b9fe0bfe82 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
 @@ -43,11 +43,13 @@ 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 9a2e9f7..4379c0c 100644
+index 9a2e9f72bd08..4379c0c10593 100644
 --- third_party/WebKit/Source/core/dom/DOMImplementation.cpp
 +++ third_party/WebKit/Source/core/dom/DOMImplementation.cpp
 @@ -241,10 +241,11 @@ Document* DOMImplementation::createDocument(const String& type,
@@ -17,7 +17,7 @@ index 9a2e9f7..4379c0c 100644
                                                          .Top()
                                                          .GetSecurityContext()
 diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
-index 72aaf88..ec45bcb 100644
+index 72aaf883fc19..ec45bcb0005f 100644
 --- third_party/WebKit/Source/core/frame/LocalFrame.cpp
 +++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
 @@ -1012,7 +1012,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -30,7 +30,7 @@ index 72aaf88..ec45bcb 100644
  }
  
 diff --git third_party/WebKit/Source/core/page/Page.cpp third_party/WebKit/Source/core/page/Page.cpp
-index 17f01a7..4a0b13b 100644
+index 17f01a7f63a4..4a0b13bb93a2 100644
 --- third_party/WebKit/Source/core/page/Page.cpp
 +++ third_party/WebKit/Source/core/page/Page.cpp
 @@ -118,7 +118,8 @@ Page::Page(PageClients& page_clients)
@@ -102,7 +102,7 @@ index 17f01a7..4a0b13b 100644
    visitor->Trace(use_counter_);
    visitor->Trace(plugins_changed_observers_);
 diff --git third_party/WebKit/Source/core/page/Page.h third_party/WebKit/Source/core/page/Page.h
-index f854ba7..0fd317c 100644
+index f854ba7b440f..0fd317cc9307 100644
 --- third_party/WebKit/Source/core/page/Page.h
 +++ third_party/WebKit/Source/core/page/Page.h
 @@ -135,7 +135,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -126,7 +126,7 @@ index f854ba7..0fd317c 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 c4fb8d7..1d5945c 100644
+index c4fb8d7e103c..1d5945c5ecf5 100644
 --- third_party/WebKit/Source/platform/plugins/PluginData.cpp
 +++ third_party/WebKit/Source/platform/plugins/PluginData.cpp
 @@ -79,16 +79,18 @@ DEFINE_TRACE(PluginData) {
@@ -152,7 +152,7 @@ index c4fb8d7..1d5945c 100644
    for (PluginInfo* plugin_info : plugins_) {
      for (MimeClassInfo* mime_class_info : plugin_info->mimes_)
 diff --git third_party/WebKit/Source/platform/plugins/PluginData.h third_party/WebKit/Source/platform/plugins/PluginData.h
-index 6cb520cd..fdcaf93 100644
+index 6cb520cd5810..fdcaf938b28a 100644
 --- third_party/WebKit/Source/platform/plugins/PluginData.h
 +++ third_party/WebKit/Source/platform/plugins/PluginData.h
 @@ -93,7 +93,7 @@ class PLATFORM_EXPORT PluginData final
@@ -165,7 +165,7 @@ index 6cb520cd..fdcaf93 100644
  
    bool SupportsMimeType(const String& mime_type) const;
 diff --git third_party/WebKit/public/platform/Platform.h third_party/WebKit/public/platform/Platform.h
-index bf92050..6f4949d 100644
+index bf920505a9b7..6f4949df5106 100644
 --- third_party/WebKit/public/platform/Platform.h
 +++ third_party/WebKit/public/platform/Platform.h
 @@ -379,6 +379,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 5b6db09f..73c2260 100644
+index 5b6db09f1a1c..73c2260fce43 100644
 --- third_party/WebKit/Source/core/exported/WebViewBase.h
 +++ third_party/WebKit/Source/core/exported/WebViewBase.h
 @@ -157,7 +157,7 @@ class WebViewBase : public WebView, public RefCounted<WebViewBase> {
@@ -12,7 +12,7 @@ index 5b6db09f..73c2260 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 cf36ed93..e508f14 100644
+index 251384473c5e..4a30c28a7a88 100644
 --- third_party/WebKit/Source/web/ChromeClientImpl.cpp
 +++ third_party/WebKit/Source/web/ChromeClientImpl.cpp
 @@ -781,7 +781,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
@@ -25,7 +25,7 @@ index cf36ed93..e508f14 100644
  
    DCHECK(RuntimeEnabledFeatures::PagePopupEnabled());
 diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp
-index f7fc7dd..7aa4f01 100644
+index f7fc7dd686a5..7aa4f010aaf9 100644
 --- third_party/WebKit/Source/web/WebViewImpl.cpp
 +++ third_party/WebKit/Source/web/WebViewImpl.cpp
 @@ -320,6 +320,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -55,7 +55,7 @@ index f7fc7dd..7aa4f01 100644
  
  void WebViewImpl::SetBackgroundColorOverride(WebColor color) {
 diff --git third_party/WebKit/Source/web/WebViewImpl.h third_party/WebKit/Source/web/WebViewImpl.h
-index 5ea6e7b..5c7b4d8 100644
+index 5ea6e7bce7fb..5c7b4d821342 100644
 --- third_party/WebKit/Source/web/WebViewImpl.h
 +++ third_party/WebKit/Source/web/WebViewImpl.h
 @@ -345,7 +345,8 @@ class WEB_EXPORT WebViewImpl final
@@ -78,7 +78,7 @@ index 5ea6e7b..5c7b4d8 100644
    TransformationMatrix device_emulation_transform_;
  
 diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h
-index 1917509..536c147 100644
+index 191750930b23..536c147dd38f 100644
 --- third_party/WebKit/public/web/WebView.h
 +++ third_party/WebKit/public/web/WebView.h
 @@ -374,6 +374,7 @@ class WebView : protected WebWidget {

patch/patches/webui_2037.patch

@@ -1,18 +1,55 @@
 diff --git chrome/browser/ui/webui/net_internals/net_internals_ui.cc chrome/browser/ui/webui/net_internals/net_internals_ui.cc
-index 028eff9..b8390d2 100644
+index 57f7ed64a226..1ba3c90ac742 100644
 --- chrome/browser/ui/webui/net_internals/net_internals_ui.cc
 +++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc
-@@ -525,8 +525,7 @@ void NetInternalsMessageHandler::OnGetSessionNetworkStats(
+@@ -507,41 +507,31 @@ void NetInternalsMessageHandler::OnClearBrowserCache(
+ void NetInternalsMessageHandler::OnGetPrerenderInfo(
      const base::ListValue* list) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   SendJavascriptCommand(
+-  SendJavascriptCommand(
+-      "receivedPrerenderInfo",
+-      chrome_browser_net::GetPrerenderInfo(Profile::FromWebUI(web_ui())));
++  SendJavascriptCommand("receivedPrerenderInfo", nullptr);
+ }
+ 
+ void NetInternalsMessageHandler::OnGetHistoricNetworkStats(
+     const base::ListValue* list) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  SendJavascriptCommand("receivedHistoricNetworkStats",
+-                        chrome_browser_net::GetHistoricNetworkStats(
+-                            Profile::FromWebUI(web_ui())));
++  SendJavascriptCommand("receivedHistoricNetworkStats", nullptr);
+ }
+ 
+ void NetInternalsMessageHandler::OnGetSessionNetworkStats(
+     const base::ListValue* list) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  SendJavascriptCommand(
 -      "receivedSessionNetworkStats",
 -      chrome_browser_net::GetSessionNetworkStats(Profile::FromWebUI(web_ui())));
-+      "receivedSessionNetworkStats", nullptr);
++  SendJavascriptCommand("receivedSessionNetworkStats", nullptr);
  }
  
  void NetInternalsMessageHandler::OnGetExtensionInfo(
-@@ -622,9 +621,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
+     const base::ListValue* list) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  SendJavascriptCommand(
+-      "receivedExtensionInfo",
+-      chrome_browser_net::GetExtensionInfo(Profile::FromWebUI(web_ui())));
++  SendJavascriptCommand("receivedExtensionInfo", nullptr);
+ }
+ 
+ void NetInternalsMessageHandler::OnGetDataReductionProxyInfo(
+     const base::ListValue* list) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  SendJavascriptCommand("receivedDataReductionProxyInfo",
+-                        chrome_browser_net::GetDataReductionProxyInfo(
+-                            Profile::FromWebUI(web_ui())));
++  SendJavascriptCommand("receivedDataReductionProxyInfo", nullptr);
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -621,9 +611,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
  
    PrePopulateEventList();
  
@@ -33,7 +70,7 @@ index 028eff9..b8390d2 100644
  }
  
  void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo(
-@@ -1026,7 +1033,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() {
+@@ -1025,7 +1023,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() {
    std::set<net::URLRequestContext*> contexts;
    for (const auto& getter : context_getters_)
      contexts.insert(getter->GetURLRequestContext());
@@ -44,7 +81,7 @@ index 028eff9..b8390d2 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(
@@ -59,7 +96,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..5bd30ae 100644
+index 903cc543a242..5bd30ae82974 100644
 --- content/browser/resource_context_impl.h
 +++ content/browser/resource_context_impl.h
 @@ -28,6 +28,8 @@ CONTENT_EXPORT StreamContext* GetStreamContextForResourceContext(
@@ -72,23 +109,23 @@ index 903cc54..5bd30ae 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 7bd88ac..7fe77b3 100644
+index 3a3ef6994df0..046e535fd6cb 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
 @@ -5045,7 +5045,7 @@ Keep your key file in a safe place. You will need it to create new versions of y

patch/patches/win_rt_2274.patch

@@ -0,0 +1,18 @@
+diff --git content/common/sandbox_win.cc content/common/sandbox_win.cc
+index 54e31d365696..8a2374e48b51 100644
+--- content/common/sandbox_win.cc
++++ content/common/sandbox_win.cc
+@@ -793,8 +793,11 @@ sandbox::ResultCode StartSandboxedProcess(
+ #endif
+ 
+   // Post-startup mitigations.
+-  mitigations = sandbox::MITIGATION_STRICT_HANDLE_CHECKS |
+-                sandbox::MITIGATION_DLL_SEARCH_ORDER;
++  mitigations = sandbox::MITIGATION_DLL_SEARCH_ORDER;
++  if (!browser_command_line.HasSwitch("win-rt-app")) {
++    // Don't enable this mitigation in WinRT apps. See issue #2274.
++    mitigations |= sandbox::MITIGATION_STRICT_HANDLE_CHECKS;
++  }
+ 
+   result = policy->SetDelayedProcessMitigations(mitigations);
+   if (result != sandbox::SBOX_ALL_OK)

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 @@

tests/cefclient/browser/main_message_loop_multithreaded_win.cc

@@ -140,7 +140,7 @@ MainMessageLoopMultithreadedWin::MessageWndProc(HWND hWnd,
     task->Release();
   } else {
     switch (message) {
-      case WM_DESTROY:
+      case WM_NCDESTROY:
         // Clear the reference to |self|.
         SetUserDataPtr(hWnd, NULL);
         break;

tests/cefclient/browser/root_window_win.cc

@@ -614,7 +614,7 @@ LRESULT CALLBACK RootWindowWin::RootWndProc(HWND hWnd,
       SetUserDataPtr(hWnd, NULL);
       self->hwnd_ = NULL;
       self->OnDestroyed();
-      return 0;
+      break;
   }
 
   return DefWindowProc(hWnd, message, wParam, lParam);

tests/ceftests/os_rendering_unittest.cc

@@ -969,14 +969,14 @@ class OSRTestHandler : public RoutingTestHandler,
     return false;
   }
 
-  void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) {
+  void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) override {
     if (test_type_ == OSR_TEST_TAKE_FOCUS) {
       EXPECT_TRUE(true);
       DestroySucceededTestSoon();
     }
   }
 
-  void OnGotFocus(CefRefPtr<CefBrowser> browser) {
+  void OnGotFocus(CefRefPtr<CefBrowser> browser) override {
     if (test_type_ == OSR_TEST_GOT_FOCUS) {
       EXPECT_TRUE(true);
       DestroySucceededTestSoon();

tools/make_distrib.py

@@ -670,6 +670,7 @@ if platform == 'windows':
       'obj\\base\\base.lib',
       'obj\\base\\base_static.lib',
       'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib',
+      'obj\\base\\win\\pe_image.lib',
       cef_sandbox_lib,
       'obj\\sandbox\\win\\sandbox.lib',
   ]