Shift URLRequestContextStorage over to taking scoped_ptrs.

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 31444e8c18c3db973af1ce733dfa3fbda33e597e..2250dbb4d489fc4eb5ae1df008e6053fbac405b8 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -257,18 +257,17 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
       new ContainerURLRequestContext(file_task_runner_));
   URLRequestContextStorage* storage = context->storage();
 
-  storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
-      accept_language_, user_agent_));
+  storage->set_http_user_agent_settings(scoped_ptr<HttpUserAgentSettings>(
+      new StaticHttpUserAgentSettings(accept_language_, user_agent_)));
 
   if (!network_delegate_)
     network_delegate_.reset(new BasicNetworkDelegate);
-  NetworkDelegate* network_delegate = network_delegate_.release();
-  storage->set_network_delegate(network_delegate);
+  storage->set_network_delegate(network_delegate_.Pass());
 
   if (net_log_) {
     context->set_net_log(net_log_);
   } else {
-    storage->set_net_log(new NetLog);
+    storage->set_net_log(make_scoped_ptr(new NetLog));
   }
 
   if (!host_resolver_) {
@@ -291,23 +290,23 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
           context->GetFileTaskRunner());
     }
   #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
-    proxy_service_.reset(
-        ProxyService::CreateUsingSystemProxyResolver(
-            proxy_config_service,
-            0,  // This results in using the default value.
-            context->net_log()));
+    proxy_service_ = ProxyService::CreateUsingSystemProxyResolver(
+        proxy_config_service,
+        0,  // This results in using the default value.
+        context->net_log());
   }
-  storage->set_proxy_service(proxy_service_.release());
+  storage->set_proxy_service(proxy_service_.Pass());
 
   storage->set_ssl_config_service(new SSLConfigServiceDefaults);
-  HttpAuthHandlerRegistryFactory* http_auth_handler_registry_factory =
-      HttpAuthHandlerRegistryFactory::CreateDefault(context->host_resolver());
+  scoped_ptr<HttpAuthHandlerRegistryFactory> http_auth_handler_registry_factory(
+      HttpAuthHandlerRegistryFactory::CreateDefault(context->host_resolver()));
   for (size_t i = 0; i < extra_http_auth_handlers_.size(); ++i) {
     http_auth_handler_registry_factory->RegisterSchemeFactory(
         extra_http_auth_handlers_[i].scheme,
         extra_http_auth_handlers_[i].factory);
   }
-  storage->set_http_auth_handler_factory(http_auth_handler_registry_factory);
+  storage->set_http_auth_handler_factory(
+      http_auth_handler_registry_factory.Pass());
 
   if (cookie_store_) {
     storage->set_cookie_store(cookie_store_.get());
@@ -325,7 +324,8 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
         scoped_ptr<net::SdchManager>(new SdchManager()).Pass());
   }
 
-  storage->set_transport_security_state(new TransportSecurityState());
+  storage->set_transport_security_state(
+      make_scoped_ptr(new TransportSecurityState()));
   if (!transport_security_persister_path_.empty()) {
     context->set_transport_security_persister(
         make_scoped_ptr<TransportSecurityPersister>(
@@ -344,11 +344,15 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
 
   storage->set_cert_verifier(CertVerifier::CreateDefault());
 
-  if (throttling_enabled_)
-    storage->set_throttler_manager(new URLRequestThrottlerManager());
+  if (throttling_enabled_) {
+    storage->set_throttler_manager(
+        make_scoped_ptr(new URLRequestThrottlerManager()));
+  }
 
-  if (backoff_enabled_)
-    storage->set_backoff_manager(new URLRequestBackoffManager());
+  if (backoff_enabled_) {
+    storage->set_backoff_manager(
+        make_scoped_ptr(new URLRequestBackoffManager()));
+  }
 
   HttpNetworkSession::Params network_session_params;
   network_session_params.host_resolver = context->host_resolver();
@@ -360,7 +364,7 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
       context->ssl_config_service();
   network_session_params.http_auth_handler_factory =
       context->http_auth_handler_factory();
-  network_session_params.network_delegate = network_delegate;
+  network_session_params.network_delegate = context->network_delegate();
   network_session_params.http_server_properties =
       context->http_server_properties();
   network_session_params.net_log = context->net_log();
@@ -384,7 +388,7 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
   network_session_params.quic_connection_options =
       http_network_session_params_.quic_connection_options;
 
-  HttpTransactionFactory* http_transaction_factory = NULL;
+  scoped_ptr<HttpTransactionFactory> http_transaction_factory;
   if (http_cache_enabled_) {
     network_session_params.channel_id_service =
         context->channel_id_service();
@@ -398,15 +402,15 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
           HttpCache::DefaultBackend::InMemory(http_cache_params_.max_size);
     }
 
-    http_transaction_factory = new HttpCache(
-        network_session_params, http_cache_backend);
+    http_transaction_factory.reset(
+        new HttpCache(network_session_params, http_cache_backend));
   } else {
     scoped_refptr<HttpNetworkSession> network_session(
         new HttpNetworkSession(network_session_params));
 
-    http_transaction_factory = new HttpNetworkLayer(network_session.get());
+    http_transaction_factory.reset(new HttpNetworkLayer(network_session.get()));
   }
-  storage->set_http_transaction_factory(http_transaction_factory);
+  storage->set_http_transaction_factory(http_transaction_factory.Pass());
 
   URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl;
   if (data_enabled_)
@@ -440,7 +444,7 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     }
     url_request_interceptors_.weak_clear();
   }
-  storage->set_job_factory(top_job_factory.release());
+  storage->set_job_factory(top_job_factory.Pass());
   // TODO(willchan): Support sdch.
 
   return context.Pass();