Add DisableIf annotation to EME test

base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java

Index: base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
similarity index 58%
copy from base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
copy to base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
index d8757241dabbdc4ad5258e0c2ca624ab371c3352..ac2e982398e30058e25dee1bf6794a1353acdf39 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.

[jbudorick, 2016/05/04 13:41:31]

Next time you upload, to so with --no-find-copies

[Yoland Yan(Google), 2016/05/04 17:08:18]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,24 +9,16 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.os.Bundle;
-import android.test.AndroidTestRunner;
-import android.test.InstrumentationTestRunner;
-
-import junit.framework.TestResult;
 
 import org.chromium.base.multidex.ChromiumMultiDexInstaller;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIfSkipCheck;
-import org.chromium.base.test.util.MinAndroidSdkLevelSkipCheck;
-import org.chromium.base.test.util.RestrictionSkipCheck;
-import org.chromium.test.reporter.TestStatusListener;
 
 // TODO(jbudorick): Add support for on-device handling of timeouts.
 /**
  *  An Instrumentation test runner that checks SDK level for tests with specific requirements.
  */
-public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
-    private static final String TAG = "base_test";
+public class BaseChromiumInstrumentationTestRunner extends BaseInstrumentationTestRunner {
+    private static final String TAG = "base_chromium_test";

[jbudorick, 2016/05/04 13:41:31]

Remove this.

[Yoland Yan(Google), 2016/05/04 17:08:18]

Done.

 
     @Override
     public void onCreate(Bundle arguments) {
@@ -34,20 +26,6 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
         super.onCreate(arguments);
     }
 
-    @Override
-    protected AndroidTestRunner getAndroidTestRunner() {
-        AndroidTestRunner runner = new AndroidTestRunner() {
-            @Override
-            protected TestResult createTestResult() {
-                BaseTestResult r = new BaseTestResult(BaseInstrumentationTestRunner.this);
-                addTestHooks(r);
-                return r;
-            }
-        };
-        runner.addTestListener(new TestStatusListener(getContext()));
-        return runner;
-    }
-
     /**
      * Override this method to register hooks and checks to be run for each test. Make sure to call
      * the base implementation if you do so.
@@ -55,11 +33,9 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
      * @see BaseTestResult#addSkipCheck(BaseTestResult.SkipCheck)
      * @see BaseTestResult#addPreTestHook(BaseTestResult.PreTestHook)
      */
+    @Override
     protected void addTestHooks(BaseTestResult result) {
-        result.addSkipCheck(new MinAndroidSdkLevelSkipCheck());
-        result.addSkipCheck(new RestrictionSkipCheck(getTargetContext()));
-        result.addSkipCheck(new DisableIfSkipCheck());
-
+        super.addTestHooks(result);
         result.addPreTestHook(CommandLineFlags.getRegistrationHook());
     }