Add histogram entries for autofill SecurityLevel metrics

The previous CL (crrev.com/c/1103218) did not add the entries for the
new histograms in histograms.xml (preventing them from getting collected
by UMA). This CL makes a small change to the previous CL to simplify the
histogram names (re-using the same base autofill histograms as already
exist), and adds their suffixed histograms recursively to the set of
affected histograms for the SecurityLevel suffix.

These metrics are used for splitting some of the existing autofill
histograms by the SecurityLevel of the page on which they occur (to be
able to distinguish autofill behavior on different types of pages).

This also adds two owners to the "SecurityLevel" suffix as it is now
applied to histograms not already owned by Enamel folk.

Bug: 853347
Change-Id: I9151b55a69e92353d17634b60aba5725e67d3c08
Reviewed-on: https://chromium-review.googlesource.com/1117740Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Christopher Thompson <cthomp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571255}

chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc

@@ -691,11 +691,11 @@ TEST_F(SaveCardBubbleControllerImplTest,
   ShowLocalBubble();
   EXPECT_THAT(
       histogram_tester.GetAllSamples(
-          "Security.SaveCardPromptMetric.Local.SECURE"),
+          "Autofill.SaveCreditCardPrompt.Local.SECURE"),
       ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1),
                   Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1)));
   EXPECT_TRUE(histogram_tester
-                  .GetAllSamples("Security.SaveCardPromptMetric.Upload.SECURE")
+                  .GetAllSamples("Autofill.SaveCreditCardPrompt.Upload.SECURE")
                   .empty());
 }
 
@@ -706,12 +706,12 @@ TEST_F(SaveCardBubbleControllerImplTest,
   ShowUploadBubble();
   EXPECT_THAT(
       histogram_tester.GetAllSamples(
-          "Security.SaveCardPromptMetric.Upload.EV_SECURE"),
+          "Autofill.SaveCreditCardPrompt.Upload.EV_SECURE"),
       ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1),
                   Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1)));
   EXPECT_TRUE(
       histogram_tester
-          .GetAllSamples("Security.SaveCardPromptMetric.Local.EV_SECURE")
+          .GetAllSamples("Autofill.SaveCreditCardPrompt.Local.EV_SECURE")
           .empty());
 }
 

components/autofill/core/browser/autofill_metrics.cc

@@ -744,7 +744,7 @@ void AutofillMetrics::LogSaveCardPromptMetricBySecurityLevel(
     return;
   }
 
-  std::string histogram_name = "Security.SaveCardPromptMetric.";
+  std::string histogram_name = "Autofill.SaveCreditCardPrompt.";
   if (is_uploading) {
     histogram_name += "Upload";
   } else {
@@ -1006,7 +1006,7 @@ void AutofillMetrics::LogUserHappinessBySecurityLevel(
     return;
   }
 
-  std::string histogram_name = "Security.UserHappiness.";
+  std::string histogram_name = "Autofill.UserHappiness.";
   switch (form_type) {
     case CREDIT_CARD_FORM:
       histogram_name += "CreditCard";

components/autofill/core/browser/autofill_metrics_unittest.cc

@@ -7363,7 +7363,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel) {
         AutofillMetrics::USER_DID_AUTOFILL, CREDIT_CARD_FORM,
         security_state::SecurityLevel::SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.CreditCard.SECURE",
+        "Autofill.UserHappiness.CreditCard.SECURE",
         AutofillMetrics::USER_DID_AUTOFILL, 1);
   }
 
@@ -7373,7 +7373,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel) {
         AutofillMetrics::SUGGESTIONS_SHOWN, ADDRESS_FORM,
         security_state::SecurityLevel::DANGEROUS);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Address.DANGEROUS",
+        "Autofill.UserHappiness.Address.DANGEROUS",
         AutofillMetrics::SUGGESTIONS_SHOWN, 1);
   }
 
@@ -7383,7 +7383,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel) {
         AutofillMetrics::FIELD_WAS_AUTOFILLED, PASSWORD_FORM,
         security_state::SecurityLevel::HTTP_SHOW_WARNING);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Password.HTTP_SHOW_WARNING",
+        "Autofill.UserHappiness.Password.HTTP_SHOW_WARNING",
         AutofillMetrics::FIELD_WAS_AUTOFILLED, 1);
   }
 
@@ -7393,7 +7393,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel) {
         AutofillMetrics::USER_DID_AUTOFILL_ONCE, UNKNOWN_FORM_TYPE,
         security_state::SecurityLevel::EV_SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Unknown.EV_SECURE",
+        "Autofill.UserHappiness.Unknown.EV_SECURE",
         AutofillMetrics::USER_DID_AUTOFILL_ONCE, 1);
   }
 
@@ -7404,7 +7404,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel) {
     AutofillMetrics::LogUserHappinessBySecurityLevel(
         AutofillMetrics::SUBMITTED_FILLABLE_FORM_AUTOFILLED_SOME,
         CREDIT_CARD_FORM, security_state::SecurityLevel::SECURITY_LEVEL_COUNT);
-    histogram_tester.ExpectTotalCount("Security.UserHappiness.CreditCard.OTHER",
+    histogram_tester.ExpectTotalCount("Autofill.UserHappiness.CreditCard.OTHER",
                                       0);
   }
 }
