UKM that threads together multiple form interaction events.

components/autofill/core/browser/autofill_manager.cc

Index: components/autofill/core/browser/autofill_manager.cc
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index d599bce07603f84b97bd881bbe88c249078ea123..36a7f3f3b45af5e958f51fb877b0d6490cce8a7b 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -223,10 +223,13 @@ AutofillManager::AutofillManager(
       personal_data_(client->GetPersonalDataManager()),
       autocomplete_history_manager_(
           new AutocompleteHistoryManager(driver, client)),
+      ukm_logger_(new AutofillMetrics::UkmLogger(client->GetUkmService())),

[Roger McFarlane (Chromium), 2017/04/07 02:34:01]

prefer base::MakeUnique<Foo>(bar, baz, boz) over naked new.

ukm_logger_(base:MakeUnique<AutofillMetrics::UkmLogger>(client->GetUkmService())),

[csashi, 2017/04/07 06:46:28]

Done.

       address_form_event_logger_(
-          new AutofillMetrics::FormEventLogger(false /* is_for_credit_card */)),
+          new AutofillMetrics::FormEventLogger(false /* is_for_credit_card */,
+                                               ukm_logger_.get())),
       credit_card_form_event_logger_(
-          new AutofillMetrics::FormEventLogger(true /* is_for_credit_card */)),
+          new AutofillMetrics::FormEventLogger(true /* is_for_credit_card */,
+                                               ukm_logger_.get())),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
@@ -517,11 +520,18 @@ void AutofillManager::OnTextFieldDidChange(const FormData& form,
     AutofillMetrics::LogUserHappinessMetric(AutofillMetrics::USER_DID_TYPE);
   }
 
+  DCHECK(ukm_logger_);
+  if (ukm_logger_)
+    ukm_logger_->LogUserHappinessMetric(AutofillMetrics::USER_DID_TYPE);
+
   if (autofill_field->is_autofilled) {
     autofill_field->is_autofilled = false;
     autofill_field->set_previously_autofilled(true);
     AutofillMetrics::LogUserHappinessMetric(
         AutofillMetrics::USER_DID_EDIT_AUTOFILLED_FIELD);
+    if (ukm_logger_)
+      ukm_logger_->LogUserHappinessMetric(
+          AutofillMetrics::USER_DID_EDIT_AUTOFILLED_FIELD);
 
     if (!user_did_edit_autofilled_field_) {
       user_did_edit_autofilled_field_ = true;
@@ -813,6 +823,9 @@ void AutofillManager::OnDidFillAutofillFormData(const FormData& form,
   UpdatePendingForm(form);
 
   AutofillMetrics::LogUserHappinessMetric(AutofillMetrics::USER_DID_AUTOFILL);
+  DCHECK(ukm_logger_);
+  if (ukm_logger_)
+    ukm_logger_->LogUserHappinessMetric(AutofillMetrics::USER_DID_AUTOFILL);
   if (!user_did_autofill_) {
     user_did_autofill_ = true;
     AutofillMetrics::LogUserHappinessMetric(
@@ -1088,6 +1101,9 @@ void AutofillManager::ShowUnmaskPrompt(
     AutofillClient::UnmaskCardReason reason,
     base::WeakPtr<CardUnmaskDelegate> delegate) {
   client_->ShowUnmaskPrompt(card, reason, delegate);
+  DCHECK(ukm_logger_);
+  if (ukm_logger_)
+    ukm_logger_->LogUnmaskPromptEvent(AutofillMetrics::UNMASK_PROMPT_SHOWN);
 }
 
 void AutofillManager::OnUnmaskVerificationResult(
@@ -1378,10 +1394,18 @@ void AutofillManager::UploadFormDataAsyncCallback(
     const TimeTicks& interaction_time,
     const TimeTicks& submission_time,
     bool observed_submission) {
-  submitted_form->LogQualityMetrics(load_time, interaction_time,
-                                    submission_time,
-                                    client_->GetRapporServiceImpl(),
-                                    did_show_suggestions_, observed_submission);
+  AutofillMetrics::AutofillFormSubmittedState state =
+      submitted_form->LogQualityMetrics(
+          load_time, interaction_time, submission_time,
+          client_->GetRapporServiceImpl(), did_show_suggestions_,
+          observed_submission);
+  if (state < AutofillMetrics::AUTOFILL_FORM_SUBMITTED_STATE_ENUM_SIZE) {
+    AutofillMetrics::LogAutofillFormSubmittedState(state);
+    DCHECK(ukm_logger_);
+    ukm_logger_->LogAutofillFormSubmittedState(submitted_form->source_url(),
+                                               state);
+    ukm_logger_->LogUkm();
+  }
 
   if (submitted_form->ShouldBeCrowdsourced())
     UploadFormData(*submitted_form, observed_submission);
@@ -1416,10 +1440,11 @@ void AutofillManager::Reset() {
   ProcessPendingFormForUpload();
   DCHECK(!pending_form_data_);
   form_structures_.clear();
-  address_form_event_logger_.reset(
-      new AutofillMetrics::FormEventLogger(false /* is_for_credit_card */));
-  credit_card_form_event_logger_.reset(
-      new AutofillMetrics::FormEventLogger(true /* is_for_credit_card */));
+  ukm_logger_.reset(new AutofillMetrics::UkmLogger(client_->GetUkmService()));
+  address_form_event_logger_.reset(new AutofillMetrics::FormEventLogger(
+      false /* is_for_credit_card */, ukm_logger_.get()));
+  credit_card_form_event_logger_.reset(new AutofillMetrics::FormEventLogger(
+      true /* is_for_credit_card */, ukm_logger_.get()));
 #if defined(OS_ANDROID) || defined(OS_IOS)
   autofill_assistant_.Reset();
 #endif
@@ -1449,10 +1474,13 @@ AutofillManager::AutofillManager(AutofillDriver* driver,
       personal_data_(personal_data),
       autocomplete_history_manager_(
           new AutocompleteHistoryManager(driver, client)),
+      ukm_logger_(new AutofillMetrics::UkmLogger(client->GetUkmService())),
       address_form_event_logger_(
-          new AutofillMetrics::FormEventLogger(false /* is_for_credit_card */)),
+          new AutofillMetrics::FormEventLogger(false /* is_for_credit_card */,
+                                               ukm_logger_.get())),
       credit_card_form_event_logger_(
-          new AutofillMetrics::FormEventLogger(true /* is_for_credit_card */)),
+          new AutofillMetrics::FormEventLogger(true /* is_for_credit_card */,
+                                               ukm_logger_.get())),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
@@ -1880,6 +1908,14 @@ void AutofillManager::ParseForms(const std::vector<FormData>& forms) {
 
   if (!queryable_forms.empty() || !non_queryable_forms.empty()) {
     AutofillMetrics::LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED);
+
+    // Log pending events, if any.
+    ukm_logger_->LogUkm();
+
+    // If user submits a form, we set the key to the |submitted_form|'s
+    // |source_url()|.
+    ukm_logger_->set_url(forms[0].origin);
+    ukm_logger_->LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED);
 #if defined(OS_IOS)
     // Log this from same location as AutofillMetrics::FORMS_LOADED to ensure
     // that KeyboardAccessoryButtonsIOS and UserHappiness UMA metrics will be