[Fast Checkout] Fix success metrics

Adds AutofillTriggerSource to all autofilling methods to determine which
source triggered Autofill. Uses the trigger source to not count Autofill
invokes from Fast Checkout. This is extremely important because
otherwise there is no way to figure out if the feature is successful or
not.

Bug: 1334642,1427611
Change-Id: Ia64e2294700e98720d5d7fb812eb4c7e4866b848
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4370088
Reviewed-by: Matthias Körber <koerber@google.com>
Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Wolfgang Billenstein <bwolfgang@google.com>
Cr-Commit-Position: refs/heads/main@{#1122313}

chrome/browser/autofill/autofill_across_iframes_browsertest.cc

@@ -125,7 +125,8 @@ void FillCard(content::RenderFrameHost* rfh,
   test::SetCreditCardInfo(&card, kNameFull, kNumber, kExpMonth, kExpYear, "");
   auto* manager = TestAutofillManager::GetForRenderFrameHost(rfh);
   manager->FillCreditCardFormImpl(form, triggered_field, card,
-                                  base::ASCIIToUTF16(base::StringPiece(kCvc)));
+                                  base::ASCIIToUTF16(base::StringPiece(kCvc)),
+                                  AutofillTriggerSource::kPopup);
 }
 
 // Clicks the first input, textarea, or select in `rfh`.

chrome/browser/fast_checkout/fast_checkout_client_impl.cc

@@ -368,8 +368,9 @@ void FastCheckoutClientImpl::TryToFillForms() {
         static_cast<autofill::BrowserAutofillManager*>(autofill_manager_.get())
             ->SetFastCheckoutRunId(autofill::FieldTypeGroup::kAddressHome,
                                    run_id_);
-        autofill_manager_->FillProfileForm(*autofill_profile,
-                                           form->ToFormData(), *field);
+        autofill_manager_->FillProfileForm(
+            *autofill_profile, form->ToFormData(), *field,
+            autofill::AutofillTriggerSource::kFastCheckout);
       }
     }
 
@@ -406,8 +407,9 @@ void FastCheckoutClientImpl::FillCreditCardForm(
       FillingState::kFilling;
   static_cast<autofill::BrowserAutofillManager*>(autofill_manager_.get())
       ->SetFastCheckoutRunId(autofill::FieldTypeGroup::kCreditCard, run_id_);
-  autofill_manager_->FillCreditCardForm(form.ToFormData(), field, credit_card,
-                                        cvc);
+  autofill_manager_->FillCreditCardForm(
+      form.ToFormData(), field, credit_card, cvc,
+      autofill::AutofillTriggerSource::kFastCheckout);
 }
 
 autofill::AutofillProfile*

chrome/browser/fast_checkout/fast_checkout_client_impl_unittest.cc

@@ -133,14 +133,16 @@ class MockBrowserAutofillManager : public autofill::TestBrowserAutofillManager {
               FillProfileFormImpl,
               (const autofill::FormData&,
                const autofill::FormFieldData&,
-               const autofill::AutofillProfile&),
+               const autofill::AutofillProfile&,
+               const autofill::AutofillTriggerSource),
               (override));
   MOCK_METHOD(void,
               FillCreditCardFormImpl,
               (const autofill::FormData&,
                const autofill::FormFieldData&,
                const autofill::CreditCard&,
-               const std::u16string&),
+               const std::u16string&,
+               const autofill::AutofillTriggerSource),
               (override));
   MOCK_METHOD(void,
               SetFastCheckoutRunId,
@@ -703,10 +705,12 @@ TEST_F(FastCheckoutClientImplTest, OnAfterLoadedServerPredictions_FillsForms) {
     filling_state = FastCheckoutClientImpl::FillingState::kNotFilled;
   }
 
-  EXPECT_CALL(*autofill_manager(),
-              FillProfileFormImpl(FormDataEqualTo(address_form_data),
-                                  FormFieldDataEqualTo(address_form_field_data),
-                                  Eq(*autofill_profile)));
+  EXPECT_CALL(
+      *autofill_manager(),
+      FillProfileFormImpl(FormDataEqualTo(address_form_data),
+                          FormFieldDataEqualTo(address_form_field_data),
+                          Eq(*autofill_profile),
+                          Eq(autofill::AutofillTriggerSource::kFastCheckout)));
   EXPECT_CALL(*autofill_manager(),
               SetFastCheckoutRunId(autofill::FieldTypeGroup::kAddressHome,
                                    fast_checkout_client()->run_id_));
@@ -744,7 +748,8 @@ TEST_F(FastCheckoutClientImplTest,
   EXPECT_CALL(*autofill_manager(),
               FillCreditCardFormImpl(
                   FormDataEqualTo(credit_card_form->ToFormData()),
-                  FormFieldDataEqualTo(field), Eq(*credit_card), Eq(cvc)));
+                  FormFieldDataEqualTo(field), Eq(*credit_card), Eq(cvc),
+                  Eq(autofill::AutofillTriggerSource::kFastCheckout)));
   EXPECT_CALL(*autofill_manager(),
               SetFastCheckoutRunId(autofill::FieldTypeGroup::kCreditCard,
                                    fast_checkout_client()->run_id_));
