Portals: Rebaseline and re-enable portal dump_a11y_tests on Android

crrev.com/c/2364049 fixed changed "GetChildCount" to return 0 for any
node that is a leaf, and portals are considered leaf nodes (with prune
tree enabled on Android) [1].

[1] https://source.chromium.org/chromium/chromium/src/+/master:content/browser/accessibility/browser_accessibility_android.cc;l=450;drc=6e8b402a6231405b753919029c9027404325ea00

Bug: 1120210
Change-Id: I021197d1f06ce92a1752f43c0aff85e9e66665f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391641
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: Nektarios Paisios <nektar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805390}

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -2123,25 +2123,12 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityProgress) {
   RunHtmlTest(FILE_PATH_LITERAL("progress.html"));
 }
 
-// https://crbug.com/1120210
-#if defined(OS_ANDROID)
-#define MAYBE_AccessibilityPortal DISABLED_AccessibilityPortal
-#else
-#define MAYBE_AccessibilityPortal AccessibilityPortal
-#endif
-IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, MAYBE_AccessibilityPortal) {
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityPortal) {
   RunHtmlTest(FILE_PATH_LITERAL("portal.html"));
 }
 
-// https://crbug.com/1120210
-#if defined(OS_ANDROID)
-#define MAYBE_AccessibilityPortalNameFromText \
-  DISABLED_AccessibilityPortalNameFromText
-#else
-#define MAYBE_AccessibilityPortalNameFromText AccessibilityPortalNameFromText
-#endif
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       MAYBE_AccessibilityPortalNameFromText) {
+                       AccessibilityPortalNameFromText) {
   RunHtmlTest(FILE_PATH_LITERAL("portal-name-from-text.html"));
 }
 
@@ -2151,16 +2138,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   RunHtmlTest(FILE_PATH_LITERAL("portal-with-widget-inside.html"));
 }
 
-// https://crbug.com/1120210
-#if defined(OS_ANDROID)
-#define MAYBE_AccessibilityPortalNameFromVisibleText \
-  DISABLED_AccessibilityPortalNameFromVisibleText
-#else
-#define MAYBE_AccessibilityPortalNameFromVisibleText \
-  AccessibilityPortalNameFromVisibleText
-#endif
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
-                       MAYBE_AccessibilityPortalNameFromVisibleText) {
+                       AccessibilityPortalNameFromVisibleText) {
   RunHtmlTest(FILE_PATH_LITERAL("portal-name-from-visible-text.html"));
 }
 

content/test/data/accessibility/html/portal-expected-android.txt

 android.webkit.WebView focusable focused scrollable
 ++android.view.View name='Before portal'
 ++android.view.View role_description='button' clickable focusable name='portal'
-++++android.view.View scrollable name='Text in iframe'
 ++android.view.View name='After portal'

content/test/data/accessibility/html/portal-name-from-text-expected-android.txt

 android.webkit.WebView focusable focused scrollable
 ++android.view.View
 ++++android.view.View role_description='button' clickable focusable name='Text in iframe'
-++++++android.view.View scrollable name='Text in iframe'

content/test/data/accessibility/html/portal-name-from-visible-text-expected-android.txt

 android.webkit.WebView focusable focused scrollable
 ++android.view.View
 ++++android.view.View role_description='button' clickable focusable name='visible text'
-++++++android.view.View scrollable name='visible text'