Portals: Fix flakes in testTouchTransferAcrossReactivation

The flakes were caused by crbug.com/1098773. As a workaround until the issue is fixed, this wraps the activate call in a setTimeout. Bug: 1024850 Change-Id: I36e2b948818d81578acc97a9a60758b281ff6764 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264856Reviewed-by: David Trainor <dtrainor@chromium.org> Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> Cr-Commit-Position: refs/heads/master@{#782379}

Portals: Fix flakes in testTouchTransferAcrossReactivation
The flakes were caused by crbug.com/1098773. As a workaround until the issue is fixed, this wraps the activate call in a setTimeout. Bug: 1024850 Change-Id: I36e2b948818d81578acc97a9a60758b281ff6764 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264856Reviewed-by: David Trainor <dtrainor@chromium.org> Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> Cr-Commit-Position: refs/heads/master@{#782379}
c615367a · Adithya Srinivasan · Commit Bot · 01ef63e3 · c615367a · c615367a
Commit c615367a authored Jun 25, 2020 by Adithya Srinivasan Committed by Commit Bot Jun 25, 2020
3 changed files
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/portals/PortalsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/portals/PortalsTest.java
@@ -31,7 +31,6 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.R;
@@ -355,7 +354,6 @@ public class PortalsTest {
    @Test
    @MediumTest
    @Feature({"Portals"})
-    @DisabledTest(message = "https://crbug.com/1024850")
    public void testTouchTransferAfterReactivation() throws Exception {
        mActivityTestRule.startMainActivityWithURL(mTestServer.getURL(
                "/chrome/test/data/android/portals/touch-transfer-after-reactivation.html"));

--- a/chrome/test/data/android/portals/activate-predecessor.html
+++ b/chrome/test/data/android/portals/activate-predecessor.html
@@ -2,10 +2,18 @@
 <html>
 <body>
  <script>
+    const urlParams = new URLSearchParams(window.location.search);
+    const withTimeout = urlParams.has('withTimeout')
    window.onportalactivate = e => {
      var portal = e.adoptPredecessor();
      document.body.appendChild(portal);
-      portal.activate();
+      if (!withTimeout) {
+        portal.activate();
+      } else {
+        setTimeout(() => {
+          portal.activate();
+        });
+      }
    }
  </script>
 </body>

--- a/chrome/test/data/android/portals/touch-transfer-after-reactivation.html
+++ b/chrome/test/data/android/portals/touch-transfer-after-reactivation.html
@@ -11,7 +11,8 @@
 </head>
 <body>
  <div id="scroller"></div>
-  <portal src="activate-predecessor.html"></portal>
+  <!-- TODO(crbug.com/1098773): The timeout shouldn't be necessary. -->
+  <portal src="activate-predecessor.html?withTimeout"></portal>
  <script>
    document.body.addEventListener('touchstart', e => {
      var portal = document.querySelector('portal');