[net] Change factory methods for HostResolver and HostCache to return a scoped_ptr

chrome/browser/net/connection_tester.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 "chrome/browser/net/connection_tester.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 124 matching lines @@
  private:
   // Creates a host resolver for |experiment|. On success returns net::OK and
   // fills |host_resolver| with a new pointer. Otherwise returns a network
   // error code.
   int CreateHostResolver(
       ConnectionTester::HostResolverExperiment experiment,
       scoped_ptr<net::HostResolver>* host_resolver) {
     // Create a vanilla HostResolver that disables caching.
     const size_t kMaxJobs = 50u;
     const size_t kMaxRetryAttempts = 4u;
-    net::HostResolver* impl = net::CreateNonCachingSystemHostResolver(
+    *host_resolver = net::HostResolver::CreateSystemResolver(
         kMaxJobs,
         kMaxRetryAttempts,
+        false /* use_cache */,
+        false /* use_async */,
         NULL /* NetLog */);
 
-    host_resolver->reset(impl);
-
     // Modify it slightly based on the experiment being run.
     switch (experiment) {
       case ConnectionTester::HOST_RESOLVER_EXPERIMENT_PLAIN:
         return net::OK;
       case ConnectionTester::HOST_RESOLVER_EXPERIMENT_DISABLE_IPV6:
-        impl->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
+        (*host_resolver)->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
         return net::OK;
       case ConnectionTester::HOST_RESOLVER_EXPERIMENT_IPV6_PROBE: {
         // Note that we don't use impl->ProbeIPv6Support() since that finishes
         // asynchronously and may not take effect in time for the test.
         // So instead we will probe synchronously (might take 100-200 ms).
         net::AddressFamily family = net::TestIPv6Support().ipv6_supported ?
             net::ADDRESS_FAMILY_UNSPECIFIED : net::ADDRESS_FAMILY_IPV4;
-        impl->SetDefaultAddressFamily(family);
+        (*host_resolver)->SetDefaultAddressFamily(family);
         return net::OK;
       }
       default:
         NOTREACHED();
         return net::ERR_UNEXPECTED;
     }
   }
 
   // Creates a proxy service for |experiment|. On success returns net::OK
   // and fills |experiment_proxy_service| with a new pointer. Otherwise returns
@@ skipping 349 matching lines @@
 
   // Notify the delegate of completion.
   delegate_->OnCompletedConnectionTestExperiment(current, result);
 
   if (remaining_experiments_.empty()) {
     delegate_->OnCompletedConnectionTestSuite();
   } else {
     StartNextExperiment();
   }
 }