Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/test/plugin/plugin_test.cpp

Index: chrome/test/plugin/plugin_test.cpp
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index ace16bc9acf99b634a96e02eb23e78d84c3aabb3..34a9de3a07104c0c17a18065fb66e342e134b9a2 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -45,7 +45,9 @@
 #include "net/base/ssl_config_service_defaults.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/socket/client_socket_factory.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/npapi/bindings/npapi.h"
@@ -284,18 +286,22 @@ class PluginInstallerDownloadTest
       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_,
+              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_,
+              network_delegate_,
+              NULL /* net_log */));
       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 */,
+          network_session,
           net::HttpCache::DefaultBackend::InMemory(0));
     }