jingle/glue/proxy_resolving_client_socket.cc - Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis

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

Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added net/base/test_proxy_delegate.{h,cc} Created 4 years, 10 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

« no previous file with comments | « components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc ('k') | net/base/proxy_delegate.h » ('j') | no next file with comments »

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	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 // prone. Should have a better way to do this.	78 // prone. Should have a better way to do this.

79 session_params.host_mapping_rules = reference_params->host_mapping_rules;	79 session_params.host_mapping_rules = reference_params->host_mapping_rules;

80 session_params.ignore_certificate_errors =	80 session_params.ignore_certificate_errors =

81 reference_params->ignore_certificate_errors;	81 reference_params->ignore_certificate_errors;

82 session_params.testing_fixed_http_port =	82 session_params.testing_fixed_http_port =

83 reference_params->testing_fixed_http_port;	83 reference_params->testing_fixed_http_port;

84 session_params.testing_fixed_https_port =	84 session_params.testing_fixed_https_port =

85 reference_params->testing_fixed_https_port;	85 reference_params->testing_fixed_https_port;

86 session_params.enable_spdy31 = reference_params->enable_spdy31;	86 session_params.enable_spdy31 = reference_params->enable_spdy31;

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

88 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;

89 session_params.forced_spdy_exclusions =	88 session_params.forced_spdy_exclusions =

90 reference_params->forced_spdy_exclusions;	89 reference_params->forced_spdy_exclusions;

91 session_params.parse_alternative_services =	90 session_params.parse_alternative_services =

92 reference_params->parse_alternative_services;	91 reference_params->parse_alternative_services;

93 session_params.enable_alternative_service_with_different_host =	92 session_params.enable_alternative_service_with_different_host =

94 reference_params->enable_alternative_service_with_different_host;	93 reference_params->enable_alternative_service_with_different_host;

95 }	94 }

96	95

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

98 }	97 }

(...skipping 335 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
434 return 0;	433 return 0;

435 }	434 }

436	435

437 void ProxyResolvingClientSocket::CloseTransportSocket() {	436 void ProxyResolvingClientSocket::CloseTransportSocket() {

438 if (transport_.get() && transport_->socket())	437 if (transport_.get() && transport_->socket())

439 transport_->socket()->Disconnect();	438 transport_->socket()->Disconnect();

440 transport_.reset();	439 transport_.reset();

441 }	440 }

442	441

443 } // namespace jingle_glue	442 } // namespace jingle_glue

OLD	NEW