Make Data Reduction Proxy a best effort proxy

components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc
index bfef9e731dba9be6a89018b7fafdfa3147969457..2533eda55a90f7937b1fe711ac9a78802309068c 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.cc
@@ -144,13 +144,12 @@ bool MaybeBypassProxyAndPrepareToRetry(
 void OnResolveProxyHandler(const GURL& url,
                            int load_flags,
                            const net::ProxyConfig& data_reduction_proxy_config,
-                           const net::ProxyConfig& proxy_service_proxy_config,
                            const net::ProxyRetryInfoMap& proxy_retry_info,
                            const DataReductionProxyParams* params,
                            net::ProxyInfo* result) {

[sclittle, 2015/01/06 18:13:24]

Can you add a DCHECK at the beginning of this function asserting that
result->proxy_server() is not the DRP?

[bengr, 2015/01/06 21:32:49]

Done.

   if (data_reduction_proxy_config.is_valid() &&
       result->proxy_server().is_direct() &&
-      !data_reduction_proxy_config.Equals(proxy_service_proxy_config)) {
+      !url.SchemeIsWSOrWSS()) {
     net::ProxyInfo data_reduction_proxy_info;
     data_reduction_proxy_config.proxy_rules().Apply(
         url, &data_reduction_proxy_info);
@@ -159,9 +158,8 @@ void OnResolveProxyHandler(const GURL& url,
       result->UseProxyList(data_reduction_proxy_info.proxy_list());
   }
 
-  if (url.SchemeIsWSOrWSS() ||
-      ((load_flags & net::LOAD_BYPASS_DATA_REDUCTION_PROXY) &&
-       DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial())) {
+  if ((load_flags & net::LOAD_BYPASS_DATA_REDUCTION_PROXY) &&
+      DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial()) {
     if (!result->is_empty() &&
         !result->is_direct() &&
         params &&