[Payments] Use event to log checkout funnel metrics.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index 6c2b7faa352cf4f6a2841176150e1fa086529c27..67b6aa82dcb19ca183bb23e0d15d69371b70e555 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -392,8 +392,6 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         if (sCanMakePaymentQueries == null) sCanMakePaymentQueries = new ArrayMap<>();
 
         mCurrencyFormatterMap = new HashMap<>();
-
-        recordSuccessFunnelHistograms("Initiated");
     }
 
     @Override
@@ -657,7 +655,6 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
 
             mDidRecordShowEvent = true;
             mShouldRecordAbortReason = true;
-            recordSuccessFunnelHistograms("SkippedShow");
             mJourneyLogger.setEventOccurred(JourneyLogger.EVENT_SKIPPED_SHOW);
             mJourneyLogger.setShowCalled();
 
@@ -1009,7 +1006,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         if (!mDidRecordShowEvent) {
             mDidRecordShowEvent = true;
             mShouldRecordAbortReason = true;
-            recordSuccessFunnelHistograms("Shown");
+            mJourneyLogger.setEventOccurred(JourneyLogger.EVENT_SHOWN);
             mJourneyLogger.setShowCalled();
         }
     }
@@ -1309,7 +1306,6 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
                 Collections.unmodifiableMap(methodData), mRawTotal, mRawLineItems,
                 Collections.unmodifiableMap(modifiers), this);
 
-        recordSuccessFunnelHistograms("PayClicked");
         mJourneyLogger.setEventOccurred(JourneyLogger.EVENT_PAY_CLICKED);
         return !(instrument instanceof AutofillPaymentInstrument);
     }
@@ -1664,7 +1660,6 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         // spinner shows up until the merchant notifies that payment was completed.
         if (mShouldSkipShowingPaymentRequestUi) mUI.showProcessingMessageAfterUiSkip();
 
-        recordSuccessFunnelHistograms("ReceivedInstrumentDetails");
         mJourneyLogger.setEventOccurred(JourneyLogger.EVENT_RECEIVED_INSTRUMENT_DETAILS);
 
         mPaymentResponseHelper.onInstrumentDetailsReceived(methodName, stringifiedDetails);