Add DisableIf annotation to EME test

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

Index: base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.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/BaseInstrumentationTestRunner.java
index d8757241dabbdc4ad5258e0c2ca624ab371c3352..309d32a5fe46f77470990ccff4a84e262ed470ef 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.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]

Please don't change the copyright year for files you're modifying.

[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.
 
@@ -14,8 +14,6 @@ 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;
@@ -30,7 +28,6 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
 
     @Override
     public void onCreate(Bundle arguments) {
-        ChromiumMultiDexInstaller.install(getTargetContext());
         super.onCreate(arguments);
     }
 
@@ -59,8 +56,6 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
         result.addSkipCheck(new MinAndroidSdkLevelSkipCheck());
         result.addSkipCheck(new RestrictionSkipCheck(getTargetContext()));
         result.addSkipCheck(new DisableIfSkipCheck());
-
-        result.addPreTestHook(CommandLineFlags.getRegistrationHook());
     }
 
     @Override