Commit 2930f9c5 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

Revert "Enable Permissions Tests on L"

This reverts commit 3fafebb6.

Reason for revert: https://ci.chromium.org/p/chromium/builders/ci/Lollipop%20Phone%20Tester/26557

Original change's description:
> Enable Permissions Tests on L
> 
> https://crrev.com/c/2352519 stopped attempting to load the GvrKeyboard,
> and the original bug that it fixed had the same error stack as seen in
> this bug. Re-enable the Permissions Tests that were failing with the
> same error.
> 
> Fixed: 1091800
> Change-Id: Icc2bf2d29ddd8ffbf0016df2be6e9e6d310a1ac3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354721
> Commit-Queue: Alexander Cooper <alcooper@chromium.org>
> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> Auto-Submit: Alexander Cooper <alcooper@chromium.org>
> Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#797967}

TBR=bsheedy@chromium.org,alcooper@chromium.org

Change-Id: I12545b8305fe531473d0c290695e4eec39807b6c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355949Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798086}
parent a1eaa45f
......@@ -8,6 +8,8 @@ import static org.chromium.chrome.browser.vr.XrTestFramework.PAGE_LOAD_TIMEOUT_S
import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_TIMEOUT_LONG_MS;
import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_TIMEOUT_SHORT_MS;
import android.os.Build;
import androidx.test.filters.MediumTest;
import org.junit.Before;
......@@ -21,6 +23,7 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.vr.rules.XrActivityRestriction;
import org.chromium.chrome.browser.vr.util.VrTestRuleUtils;
......@@ -86,6 +89,8 @@ public class WebXrVrPermissionTest {
@Test
@MediumTest
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
@DisableIf.
Build(message = "https://crbug.com/1091800", sdk_is_less_than = Build.VERSION_CODES.M)
public void testVrPermissionPersistance() {
mWebXrVrPermissionTestFramework.loadFileAndAwaitInitialization(
"generic_webxr_page", PAGE_LOAD_TIMEOUT_S);
......@@ -123,6 +128,8 @@ public class WebXrVrPermissionTest {
@Test
@MediumTest
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
@DisableIf.
Build(message = "https://crbug.com/1091800", sdk_is_less_than = Build.VERSION_CODES.M)
public void testPermissionPersistsAfterReload() {
mWebXrVrPermissionTestFramework.loadFileAndAwaitInitialization(
"generic_webxr_page", PAGE_LOAD_TIMEOUT_S);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment