| Index: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
|
| index 595081cb77831dcc148cb6f25a12a32b9451fbb2..875f466461eb2726278f8c9a675a4c081c1660d6 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
|
| @@ -9,10 +9,10 @@ import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_CHECK_INTERVAL_S
|
| 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.os.Build;
|
| +import android.support.test.filters.LargeTest;
|
| import android.support.test.filters.MediumTest;
|
| import android.support.test.filters.SmallTest;
|
| import android.widget.TextView;
|
| @@ -255,11 +255,8 @@ public class WebVrTest extends ChromeTabbedActivityTestBase {
|
| * Tests that screen touches are not registered when the viewer is a
|
| * Daydream View.
|
| */
|
| - /*
|
| @LargeTest
|
| @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
|
| - */
|
| - @DisabledTest(message = "crbug.com/713781")
|
| public void testScreenTapsNotRegisteredOnDaydream() throws InterruptedException {
|
| String testName = "test_screen_taps_not_registered_on_daydream";
|
| loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
|
| @@ -290,8 +287,11 @@ public class WebVrTest extends ChromeTabbedActivityTestBase {
|
| * Tests that screen touches are still registered when the viewer is
|
| * Cardboard.
|
| */
|
| + /*
|
| @MediumTest
|
| @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
|
| + */
|
| + @DisabledTest(message = "crbug.com/713781")
|
| public void testScreenTapsRegisteredOnCardboard() throws InterruptedException {
|
| String testName = "test_screen_taps_registered_on_cardboard";
|
| loadUrl(getHtmlTestFile(testName), PAGE_LOAD_TIMEOUT_S);
|
|
|