[Merge M-53] [Payments] Add metrics for Payment Request aborts.

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

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 30f47a928872984978e694c87153aa61275f52a6..97c70eb608b074754a9d2576b3c4b2a75d10c2dc 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
@@ -15,7 +15,7 @@ import android.widget.TextView;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.autofill.CardUnmaskPrompt;
 import org.chromium.chrome.browser.autofill.CardUnmaskPrompt.CardUnmaskObserverForTest;
 import org.chromium.chrome.browser.payments.PaymentAppFactory.PaymentAppFactoryAddition;
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReference;
 /**
  * A base integration test for payments.
  */
-abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeActivity>
+abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeTabbedActivity>
         implements PaymentRequestObserverForTest, PaymentRequestServiceObserverForTest,
         CardUnmaskObserverForTest {
     /** Flag for installing a payment app without instruments. */
@@ -84,7 +84,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
     private CardUnmaskPrompt mCardUnmaskPrompt;
 
     protected PaymentRequestTestBase(String testFileName) {
-        super(ChromeActivity.class);
+        super(ChromeTabbedActivity.class);
         mReadyForInput = new PaymentsCallbackHelper<>();
         mReadyToPay = new PaymentsCallbackHelper<>();
         mReadyToClose = new PaymentsCallbackHelper<>();
@@ -113,12 +113,17 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
 
     protected void triggerUIAndWait(PaymentsCallbackHelper<PaymentRequestUI> helper)
             throws InterruptedException, ExecutionException, TimeoutException {
-        triggerUIAndWait((CallbackHelper) helper);
+        triggerUIAndWait("buy", (CallbackHelper) helper);
         mUI = helper.getTarget();
     }
 
     protected void triggerUIAndWait(CallbackHelper helper)
             throws InterruptedException, ExecutionException, TimeoutException {
+        triggerUIAndWait("buy", helper);
+    }
+
+    protected void triggerUIAndWait(String nodeId, CallbackHelper helper)
+            throws InterruptedException, ExecutionException, TimeoutException {
         startMainActivityWithURL(mTestFilePath);
         onMainActivityStarted();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -132,7 +137,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
             }
         });
         assertWaitForPageScaleFactorMatch(1);
-        clickNodeAndWait("buy", helper);
+        clickNodeAndWait(nodeId, helper);
     }
 
     /** Clicks on an HTML node. */