base::Bind: Convert Socket::Read.

net/curvecp/messenger.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_MESSENGER_H_
 #define NET_CURVECP_MESSENGER_H_
 #pragma once
 
 #include <deque>
 #include <list>
@@ skipping 16 matching lines @@
 class Packetizer;
 
 // The messenger provides the reliable CurveCP transport.
 class Messenger : public base::NonThreadSafe,
                   public Packetizer::Listener {
  public:
   explicit Messenger(Packetizer* packetizer);
   virtual ~Messenger();
 
   int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
+  int Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
   int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
 
-  // Packetizer::Listener methods:
+  // Packetizer::Listener implementation.
   virtual void OnConnection(ConnectionKey key) OVERRIDE;
   virtual void OnClose(Packetizer* packetizer, ConnectionKey key);
   virtual void OnMessage(Packetizer* packetizer,
                          ConnectionKey key,
                          unsigned char* msg,
                          size_t length) OVERRIDE;
 
  protected:
   ConnectionKey key_;
 
@@ skipping 19 matching lines @@
 
   // The send_buffer is a list of pending data to pack into messages and send
   // to the remote.
   CircularBuffer send_buffer_;
   OldCompletionCallback* send_complete_callback_;
   scoped_refptr<IOBuffer> pending_send_;
   int pending_send_length_;
 
   // The read_buffer is a list of pending data which has been unpacked from
   // messages and is awaiting delivery to the application.
-  OldCompletionCallback* receive_complete_callback_;
+  OldCompletionCallback* old_receive_complete_callback_;
+  CompletionCallback receive_complete_callback_;
   scoped_refptr<IOBuffer> pending_receive_;
   int pending_receive_length_;
 
   // The list of received but unprocessed messages.
   std::list<scoped_refptr<IOBufferWithSize> > read_queue_;
 
   ReceivedBlockList received_list_;
   SentBlockList sent_list_;
   bool send_message_in_progress_;
 
   // A timer to fire when a timeout has occurred.
   base::OneShotTimer<Messenger> send_timeout_timer_;
   // A timer to fire when we can send data.
   base::OneShotTimer<Messenger> send_timer_;
 
   OldCompletionCallbackImpl<Messenger> send_message_callback_;
 
   ScopedRunnableMethodFactory<Messenger> factory_;
   DISALLOW_COPY_AND_ASSIGN(Messenger);
 };
 
 }  // namespace net
 
 #endif  // NET_CURVECP_MESSENGER_H_