Shift URLRequestContextStorage over to taking scoped_ptrs.

net/proxy/proxy_script_fetcher_impl_unittest.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/proxy/proxy_script_fetcher_impl.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 43 matching lines @@
   base::string16 text;
 };
 
 // A non-mock URL request which can access http:// and file:// urls, in the case
 // the tests were built with file support.
 class RequestContext : public URLRequestContext {
  public:
   RequestContext() : storage_(this) {
     ProxyConfig no_proxy;
     storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
-    storage_.set_cert_verifier(new MockCertVerifier);
-    storage_.set_transport_security_state(new TransportSecurityState);
+    storage_.set_cert_verifier(make_scoped_ptr(new MockCertVerifier).Pass());
+    storage_.set_transport_security_state(
+        make_scoped_ptr(new TransportSecurityState));
     storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy));
     storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
     storage_.set_http_server_properties(
         scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
 
     HttpNetworkSession::Params params;
     params.host_resolver = host_resolver();
     params.cert_verifier = cert_verifier();
     params.transport_security_state = transport_security_state();
     params.proxy_service = proxy_service();
     params.ssl_config_service = ssl_config_service();
     params.http_server_properties = http_server_properties();
     scoped_refptr<HttpNetworkSession> network_session(
         new HttpNetworkSession(params));
-    storage_.set_http_transaction_factory(new HttpCache(
-        network_session.get(), HttpCache::DefaultBackend::InMemory(0)));
-    URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl();
+    storage_.set_http_transaction_factory(
+        make_scoped_ptr(new HttpCache(network_session.get(),
+                                      HttpCache::DefaultBackend::InMemory(0)))
+            .Pass());
+    scoped_ptr<URLRequestJobFactoryImpl> job_factory =
+        make_scoped_ptr(new URLRequestJobFactoryImpl());
 #if !defined(DISABLE_FILE_SUPPORT)
     job_factory->SetProtocolHandler("file",
                                     make_scoped_ptr(new FileProtocolHandler(
                                         base::ThreadTaskRunnerHandle::Get())));
 #endif
-    storage_.set_job_factory(job_factory);
+    storage_.set_job_factory(job_factory.Pass());
   }
 
   ~RequestContext() override { AssertNoURLRequests(); }
 
  private:
   URLRequestContextStorage storage_;
 };
 
 #if !defined(DISABLE_FILE_SUPPORT)
 // Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest.
@@ skipping 375 matching lines @@
     base::string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher.Fetch(url, &text, callback.callback());
     EXPECT_EQ(ERR_FAILED, result);
   }
 }
 
 }  // namespace
 
 }  // namespace net