Fix for issue 439560: connect to TURN servers through proxies with auth.

jingle/glue/proxy_resolving_client_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/glue/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #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"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace jingle_glue {
 
 ProxyResolvingClientSocket::ProxyResolvingClientSocket(
     net::ClientSocketFactory* socket_factory,
@@ skipping 19 matching lines @@
                   net::NetLog::SOURCE_SOCKET)),
           weak_factory_(this) {
   DCHECK(request_context_getter.get());
   net::URLRequestContext* request_context =
       request_context_getter->GetURLRequestContext();
   DCHECK(request_context);
   DCHECK(!dest_host_port_pair_.host().empty());
   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() {
   Disconnect();
 }
 
 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,
                                      const net::CompletionCallback& callback) {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->Read(buf, buf_len, callback);
@@ skipping 304 matching lines @@
   return false;
 }
 
 void ProxyResolvingClientSocket::CloseTransportSocket() {
   if (transport_.get() && transport_->socket())
     transport_->socket()->Disconnect();
   transport_.reset();
 }
 
 }  // namespace jingle_glue