Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 10834215: Remove static variables from HttpStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | net/http/http_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/proxy_resolving_client_socket.cc
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index 02df488208c27261a62769c2baa2e65f07335719..839daf2573807ea9de2d70bb10850a304f7e7566 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);
}
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | net/http/http_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698