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..f36b5334f14adf3ca15f84e234544af43b1b83a1 100644 |
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
@@ -37,6 +37,7 @@ bool SetProxyServerFromGURL(const GURL& gurl, |
namespace data_reduction_proxy { |
bool MaybeBypassProxyAndPrepareToRetry( |
+ net::ProxyService::DataReductionProxyBypassType* proxy_bypass_type, |
bengr
2014/07/16 01:40:10
While you're here, reorder the parameters. Paramet
megjablon
2014/07/16 23:07:14
Done.
|
const DataReductionProxyParams* data_reduction_proxy_params, |
net::URLRequest* request, |
const net::HttpResponseHeaders* original_response_headers, |
@@ -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) { |
return false; |
} |