@@ -906,7 +911,8 @@ TEST_F(FastCheckoutClientImplTest,
   EXPECT_CALL(*autofill_manager(),
               FillCreditCardFormImpl(
                   FormDataEqualTo(credit_card_form->ToFormData()),
-                  FormFieldDataEqualTo(field), Eq(*credit_card), Eq(cvc)));
+                  FormFieldDataEqualTo(field), Eq(*credit_card), Eq(cvc),
+                  Eq(autofill::AutofillTriggerSource::kFastCheckout)));
   EXPECT_CALL(*autofill_manager(),
               SetFastCheckoutRunId(autofill::FieldTypeGroup::kCreditCard,
                                    fast_checkout_client()->run_id_));
@@ -1032,10 +1038,11 @@ TEST_F(FastCheckoutClientImplTest,
   EXPECT_CALL(
       *autofill_manager(),
       SetFastCheckoutRunId(autofill::FieldTypeGroup::kCreditCard, Ne(0)));
-  EXPECT_CALL(
-      *autofill_manager(),
-      FillCreditCardFormImpl(FormDataEqualTo(credit_card_form->ToFormData()),
-                             FormFieldDataEqualTo(field), _, Eq(u"")));
+  EXPECT_CALL(*autofill_manager(),
+              FillCreditCardFormImpl(
+                  FormDataEqualTo(credit_card_form->ToFormData()),
+                  FormFieldDataEqualTo(field), _, Eq(u""),
+                  Eq(autofill::AutofillTriggerSource::kFastCheckout)));
   StartRunAndSelectOptions({credit_card_form->form_signature()},
                            /*local_card=*/true);
   EXPECT_FALSE(fast_checkout_client()->IsNotShownYet());

chrome/browser/touch_to_fill/payments/android/touch_to_fill_delegate_android_impl.cc

@@ -201,8 +201,9 @@ void TouchToFillDelegateAndroidImpl::ScanCreditCard() {
 void TouchToFillDelegateAndroidImpl::OnCreditCardScanned(
     const CreditCard& card) {
   HideTouchToFill();
-  manager_->FillCreditCardFormImpl(query_form_, query_field_, card,
-                                   std::u16string());
+  manager_->FillCreditCardFormImpl(
+      query_form_, query_field_, card, std::u16string(),
+      AutofillTriggerSource::kTouchToFillCreditCard);
 }
 
 void TouchToFillDelegateAndroidImpl::ShowCreditCardSettings() {
@@ -216,13 +217,14 @@ void TouchToFillDelegateAndroidImpl::SuggestionSelected(std::string unique_id,
   if (is_virtual) {
     manager_->FillOrPreviewVirtualCardInformation(
         mojom::RendererFormDataAction::kFill, unique_id, query_form_,
-        query_field_);
+        query_field_, AutofillTriggerSource::kTouchToFillCreditCard);
   } else {
     PersonalDataManager* pdm = manager_->client()->GetPersonalDataManager();
     DCHECK(pdm);
     CreditCard* card = pdm->GetCreditCardByGUID(unique_id);
-    manager_->FillOrPreviewCreditCardForm(mojom::RendererFormDataAction::kFill,
-                                          query_form_, query_field_, card);
+    manager_->FillOrPreviewCreditCardForm(
+        mojom::RendererFormDataAction::kFill, query_form_, query_field_, card,
+        AutofillTriggerSource::kTouchToFillCreditCard);
   }
 }
 

chrome/browser/touch_to_fill/payments/android/touch_to_fill_delegate_android_impl_unittest.cc

@@ -112,20 +112,23 @@ class MockBrowserAutofillManager : public TestBrowserAutofillManager {
               (const FormData& form,
                const FormFieldData& field,
                const CreditCard& credit_card,
-               const std::u16string& cvc),
+               const std::u16string& cvc,
+               const AutofillTriggerSource trigger_source),
               (override));
   MOCK_METHOD(void,
               FillOrPreviewCreditCardForm,
               (mojom::RendererFormDataAction action,
                const FormData& form,
                const FormFieldData& field,
-               const CreditCard* credit_card));
+               const CreditCard* credit_card,
+               const AutofillTriggerSource trigger_source));
   MOCK_METHOD(void,
               FillOrPreviewVirtualCardInformation,
               (mojom::RendererFormDataAction action,
                const std::string& guid,
                const FormData& form,
-               const FormFieldData& field));
+               const FormFieldData& field,
+               const AutofillTriggerSource trigger_source));
   MOCK_METHOD(void,
               DidShowSuggestions,
               (bool has_autofill_suggestions,

components/android_autofill/browser/android_autofill_manager.cc

@@ -50,14 +50,16 @@ void AndroidAutofillManager::FillCreditCardFormImpl(
     const FormData& form,
     const FormFieldData& field,
     const CreditCard& credit_card,
-    const std::u16string& cvc) {
+    const std::u16string& cvc,
+    AutofillTriggerSource trigger_source) {
   NOTREACHED();
 }
 
 void AndroidAutofillManager::FillProfileFormImpl(
     const FormData& form,
     const FormFieldData& field,
-    const autofill::AutofillProfile& profile) {
+    const autofill::AutofillProfile& profile,
+    AutofillTriggerSource trigger_source) {
   NOTREACHED();
 }
 

components/android_autofill/browser/android_autofill_manager.h

@@ -47,10 +47,12 @@ class AndroidAutofillManager : public AutofillManager {
   void FillCreditCardFormImpl(const FormData& form,
                               const FormFieldData& field,
                               const CreditCard& credit_card,
-                              const std::u16string& cvc) override;
+                              const std::u16string& cvc,
+                              AutofillTriggerSource trigger_source) override;
   void FillProfileFormImpl(const FormData& form,
                            const FormFieldData& field,
-                           const autofill::AutofillProfile& profile) override;
+                           const autofill::AutofillProfile& profile,
+                           AutofillTriggerSource trigger_source) override;
 
   void OnFocusNoLongerOnFormImpl(bool had_interacted_form) override;
 

components/autofill/core/browser/BUILD.gn

@@ -109,6 +109,7 @@ static_library("browser") {
     "autofill_subject.h",
     "autofill_suggestion_generator.cc",
     "autofill_suggestion_generator.h",
+    "autofill_trigger_source.h",
     "autofill_type.cc",
     "autofill_type.h",
     "browser_autofill_manager.cc",

components/autofill/core/browser/autofill_external_delegate.cc

@@ -21,6 +21,7 @@
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_trigger_source.h"
 #include "components/autofill/core/browser/browser_autofill_manager.h"
 #include "components/autofill/core/browser/metrics/autofill_metrics.h"
 #include "components/autofill/core/browser/metrics/suggestions_list_metrics.h"
@@ -214,7 +215,8 @@ void AutofillExternalDelegate::DidSelectSuggestion(
 
   // Only preview the data if it is a profile or a virtual card.
   if (frontend_id > 0) {
-    FillAutofillFormData(frontend_id, true);
+    FillAutofillFormData(frontend_id, true,
+                         AutofillTriggerSource::kKeyboardAccessory);
   } else if (frontend_id == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY ||
              frontend_id == POPUP_ITEM_ID_IBAN_ENTRY ||
              frontend_id == POPUP_ITEM_ID_MERCHANT_PROMO_CODE_ENTRY) {
@@ -223,7 +225,7 @@ void AutofillExternalDelegate::DidSelectSuggestion(
   } else if (frontend_id == POPUP_ITEM_ID_VIRTUAL_CREDIT_CARD_ENTRY) {
     manager_->FillOrPreviewVirtualCardInformation(
         mojom::RendererFormDataAction::kPreview, backend_id.value(),
-        query_form_, query_field_);
+        query_form_, query_field_, AutofillTriggerSource::kKeyboardAccessory);
   }
 }
 
@@ -273,8 +275,9 @@ void AutofillExternalDelegate::DidAcceptSuggestion(const Suggestion& suggestion,
                                                 query_form_, query_field_);
       break;
     case POPUP_ITEM_ID_SCAN_CREDIT_CARD:
-      manager_->client()->ScanCreditCard(base::BindOnce(
-          &AutofillExternalDelegate::OnCreditCardScanned, GetWeakPtr()));
+      manager_->client()->ScanCreditCard(
+          base::BindOnce(&AutofillExternalDelegate::OnCreditCardScanned,
+                         GetWeakPtr(), AutofillTriggerSource::kPopup));
       break;
     case POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO:
       manager_->client()->ExecuteCommand(suggestion.frontend_id);
@@ -297,7 +300,7 @@ void AutofillExternalDelegate::DidAcceptSuggestion(const Suggestion& suggestion,
       manager_->FillOrPreviewVirtualCardInformation(
           mojom::RendererFormDataAction::kFill,
           suggestion.GetPayload<Suggestion::BackendId>().value(), query_form_,
-          query_field_);
+          query_field_, AutofillTriggerSource::kPopup);
       break;
     case POPUP_ITEM_ID_SEE_PROMO_CODE_DETAILS:
       manager_->OnSeePromoCodeOfferDetailsSelected(
@@ -309,7 +312,8 @@ void AutofillExternalDelegate::DidAcceptSuggestion(const Suggestion& suggestion,
         autofill_metrics::LogAutofillSuggestionAcceptedIndex(
             position, popup_type_, manager_->client()->IsOffTheRecord());
       }
-      FillAutofillFormData(suggestion.frontend_id, false);
+      FillAutofillFormData(suggestion.frontend_id, false,
+                           AutofillTriggerSource::kPopup);
       break;
   }
 
@@ -386,13 +390,17 @@ base::WeakPtr<AutofillExternalDelegate> AutofillExternalDelegate::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-void AutofillExternalDelegate::OnCreditCardScanned(const CreditCard& card) {
+void AutofillExternalDelegate::OnCreditCardScanned(
+    const AutofillTriggerSource trigger_source,
+    const CreditCard& card) {
   manager_->FillCreditCardFormImpl(query_form_, query_field_, card,
-                                   std::u16string());
+                                   std::u16string(), trigger_source);
 }
 
-void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
-                                                    bool is_preview) {
+void AutofillExternalDelegate::FillAutofillFormData(
+    int unique_id,
+    bool is_preview,
+    const AutofillTriggerSource trigger_source) {
   // If the selected element is a warning we don't want to do anything.
   if (IsAutofillWarningEntry(unique_id))
     return;
@@ -404,7 +412,7 @@ void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
   DCHECK(driver_->RendererIsAvailable());
   // Fill the values for the whole form.
   manager_->FillOrPreviewForm(renderer_action, query_form_, query_field_,
-                              unique_id);
+                              unique_id, trigger_source);
 }
 
 void AutofillExternalDelegate::PossiblyRemoveAutofillWarnings(

components/autofill/core/browser/autofill_external_delegate.h

@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "components/autofill/core/browser/autofill_trigger_source.h"
 #include "components/autofill/core/browser/ui/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/ui/suggestion.h"
 #include "components/autofill/core/common/aliases.h"
@@ -120,13 +121,16 @@ class AutofillExternalDelegate : public AutofillPopupDelegate {
                            FillCreditCardFormImpl);
 
   // Called when a credit card is scanned using device camera.
-  void OnCreditCardScanned(const CreditCard& card);
+  void OnCreditCardScanned(const AutofillTriggerSource trigger_source,
+                           const CreditCard& card);
 
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
-  void FillAutofillFormData(int unique_id, bool is_preview);
+  void FillAutofillFormData(int unique_id,
+                            bool is_preview,
+                            const AutofillTriggerSource trigger_source);
 
   // Will remove Autofill warnings from |suggestions| if there are also
   // autocomplete entries in the vector. Note: at this point, it is assumed that