base::Bind: Cleanup in test_shell.

webkit/tools/test_shell/test_shell_devtools_agent.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 "webkit/tools/test_shell/test_shell_devtools_agent.h"
 
+#include "base/bind.h"
 #include "base/message_loop.h"
 #include "grit/webkit_chromium_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/tools/test_shell/test_shell_devtools_callargs.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebCString;
 using WebKit::WebDevToolsAgent;
@@ skipping 28 matching lines @@
 // static
 void TestShellDevToolsAgent::DispatchMessageLoop() {
   MessageLoop* current = MessageLoop::current();
   bool old_state = current->NestableTasksAllowed();
   current->SetNestableTasksAllowed(true);
   current->RunAllPending();
   current->SetNestableTasksAllowed(old_state);
 }
 
 TestShellDevToolsAgent::TestShellDevToolsAgent()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(call_method_factory_(this)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       dev_tools_client_(NULL) {
   static int dev_tools_agent_counter;
   routing_id_ = ++dev_tools_agent_counter;
   if (routing_id_ == 1)
     WebDevToolsAgent::setMessageLoopDispatchHandler(
         &TestShellDevToolsAgent::DispatchMessageLoop);
 }
 
 TestShellDevToolsAgent::~TestShellDevToolsAgent() {
 }
@@ skipping 17 matching lines @@
     const WebKit::WebString& value) {
   // TODO: Implement.
 }
 
 WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
     TestShellDevToolsAgent::createClientMessageLoop() {
   return new WebKitClientMessageLoopImpl();
 }
 
 void TestShellDevToolsAgent::AsyncCall(const TestShellDevToolsCallArgs &args) {
-  MessageLoop::current()->PostDelayedTask(
+  MessageLoop::current()->PostTask(
       FROM_HERE,
-      call_method_factory_.NewRunnableMethod(&TestShellDevToolsAgent::Call,
-                                             args),
-      0);
+      base::Bind(&TestShellDevToolsAgent::Call, weak_factory_.GetWeakPtr(),
+                 args));
 }
 
 void TestShellDevToolsAgent::Call(const TestShellDevToolsCallArgs &args) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
     web_agent->dispatchOnInspectorBackend(args.data_);
   if (TestShellDevToolsCallArgs::calls_count() == 1 && dev_tools_client_)
     dev_tools_client_->all_messages_processed();
 }
 
@@ skipping 19 matching lines @@
 
 void TestShellDevToolsAgent::detach() {
   DCHECK(dev_tools_client_);
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
     web_agent->detach();
   dev_tools_client_ = NULL;
 }
 
 void TestShellDevToolsAgent::frontendLoaded() {
-  MessageLoop::current()->PostDelayedTask(
+  MessageLoop::current()->PostTask(
       FROM_HERE,
-      call_method_factory_.NewRunnableMethod(
-          &TestShellDevToolsAgent::DelayedFrontendLoaded),
-      0);
+      base::Bind(&TestShellDevToolsAgent::DelayedFrontendLoaded,
+                 weak_factory_.GetWeakPtr()));
 }
 
 bool TestShellDevToolsAgent::evaluateInWebInspector(
       long call_id,
       const std::string& script) {
   WebDevToolsAgent* agent = GetWebAgent();
   if (!agent)
     return false;
   agent->evaluateInWebInspector(call_id, WebString::fromUTF8(script));
   return true;
 }