Massively simplify the NetworkChangeNotifier infrastructure:...

net/tools/fetch/fetch_client.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 "build/build_config.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
@@ skipping 115 matching lines @@
     usage(argv[0]);
   int client_limit = 1;
   if (parsed_command_line.HasSwitch("n"))
     StringToInt(parsed_command_line.GetSwitchValueASCII("n"), &client_limit);
   bool use_cache = parsed_command_line.HasSwitch("use-cache");
 
   // Do work here.
   MessageLoop loop(MessageLoop::TYPE_IO);
 
   scoped_refptr<net::HostResolver> host_resolver(
-      net::CreateSystemHostResolver(NULL));
+      net::CreateSystemHostResolver());
 
   scoped_refptr<net::ProxyService> proxy_service(
       net::ProxyService::CreateNull());
   scoped_refptr<net::SSLConfigService> ssl_config_service(
       net::SSLConfigService::CreateSystemSSLConfigService());
   net::HttpTransactionFactory* factory = NULL;
   scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault());
   if (use_cache) {
-    factory = new net::HttpCache(NULL, host_resolver, proxy_service,
-                                 ssl_config_service,
-                                 http_auth_handler_factory.get(),
-                                 NULL,
-                                 NULL,
-                                 net::HttpCache::DefaultBackend::InMemory(0));
+    factory = new net::HttpCache(host_resolver, proxy_service,
+        ssl_config_service, http_auth_handler_factory.get(), NULL, NULL,
+        net::HttpCache::DefaultBackend::InMemory(0));
   } else {
     factory = new net::HttpNetworkLayer(
-        net::ClientSocketFactory::GetDefaultFactory(), NULL, host_resolver,
+        net::ClientSocketFactory::GetDefaultFactory(), host_resolver,
         proxy_service, ssl_config_service, http_auth_handler_factory.get(),
-        NULL,
-        NULL);
+        NULL, NULL);
   }
 
   {
     StatsCounterTimer driver_time("FetchClient.total_time");
     StatsScope<StatsCounterTimer> scope(driver_time);
 
     Client** clients = new Client*[client_limit];
     for (int i = 0; i < client_limit; i++)
       clients[i] = new Client(factory, url);
 
@@ skipping 32 matching lines @@
       std::string name(table.GetRowName(index));
       if (name.length() > 0) {
         int value = table.GetRowValue(index);
         printf("%s:\t%d\n", name.c_str(), value);
       }
     }
     printf("</stats>\n");
   }
   return 0;
 }