Check effective proxy config before adding data reduction proxies

components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
index ac42fc70baf81c9de33a9351b5bb277016f676f0..af2cea53399a15d04573cf734e388c7c5252263b 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol.h
@@ -38,15 +38,17 @@ bool MaybeBypassProxyAndPrepareToRetry(
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
     DataReductionProxyBypassType* proxy_bypass_type);
 
-// Configure |result| to proceed directly to the origin if |result|'s current
-// proxy is the data reduction proxy, the
-// |net::LOAD_BYPASS_DATA_REDUCTION_PROXY| |load_flag| is set, and the
-// DataCompressionProxyCriticalBypass Finch trial is set.
-// This handler is intended to be invoked only by
-// |ChromeNetworkDelegate.NotifyResolveProxy|.
+// Adds data reduction proxies to |result|, where applicable, if result
+// otherwise uses a direct connection for |url|, the proxy service's effective
+// proxy configuration is not the data reduction proxy configuration, and the
+// data reduction proxy is not bypassed. Also, configures |result| to proceed
+// directly to the origin if |result|'s current proxy is the data
+// reduction proxy, the |net::LOAD_BYPASS_DATA_REDUCTION_PROXY| |load_flag| is
+// set, and the DataCompressionProxyCriticalBypass Finch trial is set.
 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);