Convert //android_webview to use std::unique_ptr

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 726883f7cb18b2cfa6b4d2f1326fd5ea93db5017..4b959ae54cacc5f52f83007e340893cbdafdba98 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -20,6 +20,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
@@ -95,38 +96,39 @@ void ApplyCmdlineOverridesToNetworkSessionParams(
   }
 }
 
-scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
+std::unique_ptr<net::URLRequestJobFactory> CreateJobFactory(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
-  scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
+  std::unique_ptr<AwURLRequestJobFactory> aw_job_factory(
+      new AwURLRequestJobFactory);
   // Note that the registered schemes must also be specified in
   // AwContentBrowserClient::IsHandledURL.
   bool set_protocol = aw_job_factory->SetProtocolHandler(
       url::kFileScheme,
-      make_scoped_ptr(new net::FileProtocolHandler(
+      base::WrapUnique(new net::FileProtocolHandler(
           content::BrowserThread::GetBlockingPool()
               ->GetTaskRunnerWithShutdownBehavior(
                   base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
-      url::kDataScheme, make_scoped_ptr(new net::DataProtocolHandler()));
+      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler()));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
       url::kBlobScheme,
-      make_scoped_ptr((*protocol_handlers)[url::kBlobScheme].release()));
+      base::WrapUnique((*protocol_handlers)[url::kBlobScheme].release()));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
       url::kFileSystemScheme,
-      make_scoped_ptr((*protocol_handlers)[url::kFileSystemScheme].release()));
+      base::WrapUnique((*protocol_handlers)[url::kFileSystemScheme].release()));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
       content::kChromeUIScheme,
-      make_scoped_ptr(
+      base::WrapUnique(
           (*protocol_handlers)[content::kChromeUIScheme].release()));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
       content::kChromeDevToolsScheme,
-      make_scoped_ptr(
+      base::WrapUnique(
           (*protocol_handlers)[content::kChromeDevToolsScheme].release()));
   DCHECK(set_protocol);
   protocol_handlers->clear();
@@ -150,13 +152,14 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
 
   // The chain of responsibility will execute the handlers in reverse to the
   // order in which the elements of the chain are created.
-  scoped_ptr<net::URLRequestJobFactory> job_factory(std::move(aw_job_factory));
+  std::unique_ptr<net::URLRequestJobFactory> job_factory(
+      std::move(aw_job_factory));
   for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
            request_interceptors.rbegin();
        i != request_interceptors.rend();
        ++i) {
     job_factory.reset(new net::URLRequestInterceptingJobFactory(
-        std::move(job_factory), make_scoped_ptr(*i)));
+        std::move(job_factory), base::WrapUnique(*i)));
   }
   request_interceptors.weak_clear();
 
@@ -167,7 +170,7 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
 
 AwURLRequestContextGetter::AwURLRequestContextGetter(
     const base::FilePath& cache_path,
-    scoped_ptr<net::ProxyConfigService> config_service,
+    std::unique_ptr<net::ProxyConfigService> config_service,
     PrefService* user_pref_service)
     : cache_path_(cache_path),
       net_log_(new net::NetLog()),
@@ -201,7 +204,8 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   DCHECK(!url_request_context_);
 
   net::URLRequestContextBuilder builder;
-  scoped_ptr<AwNetworkDelegate> aw_network_delegate(new AwNetworkDelegate());
+  std::unique_ptr<AwNetworkDelegate> aw_network_delegate(
+      new AwNetworkDelegate());
 
   AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
   DCHECK(browser_context);
@@ -214,7 +218,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
 #endif
   DCHECK(proxy_config_service_.get());
-  scoped_ptr<net::ChannelIDService> channel_id_service;
+  std::unique_ptr<net::ChannelIDService> channel_id_service;
   if (TokenBindingManager::GetInstance()->is_enabled()) {
     base::FilePath channel_id_path =
         browser_context->GetPath().Append(kChannelIDFilename);
@@ -236,7 +240,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
       std::move(proxy_config_service_), net_log_.get()));
   builder.set_net_log(net_log_.get());
   builder.SetCookieAndChannelIdStores(
-      make_scoped_ptr(new AwCookieStoreWrapper()),
+      base::WrapUnique(new AwCookieStoreWrapper()),
       std::move(channel_id_service));
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
@@ -254,8 +258,9 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   builder.set_http_network_session_params(network_session_params);
   builder.SetSpdyAndQuicEnabled(true, false);
 
-  scoped_ptr<net::MappedHostResolver> host_resolver(new net::MappedHostResolver(
-      net::HostResolver::CreateDefaultResolver(nullptr)));
+  std::unique_ptr<net::MappedHostResolver> host_resolver(
+      new net::MappedHostResolver(
+          net::HostResolver::CreateDefaultResolver(nullptr)));
   ApplyCmdlineOverridesToHostResolver(host_resolver.get());
   builder.SetHttpAuthHandlerFactory(
       CreateAuthHandlerFactory(host_resolver.get()));
@@ -303,7 +308,7 @@ void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
       request_options()->SetKeyOnIO(key);
 }
 
-scoped_ptr<net::HttpAuthHandlerFactory>
+std::unique_ptr<net::HttpAuthHandlerFactory>
 AwURLRequestContextGetter::CreateAuthHandlerFactory(
     net::HostResolver* resolver) {
   DCHECK(resolver);