base::Bind: Convert jingle/.

BUG=none
TEST=none

R=csilv@chromium.org

Review URL: http://codereview.chromium.org/8551004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109811 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 30 insertions, 21 deletions

diff --git a/jingle/glue/fake_network_manager.cc b/jingle/glue/fake_network_manager.cc
index 26c2fd0..d30aba9 100644
--- a/jingle/glue/fake_network_manager.cc
+++ b/jingle/glue/fake_network_manager.cc
@@ -4,6 +4,7 @@
 
 #include "jingle/glue/fake_network_manager.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/ip_endpoint.h"
@@ -14,7 +15,7 @@ namespace jingle_glue {
 
 FakeNetworkManager::FakeNetworkManager(const net::IPAddressNumber& address)
     : started_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   net::IPEndPoint endpoint(address, 0);
   talk_base::SocketAddress socket_address;
   CHECK(IPEndPointToSocketAddress(endpoint, &socket_address));
@@ -28,8 +29,8 @@ FakeNetworkManager::~FakeNetworkManager() {
 void FakeNetworkManager::StartUpdating() {
   started_ = true;
   MessageLoop::current()->PostTask(
-      FROM_HERE,task_factory_.NewRunnableMethod(
-          &FakeNetworkManager::SendNetworksChangedSignal));
+      FROM_HERE, base::Bind(&FakeNetworkManager::SendNetworksChangedSignal,
+                            weak_factory_.GetWeakPtr()));
 }
 
 void FakeNetworkManager::StopUpdating() {
diff --git a/jingle/glue/fake_network_manager.h b/jingle/glue/fake_network_manager.h
index ad39e6b..01e2f91 100644
--- a/jingle/glue/fake_network_manager.h
+++ b/jingle/glue/fake_network_manager.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/task.h"
+#include "base/memory/weak_ptr.h"
 #include "net/base/net_util.h"
 #include "third_party/libjingle/source/talk/base/network.h"
 
@@ -33,7 +33,7 @@ class FakeNetworkManager : public talk_base::NetworkManager {
   bool started_;
   scoped_ptr<talk_base::Network> network_;
 
-  ScopedRunnableMethodFactory<FakeNetworkManager> task_factory_;
+  base::WeakPtrFactory<FakeNetworkManager> weak_factory_;
 };
 
 }  // namespace jingle_glue
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc
index 95a0fa2..f6812b3 100644
--- a/jingle/glue/fake_socket_factory.cc
+++ b/jingle/glue/fake_socket_factory.cc
@@ -4,6 +4,7 @@
 
 #include "jingle/glue/fake_socket_factory.h"
 
+#include "base/bind.h"
 #include "base/message_loop.h"
 #include "jingle/glue/utils.h"
 #include "third_party/libjingle/source/talk/base/asyncsocket.h"
@@ -125,8 +126,8 @@ void FakeSocketManager::SendPacket(const net::IPEndPoint& from,
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   message_loop_->PostTask(
-      FROM_HERE, NewRunnableMethod(this, &FakeSocketManager::DeliverPacket,
-                                   from, to, data));
+      FROM_HERE,
+      base::Bind(&FakeSocketManager::DeliverPacket, this, from, to, data));
 }
 
 void FakeSocketManager::DeliverPacket(const net::IPEndPoint& from,
diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc
index d418826..65d7a56 100644
--- a/jingle/glue/pseudotcp_adapter_unittest.cc
+++ b/jingle/glue/pseudotcp_adapter_unittest.cc
@@ -6,6 +6,8 @@
 
 #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"
@@ -21,8 +23,6 @@ class FakeSocket;
 }  // namespace
 }  // namespace jingle_glue
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(jingle_glue::FakeSocket);
-
 namespace jingle_glue {
 
 namespace {
@@ -136,9 +136,12 @@ class FakeSocket : public net::Socket {
                     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;
@@ -186,7 +189,7 @@ class TCPChannelTester : public base::RefCountedThreadSafe<TCPChannelTester> {
 
   void Start() {
     message_loop_->PostTask(
-        FROM_HERE, NewRunnableMethod(this, &TCPChannelTester::DoStart));
+        FROM_HERE, base::Bind(&TCPChannelTester::DoStart, this));
   }
 
   void CheckResults() {
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc
index 4a47e5d..24ad922 100644
--- a/jingle/glue/thread_wrapper.cc
+++ b/jingle/glue/thread_wrapper.cc
@@ -4,6 +4,8 @@
 
 #include "jingle/glue/thread_wrapper.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 
@@ -153,8 +155,9 @@ void JingleThreadWrapper::Send(talk_base::MessageHandler *handler, uint32 id,
   // Need to signal |pending_send_event_| here in case the thread is
   // sending message to another thread.
   pending_send_event_.Signal();
-  message_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &JingleThreadWrapper::ProcessPendingSends));
+  message_loop_->PostTask(FROM_HERE,
+                          base::Bind(&JingleThreadWrapper::ProcessPendingSends,
+                                     base::Unretained(this)));
 
 
   while (!pending_send.done_event.IsSignaled()) {
@@ -204,13 +207,14 @@ void JingleThreadWrapper::PostTaskInternal(
   }
 
   if (delay_ms <= 0) {
-    message_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-        this, &JingleThreadWrapper::RunTask, task_id));
+    message_loop_->PostTask(FROM_HERE,
+                            base::Bind(&JingleThreadWrapper::RunTask,
+                                       base::Unretained(this), task_id));
   } else {
-    message_loop_->PostDelayedTask(
-        FROM_HERE,
-        NewRunnableMethod(this, &JingleThreadWrapper::RunTask, task_id),
-        delay_ms);
+    message_loop_->PostDelayedTask(FROM_HERE,
+                                   base::Bind(&JingleThreadWrapper::RunTask,
+                                              base::Unretained(this), task_id),
+                                   delay_ms);
   }
 }