Reenable Context Menu Test for Ozone

A series of interactive_ui_tests were disabled for ozone configurations, as
nested message loops do not work well with ozone in tests.

However nested message loops are gone from context menus. So try to reenable
them in ozone builds.

TEST=BookmakrBarViewTest, KeyboardAccessTest, MenuControllerMnemonicTest*,
MenuItemViewTestRemoveWithSubmenu*

Bug: 401304
Change-Id: I804a312c4295adc7116592a5c5dc5693f96f56ae
Reviewed-on: https://chromium-review.googlesource.com/575427Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488234}

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

@@ -1211,14 +1211,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
   }
 };
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_KeyEvents DISABLED_KeyEvents
-#else
-#define MAYBE_KeyEvents KeyEvents
-#endif
-
-VIEW_TEST(BookmarkBarViewTest10, MAYBE_KeyEvents)
+VIEW_TEST(BookmarkBarViewTest10, KeyEvents)
 
 // Make sure the menu closes with the following sequence: show menu, show
 // context menu, close context menu (via escape), then click else where. This
@@ -1296,10 +1289,6 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // TODO(erg): linux_aura bringup: http://crbug.com/163931
-#define MAYBE_CloseMenuAfterClosingContextMenu \
-  DISABLED_CloseMenuAfterClosingContextMenu
-#elif defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
 #define MAYBE_CloseMenuAfterClosingContextMenu \
   DISABLED_CloseMenuAfterClosingContextMenu
 #else
@@ -1523,14 +1512,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
   BookmarkContextMenuNotificationObserver observer_;
 };
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_ContextMenus2 DISABLED_ContextMenus2
-#else
-#define MAYBE_ContextMenus2 ContextMenus2
-#endif
-
-VIEW_TEST(BookmarkBarViewTest14, MAYBE_ContextMenus2)
+VIEW_TEST(BookmarkBarViewTest14, ContextMenus2)
 
 // Makes sure deleting from the context menu keeps the bookmark menu showing.
 class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
@@ -1729,14 +1711,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
   BookmarkContextMenuNotificationObserver observer_;
 };
 
-#if defined(OS_WIN)
-// Flaky on Win7. crbug/453796
-#define MAYBE_ContextMenus3 DISABLED_ContextMenus3
-#else
-#define MAYBE_ContextMenus3 ContextMenus3
-#endif
-
-VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3)
+VIEW_TEST(BookmarkBarViewTest17, ContextMenus3)
 
 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then
 // moves the mouse over the first item on the bookmark bar and makes sure the

chrome/browser/ui/views/keyboard_access_browsertest.cc

@@ -377,8 +377,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest,
 }
 #endif
 
-#if !defined(OS_WIN) && defined(USE_AURA) && !defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
+#if !defined(OS_WIN) && defined(USE_AURA)
 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) {
   TestMenuKeyboardAccessAndDismiss();
 }

chrome/browser/ui/views/menu_controller_interactive_uitest.cc

@@ -55,41 +55,17 @@ class MenuControllerMnemonicTest : public MenuTestBase {
 typedef MenuControllerMnemonicTest<ui::VKEY_DIVIDE,1>
     MenuControllerMnemonicTestMnemonicMatch;
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_MnemonicMatch DISABLED_MnemonicMatch
-#else
-// If this flakes, disable and log details in http://crbug.com/523255.
-#define MAYBE_MnemonicMatch MnemonicMatch
-#endif
-
-VIEW_TEST(MenuControllerMnemonicTestMnemonicMatch, MAYBE_MnemonicMatch);
+VIEW_TEST(MenuControllerMnemonicTestMnemonicMatch, MnemonicMatch);
 
 // Pressing a key which matches the first letter of the menu item's title
 // should execute the command for that menu item.
 typedef MenuControllerMnemonicTest<ui::VKEY_T,2>
     MenuControllerMnemonicTestTitleMatch;
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_TitleMatch DISABLED_TitleMatch
-#else
-// If this flakes, disable and log details in http://crbug.com/523255.
-#define MAYBE_TitleMatch TitleMatch
-#endif
-
-VIEW_TEST(MenuControllerMnemonicTestTitleMatch, MAYBE_TitleMatch);
+VIEW_TEST(MenuControllerMnemonicTestTitleMatch, TitleMatch);
 
 // Pressing an arbitrary key should not execute any commands.
 typedef MenuControllerMnemonicTest<ui::VKEY_A,0>
     MenuControllerMnemonicTestNoMatch;
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_NoMatch DISABLED_NoMatch
-#else
-// If this flakes, disable and log details in http://crbug.com/523255.
-#define MAYBE_NoMatch NoMatch
-#endif
-
-VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch);
+VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch);

chrome/browser/ui/views/menu_item_view_interactive_uitest.cc

@@ -365,16 +365,8 @@ class MenuItemViewTestRemoveWithSubmenu : public MenuTestBase {
 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;
 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
 
-#if defined(USE_OZONE)
-// ozone bringup - http://crbug.com/401304
-#define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0
-#define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1
-#else
-#define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0
-#define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1
-#endif
 // If this flakes, disable and log details in http://crbug.com/523255.
-VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0)
+VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)
 
 // If this flakes, disable and log details in http://crbug.com/523255.
-VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1)
+VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)