Update to Chromium revision 2b3ae3b8 (#394939)

libcef/browser/net/chrome_scheme_handler.cc

@@ -190,7 +190,7 @@ class TemplateParser {
 using ResourcesMap = base::hash_map<std::string, int>;
 
 // TODO(rkc): Once we have a separate source for apps, remove '*/apps/' aliases.
-const char* kPathAliases[][2] = {
+const char* const kPathAliases[][2] = {
     {"../../../third_party/polymer/v1_0/components-chromium/", "polymer/v1_0/"},
     {"../../../third_party/web-animations-js/sources/",
      "polymer/v1_0/web-animations-js/"},
@@ -211,7 +211,7 @@ const ResourcesMap* CreateResourcesMap() {
     const std::string resource_name = kWebuiResources[i].name;
     const int resource_id = kWebuiResources[i].value;
     AddResource(resource_name, resource_id, result);
-    for (const char* (&alias)[2]: kPathAliases) {
+    for (const char* const (&alias)[2] : kPathAliases) {
       if (base::StartsWith(resource_name, alias[0],
                            base::CompareCase::SENSITIVE)) {
         AddResource(alias[1] + resource_name.substr(strlen(alias[0])),

libcef/browser/net/cookie_store_proxy.cc

@@ -115,15 +115,15 @@ void CefCookieStoreProxy::DeleteAllCreatedBetweenAsync(
   }
 }
 
-void CefCookieStoreProxy::DeleteAllCreatedBetweenForHostAsync(
-    const base::Time delete_begin,
-    const base::Time delete_end,
-    const GURL& url,
+void CefCookieStoreProxy::DeleteAllCreatedBetweenWithPredicateAsync(
+    const base::Time& delete_begin,
+    const base::Time& delete_end,
+    const CookiePredicate& predicate,
     const DeleteCallback& callback) {
   net::CookieStore* cookie_store = GetCookieStore();
   if (cookie_store) {
-    cookie_store->DeleteAllCreatedBetweenForHostAsync(delete_begin, delete_end,
-                                                      url, callback);
+    cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
+        delete_begin, delete_end, predicate, callback);
   }
 }
 

libcef/browser/net/cookie_store_proxy.h

@@ -59,10 +59,10 @@ class CefCookieStoreProxy : public net::CookieStore {
   void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin,
                                     const base::Time& delete_end,
                                     const DeleteCallback& callback) override;
-  void DeleteAllCreatedBetweenForHostAsync(
-      const base::Time delete_begin,
-      const base::Time delete_end,
-      const GURL& url,
+  void DeleteAllCreatedBetweenWithPredicateAsync(
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
+      const CookiePredicate& predicate,
       const DeleteCallback& callback) override;
   void DeleteSessionCookiesAsync(const DeleteCallback& callback) override;
   void FlushStore(const base::Closure& callback) override;

libcef/browser/net/scheme_handler.cc

@@ -10,6 +10,7 @@
 #include "libcef/browser/net/devtools_scheme_handler.h"
 #include "libcef/common/net/scheme_registration.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_constants.h"
@@ -60,7 +61,7 @@ void InstallInternalProtectedHandlers(
       protocol_handler.reset(
           scheme::WrapChromeProtocolHandler(
               request_manager,
-              make_scoped_ptr(it->second.release())).release());
+              base::WrapUnique(it->second.release())).release());
     } else {
       protocol_handler.reset(it->second.release());
     }
@@ -70,7 +71,7 @@ void InstallInternalProtectedHandlers(
     DCHECK(IsInternalProtectedScheme(scheme));
 
     bool set_protocol = job_factory->SetProtocolHandler(
-        scheme, make_scoped_ptr(protocol_handler.release()));
+        scheme, base::WrapUnique(protocol_handler.release()));
     DCHECK(set_protocol);
   }
 }

libcef/browser/net/url_request_context_getter_impl.cc

@@ -154,7 +154,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
 
     storage_->set_network_delegate(base::WrapUnique(new CefNetworkDelegate));
 
-    storage_->set_channel_id_service(make_scoped_ptr(
+    storage_->set_channel_id_service(base::WrapUnique(
         new net::ChannelIDService(
             new net::DefaultChannelIDStore(NULL),
             base::WorkerPool::GetTaskRunner(true))));
@@ -168,7 +168,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
     storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
     storage_->set_transport_security_state(
-        make_scoped_ptr(new net::TransportSecurityState));
+        base::WrapUnique(new net::TransportSecurityState));
 
     std::unique_ptr<net::ProxyService> system_proxy_service =
         ProxyServiceFactory::CreateProxyService(
@@ -232,8 +232,8 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
         settings_.ignore_certificate_errors ? true : false;
 
     storage_->set_http_network_session(
-        make_scoped_ptr(new net::HttpNetworkSession(network_session_params)));
-    storage_->set_http_transaction_factory(make_scoped_ptr(
+        base::WrapUnique(new net::HttpNetworkSession(network_session_params)));
+    storage_->set_http_transaction_factory(base::WrapUnique(
         new net::HttpCache(storage_->http_network_session(),
                            std::move(main_backend),
                            true /* set_up_quic_server_info */)));
@@ -267,7 +267,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
          i != request_interceptors_.rend();
          ++i) {
       top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
-          std::move(top_job_factory), make_scoped_ptr(*i)));
+          std::move(top_job_factory), base::WrapUnique(*i)));
     }
     request_interceptors_.weak_clear();
 

libcef/browser/net/url_request_manager.cc

@@ -16,6 +16,7 @@
 #include "libcef/common/request_impl.h"
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
@@ -201,7 +202,7 @@ void CefURLRequestManager::SetProtocolHandlerIfNecessary(
 
   bool set_protocol = job_factory_->SetProtocolHandler(
       scheme,
-      make_scoped_ptr(add ? new CefProtocolHandler(this, scheme) : NULL));
+      base::WrapUnique(add ? new CefProtocolHandler(this, scheme) : NULL));
   DCHECK(set_protocol);
 }