Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/browser/net/connection_tester.cc

Index: chrome/browser/net/connection_tester.cc
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index d68a169b500d492fed3bee0c3660aff7e791e29c..f0f7efe8f0b90fdb7c6bb694bd4e158fdd6882de 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -25,9 +25,11 @@
 #include "net/ftp/ftp_network_layer.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/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
@@ -67,12 +69,22 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
         host_resolver_);
+    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 */));
     http_transaction_factory_ = new net::HttpCache(
-        net::HttpNetworkLayer::CreateFactory(host_resolver_, cert_verifier_,
-            dnsrr_resolver_, NULL /* dns_cert_checker */,
-            NULL /* ssl_host_info_factory */, proxy_service_,
-            ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
-        NULL /* net_log */,
+        network_session,
         net::HttpCache::DefaultBackend::InMemory(0));
     // In-memory cookie store.
     cookie_store_ = new net::CookieMonster(NULL, NULL);