chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java - Issue 1952573002: Add DisableIf annotation to EME test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

Issue 1952573002: Add DisableIf annotation to EME test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor format changes Created 4 years, 7 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

« base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java ('K') | « blimp/client/app/android/javatests/AndroidManifest.xml.jinja2 ('k') | content/shell/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

index 671c9b2704c9f3dff36ab6cb500ebe3002ea1011..5666c6eebf8c796ada42057ffdeb88a28e1bd000 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

@@ -14,7 +14,7 @@ import com.google.android.gms.common.GoogleApiAvailability;

import junit.framework.TestCase;

-import org.chromium.base.test.BaseInstrumentationTestRunner;

+import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;

import org.chromium.base.test.BaseTestResult;

import org.chromium.base.test.util.RestrictionSkipCheck;

import org.chromium.base.test.util.SkipCheck;

@@ -33,7 +33,7 @@ import java.lang.reflect.Method;

* TODO(jbudorick): remove uses of deprecated org.apache.* crbug.com/488192

@SuppressWarnings("deprecation")

-public class ChromeInstrumentationTestRunner extends BaseInstrumentationTestRunner {

+public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {

private static final String TAG = "ChromeInstrumentationTestRunner";