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

net/base/layered_network_delegate.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_LAYERED_NETWORK_DELEGATE_H_
 #define NET_BASE_LAYERED_NETWORK_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "net/base/completion_callback.h"
 #include "net/base/network_delegate.h"
 #include "net/cookies/canonical_cookie.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 }
 
 namespace net {
 
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyInfo;
 class ProxyServer;
 class ProxyService;

[bengr, 2016/02/08 23:23:30]

You don't need ProxyServer or ProxyService anymore.

[RyanSturm, 2016/02/09 00:46:03]

Done.

 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,
@@ skipping 27 matching lines @@
   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);
@@ skipping 50 matching lines @@
       const GURL& target_url,
       const GURL& referrer_url) const;
 
  private:
   scoped_ptr<NetworkDelegate> nested_network_delegate_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_LAYERED_NETWORK_DELEGATE_H_