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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.test;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
 
 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;
 import org.chromium.policy.test.annotations.Policies;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.Socket;
@@ skipping 201 matching lines @@
                     && !DeviceFormFactor.isTablet(getTargetContext())) {
                 return true;
             }
             return false;
         }
     }
 
     /**
      * 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
          * {@link org.chromium.chrome.test.util.DisableInTabbedMode}.
          *
          * @param testCase The test to check.
          * @return Whether the test is running in tabbed mode and has been marked as disabled in
          *      tabbed mode.
          */
         @Override
@@ skipping 10 matching lines @@
                     }
                 }
             } catch (NoSuchMethodException e) {
                 Log.e(TAG, "Couldn't find test method: " + e.toString());
             }
 
             return false;
         }
     }
 }