Reland: Test dismissing CVC prompt for PaymentRequest

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.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 org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
@@ skipping 18 matching lines @@
 
 /**
  * A base integration test for payments.
  */
 @CommandLineFlags.Add({ChromeSwitches.EXPERIMENTAL_WEB_PLAFTORM_FEATURES})
 abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeActivity>
         implements PaymentRequestObserverForTest, CardUnmaskObserverForTest {
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyForInput;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyToPay;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyToClose;
+    protected final PaymentsCallbackHelper<PaymentRequestUI> mResultReady;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyToUnmask;
     protected final CallbackHelper mDismissed;
     private final AtomicReference<ContentViewCore> mViewCoreRef;
     private final AtomicReference<WebContents> mWebContentsRef;
     private final String mTestFilePath;
     private PaymentRequestUI mUI;
 
     protected PaymentRequestTestBase(String testFileName) {
         super(ChromeActivity.class);
         mReadyForInput = new PaymentsCallbackHelper<>();
         mReadyToPay = new PaymentsCallbackHelper<>();
         mReadyToClose = new PaymentsCallbackHelper<>();
+        mResultReady = new PaymentsCallbackHelper<>();
         mReadyToUnmask = new PaymentsCallbackHelper<>();
         mDismissed = new CallbackHelper();
         mViewCoreRef = new AtomicReference<>();
         mWebContentsRef = new AtomicReference<>();
         mTestFilePath = UrlUtils.getIsolatedTestFilePath(
                 String.format("chrome/test/data/android/payments/%s", testFileName));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {}
@@ skipping 87 matching lines @@
         mReadyToPay.notifyCalled(ui);
     }
 
     @Override
     public void onPaymentRequestReadyToClose(PaymentRequestUI ui) {
         ThreadUtils.assertOnUiThread();
         mReadyToClose.notifyCalled(ui);
     }
 
     @Override
+    public void onPaymentRequestResultReady(PaymentRequestUI ui) {
+        ThreadUtils.assertOnUiThread();
+        mResultReady.notifyCalled(ui);
+    }
+
+
+    @Override
     public void onPaymentRequestDismiss() {
         ThreadUtils.assertOnUiThread();
         mDismissed.notifyCalled();
     }
 
     @Override
     public void onCardUnmaskReadyForInput(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyToUnmask.notifyCalled(prompt);
     }
@@ skipping 18 matching lines @@
          *
          * @param ui The UI that is ready for input.
          */
         public void notifyCalled(T target) {
             ThreadUtils.assertOnUiThread();
             mTarget = target;
             notifyCalled();
         }
     }
 }