base::Bind: Convert Socket::Read.

remoting/protocol/pepper_transport_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_PROTOCOL_PEPPER_TRANSPORT_SOCKET_ADAPTER_H_
 #define REMOTING_PROTOCOL_PEPPER_TRANSPORT_SOCKET_ADAPTER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "net/base/completion_callback.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_socket.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/cpp/completion_callback.h"
 
 namespace pp {
 class Transport_Dev;
 }  // namespace pp
 
 namespace remoting {
@@ skipping 20 matching lines @@
   virtual ~PepperTransportSocketAdapter();
 
   const std::string& name() { return name_; }
 
   // Adds candidate received from the peer.
   void AddRemoteCandidate(const std::string& candidate);
 
   // 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;
 
   // net::StreamSocket implementation.
   virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
@@ skipping 21 matching lines @@
   Observer* observer_;
 
   scoped_ptr<pp::Transport_Dev> transport_;
 
   net::OldCompletionCallback* old_connect_callback_;
   net::CompletionCallback connect_callback_;
   bool connected_;
 
   bool get_address_pending_;
 
-  net::OldCompletionCallback* read_callback_;
+  net::OldCompletionCallback* old_read_callback_;
+  net::CompletionCallback read_callback_;
   scoped_refptr<net::IOBuffer> read_buffer_;
 
   net::OldCompletionCallback* write_callback_;
   scoped_refptr<net::IOBuffer> write_buffer_;
 
   net::BoundNetLog net_log_;
 
   pp::CompletionCallbackFactory<PepperTransportSocketAdapter> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperTransportSocketAdapter);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_TRANSPORT_SOCKET_ADAPTER_H_