Update disabling of DumpAccessibilityTree tests

Disables a set of tests that are failing on M87 on Android.

This CL landed on Master and was merged to M87, but it was flawed.
This fixes the flaw and relands on Master.

We plan to merge into M87 and revert on Master (since it
has been addressed on Master).

BUG=1137967

Change-Id: I66eabb97c167822c2652b7c89c606377fb08b5d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503844
Auto-Submit: Donn Denman <donnd@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821843}

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -547,13 +547,47 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
 #define MAYBE_AccessibilityAriaCombobox AccessibilityAriaCombobox
 #endif
 
+// DISABLE A BUNCH OF TESTS FOR ANDROID
+// ------------------------------------
+// TODO(crbug.com/1137967): tests are flaky on android.
+#if defined(OS_ANDROID)
+#define MAYBE_AccessibilityAriaMenuItemRadio \
+  DISABLED_AccessibilityAriaMenuItemRadio
+#define MAYBE_AccessibilityAriaComboboxUneditable \
+  DISABLED_AccessibilityAriaComboboxUneditable
+#define MAYBE_AccessibilityAriaListBox DISABLED_AccessibilityAriaListBox
+#define MAYBE_AccessibilityAriaListBoxDisabled \
+  DISABLED_AccessibilityAriaListBoxDisabled
+#define MAYBE_AccessibilityAriaOption DISABLED_AccessibilityAriaOption
+#define MAYBE_AccessibilityAriaPosinset DISABLED_AccessibilityAriaPosinset
+#define MAYBE_AccessibilityAriaSelected DISABLED_AccessibilityAriaSelected
+#define MAYBE_AccessibilityAriaSetsize DISABLED_AccessibilityAriaSetsize
+#define MAYBE_AccessibilityAriaTree DISABLED_AccessibilityAriaTree
+#define MAYBE_AccessibilityButtonWithListboxPopup \
+  DISABLED_AccessibilityButtonWithListboxPopup
+#else
+#define MAYBE_AccessibilityAriaMenuItemRadio AccessibilityAriaMenuItemRadio
+#define MAYBE_AccessibilityAriaComboboxUneditable \
+  AccessibilityAriaComboboxUneditable
+#define MAYBE_AccessibilityAriaListBox AccessibilityAriaListBox
+#define MAYBE_AccessibilityAriaListBoxDisabled AccessibilityAriaListBoxDisabled
+#define MAYBE_AccessibilityAriaOption AccessibilityAriaOption
+#define MAYBE_AccessibilityAriaPosinset AccessibilityAriaPosinset
+#define MAYBE_AccessibilityAriaSelected AccessibilityAriaSelected
+#define MAYBE_AccessibilityAriaSetsize AccessibilityAriaSetsize
+#define MAYBE_AccessibilityAriaTree AccessibilityAriaTree
+#define MAYBE_AccessibilityButtonWithListboxPopup \
+  AccessibilityButtonWithListboxPopup
+#endif
+// ------------------------------------
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
                        MAYBE_AccessibilityAriaCombobox) {
   RunAriaTest(FILE_PATH_LITERAL("aria-combobox.html"));
 }
 
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       AccessibilityAriaComboboxUneditable) {
+                       MAYBE_AccessibilityAriaComboboxUneditable) {
   RunAriaTest(FILE_PATH_LITERAL("aria-combobox-uneditable.html"));
 }
 
@@ -818,12 +852,13 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaList) {
   RunAriaTest(FILE_PATH_LITERAL("aria-list.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaListBox) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       MAYBE_AccessibilityAriaListBox) {
   RunAriaTest(FILE_PATH_LITERAL("aria-listbox.html"));
 }
 
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       AccessibilityAriaListBoxDisabled) {
+                       MAYBE_AccessibilityAriaListBoxDisabled) {
   RunAriaTest(FILE_PATH_LITERAL("aria-listbox-disabled.html"));
 }
 // TODO(crbug.com/983802): Flaky.
@@ -903,7 +938,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
 // crbug.com/442278 will stop creating new text elements representing title.
 // Re-baseline after the Blink change goes in
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       AccessibilityAriaMenuItemRadio) {
+                       MAYBE_AccessibilityAriaMenuItemRadio) {
   RunAriaTest(FILE_PATH_LITERAL("aria-menuitemradio.html"));
 }
 
@@ -988,7 +1023,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaNone) {
   RunAriaTest(FILE_PATH_LITERAL("aria-none.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaOption) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       MAYBE_AccessibilityAriaOption) {
   RunAriaTest(FILE_PATH_LITERAL("aria-option.html"));
 }
 
@@ -996,7 +1032,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaParagraph) {
   RunAriaTest(FILE_PATH_LITERAL("aria-paragraph.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaPosinset) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       MAYBE_AccessibilityAriaPosinset) {
   RunAriaTest(FILE_PATH_LITERAL("aria-posinset.html"));
 }
 
@@ -1092,7 +1129,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   RunAriaTest(FILE_PATH_LITERAL("aria-searchbox-with-selection.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaSelected) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       MAYBE_AccessibilityAriaSelected) {
   RunAriaTest(FILE_PATH_LITERAL("aria-selected.html"));
 }
 
@@ -1100,7 +1138,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaSeparator) {
   RunAriaTest(FILE_PATH_LITERAL("aria-separator.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaSetsize) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       MAYBE_AccessibilityAriaSetsize) {
   RunAriaTest(FILE_PATH_LITERAL("aria-setsize.html"));
 }
 
@@ -1213,7 +1252,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaTooltip) {
   RunAriaTest(FILE_PATH_LITERAL("aria-tooltip.html"));
 }
 
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaTree) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, MAYBE_AccessibilityAriaTree) {
   RunAriaTest(FILE_PATH_LITERAL("aria-tree.html"));
 }
 
@@ -2519,7 +2558,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityNestedList) {
 }
 
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       AccessibilityButtonWithListboxPopup) {
+                       MAYBE_AccessibilityButtonWithListboxPopup) {
   RunHtmlTest(FILE_PATH_LITERAL("button-with-listbox-popup.html"));
 }