[Android] Support conditional test disabling based on android.os.Build values.

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

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 2abc1717fbf47f2923d4722ff42eb589fc695a90..25fb441181fb564e6283a3789dce5c4d8b7c0e1f 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,8 +14,8 @@ import junit.framework.TestCase;
 
 import org.chromium.base.test.BaseInstrumentationTestRunner;
 import org.chromium.base.test.BaseTestResult;
-import org.chromium.base.test.BaseTestResult.SkipCheck;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.SkipCheck;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.test.util.DisableInTabbedMode;
 import org.chromium.net.test.BaseHttpTestServer;
@@ -237,7 +237,7 @@ public class ChromeInstrumentationTestRunner extends BaseInstrumentationTestRunn
     /**
      * Checks for tests that should only run in document mode.
      */
-    private class DisableInTabbedModeSkipCheck implements SkipCheck {
+    private class DisableInTabbedModeSkipCheck extends SkipCheck {
 
         /**
          * If the test is running in tabbed mode, checks for