[Autofill] Add upstreaming UKM

components/autofill/core/browser/autofill_metrics.cc

Index: components/autofill/core/browser/autofill_metrics.cc
diff --git a/components/autofill/core/browser/autofill_metrics.cc b/components/autofill/core/browser/autofill_metrics.cc
index 3300b672d536b6c2c3499ee8fe1a85f357048294..5fae2d59b21b68b5f554eb0fbd5a715507ca8112 100644
--- a/components/autofill/core/browser/autofill_metrics.cc
+++ b/components/autofill/core/browser/autofill_metrics.cc
@@ -11,9 +11,16 @@
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "base/time/time.h"
+#include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/form_data.h"
+#include "components/ukm/ukm_entry_builder.h"
+
+namespace internal {
+const char kUKMCardUploadDecisionEntryName[] = "Autofill.CardUploadDecision";
+const char kUKMCardUploadDecisionMetricName[] = "UploadDecision";
+}  // namespace internal
 
 namespace autofill {
 
@@ -689,6 +696,42 @@ void AutofillMetrics::LogShowedHttpNotSecureExplanation() {
       base::UserMetricsAction("Autofill_ShowedHttpNotSecureExplanation"));
 }
 
+// static
+void AutofillMetrics::LogCardUploadDecisionMetricUkm(
+    ukm::UkmService* ukm_service,
+    const GURL& url,
+    AutofillMetrics::CardUploadDecisionMetric upload_decision) {
+  if (upload_decision >= AutofillMetrics::NUM_CARD_UPLOAD_DECISION_METRICS)
+    return;
+
+  std::map<std::string, int> metrics = {

[rkaplow, 2017/03/10 19:00:27]

hm, right now LogUKM supports a map, but we're only ever adding a single
key/value pair. Is this expected to change shortly?

[sebsg, 2017/03/10 19:25:33]

The Payment Request ukm that I'm adding now in another CL will save 2 metrics
per entry. I was also wondering if this is something that would be worth
exposing in the UKM API? It sounds like something that will be done often.

[rkaplow, 2017/03/10 20:26:16]

yes, we can probably do that though. 
Can you add a comment that you set it up as a map as more metrics will be added?
Right now it seems wasteful

[sebsg, 2017/03/10 20:38:07]

Done.

+      {internal::kUKMCardUploadDecisionMetricName,
+       static_cast<int>(upload_decision)}};
+  LogUkm(ukm_service, url, internal::kUKMCardUploadDecisionEntryName, metrics);
+}
+
+// static
+bool AutofillMetrics::LogUkm(ukm::UkmService* ukm_service,
+                             const GURL& url,
+                             const std::string& ukm,
+                             const std::map<std::string, int>& metrics) {
+  if (!IsUkmLoggingEnabled() || !ukm_service || !url.is_valid() ||
+      metrics.empty()) {
+    return false;
+  }
+
+  int32_t source_id = ukm_service->GetNewSourceID();
+  ukm_service->UpdateSourceURL(source_id, url);
+  std::unique_ptr<ukm::UkmEntryBuilder> builder =
+      ukm_service->GetEntryBuilder(source_id, ukm.c_str());
+
+  for (auto it = metrics.begin(); it != metrics.end(); ++it) {
+    builder->AddMetric(it->first.c_str(), it->second);
+  }
+
+  return true;
+}
+
 AutofillMetrics::FormEventLogger::FormEventLogger(bool is_for_credit_card)
     : is_for_credit_card_(is_for_credit_card),
       is_server_data_available_(false),