| Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
|
| index 7f2f0473a5f7c171d260348de633b2ccb7eba9b0..5fdee6ede98e2e46ddf4165b47609f90a1212eaa 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
|
| @@ -57,6 +57,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
|
| protected final CallbackHelper mDismissed;
|
| protected final CallbackHelper mUnableToAbort;
|
| protected final CallbackHelper mBillingAddressChangeProcessed;
|
| + protected final CallbackHelper mShowFailed;
|
| protected PaymentRequestUI mUI;
|
|
|
| private final AtomicReference<ContentViewCore> mViewCoreRef;
|
| @@ -78,6 +79,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
|
| mDismissed = new CallbackHelper();
|
| mUnableToAbort = new CallbackHelper();
|
| mBillingAddressChangeProcessed = new CallbackHelper();
|
| + mShowFailed = new CallbackHelper();
|
| mViewCoreRef = new AtomicReference<>();
|
| mWebContentsRef = new AtomicReference<>();
|
| mTestFilePath = UrlUtils.getIsolatedTestFilePath(
|
| @@ -92,6 +94,12 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
|
|
|
| protected void triggerUIAndWait(PaymentsCallbackHelper<PaymentRequestUI> helper)
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| + triggerUIAndWait((CallbackHelper) helper);
|
| + mUI = helper.getTarget();
|
| + }
|
| +
|
| + protected void triggerUIAndWait(CallbackHelper helper)
|
| + throws InterruptedException, ExecutionException, TimeoutException {
|
| startMainActivityWithURL(mTestFilePath);
|
| onMainActivityStarted();
|
| ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| @@ -106,7 +114,6 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
|
| });
|
| assertWaitForPageScaleFactorMatch(1);
|
| clickNodeAndWait("buy", helper);
|
| - mUI = helper.getTarget();
|
| }
|
|
|
| /** Clicks on an HTML node. */
|
| @@ -480,6 +487,12 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
|
| }
|
|
|
| @Override
|
| + public void onPaymentRequestServiceShowFailed() {
|
| + ThreadUtils.assertOnUiThread();
|
| + mShowFailed.notifyCalled();
|
| + }
|
| +
|
| + @Override
|
| public void onCardUnmaskPromptReadyForInput(CardUnmaskPrompt prompt) {
|
| ThreadUtils.assertOnUiThread();
|
| mReadyForUnmaskInput.notifyCalled(prompt);
|
|
|