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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 session_params.host_resolver = request_context->host_resolver(); | 60 session_params.host_resolver = request_context->host_resolver(); |
61 session_params.cert_verifier = request_context->cert_verifier(); | 61 session_params.cert_verifier = request_context->cert_verifier(); |
62 session_params.transport_security_state = | 62 session_params.transport_security_state = |
63 request_context->transport_security_state(); | 63 request_context->transport_security_state(); |
64 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. | 64 // TODO(rkn): This is NULL because ChannelIDService is not thread safe. |
65 session_params.channel_id_service = NULL; | 65 session_params.channel_id_service = NULL; |
66 session_params.proxy_service = request_context->proxy_service(); | 66 session_params.proxy_service = request_context->proxy_service(); |
67 session_params.ssl_config_service = request_context->ssl_config_service(); | 67 session_params.ssl_config_service = request_context->ssl_config_service(); |
68 session_params.http_auth_handler_factory = | 68 session_params.http_auth_handler_factory = |
69 request_context->http_auth_handler_factory(); | 69 request_context->http_auth_handler_factory(); |
70 session_params.network_delegate = request_context->network_delegate(); | |
71 session_params.http_server_properties = | 70 session_params.http_server_properties = |
72 request_context->http_server_properties(); | 71 request_context->http_server_properties(); |
73 session_params.net_log = request_context->net_log(); | 72 session_params.net_log = request_context->net_log(); |
74 | 73 |
75 const net::HttpNetworkSession::Params* reference_params = | 74 const net::HttpNetworkSession::Params* reference_params = |
76 request_context->GetNetworkSessionParams(); | 75 request_context->GetNetworkSessionParams(); |
77 if (reference_params) { | 76 if (reference_params) { |
78 // TODO(mmenke): Just copying specific parameters seems highly regression | 77 // TODO(mmenke): Just copying specific parameters seems highly regression |
79 // prone. Should have a better way to do this. | 78 // prone. Should have a better way to do this. |
80 session_params.host_mapping_rules = reference_params->host_mapping_rules; | 79 session_params.host_mapping_rules = reference_params->host_mapping_rules; |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 return 0; | 432 return 0; |
434 } | 433 } |
435 | 434 |
436 void ProxyResolvingClientSocket::CloseTransportSocket() { | 435 void ProxyResolvingClientSocket::CloseTransportSocket() { |
437 if (transport_.get() && transport_->socket()) | 436 if (transport_.get() && transport_->socket()) |
438 transport_->socket()->Disconnect(); | 437 transport_->socket()->Disconnect(); |
439 transport_.reset(); | 438 transport_.reset(); |
440 } | 439 } |
441 | 440 |
442 } // namespace jingle_glue | 441 } // namespace jingle_glue |
OLD | NEW |