base::Bind: Convert Socket::Read.

jingle/glue/channel_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 JINGLE_GLUE_CHANNEL_SOCKET_ADAPTER_H_
 #define JINGLE_GLUE_CHANNEL_SOCKET_ADAPTER_H_
 
 #include "base/compiler_specific.h"
 #include "net/socket/socket.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
@@ skipping 15 matching lines @@
  public:
   // TransportChannel object is always owned by the corresponding session.
   explicit TransportChannelSocketAdapter(cricket::TransportChannel* channel);
   virtual ~TransportChannelSocketAdapter();
 
   // Closes the stream. |error_code| specifies error code that will
   // be returned by Read() and Write() after the stream is closed.
   // 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;
 
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
  private:
   void OnNewPacket(cricket::TransportChannel* channel,
                    const char* data, size_t data_size);
   void OnWritableState(cricket::TransportChannel* channel);
   void OnChannelDestroyed(cricket::TransportChannel* channel);
 
   MessageLoop* message_loop_;
 
   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_;
 
   net::OldCompletionCallback* write_callback_;  // Not owned.
   scoped_refptr<net::IOBuffer> write_buffer_;
   int write_buffer_size_;
 
   int closed_error_code_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportChannelSocketAdapter);
 };
 
 }  // namespace jingle_glue
 
 #endif  // JINGLE_GLUE_CHANNEL_SOCKET_ADAPTER_H_