[Android] More @RetryOnFailure in chrome_public_test_apk.

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 6d6f797b04882381cf424b52794b9a226578b4f2..ab9fdcbc185b6e7786c0bec61a3a6fc73c2954a7 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,7 +11,6 @@ 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;
@@ -47,7 +46,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Click [X] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testCloseDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
@@ -58,7 +56,6 @@ 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);
@@ -70,7 +67,6 @@ 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);
@@ -82,7 +78,6 @@ 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);
@@ -95,7 +90,6 @@ 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);
@@ -151,7 +145,6 @@ 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);
@@ -165,7 +158,6 @@ 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);
@@ -183,7 +175,6 @@ 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);
@@ -214,7 +205,6 @@ 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);
@@ -314,7 +304,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickDismissAndPayShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -339,7 +328,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickDismissAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -364,7 +352,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickCloseAndDismissShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -390,7 +377,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
             TimeoutException {
         // Start the Payment Request.
@@ -407,7 +393,6 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
     /** Verifies the format of the billing address suggestions when adding a new credit card. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testNewCardBillingAddressFormat()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);