Revert of Make VR screen tap tests more stable

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

 // Copyright 2017 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.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_CHECK_INTERVAL_LONG_MS;
 import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_CHECK_INTERVAL_SHORT_MS;
 import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_TIMEOUT_LONG_MS;
 import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_TIMEOUT_SHORT_MS;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_DAYDREAM;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_NON_DAYDREAM;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_WEBVR_SUPPORTED;
 
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 
 import org.chromium.base.Log;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.content.browser.test.util.ClickUtils;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
  * This is a workaround for testing aspects of WebVR that aren't testable with
  * WebVR's mocked layout tests, such as E2E tests.
  *
  * The general test flow is:
  * - Load the HTML file containing the test, which:
  *   - Loads the WebVR boilerplate code and some test functions
@@ skipping 206 matching lines @@
         String testName = "test_nfc_fires_vrdisplayactivate";
         loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
         simNfcScanAndWait(mWebContents);
         endTest(mWebContents);
     }
 
     /**
      * Tests that screen touches are not registered when the viewer is a
      * Daydream View.
      */
-    @LargeTest
+    @SmallTest
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
     public void testScreenTapsNotRegisteredOnDaydream() throws InterruptedException {
         String testName = "test_screen_taps_not_registered_on_daydream";
         loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
         assertTrue("VRDisplay found", vrDisplayFound(mWebContents));
         executeStepAndWait("stepVerifyNoInitialTaps()", mWebContents);
         enterVrTapAndWait(mWebContents);
-        // Wait on VrShellImpl to say that its parent consumed the touch event
-        // Set to 2 because there's an ACTION_DOWN followed by ACTION_UP
-        final CountDownLatch touchRegisteredLatch = new CountDownLatch(2);
-        ((VrShellImpl) VrShellDelegate.getVrShellForTesting())
-                .setOnDispatchTouchEventForTesting(new OnDispatchTouchEventCallback() {
-                    @Override
-                    public void onDispatchTouchEvent(
-                            boolean parentConsumed, boolean cardboardTriggered) {
-                        if (!parentConsumed) fail("Parent did not consume event");
-                        if (cardboardTriggered) fail("Cardboard event triggered");
-                        touchRegisteredLatch.countDown();
-                    }
-                });
         enterVrTap();
-        assertTrue("VrShellImpl dispatched touches",
-                touchRegisteredLatch.await(POLL_TIMEOUT_SHORT_MS, TimeUnit.MILLISECONDS));
         executeStepAndWait("stepVerifyNoAdditionalTaps()", mWebContents);
         endTest(mWebContents);
     }
 
     /**
      * Tests that screen touches are still registered when the viewer is
      * Cardboard.
      */
-    @MediumTest
+    @SmallTest
     @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
     public void testScreenTapsRegisteredOnCardboard() throws InterruptedException {
         String testName = "test_screen_taps_registered_on_cardboard";
         loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
         assertTrue("VRDisplay found", vrDisplayFound(mWebContents));
         executeStepAndWait("stepVerifyNoInitialTaps()", mWebContents);
-        // Tap and wait to enter VR
         enterVrTapAndWait(mWebContents);
-        // Tap and wait for Javascript to receive it
-        enterVrTapAndWait(mWebContents);
+        enterVrTap();
+        executeStepAndWait("stepVerifyAdditionalTap()", mWebContents);
         endTest(mWebContents);
     }
 
     /**
      * Tests that non-focused tabs cannot get pose information.
      */
     @SmallTest
     public void testPoseDataUnfocusedTab() throws InterruptedException {
         String testName = "test_pose_data_unfocused_tab";
         loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
         assertTrue("VRDisplay found", vrDisplayFound(mWebContents));
         executeStepAndWait("stepCheckFrameDataWhileFocusedTab()", mWebContents);
 
         loadUrlInNewTab("about:blank");
 
         executeStepAndWait("stepCheckFrameDataWhileNonFocusedTab()", mWebContents);
         endTest(mWebContents);
     }
 }