Replaced static URLRequestFtpJob factory with non-static protocol handler for FTP jobs.

net/url_request/url_request_ftp_job.h

Index: net/url_request/url_request_ftp_job.h
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 05cbb33979c8e6aad32b4f8e93259833a28ea36c..a2f86bbc1e962d4d8b8819516eaea565e7790ae1 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -17,14 +17,21 @@
 
 namespace net {
 
+class NetworkDelegate;
+class FtpTransactionFactory;
+class FtpAuthCache;
 class URLRequestContext;

[mmenke, 2012/06/27 17:20:07]

While you're here, can you remove the  URLRequestContext forward declaration? 
It's not used in this file.

[shalev, 2012/06/27 20:10:43]

Done.

 
 // A URLRequestJob subclass that is built on top of FtpTransaction. It
 // provides an implementation for FTP.
 class URLRequestFtpJob : public URLRequestJob {
  public:
-  explicit URLRequestFtpJob(URLRequest* request);
+  URLRequestFtpJob(URLRequest* request,
+                   NetworkDelegate* network_delegate,
+                   FtpTransactionFactory* ftp_transaction_factory,
+                   FtpAuthCache* ftp_auth_cache);
 
+  // TODO(shalev): get rid of this function in favor of FtpProtocolHandler.
   static URLRequestJob* Factory(URLRequest* request,
                                 const std::string& scheme);
 
@@ -69,6 +76,9 @@ class URLRequestFtpJob : public URLRequestJob {
 
   base::WeakPtrFactory<URLRequestFtpJob> weak_factory_;
 
+  FtpTransactionFactory* ftp_transaction_factory_;
+  FtpAuthCache* ftp_auth_cache_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestFtpJob);
 };