[Android] Prepare the test runner for @RetryOnFailure.

BUG=619055

Review-Url: https://codereview.chromium.org/2099323002
Cr-Commit-Position: refs/heads/master@{#404774}

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

@@ -9,7 +9,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-// Note this annotation may not do anything yet. Check crbug.com/622451
+// Note this annotation may not do anything yet. Check crbug.com/619055
 // for latest status.
 /**
  * Mark a test as flaky and should be retried on failure. The test is

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -330,6 +330,17 @@ def name_and_timeout(t):
           '*'))
     return results
 
+  #override
+  def _ShouldRetry(self, test):
+    if 'RetryOnFailure' in test.get('annotations', {}):
+      return True
+
+    # TODO(jbudorick): Remove this log message and switch the return value to
+    # False after tests have been annotated with @RetryOnFailure.
+    # See crbug.com/619055 for more details.
+    logging.warning('Default retries are being phased out. crbug.com/619055')
+    return True
+
   #override
   def _ShouldShard(self):
     return True

build/android/pylib/local/device/local_device_test_run.py

@@ -176,7 +176,7 @@ def stop_tests(_signum, _frame):
 
   def _GetTestsToRetry(self, tests, try_results):
 
-    def is_failure(test_result):
+    def is_failure_result(test_result):
       return (
           test_result is None
           or test_result.GetType() not in (
@@ -185,15 +185,17 @@ def is_failure(test_result):
 
     all_test_results = {r.GetName(): r for r in try_results.GetAll()}
 
-    def should_retry(name):
+    def test_failed(name):
       # When specifying a test filter, names can contain trailing wildcards.
       # See local_device_gtest_run._ExtractTestsFromFilter()
       if name.endswith('*'):
-        return any(fnmatch.fnmatch(n, name) and is_failure(t)
+        return any(fnmatch.fnmatch(n, name) and is_failure_result(t)
                    for n, t in all_test_results.iteritems())
-      return is_failure(all_test_results.get(name))
+      return is_failure_result(all_test_results.get(name))
 
-    return [t for t in tests if should_retry(self._GetUniqueTestName(t))]
+    failed_tests = (t for t in tests if test_failed(self._GetUniqueTestName(t)))
+
+    return [t for t in failed_tests if self._ShouldRetry(t)]
 
   def GetTool(self, device):
     if not str(device) in self._tools:
@@ -204,10 +206,14 @@ def GetTool(self, device):
   def _CreateShards(self, tests):
     raise NotImplementedError
 
-  # pylint: disable=no-self-use
   def _GetUniqueTestName(self, test):
+    # pylint: disable=no-self-use
     return test
 
+  def _ShouldRetry(self, test):
+    # pylint: disable=no-self-use,unused-argument
+    return True
+
   def _GetTests(self):
     raise NotImplementedError