Chromium Code Reviews| 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 2ec31e750924280bffa3c74a7e7d0787ca2fccd6..97ee818a78517d08993bf1702c1f2a8fb5a46252 100644 |
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol.cc |
| @@ -18,6 +18,7 @@ |
| #include "net/url_request/url_request_context.h" |
| #include "url/gurl.h" |
| + |
|
mmenke
2014/07/07 20:21:59
nit: Remove extra blank line.
rcs
2014/07/07 22:08:49
Done.
|
| namespace { |
| bool SetProxyServerFromGURL(const GURL& gurl, |
|
mmenke
2014/07/07 20:21:59
nit: blank line after start and before end of nam
rcs
2014/07/07 22:08:49
Done.
|
| net::ProxyServer* proxy_server) { |
| @@ -85,7 +86,20 @@ bool MaybeBypassProxyAndPrepareToRetry( |
| return true; |
| } |
| - |
| +void OnResolveProxyHandler(const GURL& url, |
| + int load_flags, |
| + const DataReductionProxyParams* params, |
| + net::ProxyInfo* result) { |
| + if ((load_flags & net::LOAD_BYPASS_DATA_REDUCTION_PROXY) && |
|
mmenke
2014/07/07 20:21:59
No need to do anything in this CL in response to t
|
| + DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial() && |
| + !result->is_empty() && |
| + !result->is_direct() && |
| + params && |
| + params->IsDataReductionProxy( |
| + result->proxy_server().host_port_pair(), NULL)) { |
| + result->UseDirect(); |
| + } |
| +} |
| bool IsRequestIdempotent(const net::URLRequest* request) { |
| DCHECK(request); |