| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
|
| index ac42fc70baf81c9de33a9351b5bb277016f676f0..54abc023a73c22c4f61e509991c6d3a161d25cb7 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
|
| @@ -44,9 +44,12 @@ bool MaybeBypassProxyAndPrepareToRetry(
|
| // DataCompressionProxyCriticalBypass Finch trial is set.
|
| // This handler is intended to be invoked only by
|
| // |ChromeNetworkDelegate.NotifyResolveProxy|.
|
| +// Also, apply the data reduction proxy configuration if another configuration
|
| +// is in use and it resolves to direct.
|
| void OnResolveProxyHandler(const GURL& url,
|
| int load_flags,
|
| const net::ProxyConfig& data_reduction_proxy_config,
|
| + const net::ProxyConfig& proxy_service_proxy_config,
|
| const net::ProxyRetryInfoMap& proxy_retry_info,
|
| const DataReductionProxyParams* params,
|
| net::ProxyInfo* result);
|
|
|