FTP: Open a fresh data connection after a command error.

net/ftp/ftp_network_transaction.h

Index: net/ftp/ftp_network_transaction.h
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h
index d5a3b9c0412c6291e7b455be321e5eb35c493630..60a802f82538941554d5d032b3ffac84723dd78c 100644
--- a/net/ftp/ftp_network_transaction.h
+++ b/net/ftp/ftp_network_transaction.h
@@ -125,6 +125,9 @@ class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {
   // Resets the members of the transaction so it can be restarted.
   void ResetStateForRestart();
 
+  // Resets the data connection after an error and switches to |next_state|.
+  void ResetDataConnectionAfterError(State next_state);
+
   void DoCallback(int result);
   void OnIOComplete(int result);
 
@@ -249,6 +252,9 @@ class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {
   scoped_ptr<StreamSocket> data_socket_;
 
   State next_state_;
+
+  // State to switch to after data connection is complete.
+  State state_after_data_connection_;

[mmenke, 2012/11/14 21:05:39]

nit:  Think state_after_data_connect_ would be clearer, since "connection" is
used elsewhere to mean the connection itself rather than the act of connecting. 
Or maybe even state_after_data_connect_complete_.

[Paweł Hajdan Jr., 2012/11/14 23:30:31]

Done.

 };
 
 }  // namespace net