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 91eb5ae7d98927ee7e2b41a1dd1d2ea631af263d..20d3dba6b48aa1203c444302b3adba2259c980cf 100644 |
--- a/jingle/glue/proxy_resolving_client_socket.cc |
+++ b/jingle/glue/proxy_resolving_client_socket.cc |
@@ -13,7 +13,7 @@ |
#include "net/base/load_flags.h" |
#include "net/base/net_errors.h" |
#include "net/http/http_auth_controller.h" |
-#include "net/http/http_network_session.h" |
+#include "net/http/http_transaction_factory.h" |
#include "net/http/proxy_client_socket.h" |
#include "net/socket/client_socket_handle.h" |
#include "net/socket/client_socket_pool_manager.h" |
@@ -53,46 +53,7 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( |
DCHECK_GT(dest_host_port_pair_.port(), 0); |
DCHECK(proxy_url_.is_valid()); |
- net::HttpNetworkSession::Params session_params; |
- session_params.client_socket_factory = socket_factory; |
- session_params.host_resolver = request_context->host_resolver(); |
- session_params.cert_verifier = request_context->cert_verifier(); |
- session_params.transport_security_state = |
- request_context->transport_security_state(); |
- // TODO(rkn): This is NULL because ChannelIDService is not thread safe. |
- session_params.channel_id_service = NULL; |
- session_params.proxy_service = request_context->proxy_service(); |
- session_params.ssl_config_service = request_context->ssl_config_service(); |
- session_params.http_auth_handler_factory = |
- request_context->http_auth_handler_factory(); |
- session_params.network_delegate = request_context->network_delegate(); |
- 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) { |
- // TODO(mmenke): Just copying specific parameters seems highly regression |
- // prone. Should have a better way to do this. |
- session_params.host_mapping_rules = reference_params->host_mapping_rules; |
- session_params.ignore_certificate_errors = |
- reference_params->ignore_certificate_errors; |
- 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.next_protos = reference_params->next_protos; |
- session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; |
- session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl; |
- session_params.force_spdy_always = reference_params->force_spdy_always; |
- session_params.forced_spdy_exclusions = |
- reference_params->forced_spdy_exclusions; |
- session_params.use_alternate_protocols = |
- reference_params->use_alternate_protocols; |
- } |
- |
- network_session_ = new net::HttpNetworkSession(session_params); |
+ network_session_ = request_context->http_transaction_factory()->GetSession(); |
} |
ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { |