[Autofill] UKM for suggestions polled field.

components/autofill/core/browser/autofill_metrics_unittest.cc

Index: components/autofill/core/browser/autofill_metrics_unittest.cc
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index 55e78d4a7681b0da84de925a283c5bf388a08bc6..fb3a13b63fafd00fd64745ac4fddb18969c37ffb 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -2109,10 +2109,21 @@ TEST_F(AutofillMetricsTest, CreditCardCheckoutFlowUserActions) {
                      "Autofill_PolledCreditCardSuggestions"));
   }
 
-  // Simulate showing a credit card suggestion.
+  // Simulate showing a credit card suggestion polled from "Name on card" field.
   {
     base::UserActionTester user_action_tester;
-    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form, field);
+    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form,
+                                          form.fields[0]);
+    EXPECT_EQ(1, user_action_tester.GetActionCount(
+                     "Autofill_ShowedCreditCardSuggestions"));
+  }
+
+  // Simulate showing a credit card suggestion polled from "Credit card number"
+  // field.
+  {
+    base::UserActionTester user_action_tester;
+    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form,
+                                          form.fields[1]);
     EXPECT_EQ(1, user_action_tester.GetActionCount(
                      "Autofill_ShowedCreditCardSuggestions"));
   }
@@ -2152,7 +2163,14 @@ TEST_F(AutofillMetricsTest, CreditCardCheckoutFlowUserActions) {
 
   VerifyFormInteractionUkm(
       form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
+      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, CREDIT_CARD_NAME_FULL},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, CREDIT_CARD_NAME_FULL}},
+       {{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, CREDIT_CARD_NUMBER},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, CREDIT_CARD_NUMBER}}});
   // Expect 2 |FORM_EVENT_LOCAL_SUGGESTION_FILLED| events. First, from
   // call to |external_delegate_->DidAcceptSuggestion|. Second, from call to
   // |autofill_manager_->FillOrPreviewForm|.
@@ -2205,10 +2223,20 @@ TEST_F(AutofillMetricsTest, ProfileCheckoutFlowUserActions) {
                      "Autofill_PolledProfileSuggestions"));
   }
 
-  // Simulate showing a profile suggestion.
+  // Simulate showing a profile suggestion polled from "State" field.
   {
     base::UserActionTester user_action_tester;
-    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form, field);
+    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form,
+                                          form.fields[0]);
+    EXPECT_EQ(1, user_action_tester.GetActionCount(
+                     "Autofill_ShowedProfileSuggestions"));
+  }
+
+  // Simulate showing a profile suggestion polled from "City" field.
+  {
+    base::UserActionTester user_action_tester;
+    autofill_manager_->DidShowSuggestions(true /* is_new_popup */, form,
+                                          form.fields[1]);
     EXPECT_EQ(1, user_action_tester.GetActionCount(
                      "Autofill_ShowedProfileSuggestions"));
   }
@@ -2248,7 +2276,14 @@ TEST_F(AutofillMetricsTest, ProfileCheckoutFlowUserActions) {
 
   VerifyFormInteractionUkm(
       form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
+      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, ADDRESS_HOME_STATE},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, ADDRESS_HOME_STATE}},
+       {{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, ADDRESS_HOME_CITY},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, ADDRESS_HOME_CITY}}});
   // Expect 2 |FORM_EVENT_LOCAL_SUGGESTION_FILLED| events. First, from
   // call to |external_delegate_->DidAcceptSuggestion|. Second, from call to
   // |autofill_manager_->FillOrPreviewForm|.
@@ -2884,9 +2919,10 @@ TEST_F(AutofillMetricsTest, CreditCardSubmittedFormEvents) {
 
     VerifyFormInteractionUkm(
         form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
-    VerifySubmitFormUkm(form, ukm_recorder,
-                        AutofillMetrics::NON_FILLABLE_FORM_OR_NEW_DATA);
+        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+          {internal::kUKMHeuristicTypeMetricName, CREDIT_CARD_NUMBER},
+          {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+          {internal::kUKMServerTypeMetricName, CREDIT_CARD_NUMBER}}});
   }
 
   // Reset the autofill manager state and purge UKM logs.
@@ -3109,9 +3145,10 @@ TEST_F(AutofillMetricsTest, CreditCardSubmittedFormEvents) {
 
     VerifyFormInteractionUkm(
         form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
-    VerifySubmitFormUkm(form, ukm_recorder,
-                        AutofillMetrics::NON_FILLABLE_FORM_OR_NEW_DATA);
+        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+          {internal::kUKMHeuristicTypeMetricName, CREDIT_CARD_NUMBER},
+          {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+          {internal::kUKMServerTypeMetricName, CREDIT_CARD_NUMBER}}});
   }
 }
 
@@ -4192,7 +4229,10 @@ TEST_F(AutofillMetricsTest, AutofillFormSubmittedState) {
 
     VerifyFormInteractionUkm(
         form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
+        {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+          {internal::kUKMHeuristicTypeMetricName, PHONE_HOME_WHOLE_NUMBER},
+          {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+          {internal::kUKMServerTypeMetricName, NO_SERVER_DATA}}});
     expected_form_submission_ukm_metrics.push_back(
         {{internal::kUKMAutofillFormSubmittedStateMetricName,
           AutofillMetrics::FILLABLE_FORM_AUTOFILLED_NONE_DID_SHOW_SUGGESTIONS},
@@ -4390,8 +4430,14 @@ TEST_F(AutofillMetricsTest, UserHappinessFormInteraction) {
         {internal::kUKMServerRecordTypeCountMetricName, 0}}});
   VerifyFormInteractionUkm(
       form, ukm_recorder, internal::kUKMSuggestionsShownEntryName,
-      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}},
-       {{internal::kUKMMillisecondsSinceFormParsedMetricName, 0}}});
+      {{{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, PHONE_HOME_WHOLE_NUMBER},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, NO_SERVER_DATA}},
+       {{internal::kUKMMillisecondsSinceFormParsedMetricName, 0},
+        {internal::kUKMHeuristicTypeMetricName, EMAIL_ADDRESS},
+        {internal::kUKMHtmlFieldTypeMetricName, HTML_TYPE_UNSPECIFIED},
+        {internal::kUKMServerTypeMetricName, NO_SERVER_DATA}}});
   VerifyFormInteractionUkm(
       form, ukm_recorder, internal::kUKMSuggestionFilledEntryName,
       {{{internal::kUKMRecordTypeMetricName, AutofillProfile::LOCAL_PROFILE},