Add DisableIf annotation to EME test

android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java

Index: android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
diff --git a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
index 44b745f8917ad433af8a0d19e286554af97ec76c..f415413bd5a6c894f3bc2e1a06aa6e42d6e73b04 100644
--- a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
+++ b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
@@ -5,15 +5,13 @@
 package org.chromium.webview_shell.test;
 
 import android.os.Bundle;
-import android.test.AndroidTestRunner;
-import android.test.InstrumentationTestRunner;
 
-import org.chromium.test.reporter.TestStatusListener;
+import org.chromium.base.test.BaseInstrumentationTestRunner;
 
 /**
  * Customized test runner for running instrumentation tests in WebViewBrowserTests.
  */
-public class WebViewLayoutTestRunner extends InstrumentationTestRunner {
+public class WebViewLayoutTestRunner extends BaseInstrumentationTestRunner {
     private String mModeArgument;
     private static final String MODE_REBASELINE = "rebaseline";
 
@@ -28,11 +26,4 @@ public class WebViewLayoutTestRunner extends InstrumentationTestRunner {
     public boolean isRebaseline() {
         return mModeArgument != null ? mModeArgument.equals(MODE_REBASELINE) : false;
     }
-
-    @Override
-    protected AndroidTestRunner getAndroidTestRunner() {
-        AndroidTestRunner runner = super.getAndroidTestRunner();
-        runner.addTestListener(new TestStatusListener(getContext()));
-        return runner;
-    }
-}
+}