Re-enable 3 DumpAccessibilityEvents tests that were disabled on windows.

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 134 matching lines @@
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io_for_test_verification;
     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.
-// TODO(crbug.com/617146): All tests flaky on Windows 8.
 #if defined(OS_WIN) || defined(OS_MACOSX)
 
 // This is tasteless, but then so's the snippet it's replacing.
 #if defined(OS_WIN)
 #define DISABLED_ON_WIN(name) DISABLED_ ## name
 #else
 #define DISABLED_ON_WIN(name) name
 #endif
 
+#if defined(OS_MACOSX)
+#define DISABLED_ON_MAC(name) DISABLED_##name
+#else
+#define DISABLED_ON_MAC(name) name
+#endif
+
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define DISABLED_ON_WIN_AND_MAC(name) DISABLED_ ## name
 #else
 #define DISABLED_ON_WIN_AND_MAC(name) name
 #endif
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsAriaComboBoxCollapse) {
   RunEventTest(FILE_PATH_LITERAL("aria-combo-box-collapse.html"));
 }
 
-// https://crbug.com/652706
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-    DISABLED_ON_WIN(AccessibilityEventsAriaComboBoxExpand)) {
+                       AccessibilityEventsAriaComboBoxExpand) {
   RunEventTest(FILE_PATH_LITERAL("aria-combo-box-expand.html"));
 }
 
-// Mac: https://crbug.com/615411, Win: https://crbug.com/652706
+// https://crbug.com/719030
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
     DISABLED_ON_WIN_AND_MAC(AccessibilityEventsAriaComboBoxFocus)) {
   RunEventTest(FILE_PATH_LITERAL("aria-combo-box-focus.html"));
 }
 
-// https://crbug.com/652706
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-    DISABLED_ON_WIN(AccessibilityEventsAriaComboBoxNext)) {
+                       AccessibilityEventsAriaComboBoxNext) {
   RunEventTest(FILE_PATH_LITERAL("aria-combo-box-next.html"));
 }
 
-// https://crbug.com/652706
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-    DISABLED_ON_WIN(AccessibilityEventsAddAlert)) {
+                       AccessibilityEventsAddAlert) {
   RunEventTest(FILE_PATH_LITERAL("add-alert.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsAddChildOfBody) {
   RunEventTest(FILE_PATH_LITERAL("add-child-of-body.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsAddHiddenAttribute) {
@@ skipping 33 matching lines @@
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsExpandedChange) {
   RunEventTest(FILE_PATH_LITERAL("expanded-change.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsInnerHtmlChange) {
   RunEventTest(FILE_PATH_LITERAL("inner-html-change.html"));
 }
 
-#if defined(OS_MACOSX)
-// Mac failures: http://crbug.com/598527.
-#define MAYBE_AccessibilityEventsInputTypeTextValueChanged \
-    DISABLED_AccessibilityEventsInputTypeTextValueChanged
-#else
-#define MAYBE_AccessibilityEventsInputTypeTextValueChanged \
-    AccessibilityEventsInputTypeTextValueChanged
-#endif
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
-                       MAYBE_AccessibilityEventsInputTypeTextValueChanged) {
+// http://crbug.com/719030
+IN_PROC_BROWSER_TEST_F(
+    DumpAccessibilityEventsTest,
+    DISABLED_ON_MAC(AccessibilityEventsInputTypeTextValueChanged)) {
   RunEventTest(FILE_PATH_LITERAL("input-type-text-value-changed.html"));
 }
 
 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) {
   RunEventTest(FILE_PATH_LITERAL("listbox-next.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsMenuListCollapse) {
   RunEventTest(FILE_PATH_LITERAL("menulist-collapse.html"));
 }
 
-// Mac: https://crbug.com/615411, Win: https://crbug.com/652706
+// https://crbug.com/719030
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
     DISABLED_ON_WIN_AND_MAC(AccessibilityEventsMenuListExpand)) {
   RunEventTest(FILE_PATH_LITERAL("menulist-expand.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsMenuListFocus) {
   RunEventTest(FILE_PATH_LITERAL("menulist-focus.html"));
 }
 
-// Mac: https://crbug.com/615411, Win: https://crbug.com/652706
+// https://crbug.com/719030
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
     DISABLED_ON_WIN_AND_MAC(AccessibilityEventsMenuListNext)) {
   RunEventTest(FILE_PATH_LITERAL("menulist-next.html"));
 }
 
-// Flaky on Windows: http://crbug.com/486861
+// http://crbug.com/719030
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        DISABLED_AccessibilityEventsMenuListPopup) {
   RunEventTest(FILE_PATH_LITERAL("menulist-popup.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsNameChange) {
   RunEventTest(FILE_PATH_LITERAL("name-change.html"));
 }
 
@@ skipping 19 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityEventsTest,
                        AccessibilityEventsTextChanged) {
   RunEventTest(FILE_PATH_LITERAL("text-changed.html"));
 }
 
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace content