base::Bind: Convert Socket::Read.

remoting/jingle_glue/ssl_socket_adapter.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 REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_
 #define REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
@@ skipping 37 matching lines @@
   virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE;
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
   virtual const net::BoundNetLog& NetLog() const OVERRIDE;
   virtual void SetSubresourceSpeculation() OVERRIDE;
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
 
-  // net::Socket implementation
-
+  // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::OldCompletionCallback* callback) OVERRIDE;
+  virtual int Read(net::IOBuffer* buf, int buf_len,
+                   const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::OldCompletionCallback* callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
  private:
   friend class SSLSocketAdapter;
 
   void OnReadEvent(talk_base::AsyncSocket* socket);
   void OnWriteEvent(talk_base::AsyncSocket* socket);
 
-  net::OldCompletionCallback* read_callback_;
+  net::OldCompletionCallback* old_read_callback_;
+  net::CompletionCallback read_callback_;
   net::OldCompletionCallback* write_callback_;
 
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_len_;
   scoped_refptr<net::IOBuffer> write_buffer_;
   int write_buffer_len_;
 
   net::BoundNetLog net_log_;
 
   talk_base::AsyncSocket *socket_;
@@ skipping 65 matching lines @@
   IOState write_state_;
   scoped_refptr<net::IOBuffer> transport_buf_;
   int data_transferred_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLSocketAdapter);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_