jingle/glue/proxy_resolving_client_socket.cc - Issue 2089243002: Split enable_alternative_service_with_different_host flag.

Side by Side Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 2089243002: Split enable_alternative_service_with_different_host flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc ('K') | « components/network_session_configurator/network_session_configurator_unittest.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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;	91 session_params.enable_spdy31 = reference_params->enable_spdy31;

92 session_params.enable_http2 = reference_params->enable_http2;	92 session_params.enable_http2 = reference_params->enable_http2;

93 session_params.enable_alternative_service_with_different_host =	93 session_params.enable_http2_alternative_service_with_different_host =

94 reference_params->enable_alternative_service_with_different_host;	94 reference_params->enable_http2_alternative_service_with_different_host;

	95 session_params.enable_quic_alternative_service_with_different_host =

	96 reference_params->enable_quic_alternative_service_with_different_host;

95 }	97 }

96	98

97 network_session_.reset(new net::HttpNetworkSession(session_params));	99 network_session_.reset(new net::HttpNetworkSession(session_params));

98 }	100 }

99	101

100 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() {	102 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() {

101 Disconnect();	103 Disconnect();

102 }	104 }

103	105

104 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,	106 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,

(...skipping 319 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
424 return 0;	426 return 0;

425 }	427 }

426	428

427 void ProxyResolvingClientSocket::CloseTransportSocket() {	429 void ProxyResolvingClientSocket::CloseTransportSocket() {

428 if (transport_.get() && transport_->socket())	430 if (transport_.get() && transport_->socket())

429 transport_->socket()->Disconnect();	431 transport_->socket()->Disconnect();

430 transport_.reset();	432 transport_.reset();

431 }	433 }

432	434

433 } // namespace jingle_glue	435 } // namespace jingle_glue

OLD	NEW