Massively simplify the NetworkChangeNotifier infrastructure:...

net/spdy/spdy_session_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/spdy/spdy_io_buffer.h"
 
 #include "googleurl/src/gurl.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_network_session.h"
@@ skipping 22 matching lines @@
 
 // Helper to manage the lifetimes of the dependencies for a
 // SpdyNetworkTransaction.
 class SessionDependencies {
  public:
   // Default set of dependencies -- "null" proxy service.
   SessionDependencies()
       : host_resolver(new MockHostResolver),
         proxy_service(ProxyService::CreateNull()),
         ssl_config_service(new SSLConfigServiceDefaults),
-        spdy_session_pool(new SpdySessionPool(NULL)) {
+        spdy_session_pool(new SpdySessionPool()) {
   }
 
   scoped_refptr<MockHostResolverBase> host_resolver;
   scoped_refptr<ProxyService> proxy_service;
   scoped_refptr<SSLConfigService> ssl_config_service;
   MockClientSocketFactory socket_factory;
   scoped_refptr<SpdySessionPool> spdy_session_pool;
 };
 
 HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
-  return new HttpNetworkSession(NULL,
-                                session_deps->host_resolver,
+  return new HttpNetworkSession(session_deps->host_resolver,
                                 session_deps->proxy_service,
                                 &session_deps->socket_factory,
                                 session_deps->ssl_config_service,
                                 session_deps->spdy_session_pool,
                                 NULL,
                                 NULL,
                                 NULL);
 }
 
 // Test the SpdyIOBuffer class.
@@ skipping 177 matching lines @@
   session = NULL;
   spdy_session_pool->CloseAllSessions();
 
   // RunAllPending needs to be called here because the
   // ClientSocketPoolBase posts a task to clean up and destroy the
   // underlying socket.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace net