[Payments] Use C++ metric enums in Java.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java
index b9a00f31feb57814f61e8b9257c727c9ed50e4f0..37c8e64990a578562a87ee38978e9987c7689bb7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java
@@ -128,8 +128,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         mPaymentRequestTestRule.getDismissed().waitForCallback(callCount);
         mPaymentRequestTestRule.expectResultContains(new String[] {"Request cancelled"});
 
-        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(
-                JourneyLogger.ABORT_REASON_ABORTED_BY_USER);
+        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(AbortReason.ABORTED_BY_USER);
     }
 
     /**
@@ -150,8 +149,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
                 R.id.close_button, mPaymentRequestTestRule.getDismissed());
         mPaymentRequestTestRule.expectResultContains(new String[] {"Request cancelled"});
 
-        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(
-                JourneyLogger.ABORT_REASON_ABORTED_BY_USER);
+        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(AbortReason.ABORTED_BY_USER);
     }
 
     /**
@@ -178,8 +176,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         mPaymentRequestTestRule.getDismissed().waitForCallback(callCount);
         mPaymentRequestTestRule.expectResultContains(new String[] {"Request cancelled"});
 
-        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(
-                JourneyLogger.ABORT_REASON_ABORTED_BY_USER);
+        mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(AbortReason.ABORTED_BY_USER);
     }
 
     /**
@@ -200,7 +197,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
                 mPaymentRequestTestRule.getActivity());
 
         mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(
-                JourneyLogger.ABORT_REASON_MOJO_RENDERER_CLOSING);
+                AbortReason.MOJO_RENDERER_CLOSING);
     }
 
     /**
@@ -219,7 +216,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         mPaymentRequestTestRule.expectResultContains(new String[] {"Abort"});
 
         mPaymentRequestTestRule.assertOnlySpecificAbortMetricLogged(
-                JourneyLogger.ABORT_REASON_ABORTED_BY_MERCHANT);
+                AbortReason.ABORTED_BY_MERCHANT);
     }
 
     /**
@@ -248,7 +245,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         Assert.assertEquals(1,
                 RecordHistogram.getHistogramValueCountForTesting(
                         "PaymentRequest.CheckoutFunnel.NoShow",
-                        JourneyLogger.NO_SHOW_NO_MATCHING_PAYMENT_METHOD));
+                        NotShownReason.NO_MATCHING_PAYMENT_METHOD));
     }
 
     /**
@@ -273,7 +270,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         Assert.assertEquals(1,
                 RecordHistogram.getHistogramValueCountForTesting(
                         "PaymentRequest.CheckoutFunnel.NoShow",
-                        JourneyLogger.NO_SHOW_NO_SUPPORTED_PAYMENT_METHOD));
+                        NotShownReason.NO_SUPPORTED_PAYMENT_METHOD));
     }
 
     /**
@@ -294,8 +291,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         mPaymentRequestTestRule.clickCardUnmaskButtonAndWait(
                 DialogInterface.BUTTON_POSITIVE, mPaymentRequestTestRule.getDismissed());
 
-        assertOnlySpecificSelectedPaymentMethodMetricLogged(
-                PaymentRequestMetrics.SELECTED_METHOD_CREDIT_CARD);
+        assertOnlySpecificSelectedPaymentMethodMetricLogged(SelectedPaymentMethod.CREDIT_CARD);
     }
 
     /**
@@ -315,8 +311,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
         mPaymentRequestTestRule.clickAndWait(
                 R.id.button_primary, mPaymentRequestTestRule.getDismissed());
 
-        assertOnlySpecificSelectedPaymentMethodMetricLogged(
-                PaymentRequestMetrics.SELECTED_METHOD_ANDROID_PAY);
+        assertOnlySpecificSelectedPaymentMethodMetricLogged(SelectedPaymentMethod.ANDROID_PAY);
     }
 
     /**
@@ -414,7 +409,7 @@ public class PaymentRequestMetricsTest implements MainActivityStartCallback {
      *                      have a record.
      */
     private void assertOnlySpecificSelectedPaymentMethodMetricLogged(int paymentMethod) {
-        for (int i = 0; i < PaymentRequestMetrics.SELECTED_METHOD_MAX; ++i) {
+        for (int i = 0; i < SelectedPaymentMethod.MAX; ++i) {
             Assert.assertEquals((i == paymentMethod ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.SelectedPaymentMethod", i));