Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

net/ftp/ftp_network_transaction.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 16 matching lines @@
 class FtpNetworkSession;
 class StreamSocket;
 
 class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {
  public:
   FtpNetworkTransaction(FtpNetworkSession* session,
                         ClientSocketFactory* socket_factory);
   virtual ~FtpNetworkTransaction();
 
   virtual int Stop(int error);
-  virtual int RestartIgnoringLastError(OldCompletionCallback* callback);
+  virtual int RestartIgnoringLastError(const CompletionCallback& callback);
 
   // FtpTransaction methods:
   virtual int Start(const FtpRequestInfo* request_info,
-                    OldCompletionCallback* callback,
+                    const CompletionCallback& callback,
                     const BoundNetLog& net_log) OVERRIDE;
   virtual int RestartWithAuth(const AuthCredentials& credentials,
-                              OldCompletionCallback* callback) OVERRIDE;
-  virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback)
-      OVERRIDE;
+                              const CompletionCallback& callback) OVERRIDE;
+  virtual int Read(IOBuffer* buf, int buf_len,
+                   const CompletionCallback& callback) OVERRIDE;
   virtual const FtpResponseInfo* GetResponseInfo() const OVERRIDE;
   virtual LoadState GetLoadState() const OVERRIDE;
   virtual uint64 GetUploadProgress() const OVERRIDE;
 
  private:
   enum Command {
     COMMAND_NONE,
     COMMAND_USER,
     COMMAND_PASS,
     COMMAND_SYST,
@@ skipping 125 matching lines @@
 
   int DoDataConnect();
   int DoDataConnectComplete(int result);
   int DoDataRead();
   int DoDataReadComplete(int result);
 
   void RecordDataConnectionError(int result);
 
   Command command_sent_;
 
-  OldCompletionCallbackImpl<FtpNetworkTransaction> io_callback_;
-  OldCompletionCallback* user_callback_;
+  CompletionCallback io_callback_;
+  CompletionCallback user_callback_;
 
   scoped_refptr<FtpNetworkSession> session_;
 
   BoundNetLog net_log_;
   const FtpRequestInfo* request_;
   FtpResponseInfo response_;
 
   // Cancels the outstanding request on destruction.
   SingleRequestHostResolver resolver_;
   AddressList addresses_;
@@ skipping 39 matching lines @@
 
   scoped_ptr<StreamSocket> ctrl_socket_;
   scoped_ptr<StreamSocket> data_socket_;
 
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_FTP_FTP_NETWORK_TRANSACTION_H_