Remove static variables from HttpStreamFactory.

webkit/tools/test_shell/test_shell_request_context.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 "webkit/tools/test_shell/test_shell_request_context.h"
 
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.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/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
+#include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
 #include "webkit/fileapi/file_system_context.h"
@@ skipping 57 matching lines @@
 
   storage_.set_http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
   storage_.set_http_server_properties(
       new net::HttpServerPropertiesImpl);
 
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
       cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
 
-  net::HttpCache* cache =
-      new net::HttpCache(host_resolver(),
-                         cert_verifier(),
-                         server_bound_cert_service(),
-                         NULL, /* transport_security_state */
-                         proxy_service(),
-                         "",  /* ssl_session_cache_shard */
-                         ssl_config_service(),
-                         http_auth_handler_factory(),
-                         NULL,  /* network_delegate */
-                         http_server_properties(),
-                         NULL,  /* netlog */
-                         backend,
-                         "" /* trusted_spdy_proxy */ );
+  net::HttpNetworkSession::Params network_session_params;
+  network_session_params.host_resolver = host_resolver();
+  network_session_params.cert_verifier = cert_verifier();
+  network_session_params.server_bound_cert_service =
+      server_bound_cert_service();
+  network_session_params.proxy_service = proxy_service();
+  network_session_params.ssl_config_service = ssl_config_service();
+  network_session_params.http_auth_handler_factory =
+      http_auth_handler_factory();
+  network_session_params.http_server_properties = http_server_properties();
+  network_session_params.host_resolver = host_resolver();
 
+  net::HttpCache* cache = new net::HttpCache(
+      network_session_params, backend);
   cache->set_mode(cache_mode);
   storage_.set_http_transaction_factory(cache);
 
   storage_.set_ftp_transaction_factory(
       new net::FtpNetworkLayer(host_resolver()));
 
   blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
   file_system_context_ = static_cast<SimpleFileSystem*>(
       WebKit::webKitPlatformSupport()->fileSystem())->file_system_context();
 
   net::URLRequestJobFactory* job_factory = new net::URLRequestJobFactoryImpl();
   job_factory->SetProtocolHandler(
       "blob",
       new webkit_blob::BlobProtocolHandler(
           blob_storage_controller_.get(),
           SimpleResourceLoaderBridge::GetIoThread()));
   job_factory->SetProtocolHandler(
       "filesystem",
       fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
   storage_.set_job_factory(job_factory);
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
 }
 
 const std::string& TestShellRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }