Refactor HttpNetworkSession construction.

Introduce HttpNetworkSession::Params. This should make it easy to add new optionally NULL parameters. I also took this opportunity to eliminate some copy/pastes of TestURLRequestContext and make them use the original. I was also able to remove the need for ClientSocketFactory::GetDefaultFactory() calls and new SpdySessionPool() calls in most places.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6349028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73669 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 15 deletions

diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 41a9f35..e5d75cc 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -23,8 +23,6 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
-#include "net/socket/client_socket_factory.h"
-#include "net/spdy/spdy_session_pool.h"
 #include "net/proxy/proxy_service.h"
 
 namespace {
@@ -126,20 +124,14 @@ ServiceURLRequestContext::ServiceURLRequestContext(
   ssl_config_service_ = new net::SSLConfigServiceDefaults;
   http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
       host_resolver_);
+  net::HttpNetworkSession::Params session_params;
+  session_params.host_resolver = host_resolver_;
+  session_params.cert_verifier = cert_verifier_;
+  session_params.dnsrr_resolver = dnsrr_resolver_;
+  session_params.proxy_service = proxy_service_;
+  session_params.ssl_config_service = ssl_config_service_;
   scoped_refptr<net::HttpNetworkSession> network_session(
-      new net::HttpNetworkSession(
-          host_resolver_,
-          cert_verifier_,
-          dnsrr_resolver_,
-          NULL /* dns_cert_checker */,
-          NULL /* ssl_host_info_factory */,
-          proxy_service_,
-          net::ClientSocketFactory::GetDefaultFactory(),
-          ssl_config_service_,
-          new net::SpdySessionPool(NULL),
-          http_auth_handler_factory_,
-          NULL /* network_delegate */,
-          NULL /* net_log */));
+      new net::HttpNetworkSession(session_params));
   http_transaction_factory_ = new net::HttpCache(
       network_session,
       net::HttpCache::DefaultBackend::InMemory(0));