Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

net/url_request/url_request_test_util.cc

 // Copyright (c) 2011 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 "net/url_request/url_request_test_util.h"
 
 #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)),
       options_(options_bit_mask),
       callback_(NULL) {
 }
 
 TestCookiePolicy::~TestCookiePolicy() {}
 
 int TestCookiePolicy::CanGetCookies(const GURL& url,
@@ skipping 83 matching lines @@
   delete host_resolver_;
 }
 
 void TestURLRequestContext::Init() {
   cert_verifier_ = new net::CertVerifier;
   ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
   ssl_config_service_ = new net::SSLConfigServiceDefaults;
   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);
   accept_language_ = "en-us,fr";
   accept_charset_ = "iso-8859-1,*,utf-8";
 }
 
 
 TestURLRequest::TestURLRequest(const GURL& url, Delegate* delegate)
     : net::URLRequest(url, delegate) {
@@ skipping 138 matching lines @@
   if (!request->status().is_io_pending())
     OnResponseCompleted(request);
   else if (cancel_in_rd_pending_)
     request->Cancel();
 }
 
 void TestDelegate::OnResponseCompleted(net::URLRequest* request) {
   if (quit_on_complete_)
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }