[Autofill] UKM for suggestions polled field.

components/autofill/core/browser/autofill_manager.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_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 587 matching lines @@
   if (is_autofill_possible &&
       driver_->RendererIsAvailable() &&
       got_autofillable_form) {
     // On desktop, don't return non credit card related suggestions for forms or
     // fields that have the "autocomplete" attribute set to off.
     if (IsDesktopPlatform() && !is_filling_credit_card &&
         !field.should_autocomplete) {
       return;
     }
     if (is_filling_credit_card) {
-      suggestions = GetCreditCardSuggestions(field, autofill_field->Type());
+      suggestions = GetCreditCardSuggestions(field, *autofill_field);
     } else {
       suggestions =
           GetProfileSuggestions(*form_structure, field, *autofill_field);
     }
 
     if (!suggestions.empty()) {
       if (is_filling_credit_card)
         AutofillMetrics::LogIsQueriedCreditCardFormSecure(is_context_secure);
 
       // Don't provide credit card suggestions for non-secure pages, but do
@@ skipping 1237 matching lines @@
   // Annotate the updated form with its predicted types.
   driver_->SendAutofillTypePredictionsToRenderer({*updated_form});
 
   return true;
 }
 
 std::vector<Suggestion> AutofillManager::GetProfileSuggestions(
     const FormStructure& form,
     const FormFieldData& field,
     const AutofillField& autofill_field) const {
-  address_form_event_logger_->OnDidPollSuggestions(field);
+  address_form_event_logger_->OnDidPollSuggestions(field, autofill_field);
 
   std::vector<ServerFieldType> field_types(form.field_count());
   for (size_t i = 0; i < form.field_count(); ++i) {
     field_types.push_back(form.field(i)->Type().GetStorableType());
   }
 
   std::vector<Suggestion> suggestions = personal_data_->GetProfileSuggestions(
       autofill_field.Type(), field.value, field.is_autofilled, field_types);
 
   // Adjust phone number to display in prefix/suffix case.
   if (autofill_field.Type().GetStorableType() == PHONE_HOME_NUMBER) {
     for (size_t i = 0; i < suggestions.size(); ++i) {
       suggestions[i].value = AutofillField::GetPhoneNumberValue(
           autofill_field, suggestions[i].value, field);
     }
   }
 
   for (size_t i = 0; i < suggestions.size(); ++i) {
     suggestions[i].frontend_id =
         MakeFrontendID(std::string(), suggestions[i].backend_id);
   }
   return suggestions;
 }
 
 std::vector<Suggestion> AutofillManager::GetCreditCardSuggestions(
     const FormFieldData& field,
-    const AutofillType& type) const {
-  credit_card_form_event_logger_->OnDidPollSuggestions(field);
+    const AutofillField& autofill_field) const {
+  credit_card_form_event_logger_->OnDidPollSuggestions(field, autofill_field);
 
   // The field value is sanitized before attempting to match it to the user's
   // data.
   std::vector<Suggestion> suggestions =
       personal_data_->GetCreditCardSuggestions(
-          type, SanitizeCreditCardFieldValue(field.value));
+          autofill_field.Type(), SanitizeCreditCardFieldValue(field.value));
   for (size_t i = 0; i < suggestions.size(); i++) {
     suggestions[i].frontend_id =
         MakeFrontendID(suggestions[i].backend_id, std::string());
     suggestions[i].is_value_bold = IsCreditCardPopupValueBold();
   }
   return suggestions;
 }
 
 void AutofillManager::ParseForms(const std::vector<FormData>& forms) {
   if (forms.empty())
@@ skipping 348 matching lines @@
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 void AutofillManager::LogCardUploadDecisionUkm(
     AutofillMetrics::CardUploadDecisionMetric upload_decision) {
   AutofillMetrics::LogCardUploadDecisionUkm(
       client_->GetUkmService(), pending_upload_request_url_, upload_decision);
 }
 
 }  // namespace autofill