Refactor UKM interface for mojo-ification

components/payments/core/journey_logger.cc

Index: components/payments/core/journey_logger.cc
diff --git a/components/payments/core/journey_logger.cc b/components/payments/core/journey_logger.cc
index aeae9aa0652bf7083c6e76c8c5f482a4c06a61d4..6546b38c9765f5be93086c96331fb2c0c906f418 100644
--- a/components/payments/core/journey_logger.cc
+++ b/components/payments/core/journey_logger.cc
@@ -9,8 +9,8 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/autofill/core/browser/autofill_experiments.h"
-#include "components/ukm/ukm_entry_builder.h"
-#include "components/ukm/ukm_service.h"
+#include "components/ukm/public/ukm_entry_builder.h"
+#include "components/ukm/public/ukm_recorder.h"
 
 namespace payments {
 
@@ -66,11 +66,11 @@ std::string GetHistogramNameSuffix(
 
 JourneyLogger::JourneyLogger(bool is_incognito,
                              const GURL& url,
-                             ukm::UkmService* ukm_service)
+                             ukm::UkmRecorder* ukm_recorder)
     : is_incognito_(is_incognito),
       events_(EVENT_INITIATED),
       url_(url),
-      ukm_service_(ukm_service) {}
+      ukm_recorder_(ukm_recorder) {}
 
 JourneyLogger::~JourneyLogger() {
   if (was_show_called_)
@@ -224,14 +224,15 @@ void JourneyLogger::RecordCanMakePaymentEffectOnCompletion(
 }
 
 void JourneyLogger::RecordUrlKeyedMetrics(CompletionStatus completion_status) {
-  if (!autofill::IsUkmLoggingEnabled() || !ukm_service_ || !url_.is_valid())
+  if (!autofill::IsUkmLoggingEnabled() || !ukm_recorder_ || !url_.is_valid())
     return;
 
   // Record the Checkout Funnel UKM.
-  int32_t source_id = ukm_service_->GetNewSourceID();
-  ukm_service_->UpdateSourceURL(source_id, url_);
-  std::unique_ptr<ukm::UkmEntryBuilder> builder = ukm_service_->GetEntryBuilder(
-      source_id, internal::kUKMCheckoutEventsEntryName);
+  ukm::SourceId source_id = ukm_recorder_->GetNewSourceID();
+  ukm_recorder_->UpdateSourceURL(source_id, url_);
+  std::unique_ptr<ukm::UkmEntryBuilder> builder =
+      ukm_recorder_->GetEntryBuilder(source_id,
+                                     internal::kUKMCheckoutEventsEntryName);
   builder->AddMetric(internal::kUKMCompletionStatusMetricName,
                      completion_status);
   builder->AddMetric(internal::kUKMEventsMetricName, events_);