Switch remoting/protocol to new callbacks

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"
 #include "net/base/net_errors.h"
 
 namespace remoting {
 namespace protocol {
 
 class BufferedSocketWriterBase::PendingPacket {
  public:
-  PendingPacket(scoped_refptr<net::IOBufferWithSize> data, Task* done_task)
+  PendingPacket(scoped_refptr<net::IOBufferWithSize> data,
+                const base::Closure& done_task)
       : data_(data),
         done_task_(done_task) {
   }
   ~PendingPacket() {
-    if (done_task_.get())
-      done_task_->Run();
+    if (!done_task_.is_null())
+      done_task_.Run();
   }
 
   net::IOBufferWithSize* data() {
     return data_;
   }
 
  private:
   scoped_refptr<net::IOBufferWithSize> data_;
-  scoped_ptr<Task> done_task_;
+  base::Closure done_task_;
 
   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,
-                                    WriteFailedCallback* callback) {
-  // TODO(garykac) Save copy of WriteFailedCallback.
-  base::AutoLock auto_lock(lock_);
+                                    const WriteFailedCallback& callback) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(socket);
   socket_ = socket;
-  DCHECK(socket_);
+  write_failed_callback_ = callback;
 }
 
 bool BufferedSocketWriterBase::Write(
-    scoped_refptr<net::IOBufferWithSize> data, Task* done_task) {
+    scoped_refptr<net::IOBufferWithSize> data, const base::Closure& done_task) {
   {
     base::AutoLock auto_lock(lock_);
     queue_.push_back(new PendingPacket(data, done_task));
     buffer_size_ += data->size();
   }
   message_loop_->PostTask(
-      FROM_HERE, NewRunnableMethod(this, &BufferedSocketWriterBase::DoWrite));
+      FROM_HERE, base::Bind(&BufferedSocketWriterBase::DoWrite, this));
   return true;
 }
 
 void BufferedSocketWriterBase::DoWrite() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(socket_);
 
   // Don't try to write if there is another write pending.
   if (write_pending_)
     return;
@@ skipping 17 matching lines @@
     int result = socket_->Write(current_packet, current_packet_size,
                                 &written_callback_);
     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_.get())
-          write_failed_callback_->Run(result);
+        if (!write_failed_callback_.is_null())
+          write_failed_callback_.Run(result);
       }
       return;
     }
   }
 }
 
 void BufferedSocketWriterBase::OnWritten(int result) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   write_pending_ = false;
 
   if (result < 0) {
     HandleError(result);
-    if (write_failed_callback_.get())
-      write_failed_callback_->Run(result);
+    if (!write_failed_callback_.is_null())
+      write_failed_callback_.Run(result);
     return;
   }
 
   {
     base::AutoLock auto_lock(lock_);
     AdvanceBufferPosition_Locked(result);
   }
 
   // Schedule next write.
   message_loop_->PostTask(
@@ skipping 92 matching lines @@
   buffer_size_ -= queue_.front()->data()->size();
   PopQueue();
 }
 
 void BufferedDatagramWriter::OnError_Locked(int result) {
   // Nothing to do here.
 }
 
 }  // namespace protocol
 }  // namespace remoting