| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_http2 = reference_params->enable_http2; | 91 session_params.enable_http2 = reference_params->enable_http2; |
| 92 session_params.enable_http2_alternative_service = | 92 session_params.enable_http2_alternative_service = |
| 93 reference_params->enable_http2_alternative_service; | 93 reference_params->enable_http2_alternative_service; |
| 94 session_params.enable_quic_alternative_service_with_different_host = | |
| 95 reference_params->enable_quic_alternative_service_with_different_host; | |
| 96 } | 94 } |
| 97 | 95 |
| 98 network_session_.reset(new net::HttpNetworkSession(session_params)); | 96 network_session_.reset(new net::HttpNetworkSession(session_params)); |
| 99 | 97 |
| 100 net::HttpAuthCache* other_auth_cache = | 98 net::HttpAuthCache* other_auth_cache = |
| 101 request_context->http_transaction_factory() | 99 request_context->http_transaction_factory() |
| 102 ->GetSession() | 100 ->GetSession() |
| 103 ->http_auth_cache(); | 101 ->http_auth_cache(); |
| 104 DCHECK(other_auth_cache); | 102 DCHECK(other_auth_cache); |
| 105 network_session_->http_auth_cache()->UpdateAllFrom(*other_auth_cache); | 103 network_session_->http_auth_cache()->UpdateAllFrom(*other_auth_cache); |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 return 0; | 429 return 0; |
| 432 } | 430 } |
| 433 | 431 |
| 434 void ProxyResolvingClientSocket::CloseTransportSocket() { | 432 void ProxyResolvingClientSocket::CloseTransportSocket() { |
| 435 if (transport_.get() && transport_->socket()) | 433 if (transport_.get() && transport_->socket()) |
| 436 transport_->socket()->Disconnect(); | 434 transport_->socket()->Disconnect(); |
| 437 transport_.reset(); | 435 transport_.reset(); |
| 438 } | 436 } |
| 439 | 437 |
| 440 } // namespace jingle_glue | 438 } // namespace jingle_glue |
| OLD | NEW |