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

net/base/layered_network_delegate.cc

 // 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.
 
 #include "net/base/layered_network_delegate.h"
 
 #include <utility>
 
 namespace net {
 
@@ skipping 12 matching lines @@
   return nested_network_delegate_->NotifyBeforeURLRequest(request, callback,
                                                           new_url);
 }
 
 void LayeredNetworkDelegate::OnBeforeURLRequestInternal(
     URLRequest* request,
     const CompletionCallback& callback,
     GURL* new_url) {
 }
 
+void LayeredNetworkDelegate::OnResolveProxy(const GURL& url,
+                                            int load_flags,
+                                            const ProxyService& proxy_service,
+                                            ProxyInfo* result) {
+  OnResolveProxyInternal(url, load_flags, proxy_service, result);
+  nested_network_delegate_->NotifyResolveProxy(url, load_flags, proxy_service,
+                                               result);
+}
+
+void LayeredNetworkDelegate::OnResolveProxyInternal(
+    const GURL& url,
+    int load_flags,
+    const ProxyService& proxy_service,
+    ProxyInfo* result) {
+}
+
+void LayeredNetworkDelegate::OnProxyFallback(const ProxyServer& bad_proxy,
+                                             int net_error) {
+  OnProxyFallbackInternal(bad_proxy, net_error);
+  nested_network_delegate_->NotifyProxyFallback(bad_proxy, net_error);
+}
+
+void LayeredNetworkDelegate::OnProxyFallbackInternal(
+    const ProxyServer& bad_proxy,
+    int net_error) {
+}
+
 int LayeredNetworkDelegate::OnBeforeSendHeaders(
     URLRequest* request,
     const CompletionCallback& callback,
     HttpRequestHeaders* headers) {
   OnBeforeSendHeadersInternal(request, callback, headers);
   return nested_network_delegate_->NotifyBeforeSendHeaders(request, callback,
                                                            headers);
 }
 
 void LayeredNetworkDelegate::OnBeforeSendHeadersInternal(
@@ skipping 210 matching lines @@
 }
 
 void LayeredNetworkDelegate::
     OnCancelURLRequestWithPolicyViolatingReferrerHeaderInternal(
         const URLRequest& request,
         const GURL& target_url,
         const GURL& referrer_url) const {
 }
 
 }  // namespace net