| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 DCHECK(!dest_host_port_pair_.host().empty()); | 50 DCHECK(!dest_host_port_pair_.host().empty()); |
| 51 DCHECK_GT(dest_host_port_pair_.port(), 0); | 51 DCHECK_GT(dest_host_port_pair_.port(), 0); |
| 52 DCHECK(proxy_url_.is_valid()); | 52 DCHECK(proxy_url_.is_valid()); |
| 53 | 53 |
| 54 net::HttpNetworkSession::Params session_params; | 54 net::HttpNetworkSession::Params session_params; |
| 55 session_params.client_socket_factory = socket_factory; | 55 session_params.client_socket_factory = socket_factory; |
| 56 session_params.host_resolver = request_context->host_resolver(); | 56 session_params.host_resolver = request_context->host_resolver(); |
| 57 session_params.cert_verifier = request_context->cert_verifier(); | 57 session_params.cert_verifier = request_context->cert_verifier(); |
| 58 session_params.transport_security_state = | 58 session_params.transport_security_state = |
| 59 request_context->transport_security_state(); | 59 request_context->transport_security_state(); |
| 60 // TODO(rkn): This is NULL because ServerBoundCertService is not thread safe. | 60 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. |
| 61 session_params.server_bound_cert_service = NULL; | 61 session_params.channel_id_service = NULL; |
| 62 session_params.proxy_service = request_context->proxy_service(); | 62 session_params.proxy_service = request_context->proxy_service(); |
| 63 session_params.ssl_config_service = request_context->ssl_config_service(); | 63 session_params.ssl_config_service = request_context->ssl_config_service(); |
| 64 session_params.http_auth_handler_factory = | 64 session_params.http_auth_handler_factory = |
| 65 request_context->http_auth_handler_factory(); | 65 request_context->http_auth_handler_factory(); |
| 66 session_params.network_delegate = request_context->network_delegate(); | 66 session_params.network_delegate = request_context->network_delegate(); |
| 67 session_params.http_server_properties = | 67 session_params.http_server_properties = |
| 68 request_context->http_server_properties(); | 68 request_context->http_server_properties(); |
| 69 session_params.net_log = request_context->net_log(); | 69 session_params.net_log = request_context->net_log(); |
| 70 | 70 |
| 71 const net::HttpNetworkSession::Params* reference_params = | 71 const net::HttpNetworkSession::Params* reference_params = |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 return false; | 399 return false; |
| 400 } | 400 } |
| 401 | 401 |
| 402 void ProxyResolvingClientSocket::CloseTransportSocket() { | 402 void ProxyResolvingClientSocket::CloseTransportSocket() { |
| 403 if (transport_.get() && transport_->socket()) | 403 if (transport_.get() && transport_->socket()) |
| 404 transport_->socket()->Disconnect(); | 404 transport_->socket()->Disconnect(); |
| 405 transport_.reset(); | 405 transport_.reset(); |
| 406 } | 406 } |
| 407 | 407 |
| 408 } // namespace jingle_glue | 408 } // namespace jingle_glue |
| OLD | NEW |