Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

net/tools/fetch/fetch_client.cc

 // 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 "build/build_config.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #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",
          program_name);
   exit(1);
 }
 
 // Test Driver
 class Driver {
  public:
@@ skipping 105 matching lines @@
                                     NULL, NULL));
 
   scoped_ptr<net::CertVerifier> cert_verifier(new net::CertVerifier);
   scoped_refptr<net::ProxyService> proxy_service(
       net::ProxyService::CreateDirect());
   scoped_refptr<net::SSLConfigService> ssl_config_service(
       net::SSLConfigService::CreateSystemSSLConfigService());
   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);
   }
 
   {
     base::StatsCounterTimer driver_time("FetchClient.total_time");
     base::StatsScope<base::StatsCounterTimer> scope(driver_time);
 
     Client** clients = new Client*[client_limit];
     for (int i = 0; i < client_limit; i++)
       clients[i] = new Client(factory, url);
 
@@ skipping 32 matching lines @@
       std::string name(table.GetRowName(index));
       if (name.length() > 0) {
         int value = table.GetRowValue(index);
         printf("%s:\t%d\n", name.c_str(), value);
       }
     }
     printf("</stats>\n");
   }
   return 0;
 }