@@ -7436,7 +7436,7 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel_FromFormEvents) {
         security_state::SecurityLevel::DANGEROUS);
     autofill_manager_->OnFormsSeen(forms, TimeTicks());
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Address.DANGEROUS",
+        "Autofill.UserHappiness.Address.DANGEROUS",
         AutofillMetrics::FORMS_LOADED, 1);
   }
 
@@ -7448,10 +7448,10 @@ TEST_F(AutofillMetricsTest, LogUserHappinessBySecurityLevel_FromFormEvents) {
     autofill_manager_->DidShowSuggestions(true, form, field);
     autofill_manager_->DidShowSuggestions(true, form, field);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Address.HTTP_SHOW_WARNING",
+        "Autofill.UserHappiness.Address.HTTP_SHOW_WARNING",
         AutofillMetrics::SUGGESTIONS_SHOWN, 2);
     histogram_tester.ExpectBucketCount(
-        "Security.UserHappiness.Address.HTTP_SHOW_WARNING",
+        "Autofill.UserHappiness.Address.HTTP_SHOW_WARNING",
         AutofillMetrics::SUGGESTIONS_SHOWN_ONCE, 1);
   }
 }
@@ -7464,7 +7464,7 @@ TEST_F(AutofillMetricsTest, LogSaveCardPromptMetricBySecurityLevel) {
         AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, /*is_uploading=*/true,
         security_state::SecurityLevel::SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Upload.SECURE",
+        "Autofill.SaveCreditCardPrompt.Upload.SECURE",
         AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1);
   }
 
@@ -7474,7 +7474,7 @@ TEST_F(AutofillMetricsTest, LogSaveCardPromptMetricBySecurityLevel) {
         AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, /*is_uploading=*/false,
         security_state::SecurityLevel::DANGEROUS);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Local.DANGEROUS",
+        "Autofill.SaveCreditCardPrompt.Local.DANGEROUS",
         AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1);
   }
 
@@ -7484,7 +7484,7 @@ TEST_F(AutofillMetricsTest, LogSaveCardPromptMetricBySecurityLevel) {
         AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, /*is_uploading=*/true,
         security_state::SecurityLevel::HTTP_SHOW_WARNING);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Upload.HTTP_SHOW_WARNING",
+        "Autofill.SaveCreditCardPrompt.Upload.HTTP_SHOW_WARNING",
         AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, 1);
   }
 
@@ -7494,7 +7494,7 @@ TEST_F(AutofillMetricsTest, LogSaveCardPromptMetricBySecurityLevel) {
         AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_SHOWING,
         /*is_uploading=*/false, security_state::SecurityLevel::EV_SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Local.EV_SECURE",
+        "Autofill.SaveCreditCardPrompt.Local.EV_SECURE",
         AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_SHOWING, 1);
   }
 
@@ -7507,7 +7507,7 @@ TEST_F(AutofillMetricsTest, LogSaveCardPromptMetricBySecurityLevel) {
         /*is_uploading=*/true,
         security_state::SecurityLevel::SECURITY_LEVEL_COUNT);
     histogram_tester.ExpectTotalCount(
-        "Security.SaveCardPromptMetric.Upload.OTHER", 0);
+        "Autofill.SaveCreditCardPrompt.Upload.OTHER", 0);
   }
 }
 
@@ -7523,7 +7523,7 @@ TEST_F(AutofillMetricsTest,
         /*previous_save_credit_card_prompt_user_decision=*/1,
         security_state::SecurityLevel::EV_SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Upload.EV_SECURE",
+        "Autofill.SaveCreditCardPrompt.Upload.EV_SECURE",
         AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_SHOWING, 1);
   }
 
@@ -7535,7 +7535,7 @@ TEST_F(AutofillMetricsTest,
         /*previous_save_credit_card_prompt_user_decision=*/0,
         security_state::SecurityLevel::SECURE);
     histogram_tester.ExpectBucketCount(
-        "Security.SaveCardPromptMetric.Local.SECURE",
+        "Autofill.SaveCreditCardPrompt.Local.SECURE",
         AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1);
   }
 }

tools/metrics/histograms/histograms.xml

@@ -123511,6 +123511,8 @@ uploading your change for review.
 </histogram_suffixes>
 
 <histogram_suffixes name="SecurityLevel" separator=".">
+  <owner>cthomp@chromium.org</owner>
+  <owner>estark@chromium.org</owner>
   <suffix name="DANGEROUS" label="SecurityLevel is DANGEROUS."/>
   <suffix name="EV_SECURE" label="SecurityLevel is EV_SECURE."/>
   <suffix name="HTTP_SHOW_WARNING" label="SecurityLevel is HTTP_SHOW_WARNING."/>
@@ -123519,6 +123521,12 @@ uploading your change for review.
   <suffix name="SECURE" label="SecurityLevel is SECURE."/>
   <suffix name="SECURE_WITH_POLICY_INSTALLED_CERT"
       label="SecurityLevel is SECURE_WITH_POLICY_INSTALLED_CERT."/>
+  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local"/>
+  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload"/>
+  <affected-histogram name="Autofill.UserHappiness.Address"/>
+  <affected-histogram name="Autofill.UserHappiness.CreditCard"/>
+  <affected-histogram name="Autofill.UserHappiness.Password"/>
+  <affected-histogram name="Autofill.UserHappiness.Unknown"/>
   <affected-histogram name="Security.PageEndReason"/>
   <affected-histogram name="Security.SiteEngagement"/>
   <affected-histogram name="Security.SiteEngagementDelta"/>