OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "jingle/glue/proxy_resolving_client_socket.h" | 5 #include "jingle/glue/proxy_resolving_client_socket.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 DCHECK(!dest_host_port_pair_.host().empty()); | 49 DCHECK(!dest_host_port_pair_.host().empty()); |
50 DCHECK_GT(dest_host_port_pair_.port(), 0); | 50 DCHECK_GT(dest_host_port_pair_.port(), 0); |
51 DCHECK(proxy_url_.is_valid()); | 51 DCHECK(proxy_url_.is_valid()); |
52 | 52 |
53 net::HttpNetworkSession::Params session_params; | 53 net::HttpNetworkSession::Params session_params; |
54 session_params.client_socket_factory = socket_factory; | 54 session_params.client_socket_factory = socket_factory; |
55 session_params.host_resolver = request_context->host_resolver(); | 55 session_params.host_resolver = request_context->host_resolver(); |
56 session_params.cert_verifier = request_context->cert_verifier(); | 56 session_params.cert_verifier = request_context->cert_verifier(); |
57 session_params.transport_security_state = | 57 session_params.transport_security_state = |
58 request_context->transport_security_state(); | 58 request_context->transport_security_state(); |
59 // TODO(rkn): This is NULL because ServerBoundCertService is not thread safe. | 59 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. |
60 session_params.server_bound_cert_service = NULL; | 60 session_params.channel_id_service = NULL; |
61 session_params.proxy_service = request_context->proxy_service(); | 61 session_params.proxy_service = request_context->proxy_service(); |
62 session_params.ssl_config_service = request_context->ssl_config_service(); | 62 session_params.ssl_config_service = request_context->ssl_config_service(); |
63 session_params.http_auth_handler_factory = | 63 session_params.http_auth_handler_factory = |
64 request_context->http_auth_handler_factory(); | 64 request_context->http_auth_handler_factory(); |
65 session_params.network_delegate = request_context->network_delegate(); | 65 session_params.network_delegate = request_context->network_delegate(); |
66 session_params.http_server_properties = | 66 session_params.http_server_properties = |
67 request_context->http_server_properties(); | 67 request_context->http_server_properties(); |
68 session_params.net_log = request_context->net_log(); | 68 session_params.net_log = request_context->net_log(); |
69 | 69 |
70 const net::HttpNetworkSession::Params* reference_params = | 70 const net::HttpNetworkSession::Params* reference_params = |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 return false; | 396 return false; |
397 } | 397 } |
398 | 398 |
399 void ProxyResolvingClientSocket::CloseTransportSocket() { | 399 void ProxyResolvingClientSocket::CloseTransportSocket() { |
400 if (transport_.get() && transport_->socket()) | 400 if (transport_.get() && transport_->socket()) |
401 transport_->socket()->Disconnect(); | 401 transport_->socket()->Disconnect(); |
402 transport_.reset(); | 402 transport_.reset(); |
403 } | 403 } |
404 | 404 |
405 } // namespace jingle_glue | 405 } // namespace jingle_glue |
OLD | NEW |