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, 8 insertions, 15 deletions

diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index deb5f20..706b591 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -80,8 +80,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/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
@@ -180,20 +178,15 @@ class ChromeFrameUploadRequestContext : public net::URLRequestContext {
         supported_schemes, url_security_manager_.get(), host_resolver_,
         std::string(), false, false);
 
+    net::HttpNetworkSession::Params session_params;
+    session_params.host_resolver = host_resolver_;
+    session_params.cert_verifier = cert_verifier_;
+    session_params.proxy_service = proxy_service_;
+    session_params.http_auth_handler_factory =
+        http_auth_handler_factory_;
+    session_params.ssl_config_service = ssl_config_service_;
     scoped_refptr<net::HttpNetworkSession> network_session =
-        new net::HttpNetworkSession(
-            host_resolver_,
-            cert_verifier_,
-            NULL /* dnsrr_resolver */,
-            NULL /* dns_cert_checker*/,
-            NULL /* ssl_host_info_factory */,
-            proxy_service_,
-            net::ClientSocketFactory::GetDefaultFactory(),
-            ssl_config_service_,
-            new net::SpdySessionPool(ssl_config_service_),
-            http_auth_handler_factory_,
-            network_delegate_,
-            NULL);
+        new net::HttpNetworkSession(session_params);
 
     http_transaction_factory_ = new net::HttpCache(
         network_session,