Massively simplify the NetworkChangeNotifier infrastructure:...

net/proxy/proxy_script_fetcher_unittest.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 "net/proxy/proxy_script_fetcher.h"
 
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "net/base/net_util.h"
@@ skipping 14 matching lines @@
 struct FetchResult {
   int code;
   std::string bytes;
 };
 
 // A non-mock URL request which can access http:// and file:// urls.
 class RequestContext : public URLRequestContext {
  public:
   RequestContext() {
     net::ProxyConfig no_proxy;
-    host_resolver_ = net::CreateSystemHostResolver(NULL);
+    host_resolver_ = net::CreateSystemHostResolver();
     proxy_service_ = net::ProxyService::CreateFixed(no_proxy);
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
 
-    http_transaction_factory_ =
-        new net::HttpCache(
-            net::HttpNetworkLayer::CreateFactory(
-                NULL, host_resolver_, proxy_service_, ssl_config_service_,
-                NULL, NULL, NULL),
-            net::HttpCache::DefaultBackend::InMemory(0));
+    http_transaction_factory_ = new net::HttpCache(
+        net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
+            ssl_config_service_, NULL, NULL, NULL),
+        net::HttpCache::DefaultBackend::InMemory(0));
   }
 
  private:
   ~RequestContext() {
     delete http_transaction_factory_;
   }
 };
 
 // Required to be in net namespace by FRIEND_TEST.
 namespace net {
@@ skipping 266 matching lines @@
     std::string bytes;
     TestCompletionCallback callback;
     int result = pac_fetcher->Fetch(url, &bytes, &callback);
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
     EXPECT_EQ("This was encoded as UTF-16BE.\n", bytes);
   }
 }
 
 }  // namespace net