Shift URLRequestContextStorage over to taking scoped_ptrs.

ios/web/shell/shell_url_request_context_getter.cc

 // Copyright 2014 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 "ios/web/shell/shell_url_request_context_getter.h"
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/threading/worker_pool.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/web/public/web_client.h"
 #include "ios/web/public/web_thread.h"
 #include "ios/web/shell/shell_network_delegate.h"
 #include "net/base/cache_type.h"
 #include "net/cert/cert_verifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
@@ skipping 56 matching lines @@
             web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
                 web::WebThread::GetBlockingPool()->GetSequenceToken()),
             true, nullptr);
     scoped_refptr<net::CookieStoreIOS> cookie_store =
         new net::CookieStoreIOS(persistent_store.get());
     storage_->set_cookie_store(cookie_store.get());
     net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get());
 
     std::string user_agent = web::GetWebClient()->GetUserAgent(false);
     storage_->set_http_user_agent_settings(
-        new net::StaticHttpUserAgentSettings("en-us,en", user_agent));
+        make_scoped_ptr(
+            new net::StaticHttpUserAgentSettings("en-us,en", user_agent))
+            .Pass());
     storage_->set_proxy_service(
         net::ProxyService::CreateUsingSystemProxyResolver(
             proxy_config_service_.release(), 0,
             url_request_context_->net_log()));
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
 
-    net::TransportSecurityState* transport_security_state =
-        new net::TransportSecurityState();
-    storage_->set_transport_security_state(transport_security_state);
+    storage_->set_transport_security_state(
+        make_scoped_ptr(new net::TransportSecurityState()));
     transport_security_persister_.reset(new net::TransportSecurityPersister(
-        transport_security_state, base_path_, file_task_runner_, false));
+        url_request_context_->transport_security_state(), base_path_,
+        file_task_runner_, false));
     storage_->set_channel_id_service(make_scoped_ptr(
         new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
                                   base::WorkerPool::GetTaskRunner(true))));
     storage_->set_http_server_properties(scoped_ptr<net::HttpServerProperties>(
         new net::HttpServerPropertiesImpl()));
 
     scoped_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(
             url_request_context_->net_log()));
     storage_->set_http_auth_handler_factory(
@@ skipping 19 matching lines @@
         url_request_context_->http_server_properties();
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
 
     base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
     net::HttpCache::DefaultBackend* main_backend =
         new net::HttpCache::DefaultBackend(net::DISK_CACHE,
                                            net::CACHE_BACKEND_DEFAULT,
                                            cache_path, 0, cache_task_runner_);
 
-    net::HttpCache* main_cache =
-        new net::HttpCache(network_session_params, main_backend);
-    storage_->set_http_transaction_factory(main_cache);
+    storage_->set_http_transaction_factory(
+        make_scoped_ptr(
+            new net::HttpCache(network_session_params, main_backend))
+            .Pass());
 
     scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
         new net::URLRequestJobFactoryImpl());
     bool set_protocol = job_factory->SetProtocolHandler(
         "data", make_scoped_ptr(new net::DataProtocolHandler));
     DCHECK(set_protocol);
 
-    storage_->set_job_factory(job_factory.release());
+    storage_->set_job_factory(job_factory.Pass());
   }
 
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
 }  // namespace web