base::Bind: Convert Socket::Read.

net/socket/tcp_client_socket_libevent.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_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_
 #define NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
 
   // Socket implementation.
   // Multiple outstanding requests are not supported.
   // Full duplex mode (reading and writing at the same time) is supported
   virtual int Read(IOBuffer* buf,
                    int buf_len,
                    OldCompletionCallback* callback) OVERRIDE;
+  virtual int Read(IOBuffer* buf,
+                   int buf_len,
+                   const CompletionCallback& callback) OVERRIDE;
   virtual int Write(IOBuffer* buf,
                     int buf_len,
                     OldCompletionCallback* callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
  private:
   // State machine for connecting the socket.
   enum ConnectState {
     CONNECT_STATE_CONNECT,
     CONNECT_STATE_CONNECT_COMPLETE,
     CONNECT_STATE_NONE,
   };
 
   class ReadWatcher : public MessageLoopForIO::Watcher {
    public:
     explicit ReadWatcher(TCPClientSocketLibevent* socket) : socket_(socket) {}
 
     // MessageLoopForIO::Watcher methods
 
     virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {
-      if (socket_->read_callback_)
+      if (socket_->old_read_callback_)
         socket_->DidCompleteRead();
     }
 
     virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {}
 
    private:
     TCPClientSocketLibevent* const socket_;
 
     DISALLOW_COPY_AND_ASSIGN(ReadWatcher);
   };
@@ skipping 70 matching lines @@
 
   // The buffer used by OnSocketReady to retry Read requests
   scoped_refptr<IOBuffer> read_buf_;
   int read_buf_len_;
 
   // The buffer used by OnSocketReady to retry Write requests
   scoped_refptr<IOBuffer> write_buf_;
   int write_buf_len_;
 
   // External callback; called when read is complete.
-  OldCompletionCallback* read_callback_;
+  OldCompletionCallback* old_read_callback_;
+  CompletionCallback read_callback_;
 
   // External callback; called when write is complete.
   OldCompletionCallback* old_write_callback_;
   CompletionCallback write_callback_;
 
   // The next state for the Connect() state machine.
   ConnectState next_connect_state_;
 
   // The OS error that CONNECT_STATE_CONNECT last completed with.
   int connect_os_error_;
@@ skipping 16 matching lines @@
   base::TimeTicks connect_start_time_;
   base::TimeDelta connect_time_micros_;
   int64 num_bytes_read_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocketLibevent);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_