[Android] More @RetryOnFailure in chrome_public_test_apk.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.content.DialogInterface;
 import android.test.suitebuilder.annotation.MediumTest;
 
 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;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * A payment integration test for a merchant that requests payment via Bob Pay or cards.
@@ skipping 19 matching lines @@
                 "4111111111111111", "", "12", "2050", "visa", R.drawable.pr_visa, billingAddressId,
                 "" /* serverId */));
     }
 
     /**
      * If Bob Pay does not have any instruments, show [visa, mastercard]. Here the payment app
      * responds quickly.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testNoInstrumentsInFastBobPay() throws InterruptedException, ExecutionException,
             TimeoutException {
         runTest(NO_INSTRUMENTS, IMMEDIATE_RESPONSE);
     }
 
     /**
      * If Bob Pay does not have any instruments, show [visa, mastercard]. Here the payment app
      * responds slowly.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testNoInstrumentsInSlowBobPay() throws InterruptedException, ExecutionException,
             TimeoutException {
         runTest(NO_INSTRUMENTS, DELAYED_RESPONSE);
     }
 
     /**
      * If Bob Pay has instruments, show [bobpay, visa, mastercard]. Here the payment app responds
      * quickly.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testHaveInstrumentsInFastBobPay() throws InterruptedException, ExecutionException,
             TimeoutException {
         runTest(HAVE_INSTRUMENTS, IMMEDIATE_RESPONSE);
     }
 
     /**
      * If Bob Pay has instruments, show [bobpay, visa, mastercard]. Here the payment app responds
      * slowly.
      */
     @MediumTest
@@ skipping 28 matching lines @@
             expectResultContains(new String[]{"https://bobpay.com", "\"transaction\"", "1337"});
         } else {
             clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
             setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
             clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
             expectResultContains(new String[] {"Jon Doe", "4111111111111111", "12", "2050", "visa",
                     "123"});
         }
     }
 }