Revert "Reland "Portals: Fix flakes in testTouchTransferAcrossReactivation""

This reverts commit a1a087cf. Reason for revert: PortalsTest#testTouchTransferAfterReactivation flakily fails in https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel and https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel. For example: https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel/1499 https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel/1502 https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel/1243 https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel/1244 Original change's description: > Reland "Portals: Fix flakes in testTouchTransferAcrossReactivation" > > This is a reland of c615367a > > Original change's description: > > 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/+/2264856 > > Reviewed-by: David Trainor <dtrainor@chromium.org> > > Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#782379} > > Bug: 1024850 > Change-Id: Ie6ad8a764f493de62cc2ab25f8b48b5d3c22375b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2295835 > Reviewed-by: Lucas Gadani <lfg@chromium.org> > Reviewed-by: David Trainor <dtrainor@chromium.org> > Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> > Cr-Commit-Position: refs/heads/master@{#788863} TBR=dtrainor@chromium.org,adithyas@chromium.org,lfg@chromium.org Change-Id: I03416bf69a6d3b0f93ace7461c73fc582ce0d69a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1024850 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302715Reviewed-by: Haiyang Pan <hypan@google.com> Commit-Queue: Haiyang Pan <hypan@google.com> Cr-Commit-Position: refs/heads/master@{#789087}

Revert "Reland "Portals: Fix flakes in testTouchTransferAcrossReactivation""
This reverts commit a1a087cf. Reason for revert: PortalsTest#testTouchTransferAfterReactivation flakily fails in https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel and https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel. For example: https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel/1499 https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel/1502 https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel/1243 https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-fyi-rel/1244 Original change's description: > Reland "Portals: Fix flakes in testTouchTransferAcrossReactivation" > > This is a reland of c615367a > > Original change's description: > > 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/+/2264856 > > Reviewed-by: David Trainor <dtrainor@chromium.org> > > Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#782379} > > Bug: 1024850 > Change-Id: Ie6ad8a764f493de62cc2ab25f8b48b5d3c22375b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2295835 > Reviewed-by: Lucas Gadani <lfg@chromium.org> > Reviewed-by: David Trainor <dtrainor@chromium.org> > Commit-Queue: Adithya Srinivasan <adithyas@chromium.org> > Cr-Commit-Position: refs/heads/master@{#788863} TBR=dtrainor@chromium.org,adithyas@chromium.org,lfg@chromium.org Change-Id: I03416bf69a6d3b0f93ace7461c73fc582ce0d69a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1024850 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302715Reviewed-by: Haiyang Pan <hypan@google.com> Commit-Queue: Haiyang Pan <hypan@google.com> Cr-Commit-Position: refs/heads/master@{#789087}
9332b0c1 · Haiyang Pan · Commit Bot · a5d88046 · 9332b0c1 · 9332b0c1
Commit 9332b0c1 authored Jul 16, 2020 by Haiyang Pan Committed by Commit Bot Jul 16, 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
@@ -32,6 +32,7 @@ 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;
@@ -356,6 +357,7 @@ 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,18 +2,10 @@
 <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);
-      if (!withTimeout) {
-        portal.activate();
-      } else {
-        setTimeout(() => {
-          portal.activate();
-        });
-      }
+      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,8 +11,7 @@
 </head>
 <body>
  <div id="scroller"></div>
-  <!-- TODO(crbug.com/1098773): The timeout shouldn't be necessary. -->
-  <portal src="activate-predecessor.html?withTimeout"></portal>
+  <portal src="activate-predecessor.html"></portal>
  <script>
    document.body.addEventListener('touchstart', e => {
      var portal = document.querySelector('portal');