Revert of Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate

components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
index 4e45dffd9578667267ff1b557b80f6150648d0f8..a9da5b928fd1c8a92da4475a34fabc87fe7be742 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
@@ -7,15 +7,12 @@
 
 #include "base/macros.h"
 #include "net/base/proxy_delegate.h"
-#include "net/proxy/proxy_retry_info.h"
 #include "url/gurl.h"
 
 namespace net {
 class HostPortPair;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
-class NetLog;
-class ProxyConfig;
 class ProxyInfo;
 class ProxyServer;
 class ProxyService;
@@ -24,10 +21,7 @@
 
 namespace data_reduction_proxy {
 
-class DataReductionProxyBypassStats;
 class DataReductionProxyConfig;
-class DataReductionProxyConfigurator;
-class DataReductionProxyEventCreator;
 class DataReductionProxyRequestOptions;
 
 class DataReductionProxyDelegate : public net::ProxyDelegate {
@@ -36,11 +30,7 @@
   // outlives this class instance.
   explicit DataReductionProxyDelegate(
       DataReductionProxyRequestOptions* request_options,
-      DataReductionProxyConfig* config,
-      const DataReductionProxyConfigurator* configurator,
-      DataReductionProxyEventCreator* event_creator,
-      DataReductionProxyBypassStats* bypass_stats,
-      net::NetLog* net_log);
+      DataReductionProxyConfig* config);
 
   ~DataReductionProxyDelegate() override;
 
@@ -67,25 +57,10 @@
  private:
   DataReductionProxyRequestOptions* request_options_;
   const DataReductionProxyConfig* config_;
-  const DataReductionProxyConfigurator* configurator_;
-  DataReductionProxyEventCreator* event_creator_;
-  DataReductionProxyBypassStats* bypass_stats_;
-  net::NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyDelegate);
 };
 
-// Adds data reduction proxies to |result|, where applicable, if result
-// otherwise uses a direct connection for |url|, 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
-// This is visible for test purposes.
-void OnResolveProxyHandler(const GURL& url,
-                           int load_flags,
-                           const net::ProxyConfig& data_reduction_proxy_config,
-                           const net::ProxyRetryInfoMap& proxy_retry_info,
-                           const DataReductionProxyConfig* config,
-                           net::ProxyInfo* result);
 }  // namespace data_reduction_proxy
 
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_DELEGATE_H_