base::Bind: Cleanup in automation.

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.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 "base/bind.h"
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 451 matching lines @@
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest3, Submenus)
 
 // Observer that posts task upon the context menu creation.
 // This is necessary for Linux as the context menu has to check
 // the clipboard, which invokes the event loop.
 class ContextMenuNotificationObserver : public NotificationObserver {
  public:
-  explicit ContextMenuNotificationObserver(Task* task) : task_(task) {
+  explicit ContextMenuNotificationObserver(const base::Closure& task)
+      : task_(task) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN,
                    NotificationService::AllSources());
   }
 
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     MessageLoop::current()->PostTask(FROM_HERE, task_);
   }
 
   // Sets the task that is posted when the context menu is shown.
-  void set_task(Task* task) { task_ = task; }
+  void set_task(const base::Closure& task) { task_ = task; }
 
  private:
   NotificationRegistrar registrar_;
-  Task* task_;
+  base::Closure task_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextMenuNotificationObserver);
 };
 
 // Tests context menus by way of opening a context menu for a bookmark,
 // then right clicking to get context menu and selecting the first menu item
 // (open).
 class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
  public:
   BookmarkBarViewTest4()
@@ skipping 17 matching lines @@
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
@@ skipping 155 matching lines @@
 
   void Step3() {
     // Drag over other button.
     views::TextButton* other_button =
         bb_view_->other_bookmarked_button();
     gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     views::View::ConvertPointToScreen(other_button, &loc);
 
     // Start a drag.
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
-        NewRunnableMethod(this, &BookmarkBarViewTest7::Step4));
+        base::Bind(&BookmarkBarViewTest7::Step4, this));
 
     // See comment above this method as to why we do this.
     ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     views::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
@@ skipping 52 matching lines @@
 
   void Step3() {
     // Drag over other button.
     views::TextButton* other_button =
         bb_view_->other_bookmarked_button();
     gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     views::View::ConvertPointToScreen(other_button, &loc);
 
     // Start a drag.
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
-        NewRunnableMethod(this, &BookmarkBarViewTest8::Step4));
+        base::Bind(&BookmarkBarViewTest8::Step4, this));
 
     // See comment above this method as to why we do this.
     ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     views::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     // Now drag back over first menu.
     views::TextButton* button = GetBookmarkButton(0);
     gfx::Point loc(button->width() / 2, button->height() / 2);
     views::View::ConvertPointToScreen(button, &loc);
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x(), loc.y(),
-        NewRunnableMethod(this, &BookmarkBarViewTest8::Step5));
+        base::Bind(&BookmarkBarViewTest8::Step5, this));
   }
 
   void Step5() {
     // Drop on folder F11.
     views::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* target_menu =
         drop_menu->GetSubmenu()->GetMenuItemAt(1);
@@ skipping 53 matching lines @@
     views::View::ConvertPointToScreen(scroll_down_button, &loc);
 
     // On linux, the sending one location isn't enough.
     ui_controls::SendMouseMove(loc.x() - 1 , loc.y() - 1);
     ui_controls::SendMouseMoveNotifyWhenDone(
         loc.x(), loc.y(), CreateEventTask(this, &BookmarkBarViewTest9::Step3));
   }
 
   void Step3() {
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
-        NewRunnableMethod(this, &BookmarkBarViewTest9::Step4), 200);
+        base::Bind(&BookmarkBarViewTest9::Step4, this), 200);
   }
 
   void Step4() {
     gfx::Point menu_loc;
     views::View::ConvertPointToScreen(first_menu_, &menu_loc);
     ASSERT_NE(start_y_, menu_loc.y());
 
     // Hide menu.
     bb_view_->GetMenu()->GetMenuController()->CancelAll();
 
     // On linux, Cancelling menu will call Quit on the message loop,
     // which can interfere with Done. We need to run Done in the
     // next execution loop.
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        NewRunnableMethod(this, &ViewEventTestBase::Done));
+        base::Bind(&ViewEventTestBase::Done, this));
   }
 
   int start_y_;
   views::MenuItemView* first_menu_;
 };
 
 VIEW_TEST(BookmarkBarViewTest9, MAYBE_ScrollButtonScrolls)
 
 // Tests up/down/left/enter key messages.
 class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
@@ skipping 128 matching lines @@
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
         NULL, ui::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest11::Step4));
   }
 
@@ skipping 65 matching lines @@
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu && menu->GetSubmenu() && menu->GetSubmenu()->IsShowing());
 
     // Select the first item in the context menu (open all).
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
 
     // Delay until we send tab, otherwise the message box doesn't appear
     // correctly.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         CreateEventTask(this, &BookmarkBarViewTest12::Step4), 1000);
   }
 
   void Step4() {
     // Press tab to give focus to the cancel button.
     ui_controls::SendKeyPress(NULL, ui::VKEY_TAB, false, false, false, false);
@@ skipping 48 matching lines @@
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
@@ skipping 45 matching lines @@
       : ALLOW_THIS_IN_INITIALIZER_LIST(
           observer_(CreateEventTask(this, &BookmarkBarViewTest14::Step2))) {
   }
 
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // right mouse button.
     views::TextButton* button = GetBookmarkButton(0);
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step2 will be invoked by ContextMenuNotificationObserver.
   }
 
  private:
 
   void Step2() {
     // Menu should NOT be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu == NULL);
 
@@ skipping 38 matching lines @@
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
 
     deleted_menu_id_ = child_menu->GetCommand();
 
     // Right click on the second child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
@@ skipping 88 matching lines @@
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Right click on the second item to show its context menu.
     views::MenuItemView* child_menu = menu->GetSubmenu()->GetMenuItemAt(2);
     ASSERT_TRUE(child_menu != NULL);
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* context_menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(context_menu != NULL);
     ASSERT_TRUE(context_menu->GetSubmenu());
     ASSERT_TRUE(context_menu->GetSubmenu()->IsShowing());
 
     // Right click on the first menu item to trigger its context menu.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     views::MenuItemView* child_menu = menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
 
     observer_.set_task(CreateEventTask(this, &BookmarkBarViewTest17::Step4));
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP, NULL);
+        ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step4 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step4() {
     // The context menu should still be showing.
     views::MenuItemView* context_menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(context_menu != NULL);
 
     // And the menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
@@ skipping 118 matching lines @@
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     menu->GetMenuController()->CancelAll();
 
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)