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

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 2cd8080711357600f96e305612aa89a4ed87c335..d118ac4cf6753cd1161e2de575c11d14460415e1 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -812,9 +812,10 @@
     replacements.SetPortStr(new_port);
     url_for_proxy = url_for_proxy.ReplaceComponents(replacements);
   }
+
   return session_->proxy_service()->ResolveProxy(
       url_for_proxy, request_info_.load_flags, &proxy_info_, io_callback_,
-      &pac_request_, session_->params().proxy_delegate, net_log_);
+      &pac_request_, session_->network_delegate(), net_log_);
 }
 
 int HttpStreamFactoryImpl::Job::DoResolveProxyComplete(int result) {
@@ -1373,7 +1374,7 @@
     return result;
 
   session_->proxy_service()->ReportSuccess(proxy_info_,
-                                           session_->params().proxy_delegate);
+                                           session_->network_delegate());
   next_state_ = STATE_NONE;
   return OK;
 }
@@ -1546,7 +1547,7 @@
 
   int rv = session_->proxy_service()->ReconsiderProxyAfterError(
       request_info_.url, request_info_.load_flags, error, &proxy_info_,
-      io_callback_, &pac_request_, session_->params().proxy_delegate, net_log_);
+      io_callback_, &pac_request_, session_->network_delegate(), net_log_);
   if (rv == OK || rv == ERR_IO_PENDING) {
     // If the error was during connection setup, there is no socket to
     // disconnect.