Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

remoting/protocol/message_reader.cc

 // 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.
 
 #include "remoting/protocol/message_reader.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/proto/internal.pb.h"
 
 namespace remoting {
 namespace protocol {
 
 static const int kReadBufferSize = 4096;
 
 MessageReader::MessageReader()
     : socket_(NULL),
       read_pending_(false),
       pending_messages_(0),
-      closed_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          read_callback_(this, &MessageReader::OnRead)) {
+      closed_(false) {
 }
 
 MessageReader::~MessageReader() {
   CHECK_EQ(pending_messages_, 0);
 }
 
 void MessageReader::Init(net::Socket* socket,
                          const MessageReceivedCallback& callback) {
   message_received_callback_ = callback;
   DCHECK(socket);
   socket_ = socket;
   DoRead();
 }
 
 void MessageReader::DoRead() {
   // Don't try to read again if there is another read pending or we
   // have messages that we haven't finished processing yet.
   while (!closed_ && !read_pending_ && pending_messages_ == 0) {
     read_buffer_ = new net::IOBuffer(kReadBufferSize);
     int result = socket_->Read(
-        read_buffer_, kReadBufferSize, &read_callback_);
+        read_buffer_, kReadBufferSize, base::Bind(&MessageReader::OnRead,
+                                                  base::Unretained(this)));
     HandleReadResult(result);
   }
 }
 
 void MessageReader::OnRead(int result) {
   DCHECK(read_pending_);
   read_pending_ = false;
 
   if (!closed_) {
     HandleReadResult(result);
@@ skipping 58 matching lines @@
 
 void MessageReader::ProcessDoneEvent() {
   pending_messages_--;
   DCHECK_GE(pending_messages_, 0);
 
   DoRead(); // Start next read if neccessary.
 }
 
 }  // namespace protocol
 }  // namespace remoting