Massively simplify the NetworkChangeNotifier infrastructure:...

net/http/http_network_layer_unittest.cc

Index: net/http/http_network_layer_unittest.cc
===================================================================
--- net/http/http_network_layer_unittest.cc	(revision 50775)
+++ net/http/http_network_layer_unittest.cc	(working copy)
@@ -16,9 +16,9 @@
 };
 
 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
-  net::HttpNetworkLayer factory(
-      NULL, NULL, new net::MockHostResolver, net::ProxyService::CreateNull(),
-      new net::SSLConfigServiceDefaults, NULL, NULL, NULL);
+  net::HttpNetworkLayer factory(NULL, new net::MockHostResolver,
+      net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL,
+      NULL, NULL);
 
   scoped_ptr<net::HttpTransaction> trans;
   int rv = factory.CreateTransaction(&trans);
@@ -27,9 +27,9 @@
 }
 
 TEST_F(HttpNetworkLayerTest, Suspend) {
-  net::HttpNetworkLayer factory(
-      NULL, NULL, new net::MockHostResolver, net::ProxyService::CreateNull(),
-      new net::SSLConfigServiceDefaults, NULL, NULL, NULL);
+  net::HttpNetworkLayer factory(NULL, new net::MockHostResolver,
+      net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL,
+      NULL, NULL);
 
   scoped_ptr<net::HttpTransaction> trans;
   int rv = factory.CreateTransaction(&trans);
@@ -67,11 +67,9 @@
                                      data_writes, arraysize(data_reads));
   mock_socket_factory.AddSocketDataProvider(&data);
 
-  net::HttpNetworkLayer factory(&mock_socket_factory, NULL,
-                                new net::MockHostResolver,
-                                net::ProxyService::CreateNull(),
-                                new net::SSLConfigServiceDefaults,
-                                NULL, NULL, NULL);
+  net::HttpNetworkLayer factory(&mock_socket_factory, new net::MockHostResolver,
+      net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL,
+      NULL, NULL);
 
   TestCompletionCallback callback;