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

diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 8ba7534..31e4001 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -24,8 +24,6 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_transaction.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/client_socket_factory.h"
-#include "net/spdy/spdy_session_pool.h"
 
 void usage(const char* program_name) {
   printf("usage: %s --url=<url>  [--n=<clients>] [--stats] [--use_cache]\n",
@@ -151,20 +149,16 @@ int main(int argc, char**argv) {
   net::HttpTransactionFactory* factory = NULL;
   scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
+
+  net::HttpNetworkSession::Params session_params;
+  session_params.host_resolver = host_resolver.get();
+  session_params.cert_verifier = cert_verifier.get();
+  session_params.proxy_service = proxy_service;
+  session_params.http_auth_handler_factory = http_auth_handler_factory.get();
+  session_params.ssl_config_service = ssl_config_service;
+
   scoped_refptr<net::HttpNetworkSession> network_session(
-      new net::HttpNetworkSession(
-          host_resolver.get(),
-          cert_verifier.get(),
-          NULL /* 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.get(),
-          NULL,
-          NULL));
+      new net::HttpNetworkSession(session_params));
   if (use_cache) {
     factory = new net::HttpCache(network_session,
                                  net::HttpCache::DefaultBackend::InMemory(0));