Mark flaky chrome_public tests with @RetryOnFailure Batch 6

BUG=619055
TBR=tedchoc@chromium.org

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

chrome/android/javatests/src/org/chromium/chrome/browser/UrlSchemeTest.java

@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -23,6 +24,7 @@ import java.util.concurrent.Callable;
 
 
 /** Test suite for different Android URL schemes. */
+@RetryOnFailure
 public class UrlSchemeTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     public UrlSchemeTest() {

chrome/android/javatests/src/org/chromium/chrome/browser/UsbChooserDialogTest.java

@@ -11,6 +11,7 @@ import android.widget.Button;
 import android.widget.ListView;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
@@ -24,6 +25,7 @@ import java.util.concurrent.Callable;
 /**
  * Tests for the UsbChooserDialog class.
  */
+@RetryOnFailure
 public class UsbChooserDialogTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     /**
      * Works like the UsbChooserDialog class, but records calls to native methods instead of

chrome/android/javatests/src/org/chromium/chrome/browser/video/VideoTest.java

@@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -30,6 +31,7 @@ public class VideoTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     @DisableIf.Build(sdk_is_less_than = 19, message = "crbug.com/582067")
     @Feature({"Media", "Media-Video", "Main"})
     @LargeTest
+    @RetryOnFailure
     public void testLoadMediaUrl() throws InterruptedException, TimeoutException {
         EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartFileServer(
                 getInstrumentation().getContext(), Environment.getExternalStorageDirectory());

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ActivityAssignerTest.java

@@ -12,6 +12,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -78,6 +79,7 @@ public class ActivityAssignerTest extends InstrumentationTestCase {
     @UiThreadTest
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testCorruptedPreferences() {
         String wrongVariableType = "omgwtfbbq";
         int index = ActivityAssigner.WEBAPP_NAMESPACE;

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java

@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
@@ -46,6 +47,7 @@ public class AddToHomescreenDialogTest extends ChromeActivityTestCaseBase<Chrome
 
     @SmallTest
     @Feature("{Webapp}")
+    @RetryOnFailure
     public void testSmoke() throws InterruptedException {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java

@@ -15,6 +15,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
@@ -33,6 +34,7 @@ import java.util.concurrent.Callable;
 /**
  * Tests org.chromium.chrome.browser.webapps.AddToHomescreenManager and its C++ counterpart.
  */
+@RetryOnFailure
 public class AddToHomescreenManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final String WEBAPP_ACTION_NAME = "WEBAPP_ACTION";
 

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcherTest.java

@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.chrome.test.util.browser.TabLoadObserver;
@@ -121,6 +122,7 @@ public class ManifestUpgradeDetectorFetcherTest extends ChromeTabbedActivityTest
      */
     @MediumTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testLaunchWithDifferentManifestUrl() throws Exception {
         CallbackWaiter waiter = new CallbackWaiter();
         startManifestUpgradeDetectorFetcher(mTestServer.getURL(WEB_MANIFEST_SCOPE),

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

@@ -14,6 +14,7 @@ import android.view.View;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ChromeActivity;
@@ -41,6 +42,7 @@ import org.chromium.content_public.common.ScreenOrientationValues;
  * FLAG_ACTIVITY_NEW_DOCUMENT mechanism.  Moreover, we don't have access to the task list pre-L so
  * we have to assume that any non-running WebappActivities are not listed in Android's Overview.
  */
+@RetryOnFailure
 public class WebappModeTest extends MultiActivityTestBase {
     private static final String WEBAPP_1_ID = "webapp_id_1";
     private static final String WEBAPP_1_URL = UrlUtils.encodeHtmlDataUri(

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenHomescreenIconTest.java

@@ -13,6 +13,7 @@ import android.widget.ImageView;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.metrics.WebappUma;
@@ -48,6 +49,7 @@ public class WebappSplashScreenHomescreenIconTest extends WebappActivityTestBase
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testUmaFallbackIcon() {
         assertEquals(1, RecordHistogram.getHistogramValueCountForTesting(
                 WebappUma.HISTOGRAM_SPLASHSCREEN_ICON_TYPE,

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenTest.java

@@ -22,6 +22,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.metrics.WebappUma;
@@ -53,6 +54,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testDefaultBackgroundColor() throws Exception {
         startWebappActivity();
         ViewGroup splashScreen = waitUntilSplashScreenAppears();
@@ -66,6 +68,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
     @SmallTest
     @Feature({"Webapps"})
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @RetryOnFailure
     public void testThemeColorWhenNotSpecified() throws Exception {
         startWebappActivity();
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
@@ -75,6 +78,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testHidesAfterFirstPaint() throws Exception {
         startWebappActivity();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
@@ -91,6 +95,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testHidesAfterCrash() throws Exception {
         startWebappActivity();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
@@ -107,6 +112,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testHidesAfterLoadCompletes() throws Exception {
         startWebappActivity();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
@@ -139,6 +145,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testHidesAfterMultipleEvents() throws Exception {
         startWebappActivity();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
@@ -159,6 +166,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testUmaOnNativeLoad() throws Exception {
         startWebappActivity();
 
@@ -192,6 +200,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testUmaWhenSplashHides() throws Exception {
         startWebappActivity();
         ThreadUtils.runOnUiThread(new Runnable() {
@@ -220,6 +229,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testRegularSplashScreenAppears() throws Exception {
         // Register a properly-sized icon for the splash screen.
         Context context = getInstrumentation().getTargetContext();
@@ -246,6 +256,7 @@ public class WebappSplashScreenTest extends WebappActivityTestBase {
 
     @SmallTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testSmallSplashScreenAppears() throws Exception {
         // Register a smaller icon for the splash screen.
         Context context = getInstrumentation().getTargetContext();

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java

@@ -13,6 +13,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.metrics.WebappUma;
 import org.chromium.chrome.browser.tab.TabTestUtils;
@@ -54,6 +55,7 @@ public class WebappSplashScreenThemeColorTest extends WebappActivityTestBase {
     @SmallTest
     @Feature({"Webapps"})
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @RetryOnFailure
     public void testThemeColorNotUsedIfPagesHasOne() throws InterruptedException {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java

@@ -9,6 +9,7 @@ import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 
@@ -36,6 +37,7 @@ public class WebappUrlBarTest extends WebappActivityTestBase {
     @UiThreadTest
     @MediumTest
     @Feature({"Webapps"})
+    @RetryOnFailure
     public void testUrlDisplay() {
         final String scheme = "https://";
         final String host = "lorem.com";

chrome/android/javatests/src/org/chromium/chrome/browser/widget/OverviewListLayoutTest.java

@@ -15,6 +15,7 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutTab;
@@ -176,6 +177,7 @@ public class OverviewListLayoutTest extends ChromeTabbedActivityTestBase {
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
     @MediumTest
     @Feature({"Accessibility"})
+    @RetryOnFailure
     public void testCanCloseWithCloseButton() throws InterruptedException, TimeoutException {
         setupTabs();
 
@@ -311,6 +313,7 @@ public class OverviewListLayoutTest extends ChromeTabbedActivityTestBase {
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
     @MediumTest
     @Feature({"Accessibility"})
+    @RetryOnFailure
     public void testCloseAllIncognito() throws InterruptedException {
         setupTabs();
         newIncognitoTabsFromMenu(2);
@@ -391,6 +394,7 @@ public class OverviewListLayoutTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"Accessibility"})
+    @RetryOnFailure
     public void testObservesTitleChanges() throws Exception {
         loadUrl(PAGE_1_HTML);
 

chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java

@@ -13,6 +13,7 @@ import android.view.View;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
@@ -33,6 +34,7 @@ import java.util.concurrent.atomic.AtomicReference;
 /**
  * Tests related to the ToolbarProgressBar.
  */
+@RetryOnFailure
 public class ToolbarProgressBarTest extends ChromeActivityTestCaseBase<ChromeTabbedActivity> {
 
     static final int TEST_WAIT_TIME_MS = 60000;

chrome/android/javatests/src/org/chromium/chrome/browser/widget/findinpage/FindTest.java

@@ -26,6 +26,7 @@ import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.chrome.test.util.MenuUtils;
@@ -150,6 +151,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage", "Main"})
+    @RetryOnFailure
     public void testFind() throws InterruptedException {
         loadTestAndVerifyFindInPage("pitts", "1/7");
     }
@@ -159,6 +161,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testFind101() throws InterruptedException {
         loadTestAndVerifyFindInPage("it", "1/101");
     }
@@ -168,6 +171,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testFindMultiLine() throws InterruptedException {
         String multiLineSearchTerm = "This is the text of this document.\n"
                 + " I am going to write the word \'Pitts\' 7 times. (That was one.)";
@@ -180,6 +184,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testFindMultiLineFalse() throws InterruptedException {
         String multiLineSearchTerm = "aThis is the text of this document.\n"
                 + " I am going to write the word \'Pitts\' 7 times. (That was one.)";
@@ -191,6 +196,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testFindNext() throws InterruptedException {
         String query = "pitts";
         loadTestAndVerifyFindInPage(query, "1/7");
@@ -220,6 +226,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
 
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testResultsBarInitiallyVisible() throws InterruptedException {
         loadUrl(mTestServer.getURL(FILEPATH));
         findInPageFromMenu();
@@ -231,6 +238,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
 
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testResultsBarVisibleAfterTypingText() throws InterruptedException {
         loadUrl(mTestServer.getURL(FILEPATH));
         findInPageFromMenu();
@@ -289,6 +297,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testFipTextNotRestoredIncognitoTab() throws InterruptedException {
         newIncognitoTabFromMenu();
         loadTestAndVerifyFindInPage("pitts", "1/7");
@@ -311,6 +320,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @SmallTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testPastedTextStylingRemoved() throws InterruptedException {
         loadUrl(mTestServer.getURL(FILEPATH));
         findInPageFromMenu();
@@ -365,6 +375,7 @@ public class FindTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"FindInPage"})
+    @RetryOnFailure
     public void testBackKeyDismissesFind() throws InterruptedException {
         loadUrl(mTestServer.getURL(FILEPATH));
         findInPageFromMenu();

chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java

@@ -10,6 +10,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.test.util.EnormousTest;
 import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.parameter.Parameter;
 import org.chromium.base.test.util.parameter.ParameterizedTest;
 import org.chromium.base.test.util.parameter.parameters.MethodParameter;
@@ -44,6 +45,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     }
 
     @SmallTest
+    @RetryOnFailure
     public void testNoParameterizedTestAnnotation() {
         assertFalse("This is a parameterized test when it should not be.", getParameterReader()
                 .isParameterizedTest());
@@ -55,6 +57,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
 
     @SmallTest
     @ParameterizedTest()
+    @RetryOnFailure
     public void testEmptyParameterizedTestAnnotation() {
         assertTrue("This is not a parameterized test.", getParameterReader()
                 .isParameterizedTest());
@@ -66,6 +69,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
 
     @SmallTest
     @ParameterizedTest(parameters = {})
+    @RetryOnFailure
     public void testParameterizedTestWithEmptyParameters() {
         assertTrue("This is not a parameterized test.", getParameterReader()
                 .isParameterizedTest());
@@ -77,6 +81,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
 
     @SmallTest
     @ParameterizedTest(parameters = {})
+    @RetryOnFailure
     public void testParameterDoesNotExist() {
         Parameter parameter = getParameterReader().getParameter(MethodParameter.PARAMETER_TAG);
         assertNull("method-parameter should not exist.", parameter);
@@ -84,6 +89,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
 
     @SmallTest
     @ParameterizedTest(parameters = {@Parameter(tag = MethodParameter.PARAMETER_TAG)})
+    @RetryOnFailure
     public void testGetParameter() {
         String expected = "method-parameter";
         String actual = getParameterReader().getParameter(MethodParameter.PARAMETER_TAG).tag();
@@ -92,6 +98,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
 
     @SmallTest
     @ParameterizedTest(parameters = {@Parameter(tag = MethodParameter.PARAMETER_TAG)})
+    @RetryOnFailure
     public void testParameterArgumentDoesNotExist() {
         Parameter.Argument actual = getArgument("arg");
         assertNull("arg should not exist.", actual);
@@ -101,6 +108,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     @ParameterizedTest(parameters = {
             @Parameter(tag = MethodParameter.PARAMETER_TAG,
                     arguments = {@Parameter.Argument(name = "string", stringVar = "value")})})
+    @RetryOnFailure
     public void testMethodParametersWithOneStringValue() {
         String expected = "value";
         String actual = getArgument("string").stringVar();
@@ -111,6 +119,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     @ParameterizedTest(parameters = {
             @Parameter(tag = MethodParameter.PARAMETER_TAG,
                     arguments = {@Parameter.Argument(name = "int", intVar = 0)})})
+    @RetryOnFailure
     public void testMethodParametersWithOneIntValue() {
         int expected = 0;
         int actual = getArgument("int").intVar();
@@ -123,6 +132,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                     arguments = {
                             @Parameter.Argument(name = "intArray", intArray = {5, 10, -6, 0, -1})})
             })
+    @RetryOnFailure
     public void testMethodParametersWithOneIntArrayValue() {
         int[] expected = new int[] {5, 10, -6, 0, -1};
         int[] actual = getArgument("intArray").intArray();
@@ -136,6 +146,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
             @Parameter(tag = MethodParameter.PARAMETER_TAG,
                     arguments = {@Parameter.Argument(name = "stringArray", stringArray = {
                             "apple", "banana", "orange", "melon", "lemon"})})})
+    @RetryOnFailure
     public void testMethodParametersWithOneStringArrayValue() {
         String[] expected = new String[] {"apple", "banana", "orange", "melon", "lemon"};
         String[] actual = getArgument("stringArray").stringArray();
@@ -159,6 +170,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                             @Parameter.Argument(name = "intArray1", intArray = {
                                     2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37}),
                             @Parameter.Argument(name = "intArray2", intArray = {4})})})
+    @RetryOnFailure
     public void testMethodParametersWithMultipleArguments1() {
         String stringVar = getArgument("string1").stringVar();
         assertEquals(mismatchMessage("string1"), "has vowel", stringVar);
@@ -198,6 +210,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                             @Parameter.Argument(name = "string2", stringVar = "blahblah"),
                             @Parameter.Argument(name = "int1", intVar = 4),
                             @Parameter.Argument(name = "int2", intVar = 0)})})
+    @RetryOnFailure
     public void testMethodParametersWithMultipleArguments2() {
         assertEquals("bar variable should equals \"testvalue\"", "testvalue",
                 getArgument("string1").stringVar());
@@ -219,6 +232,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                                     @Parameter.Argument(name = "string2", stringVar = "blahblah"),
                                     @Parameter.Argument(name = "int1", intVar = 4),
                                     @Parameter.Argument(name = "int2", intVar = 0)})})})
+    @RetryOnFailure
     public void testParameterArgumentsWithParameterSetOfOneTest() {
         assertEquals("bar variable should equals \"testvalue\"", "testvalue",
                 getArgument("string1").stringVar());
@@ -300,6 +314,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                             arguments = {
                                     @Parameter.Argument(name = "input", intVar = 10),
                                     @Parameter.Argument(name = "output", intVar = 34)})})})
+    @RetryOnFailure
     public void testParameterArgumentsWithParameterSetOfMoreThanOneTest() {
         int input = getArgument("input").intVar();
         int expected = getArgument("output").intVar();
@@ -326,6 +341,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                                             intArray = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}),
                                     @Parameter.Argument(name = "expected",
                                             intArray = {0, 1, 1, 2, 3, 5, 8, 13, 21, 34})})})})
+    @RetryOnFailure
     public void testSingleTestParameterArgumentsWithParameterSet() {
         int[] input = getArgument("input").intArray();
         int[] expected = getArgument("expected").intArray();
@@ -352,6 +368,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
                                     intArray = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}),
                             @Parameter.Argument(name = "expected",
                                     intArray = {0, 1, 1, 2, 3, 5, 8, 13, 21, 34})})})
+    @RetryOnFailure
     public void testSingleTestParameterArgumentsWithoutParameterSet() {
         int[] input = getArgument("input").intArray();
         int[] expected = getArgument("expected").intArray();
@@ -392,6 +409,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
      * TODO (crbug.com/522503): Merge tests together when this is fixed.
      */
     @SmallTest
+    @RetryOnFailure
     public void testActivityIsNotSignedInOnAppOrFakeOSorGoogleOS() {
         assertFalse("Should not be signed into app.",
                 mAddFakeAccountToAppParameter.isSignedIn());
@@ -404,6 +422,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     @SmallTest
     @ParameterizedTest(parameters = {
             @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG)})
+    @RetryOnFailure
     public void testIsSignedInOnApp() {
         assertTrue("Should not be signed into app.",
                 mAddFakeAccountToAppParameter.isSignedIn());
@@ -416,6 +435,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     @SmallTest
     @ParameterizedTest(parameters = {
             @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG)})
+    @RetryOnFailure
     public void testIsSignedInOnFakeOS() {
         assertFalse("Should not be signed in on app.",
                 mAddFakeAccountToAppParameter.isSignedIn());
@@ -451,6 +471,7 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
     @ParameterizedTest(parameters = {
             @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG),
             @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG)})
+    @RetryOnFailure
     public void testIsSignedInOnFakeOSandApp() {
         assertTrue("Should be signed in on app.",
                 mAddFakeAccountToAppParameter.isSignedIn());

chrome/android/javatests/src/org/chromium/chrome/test/util/parameters/SigninParametersTest.java

@@ -10,6 +10,7 @@ import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.EnormousTest;
 import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.parameter.Parameter;
 import org.chromium.base.test.util.parameter.ParameterizedTest;
 import org.chromium.chrome.browser.ChromeActivity;
@@ -18,6 +19,7 @@ import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 /**
  * Tester class for implementation of Signin testing and ParameterizedTest.
  */
+@RetryOnFailure
 public class SigninParametersTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final String GOOGLE_ACCOUNT_USERNAME = "chromiumforandroid01@gmail.com";
     private static final String GOOGLE_ACCOUNT_PASSWORD = "chromeforandroid";

components/sync/android/javatests/src/org/chromium/components/sync/notifier/InvalidationPreferencesTest.java

@@ -12,6 +12,7 @@ import com.google.ipc.invalidation.external.client.types.ObjectId;
 
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -21,6 +22,7 @@ import java.util.Set;
  *
  * @author dsmyers@google.com (Daniel Myers)
  */
+@RetryOnFailure
 public class InvalidationPreferencesTest extends InstrumentationTestCase {
     @SmallTest
     @Feature({"Sync"})