Massively simplify the NetworkChangeNotifier infrastructure:...

webkit/tools/test_shell/test_shell_request_context.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 "webkit/tools/test_shell/test_shell_request_context.h"
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "net/base/cookie_monster.h"
@@ skipping 39 matching lines @@
   //  non-functional on linux in this context because of v8 threading
   //  issues.
   // TODO(port): rename "linux" to some nonspecific unix.
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       new net::ProxyConfigServiceFixed(net::ProxyConfig()));
 #else
   // Use the system proxy settings.
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       net::ProxyService::CreateSystemProxyConfigService(NULL, NULL));
 #endif
-  host_resolver_ = net::CreateSystemHostResolver(NULL);
+  host_resolver_ = net::CreateSystemHostResolver();
   proxy_service_ = net::ProxyService::Create(proxy_config_service.release(),
-                                             false, NULL, NULL, NULL, NULL);
+                                             false, NULL, NULL, NULL);
   ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
 
   http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault();
 
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
       cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
 
   net::HttpCache* cache =
-      new net::HttpCache(NULL, host_resolver_, proxy_service_,
-                         ssl_config_service_, http_auth_handler_factory_,
-                         NULL, NULL, backend);
+      new net::HttpCache(host_resolver_, proxy_service_, ssl_config_service_,
+                         http_auth_handler_factory_, NULL, NULL, backend);
 
   cache->set_mode(cache_mode);
   http_transaction_factory_ = cache;
 
   ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
   delete http_auth_handler_factory_;
   delete static_cast<net::StaticCookiePolicy*>(cookie_policy_);
 }
 
 const std::string& TestShellRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }