Massively simplify the NetworkChangeNotifier infrastructure:...

chrome_frame/test/test_server_test.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 <windows.h>
 #include <wininet.h>
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/scoped_handle_win.h"
@@ skipping 43 matching lines @@
     return h_;
   }
 
  protected:
   HINTERNET h_;
 };
 
 class URLRequestTestContext : public URLRequestContext {
  public:
   URLRequestTestContext() {
-    host_resolver_ = net::CreateSystemHostResolver(NULL);
+    host_resolver_ = net::CreateSystemHostResolver();
     proxy_service_ = net::ProxyService::CreateNull();
     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);
   }
 
   virtual ~URLRequestTestContext() {
     delete http_transaction_factory_;
     delete http_auth_handler_factory_;
   }
 };
 
@@ skipping 105 matching lines @@
     EXPECT_EQ(file.accessed(), 1);
     EXPECT_EQ(redir.accessed(), 1);
 
     EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos);
     EXPECT_TRUE(file_task.response().find("function") != std::string::npos);
     EXPECT_TRUE(goog_task.response().find("<title>") != std::string::npos);
   } else {
     ::TerminateThread(worker, ~0);
   }
 }