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

net/url_request/url_request_ftp_job.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
 #include "net/ftp/ftp_request_info.h"
 #include "net/ftp/ftp_transaction.h"
 #include "net/url_request/url_request_job.h"
 

[Paweł Hajdan Jr., 2012/06/07 19:30:21]

nit: Why an empty line? Keep things sorted and forward-declare where possible as
Erik said.

[shalev, 2012/06/21 20:04:55]

Done.

+#include "net/url_request/url_request_job_factory.h"
+#include "net/base/network_delegate.h"

[erikwright (departed), 2012/06/07 19:14:51]

presumably these includes are no longer required here? Just some forward-decls?

[shalev, 2012/06/21 20:04:55]

Done.

+#include "net/ftp/ftp_transaction_factory.h"
+#include "net/ftp/ftp_auth_cache.h"
+
 namespace net {
 
 class URLRequestContext;
 
 // 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);
 
   static URLRequestJob* Factory(URLRequest* request,
                                 const std::string& scheme);
 
   // Overridden from URLRequestJob:
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
   virtual HostPortPair GetSocketAddress() const OVERRIDE;
+  NetworkDelegate* network_delegate() const { return network_delegate_; }
+  FtpTransactionFactory* ftp_transaction_factory() {

[erikwright (departed), 2012/06/07 19:14:51]

Why are these accessors added?

[Paweł Hajdan Jr., 2012/06/07 19:30:21]

Yup, they really shouldn't be needed.

[shalev, 2012/06/21 20:04:55]

Done.

+    return ftp_transaction_factory_;
+  }
+  FtpAuthCache* ftp_auth_cache() { return ftp_auth_cache_; }
 
  private:
   virtual ~URLRequestFtpJob();
 
   void StartTransaction();
 
   void OnStartCompleted(int result);
   void OnReadCompleted(int result);
 
   void RestartTransactionWithAuth();
@@ skipping 18 matching lines @@
 
   FtpRequestInfo request_info_;
   scoped_ptr<FtpTransaction> transaction_;
 
   bool read_in_progress_;
 
   scoped_refptr<AuthData> server_auth_;
 
   base::WeakPtrFactory<URLRequestFtpJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestFtpJob);

[erikwright (departed), 2012/06/07 19:14:51]

DISALLOW_... should be the last line in the private member section.

[shalev, 2012/06/21 20:04:55]

Done.

+
+  NetworkDelegate* network_delegate_;
+  FtpTransactionFactory* ftp_transaction_factory_;
+  FtpAuthCache* ftp_auth_cache_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_