Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome_frame/metrics_service.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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is created at ChromeFrame startup in
@@ skipping 61 matching lines @@
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/http_negotiate.h"
 #include "chrome_frame/utils.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/upload_data.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"
 
 using base::Time;
 using base::TimeDelta;
 
 static const char kMetricsType[] = "application/vnd.mozilla.metrics.bz2";
 
 // The first UMA upload occurs after this interval.
 static const int kInitialUMAUploadTimeoutMilliSeconds = 30000;
@@ skipping 78 matching lines @@
         net::URLSecurityManager::Create(NULL, NULL));
 
     std::string csv_auth_schemes = "basic,digest,ntlm,negotiate";
     std::vector<std::string> supported_schemes;
     base::SplitString(csv_auth_schemes, ',', &supported_schemes);
 
     http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create(
         supported_schemes, url_security_manager_.get(), host_resolver_,
         std::string(), false, false);
 
+    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(ssl_config_service_),
+            http_auth_handler_factory_,
+            network_delegate_,
+            NULL);
+
     http_transaction_factory_ = new net::HttpCache(
-        net::HttpNetworkLayer::CreateFactory(host_resolver_,
-                                             cert_verifier_,
-                                             NULL /* dnsrr_resovler */,
-                                             NULL /* dns_cert_checker*/,
-                                             NULL /* ssl_host_info */,
-                                             proxy_service_,
-                                             ssl_config_service_,
-                                             http_auth_handler_factory_,
-                                             network_delegate_,
-                                             NULL),
-        NULL /* net_log */,
+        network_session,
         net::HttpCache::DefaultBackend::InMemory(0));
   }
 
   virtual const std::string& GetUserAgent(const GURL& url) const {
     return user_agent_;
   }
 
  private:
   std::string user_agent_;
   MessageLoop* io_loop_;
@@ skipping 412 matching lines @@
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }