Fix BrowserKeyEventsTest.ReservedAccelerators on Mac 10.6

chrome/browser/browser_keyevents_browsertest.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #include "app/keyboard_codes.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 618 matching lines @@
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAccess1));
 #if defined(TOOLKIT_GTK)
   // On GTK, alt-0..9 are assigned as tab selection accelerators, so they can
   // not be used as accesskeys.
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));
 #else
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"1"));
 #endif
 }
 
-#if defined(OS_MACOSX)
-// See http://crbug.com/50447 for details.
-#define MAYBE_ReservedAccelerators FLAKY_ReservedAccelerators
-#else
-#define MAYBE_ReservedAccelerators ReservedAccelerators
-#endif
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) {
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, ReservedAccelerators) {
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   GURL url = test_server()->GetURL(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
   static const KeyEventTestData kTestCtrlT = {
     app::VKEY_T, true, false, false, false,
     true, false, false, false, 1,
     { "D 17 0 true false false false" }
   };
 
   ASSERT_EQ(1, browser()->tab_count());
   // Press Ctrl+T, which will open a new tab.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlT));
   EXPECT_EQ(2, browser()->tab_count());
   browser()->SelectNumberedTab(0);
   ASSERT_EQ(0, browser()->selected_index());
 
   int result_length;
   ASSERT_NO_FATAL_FAILURE(GetResultLength(0, &result_length));
   EXPECT_EQ(1, result_length);
 
+  ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
+
   // Reserved accelerators can't be suppressed.
   ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true));
   // Press Ctrl+W, which will close the tab.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), app::VKEY_W, true, false, false, false));
   EXPECT_EQ(1, browser()->tab_count());
 #elif defined(OS_MACOSX)
   static const KeyEventTestData kTestCmdT = {
     app::VKEY_T, false, false, false, true,
     true, false, false, false, 1,
     { "D 91 0 false false false true" }
   };
 
   ASSERT_EQ(1, browser()->tab_count());
-  // Press Cmd+T, which will open a new tab.
+
+  ui_test_utils::WindowedNotificationObserver wait_for_new_tab(
+      NotificationType::TAB_PARENTED,
+      NotificationService::AllSources());
+
+  // Press Cmd+T, which will open a new tab, it can not be suppressed.

[Ilya Sherman, 2010/12/04 02:31:00]

nit: The added part would be better as ". It cannot be suppressed." (period
rather than comma, no space between "can" and "not")

[James Su, 2010/12/04 03:21:11]

Done.

   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCmdT));
-  EXPECT_EQ(2, browser()->tab_count());
-  browser()->SelectNumberedTab(0);
-  ASSERT_EQ(0, browser()->selected_index());
+
+  wait_for_new_tab.WaitFor(Source<NavigationController>(
+      &browser()->GetTabContentsAt(1)->controller()));
 
   int result_length;
   ASSERT_NO_FATAL_FAILURE(GetResultLength(0, &result_length));
   EXPECT_EQ(1, result_length);
 
+  EXPECT_EQ(2, browser()->tab_count());
+  ASSERT_EQ(1, browser()->selected_index());
+
+  // Because of issue http://crbug.com/65375, switching back to the first tab
+  // may cause the focus to be grabbed by omnibox. So instead, we load our
+  // testing page in the newly created tab and try Cmd-W here.
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  // Make sure the focus is in the testing page.
+  ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
+  ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
+
   // Reserved accelerators can't be suppressed.
-  ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true));
+  ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(1, true));
+
   // Press Cmd+W, which will close the tab.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), app::VKEY_W, false, false, false, true));
   EXPECT_EQ(1, browser()->tab_count());
 #elif defined(TOOLKIT_GTK)
   // Ctrl-[a-z] are not treated as reserved accelerators on GTK.
   static const KeyEventTestData kTestCtrlT = {
     app::VKEY_T, true, false, false, false,
     false, false, false, false, 2,
     { "D 17 0 true false false false",
@@ skipping 34 matching lines @@
 
   // Ctrl+T should be blockable.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlTBlocked));
   ASSERT_EQ(1, browser()->tab_count());
 
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlT));
   ASSERT_EQ(2, browser()->tab_count());
   ASSERT_EQ(1, browser()->selected_index());
   browser()->SelectNumberedTab(0);
   ASSERT_EQ(0, browser()->selected_index());
+  ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   // Ctrl+PageDown and Ctrl+Tab switches to the next tab.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlPageDown));
   ASSERT_EQ(1, browser()->selected_index());
 
   browser()->SelectNumberedTab(0);
   ASSERT_EQ(0, browser()->selected_index());
+  ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
+
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlTab));
   ASSERT_EQ(1, browser()->selected_index());
 
   // Ctrl+W should be blockable.
   browser()->SelectNumberedTab(0);
   ASSERT_EQ(0, browser()->selected_index());
+  ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
+
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlWBlocked));
   ASSERT_EQ(2, browser()->tab_count());
 
   // Ctrl+F4 to close the tab.
   ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true));
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), app::VKEY_F4, true, false, false, false));
   ASSERT_EQ(1, browser()->tab_count());
 #endif
 }
@@ skipping 126 matching lines @@
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   // Ctrl+Alt should have no effect.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 }
 #endif
 
 }  // namespace