Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/net/connection_tester.cc

 // Copyright (c) 2010 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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 35 matching lines @@
     rv = CreateProxyService(experiment.proxy_settings_experiment,
                             &proxy_service_);
     if (rv != net::OK)
       return rv;  // Failure.
 
     // The rest of the dependencies are standard, and don't depend on the
     // experiment being run.
     ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault();
-    http_transaction_factory_ =
-        new net::HttpCache(
-            net::HttpNetworkLayer::CreateFactory(NULL, host_resolver_,
-                                                 proxy_service_,
-                                                 ssl_config_service_,
-                                                 http_auth_handler_factory_,
-                                                 NULL,
-                                                 NULL),
-            net::HttpCache::DefaultBackend::InMemory(0));
+    http_transaction_factory_ = new net::HttpCache(
+        net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
+            ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
+        net::HttpCache::DefaultBackend::InMemory(0));
     // In-memory cookie store.
     cookie_store_ = new net::CookieMonster(NULL, NULL);
 
     return net::OK;
   }
 
  protected:
   virtual ~ExperimentURLRequestContext() {
     delete ftp_transaction_factory_;
     delete http_transaction_factory_;
     delete http_auth_handler_factory_;
   }
 
  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_refptr<net::HostResolver>* host_resolver) {
     // Create a vanilla HostResolver that disables caching.
     const size_t kMaxJobs = 50u;
-    scoped_refptr<net::HostResolverImpl> impl = new net::HostResolverImpl(
-        NULL, NULL, NULL, kMaxJobs);
+    scoped_refptr<net::HostResolverImpl> impl =
+        new net::HostResolverImpl(NULL, NULL, kMaxJobs);
 
     *host_resolver = 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);
         return net::OK;
@@ skipping 49 matching lines @@
     if (rv != net::OK)
       return rv;  // Failure.
 
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kSingleProcess)) {
       // We can't create a standard proxy resolver in single-process mode.
       // Rather than falling-back to some other implementation, fail.
       return net::ERR_NOT_IMPLEMENTED;
     }
 
-    *proxy_service = net::ProxyService::Create(
-        config_service.release(),
-        true, this, NULL, NULL, MessageLoop::current());
+    *proxy_service = net::ProxyService::Create(config_service.release(), true,
+        this, NULL, MessageLoop::current());
 
     return net::OK;
   }
 
   // Creates a proxy config service that pulls from the system proxy settings.
   // On success returns net::OK and fills |config_service| with a new pointer.
   // Otherwise returns a network error code.
   int CreateSystemProxyConfigService(
       scoped_ptr<net::ProxyConfigService>* config_service) {
 #if defined(OS_LINUX)
@@ skipping 224 matching lines @@
 
   // Notify the delegate of completion.
   delegate_->OnCompletedConnectionTestExperiment(current, result);
 
   if (remaining_experiments_.empty()) {
     delegate_->OnCompletedConnectionTestSuite();
   } else {
     StartNextExperiment();
   }
 }