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

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 577f4b70b9af500b99816c7297eed267b69fc9b4..9f0928e7d1b3d43ee4bae02a72421b54b2e660cb 100644
--- a/net/base/layered_network_delegate.h
+++ b/net/base/layered_network_delegate.h
@@ -25,6 +25,8 @@
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyInfo;
+class ProxyServer;
+class ProxyService;
 class URLRequest;
 
 // WrappingNetworkDelegate takes a |network_delegate| and extends it. When
@@ -41,6 +43,11 @@
   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;
@@ -87,6 +94,14 @@
   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,