Refactor UKM interface for mojo-ification

components/translate/core/browser/translate_ranker_impl.cc

 // Copyright 2016 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/translate/core/browser/translate_ranker_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/metrics_hashes.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/metrics/proto/translate_event.pb.h"
 #include "components/translate/core/browser/proto/ranker_model.pb.h"
 #include "components/translate/core/browser/proto/translate_ranker_model.pb.h"
 #include "components/translate/core/browser/ranker_model.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/browser/translate_url_fetcher.h"
 #include "components/translate/core/common/translate_switches.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"
 #include "components/variations/variations_associated_data.h"
 #include "url/gurl.h"
 
 namespace translate {
 
 namespace {
 
 using chrome_intelligence::RankerModel;
 using chrome_intelligence::RankerModelProto;
 using chrome_intelligence::TranslateRankerModel;
@@ skipping 87 matching lines @@
          << "denied_count=" << denied_count << ", "
          << "ignored_count=" << ignored_count << ", "
          << "total_count=" << total_count << ", "
          << "accept_ratio=" << accepted_ratio << ", "
          << "decline_ratio=" << denied_ratio << ", "
          << "ignore_ratio=" << ignored_ratio;
 }
 
 TranslateRankerImpl::TranslateRankerImpl(const base::FilePath& model_path,
                                          const GURL& model_url,
-                                         ukm::UkmService* ukm_service)
-    : ukm_service_(ukm_service),
+                                         ukm::UkmRecorder* ukm_recorder)
+    : ukm_recorder_(ukm_recorder),
       is_logging_enabled_(true),
       is_query_enabled_(base::FeatureList::IsEnabled(kTranslateRankerQuery)),
       is_enforcement_enabled_(
           base::FeatureList::IsEnabled(kTranslateRankerEnforcement)),
       is_decision_override_enabled_(base::FeatureList::IsEnabled(
           translate::kTranslateRankerDecisionOverride)),
       weak_ptr_factory_(this) {
   if (is_query_enabled_ || is_enforcement_enabled_ ||
       is_decision_override_enabled_) {
     model_loader_ = base::MakeUnique<RankerModelLoader>(
@@ skipping 138 matching lines @@
     std::vector<metrics::TranslateEventProto>* events) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   DVLOG(3) << "Flushing translate ranker events.";
   events->swap(event_cache_);
   event_cache_.clear();
 }
 
 void TranslateRankerImpl::SendEventToUKM(
     const metrics::TranslateEventProto& event,
     const GURL& url) {
-  if (!ukm_service_) {
+  if (!ukm_recorder_) {
     DVLOG(3) << "No UKM service.";
     return;
   }
   DVLOG(3) << "Sending event for url: " << url.spec();
-  int32_t source_id = ukm_service_->GetNewSourceID();
-  ukm_service_->UpdateSourceURL(source_id, url);
+  ukm::SourceId source_id = ukm_recorder_->GetNewSourceID();
+  ukm_recorder_->UpdateSourceURL(source_id, url);
   std::unique_ptr<ukm::UkmEntryBuilder> builder =
-      ukm_service_->GetEntryBuilder(source_id, "Translate");
+      ukm_recorder_->GetEntryBuilder(source_id, "Translate");
   // The metrics added here should be kept in sync with the documented
   // metrics in tools/metrics/ukm/ukm.xml.
   // TODO(hamelphi): Remove hashing functions once UKM accepts strings metrics.
   builder->AddMetric("SourceLanguage",
                      base::HashMetricName(event.source_language()));
   builder->AddMetric("TargetLanguage",
                      base::HashMetricName(event.target_language()));
   builder->AddMetric("Country", base::HashMetricName(event.country()));
   builder->AddMetric("AcceptCount", event.accept_count());
   builder->AddMetric("DeclineCount", event.decline_count());
@@ skipping 53 matching lines @@
   }
 }
 
 }  // namespace translate
 
 std::ostream& operator<<(std::ostream& stream,
                          const translate::TranslateRankerFeatures& features) {
   features.WriteTo(stream);
   return stream;
 }