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 /jingle | |
| 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 'jingle')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index 02df488..839daf2 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -46,6 +46,7 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( DCHECK(request_context); DCHECK(!dest_host_port_pair_.host().empty()); DCHECK_GT(dest_host_port_pair_.port(), 0); + net::HttpNetworkSession::Params session_params; session_params.client_socket_factory = socket_factory; session_params.host_resolver = request_context->host_resolver(); @@ -62,6 +63,22 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( session_params.http_server_properties = request_context->http_server_properties(); session_params.net_log = request_context->net_log(); + + const net::HttpNetworkSession::Params* reference_params = + request_context->GetNetworkSessionParams(); + if (reference_params) { + session_params.host_mapping_rules = reference_params->host_mapping_rules; + session_params.ignore_certificate_errors = + reference_params->ignore_certificate_errors; + session_params.http_pipelining_enabled = + reference_params->http_pipelining_enabled; + session_params.testing_fixed_http_port = + reference_params->testing_fixed_http_port; + session_params.testing_fixed_https_port = + reference_params->testing_fixed_https_port; + session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; + } + network_session_ = new net::HttpNetworkSession(session_params); } |