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 887b19a49fc5b7f5439d2ecbf5e37ef82eee6d1c..f3c5dedc36fe2cb39fe3620a4ecbb09fd17fb1c5 100644 |
--- a/components/autofill/browser/autofill_metrics_unittest.cc |
+++ b/components/autofill/browser/autofill_metrics_unittest.cc |
@@ -22,6 +22,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 "content/public/test/test_browser_thread.h" |
#include "googleurl/src/gurl.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -790,7 +791,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()); |
} |
@@ -810,7 +812,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()); |
} |
@@ -841,7 +844,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()); |
} |
@@ -1120,7 +1124,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(); |
@@ -1130,7 +1135,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. |
@@ -1243,7 +1249,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); |
} |
@@ -1279,7 +1286,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. |
@@ -1379,7 +1387,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. |
@@ -1499,7 +1508,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()); |
@@ -1518,7 +1528,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)); |
@@ -1540,7 +1551,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)); |
@@ -1563,7 +1575,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(), |