[Android] Configurable instrumentation test runner + test SDK levels.

base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java

Index: base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java
similarity index 54%
copy from base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
copy to base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java
index 5aee05e73aef2edda2e790cf74db2dcfaae226d0..d7c45e7e5ac71d97b17250fd15501fc97356026c 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java
@@ -1,22 +1,19 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// 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.base.test.util;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * This annotation can be used to scale a specific test timeout.
- */
-@Target(ElementType.METHOD)
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
-public @interface TimeoutScale {
-    /**
-     * @return A number to scale the test timeout.
-     */
-    public int value();
+@Target({ElementType.TYPE})
+public @interface MinAndroidSdkLevel {

[Yaron, 2014/07/28 17:59:58]

I don't see a MaxAndroidSdkLevel. I also agree that we don't want it. Please
update CL description.

+    int value() default 0;
 }
+