Refactor UKM interface for mojo-ification

components/autofill/core/browser/autofill_metrics.h

Index: components/autofill/core/browser/autofill_metrics.h
diff --git a/components/autofill/core/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h
index 714c8d49bfeae822c8d4b451bd6ef6b2b2e9d3b1..995da4339969e39725089308c453fe0eee5cbefa 100644
--- a/components/autofill/core/browser/autofill_metrics.h
+++ b/components/autofill/core/browser/autofill_metrics.h
@@ -18,9 +18,10 @@
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "components/ukm/public/ukm_recorder.h"
 
 namespace ukm {
-class UkmService;
+class UkmRecorder;

[sebsg, 2017/05/18 15:54:10]

not needed anymore because of your include of ukm_recorder.h?

[oystein (OOO til 10th of July), 2017/05/18 22:06:30]

Done.

 }  // namespace ukm
 
 namespace internal {
@@ -624,7 +625,7 @@ class AutofillMetrics {
   // Utility to log URL keyed form interaction events.
   class FormInteractionsUkmLogger {
    public:
-    explicit FormInteractionsUkmLogger(ukm::UkmService* ukm_service);
+    explicit FormInteractionsUkmLogger(ukm::UkmRecorder* ukm_recorder);
 
     const GURL& url() const { return url_; }
 
@@ -648,8 +649,8 @@ class AutofillMetrics {
     int64_t MillisecondsSinceFormParsed() const;
     void GetNewSourceID();
 
-    ukm::UkmService* ukm_service_;  // Weak reference.
-    int32_t source_id_ = -1;
+    ukm::UkmRecorder* ukm_recorder_;  // Weak reference.
+    ukm::SourceId source_id_ = -1;
     GURL url_;
     base::TimeTicks form_parsed_timestamp_;
   };
@@ -821,20 +822,20 @@ class AutofillMetrics {
 
   // Logs the card upload decisions ukm for the specified |url|.
   // |upload_decision_metrics| is a bitmask of |CardUploadDecisionMetric|.
-  static void LogCardUploadDecisionsUkm(ukm::UkmService* ukm_service,
+  static void LogCardUploadDecisionsUkm(ukm::UkmRecorder* ukm_recorder,
                                         const GURL& url,
                                         int upload_decision_metrics);
 
   // Logs the developer engagement ukm for the specified |url| and autofill
   // fields in the form structure. |developer_engagement_metrics| is a bitmask
   // of |AutofillMetrics::DeveloperEngagementMetric|.
-  static void LogDeveloperEngagementUkm(ukm::UkmService* ukm_service,
+  static void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
                                         const GURL& url,
                                         int developer_engagement_metrics);
 
   // Logs the the |ukm_entry_name| with the specified |url| and the specified
   // |metrics|. Returns whether the ukm was sucessfully logged.
-  static bool LogUkm(ukm::UkmService* ukm_service,
+  static bool LogUkm(ukm::UkmRecorder* ukm_recorder,
                      const GURL& url,
                      const std::string& ukm_entry_name,
                      const std::vector<std::pair<const char*, int>>& metrics);