Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate for DataReductionProxy

net/base/layered_network_delegate.h

Index: net/base/layered_network_delegate.h
diff --git a/net/base/layered_network_delegate.h b/net/base/layered_network_delegate.h
index 9f0928e7d1b3d43ee4bae02a72421b54b2e660cb..577f4b70b9af500b99816c7297eed267b69fc9b4 100644
--- a/net/base/layered_network_delegate.h
+++ b/net/base/layered_network_delegate.h
@@ -18,43 +18,36 @@ class GURL;
 namespace base {
 class FilePath;
 }
 
 namespace net {
 
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyInfo;
-class ProxyServer;
-class ProxyService;
 class URLRequest;
 
 // WrappingNetworkDelegate takes a |network_delegate| and extends it. When
 // On*() is called, the On*Internal() method of this is first called and then
 // the On*() of |network_delegate| is called. On*Internal() methods have no
 // return values, and cannot prevent calling into the nested network delegate.
 class NET_EXPORT LayeredNetworkDelegate : public NetworkDelegate {
  public:
   explicit LayeredNetworkDelegate(
       scoped_ptr<NetworkDelegate> nested_network_delegate);
   ~LayeredNetworkDelegate() override;
 
   // NetworkDelegate implementation:
   int OnBeforeURLRequest(URLRequest* request,
                          const CompletionCallback& callback,
                          GURL* new_url) final;
-  void OnResolveProxy(const GURL& url,
-                      int load_flags,
-                      const ProxyService& proxy_service,
-                      ProxyInfo* result) final;
-  void OnProxyFallback(const ProxyServer& bad_proxy, int net_error) final;
   int OnBeforeSendHeaders(URLRequest* request,
                           const CompletionCallback& callback,
                           HttpRequestHeaders* headers) final;
   void OnBeforeSendProxyHeaders(URLRequest* request,
                                 const ProxyInfo& proxy_info,
                                 HttpRequestHeaders* headers) final;
   void OnSendHeaders(URLRequest* request,
                      const HttpRequestHeaders& headers) final;
   int OnHeadersReceived(
       URLRequest* request,
@@ -88,28 +81,20 @@ class NET_EXPORT LayeredNetworkDelegate : public NetworkDelegate {
   bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       const URLRequest& request,
       const GURL& target_url,
       const GURL& referrer_url) const final;
 
  protected:
   virtual void OnBeforeURLRequestInternal(URLRequest* request,
                                           const CompletionCallback& callback,
                                           GURL* new_url);
 
-  virtual void OnResolveProxyInternal(const GURL& url,
-                                      int load_flags,
-                                      const ProxyService& proxy_service,
-                                      ProxyInfo* result);
-
-  virtual void OnProxyFallbackInternal(const ProxyServer& bad_proxy,
-                                       int net_error);
-
   virtual void OnBeforeSendHeadersInternal(URLRequest* request,
                                            const CompletionCallback& callback,
                                            HttpRequestHeaders* headers);
 
   virtual void OnBeforeSendProxyHeadersInternal(URLRequest* request,
                                                 const ProxyInfo& proxy_info,
                                                 HttpRequestHeaders* headers);
 
   virtual void OnSendHeadersInternal(URLRequest* request,
                                      const HttpRequestHeaders& headers);