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

content/browser/accessibility/dump_accessibility_events_browsertest.cc

Index: content/browser/accessibility/dump_accessibility_events_browsertest.cc
diff --git a/content/browser/accessibility/dump_accessibility_events_browsertest.cc b/content/browser/accessibility/dump_accessibility_events_browsertest.cc
index 2415a24e5b6a0a3b8bb9326cac60eacfd4512bfb..082fc2adc9fd41602ddd26838476d9ebc1853e4a 100644
--- a/content/browser/accessibility/dump_accessibility_events_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_events_browsertest.cc
@@ -153,26 +153,6 @@
 #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"));
 }
@@ -248,26 +228,8 @@
 // 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,
@@ -275,15 +237,8 @@
   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) {
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
+                       AccessibilityEventsMenuListNext) {
   RunEventTest(FILE_PATH_LITERAL("menulist-next.html"));
 }