Autofill: Set requirements for number of recognized fields in an autofillable form

components/autofill/core/common/form_data_unittest.cc

Index: components/autofill/core/common/form_data_unittest.cc
diff --git a/components/autofill/core/common/form_data_unittest.cc b/components/autofill/core/common/form_data_unittest.cc
index 788e268ebe168088c5f79242d2b4c4a9bfc11dd8..f66322d9efc7474b099caa86ad29ac7542218a64 100644
--- a/components/autofill/core/common/form_data_unittest.cc
+++ b/components/autofill/core/common/form_data_unittest.cc
@@ -9,13 +9,15 @@
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace autofill {
+
 namespace {
 
 // This function serializes the form data into the pickle in version one format.
 // It should always be possible to deserialize it using DeserializeFormData(),
 // even when version changes. See kPickleVersion in form_data.cc.
-void SerializeInVersion1Format(const autofill::FormData& form_data,
-                               Pickle* pickle) {
+void SerializeInVersion1Format(const FormData& form_data, Pickle* pickle) {
+  DCHECK_EQ(true, form_data.is_in_form_tag);
   pickle->WriteInt(1);
   pickle->WriteString16(form_data.name);
   base::string16 method(base::ASCIIToUTF16("POST"));
@@ -29,10 +31,9 @@ void SerializeInVersion1Format(const autofill::FormData& form_data,
   }
 }
 
-// This function serializes the form data into the pickle in incorrect format
-// (no version number).
-void SerializeIncorrectFormat(const autofill::FormData& form_data,
-                               Pickle* pickle) {
+void SerializeInVersion2Format(const FormData& form_data, Pickle* pickle) {
+  DCHECK_EQ(true, form_data.is_in_form_tag);
+  pickle->WriteInt(2);
   pickle->WriteString16(form_data.name);
   pickle->WriteString(form_data.origin.spec());
   pickle->WriteString(form_data.action.spec());
@@ -43,16 +44,24 @@ void SerializeIncorrectFormat(const autofill::FormData& form_data,
   }
 }
 
+// This function serializes the form data into the pickle in incorrect format
+// (no version number).
+void SerializeIncorrectFormat(const FormData& form_data, Pickle* pickle) {
+  pickle->WriteString16(form_data.name);
+  pickle->WriteString(form_data.origin.spec());
+  pickle->WriteString(form_data.action.spec());
+  pickle->WriteBool(form_data.user_submitted);
+  pickle->WriteInt(static_cast<int>(form_data.fields.size()));
+  for (size_t i = 0; i < form_data.fields.size(); ++i) {
+    SerializeFormFieldData(form_data.fields[i], pickle);
+  }
 }
 
-namespace autofill {
-
-TEST(FormDataTest, SerializeAndDeserialize) {
-  FormData data;
-  data.name = base::ASCIIToUTF16("name");
-  data.origin = GURL("origin");
-  data.action = GURL("action");
-  data.user_submitted = true;
+void FillInDummyFormData(FormData* data) {
+  data->name = base::ASCIIToUTF16("name");
+  data->origin = GURL("origin");
+  data->action = GURL("action");
+  data->user_submitted = true;
 
   FormFieldData field_data;
   field_data.label = base::ASCIIToUTF16("label");
@@ -72,13 +81,21 @@ TEST(FormDataTest, SerializeAndDeserialize) {
   field_data.option_contents.push_back(base::ASCIIToUTF16("First"));
   field_data.option_contents.push_back(base::ASCIIToUTF16("Second"));
 
-  data.fields.push_back(field_data);
+  data->fields.push_back(field_data);
 
   // Change a few fields.
   field_data.max_length = 150;
   field_data.option_values.push_back(base::ASCIIToUTF16("Third"));
   field_data.option_contents.push_back(base::ASCIIToUTF16("Third"));
-  data.fields.push_back(field_data);
+  data->fields.push_back(field_data);
+}
+
+}  // namespace
+
+TEST(FormDataTest, SerializeAndDeserialize) {
+  FormData data;
+  FillInDummyFormData(&data);
+  data.is_in_form_tag = false;
 
   Pickle pickle;
   SerializeFormData(data, &pickle);
@@ -92,36 +109,7 @@ TEST(FormDataTest, SerializeAndDeserialize) {
 
 TEST(FormDataTest, Serialize_v1_Deserialize_vCurrent) {
   FormData data;
-  data.name = base::ASCIIToUTF16("name");
-  data.origin = GURL("origin");
-  data.action = GURL("action");
-  data.user_submitted = true;
-
-  FormFieldData field_data;
-  field_data.label = base::ASCIIToUTF16("label");
-  field_data.name = base::ASCIIToUTF16("name");
-  field_data.value = base::ASCIIToUTF16("value");
-  field_data.form_control_type = "password";
-  field_data.autocomplete_attribute = "off";
-  field_data.max_length = 200;
-  field_data.is_autofilled = true;
-  field_data.is_checked = true;
-  field_data.is_checkable = true;
-  field_data.is_focusable = true;
-  field_data.should_autocomplete = false;
-  field_data.text_direction = base::i18n::RIGHT_TO_LEFT;
-  field_data.option_values.push_back(base::ASCIIToUTF16("First"));
-  field_data.option_values.push_back(base::ASCIIToUTF16("Second"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("First"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("Second"));
-
-  data.fields.push_back(field_data);
-
-  // Change a few fields.
-  field_data.max_length = 150;
-  field_data.option_values.push_back(base::ASCIIToUTF16("Third"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("Third"));
-  data.fields.push_back(field_data);
+  FillInDummyFormData(&data);
 
   Pickle pickle;
   SerializeInVersion1Format(data, &pickle);
@@ -133,38 +121,23 @@ TEST(FormDataTest, Serialize_v1_Deserialize_vCurrent) {
   EXPECT_TRUE(actual.SameFormAs(data));
 }
 
-TEST(FormDataTest, SerializeIncorrectFormatAndDeserialize) {
+TEST(FormDataTest, Serialize_v2_Deserialize_vCurrent) {
   FormData data;
-  data.name = base::ASCIIToUTF16("name");
-  data.origin = GURL("origin");
-  data.action = GURL("action");
-  data.user_submitted = true;
+  FillInDummyFormData(&data);
 
-  FormFieldData field_data;
-  field_data.label = base::ASCIIToUTF16("label");
-  field_data.name = base::ASCIIToUTF16("name");
-  field_data.value = base::ASCIIToUTF16("value");
-  field_data.form_control_type = "password";
-  field_data.autocomplete_attribute = "off";
-  field_data.max_length = 200;
-  field_data.is_autofilled = true;
-  field_data.is_checked = true;
-  field_data.is_checkable = true;
-  field_data.is_focusable = true;
-  field_data.should_autocomplete = false;
-  field_data.text_direction = base::i18n::RIGHT_TO_LEFT;
-  field_data.option_values.push_back(base::ASCIIToUTF16("First"));
-  field_data.option_values.push_back(base::ASCIIToUTF16("Second"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("First"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("Second"));
+  Pickle pickle;
+  SerializeInVersion2Format(data, &pickle);
 
-  data.fields.push_back(field_data);
+  PickleIterator iter(pickle);
+  FormData actual;
+  EXPECT_TRUE(DeserializeFormData(&iter, &actual));
 
-  // Change a few fields.
-  field_data.max_length = 150;
-  field_data.option_values.push_back(base::ASCIIToUTF16("Third"));
-  field_data.option_contents.push_back(base::ASCIIToUTF16("Third"));
-  data.fields.push_back(field_data);
+  EXPECT_TRUE(actual.SameFormAs(data));
+}
+
+TEST(FormDataTest, SerializeIncorrectFormatAndDeserialize) {
+  FormData data;
+  FillInDummyFormData(&data);
 
   Pickle pickle;
   SerializeIncorrectFormat(data, &pickle);