Requery the autofill server when forms and input fields are dynamically added.

components/autofill/browser/autofill_manager_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/test_autofill_external_delegate.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
+#include "components/autofill/common/forms_seen_state.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 639 matching lines @@
                               const FormFieldData& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(
       const std::vector<base::string16>& result) {
     autofill_manager_->autocomplete_history_manager_.SendSuggestions(&result);
   }
 
   void FormsSeen(const std::vector<FormData>& forms) {
-    autofill_manager_->OnFormsSeen(forms, base::TimeTicks(), false);
+    autofill_manager_->OnFormsSeen(forms, base::TimeTicks(),
+                                   autofill::NO_SPECIAL_FORMS_SEEN);
   }
 
   void PartialFormsSeen(const std::vector<FormData>& forms) {
-    autofill_manager_->OnFormsSeen(forms, base::TimeTicks(), true);
+    autofill_manager_->OnFormsSeen(forms, base::TimeTicks(),
+                                   autofill::PARTIAL_FORMS_SEEN);
+  }
+
+  void DynamicFormsSeen(const std::vector<FormData>& forms) {
+    autofill_manager_->OnFormsSeen(forms, base::TimeTicks(),
+                                   autofill::DYNAMIC_FORMS_SEEN);
   }
 
   void FormSubmitted(const FormData& form) {
     autofill_manager_->ResetMessageLoopRunner();
     if (autofill_manager_->OnFormSubmitted(form, base::TimeTicks::Now()))
       autofill_manager_->WaitForAsyncFormSubmit();
   }
 
   void FillAutofillFormData(int query_id,
                             const FormData& form,
@@ skipping 185 matching lines @@
   // userspecified and then address form.
   autofill_manager_->set_autocheckout_url_prefix("yes-autocheckout");
   FormsSeen(forms);
   form_structures = autofill_manager_->GetFormStructures();
   ASSERT_EQ(3U, form_structures.size());
   EXPECT_EQ("/shipping.html", form_structures[0]->source_url().path());
   EXPECT_EQ("/userspecified.html", form_structures[1]->source_url().path());
   EXPECT_EQ("/form.html", form_structures[2]->source_url().path());
 }
 
+// Test that in the case of Autocheckout, forms seen are in order supplied.
+TEST_F(AutofillManagerTest, DynamicFormsSeen) {
+  FormData shipping_options;
+  CreateTestShippingOptionsFormData(&shipping_options);
+  FormData user_supplied;
+  CreateTestFormWithAutocompleteAttribute(&user_supplied);
+  FormData address;
+  CreateTestAddressFormData(&address);
+
+  autofill_manager_->set_autocheckout_url_prefix("test-prefix");
+  // Push user_supplied only
+  std::vector<FormData> forms;
+  forms.push_back(user_supplied);
+
+  // Make sure normal form is handled correctly.
+  FormsSeen(forms);
+  std::vector<FormStructure*> form_structures;
+  form_structures = autofill_manager_->GetFormStructures();
+  ASSERT_EQ(1U, form_structures.size());
+  EXPECT_EQ("/userspecified.html", form_structures[0]->source_url().path());
+
+  // Push other forms
+  forms.push_back(shipping_options);
+  forms.push_back(address);
+
+  // FormStructure should contain three and only three forms. Otherwise, it
+  // would indicate that the manager didn't reset upon being notified of
+  // the new forms;
+  DynamicFormsSeen(forms);
+  form_structures = autofill_manager_->GetFormStructures();
+  ASSERT_EQ(3U, form_structures.size());
+  EXPECT_EQ("/userspecified.html", form_structures[0]->source_url().path());
+  EXPECT_EQ("/shipping.html", form_structures[1]->source_url().path());
+  EXPECT_EQ("/form.html", form_structures[2]->source_url().path());
+}
+
 // Test that we return only matching address profile suggestions when the
 // selected form field has been partially filled out.
 TEST_F(AutofillManagerTest, GetProfileSuggestionsMatchCharacter) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   FormFieldData field;
@@ skipping 2246 matching lines @@
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormFieldData& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
 }
 
 }  // namespace autofill