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

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

Index: base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java b/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
index 7ac4bee1c298492faa2b58ca1783cbda1a5bfff7..1de03ac79834e0b24aa940c8d1e129986460e8bb 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
@@ -15,6 +15,7 @@ import junit.framework.TestResult;
 
 import org.chromium.base.Log;
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.SkipCheck;
 import org.chromium.base.test.util.parameter.BaseParameter;
 import org.chromium.base.test.util.parameter.Parameter;
 import org.chromium.base.test.util.parameter.Parameterizable;
@@ -53,20 +54,6 @@ public class BaseTestResult extends TestResult {
     }
 
     /**
-     * An interface for classes that check whether a test case should be skipped.
-     */
-    public interface SkipCheck {
-        /**
-         *
-         * Checks whether the given test case should be skipped.
-         *
-         * @param testCase The test case to check.
-         * @return Whether the test case should be skipped.
-         */
-        boolean shouldSkip(TestCase testCase);
-    }
-
-    /**
      * An interface for classes that have some code to run before a test. They run after
      * {@link SkipCheck}s. Provides access to the test method (and the annotations defined for it)
      * and the instrumentation context.