[Autofill] Distinguish between native field types and potentially HTML field types.

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/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/browser/autocheckout_page_meta_data.h"
@@ skipping 1649 matching lines @@
       "signature=\"509334676\"/><field signature=\"509334676\"/><field "
       "signature=\"509334676\"/><field signature=\"509334676\"/></form>"
       "</autofillquery>";
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature3, encoded_signatures[0]);
   EXPECT_EQ(kResponse3, encoded_xml);
 }
 
 TEST(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
-  std::vector<FieldTypeSet> possible_field_types;
+  std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
   form_structure.reset(new FormStructure(form, std::string()));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_LAST);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "email";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(EMAIL_ADDRESS);
 
   field.label = ASCIIToUTF16("Phone");
   field.name = ASCIIToUTF16("phone");
   field.form_control_type = "number";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(PHONE_HOME_WHOLE_NUMBER);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
   // 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);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
   form_structure.reset(new FormStructure(form, std::string()));
 
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
-  FieldTypeSet available_field_types;
+  ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_COUNTRY);
   available_field_types.insert(ADDRESS_BILLING_LINE1);
   available_field_types.insert(ADDRESS_BILLING_LINE2);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
 
@@ skipping 24 matching lines @@
             "<field signature=\"2799270304\" autofilltype=\"36\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // Add 2 address fields - this should be still a valid form.
   for (size_t i = 0; i < 2; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     field.form_control_type = "text";
     form.fields.push_back(field);
-    possible_field_types.push_back(FieldTypeSet());
+    possible_field_types.push_back(ServerFieldTypeSet());
     possible_field_types.back().insert(ADDRESS_HOME_LINE1);
     possible_field_types.back().insert(ADDRESS_HOME_LINE2);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE1);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE2);
   }
 
   form_structure.reset(new FormStructure(form, std::string()));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
@@ skipping 19 matching lines @@
             "<field signature=\"509334676\" autofilltype=\"38\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // Add 50 address fields - now the form is invalid, as it has too many fields.
   for (size_t i = 0; i < 50; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     field.form_control_type = "text";
     form.fields.push_back(field);
-    possible_field_types.push_back(FieldTypeSet());
+    possible_field_types.push_back(ServerFieldTypeSet());
     possible_field_types.back().insert(ADDRESS_HOME_LINE1);
     possible_field_types.back().insert(ADDRESS_HOME_LINE2);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE1);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE2);
   }
   form_structure.reset(new FormStructure(form, std::string()));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
   EXPECT_FALSE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                    &encoded_xml));
 }
 
 TEST(FormStructureTest, EncodeFieldAssignments) {
   scoped_ptr<FormStructure> form_structure;
-  std::vector<FieldTypeSet> possible_field_types;
+  std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
   form_structure.reset(new FormStructure(form, std::string()));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_LAST);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "email";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(EMAIL_ADDRESS);
 
   field.label = ASCIIToUTF16("Phone");
   field.name = ASCIIToUTF16("phone");
   field.form_control_type = "number";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(PHONE_HOME_WHOLE_NUMBER);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
   // 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);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
   form_structure.reset(new FormStructure(form, std::string()));
 
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
-  FieldTypeSet available_field_types;
+  ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_COUNTRY);
   available_field_types.insert(ADDRESS_BILLING_LINE1);
   available_field_types.insert(ADDRESS_BILLING_LINE2);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
 
@@ skipping 11 matching lines @@
       "<fields fieldid=\"3410250678\" fieldtype=\"36\" name=\"Checkable1\"/>"
       "</fieldassignments>",
       encoded_xml);
 
   // Add 2 address fields - this should be still a valid form.
   for (size_t i = 0; i < 2; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     field.form_control_type = "text";
     form.fields.push_back(field);
-    possible_field_types.push_back(FieldTypeSet());
+    possible_field_types.push_back(ServerFieldTypeSet());
     possible_field_types.back().insert(ADDRESS_HOME_LINE1);
     possible_field_types.back().insert(ADDRESS_HOME_LINE2);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE1);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE2);
   }
 
   form_structure.reset(new FormStructure(form, std::string()));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
@@ skipping 37 matching lines @@
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("last");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
   FormStructure form_structure(form, std::string());
 
-  FieldTypeSet unknown_type;
+  ServerFieldTypeSet unknown_type;
   unknown_type.insert(UNKNOWN_TYPE);
   for (size_t i = 0; i < form_structure.field_count(); ++i)
     form_structure.field(i)->set_possible_types(unknown_type);
 
   // No available types.
   // datapresent should be "" == trimmmed(0x0000000000000000) ==
   //     0b0000000000000000000000000000000000000000000000000000000000000000
-  FieldTypeSet available_field_types;
+  ServerFieldTypeSet available_field_types;
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
             " formsignature=\"6402244543831589061\" autofillused=\"false\""
             " datapresent=\"\">"
             "<field signature=\"1089846351\" autofilltype=\"1\"/>"
             "<field signature=\"2404144663\" autofilltype=\"1\"/>"
@@ skipping 192 matching lines @@
   //     0b0001010001000000000000000000001101100000000000000000000000001000
   // The set bits are:
   //  3 == NAME_FIRST
   //  5 == NAME_LAST
   //  9 == EMAIL_ADDRESS
   // 30 == ADDRESS_HOME_LINE1
   // 31 == ADDRESS_HOME_LINE2
   // 33 == ADDRESS_HOME_CITY
   // 34 == ADDRESS_HOME_STATE
   // 60 == COMPANY_NAME
-  FieldTypeSet available_field_types;
+  ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_CITY);
   available_field_types.insert(ADDRESS_HOME_STATE);
   available_field_types.insert(COMPANY_NAME);
 
   // Check that multiple types for the field are processed correctly.
   scoped_ptr<FormStructure> form_structure;
-  std::vector<FieldTypeSet> possible_field_types;
+  std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(EMAIL_ADDRESS);
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("last");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_LAST);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("address");
   form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
+  possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_LINE1);
 
   form_structure.reset(new FormStructure(form, std::string()));
 
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
   std::string encoded_xml;
 
   // Now we matched both fields singularly.
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
@@ skipping 207 matching lines @@
       "<autofillqueryresponse><field autofilltype=\"3\" />"
       "<field autofilltype=\"9\" /></autofillqueryresponse>";
   FormStructure::ParseQueryResponse(kServerResponse, forms.get(),
                                     &page_meta_data, TestAutofillMetrics());
   ASSERT_EQ(NAME_FIRST, forms[0]->field(0)->server_type());
   ASSERT_EQ(NO_SERVER_DATA, forms[0]->field(1)->server_type());
   ASSERT_EQ(EMAIL_ADDRESS, forms[0]->field(2)->server_type());
 }
 
 }  // namespace autofill