Mark flaky chrome_public tests with @RetryOnFailure Batch 5

BUG=619055
TBR=tedchoc@chromium.org

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

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

@@ -10,6 +10,7 @@ import android.text.TextUtils;
 import org.chromium.base.BuildInfo;
 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.test.ChromeActivityTestCaseBase;
 
 import java.io.BufferedReader;
@@ -38,6 +39,7 @@ public class ProcessIsolationTest extends ChromeActivityTestCaseBase<ChromeActiv
     @MediumTest
     @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/517611")
     @Feature({"Browser", "Security"})
+    @RetryOnFailure
     public void testProcessIsolationForRenderers() throws InterruptedException {
         int tabsCount = getActivity().getCurrentTabModel().getCount();
         // The ActivityManager can be used to retrieve the current processes, but the reported UID

chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.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.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
@@ -25,6 +26,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Integration tests verifying that form resubmission dialogs are correctly displayed and handled.
  */
+@RetryOnFailure
 public class RepostFormWarningTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     // Active tab.
     private Tab mTab;

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

@@ -13,6 +13,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.UrlUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
@@ -102,6 +103,7 @@ public class SelectFileDialogTest extends ChromeActivityTestCaseBase<ChromeActiv
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     @MediumTest
     @Feature({"TextInput", "Main"})
+    @RetryOnFailure
     public void testSelectFileAndCancelRequest() throws Throwable {
         DOMUtils.clickNode(this, mContentViewCore, "input_file");
         CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());

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

@@ -13,6 +13,7 @@ import android.os.ParcelFileDescriptor;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ChromeFileProvider;
@@ -103,6 +104,7 @@ public class ShareIntentTest extends ChromeTabbedActivityTestBase {
     }
 
     @LargeTest
+    @RetryOnFailure
     public void testShareIntent() {
         final MockChromeActivity mockActivity = new MockChromeActivity(getActivity());
         // Sets a test component as last shared and "shareDirectly" option is set so that the share

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

@@ -19,6 +19,7 @@ import android.view.ViewGroup;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.CallbackHelper;
 
@@ -165,6 +166,7 @@ public class SmartClipProviderTest
 
     @MediumTest
     @Feature({"SmartClip"})
+    @RetryOnFailure
     public void testSmartClipDataCallback() throws InterruptedException, TimeoutException {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override

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

@@ -9,6 +9,7 @@ import android.widget.ImageButton;
 
 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.toolbar.TabSwitcherDrawable;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
@@ -39,6 +40,7 @@ public class TabCountLabelTest extends ChromeTabbedActivityTestBase {
     @MediumTest
     @Feature({"Browser", "Main"})
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
+    @RetryOnFailure
     public void testTabCountLabel() throws InterruptedException {
         final int tabCount = getActivity().getCurrentTabModel().getCount();
         tabCountLabelCheck("Initial state", tabCount);
@@ -56,4 +58,4 @@ public class TabCountLabelTest extends ChromeTabbedActivityTestBase {
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
-}
\ No newline at end of file
+}

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

@@ -9,6 +9,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.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
@@ -23,6 +24,7 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 /**
  * Tests for Tab class.
  */
+@RetryOnFailure
 public class TabTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private Tab mTab;
     private CallbackHelper mOnTitleUpdatedHelper;

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

@@ -10,6 +10,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.Restriction;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
@@ -77,6 +78,7 @@ public class TabThemeTest extends ChromeActivityTestCaseBase<ChromeTabbedActivit
     @Feature({"Toolbar-Theme-Color"})
     @MediumTest
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
+    @RetryOnFailure
     public void testThemeColorIsCorrect()
             throws ExecutionException, InterruptedException, TimeoutException {
 

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

@@ -24,6 +24,7 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.FlakyTest;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
@@ -45,6 +46,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Test the behavior of tabs when opening a URL from an external app.
  */
+@RetryOnFailure
 public class TabsOpenedFromExternalAppTest extends ChromeTabbedActivityTestBase {
     private static final String EXTERNAL_APP_1_ID = "app1";
     private static final String EXTERNAL_APP_2_ID = "app2";

chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java

@@ -18,6 +18,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 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.browser.ChromeActivity;
@@ -42,6 +43,7 @@ import java.util.concurrent.TimeUnit;
  * TODO(cimamoglu): Add a test with multiple, stacked onLayout/onWrite calls.
  * TODO(cimamoglu): Add a test which emulates Chromium failing to generate a PDF.
  */
+@RetryOnFailure
 public class PrintingControllerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     private static final String TEMP_FILE_NAME = "temp_print";

chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java

@@ -10,6 +10,7 @@ import android.net.Uri;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -91,6 +92,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
 
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testQueryBookmark() {
         final long now = System.currentTimeMillis();
         final long lastUpdateTime[] = { now, now - 1000 * 60 };
@@ -170,6 +172,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
 
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testUpdateBookmark() {
         final long now = System.currentTimeMillis();
         final long lastUpdateTime[] = { now, now - 1000 * 60 };
@@ -221,6 +224,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
 
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testDeleteBookmark() {
         final long now = System.currentTimeMillis();
         final long lastUpdateTime[] = { now, now - 1000 * 60 };

chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java

@@ -10,6 +10,7 @@ import android.net.Uri;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 
 import java.util.Date;
 
@@ -42,6 +43,7 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
 
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testAddSearchTerm() {
         long searchTime = System.currentTimeMillis();
         String searchTerm = "chrome";
@@ -92,6 +94,7 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
 
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testDeleteSearchTerm() {
         long[] searchTime = { System.currentTimeMillis(), System.currentTimeMillis() - 1000 };
         String[] searchTerm = {"chrome", "chromium"};
@@ -126,6 +129,7 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
     // Copied from CTS test with minor adaptations.
     @MediumTest
     @Feature({"Android-ContentProvider"})
+    @RetryOnFailure
     public void testSearchesTable() {
         final int idIndex = 0;
         String insertSearch = "search_insert";

chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

@@ -18,6 +18,7 @@ import android.util.Pair;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.infobar.InfoBar;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.notifications.NotificationTestBase;
@@ -188,6 +189,7 @@ public class PushMessagingTest
      */
     @MediumTest
     @Feature({"Browser", "PushMessaging"})
+    @RetryOnFailure
     public void testPushAndShowNotification() throws InterruptedException, TimeoutException {
         setNotificationContentSettingForCurrentOrigin(ContentSetting.ALLOW);
         runScriptAndWaitForTitle("subscribePush()", "subscribe ok");
@@ -206,6 +208,7 @@ public class PushMessagingTest
      */
     @LargeTest
     @Feature({"Browser", "PushMessaging"})
+    @RetryOnFailure
     public void testDefaultNotification() throws InterruptedException, TimeoutException {
         // Start off using the tab loaded in setUp().
         assertEquals(1, getActivity().getCurrentTabModel().getCount());

chrome/android/javatests/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceTest.java

@@ -9,6 +9,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.browser.search_engines.TemplateUrlService.LoadListener;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
 import org.chromium.chrome.test.util.ApplicationData;
@@ -48,6 +49,7 @@ public class TemplateUrlServiceTest extends NativeLibraryTestBase {
 
     @SmallTest
     @Feature({"ContextualSearch"})
+    @RetryOnFailure
     public void testUrlForContextualSearchQueryValid()
             throws InterruptedException, ExecutionException {
         waitForTemplateUrlServiceToLoad();
@@ -90,6 +92,7 @@ public class TemplateUrlServiceTest extends NativeLibraryTestBase {
 
     @SmallTest
     @Feature({"SearchEngines"})
+    @RetryOnFailure
     public void testLoadUrlService() throws InterruptedException {
         assertFalse(ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Boolean>() {
             @Override

chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java

@@ -12,6 +12,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.util.ApplicationData;
 import org.chromium.components.sync.signin.AccountManagerHelper;
@@ -359,6 +360,7 @@ public class OAuth2TokenServiceIntegrationTest extends NativeLibraryTestBase {
 
     @MediumTest
     @UiThreadTest
+    @RetryOnFailure
     public void testValidateAccountsTwoAccountsThenRemoveAllSignOut() {
         // Add accounts.
         mAccountManager.addAccountHolderExplicitly(TEST_ACCOUNT_HOLDER_1);

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java

@@ -10,6 +10,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker;
 import org.chromium.components.sync.signin.AccountManagerHelper;
 import org.chromium.components.sync.signin.ChromeSigninController;
@@ -35,6 +36,7 @@ public class SigninHelperTest extends InstrumentationTestCase {
     }
 
     @SmallTest
+    @RetryOnFailure
     public void testAccountsChangedPref() {
         assertEquals("Should never return true before the pref has ever been set.",
                 false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
@@ -91,6 +93,7 @@ public class SigninHelperTest extends InstrumentationTestCase {
     }
 
     @SmallTest
+    @RetryOnFailure
     public void testNotSignedInAccountRename2() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("B", "C");
@@ -100,6 +103,7 @@ public class SigninHelperTest extends InstrumentationTestCase {
     }
 
     @SmallTest
+    @RetryOnFailure
     public void testChainedAccountRename2() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("Z", "Y"); // Unrelated.

chrome/android/javatests/src/org/chromium/chrome/browser/snackbar/SnackbarTest.java

@@ -8,6 +8,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.content.browser.test.util.Criteria;
@@ -77,6 +78,7 @@ public class SnackbarTest extends ChromeTabbedActivityTestBase {
     }
 
     @SmallTest
+    @RetryOnFailure
     public void testQueueStackOrder() throws InterruptedException {
         final Snackbar stackbar = Snackbar.make("stack", mDefaultController,
                 Snackbar.TYPE_ACTION, Snackbar.UMA_TEST_SNACKBAR);

chrome/android/javatests/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderTest.java

@@ -13,6 +13,7 @@ import android.os.RemoteException;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.childaccounts.ChildAccountService;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
@@ -26,6 +27,7 @@ import java.util.concurrent.ExecutionException;
 /**
  * Instrumentation test for SupervisedUserContentProvider.
  */
+@RetryOnFailure
 public class SupervisedUserContentProviderTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final String DEFAULT_ACCOUNT = "test@gmail.com";
     private static final String AUTHORITY_SUFFIX = ".SupervisedUserProvider";

chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java

@@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
@@ -27,6 +28,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Tests for InterceptNavigationDelegate
  */
+@RetryOnFailure
 public class InterceptNavigationDelegateTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final String BASE_PAGE = "/chrome/test/data/navigation_interception/";
     private static final String NAVIGATION_FROM_TIMEOUT_PAGE =

chrome/android/javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java

@@ -8,12 +8,14 @@ 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.browser.ChromeActivity;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 
 /**
  * Tests related to the sad tab logic.
  */
+@RetryOnFailure
 public class SadTabTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     public SadTabTest() {

chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabRedirectHandlerTest.java

@@ -17,6 +17,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.ui.base.PageTransition;
 
 import java.net.URISyntaxException;
@@ -311,6 +312,7 @@ public class TabRedirectHandlerTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"IntentHandling"})
+    @RetryOnFailure
     public void testNavigationFromLinkWithoutUserGesture() {
         TabRedirectHandler handler = new TabRedirectHandler(mContext);
         handler.updateIntent(sYtIntent);
@@ -342,6 +344,7 @@ public class TabRedirectHandlerTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"IntentHandling"})
+    @RetryOnFailure
     public void testNavigationFromReload() {
         TabRedirectHandler handler = new TabRedirectHandler(mContext);
         handler.updateIntent(sYtIntent);
@@ -373,6 +376,7 @@ public class TabRedirectHandlerTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"IntentHandling"})
+    @RetryOnFailure
     public void testNavigationWithForwardBack() {
         TabRedirectHandler handler = new TabRedirectHandler(mContext);
         handler.updateIntent(sYtIntent);

chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java

@@ -10,6 +10,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.MetricsUtils.HistogramDelta;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
@@ -23,6 +24,7 @@ import java.util.concurrent.ExecutionException;
 /**
  * Tests for Tab-related histogram collection.
  */
+@RetryOnFailure
 public class TabUmaTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     private static final String TEST_PATH = "/chrome/test/data/android/about.html";

chrome/android/javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java

@@ -10,6 +10,7 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import org.chromium.base.ThreadUtils;
 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.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -53,6 +54,7 @@ public class UndoIntegrationTest extends ChromeTabbedActivityTestBase {
      */
     @LargeTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+    @RetryOnFailure
     public void testAddNewContentsFromClosingTab() throws InterruptedException, TimeoutException {
         loadUrl(WINDOW_OPEN_BUTTON_URL);
 

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/ContextMenuLoadUrlParamsTest.java

@@ -9,6 +9,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.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
@@ -26,6 +27,7 @@ import java.util.regex.Pattern;
 /**
  * Verifies URL load parameters set when triggering navigations from the context menu.
  */
+@RetryOnFailure
 public class ContextMenuLoadUrlParamsTest extends ChromeTabbedActivityTestBase {
     private static final String HTML_PATH =
             "/chrome/test/data/android/contextmenu/context_menu_test.html";

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelTest.java

@@ -8,6 +8,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.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
@@ -50,6 +51,7 @@ public class IncognitoTabModelTest extends ChromeTabbedActivityTestBase {
      */
     @SmallTest
     @Feature({"OffTheRecord"})
+    @RetryOnFailure
     public void testCloseAllDuringAddTabDoesNotCrash() {
         createTabOnUiThread();
         assertEquals(1, mTabModel.getCount());

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java

@@ -15,6 +15,7 @@ import org.chromium.base.annotations.SuppressFBWarnings;
 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 org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
@@ -253,6 +254,7 @@ public class RestoreMigrateTest extends InstrumentationTestCase {
      */
     @SmallTest
     @Feature({"TabPersistentStore"})
+    @RetryOnFailure
     public void testFindsMaxIdProperly() throws IOException {
         TabModelSelector selector0 = new MockTabModelSelector(1, 1, null);
         TabModelSelector selector1 = new MockTabModelSelector(1, 1, null);

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java

@@ -16,6 +16,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelper;
@@ -595,6 +596,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
      */
     @SmallTest
     @Feature({"TabPersistentStore"})
+    @RetryOnFailure
     public void testUndoCloseAllTabsWritesTabListFile() throws Exception {
         final TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
         mMockDirectory.writeTabModelFiles(info, true);

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java

@@ -14,6 +14,7 @@ import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 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.browser.ChromeTabbedActivity2;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtilsTest;
@@ -376,6 +377,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testSingleTab() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(false);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(false);
@@ -615,6 +617,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testInOrderRestore() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(false);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(false);
@@ -926,6 +929,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testOutOfOrder1() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(false);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(false);
@@ -1259,6 +1263,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testMoveTab() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(false);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(false);
@@ -1381,6 +1386,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testUndoNotSupported() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(true);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(true);
@@ -1458,6 +1464,7 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
      * @throws InterruptedException
      */
     @MediumTest
+    @RetryOnFailure
     public void testOpenRecentlyClosedTab() throws InterruptedException {
         TabModelSelector selector = getActivity().getTabModelSelector();
         TabModel model = selector.getModel(false);

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

@@ -16,6 +16,7 @@ import org.chromium.base.SysUtils;
 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.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
@@ -34,6 +35,7 @@ import java.util.concurrent.Callable;
 /**
  * Contains tests for the brand color feature.
  */
+@RetryOnFailure
 public class BrandColorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     public BrandColorTest() {

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarModelTest.java

@@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 import junit.framework.Assert;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.tab.Tab;
@@ -31,6 +32,7 @@ public class ToolbarModelTest extends ChromeTabbedActivityTestBase {
      */
     @Feature({"Android-Toolbar"})
     @MediumTest
+    @RetryOnFailure
     public void testClosingLastTabReflectedInModel() throws InterruptedException {
         assertNotSame("No current tab", Tab.INVALID_TAB_ID,
                 getCurrentTabId(getActivity()));