Commit 32ebb639 authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Disable SendTabToSelf in VR test

Disables the SendTabToSelf feature in
WebXrVrTransitionTest#testNonImmersiveStopsDuringImmersive, as it's
suspected that the feature is the cause of recent flakiness.

TBR=bialpio@chromium.org

Bug: 986580
Change-Id: Ic1b22a9ba48d5c96729c4e57439c590dcdd1ca35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729537Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682835}
parent 58282116
...@@ -43,6 +43,7 @@ import org.chromium.base.test.util.MinAndroidSdkLevel; ...@@ -43,6 +43,7 @@ import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.base.test.util.UrlUtils; import org.chromium.base.test.util.UrlUtils;
import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.vr.rules.VrSettingsFile; import org.chromium.chrome.browser.vr.rules.VrSettingsFile;
import org.chromium.chrome.browser.vr.rules.XrActivityRestriction; import org.chromium.chrome.browser.vr.rules.XrActivityRestriction;
...@@ -54,6 +55,7 @@ import org.chromium.chrome.browser.vr.util.VrTestRuleUtils; ...@@ -54,6 +55,7 @@ import org.chromium.chrome.browser.vr.util.VrTestRuleUtils;
import org.chromium.chrome.browser.vr.util.VrTransitionUtils; import org.chromium.chrome.browser.vr.util.VrTransitionUtils;
import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate; import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
import org.chromium.content_public.browser.test.util.CriteriaHelper; import org.chromium.content_public.browser.test.util.CriteriaHelper;
import java.io.File; import java.io.File;
...@@ -480,6 +482,7 @@ public class WebXrVrTransitionTest { ...@@ -480,6 +482,7 @@ public class WebXrVrTransitionTest {
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
@DisableFeatures(ChromeFeatureList.SEND_TAB_TO_SELF)
public void testNonImmersiveStopsDuringImmersive() throws InterruptedException { public void testNonImmersiveStopsDuringImmersive() throws InterruptedException {
mWebXrVrTestFramework.loadUrlAndAwaitInitialization( mWebXrVrTestFramework.loadUrlAndAwaitInitialization(
WebXrVrTestFramework.getFileUrlForHtmlTestFile( WebXrVrTestFramework.getFileUrlForHtmlTestFile(
......
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