| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // prone. Should have a better way to do this. | 79 // prone. Should have a better way to do this. |
| 80 session_params.host_mapping_rules = reference_params->host_mapping_rules; | 80 session_params.host_mapping_rules = reference_params->host_mapping_rules; |
| 81 session_params.ignore_certificate_errors = | 81 session_params.ignore_certificate_errors = |
| 82 reference_params->ignore_certificate_errors; | 82 reference_params->ignore_certificate_errors; |
| 83 session_params.testing_fixed_http_port = | 83 session_params.testing_fixed_http_port = |
| 84 reference_params->testing_fixed_http_port; | 84 reference_params->testing_fixed_http_port; |
| 85 session_params.testing_fixed_https_port = | 85 session_params.testing_fixed_https_port = |
| 86 reference_params->testing_fixed_https_port; | 86 reference_params->testing_fixed_https_port; |
| 87 session_params.enable_spdy31 = reference_params->enable_spdy31; | 87 session_params.enable_spdy31 = reference_params->enable_spdy31; |
| 88 session_params.enable_http2 = reference_params->enable_http2; | 88 session_params.enable_http2 = reference_params->enable_http2; |
| 89 session_params.parse_alternative_services = | |
| 90 reference_params->parse_alternative_services; | |
| 91 session_params.enable_alternative_service_with_different_host = | 89 session_params.enable_alternative_service_with_different_host = |
| 92 reference_params->enable_alternative_service_with_different_host; | 90 reference_params->enable_alternative_service_with_different_host; |
| 93 } | 91 } |
| 94 | 92 |
| 95 network_session_.reset(new net::HttpNetworkSession(session_params)); | 93 network_session_.reset(new net::HttpNetworkSession(session_params)); |
| 96 } | 94 } |
| 97 | 95 |
| 98 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { | 96 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { |
| 99 Disconnect(); | 97 Disconnect(); |
| 100 } | 98 } |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 return 0; | 424 return 0; |
| 427 } | 425 } |
| 428 | 426 |
| 429 void ProxyResolvingClientSocket::CloseTransportSocket() { | 427 void ProxyResolvingClientSocket::CloseTransportSocket() { |
| 430 if (transport_.get() && transport_->socket()) | 428 if (transport_.get() && transport_->socket()) |
| 431 transport_->socket()->Disconnect(); | 429 transport_->socket()->Disconnect(); |
| 432 transport_.reset(); | 430 transport_.reset(); |
| 433 } | 431 } |
| 434 | 432 |
| 435 } // namespace jingle_glue | 433 } // namespace jingle_glue |
| OLD | NEW |