[Android] More @RetryOnFailure in chrome_public_test_apk.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
index b27f7f8a66937e1884d54422e24ea8f1b8c29dff..5ddb4d674465056fa194f0fb523e4186158e9151 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
@@ -10,7 +10,6 @@ import android.test.suitebuilder.annotation.MediumTest;
 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.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
@@ -44,7 +43,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Submit the shipping address to the merchant when the user clicks "Pay." */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
@@ -72,7 +70,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Add a valid address and complete the transaction. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testAddAddressAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -91,7 +88,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Change the country in the spinner, add a valid address, and complete the transaction. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testChangeCountryAddAddressAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -111,7 +107,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Quickly pressing on "add address" and then [X] should not crash. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickAddAddressAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -137,7 +132,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Quickly pressing on [X] and then "add address" should not crash. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickCloseAndAddAddressShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -161,7 +155,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     /** Quickly pressing on "add address" and then "cancel" should not crash. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickAddAddressAndCancelShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
@@ -213,7 +206,6 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
             TimeoutException {
         // Start the Payment Request.