chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java - Issue 1582513003: Add a testing restriction for whether Google Play Services is up-to-date.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

Issue 1582513003: Add a testing restriction for whether Google Play Services is up-to-date. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java » ('j') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

index a604f3ac12b08148348ff72308495e819d8bcfcd..cdb241e777f026ffdc23739c9a2c81bbdc6b6db6 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

@@ -4,8 +4,6 @@

package org.chromium.chrome.browser.externalnav;

-import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_TABLET;

import android.app.Activity;

import android.app.Instrumentation;

import android.app.Instrumentation.ActivityMonitor;

@@ -17,7 +15,6 @@ import android.os.SystemClock;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.TextUtils;

-import org.chromium.base.test.util.Restriction;

import org.chromium.chrome.browser.ChromeActivity;

import org.chromium.chrome.browser.document.ChromeLauncherActivity;

import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;

@@ -25,6 +22,7 @@ import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;

import org.chromium.chrome.test.ChromeActivityTestCaseBase;

+import org.chromium.chrome.test.util.ChromeRestriction;

import org.chromium.chrome.test.util.TestHttpServerClient;

import org.chromium.content.browser.test.util.CallbackHelper;

import org.chromium.content.browser.test.util.Criteria;

@@ -272,7 +270,7 @@ public class UrlOverridingTest extends ChromeActivityTestCaseBase<ChromeActivity

}

@SmallTest

- @Restriction(RESTRICTION_TYPE_TABLET)

+ @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_TABLET)

public void testOpenWindowFromUserGesture() throws InterruptedException {

loadUrlAndWaitForIntentUrl(TestHttpServerClient.getUrl(OPEN_WINDOW_FROM_USER_GESTURE_PAGE),

true, 1, true, null, true);