| 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 e0708b124a631c95e6bf772cdbfd0d7d24f6c748..b0ae34df8c4d2283db4872f7d63a5dc01a885214 100644
|
| --- a/components/autofill/core/browser/autofill_metrics_unittest.cc
|
| +++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
|
| @@ -22,6 +22,7 @@
|
| #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
|
| #include "components/autofill/core/common/form_data.h"
|
| #include "components/autofill/core/common/form_field_data.h"
|
| +#include "components/autofill/core/common/forms_seen_state.h"
|
| #include "components/webdata/common/web_data_results.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -509,7 +510,8 @@
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -529,7 +531,8 @@
|
| *autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(
|
| AutofillMetrics::FILLABLE_FORM_CONTAINS_TYPE_HINTS)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -560,7 +563,8 @@
|
| *autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(
|
| AutofillMetrics::FILLABLE_FORM_CONTAINS_TYPE_HINTS)).Times(1);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -672,7 +676,8 @@
|
| LogIsAutofillEnabledAtPageLoad(true)).Times(1);
|
|
|
| autofill_manager_->set_autofill_enabled(true);
|
| - autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks());
|
| + autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
|
|
| // Reset the autofill manager state.
|
| autofill_manager_->Reset();
|
| @@ -682,7 +687,8 @@
|
| LogIsAutofillEnabledAtPageLoad(false)).Times(1);
|
|
|
| autofill_manager_->set_autofill_enabled(false);
|
| - autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks());
|
| + autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Verify that we correctly log user happiness metrics dealing with form loading
|
| @@ -708,7 +714,8 @@
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
|
|
| @@ -744,7 +751,8 @@
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED));
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Expect a notification when the form is submitted.
|
| @@ -844,7 +852,8 @@
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED));
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks());
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Simulate typing.
|
| @@ -947,24 +956,11 @@
|
|
|
| std::vector<FormData> forms(1, form);
|
|
|
| - // Fill additional form.
|
| - FormData second_form = form;
|
| - test::CreateTestFormField("Second Phone", "second_phone", "", "text", &field);
|
| - second_form.fields.push_back(field);
|
| -
|
| - std::vector<FormData> second_forms(1, second_form);
|
| -
|
| // Fill the field values for form submission.
|
| form.fields[0].value = ASCIIToUTF16("Elvis Aaron Presley");
|
| form.fields[1].value = ASCIIToUTF16("theking@gmail.com");
|
| form.fields[2].value = ASCIIToUTF16("12345678901");
|
|
|
| - // Fill the field values for form submission.
|
| - second_form.fields[0].value = ASCIIToUTF16("Elvis Aaron Presley");
|
| - second_form.fields[1].value = ASCIIToUTF16("theking@gmail.com");
|
| - second_form.fields[2].value = ASCIIToUTF16("12345678901");
|
| - second_form.fields[3].value = ASCIIToUTF16("51512345678");
|
| -
|
| // Expect only form load metrics to be logged if the form is submitted without
|
| // user interaction.
|
| {
|
| @@ -977,7 +973,9 @@
|
| LogFormFillDurationFromInteractionWithAutofill(_)).Times(0);
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| + autofill_manager_->OnFormsSeen(
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| @@ -995,7 +993,9 @@
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(
|
| TimeDelta::FromInternalValue(14)));
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| + autofill_manager_->OnFormsSeen(
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
|
| TimeTicks::FromInternalValue(3));
|
| autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
|
| @@ -1016,7 +1016,9 @@
|
| TimeDelta::FromInternalValue(12)));
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| + autofill_manager_->OnFormsSeen(
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->OnDidFillAutofillFormData(
|
| TimeTicks::FromInternalValue(5));
|
| autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
|
| @@ -1038,7 +1040,9 @@
|
| TimeDelta::FromInternalValue(14)));
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| + autofill_manager_->OnFormsSeen(
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->OnDidFillAutofillFormData(
|
| TimeTicks::FromInternalValue(5));
|
| autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
|
| @@ -1047,52 +1051,6 @@
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| -
|
| - // Make sure that loading another form doesn't affect metrics from the first
|
| - // form.
|
| - {
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromLoadWithAutofill(
|
| - TimeDelta::FromInternalValue(16)));
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromLoadWithoutAutofill(_)).Times(0);
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromInteractionWithAutofill(
|
| - TimeDelta::FromInternalValue(14)));
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| - autofill_manager_->OnFormsSeen(second_forms,
|
| - TimeTicks::FromInternalValue(3));
|
| - autofill_manager_->OnDidFillAutofillFormData(
|
| - TimeTicks::FromInternalValue(5));
|
| - autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
|
| - TimeTicks::FromInternalValue(3));
|
| - autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
|
| - autofill_manager_->Reset();
|
| - Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| - }
|
| -
|
| - // Make sure that submitting a form that was loaded later will report the
|
| - // later loading time.
|
| - {
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromLoadWithoutAutofill(
|
| - TimeDelta::FromInternalValue(12)));
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromLoadWithAutofill(_)).Times(0);
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromInteractionWithAutofill(_)).Times(0);
|
| - EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| - LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
|
| - autofill_manager_->OnFormsSeen(second_forms,
|
| - TimeTicks::FromInternalValue(5));
|
| - autofill_manager_->FormSubmitted(second_form,
|
| - TimeTicks::FromInternalValue(17));
|
| - autofill_manager_->Reset();
|
| - Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| - }
|
| }
|
|
|
| } // namespace autofill
|
|
|