base::Bind: Convert jingle/.

jingle/glue/pseudotcp_adapter_unittest.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 "jingle/glue/pseudotcp_adapter.h"
 
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/udp/udp_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace jingle_glue {
 namespace {
 class FakeSocket;
 }  // namespace
 }  // namespace jingle_glue
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(jingle_glue::FakeSocket);
-
 namespace jingle_glue {
 
 namespace {
 
 // The range is chosen arbitrarily. It must be big enough so that we
 // always have at least two UDP ports available.
 const int kMinPort = 32000;
 const int kMaxPort = 33000;
 
 const int kMessageSize = 1024;
@@ skipping 93 matching lines @@
       read_buffer_ = buf;
       read_buffer_size_ = buf_len;
       return net::ERR_IO_PENDING;
     }
   }
 
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::OldCompletionCallback* callback) OVERRIDE {
     DCHECK(buf);
     if (peer_socket_) {
-      MessageLoop::current()->PostDelayedTask(FROM_HERE, NewRunnableMethod(
-          peer_socket_, &FakeSocket::AppendInputPacket,
-          std::vector<char>(buf->data(), buf->data() + buf_len)), latency_ms_);
+      MessageLoop::current()->PostDelayedTask(
+          FROM_HERE,
+          base::Bind(&FakeSocket::AppendInputPacket,
+                     base::Unretained(peer_socket_),
+                     std::vector<char>(buf->data(), buf->data() + buf_len)),
+          latency_ms_);
     }
 
     return buf_len;
   }
 
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE {
     NOTIMPLEMENTED();
     return false;
   }
   virtual bool SetSendBufferSize(int32 size) OVERRIDE {
@@ skipping 27 matching lines @@
         ALLOW_THIS_IN_INITIALIZER_LIST(
             read_cb_(this, &TCPChannelTester::OnRead)),
         write_errors_(0),
         read_errors_(0) {
   }
 
   virtual ~TCPChannelTester() { }
 
   void Start() {
     message_loop_->PostTask(
-        FROM_HERE, NewRunnableMethod(this, &TCPChannelTester::DoStart));
+        FROM_HERE, base::Bind(&TCPChannelTester::DoStart, this));
   }
 
   void CheckResults() {
     EXPECT_EQ(0, write_errors_);
     EXPECT_EQ(0, read_errors_);
 
     ASSERT_EQ(kTestDataSize + kMessageSize, input_buffer_->capacity());
 
     output_buffer_->SetOffset(0);
     ASSERT_EQ(kTestDataSize, output_buffer_->size());
@@ skipping 204 matching lines @@
   host_pseudotcp_->Connect(&host_connect_cb);
   client_pseudotcp_->Connect(&client_connect_cb);
   message_loop_.Run();
 
   ASSERT_EQ(NULL, host_pseudotcp_.get());
 }
 
 }  // namespace
 
 }  // namespace jingle_glue