Clean up FTP code a bit:

net/ftp/ftp_network_transaction.h

-// Copyright (c) 2008 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.
+// Copyright (c) 2010 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_FTP_FTP_NETWORK_TRANSACTION_H_
 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
 
 #include <string>
 #include <queue>
 #include <utility>
 #include <vector>
 
 #include "base/ref_counted.h"
@@ skipping 29 matching lines @@
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual const FtpResponseInfo* GetResponseInfo() const;
   virtual LoadState GetLoadState() const;
   virtual uint64 GetUploadProgress() const;
 
  private:
   enum Command {
     COMMAND_NONE,
     COMMAND_USER,
     COMMAND_PASS,
-    COMMAND_ACCT,
     COMMAND_SYST,
     COMMAND_TYPE,
     COMMAND_EPSV,
     COMMAND_PASV,
     COMMAND_PWD,
     COMMAND_SIZE,
     COMMAND_RETR,
     COMMAND_CWD,
     COMMAND_MLSD,
     COMMAND_LIST,
@@ skipping 71 matching lines @@
   // See if the request URL contains a typecode and make us respect it.
   void DetectTypecode();
 
   // Runs the state transition loop.
   int DoLoop(int result);
 
   // Each of these methods corresponds to a State value.  Those with an input
   // argument receive the result from the previous state.  If a method returns
   // ERR_IO_PENDING, then the result from OnIOComplete will be passed to the
   // next state method as the result arg.
-  int DoCtrlInit();
-  int DoCtrlInitComplete(int result);
   int DoCtrlResolveHost();
   int DoCtrlResolveHostComplete(int result);
   int DoCtrlConnect();
   int DoCtrlConnectComplete(int result);
   int DoCtrlRead();
   int DoCtrlReadComplete(int result);
   int DoCtrlWrite();
   int DoCtrlWriteComplete(int result);
   int DoCtrlWriteUSER();
   int ProcessResponseUSER(const FtpCtrlResponse& response);
   int DoCtrlWritePASS();
   int ProcessResponsePASS(const FtpCtrlResponse& response);
-  int DoCtrlWriteACCT();
-  int ProcessResponseACCT(const FtpCtrlResponse& response);
   int DoCtrlWriteSYST();
   int ProcessResponseSYST(const FtpCtrlResponse& response);
   int DoCtrlWritePWD();
   int ProcessResponsePWD(const FtpCtrlResponse& response);
   int DoCtrlWriteTYPE();
   int ProcessResponseTYPE(const FtpCtrlResponse& response);
   int DoCtrlWriteEPSV();
   int ProcessResponseEPSV(const FtpCtrlResponse& response);
   int DoCtrlWritePASV();
   int ProcessResponsePASV(const FtpCtrlResponse& response);
@@ skipping 72 matching lines @@
 
   int data_connection_port_;
 
   ClientSocketFactory* socket_factory_;
 
   scoped_ptr<ClientSocket> ctrl_socket_;
   scoped_ptr<ClientSocket> data_socket_;
 
   enum State {
     // Control connection states:
-    STATE_CTRL_INIT,
-    STATE_CTRL_INIT_COMPLETE,
     STATE_CTRL_RESOLVE_HOST,
     STATE_CTRL_RESOLVE_HOST_COMPLETE,
     STATE_CTRL_CONNECT,
     STATE_CTRL_CONNECT_COMPLETE,
     STATE_CTRL_READ,
     STATE_CTRL_READ_COMPLETE,
     STATE_CTRL_WRITE,
     STATE_CTRL_WRITE_COMPLETE,
     STATE_CTRL_WRITE_USER,
     STATE_CTRL_WRITE_PASS,
-    STATE_CTRL_WRITE_ACCT,
     STATE_CTRL_WRITE_SYST,
     STATE_CTRL_WRITE_TYPE,
     STATE_CTRL_WRITE_EPSV,
     STATE_CTRL_WRITE_PASV,
     STATE_CTRL_WRITE_PWD,
     STATE_CTRL_WRITE_RETR,
     STATE_CTRL_WRITE_SIZE,
     STATE_CTRL_WRITE_CWD,
     STATE_CTRL_WRITE_MLSD,
     STATE_CTRL_WRITE_LIST,
     STATE_CTRL_WRITE_QUIT,
     // Data connection states:
     STATE_DATA_CONNECT,
     STATE_DATA_CONNECT_COMPLETE,
     STATE_DATA_READ,
     STATE_DATA_READ_COMPLETE,
     STATE_NONE
   };
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_FTP_FTP_NETWORK_TRANSACTION_H_