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..254bf2f5fc61fb913f58d009b56ab2b0d0a9bc8a 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,8 +60,10 @@ bool MaybeBypassProxyAndPrepareToRetry( |
DataReductionProxyInfo data_reduction_proxy_info; |
net::ProxyService::DataReductionProxyBypassType bypass_type = |
- GetDataReductionProxyBypassType( |
- original_response_headers, &data_reduction_proxy_info); |
+ 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) { |
bengr
2014/07/19 00:13:01
no need for curly braces.
megjablon
2014/07/21 19:44:45
Done.
|
return false; |
} |