Re-eanble browser_keyevents_browsertest.

chrome/browser/browser_keyevents_browsertest.cc

Index: chrome/browser/browser_keyevents_browsertest.cc
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index b89162d4f0cc7f528769256ce15bd07299f57af0..8ceb820400ea6d8437e9cef17854c404fd510ace 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -294,8 +294,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
   }
 };
 
-// Flaky: http://crbug.com/129235, http://crbug.com/81451.
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) {
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) {
   static const KeyEventTestData kTestNoInput[] = {
     // a
     { ui::VKEY_A, false, false, false, false,
@@ -392,15 +391,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) {
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 
-#if defined(OS_LINUX) || defined(OS_WIN)
-// Linux: http://crbug.com/129235
-// Win: crbug.com/269564
-#define MAYBE_CtrlKeyEvents DISABLED_CtrlKeyEvents
-#else
-#define MAYBE_CtrlKeyEvents CtrlKeyEvents
-#endif
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) {
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
   static const KeyEventTestData kTestCtrlF = {
     ui::VKEY_F, true, false, false, false,
     false, false, false, false, 2,
@@ -449,6 +440,12 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) {
       "U 17 0 true false false false" }
   };
 
+  static const KeyEventTestData kTestEscape = {
+    ui::VKEY_ESCAPE, false, false, false, false,
+    false, false, false, false, 0,
+    {}
+  };
+
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
@@ -464,8 +461,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) {
   EXPECT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // Press Escape to close the Find box and move the focus back to the web page.
-  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), ui::VKEY_ESCAPE, false, false, false, false));
+  EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestEscape));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   // Press Ctrl+F with keydown suppressed shall not open the find box.
@@ -478,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) {
 }
 #elif defined(OS_MACOSX)
 // http://crbug.com/81451
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) {
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CommandKeyEvents) {
   static const KeyEventTestData kTestCmdF = {
     ui::VKEY_F, false, false, false, true,
     false, false, false, false, 2,
@@ -520,9 +516,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) {
 }
 #endif
 
-// Flaky: http://crbug.com/81451 , http://crbug.com/129235 ,
-// also fails on Windows.
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) {
 #if defined(OS_MACOSX)
   // On Mac, access keys use ctrl+alt modifiers.
   static const KeyEventTestData kTestAccessA = {
@@ -546,17 +540,6 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
       "U 18 0 true false true false",
       "U 17 0 true false false false" }
   };
-
-  static const KeyEventTestData kTestAccess1 = {
-    ui::VKEY_1, true, false, true, false,
-    false, false, false, false, 6,
-    { "D 17 0 true false false false",
-      "D 18 0 true false true false",
-      "D 49 0 true false true false",
-      "U 49 0 true false true false",
-      "U 18 0 true false true false",
-      "U 17 0 true false false false" }
-  };
 #else
   static const KeyEventTestData kTestAccessA = {
     ui::VKEY_A, false, false, true, false,
@@ -583,16 +566,6 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
       "U 18 0 false false true false" }
   };
 
-#if !defined(USE_ASH)
-  static const KeyEventTestData kTestAccess1 = {
-    ui::VKEY_1, false, false, true, false,
-    false, false, false, false, 4,
-    { "D 18 0 false false true false",
-      "D 49 0 false false true false",
-      "U 49 0 false false true false",
-      "U 18 0 false false true false" }
-  };
-#endif
 #endif
 
   ASSERT_TRUE(embedded_test_server()->Start());
@@ -648,12 +621,6 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
   EXPECT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L""));
   // Make sure no element is focused.
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));
-#if !defined(USE_ASH)
-  // On Ash, alt-1..9 are assigned as window selection global accelerators, so
-  // they can not be used as accesskeys.
-  EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAccess1));
-  EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"1"));
-#endif
 }
 
 // Flaky, http://crbug.com/69475.