[Autofill] No longer pass FormStructure pointers in ParseQueryResponse.

components/autofill/core/browser/form_structure_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/form_structure.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 1465 matching lines @@
   // Add checkable field.
   FormFieldData checkable_field;
   checkable_field.is_checkable = true;
   checkable_field.label = ASCIIToUTF16("Checkable1");
   checkable_field.name = ASCIIToUTF16("Checkable1");
   form.fields.push_back(checkable_field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
   const char kSignature1[] = "11337937696949187602";
   const char kResponse1[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"11337937696949187602\">"
       "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\""
       " label=\"Name on Card\"/><field signature=\"1917667676\""
       " name=\"billing_address\" type=\"text\" label=\"Address\"/>"
       "<field signature=\"2226358947\" name=\"card_number\" type=\"text\""
       " label=\"Card Number\"/><field signature=\"747221617\""
       " name=\"expiration_month\" type=\"text\" label=\"Expiration Date\"/>"
       "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
       " label=\"Expiration Year\"/></form></autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
-  EXPECT_EQ(forms[0], queried_forms[0]);
   EXPECT_EQ(kResponse1, encoded_xml);
 
   // Add the same form, only one will be encoded, so EncodeQueryRequest() should
   // return the same data.
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
-  ASSERT_EQ(1U, queried_forms.size());
-  EXPECT_EQ(forms[0], queried_forms[0]);
   EXPECT_EQ(kResponse1, encoded_xml);
   // Add 5 address fields - this should be still a valid form.
   for (size_t i = 0; i < 5; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   const char kSignature2[] = "8308881815906226214";
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
   const char kResponse2[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
   "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
   "<form signature=\"11337937696949187602\"><field signature=\"412125936\""
   " name=\"name_on_card\" type=\"text\" label=\"Name on Card\"/>"
   "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\""
   " label=\"Address\"/><field signature=\"2226358947\" name=\"card_number\""
@@ skipping 23 matching lines @@
   // Add 50 address fields - the form is not valid anymore, but previous ones
   // are. The result should be the same as in previous test.
   for (size_t i = 0; i < 50; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     malformed_form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(malformed_form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
-  ASSERT_EQ(2U, queried_forms.size());
-  EXPECT_EQ(forms[0], queried_forms[0]);
-  EXPECT_EQ(forms[2], queried_forms[1]);
   EXPECT_EQ(kResponse2, encoded_xml);
 
   // Check that we fail if there are only bad form(s).
   ScopedVector<FormStructure> bad_forms;
   bad_forms.push_back(new FormStructure(malformed_form));
   EXPECT_FALSE(FormStructure::EncodeQueryRequest(
-      bad_forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      bad_forms.get(), &encoded_signatures, &encoded_xml));
   EXPECT_EQ(0U, encoded_signatures.size());
-  EXPECT_EQ(0U, queried_forms.size());
   EXPECT_EQ("", encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
@@ skipping 1166 matching lines @@
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
 
   const char kSignature[] = "18006745212084723782";
   const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"18006745212084723782\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\""
       " label=\"username\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\"/>"
       "</form></autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
-  EXPECT_EQ(forms[0], queried_forms[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeQueryRequest_WithLabels) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
   // No label on the first field.
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Enter your Email address");
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Enter your Password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
 
   const char kRequest[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"13906559713264665730\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\""
       " label=\"Enter your Email address\"/>"
       "<field signature=\"2051817934\" name=\"password\" type=\"password\""
       " label=\"Enter your Password\"/></form></autofillquery>";
   EXPECT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   EXPECT_EQ(kRequest, encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeQueryRequest_WithLongLabels) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
@@ skipping 13 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Enter your Password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
 
   const char kRequest[] =
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"13906559713264665730\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\""
       " label=\"Enter Your Really Really Really (Really!) Long Email Address"
       " Which We Hope To Get In Order To Send You Unwanted Publicity Because"
       " That's What Marketers Do! We Know That Your Email Address Has The"
       " Poss\"/>"
       "<field signature=\"2051817934\" name=\"password\" type=\"password\""
       " label=\"Enter your Password\"/></form></autofillquery>";
   EXPECT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   EXPECT_EQ(kRequest, encoded_xml);
 }
 
 // One name is missing from one field.
 TEST_F(FormStructureTest, EncodeQueryRequest_MissingNames) {
   FormData form;
   // No name set for the form.
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = base::string16();
   // No name set for this field.
   field.name = ASCIIToUTF16("");
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
 
   const char kSignature[] = "16416961345885087496";
   const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"16416961345885087496\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\""
       " label=\"username\"/><field signature=\"1318412689\" type=\"text\"/>"
       "</form></autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
-  EXPECT_EQ(forms[0], queried_forms[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 // Sending field metadata to the server is disabled.
 TEST_F(FormStructureTest, EncodeQueryRequest_DisabledMetadataTrial) {
   DisableAutofillMetadataFieldTrial();
 
   FormData form;
   // No name set for the form.
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("country");
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
-  std::vector<FormStructure*> queried_forms;
   std::string encoded_xml;
 
   const char kSignature[] = "7635954436925888745";
   const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"7635954436925888745\">"
       "<field signature=\"239111655\"/>"
       "<field signature=\"3654076265\"/>"
       "</form></autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
-      forms.get(), &encoded_signatures, &queried_forms, &encoded_xml));
+      forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
-  EXPECT_EQ(forms[0], queried_forms[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 TEST_F(FormStructureTest, PossibleValues) {
   FormData form_data;
   FormFieldData field;
   field.autocomplete_attribute = "billing country";
   field.option_contents.push_back(ASCIIToUTF16("Down Under"));
   field.option_values.push_back(ASCIIToUTF16("AU"));
   field.option_contents.push_back(ASCIIToUTF16("Fr"));
@@ skipping 112 matching lines @@
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get(), nullptr);
 
   ASSERT_GE(forms[0]->field_count(), 2U);
   EXPECT_EQ(NO_SERVER_DATA, forms[0]->field(0)->server_type());
   EXPECT_EQ(76, forms[0]->field(1)->server_type());
 }
 
 }  // namespace autofill