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

net/proxy/proxy_service.h

Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 377cde35aabba47b4abfe772d690e06ac015ba82..e71fe9b9c0fe67ff7d9b8abbf69ce613860b4880 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -37,7 +37,7 @@
 
 class DhcpProxyScriptFetcher;
 class HostResolver;
-class ProxyDelegate;
+class NetworkDelegate;
 class ProxyResolver;
 class ProxyResolverFactory;
 class ProxyResolverScriptData;
@@ -131,7 +131,7 @@
                    ProxyInfo* results,
                    const CompletionCallback& callback,
                    PacRequest** pac_request,
-                   ProxyDelegate* proxy_delegate,
+                   NetworkDelegate* network_delegate,
                    const BoundNetLog& net_log);
 
   // Returns true if the proxy information could be determined without spawning
@@ -139,7 +139,7 @@
   bool TryResolveProxySynchronously(const GURL& raw_url,
                                     int load_flags,
                                     ProxyInfo* result,
-                                    ProxyDelegate* proxy_delegate,
+                                    NetworkDelegate* network_delegate,
                                     const BoundNetLog& net_log);
 
   // This method is called after a failure to connect or resolve a host name.
@@ -162,7 +162,7 @@
                                 ProxyInfo* results,
                                 const CompletionCallback& callback,
                                 PacRequest** pac_request,
-                                ProxyDelegate* proxy_delegate,
+                                NetworkDelegate* network_delegate,
                                 const BoundNetLog& net_log);
 
   // Explicitly trigger proxy fallback for the given |results| by updating our
@@ -183,10 +183,10 @@
 
   // Called to report that the last proxy connection succeeded.  If |proxy_info|
   // has a non empty proxy_retry_info map, the proxies that have been tried (and
-  // failed) for this request will be marked as bad. |proxy_delegate| will
+  // failed) for this request will be marked as bad. |network_delegate| will
   // be notified of any proxy fallbacks.
   void ReportSuccess(const ProxyInfo& proxy_info,
-                     ProxyDelegate* proxy_delegate);
+                     NetworkDelegate* network_delegate);
 
   // Call this method with a non-null |pac_request| to cancel the PAC request.
   void CancelPacRequest(PacRequest* pac_request);
@@ -326,7 +326,7 @@
   // Completing synchronously means we don't need to query ProxyResolver.
   int TryToCompleteSynchronously(const GURL& url,
                                  int load_flags,
-                                 ProxyDelegate* proxy_delegate,
+                                 NetworkDelegate* network_delegate,
                                  ProxyInfo* result);
 
   // Identical to ResolveProxy, except that |callback| is permitted to be null.
@@ -337,7 +337,7 @@
                          ProxyInfo* results,
                          const CompletionCallback& callback,
                          PacRequest** pac_request,
-                         ProxyDelegate* proxy_delegate,
+                         NetworkDelegate* network_delegate,
                          const BoundNetLog& net_log);
 
   // Cancels all of the requests sent to the ProxyResolver. These will be
@@ -359,7 +359,7 @@
   // bad entries from the results list.
   int DidFinishResolvingProxy(const GURL& url,
                               int load_flags,
-                              ProxyDelegate* proxy_delegate,
+                              NetworkDelegate* network_delegate,
                               ProxyInfo* result,
                               int result_code,
                               const BoundNetLog& net_log,