Mark flaky content tests with @RetryOnFailure

content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
index d5fbd4d26f5350c7f20b15d1f815281dfe75fc52..446bfc8ee90a766d237fa07cd025bd3432e31f65 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
@@ -12,6 +12,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentViewCore.InternalAccessDelegate;
 import org.chromium.content.browser.test.util.Criteria;
@@ -162,6 +163,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
 
     @SmallTest
     @Feature({"Main"})
+    @RetryOnFailure
     public void testFling() throws Throwable {
         // Scaling the initial velocity by the device scale factor ensures that
         // it's of sufficient magnitude for all displays densities.
@@ -193,6 +195,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
     @SmallTest
     @RerunWithUpdatedContainerView
     @Feature({"Main"})
+    @RetryOnFailure
     public void testScrollTo() throws Throwable {
         // Vertical scroll to lower-left.
         scrollTo(0, 2500);
@@ -218,6 +221,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
     @SmallTest
     @RerunWithUpdatedContainerView
     @Feature({"Main"})
+    @RetryOnFailure
     public void testScrollBy() throws Throwable {
         scrollTo(0, 0);
         assertWaitForScroll(true, true);
@@ -282,6 +286,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
     @SmallTest
     @RerunWithUpdatedContainerView
     @Feature({"Main"})
+    @RetryOnFailure
     public void testOverScroll() throws Throwable {
         // Overscroll lower-left.
         scrollTo(-10000, 10000);