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