Merge-59 [Payments] Fix metric log.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java
index f6640797dfd471d87eba435884f10f5ddec16e59..bfdbf6546f177bd24bbcf3f8d99277f0c003b18a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java
@@ -135,16 +135,9 @@ public class PaymentRequestCanMakePaymentMetricsTest extends PaymentRequestTestB
         // Initiate a payment request.
         triggerUIAndWait("queryShow", mReadyForInput);
 
-        // Press the back button.
-        int callCount = mDismissed.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                mUI.getDialogForTest().onBackPressed();
-            }
-        });
-        mDismissed.waitForCallback(callCount);
-        expectResultContains(new String[] {"Request cancelled"});
+        // Simulate an abort by the merchant.
+        clickNodeAndWait("abort", mDismissed);
+        expectResultContains(new String[] {"Abort"});
 
         // CanMakePayment was queried.
         assertEquals(1,
@@ -164,7 +157,7 @@ public class PaymentRequestCanMakePaymentMetricsTest extends PaymentRequestTestB
         assertEquals(1,
                 RecordHistogram.getHistogramValueCountForTesting(
                         "PaymentRequest.CanMakePayment.Used.TrueWithShowEffectOnCompletion",
-                        JourneyLogger.COMPLETION_STATUS_USER_ABORTED));
+                        JourneyLogger.COMPLETION_STATUS_OTHER_ABORTED));
     }
 
     /**