Remove static variables from HttpStreamFactory.

content/shell/shell_url_request_context_getter.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 "content/shell/shell_url_request_context_getter.h"
 
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/threading/worker_pool.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/shell/shell_network_delegate.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/default_server_bound_cert_store.h"
 #include "net/base/host_resolver.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
+#include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory.h"
 
 namespace content {
 
 ShellURLRequestContextGetter::ShellURLRequestContextGetter(
     const FilePath& base_path,
@@ skipping 51 matching lines @@
 
     FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
     net::HttpCache::DefaultBackend* main_backend =
         new net::HttpCache::DefaultBackend(
             net::DISK_CACHE,
             cache_path,
             0,
             BrowserThread::GetMessageLoopProxyForThread(
                 BrowserThread::CACHE));
 
+    net::HttpNetworkSession::Params network_session_params;
+    network_session_params.host_resolver =
+        url_request_context_->host_resolver();
+    network_session_params.cert_verifier =
+        url_request_context_->cert_verifier();
+    network_session_params.server_bound_cert_service =
+        url_request_context_->server_bound_cert_service();
+    network_session_params.proxy_service =
+        url_request_context_->proxy_service();
+    network_session_params.ssl_config_service =
+        url_request_context_->ssl_config_service();
+    network_session_params.http_auth_handler_factory =
+        url_request_context_->http_auth_handler_factory();
+    network_session_params.network_delegate =
+        url_request_context_->network_delegate();
+    network_session_params.http_server_properties =
+        url_request_context_->http_server_properties();
+
     net::HttpCache* main_cache = new net::HttpCache(
-        url_request_context_->host_resolver(),
-        url_request_context_->cert_verifier(),
-        url_request_context_->server_bound_cert_service(),
-        NULL, /* transport_security_state */
-        url_request_context_->proxy_service(),
-        "", /* ssl_session_cache_shard */
-        url_request_context_->ssl_config_service(),
-        url_request_context_->http_auth_handler_factory(),
-        url_request_context_->network_delegate(),
-        url_request_context_->http_server_properties(),
-        NULL,
-        main_backend,
-        "" /* trusted_spdy_proxy */ );
+        network_session_params, main_backend);
     storage_->set_http_transaction_factory(main_cache);
 
     storage_->set_job_factory(new net::URLRequestJobFactory);
   }
 
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
     ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
   return url_request_context_->host_resolver();
 }
 
 }  // namespace content