Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

Eliminate lazy initialization of HttpNetworkSession in HttpNetworkLayer.
  * This eliminates the need to update parameters for HttpNetworkLayer, it just takes a HttpNetworkSession.
  * It is OK to eliminate lazy initialization since these variables are cheap.

BUG=none
TEST=none

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

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

1 files changed, 19 insertions, 16 deletions

diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 0d9682f..8ba7534 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -20,10 +20,12 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
+#include "net/http/http_network_session.h"
 #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",
@@ -149,24 +151,25 @@ int main(int argc, char**argv) {
   net::HttpTransactionFactory* factory = NULL;
   scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
+  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));
   if (use_cache) {
-    factory = new net::HttpCache(host_resolver.get(), cert_verifier.get(),
-        NULL, NULL, proxy_service, ssl_config_service,
-        http_auth_handler_factory.get(), NULL, NULL,
-        net::HttpCache::DefaultBackend::InMemory(0));
+    factory = new net::HttpCache(network_session,
+                                 net::HttpCache::DefaultBackend::InMemory(0));
   } else {
-    factory = new net::HttpNetworkLayer(
-        net::ClientSocketFactory::GetDefaultFactory(),
-        host_resolver.get(),
-        cert_verifier.get(),
-        NULL /* dnsrr_resolver */,
-        NULL /* dns_cert_checker */,
-        NULL /* ssl_host_info_factory */,
-        proxy_service,
-        ssl_config_service,
-        http_auth_handler_factory.get(),
-        NULL,
-        NULL);
+    factory = new net::HttpNetworkLayer(network_session);
   }
 
   {