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

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: Apply network settings to jingle Created 8 years, 4 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
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..2f585c5231cd18f9a23ddc12278d2df95296540c 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -13,6 +13,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/http/http_network_session.h"
+#include "net/http/http_transaction_factory.h"
#include "net/socket/client_socket_handle.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context.h"
@@ -62,6 +63,29 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
session_params.http_server_properties =
request_context->http_server_properties();
session_params.net_log = request_context->net_log();
+
+ net::HttpTransactionFactory* transaction_factory =
akalin 2012/08/31 19:44:48 This seems to violate the principle of least knowl
szager1 2012/08/31 19:59:16 That's kind of at odds with comment #15. Maybe so
+ request_context->http_transaction_factory();
+ if (transaction_factory) {
+ net::HttpNetworkSession* network_session =
+ transaction_factory->GetSession();
+ if (network_session) {
+ const net::HttpNetworkSession::Params& reference_params =
+ network_session->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);
}

Powered by Google App Engine
This is Rietveld 408576698