Refactor UKM interface for mojo-ification

components/payments/core/journey_logger.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/payments/core/journey_logger.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.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 {
 
 namespace internal {
 extern const char kUKMCheckoutEventsEntryName[] =
     "PaymentRequest.CheckoutEvents";
 extern const char kUKMCompletionStatusMetricName[] = "CompletionStatus";
 extern const char kUKMEventsMetricName[] = "Events";
 }  // namespace internal
 
@@ skipping 35 matching lines @@
   }
 
   DCHECK(!name_suffix.empty());
   return name_suffix;
 }
 
 }  // namespace
 
 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_)
     DCHECK(has_recorded_);
 }
 
 void JourneyLogger::IncrementSelectionAdds(Section section) {
   DCHECK_LT(section, SECTION_MAX);
   sections_[section].number_selection_adds_++;
 }
@@ skipping 152 matching lines @@
     histogram_name += "Used.TrueWithShowEffectOnCompletion";
   } else {
     histogram_name += "Used.FalseWithShowEffectOnCompletion";
   }
 
   base::UmaHistogramEnumeration(histogram_name, completion_status,
                                 COMPLETION_STATUS_MAX);
 }
 
 void JourneyLogger::RecordUrlKeyedMetrics(CompletionStatus completion_status) {
-  if (!ukm_service_ || !url_.is_valid())
+  if (!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_);
 }
 
 }  // namespace payments