Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/service/net/service_url_request_context.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/service/net/service_url_request_context.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/service/service_process.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_policy.h"
 #include "net/base/dnsrr_resolver.h"
 #include "net/base/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_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/proxy/proxy_service.h"
 
 namespace {
 // Copied from webkit/glue/user_agent.cc. We don't want to pull in a dependency
 // on webkit/glue which also pulls in the renderer. Also our user-agent is
 // totally different from the user-agent used by the browser, just the
 // OS-specific parts are common.
 std::string BuildOSCpuInfo() {
   std::string os_cpu;
 
@@ skipping 81 matching lines @@
           g_service_process->io_thread()->message_loop(),
           g_service_process->file_thread()->message_loop());
   proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
       proxy_config_service, 0u, NULL);
   cert_verifier_ = new net::CertVerifier;
   dnsrr_resolver_ = new net::DnsRRResolver;
   ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
   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_,
+          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_,
+          NULL /* network_delegate */,
+          NULL /* net_log */));
   http_transaction_factory_ = new net::HttpCache(
-      net::HttpNetworkLayer::CreateFactory(host_resolver_,
-                                           cert_verifier_,
-                                           dnsrr_resolver_,
-                                           NULL /* dns_cert_checker */,
-                                           NULL /* ssl_host_info_factory */,
-                                           proxy_service_,
-                                           ssl_config_service_,
-                                           http_auth_handler_factory_,
-                                           NULL /* network_delegate */,
-                                           NULL /* net_log */),
-      NULL /* net_log */,
+      network_session,
       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";
 }
 
 const std::string& ServiceURLRequestContext::GetUserAgent(
     const GURL& url) const {
   // If the user agent is set explicitly return that, otherwise call the
@@ skipping 23 matching lines @@
     url_request_context_ = new ServiceURLRequestContext(user_agent_);
   return url_request_context_;
 }
 
 scoped_refptr<base::MessageLoopProxy>
 ServiceURLRequestContextGetter::GetIOMessageLoopProxy() const {
   return io_message_loop_proxy_;
 }
 
 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {}