Remove static variables from HttpStreamFactory.

net/http/http_cache.cc

 // Copyright (c) 2012 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 "net/http/http_cache.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 
@@ skipping 20 matching lines @@
 #include "net/http/http_cache_transaction.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 
 namespace net {
 
-namespace {
-
-HttpNetworkSession* CreateNetworkSession(
-    HostResolver* host_resolver,
-    CertVerifier* cert_verifier,
-    ServerBoundCertService* server_bound_cert_service,
-    TransportSecurityState* transport_security_state,
-    ProxyService* proxy_service,
-    const std::string& ssl_session_cache_shard,
-    SSLConfigService* ssl_config_service,
-    HttpAuthHandlerFactory* http_auth_handler_factory,
-    NetworkDelegate* network_delegate,
-    HttpServerProperties* http_server_properties,
-    NetLog* net_log,
-    const std::string& trusted_spdy_proxy) {
-  HttpNetworkSession::Params params;
-  params.host_resolver = host_resolver;
-  params.cert_verifier = cert_verifier;
-  params.server_bound_cert_service = server_bound_cert_service;
-  params.transport_security_state = transport_security_state;
-  params.proxy_service = proxy_service;
-  params.ssl_session_cache_shard = ssl_session_cache_shard;
-  params.ssl_config_service = ssl_config_service;
-  params.http_auth_handler_factory = http_auth_handler_factory;
-  params.network_delegate = network_delegate;
-  params.http_server_properties = http_server_properties;
-  params.net_log = net_log;
-  params.trusted_spdy_proxy = trusted_spdy_proxy;
-  return new HttpNetworkSession(params);
-}
-
-}  // namespace
-
 HttpCache::DefaultBackend::DefaultBackend(CacheType type,
                                           const FilePath& path,
                                           int max_bytes,
                                           base::MessageLoopProxy* thread)
     : type_(type),
       path_(path),
       max_bytes_(max_bytes),
       thread_(thread) {
 }
 
@@ skipping 184 matching lines @@
 }
 
 void HttpCache::MetadataWriter::OnIOComplete(int result) {
   if (!verified_)
     return VerifyResponse(result);
   SelfDestroy();
 }
 
 //-----------------------------------------------------------------------------
 
-HttpCache::HttpCache(HostResolver* host_resolver,
-                     CertVerifier* cert_verifier,
-                     ServerBoundCertService* server_bound_cert_service,
-                     TransportSecurityState* transport_security_state,
-                     ProxyService* proxy_service,
-                     const std::string& ssl_session_cache_shard,
-                     SSLConfigService* ssl_config_service,
-                     HttpAuthHandlerFactory* http_auth_handler_factory,
-                     NetworkDelegate* network_delegate,
-                     HttpServerProperties* http_server_properties,
-                     NetLog* net_log,
-                     BackendFactory* backend_factory,
-                     const std::string& trusted_spdy_proxy)
-    : net_log_(net_log),
+HttpCache::HttpCache(const net::HttpNetworkSession::Params& params,
+                     BackendFactory* backend_factory)
+    : net_log_(params.net_log),
       backend_factory_(backend_factory),
       building_backend_(false),
       mode_(NORMAL),
-      network_layer_(
-          new HttpNetworkLayer(
-              CreateNetworkSession(
-                  host_resolver,
-                  cert_verifier,
-                  server_bound_cert_service,
-                  transport_security_state,
-                  proxy_service,
-                  ssl_session_cache_shard,
-                  ssl_config_service,
-                  http_auth_handler_factory,
-                  network_delegate,
-                  http_server_properties,
-                  net_log,
-                  trusted_spdy_proxy))) {
+      network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))) {
 }
 
 
 HttpCache::HttpCache(HttpNetworkSession* session,
                      BackendFactory* backend_factory)
     : net_log_(session->net_log()),
       backend_factory_(backend_factory),
       building_backend_(false),
       mode_(NORMAL),
       network_layer_(new HttpNetworkLayer(session)) {
@@ skipping 827 matching lines @@
     building_backend_ = false;
     DeletePendingOp(pending_op);
   }
 
   // The cache may be gone when we return from the callback.
   if (!item->DoCallback(result, backend))
     item->NotifyTransaction(result, NULL);
 }
 
 }  // namespace net