base::Bind: Cleanup in automation.

chrome/test/base/view_event_test_base.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
 #define CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
 #pragma once
 
 // We only want to use ViewEventTestBase in test targets which properly
 // isolate each test case by running each test in a separate process.
 // This way if a test hangs the test launcher can reliably terminate it.
 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/widget/widget_delegate.h"
 
-class Task;
-
 namespace gfx {
 class Size;
 }
 
 // Base class for Views based tests that dispatch events.
 //
 // As views based event test involves waiting for events to be processed,
 // writing a views based test is slightly different than that of writing
 // other unit tests. In particular when the test fails or is done you need
 // to stop the message loop. This can be done by way of invoking the Done
@@ skipping 42 matching lines @@
 
   // Destroys the window.
   virtual void TearDown();
 
   // Overridden from views::WidgetDelegate:
   virtual bool CanResize() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
 
-  // Overriden to do nothing so that this class can be used in runnable tasks.
+  // Overridden to do nothing so that this class can be used in runnable tasks.
   void AddRef() {}
   void Release() {}
   static bool ImplementsThreadSafeReferenceCounting() { return false; }
 
  protected:
   virtual ~ViewEventTestBase();
 
   // Returns the view that is added to the window.
   virtual views::View* CreateContentsView() = 0;
 
   // Called once the message loop is running.
   virtual void DoTestOnMessageLoop() = 0;
 
   // Invoke from test main. Shows the window, starts the message loop and
   // schedules a task that invokes DoTestOnMessageLoop.
   void StartMessageLoopAndRunTest();
 
   // Returns an empty Size. Subclasses that want a preferred size other than
   // that of the View returned by CreateContentsView should override this
   // appropriately.
   virtual gfx::Size GetPreferredSize();
 
   // Creates a task that calls the specified method back. The specified
   // method is called in such a way that if there are any test failures
   // Done is invoked.
   template <class T, class Method>
-  Task* CreateEventTask(T* target, Method method) {
-    return NewRunnableMethod(this, &ViewEventTestBase::RunTestMethod,
-                             NewRunnableMethod(target, method));
+  base::Closure CreateEventTask(T* target, Method method) {
+    return base::Bind(&ViewEventTestBase::RunTestMethod, this,
+                      base::Bind(method, target));
   }
 
   // Spawns a new thread posts a MouseMove in the background.
   void ScheduleMouseMoveInBackground(int x, int y);
 
   views::Widget* window_;
 
  private:
   // Stops the thread started by ScheduleMouseMoveInBackground.
   void StopBackgroundThread();
 
   // Callback from CreateEventTask. Stops the background thread, runs the
   // supplied task and if there are failures invokes Done.
-  void RunTestMethod(Task* task);
+  void RunTestMethod(const base::Closure& task);
 
   // The content of the Window.
   views::View* content_view_;
 
   // Thread for posting background MouseMoves.
   scoped_ptr<base::Thread> dnd_thread_;
 
   MessageLoopForUI message_loop_;
 
   // Method factory used for time-outs.
   ScopedRunnableMethodFactory<ViewEventTestBase> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase);
 };
 
 // Convenience macro for defining a ViewEventTestBase. See class description
 // of ViewEventTestBase for details.
 #define VIEW_TEST(test_class, name) \
   TEST_F(test_class, name) {\
     StartMessageLoopAndRunTest();\
   }
 
 #endif  // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
 #endif  // CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_