Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

net/spdy/spdy_test_util.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 "net/spdy/spdy_test_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 // Chop a frame into an array of MockWrites.
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) {
@@ skipping 895 matching lines @@
                                 NULL);
 }
 
 SpdyURLRequestContext::SpdyURLRequestContext() {
   host_resolver_ = new MockHostResolver();
   cert_verifier_ = new CertVerifier;
   proxy_service_ = ProxyService::CreateDirect();
   ssl_config_service_ = new SSLConfigServiceDefaults;
   http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(
       host_resolver_);
+  scoped_refptr<HttpNetworkSession> network_session(
+      new HttpNetworkSession(
+          host_resolver_,
+          cert_verifier_,
+          NULL /* dnsrr_resolver */,
+          NULL /* dns_cert_checker */,
+          NULL /* ssl_host_info_factory */,
+          proxy_service_,
+          &socket_factory_,
+          ssl_config_service_,
+          new SpdySessionPool(NULL),
+          http_auth_handler_factory_,
+          network_delegate_,
+          NULL /* net_log */));
   http_transaction_factory_ = new HttpCache(
-      new HttpNetworkLayer(&socket_factory_,
-                           host_resolver_,
-                           cert_verifier_,
-                           NULL /* dnsrr_resolver */,
-                           NULL /* dns_cert_checker */,
-                           NULL /* ssl_host_info_factory */,
-                           proxy_service_,
-                           ssl_config_service_,
-                           new SpdySessionPool(NULL),
-                           http_auth_handler_factory_,
-                           network_delegate_,
-                           NULL),
-      NULL /* net_log */,
+      network_session,
       HttpCache::DefaultBackend::InMemory(0));
 }
 
 SpdyURLRequestContext::~SpdyURLRequestContext() {
   delete http_transaction_factory_;
   delete http_auth_handler_factory_;
   delete cert_verifier_;
   delete host_resolver_;
 }
 
 const SpdyHeaderInfo make_spdy_header(spdy::SpdyControlType type) {
   const SpdyHeaderInfo kHeader = {
     type,                         // Kind = Syn
     1,                            // Stream ID
     0,                            // Associated stream ID
     2,                            // Priority
     spdy::CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     spdy::INVALID,                // Status
     NULL,                         // Data
     0,                            // Length
     spdy::DATA_FLAG_NONE          // Data Flags
   };
   return kHeader;
 }
 }  // namespace net