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 "base/prefs/testing_pref_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h"
@@ skipping 509 matching lines @@
         task_runner_, task_runner_, 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()

[Deprecated (see juliatuttle), 2015/09/08 15:39:42]

Is this what git cl format does? Separating the io_data() and the
->CreateNetworkDelegate seems unnecessary.

[Randy Smith (Not in Mondays), 2015/09/08 16:33:17]

Yeah, that's git cl format (changed back, re-ran, it corrected me again).  I'll
try to fix it and upload and see if any presubmit stuff objects.  ETA: Nope,
this directory requires using git cl format; I'm afraid that I'm just going to
take whatever it gives me.

+          ->CreateNetworkDelegate(
+              scoped_ptr<net::NetworkDelegate>(new net::TestNetworkDelegate()),

[pauljensen, 2015/08/28 13:38:02]

I see lots of places in this CL where you've added scoped_ptr<>() instead of
make_scoped_ptr(), I assume because an implicit upcast is needed.
I wonder if this could be changed to make_scoped_ptr(...).Pass()?
We used to use .PassAs<>() but that was eliminated; now just Pass() is required.
This would make things more consistent (i.e. using make_scoped_ptr in all
places).
Some directories forbid scoped_ptr<>():
https://code.google.com/p/chromium/codesearch#chromium/src/ui/PRESUBMIT.py&l=34

[Randy Smith (Not in Mondays), 2015/09/02 23:42:19]

So "Done", with the exception of places where I'm returning a null scoped_ptr of
a particular type; I'm not sure how to do that with make_scoped_ptr.  An example
is LayoutTestURLRequestContextGetter::GetProxyConfigService().  Any ideas of
what the right idiom is in that case?

+              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