Adds UKM for autofill attributes in form_structure.

components/autofill/core/browser/autofill_metrics_unittest.cc

 // Copyright 2013 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/autofill/core/browser/autofill_metrics.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 748 matching lines @@
   form.fields.push_back(field);
 
   // No autocomplete attribute. No metric logged.
   test::CreateTestFormField("Address", "address", "", "text", &field);
   field.autocomplete_attribute = "";
   form.fields.push_back(field);
 
   std::unique_ptr<TestFormStructure> form_structure =
       base::MakeUnique<TestFormStructure>(form);
   TestFormStructure* form_structure_ptr = form_structure.get();
-  form_structure->DetermineHeuristicTypes();
+  form_structure->DetermineHeuristicTypes(nullptr /* ukm_service */, GURL());
   autofill_manager_->form_structures()->push_back(std::move(form_structure));
 
   AutofillQueryResponseContents response;
   // Server response will match with autocomplete.
   response.add_field()->set_autofill_type(NAME_LAST);
   // Server response will NOT match with autocomplete.
   response.add_field()->set_autofill_type(NAME_FIRST);
   // Server response will have no data.
   response.add_field()->set_autofill_type(NO_SERVER_DATA);
   // Not logged.
@@ skipping 3579 matching lines @@
         "Autofill.FormEvents.CreditCard",
         AutofillMetrics::FORM_EVENT_NO_SUGGESTION_SUBMITTED_ONCE, 1);
     // Check that the nonsecure histogram was not recorded. ExpectBucketCount()
     // can't be used here because it expects the histogram to exist.
     EXPECT_EQ(
         0, histograms.GetTotalCountsForPrefix("Autofill.FormEvents.CreditCard")
                ["Autofill.FormEvents.CreditCard.OnNonsecurePage"]);
   }
 }
 
-// Tests that logging a UKM works as expected.
+// Tests that logging CardUploadDecision UKM works as expected.
 TEST_F(AutofillMetricsTest, RecordCardUploadDecisionMetric) {
   EnableUkmLogging();
   ukm::UkmServiceTestingHarness ukm_service_test_harness;
   GURL url("https://www.google.com");
   int upload_decision = 1;
   std::map<std::string, int> metrics;
   metrics.insert(std::make_pair(internal::kUKMCardUploadDecisionMetricName,
                                 upload_decision));
 
   EXPECT_TRUE(AutofillMetrics::LogUkm(
       ukm_service_test_harness.test_ukm_service(), url,
       internal::kUKMCardUploadDecisionEntryName, metrics));
 
   // Make sure that the UKM was logged correctly.
   ukm::TestUkmService* ukm_service =
       ukm_service_test_harness.test_ukm_service();
 
   ASSERT_EQ(1U, ukm_service->sources_count());
   const ukm::UkmSource* source =
       ukm_service->GetSourceForUrl(url.spec().c_str());
   EXPECT_EQ(url.spec(), source->url().spec());
 
   EXPECT_EQ(1U, ukm_service->entries_count());
   const ukm::UkmEntry* entry = ukm_service->GetEntry(0);
   EXPECT_EQ(source->id(), entry->source_id());
 
-  // Make sure that an card upload decision entry was logged.
+  // Make sure that a card upload decision entry was logged.
   ukm::Entry entry_proto;
   entry->PopulateProto(&entry_proto);
   EXPECT_EQ(source->id(), entry_proto.source_id());
   EXPECT_EQ(base::HashMetricName(internal::kUKMCardUploadDecisionEntryName),
             entry_proto.event_hash());
   EXPECT_EQ(1, entry_proto.metrics_size());
 
   // Make sure that the correct upload decision was logged.
   const ukm::Entry_Metric* metric = FindMetric(
       internal::kUKMCardUploadDecisionMetricName, entry_proto.metrics());
   ASSERT_NE(nullptr, metric);
   EXPECT_EQ(upload_decision, metric->value());
 }
 
+// Tests that logging DeveloperEngagement UKM works as expected.
+TEST_F(AutofillMetricsTest, RecordDeveloperEnagementMetric) {

[Mathieu, 2017/03/27 18:58:55]

*engagement

[Mathieu, 2017/03/27 18:58:55]

This is not a sufficient test. You should also add a test alongside where we
test for DeveloperEngagement _UMA_ metric (Line 1436)

[csashi, 2017/03/27 23:37:43]

Done.

+  EnableUkmLogging();
+  ukm::UkmServiceTestingHarness ukm_service_test_harness;
+  GURL url("https://www.google.com");
+  int form_structure_metric = 1;
+  std::map<std::string, int> metrics;
+  metrics.insert(std::make_pair(internal::kUKMDeveloperEngagementMetricName,
+                                form_structure_metric));
+
+  EXPECT_TRUE(AutofillMetrics::LogUkm(
+      ukm_service_test_harness.test_ukm_service(), url,
+      internal::kUKMDeveloperEngagementEntryName, metrics));
+
+  // Make sure that the UKM was logged correctly.
+  ukm::TestUkmService* ukm_service =
+      ukm_service_test_harness.test_ukm_service();
+
+  ASSERT_EQ(1U, ukm_service->sources_count());
+  const ukm::UkmSource* source =
+      ukm_service->GetSourceForUrl(url.spec().c_str());
+  EXPECT_EQ(url.spec(), source->url().spec());
+
+  EXPECT_EQ(1U, ukm_service->entries_count());
+  const ukm::UkmEntry* entry = ukm_service->GetEntry(0);
+  EXPECT_EQ(source->id(), entry->source_id());
+
+  // Make sure that a developer engagement entry was logged.
+  ukm::Entry entry_proto;
+  entry->PopulateProto(&entry_proto);
+  EXPECT_EQ(source->id(), entry_proto.source_id());
+  EXPECT_EQ(base::HashMetricName(internal::kUKMDeveloperEngagementEntryName),
+            entry_proto.event_hash());
+  EXPECT_EQ(1, entry_proto.metrics_size());
+
+  // Make sure that the correct developer engagement metric was logged.
+  const ukm::Entry_Metric* metric = FindMetric(
+      internal::kUKMDeveloperEngagementMetricName, entry_proto.metrics());
+  ASSERT_NE(nullptr, metric);
+  EXPECT_EQ(form_structure_metric, metric->value());
+}
+
 // Tests that no UKM is logged when the URL is not valid.
 TEST_F(AutofillMetricsTest, RecordCardUploadDecisionMetric_InvalidUrl) {
   EnableUkmLogging();
   ukm::UkmServiceTestingHarness ukm_service_test_harness;
   GURL url("");
   std::map<std::string, int> metrics;
   metrics.insert(std::make_pair("metric", 1));
 
   EXPECT_FALSE(AutofillMetrics::LogUkm(
       ukm_service_test_harness.test_ukm_service(), url, "test_ukm", metrics));
@@ skipping 30 matching lines @@
   GURL url("https://www.google.com");
   std::map<std::string, int> metrics;
   metrics.insert(std::make_pair("metric", 1));
 
   EXPECT_FALSE(AutofillMetrics::LogUkm(
       ukm_service_test_harness.test_ukm_service(), url, "test_ukm", metrics));
   EXPECT_EQ(0U, ukm_service_test_harness.test_ukm_service()->sources_count());
 }
 
 }  // namespace autofill