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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 = |
71 request_context->GetNetworkSessionParams(); | 71 request_context->GetNetworkSessionParams(); |
72 if (reference_params) { | 72 if (reference_params) { |
73 // TODO(mmenke): Just copying specific parameters seems highly regression | 73 // TODO(mmenke): Just copying specific parameters seems highly regression |
74 // prone. Should have a better way to do this. | 74 // prone. Should have a better way to do this. |
75 session_params.host_mapping_rules = reference_params->host_mapping_rules; | 75 session_params.host_mapping_rules = reference_params->host_mapping_rules; |
76 session_params.ignore_certificate_errors = | 76 session_params.ignore_certificate_errors = |
77 reference_params->ignore_certificate_errors; | 77 reference_params->ignore_certificate_errors; |
78 session_params.http_pipelining_enabled = | |
79 reference_params->http_pipelining_enabled; | |
80 session_params.testing_fixed_http_port = | 78 session_params.testing_fixed_http_port = |
81 reference_params->testing_fixed_http_port; | 79 reference_params->testing_fixed_http_port; |
82 session_params.testing_fixed_https_port = | 80 session_params.testing_fixed_https_port = |
83 reference_params->testing_fixed_https_port; | 81 reference_params->testing_fixed_https_port; |
84 session_params.next_protos = reference_params->next_protos; | 82 session_params.next_protos = reference_params->next_protos; |
85 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; | 83 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; |
86 session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl; | 84 session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl; |
87 session_params.force_spdy_always = reference_params->force_spdy_always; | 85 session_params.force_spdy_always = reference_params->force_spdy_always; |
88 session_params.forced_spdy_exclusions = | 86 session_params.forced_spdy_exclusions = |
89 reference_params->forced_spdy_exclusions; | 87 reference_params->forced_spdy_exclusions; |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 return false; | 396 return false; |
399 } | 397 } |
400 | 398 |
401 void ProxyResolvingClientSocket::CloseTransportSocket() { | 399 void ProxyResolvingClientSocket::CloseTransportSocket() { |
402 if (transport_.get() && transport_->socket()) | 400 if (transport_.get() && transport_->socket()) |
403 transport_->socket()->Disconnect(); | 401 transport_->socket()->Disconnect(); |
404 transport_.reset(); | 402 transport_.reset(); |
405 } | 403 } |
406 | 404 |
407 } // namespace jingle_glue | 405 } // namespace jingle_glue |
OLD | NEW |