Remove static variables from HttpStreamFactory.

webkit/tools/test_shell/test_shell_request_context.cc

Index: webkit/tools/test_shell/test_shell_request_context.cc
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 42d73c28caf929edfd3d8b9d4822402641ffd650..eccea938d4b128ba8d17a7a877d20bddc6976985 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -18,6 +18,7 @@
 #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"
@@ -95,21 +96,24 @@ void TestShellRequestContext::Init(
       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();
+  network_session_params.host_resolver = host_resolver();
+  network_session_params.host_resolver = host_resolver();
+  network_session_params.host_resolver = host_resolver();

[mmenke, 2012/08/23 18:11:28]

I think that once should generally be enough.

+
+  net::HttpCache* cache = new net::HttpCache(
+      network_session_params, backend);
   cache->set_mode(cache_mode);
   storage_.set_http_transaction_factory(cache);