[Autofill] OnLoadedServerPredictions correctly supplies FormStructure to ParseQueryResponse.

components/autofill/core/browser/autofill_manager_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 2587 matching lines @@
   // Set up our form data.
   FormData form;
   test::CreateTestAddressFormData(&form);
 
   // Simulate having seen this form on page load.
   // |form_structure| will be owned by |autofill_manager_|.
   TestFormStructure* form_structure = new TestFormStructure(form);
   form_structure->DetermineHeuristicTypes();
   autofill_manager_->AddSeenForm(form_structure);
 
+  // Similarly, a second form.
+  FormData form2;
+  form2.name = ASCIIToUTF16("MyForm");
+  form2.origin = GURL("http://myform.com/form.html");
+  form2.action = GURL("http://myform.com/submit.html");
+
+  FormFieldData field;
+  test::CreateTestFormField("Last Name", "lastname", "", "text", &field);
+  form2.fields.push_back(field);
+
+  test::CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  form2.fields.push_back(field);
+
+  test::CreateTestFormField("Postal Code", "zipcode", "", "text", &field);
+  form2.fields.push_back(field);
+
+  TestFormStructure* form_structure2 = new TestFormStructure(form2);
+  form_structure2->DetermineHeuristicTypes();
+  autofill_manager_->AddSeenForm(form_structure2);
+
   std::string xml = "<autofillqueryresponse>"
-                    "<field autofilltype=\"3\" />"  // This is tested below.
+                    "<field autofilltype=\"3\" />"  // First test form.
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"0\" />"
                     "<field autofilltype=\"3\" />"
                     "<field autofilltype=\"2\" />"
                     "<field autofilltype=\"61\"/>"
+                    "<field autofilltype=\"5\" />"  // Second form.
+                    "<field autofilltype=\"4\" />"
+                    "<field autofilltype=\"35\"/>"
                     "</autofillqueryresponse>";
   std::vector<std::string> signatures;
   signatures.push_back(form_structure->FormSignature());
+  signatures.push_back(form_structure2->FormSignature());
 
   base::HistogramTester histogram_tester;
   autofill_manager_->OnLoadedServerPredictions(xml, signatures);
   // Verify that FormStructure::ParseQueryResponse was called (here and below).
   histogram_tester.ExpectBucketCount("Autofill.ServerQueryResponse",
                                      AutofillMetrics::QUERY_RESPONSE_RECEIVED,
                                      1);
   histogram_tester.ExpectBucketCount("Autofill.ServerQueryResponse",
                                      AutofillMetrics::QUERY_RESPONSE_PARSED,
                                      1);
   // We expect the server type to have been applied to the first field.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->Type().GetStorableType());
+
+  // We expect the server type to have been applied to the first field.
+  EXPECT_EQ(NAME_LAST, form_structure2->field(0)->Type().GetStorableType());
+  EXPECT_EQ(NAME_MIDDLE, form_structure2->field(1)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_HOME_ZIP,
+            form_structure2->field(2)->Type().GetStorableType());
 }
 
 // Test that OnLoadedServerPredictions does not call ParseQueryResponse if the
 // AutofillManager has been reset between the time the query was sent and the
 // response received.
 TEST_F(AutofillManagerTest, OnLoadedServerPredictions_ResetManager) {
   // Set up our form data.
   FormData form;
   test::CreateTestAddressFormData(&form);
 
@@ skipping 1049 matching lines @@
 
   external_delegate_->CheckSuggestions(
       kDefaultPageID,
       Suggestion("Shawn Smith", "1234 Smith Blvd., Robin Adam Smith Grimes", "",
                  1),
       Suggestion("Adam Smith", "1234 Smith Blvd., Carl Shawn Smith Grimes", "",
                  2));
 }
 
 }  // namespace autofill