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

net/curvecp/client_packetizer.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_CURVECP_CLIENT_PACKETIZER_H_
 #define NET_CURVECP_CLIENT_PACKETIZER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 class IPEndPoint;
 class UDPClientSocket;
 
 class ClientPacketizer : public Packetizer {
  public:
   ClientPacketizer();
   virtual ~ClientPacketizer();
 
   int Connect(const AddressList& server,
               Packetizer::Listener* listener,
-              OldCompletionCallback* callback);
-  int Connect(const AddressList& server,
-              Packetizer::Listener* listener,
               const CompletionCallback& callback);
 
   // Packetizer implementation.
   virtual int SendMessage(ConnectionKey key,
                           const char* data,
                           size_t length,
-                          OldCompletionCallback* callback) OVERRIDE;
+                          const CompletionCallback& callback) OVERRIDE;
   virtual void Close(ConnectionKey key) OVERRIDE;
   virtual int GetPeerAddress(IPEndPoint* endpoint) const OVERRIDE;
   virtual int max_message_payload() const OVERRIDE;
 
  private:
   enum StateType {
     NONE,                      // The initial state, before connect.
     LOOKUP_COOKIE,             // Looking up a cookie in the disk cache.
     LOOKUP_COOKIE_COMPLETE,    // The disk cache lookup is complete.
     SENDING_HELLO,             // Sending a Hello packet.
@@ skipping 27 matching lines @@
 
   // Read packets until an error occurs.
   int ReadPackets();
 
   // Callback when an internal IO is completed.
   void OnIOComplete(int result);
 
   StateType next_state_;
   scoped_ptr<UDPClientSocket> socket_;
   Packetizer::Listener* listener_;
-  OldCompletionCallback* old_user_callback_;
   CompletionCallback user_callback_;
   AddressList addresses_;
   const struct addrinfo* current_address_;
   int hello_attempts_;  // Number of attempts to send a Hello Packet.
   bool initiate_sent_;  // Indicates whether the Initiate Packet was sent.
 
   scoped_refptr<IOBuffer> read_buffer_;  // Buffer for internal reads.
 
   uchar shortterm_public_key_[32];
 
-  OldCompletionCallbackImpl<ClientPacketizer> io_callback_;
+  CompletionCallback io_callback_;
   base::WeakPtrFactory<ClientPacketizer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientPacketizer);
 };
 
 }  // namespace net
 
 #endif  // NET_CURVECP_CLIENT_PACKETIZER_H_