android: Add RetryOnFailure test annotation

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

Index: base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java
similarity index 50%
copy from base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java
copy to base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java
index 83f8e9f43d3386dbb6457ac578e0dbf8427a6498..63b7111de18631eab4c5ee788baab04a33354295 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java
@@ -9,14 +9,17 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+// Note this annotation may not do anything yet. Check crbug.com/622451
+// for latest status.
 /**
- * This annotation is for flaky tests.
- * <p>
- * Tests with this annotation will not be run on any of the normal bots.
- * Please note that they might eventually run on a special bot.
+ * Mark a test as flaky and should be retried on failure. The test is
+ * considered passed by the test script if any retry succeeds.
+ *
+ * Long term, this should be merged with @FlakyTest. But @FlakyTest means
+ * has specific meaning that is currently different from RetryOnFailure.
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface FlakyTest {
+public @interface RetryOnFailure {
     String message() default "";
 }