base::Bind: Cleanup in automation.

chrome/test/base/view_event_test_base.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 "chrome/test/base/view_event_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
@@ skipping 42 matching lines @@
   MessageLoop::current()->Quit();
 
 #if defined(OS_WIN)
   // We need to post a message to tickle the Dispatcher getting called and
   // exiting out of the nested loop. Without this the quit never runs.
   PostMessage(window_->GetNativeWindow(), WM_USER, 0, 0);
 #endif
 
   // If we're in a nested message loop, as is the case with menus, we need
   // to quit twice. The second quit does that for us.
-  MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
+  MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 void ViewEventTestBase::SetUp() {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
-    MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
+    MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     ui_test_utils::RunMessageLoop();
 #endif
     window_ = NULL;
   }
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 bool ViewEventTestBase::CanResize() const {
@@ skipping 31 matching lines @@
   SetForegroundWindow(window_->GetNativeWindow());
 #endif
 
   // Flush any pending events to make sure we start with a clean slate.
   MessageLoop::current()->RunAllPending();
 
   // Schedule a task that starts the test. Need to do this as we're going to
   // run the message loop.
   MessageLoop::current()->PostTask(
       FROM_HERE,
-      NewRunnableMethod(this, &ViewEventTestBase::DoTestOnMessageLoop));
+      base::Bind(&ViewEventTestBase::DoTestOnMessageLoop, this));
 
   MessageLoop::current()->Run();
 }
 
 gfx::Size ViewEventTestBase::GetPreferredSize() {
   return gfx::Size();
 }
 
 void ViewEventTestBase::ScheduleMouseMoveInBackground(int x, int y) {
   if (!dnd_thread_.get()) {
     dnd_thread_.reset(new base::Thread("mouse-move-thread"));
     dnd_thread_->Start();
   }
   dnd_thread_->message_loop()->PostDelayedTask(
-      FROM_HERE, NewRunnableFunction(&ui_controls::SendMouseMove, x, y),
+      FROM_HERE,
+      base::IgnoreReturn<bool>(base::Bind(&ui_controls::SendMouseMove, x, y)),
       kMouseMoveDelayMS);
 }
 
 void ViewEventTestBase::StopBackgroundThread() {
   dnd_thread_.reset(NULL);
 }
 
-void ViewEventTestBase::RunTestMethod(Task* task) {
+void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
-  scoped_ptr<Task> task_deleter(task);
-  task->Run();
+  task.Run();
   if (HasFatalFailure())
     Done();
 }