Refactoring: ProtocolHandler::MaybeCreateJob and other functions take NetworkDelegate as argument

This change goes a long way to prepare for removing NetworkDelegate from URLRequestContext.

TBR=sky@chromium.org, michaeln@chromium.org, benjhayden@chromium.org, brettw@chromium.org, ben@chromium.org, davemoore@chromium.org, zelidrag@chromium.org, mnissler@chromium.org, thestig@chromium.org, asargent@chromium.org, jhawkins@chromium.org, bulach@chromium.org

BUG=crbug.com/142945

Review URL: https://chromiumcodereview.appspot.com/10855209

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153133 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/net/url_request/ftp_protocol_handler.cc b/net/url_request/ftp_protocol_handler.cc
index b9dc0fa0..7d9ba88 100644
--- a/net/url_request/ftp_protocol_handler.cc
+++ b/net/url_request/ftp_protocol_handler.cc
@@ -15,26 +15,24 @@
 namespace net {
 
 FtpProtocolHandler::FtpProtocolHandler(
-    NetworkDelegate* network_delegate,
     FtpTransactionFactory* ftp_transaction_factory,
     FtpAuthCache* ftp_auth_cache)
-    : network_delegate_(network_delegate),
-      ftp_transaction_factory_(ftp_transaction_factory),
+    : ftp_transaction_factory_(ftp_transaction_factory),
       ftp_auth_cache_(ftp_auth_cache) {
   DCHECK(ftp_transaction_factory_);
   DCHECK(ftp_auth_cache_);
 }
 
 URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
-    URLRequest* request) const {
+    URLRequest* request, NetworkDelegate* network_delegate) const {
   int port = request->url().IntPort();
   if (request->url().has_port() &&
       !IsPortAllowedByFtp(port) && !IsPortAllowedByOverride(port)) {
-    return new URLRequestErrorJob(request, ERR_UNSAFE_PORT);
+    return new URLRequestErrorJob(request, network_delegate, ERR_UNSAFE_PORT);
   }
 
   return new URLRequestFtpJob(request,
-                              network_delegate_,
+                              network_delegate,
                               ftp_transaction_factory_,
                               ftp_auth_cache_);
 }