Reland: Test dismissing CVC prompt for PaymentRequest

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 be7a627dc606c4274704b150251f7f117e30da39..a7343bdb6f116eae4c75c87fcf4e24f0d0e92bed 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
@@ -53,4 +53,14 @@ public class PaymentRequestNoShippingTest extends PaymentRequestTestBase {
         clickAndWait(R.id.button_secondary, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
+
+    @MediumTest
+    public void testPayAndCancelDialog() throws InterruptedException, ExecutionException,
+            TimeoutException {
+        triggerUIAndWait(mReadyToPay);
+        clickAndWait(R.id.button_primary, mReadyToUnmask);
+        cancelCardUnmaskDialogAndWait(mReadyToUnmask.getTarget(), mResultReady);
+        clickAndWait(R.id.ok_button, mDismissed);
+        expectResultContains(new String[] {"Request cancelled"});
+    }
 }