| Index: components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc
|
| diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc
|
| index 1d9cca5c12db6d2b76bde38f9e5a51d2249a4b56..f6b785dca91ab1b53b1c61b0c0ba2f7302496c5e 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc
|
| @@ -40,7 +40,8 @@ bool MaybeBypassProxyAndPrepareToRetry(
|
| const DataReductionProxyParams* data_reduction_proxy_params,
|
| net::URLRequest* request,
|
| const net::HttpResponseHeaders* original_response_headers,
|
| - scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
|
| + scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
|
| + net::ProxyService::DataReductionProxyBypassType* proxy_bypass_type) {
|
| if (!data_reduction_proxy_params)
|
| return false;
|
| std::pair<GURL, GURL> data_reduction_proxies;
|
| @@ -59,11 +60,12 @@ bool MaybeBypassProxyAndPrepareToRetry(
|
|
|
| DataReductionProxyInfo data_reduction_proxy_info;
|
| net::ProxyService::DataReductionProxyBypassType bypass_type =
|
| - GetDataReductionProxyBypassType(
|
| - original_response_headers, &data_reduction_proxy_info);
|
| - if (bypass_type == net::ProxyService::BYPASS_EVENT_TYPE_MAX) {
|
| + GetDataReductionProxyBypassType(original_response_headers,
|
| + &data_reduction_proxy_info);
|
| + if (proxy_bypass_type)
|
| + *proxy_bypass_type = bypass_type;
|
| + if (bypass_type == net::ProxyService::BYPASS_EVENT_TYPE_MAX)
|
| return false;
|
| - }
|
|
|
| DCHECK(request->context());
|
| DCHECK(request->context()->proxy_service());
|
|
|