Mark flaky chrome_public tests with @RetryOnFailure Batch 4

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
index 80c145f5b8c258d19a9d406862d64f17fa972d1a..44521b328278c910bf0b5ea79ed7ac77d57c5ee3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java
@@ -11,6 +11,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 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.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
@@ -46,6 +47,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [X] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testCloseDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
@@ -56,6 +58,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [EDIT] to expand the dialog, then click [X] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testEditAndCloseDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
@@ -67,6 +70,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [EDIT] to expand the dialog, then click [CANCEL] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testEditAndCancelDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
@@ -78,6 +82,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [PAY] and dismiss the card unmask dialog. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
@@ -90,6 +95,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [PAY], type in "123" into the CVC dialog, then submit the payment. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testCancelUnmaskAndRetry()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -145,6 +151,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Save a new card on disk and pay. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testSaveNewCardAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
@@ -158,6 +165,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Use a temporary credit card to complete payment. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testAddTemporaryCardAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
@@ -175,6 +183,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Add a new card together with a new billing address and pay. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testSaveNewCardAndNewBillingAddressAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -205,6 +214,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Quickly pressing on "add card" and then [X] should not crash. */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testQuickAddCardAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -304,6 +314,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testQuickDismissAndPayShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -328,6 +339,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testQuickDismissAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -352,6 +364,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testQuickCloseAndDismissShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -377,6 +390,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
+    @RetryOnFailure
     public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
             TimeoutException {
         // Start the Payment Request.
@@ -392,6 +406,7 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
 
     /** Verifies the format of the billing address suggestions when adding a new credit card. */
     @MediumTest
+    @RetryOnFailure
     public void testNewCardBillingAddressFormat()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);