| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 DCHECK(!dest_host_port_pair_.host().empty()); | 55 DCHECK(!dest_host_port_pair_.host().empty()); |
| 56 DCHECK_GT(dest_host_port_pair_.port(), 0); | 56 DCHECK_GT(dest_host_port_pair_.port(), 0); |
| 57 DCHECK(proxy_url_.is_valid()); | 57 DCHECK(proxy_url_.is_valid()); |
| 58 | 58 |
| 59 net::HttpNetworkSession::Params session_params; | 59 net::HttpNetworkSession::Params session_params; |
| 60 session_params.client_socket_factory = socket_factory; | 60 session_params.client_socket_factory = socket_factory; |
| 61 session_params.host_resolver = request_context->host_resolver(); | 61 session_params.host_resolver = request_context->host_resolver(); |
| 62 session_params.cert_verifier = request_context->cert_verifier(); | 62 session_params.cert_verifier = request_context->cert_verifier(); |
| 63 session_params.transport_security_state = | 63 session_params.transport_security_state = |
| 64 request_context->transport_security_state(); | 64 request_context->transport_security_state(); |
| 65 session_params.cert_transparency_verifier = |
| 66 request_context->cert_transparency_verifier(); |
| 67 session_params.ct_policy_enforcer = request_context->ct_policy_enforcer(); |
| 65 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. | 68 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. |
| 66 session_params.channel_id_service = NULL; | 69 session_params.channel_id_service = NULL; |
| 67 session_params.proxy_service = request_context->proxy_service(); | 70 session_params.proxy_service = request_context->proxy_service(); |
| 68 session_params.ssl_config_service = request_context->ssl_config_service(); | 71 session_params.ssl_config_service = request_context->ssl_config_service(); |
| 69 session_params.http_auth_handler_factory = | 72 session_params.http_auth_handler_factory = |
| 70 request_context->http_auth_handler_factory(); | 73 request_context->http_auth_handler_factory(); |
| 71 session_params.http_server_properties = | 74 session_params.http_server_properties = |
| 72 request_context->http_server_properties(); | 75 request_context->http_server_properties(); |
| 73 session_params.net_log = request_context->net_log(); | 76 session_params.net_log = request_context->net_log(); |
| 74 | 77 |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 return 0; | 427 return 0; |
| 425 } | 428 } |
| 426 | 429 |
| 427 void ProxyResolvingClientSocket::CloseTransportSocket() { | 430 void ProxyResolvingClientSocket::CloseTransportSocket() { |
| 428 if (transport_.get() && transport_->socket()) | 431 if (transport_.get() && transport_->socket()) |
| 429 transport_->socket()->Disconnect(); | 432 transport_->socket()->Disconnect(); |
| 430 transport_.reset(); | 433 transport_.reset(); |
| 431 } | 434 } |
| 432 | 435 |
| 433 } // namespace jingle_glue | 436 } // namespace jingle_glue |
| OLD | NEW |