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 a013f721be079c1dd00c028d3858be78fb14e196..8d270cf83fbb1e761303790f1587a144b38e5658 100644 |
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
@@ -35,6 +35,7 @@ bool SetProxyServerFromGURL(const GURL& gurl, |
namespace data_reduction_proxy { |
bool MaybeBypassProxyAndPrepareToRetry( |
+ net::ProxyService::DataReductionProxyBypassType proxy_bypass_type, |
const DataReductionProxyParams* data_reduction_proxy_params, |
net::URLRequest* request, |
const net::HttpResponseHeaders* original_response_headers, |
@@ -57,8 +58,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) |
bengr
2014/07/14 22:04:30
if (proxy_bypass_type)
|
+ proxy_bypass_type = bypass_type; |
bengr
2014/07/14 22:04:29
I don't understand this. What is it doing?
megjablon
2014/07/15 18:02:50
Whoops meant to take that out but missed it.
|
if (bypass_type == net::ProxyService::BYPASS_EVENT_TYPE_MAX) { |
return false; |
} |