| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
|
| index 5c65d708f0c36a9bf2c62985a9a8f5bee7451551..e1305c4a6f6907b883468218e68b137cf3038a03 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
|
| @@ -185,15 +185,12 @@ void DataReductionProxyRequestOptions::MaybeAddRequestHeader(
|
| return;
|
| if (proxy_server.is_direct())
|
| return;
|
| - MaybeAddRequestHeaderImpl(proxy_server.host_port_pair(), false,
|
| - request_headers);
|
| -}
|
| -
|
| -void DataReductionProxyRequestOptions::MaybeAddProxyTunnelRequestHandler(
|
| - const net::HostPortPair& proxy_server,
|
| - net::HttpRequestHeaders* request_headers) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - MaybeAddRequestHeaderImpl(proxy_server, true, request_headers);
|
| + if (proxy_server.host_port_pair().IsEmpty())
|
| + return;
|
| + if (data_reduction_proxy_config_->IsDataReductionProxy(
|
| + proxy_server.host_port_pair(), NULL)) {
|
| + SetHeader(request_headers);
|
| + }
|
| }
|
|
|
| void DataReductionProxyRequestOptions::SetHeader(
|
| @@ -290,19 +287,6 @@ const std::string& DataReductionProxyRequestOptions::GetSecureSession() const {
|
| return secure_session_;
|
| }
|
|
|
| -void DataReductionProxyRequestOptions::MaybeAddRequestHeaderImpl(
|
| - const net::HostPortPair& proxy_server,
|
| - bool expect_ssl,
|
| - net::HttpRequestHeaders* request_headers) {
|
| - if (proxy_server.IsEmpty())
|
| - return;
|
| - if (data_reduction_proxy_config_->IsDataReductionProxy(proxy_server, NULL) &&
|
| - data_reduction_proxy_config_->UsingHTTPTunnel(proxy_server) ==
|
| - expect_ssl) {
|
| - SetHeader(request_headers);
|
| - }
|
| -}
|
| -
|
| void DataReductionProxyRequestOptions::RegenerateRequestHeaderValue() {
|
| std::vector<std::string> headers;
|
| if (!session_.empty())
|
|
|