Revert 192525 "Context menu on views must show on mouse down for..."

trunk/src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

 // Copyright (c) 2012 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/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 51 matching lines @@
 class TestingPageNavigator : public PageNavigator {
  public:
   virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
     url_ = params.url;
     return NULL;
   }
 
   GURL url_;
 };
 
-// Delay before allowing menu selection. When context menu is shown on mouse
-// press, we enforce a delay before a selection can be made. So for tests that
-// perform selection on context menu, we add this delay before going to the next
-// step. See comment on |kContextMenuSelectionHoldTimeMs| in menu_controller.cc
-// for more info. The delay here should be greater than
-// |kContextMenuSelectionHoldTimeMs|.
-#define STEP_3_WITH_SELECTION_DELAY(test_class)\
-  void Step3() {\
-    views::MenuItemView* menu = bb_view_->GetContextMenu();\
-    ASSERT_TRUE(menu && menu->GetSubmenu() && menu->GetSubmenu()->IsShowing());\
-    if (views::View::ShouldShowContextMenuOnMousePress()) {\
-      MessageLoop::current()->PostDelayedTask(FROM_HERE,\
-          CreateEventTask(this, &test_class::Step3_1),\
-          base::TimeDelta::FromMilliseconds(250));\
-    } else {\
-      Step3_1();\
-    }\
-  }\
-  void Step3_1() {
-
 }  // namespace
 
 // Base class for event generating bookmark view tests. These test are intended
 // to exercise View's menus, but that's easier done with BookmarkBarView rather
 // than View's menu itself.
 //
 // SetUp creates a bookmark model with the following structure.
 // All folders are in upper case, all URLs in lower case.
 // F1
 //   f1a
@@ skipping 393 matching lines @@
     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_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
-  STEP_3_WITH_SELECTION_DELAY(BookmarkBarViewTest4)
+  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());
 
     // Select the first menu item (open).
     ui_test_utils::MoveMouseToCenterAndPress(
         menu->GetSubmenu()->GetMenuItemAt(0),
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
@@ skipping 606 matching lines @@
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the second child (a folder) to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest12::Step3));
   }
 
-  STEP_3_WITH_SELECTION_DELAY(BookmarkBarViewTest12)
+  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_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
@@ skipping 65 matching lines @@
     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_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
-  STEP_3_WITH_SELECTION_DELAY(BookmarkBarViewTest13)
+  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());
 
     // Find the first separator.
     views::SubmenuView* submenu = menu->GetSubmenu();
     views::View* separator_view = NULL;
     for (int i = 0; i < submenu->child_count(); ++i) {
@@ skipping 106 matching lines @@
     ASSERT_TRUE(child_menu != NULL);
 
     deleted_menu_id_ = child_menu->GetCommand();
 
     // Right click on the second child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
-  STEP_3_WITH_SELECTION_DELAY(BookmarkBarViewTest15)
+  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());
 
     views::MenuItemView* delete_menu =
         menu->GetMenuItemByID(IDC_BOOKMARK_BAR_REMOVE);
     ASSERT_TRUE(delete_menu);
 
@@ skipping 406 matching lines @@
     ASSERT_TRUE(view != NULL);
     EXPECT_EQ(views::MenuItemView::kEmptyMenuItemViewID, view->id());
 
     // Right click on the first child to get its context menu.
     ui_test_utils::MoveMouseToCenterAndPress(view, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, base::Closure());
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   // Confirm that context menu shows and click REMOVE menu.
-  STEP_3_WITH_SELECTION_DELAY(BookmarkBarViewTest21)
+  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());
 
     views::MenuItemView* delete_menu =
         menu->GetMenuItemByID(IDC_BOOKMARK_BAR_REMOVE);
     ASSERT_TRUE(delete_menu);
 
@@ skipping 11 matching lines @@
     EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
     EXPECT_TRUE(bb_view_->GetMenu() == NULL);
 
     Done();
   }
 
   ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)