Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 099810adbfeb7739a18d99ac1e7639efa37d4a0a..5053f35ec7fcc498f4e307829195d602d704c346 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -7,6 +7,9 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
+#include "net/http/http_network_session.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/spdy/spdy_session_pool.h"
 
 TestCookiePolicy::TestCookiePolicy(int options_bit_mask)
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
@@ -110,17 +113,19 @@ void TestURLRequestContext::Init() {
   http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
       host_resolver_);
   http_transaction_factory_ = new net::HttpCache(
-      net::HttpNetworkLayer::CreateFactory(host_resolver_,
-                                           cert_verifier_,
-                                           NULL /* dnsrr_resolver */,
-                                           NULL /* dns_cert_checker */,
-                                           NULL /* ssl_host_info_factory */,
-                                           proxy_service_,
-                                           ssl_config_service_,
-                                           http_auth_handler_factory_,
-                                           network_delegate_,
-                                           NULL),
-      NULL /* net_log */,
+      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),
       net::HttpCache::DefaultBackend::InMemory(0));
   // In-memory cookie store.
   cookie_store_ = new net::CookieMonster(NULL, NULL);