Shift URLRequestContextStorage over to taking scoped_ptrs.

components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc

 // Copyright 2015 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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h"
 
 #include <map>
 
 #include "base/prefs/testing_pref_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
@@ skipping 534 matching lines @@
         task_runner_, base::TimeDelta()));
   }
 }
 
 void DataReductionProxyTestContext::AttachToURLRequestContext(
       net::URLRequestContextStorage* request_context_storage) const {
   DCHECK(request_context_storage);
 
   // |request_context_storage| takes ownership of the network delegate.
   request_context_storage->set_network_delegate(
-      io_data()->CreateNetworkDelegate(
-          scoped_ptr<net::NetworkDelegate>(new net::TestNetworkDelegate()),
-          true).release());
+      io_data()
+          ->CreateNetworkDelegate(
+              make_scoped_ptr(new net::TestNetworkDelegate()).Pass(), true)
+          .Pass());
 
-  // |request_context_storage| takes ownership of the job factory.
   request_context_storage->set_job_factory(
-      new net::URLRequestInterceptingJobFactory(
+      make_scoped_ptr(new net::URLRequestInterceptingJobFactory(
           scoped_ptr<net::URLRequestJobFactory>(
               new net::URLRequestJobFactoryImpl()),
-          io_data()->CreateInterceptor().Pass()));
+          io_data()->CreateInterceptor().Pass())));
 }
 
 void DataReductionProxyTestContext::
     EnableDataReductionProxyWithSecureProxyCheckSuccess() {
   DCHECK(mock_socket_factory_);
   // This won't actually update the proxy config when using a test configurator.
   DCHECK(!(test_context_flags_ &
            DataReductionProxyTestContext::USE_TEST_CONFIGURATOR));
   // |settings_| needs to have been initialized, since a
   // |DataReductionProxyService| is needed in order to issue the secure proxy
@@ skipping 84 matching lines @@
     : prefs_(prefs) {
   DCHECK(prefs);
 }
 
 void DataReductionProxyTestContext::TestConfigStorer::StoreSerializedConfig(
     const std::string& serialized_config) {
   prefs_->SetString(prefs::kDataReductionProxyConfig, serialized_config);
 }
 
 }  // namespace data_reduction_proxy