diff options
| author | szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:27:35 +0000 |
|---|---|---|
| committer | szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:27:35 +0000 |
| commit | c2dad2976730464242e1b89edd6db17163a5fa02 (patch) | |
| tree | 277f0e83c1c28ab371bf696a9d6d46eb5520bfb0 /webkit | |
| parent | 28196f11973c0615b3e871a48bb8f8babccd4082 (diff) | |
| download | chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.zip chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.gz chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.bz2 | |
Remove static variables from HttpStreamFactory.
Refresh of issue 10389162.
BUG=124900
Review URL: https://chromiumcodereview.appspot.com/10834215
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index b5b8dd3..3427da0 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,20 @@ 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(); + + net::HttpCache* cache = new net::HttpCache( + network_session_params, backend); cache->set_mode(cache_mode); storage_.set_http_transaction_factory(cache); |