Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome_frame/test/test_server_test.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 <windows.h>
 #include <wininet.h>
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/test/test_server.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
+#include "net/http/http_network_session.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestServerTest: public testing::Test {
  protected:
   virtual void SetUp() {
     PathService::Get(base::DIR_SOURCE_ROOT, &source_path_);
     source_path_ = source_path_.Append(FILE_PATH_LITERAL("chrome_frame"));
   }
@@ skipping 35 matching lines @@
   URLRequestTestContext() {
     host_resolver_ =
         net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
                                       NULL, NULL);
     cert_verifier_ = new net::CertVerifier;
     proxy_service_ = net::ProxyService::CreateDirect();
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
         host_resolver_);
     http_transaction_factory_ = new net::HttpCache(
-        net::HttpNetworkLayer::CreateFactory(
+        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_,
-            NULL /* network_delegate */,
-            NULL /* net_log */),
-        NULL /* net_log */,
+            NULL,
+            NULL),

[wtc, 2011/01/28 01:51:23]

Nit: add /* network_delegate */ and /* net_log */ after these
NULLs?

         net::HttpCache::DefaultBackend::InMemory(0));
     // In-memory cookie store.
     cookie_store_ = new net::CookieMonster(NULL, NULL);
   }
 
   virtual ~URLRequestTestContext() {
     delete http_transaction_factory_;
     delete http_auth_handler_factory_;
     delete cert_verifier_;
     delete host_resolver_;
@@ skipping 109 matching lines @@
     EXPECT_EQ(file.accessed(), 1);
     EXPECT_EQ(redir.accessed(), 1);
 
     EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos);
     EXPECT_TRUE(file_task.response().find("function") != std::string::npos);
     EXPECT_TRUE(goog_task.response().find("<title>") != std::string::npos);
   } else {
     ::TerminateThread(worker, ~0);
   }
 }