Update to Chromium version 72.0.3626.0 (#612437)

- Windows: Can now build with either 10.0.17134 or 10.0.17763 SDK.

libcef/browser/browser_context_impl.cc

@@ -472,7 +472,6 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
   url_request_getter_ = new CefURLRequestContextGetterImpl(
       settings_, GetPrefs(), io_thread_runner, protocol_handlers,
       std::move(proxy_config_service), std::move(request_interceptors));
-  resource_context()->set_url_request_context_getter(url_request_getter_.get());
   return url_request_getter_.get();
 }
 

libcef/browser/browser_context_proxy.cc

@@ -233,8 +233,6 @@ CefBrowserContextProxy::GetOrCreateStoragePartitionProxy(
     scoped_refptr<CefURLRequestContextGetterProxy> url_request_getter =
         new CefURLRequestContextGetterProxy(handler_,
                                             parent_->request_context_getter());
-    resource_context()->set_url_request_context_getter(
-        url_request_getter.get());
     storage_partition_proxy_.reset(
         new CefStoragePartitionProxy(partition_impl, url_request_getter.get()));
 

libcef/browser/chrome_profile_stub.cc

@@ -73,10 +73,10 @@ PrefService* ChromeProfileStub::GetOffTheRecordPrefs() {
 base::OnceCallback<net::CookieStore*()>
 ChromeProfileStub::GetExtensionsCookieStoreGetter() {
   return base::BindOnce(
-      [](content::ResourceContext* context) {
-        return context->GetRequestContext()->cookie_store();
+      [](scoped_refptr<net::URLRequestContextGetter> context) {
+        return context->GetURLRequestContext()->cookie_store();
       },
-      GetResourceContext());
+      base::WrapRefCounted(GetRequestContext()));
 }
 
 bool ChromeProfileStub::IsSameProfile(Profile* profile) {

libcef/browser/content_browser_client.cc

@@ -734,7 +734,8 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
     // Propagate the following switches to the zygote command line (along with
     // any associated values) if present in the browser command line.
     static const char* const kSwitchNames[] = {
-        switches::kPpapiFlashPath, switches::kPpapiFlashVersion,
+        switches::kPpapiFlashPath,
+        switches::kPpapiFlashVersion,
     };
     command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
                                    arraysize(kSwitchNames));
@@ -1095,9 +1096,11 @@ void CefContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
 bool CefContentBrowserClient::WillCreateURLLoaderFactory(
     content::BrowserContext* browser_context,
     content::RenderFrameHost* frame,
+    int render_process_id,
     bool is_navigation,
     const url::Origin& request_initiator,
     network::mojom::URLLoaderFactoryRequest* factory_request,
+    network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client,
     bool* bypass_redirect_checks) {
   if (!extensions::ExtensionsEnabled())
     return false;
@@ -1106,7 +1109,8 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory(
       extensions::BrowserContextKeyedAPIFactory<extensions::WebRequestAPI>::Get(
           browser_context);
   bool use_proxy = web_request_api->MaybeProxyURLLoaderFactory(
-      frame, is_navigation, factory_request);
+      browser_context, frame, render_process_id, is_navigation, factory_request,
+      header_client);
   if (bypass_redirect_checks)
     *bypass_redirect_checks = use_proxy;
   return use_proxy;

libcef/browser/content_browser_client.h

@@ -143,9 +143,11 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   bool WillCreateURLLoaderFactory(
       content::BrowserContext* browser_context,
       content::RenderFrameHost* frame,
+      int render_process_id,
       bool is_navigation,
       const url::Origin& request_initiator,
       network::mojom::URLLoaderFactoryRequest* factory_request,
+      network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client,
       bool* bypass_redirect_checks) override;
 
   bool HandleExternalProtocol(

libcef/browser/osr/render_widget_host_view_osr.cc

@@ -150,12 +150,12 @@ class CefDelegatedFrameHostClient : public content::DelegatedFrameHostClient {
     return view_->GetDeviceScaleFactor();
   }
 
-  void AllocateNewSurfaceIdOnEviction() override {}
-
   std::vector<viz::SurfaceId> CollectSurfaceIdsForEviction() override {
     return view_->render_widget_host()->CollectSurfaceIdsForEviction();
   }
 
+  void InvalidateLocalSurfaceIdOnEviction() override {}
+
  private:
   CefRenderWidgetHostViewOSR* const view_;
 

libcef/browser/resource_context.cc

@@ -66,11 +66,6 @@ void CefResourceContext::RemoveUserData(const void* key) {
     content::ResourceContext::RemoveUserData(key);
 }
 
-net::URLRequestContext* CefResourceContext::GetRequestContext() {
-  CHECK(getter_.get());
-  return getter_->GetURLRequestContext();
-}
-
 std::unique_ptr<net::ClientCertStore>
 CefResourceContext::CreateClientCertStore() {
 #if defined(USE_NSS_CERTS)
@@ -96,12 +91,6 @@ void CefResourceContext::set_extensions_info_map(
   extension_info_map_ = extensions_info_map;
 }
 
-void CefResourceContext::set_url_request_context_getter(
-    CefURLRequestContextGetter* getter) {
-  DCHECK(!getter_.get());
-  getter_ = getter;
-}
-
 void CefResourceContext::set_parent(CefResourceContext* parent) {
   DCHECK(!parent_);
   DCHECK(parent);

libcef/browser/resource_context.h

@@ -37,13 +37,9 @@ class CefResourceContext : public content::ResourceContext {
   void SetUserData(const void* key, std::unique_ptr<Data> data) override;
   void RemoveUserData(const void* key) override;
 
-  // ResourceContext implementation.
-  net::URLRequestContext* GetRequestContext() override;
-
   std::unique_ptr<net::ClientCertStore> CreateClientCertStore();
 
   void set_extensions_info_map(extensions::InfoMap* extensions_info_map);
-  void set_url_request_context_getter(CefURLRequestContextGetter* getter);
   void set_parent(CefResourceContext* parent);
 
   // Remember the plugin load decision for plugin status requests that arrive
@@ -71,8 +67,6 @@ class CefResourceContext : public content::ResourceContext {
   CefRefPtr<CefRequestContextHandler> GetHandler() const { return handler_; }
 
  private:
-  scoped_refptr<CefURLRequestContextGetter> getter_;
-
   // Non-NULL when this object is owned by a CefBrowserContextProxy. |parent_|
   // is guaranteed to outlive this object because CefBrowserContextProxy has a
   // refptr to the CefBrowserContextImpl that owns |parent_|.