Revert of [Autofill] Enable Autofill for dynamically created forms.

components/autofill/core/browser/autofill_metrics_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/autofill_metrics.h"
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/test_autofill_driver.h"
 #include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #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"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
 using base::ASCIIToUTF16;
 using base::TimeDelta;
 using base::TimeTicks;
 using testing::_;
@@ skipping 467 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Ensure no metrics are logged when loading a non-fillable form.
   {
     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());
   }
 
   // Add another field to the form, so that it becomes fillable.
   test::CreateTestFormField("Phone", "phone", "", "text", &field);
   forms.back().fields.push_back(field);
 
   // Expect only the "form parsed" metric to be logged; no metrics about
   // author-specified field type hints.
   {
     EXPECT_CALL(
         *autofill_manager_->metric_logger(),
         LogDeveloperEngagementMetric(
             AutofillMetrics::FILLABLE_FORM_PARSED)).Times(1);
     EXPECT_CALL(
         *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());
   }
 
   // Add some fields with an author-specified field type to the form.
   // We need to add at least three fields, because a form must have at least
   // three fillable fields to be considered to be autofillable; and if at least
   // one field specifies an explicit type hint, we don't apply any of our usual
   // local heuristics to detect field types in the rest of the form.
   test::CreateTestFormField("", "", "", "text", &field);
@@ skipping 10 matching lines @@
   // hints metric to be logged.
   {
     EXPECT_CALL(
         *autofill_manager_->metric_logger(),
         LogDeveloperEngagementMetric(
             AutofillMetrics::FILLABLE_FORM_PARSED)).Times(1);
     EXPECT_CALL(
         *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());
   }
 }
 
 // Test that the profile count is logged correctly.
 TEST_F(AutofillMetricsTest, StoredProfileCount) {
   // The metric should be logged when the profiles are first loaded.
   EXPECT_CALL(*personal_data_->metric_logger(),
               LogStoredProfileCount(2)).Times(1);
@@ skipping 91 matching lines @@
 }
 
 // Test that we log whether Autofill is enabled when filling a form.
 TEST_F(AutofillMetricsTest, AutofillIsEnabledAtPageLoad) {
   // Establish our expectations.
   ::testing::InSequence dummy;
   EXPECT_CALL(*autofill_manager_->metric_logger(),
               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();
 
   // Establish our expectations.
   EXPECT_CALL(*autofill_manager_->metric_logger(),
               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
 // and form submission.
 TEST_F(AutofillMetricsTest, UserHappinessFormLoadAndSubmission) {
   // Start with a form with insufficiently many fields.
   FormData form;
   form.name = ASCIIToUTF16("TestForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://example.com/form.html");
   form.action = GURL("http://example.com/submit.html");
   form.user_submitted = true;
 
   FormFieldData field;
   test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Expect no notifications when the form is first seen.
   {
     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);
   }
 
 
   // Expect no notifications when the form is submitted.
   {
     EXPECT_CALL(
         *autofill_manager_->metric_logger(),
         LogUserHappinessMetric(
             AutofillMetrics::SUBMITTED_FILLABLE_FORM_AUTOFILLED_ALL)).Times(0);
     EXPECT_CALL(
@@ skipping 15 matching lines @@
   test::CreateTestFormField("Phone", "phone", "", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Unknown", "unknown", "", "text", &field);
   form.fields.push_back(field);
   forms.front() = form;
 
   // Expect a notification when the form is first seen.
   {
     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.
   {
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogUserHappinessMetric(
                     AutofillMetrics::SUBMITTED_NON_FILLABLE_FORM));
     autofill_manager_->FormSubmitted(form, TimeTicks::Now());
   }
 
@@ skipping 79 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField("Phone", "phone", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Expect a notification when the form is first seen.
   {
     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.
   {
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogUserHappinessMetric(AutofillMetrics::USER_DID_TYPE));
     autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
                                             TimeTicks());
   }
 
@@ skipping 82 matching lines @@
   FormFieldData field;
   test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Phone", "phone", "", "text", &field);
   form.fields.push_back(field);
 
   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.
   {
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogFormFillDurationFromLoadWithAutofill(_)).Times(0);
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogFormFillDurationFromLoadWithoutAutofill(
                     TimeDelta::FromInternalValue(16)));
     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(
+        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());
   }
 
   // Expect metric to be logged if the user manually edited a form field.
   {
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogFormFillDurationFromLoadWithAutofill(_)).Times(0);
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogFormFillDurationFromLoadWithoutAutofill(
                     TimeDelta::FromInternalValue(16)));
     EXPECT_CALL(*autofill_manager_->metric_logger(),
                 LogFormFillDurationFromInteractionWithAutofill(_)).Times(0);
     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));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 
   // Expect metric to be logged if the user autofilled the form.
   form.fields[0].is_autofilled = true;
   {
     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(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));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 
   // Expect metric to be logged if the user both manually filled some fields
   // and autofilled others.  Messages can arrive out of order, so make sure they
   // take precedence appropriately.
   {
     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(
+        forms, TimeTicks::FromInternalValue(1),
+        autofill::NO_SPECIAL_FORMS_SEEN);
     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 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