Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/browser/net/connection_tester_unittest.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 "chrome/browser/net/connection_tester.h"
 
 #include "chrome/browser/browser_thread.h"
 #include "chrome/test/testing_pref_service.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/dnsrr_resolver.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.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/socket/client_socket_factory.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
@@ skipping 83 matching lines @@
  private:
   void InitializeRequestContext() {
     proxy_script_fetcher_context_->set_host_resolver(&host_resolver_);
     proxy_script_fetcher_context_->set_cert_verifier(&cert_verifier_);
     proxy_script_fetcher_context_->set_dnsrr_resolver(&dnsrr_resolver_);
     proxy_script_fetcher_context_->set_http_auth_handler_factory(
         &http_auth_handler_factory_);
     proxy_service_ = net::ProxyService::CreateDirect();
     proxy_script_fetcher_context_->set_proxy_service(proxy_service_);
     ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
-    http_transaction_factory_.reset(
-        new net::HttpNetworkLayer(
-            client_socket_factory_,
+    scoped_refptr<net::HttpNetworkSession> network_session(
+        new net::HttpNetworkSession(
             &host_resolver_,
             &cert_verifier_,
             &dnsrr_resolver_,
-            NULL /* DNS cert provenance checker */,
+            NULL /* dns_cert_checker */,
             NULL /* ssl_host_info_factory */,
             proxy_service_.get(),
+            client_socket_factory_,
             ssl_config_service_,
             new net::SpdySessionPool(ssl_config_service_),
             &http_auth_handler_factory_,
-            NULL /* NetworkDelegate */,
-            NULL /* NetLog */));
+            NULL /* network_delegate */,
+            NULL /* net_log */));
+    http_transaction_factory_.reset(
+        new net::HttpNetworkLayer(network_session));
     proxy_script_fetcher_context_->set_http_transaction_factory(
         http_transaction_factory_.get());
     // In-memory cookie store.
     proxy_script_fetcher_context_->set_cookie_store(
         new net::CookieMonster(NULL, NULL));
   }
 
   MessageLoop message_loop_;
   BrowserThread io_thread_;
 };
@@ skipping 48 matching lines @@
   // any pending tasks instead of running them. This causes a problem with
   // net::ClientSocketPoolBaseHelper, since the "Group" holds a pointer
   // |backup_task| that it will try to deref during the destructor, but
   // depending on the order that pending tasks were deleted in, it might
   // already be invalid! See http://crbug.com/43291.
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   MessageLoop::current()->Run();
 }
 
 }  // namespace