android: Mark flaky tests with @RetryOnFailure

chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java
index db00d0fd918361f1aecdd744d67f67f13e4bdf70..3df7dcfcfeff585d2755c6529304a634b110321a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheControllerTest.java
@@ -16,7 +16,6 @@ import com.google.android.gms.gcm.Task;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.AdvancedMockContext;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.components.precache.MockDeviceState;
@@ -197,6 +196,7 @@ public class PrecacheControllerTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"Precache"})
+    @RetryOnFailure
     public void testDeviceStateChangeCancels() {
         verifyBeginPrecaching();
 
@@ -248,11 +248,9 @@ public class PrecacheControllerTest extends InstrumentationTestCase {
         verifyLockCounts(1, 1);
     }
 
-    /*
     @SmallTest
     @Feature({"Precache"})
-    */
-    @DisabledTest(message = "crbug.com/648952")
+    @RetryOnFailure
     public void testTimeoutDoesNotCancelIfNotPrecaching() {
         assertFalse(mPrecacheController.isPrecaching());