| Index: components/autofill/browser/autofill_metrics_unittest.cc
|
| diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
|
| index ab9d8032a1d6d3c3b3741121601ced8ac4427dbf..d5229f4a6eb0b55eedcbbfe3a0a24a4bdae9002f 100644
|
| --- a/components/autofill/browser/autofill_metrics_unittest.cc
|
| +++ b/components/autofill/browser/autofill_metrics_unittest.cc
|
| @@ -21,6 +21,7 @@
|
| #include "components/autofill/browser/personal_data_manager.h"
|
| #include "components/autofill/common/form_data.h"
|
| #include "components/autofill/common/form_field_data.h"
|
| +#include "components/autofill/common/forms_seen_param.h"
|
| #include "components/webdata/common/web_data_results.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -792,7 +793,8 @@ TEST_F(AutofillMetricsTest, DeveloperEngagement) {
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(_)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -812,7 +814,8 @@ TEST_F(AutofillMetricsTest, DeveloperEngagement) {
|
| *autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(
|
| AutofillMetrics::FILLABLE_FORM_CONTAINS_TYPE_HINTS)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -843,7 +846,8 @@ TEST_F(AutofillMetricsTest, DeveloperEngagement) {
|
| *autofill_manager_->metric_logger(),
|
| LogDeveloperEngagementMetric(
|
| AutofillMetrics::FILLABLE_FORM_CONTAINS_TYPE_HINTS)).Times(1);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->Reset();
|
| Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
|
| }
|
| @@ -1122,7 +1126,8 @@ TEST_F(AutofillMetricsTest, AutofillIsEnabledAtPageLoad) {
|
| LogIsAutofillEnabledAtPageLoad(true)).Times(1);
|
|
|
| autofill_manager_->set_autofill_enabled(true);
|
| - autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
|
|
| // Reset the autofill manager state.
|
| autofill_manager_->Reset();
|
| @@ -1132,7 +1137,8 @@ TEST_F(AutofillMetricsTest, AutofillIsEnabledAtPageLoad) {
|
| LogIsAutofillEnabledAtPageLoad(false)).Times(1);
|
|
|
| autofill_manager_->set_autofill_enabled(false);
|
| - autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Test that credit card infobar metrics are logged correctly.
|
| @@ -1245,7 +1251,8 @@ TEST_F(AutofillMetricsTest, UserHappinessFormLoadAndSubmission) {
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED)).Times(0);
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
|
|
| @@ -1281,7 +1288,8 @@ TEST_F(AutofillMetricsTest, UserHappinessFormLoadAndSubmission) {
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED));
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Expect a notification when the form is submitted.
|
| @@ -1381,7 +1389,8 @@ TEST_F(AutofillMetricsTest, UserHappinessFormInteraction) {
|
| {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogUserHappinessMetric(AutofillMetrics::FORMS_LOADED));
|
| - autofill_manager_->OnFormsSeen(forms, TimeTicks(), false);
|
| + autofill_manager_->OnFormsSeen(forms, TimeTicks(),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| }
|
|
|
| // Simulate typing.
|
| @@ -1501,7 +1510,8 @@ TEST_F(AutofillMetricsTest, FormFillDuration) {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| autofill_manager_->OnFormsSeen(
|
| - forms, TimeTicks::FromInternalValue(1), false);
|
| + 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());
|
| @@ -1520,7 +1530,8 @@ TEST_F(AutofillMetricsTest, FormFillDuration) {
|
| LogFormFillDurationFromInteractionWithoutAutofill(
|
| TimeDelta::FromInternalValue(14)));
|
| autofill_manager_->OnFormsSeen(
|
| - forms, TimeTicks::FromInternalValue(1), false);
|
| + 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));
|
| @@ -1542,7 +1553,8 @@ TEST_F(AutofillMetricsTest, FormFillDuration) {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| autofill_manager_->OnFormsSeen(
|
| - forms, TimeTicks::FromInternalValue(1), false);
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->OnDidFillAutofillFormData(
|
| TimeTicks::FromInternalValue(5));
|
| autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
|
| @@ -1565,7 +1577,8 @@ TEST_F(AutofillMetricsTest, FormFillDuration) {
|
| EXPECT_CALL(*autofill_manager_->metric_logger(),
|
| LogFormFillDurationFromInteractionWithoutAutofill(_)).Times(0);
|
| autofill_manager_->OnFormsSeen(
|
| - forms, TimeTicks::FromInternalValue(1), false);
|
| + forms, TimeTicks::FromInternalValue(1),
|
| + autofill::NO_SPECIAL_FORMS_SEEN);
|
| autofill_manager_->OnDidFillAutofillFormData(
|
| TimeTicks::FromInternalValue(5));
|
| autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
|
|
|