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

remoting/protocol/buffered_socket_writer.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/buffered_socket_writer.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/stl_util.h"
@@ skipping 24 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PendingPacket);
 };
 
 BufferedSocketWriterBase::BufferedSocketWriterBase(
     base::MessageLoopProxy* message_loop)
     : buffer_size_(0),
       socket_(NULL),
       message_loop_(message_loop),
       write_pending_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          written_callback_(this, &BufferedSocketWriterBase::OnWritten)),
       closed_(false) {
 }
 
 BufferedSocketWriterBase::~BufferedSocketWriterBase() { }
 
 void BufferedSocketWriterBase::Init(net::Socket* socket,
                                     const WriteFailedCallback& callback) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(socket);
   socket_ = socket;
@@ skipping 29 matching lines @@
     int current_packet_size;
     {
       base::AutoLock auto_lock(lock_);
       GetNextPacket_Locked(&current_packet, &current_packet_size);
     }
 
     // Return if the queue is empty.
     if (!current_packet)
       return;
 
-    int result = socket_->Write(current_packet, current_packet_size,
-                                &written_callback_);
+    int result = socket_->Write(
+        current_packet, current_packet_size,
+        base::Bind(&BufferedSocketWriterBase::OnWritten,
+                   base::Unretained(this)));
     if (result >= 0) {
       base::AutoLock auto_lock(lock_);
       AdvanceBufferPosition_Locked(result);
     } else {
       if (result == net::ERR_IO_PENDING) {
         write_pending_ = true;
       } else {
         HandleError(result);
         if (!write_failed_callback_.is_null())
           write_failed_callback_.Run(result);
@@ skipping 116 matching lines @@
   buffer_size_ -= queue_.front()->data()->size();
   PopQueue();
 }
 
 void BufferedDatagramWriter::OnError_Locked(int result) {
   // Nothing to do here.
 }
 
 }  // namespace protocol
 }  // namespace remoting