Revert of Uses the activedescendant_changed event received from Blink to fire the right focus event

content/browser/accessibility/dump_accessibility_events_browsertest.cc

 // Copyright (c) 2014 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 <stddef.h>
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 135 matching lines @@
   ASSERT_TRUE(base::PathExists(test_path)) << test_path.LossyDisplayName();
 
   base::FilePath event_file = test_path.Append(base::FilePath(file_path));
   RunTest(event_file, "accessibility/event");
 }
 
 // TODO(dmazzoni): port these tests to run on all platforms.
 #if defined(OS_WIN) || defined(OS_MACOSX)
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsAriaComboBoxCollapse) {
-  RunEventTest(FILE_PATH_LITERAL("aria-combo-box-collapse.html"));
-}
-
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsAriaComboBoxExpand) {
-  RunEventTest(FILE_PATH_LITERAL("aria-combo-box-expand.html"));
-}
-
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsAriaComboBoxFocus) {
-  RunEventTest(FILE_PATH_LITERAL("aria-combo-box-focus.html"));
-}
-
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsAriaComboBoxNext) {
-  RunEventTest(FILE_PATH_LITERAL("aria-combo-box-next.html"));
-}
-
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsAddAlert) {
   RunEventTest(FILE_PATH_LITERAL("add-alert.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsAddChild) {
   RunEventTest(FILE_PATH_LITERAL("add-child.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
@@ skipping 55 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsListboxFocus) {
   RunEventTest(FILE_PATH_LITERAL("listbox-focus.html"));
 }
 
 // Flaky on Windows: http://crbug.com/486861
 // Flaky on Mac: http://crbug.com/588271
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsListboxNext) {
+                       DISABLED_AccessibilityEventsListboxNext) {
   RunEventTest(FILE_PATH_LITERAL("listbox-next.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       AccessibilityEventsMenuListCollapse) {
-  RunEventTest(FILE_PATH_LITERAL("menulist-collapse.html"));
-}
-
-#if defined(OS_MACOSX)
-// Crashes on Mac.
-#define MAYBE_AccessibilityEventsMenuListExpand \
-    DISABLED_AccessibilityEventsMenuListExpand
-#else
-#define MAYBE_AccessibilityEventsMenuListExpand \
-    AccessibilityEventsMenuListExpand
-#endif
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       MAYBE_AccessibilityEventsMenuListExpand) {
-  RunEventTest(FILE_PATH_LITERAL("menulist-expand.html"));
-}
-
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsMenuListFocus) {
   RunEventTest(FILE_PATH_LITERAL("menulist-focus.html"));
 }
 
-#if defined(OS_MACOSX)
-// Crashes on Mac.
-#define MAYBE_AccessibilityEventsMenuListNext \
-    DISABLED_AccessibilityEventsMenuListNext
-#else
-#define MAYBE_AccessibilityEventsMenuListNext AccessibilityEventsMenuListNext
-#endif
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       MAYBE_AccessibilityEventsMenuListNext) {
+                       AccessibilityEventsMenuListNext) {
   RunEventTest(FILE_PATH_LITERAL("menulist-next.html"));
 }
 
 // Flaky on Windows: http://crbug.com/486861
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        DISABLED_AccessibilityEventsMenuListPopup) {
   RunEventTest(FILE_PATH_LITERAL("menulist-popup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
@@ skipping 23 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsTextChanged) {
   RunEventTest(FILE_PATH_LITERAL("text-changed.html"));
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace content