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..e77b04d437e3d3437b2c1cba13da7633f6a09791 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" |
+ |
namespace { |
bool SetProxyServerFromGURL(const GURL& gurl, |
net::ProxyServer* proxy_server) { |
@@ -85,7 +86,17 @@ bool MaybeBypassProxyAndPrepareToRetry( |
return true; |
} |
- |
+void OnResolveProxyHandler(const GURL& url, int load_flags, |
+ net::ProxyInfo* result) { |
bengr
2014/07/02 18:46:43
move up a line.
rcs
2014/07/02 22:53:12
Breaks 80 chars. I changed it to have one arg per
|
+#if defined(SPDY_PROXY_AUTH_ORIGIN) |
+ if ((load_flags & net::LOAD_BYPASS_DATA_REDUCTION_PROXY) && |
+ DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial() && |
+ !result->is_direct() && |
+ result->proxy_server().isDataReductionProxy()) { |
bengr
2014/07/02 18:46:43
We're trying to deprecate ProxyServer::IsDatareduc
rcs
2014/07/02 22:53:12
Done.
|
+ result->UseDirect(); |
+ } |
+#endif |
+} |
bool IsRequestIdempotent(const net::URLRequest* request) { |
DCHECK(request); |