base::Bind: Convert Socket::Read.

jingle/glue/channel_socket_adapter.h

Index: jingle/glue/channel_socket_adapter.h
diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h
index 43a63f0052b8623a723c13a6dac60041a4f8436c..152db45c5a5080b45ef4c4fdc4083098385412cc 100644
--- a/jingle/glue/channel_socket_adapter.h
+++ b/jingle/glue/channel_socket_adapter.h
@@ -33,9 +33,11 @@ class TransportChannelSocketAdapter : public net::Socket,
   // Must be called before the session and the channel are destroyed.
   void Close(int error_code);
 
-  // Socket interface.
+  // 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;
 
@@ -52,7 +54,8 @@ class TransportChannelSocketAdapter : public net::Socket,
 
   cricket::TransportChannel* channel_;
 
-  net::OldCompletionCallback* read_callback_;  // Not owned.
+  net::OldCompletionCallback* old_read_callback_;  // Not owned.
+  net::CompletionCallback read_callback_;

[James Hawkins, 2011/12/07 00:01:57]

#include "net/base/completion_callback.h"

[James Hawkins, 2011/12/07 00:08:11]

Done.

   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;