Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/test/plugin/plugin_test.cpp

 // 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.
 
 // Tests for the top plugins to catch regressions in our plugin host code, as
 // well as in the out of process code.  Currently this tests:
 //  Flash
 //  Real
 //  QuickTime
 //  Windows Media Player
@@ skipping 27 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_util.h"
 #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"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
@@ skipping 217 matching lines @@
       const size_t kNetLogBound = 50u;
       net_log_.reset(new net::CapturingNetLog(kNetLogBound));
 
       proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
           proxy_config_service, 0, net_log_.get());
       DCHECK(proxy_service_);
 
       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));

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

Nit: add /* net_log */ after this NULL?

       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));
     }
 
    private:
     scoped_ptr<net::NetLog> net_log_;
     scoped_ptr<net::URLSecurityManager> url_security_manager_;
   };
 
   PluginInstallerDownloadTest()
       : success_(false),
@@ skipping 44 matching lines @@
 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
   MessageLoop loop(MessageLoop::TYPE_IO);
   Start();
   loop.Run();
 
   EXPECT_TRUE(success());
   EXPECT_TRUE(initial_download_path().BaseName().value() ==
               final_download_path().BaseName().value());
 }
 #endif  // defined(OS_WIN)