Shift URLRequestContextStorage over to taking scoped_ptrs.

net/url_request/url_request_context_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 239 matching lines @@
 void URLRequestContextBuilder::SetHttpServerProperties(
     scoped_ptr<HttpServerProperties> http_server_properties) {
   http_server_properties_ = http_server_properties.Pass();
 }
 
 scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
   scoped_ptr<ContainerURLRequestContext> context(
       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_) {
     host_resolver_ = HostResolver::CreateDefaultResolver(context->net_log());
   }
   storage->set_host_resolver(host_resolver_.Pass());
 
   if (!proxy_service_) {
     // TODO(willchan): Switch to using this code when
     // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
   #if defined(OS_LINUX) || defined(OS_ANDROID)
     ProxyConfigService* proxy_config_service = proxy_config_service_.release();
   #else
     ProxyConfigService* proxy_config_service = NULL;
     if (proxy_config_service_) {
       proxy_config_service = proxy_config_service_.release();
     } else {
       proxy_config_service = ProxyService::CreateSystemProxyConfigService(
           base::ThreadTaskRunnerHandle::Get().get(),
           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());
     storage->set_channel_id_service(channel_id_service_.Pass());
   } else {
     storage->set_cookie_store(new CookieMonster(NULL, NULL));
     // TODO(mmenke):  This always creates a file thread, even when it ends up
     // not being used.  Consider lazily creating the thread.
     storage->set_channel_id_service(make_scoped_ptr(new ChannelIDService(
         new DefaultChannelIDStore(NULL), context->GetFileTaskRunner())));
   }
 
   if (sdch_enabled_) {
     storage->set_sdch_manager(
         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>(
             new TransportSecurityPersister(context->transport_security_state(),
                                            transport_security_persister_path_,
                                            context->GetFileTaskRunner(),
                                            false)));
   }
 
   if (http_server_properties_) {
     storage->set_http_server_properties(http_server_properties_.Pass());
   } else {
     storage->set_http_server_properties(
         scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
   }
 
   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();
   network_session_params.cert_verifier = context->cert_verifier();
   network_session_params.transport_security_state =
       context->transport_security_state();
   network_session_params.proxy_service = context->proxy_service();
   network_session_params.ssl_config_service =
       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();
 
   network_session_params.ignore_certificate_errors =
       http_network_session_params_.ignore_certificate_errors;
   network_session_params.host_mapping_rules =
       http_network_session_params_.host_mapping_rules;
   network_session_params.testing_fixed_http_port =
       http_network_session_params_.testing_fixed_http_port;
   network_session_params.testing_fixed_https_port =
       http_network_session_params_.testing_fixed_https_port;
   network_session_params.use_alternative_services =
       http_network_session_params_.use_alternative_services;
   network_session_params.trusted_spdy_proxy =
       http_network_session_params_.trusted_spdy_proxy;
   network_session_params.next_protos = http_network_session_params_.next_protos;
   network_session_params.enable_quic = http_network_session_params_.enable_quic;
   network_session_params.enable_insecure_quic =
       http_network_session_params_.enable_insecure_quic;
   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();
     HttpCache::BackendFactory* http_cache_backend = NULL;
     if (http_cache_params_.type == HttpCacheParams::DISK) {
       http_cache_backend = new HttpCache::DefaultBackend(
           DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path,
           http_cache_params_.max_size, context->GetFileTaskRunner());
     } else {
       http_cache_backend =
           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_)
     job_factory->SetProtocolHandler("data", new DataProtocolHandler);
 
 #if !defined(DISABLE_FILE_SUPPORT)
   if (file_enabled_) {
     job_factory->SetProtocolHandler(
         "file", new FileProtocolHandler(context->GetFileTaskRunner()));
   }
@@ skipping 13 matching lines @@
     // Set up interceptors in the reverse order.
 
     for (ScopedVector<net::URLRequestInterceptor>::reverse_iterator i =
              url_request_interceptors_.rbegin();
          i != url_request_interceptors_.rend(); ++i) {
       top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
           top_job_factory.Pass(), make_scoped_ptr(*i)));
     }
     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();
 }
 
 }  // namespace net