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

net/base/network_delegate.cc

Index: net/base/network_delegate.cc
diff --git a/net/base/network_delegate.cc b/net/base/network_delegate.cc
index 8c23a5329424896f7e637312a22a113f6759d9cd..ff4ee88fa0b7ea23bb1d9eee57543146dd5f7739 100644
--- a/net/base/network_delegate.cc
+++ b/net/base/network_delegate.cc
@@ -24,6 +24,23 @@
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "475753 NetworkDelegate::OnBeforeURLRequest"));
   return OnBeforeURLRequest(request, callback, new_url);
+}
+
+void NetworkDelegate::NotifyResolveProxy(
+    const GURL& url,
+    int load_flags,
+    const ProxyService& proxy_service,
+    ProxyInfo* result) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(result);
+  OnResolveProxy(url, load_flags, proxy_service, result);
+}
+
+void NetworkDelegate::NotifyProxyFallback(
+    const ProxyServer& bad_proxy,
+    int net_error) {
+  DCHECK(CalledOnValidThread());
+  OnProxyFallback(bad_proxy, net_error);
 }
 
 int NetworkDelegate::NotifyBeforeSendHeaders(