[Autofill] Update the autocomplete types implementation to match the current HTML spec.

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/common/form_data.h"
 #include "chrome/common/form_field_data.h"
@@ skipping 34 matching lines @@
   }
 };
 
 TEST(FormStructureTest, FieldCount) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
-  field.form_control_type = ASCIIToUTF16("password");
+  field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   FormStructure form_structure(form);
 
   // All fields are counted.
   EXPECT_EQ(3U, form_structure.field_count());
 }
 
 TEST(FormStructureTest, AutofillCount) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
-  field.form_control_type = ASCIIToUTF16("password");
+  field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("state");
   field.name = ASCIIToUTF16("state");
-  field.form_control_type = ASCIIToUTF16("select-one");
+  field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes();
 
   // Only text and select fields that are heuristically matched are counted.
   EXPECT_EQ(1U, form_structure.autofill_count());
 }
 
 TEST(FormStructureTest, SourceURL) {
   FormData form;
   form.origin = GURL("http://www.foo.com/");
   form.method = ASCIIToUTF16("post");
   FormStructure form_structure(form);
 
   EXPECT_EQ(form.origin, form_structure.source_url());
 }
 
 TEST(FormStructureTest, IsAutofillable) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   // We need at least three text fields to be auto-fillable.
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
-  field.form_control_type = ASCIIToUTF16("password");
+  field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // We now have three text fields, but only two auto-fillable fields.
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // We now have three auto-fillable fields.
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
-  field.form_control_type = ASCIIToUTF16("email");
+  field.form_control_type = "email";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // The method must be 'post', though we can intentionally ignore this
   // criterion for the sake of providing a helpful warning message to the user.
   form.method = ASCIIToUTF16("get");
   form_structure.reset(new FormStructure(form));
@@ skipping 18 matching lines @@
 TEST(FormStructureTest, ShouldBeParsed) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   // We need at least three text fields to be parseable.
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
 
   // We now have three text fields, though only two are auto-fillable.
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
   // The method must be 'post', though we can intentionally ignore this
   // criterion for the sake of providing a helpful warning message to the user.
   form.method = ASCIIToUTF16("get");
   form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->IsAutofillable(true));
   EXPECT_TRUE(form_structure->ShouldBeParsed(false));
 
   // The target cannot include http(s)://*/search...
   form.method = ASCIIToUTF16("post");
   form.action = GURL("http://google.com/search?q=hello");
   form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
 
   // But search can be in the URL.
   form.action = GURL("http://search.com/?q=hello");
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
   // The form need only have three fields, but at least one must be a text
   // field.
   form.fields.clear();
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
-  field.form_control_type = ASCIIToUTF16("email");
+  field.form_control_type = "email";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("State");
   field.name = ASCIIToUTF16("state");
-  field.form_control_type = ASCIIToUTF16("select-one");
+  field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
-  field.form_control_type = ASCIIToUTF16("select-one");
+  field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
-  form.fields[0].form_control_type = ASCIIToUTF16("select-one");
+  form.fields[0].form_control_type = "select-one";
   form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
 }
 
 TEST(FormStructureTest, HeuristicsContactInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
@@ skipping 11 matching lines @@
   field.label = ASCIIToUTF16("City");
   field.name = ASCIIToUTF16("city");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = ASCIIToUTF16("zipcode");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(8U, form_structure->field_count());
   ASSERT_EQ(7U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
   // Phone.
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
       form_structure->field(3)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(4)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(5)->heuristic_type());
   // Zip.
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(6)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
-// Verify that we can correctly process the |autocompletetype| attribute.
-TEST(FormStructureTest, HeuristicsAutocompletetype) {
+// Verify that we can correctly process the |autocomplete| attribute.
+TEST(FormStructureTest, HeuristicsAutocompleteAttribute) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
-  field.autocomplete_type = ASCIIToUTF16("given-name");
+  field.autocomplete_attribute = "given-name";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field2");
-  field.autocomplete_type = ASCIIToUTF16("surname");
+  field.autocomplete_attribute = "family-name";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field3");
-  field.autocomplete_type = ASCIIToUTF16("email");
+  field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
 }
 
-// Verify that we can correctly process the |autocompletetype| attribute for
-// phone number types (especially phone prefixes and suffixes).
-TEST(FormStructureTest, HeuristicsAutocompletetypePhones) {
+// Verify that we can correctly process the 'autocomplete' attribute for phone
+// number types (especially phone prefixes and suffixes).
+TEST(FormStructureTest, HeuristicsAutocompleteAttributePhoneTypes) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
-  field.autocomplete_type = ASCIIToUTF16("phone-local");
+  field.autocomplete_attribute = "tel-local";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field2");
-  field.autocomplete_type = ASCIIToUTF16("phone-local-prefix");
+  field.autocomplete_attribute = "tel-local-prefix";
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field3");
-  field.autocomplete_type = ASCIIToUTF16("phone-local-suffix");
+  field.autocomplete_attribute = "tel-local-suffix";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   EXPECT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(AutofillField::IGNORED, form_structure->field(0)->phone_part());
   EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(AutofillField::PHONE_PREFIX,
             form_structure->field(1)->phone_part());
   EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(2)->heuristic_type());
   EXPECT_EQ(AutofillField::PHONE_SUFFIX,
             form_structure->field(2)->phone_part());
 }
 
-// If at least one field includes the |autocompletetype| attribute, we should
-// not try to apply any other heuristics.
-TEST(FormStructureTest, AutocompletetypeOverridesOtherHeuristics) {
+// If at least one field includes type hints in the 'autocomplete' attribute, we
+// should not try to apply any other heuristics.
+TEST(FormStructureTest, AutocompleteAttributeOverridesOtherHeuristics) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   // Start with a regular contact form.
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
 
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
 
-  // Now update the first form field to include an 'autocompletetype' attribute.
-  form.fields.front().autocomplete_type = ASCIIToUTF16("x-other");
+  // Now update the first form field to include an 'autocomplete' attribute.
+  form.fields.front().autocomplete_attribute = "x-other";
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_FALSE(form_structure->IsAutofillable(true));
   EXPECT_FALSE(form_structure->ShouldBeCrowdsourced());
 
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(0U, form_structure->autofill_count());
 
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
 }
 
 // Verify that we can correctly process sections listed in the |autocomplete|
 // attribute.
-TEST(FormStructureTest, HeuristicsAutocompletetypeWithSections) {
-  scoped_ptr<FormStructure> form_structure;
+TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSections) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
-  // We expect "shipping" and "billing" to be the most common sections.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field1");
-  field.autocomplete_type = ASCIIToUTF16("section-shipping given-name");
-  form.fields.push_back(field);
-
-  // Some field will have no section specified.  These fall into the default
-  // section, with an empty name.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field2");
-  field.autocomplete_type = ASCIIToUTF16("surname");
+  // Some fields will have no section specified.  These fall into the default
+  // section.
+  field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
   // We allow arbitrary section names.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field3");
-  field.autocomplete_type = ASCIIToUTF16("section-foo address-line1");
+  field.autocomplete_attribute = "section-foo email";
   form.fields.push_back(field);
 
-  // Specifying "section-" is equivalent to not specifying a section.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field4");
-  field.autocomplete_type = ASCIIToUTF16("section- address-line2");
+  // "shipping" and "billing" are special section tokens that don't require the
+  // "section-" prefix.
+  field.autocomplete_attribute = "shipping email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "billing email";
+  form.fields.push_back(field);
+
+  // "shipping" and "billing" can be combined with other section names.
+  field.autocomplete_attribute = "section-foo shipping email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "section-foo billing email";
   form.fields.push_back(field);
 
   // We don't do anything clever to try to coalesce sections; it's up to site
   // authors to avoid typos.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field5");
-  field.autocomplete_type = ASCIIToUTF16("section--shipping locality");
+  field.autocomplete_attribute = "section--foo email";
+  form.fields.push_back(field);
+
+  // "shipping email" and "section--shipping" email should be parsed as
+  // different sections.  This is only an interesting test due to how we
+  // implement implicit section names from attributes like "shipping email"; see
+  // the implementation for more details.
+  field.autocomplete_attribute = "section--shipping email";
   form.fields.push_back(field);
 
   // Credit card fields are implicitly in a separate section from other fields.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field6");
-  field.autocomplete_type = ASCIIToUTF16("section-shipping cc-number");
+  field.autocomplete_attribute = "section-foo cc-number";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form));
-  form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutofillable(true));
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+  EXPECT_TRUE(form_structure.IsAutofillable(true));
 
   // Expect the correct number of fields.
-  ASSERT_EQ(6U, form_structure->field_count());
-  ASSERT_EQ(6U, form_structure->autofill_count());
+  ASSERT_EQ(9U, form_structure.field_count());
+  EXPECT_EQ(9U, form_structure.autofill_count());
 
-  EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("shipping-default"),
-            form_structure->field(0)->section());
-  EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("-default"), form_structure->field(1)->section());
-  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(2)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("foo-default"), form_structure->field(2)->section());
-  EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(3)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("-default"), form_structure->field(3)->section());
-  EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(4)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("-shipping-default"),
-            form_structure->field(4)->section());
-  EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(5)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("shipping-cc"), form_structure->field(5)->section());
+  // All of the fields in this form should be parsed as belonging to different
+  // sections.
+  std::set<std::string> section_names;
+  for (size_t i = 0; i < 9; ++i) {
+    section_names.insert(form_structure.field(i)->section());
+  }
+  EXPECT_EQ(9U, section_names.size());
 }
 
-// Verify that we can correctly process fallback types listed in the
-// |autocompletetype| attribute.
-TEST(FormStructureTest, HeuristicsAutocompletetypeWithFallbacks) {
-  scoped_ptr<FormStructure> form_structure;
+// Verify that we can correctly process a degenerate section listed in the
+// |autocomplete| attribute.
+TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsDegenerate) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
-  // Skip over any sections and "x"-prefixed types.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field1");
-  field.autocomplete_type =
-      ASCIIToUTF16("section-full-name x-given-name-initial given-name");
+  // Some fields will have no section specified.  These fall into the default
+  // section.
+  field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
-  // Stop processing once we see a known type.
-  field.label = string16();
-  field.name = ASCIIToUTF16("field2");
-  field.autocomplete_type = ASCIIToUTF16("section-full-name surname full-name");
+  // Specifying "section-" is equivalent to not specifying a section.
+  field.autocomplete_attribute = "section- email";
   form.fields.push_back(field);
 
-  // Skip over unknown types even if they are not prefixed with "x-".
-  field.label = string16();
-  field.name = ASCIIToUTF16("field3");
-  field.autocomplete_type =
-      ASCIIToUTF16("section-shipping mobile-phone-full phone-full");
+  // Invalid tokens should prevent us from setting a section name.
+  field.autocomplete_attribute = "garbage section-foo email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "garbage section-bar email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "garbage shipping email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "garbage billing email";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form));
-  form_structure->DetermineHeuristicTypes();
-  EXPECT_TRUE(form_structure->IsAutofillable(true));
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
 
   // Expect the correct number of fields.
-  ASSERT_EQ(3U, form_structure->field_count());
-  ASSERT_EQ(3U, form_structure->autofill_count());
+  ASSERT_EQ(6U, form_structure.field_count());
+  EXPECT_EQ(2U, form_structure.autofill_count());
 
-  EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("full-name-default"),
-            form_structure->field(0)->section());
-  EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("full-name-default"),
-            form_structure->field(1)->section());
-  EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
-            form_structure->field(2)->heuristic_type());
-  EXPECT_EQ(ASCIIToUTF16("shipping-default"),
-            form_structure->field(2)->section());
+  // All of the fields in this form should be parsed as belonging to the same
+  // section.
+  std::set<std::string> section_names;
+  for (size_t i = 0; i < 6; ++i) {
+    section_names.insert(form_structure.field(i)->section());
+  }
+  EXPECT_EQ(1U, section_names.size());
+}
+
+// Verify that we can correctly process repeated sections listed in the
+// |autocomplete| attribute.
+TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsRepeated) {
+  FormData form;
+  form.method = ASCIIToUTF16("post");
+
+  FormFieldData field;
+  field.form_control_type = "text";
+
+  field.autocomplete_attribute = "section-foo email";
+  form.fields.push_back(field);
+  field.autocomplete_attribute = "section-foo street-address";
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+
+  // Expect the correct number of fields.
+  ASSERT_EQ(2U, form_structure.field_count());
+  EXPECT_EQ(2U, form_structure.autofill_count());
+
+  // All of the fields in this form should be parsed as belonging to the same
+  // section.
+  std::set<std::string> section_names;
+  for (size_t i = 0; i < 2; ++i) {
+    section_names.insert(form_structure.field(i)->section());
+  }
+  EXPECT_EQ(1U, section_names.size());
+}
+
+// Verify that we do not override the author-specified sections from a form with
+// local heuristics.
+TEST(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) {
+  FormData form;
+  form.method = ASCIIToUTF16("post");
+
+  FormFieldData field;
+  field.form_control_type = "text";
+
+  field.name = ASCIIToUTF16("one");
+  field.autocomplete_attribute = "street-address";
+  form.fields.push_back(field);
+  field.name = string16();
+  field.autocomplete_attribute = "section-foo email";
+  form.fields.push_back(field);
+  field.name = string16();
+  field.autocomplete_attribute = "name";
+  form.fields.push_back(field);
+  field.name = ASCIIToUTF16("two");
+  field.autocomplete_attribute = "street-address";
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+
+  // Expect the correct number of fields.
+  ASSERT_EQ(4U, form_structure.field_count());
+  EXPECT_EQ(4U, form_structure.autofill_count());
+
+  // Normally, the two separate address fields would cause us to detect two
+  // separate sections; but because there is an author-specified section in this
+  // form, we do not apply these usual heuristics.
+  EXPECT_EQ(ASCIIToUTF16("one"), form_structure.field(0)->name);
+  EXPECT_EQ(ASCIIToUTF16("two"), form_structure.field(3)->name);
+  EXPECT_EQ(form_structure.field(0)->section(),
+            form_structure.field(3)->section());
 }
 
 TEST(FormStructureTest, HeuristicsSample8) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Your First Name:");
   field.name = ASCIIToUTF16("bill.first");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Your Last Name:");
   field.name = ASCIIToUTF16("bill.last");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Street Address Line 1:");
@@ skipping 19 matching lines @@
   field.label = ASCIIToUTF16("Country:");
   field.name = ASCIIToUTF16("bill.country");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Phone Number:");
   field.name = ASCIIToUTF16("BillTo.Phone");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(10U, form_structure->field_count());
   ASSERT_EQ(9U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
@@ skipping 18 matching lines @@
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(9)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsSample6) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("E-mail address");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Full name");
   field.name = ASCIIToUTF16("name");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Company");
   field.name = ASCIIToUTF16("company");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City");
   field.name = ASCIIToUTF16("city");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Zip Code");
   field.name = ASCIIToUTF16("Home.PostalCode");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
   field.value = ASCIIToUTF16("continue");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(6U, form_structure->autofill_count());
 
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(0)->heuristic_type());
@@ skipping 13 matching lines @@
 
 // Tests a sequence of FormFields where only labels are supplied to heuristics
 // for matching.  This works because FormFieldData labels are matched in the
 // case that input element ids (or |name| fields) are missing.
 TEST(FormStructureTest, HeuristicsLabelsOnly) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
@@ skipping 11 matching lines @@
   field.label = ASCIIToUTF16("Address");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(8U, form_structure->field_count());
   ASSERT_EQ(7U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
@@ skipping 13 matching lines @@
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(6U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Credit card number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(1)->heuristic_type());
   // Credit card expiration month.
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(2)->heuristic_type());
   // Credit card expiration year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(3)->heuristic_type());
   // We don't determine CVV.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(4)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(5)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsCreditCardInfoWithUnknownCardField) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   // This is not a field we know how to process.  But we should skip over it
   // and process the other fields in the card block.
   field.label = ASCIIToUTF16("Card Type");
   field.name = ASCIIToUTF16("card_type");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
-  field.form_control_type = ASCIIToUTF16("submit");
+  field.form_control_type = "submit";
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
@@ skipping 11 matching lines @@
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(6)->heuristic_type());
 }
 
 TEST(FormStructureTest, ThreeAddressLines) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Address Line1");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line2");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line3");
@@ skipping 21 matching lines @@
 }
 
 // This test verifies that "addressLine1" and "addressLine2" matches heuristics.
 // This occured in https://www.gorillaclothing.com/.  http://crbug.com/52126.
 TEST(FormStructureTest, BillingAndShippingAddresses) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Address Line1");
   field.name = ASCIIToUTF16("shipping.address.addressLine1");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line2");
   field.name = ASCIIToUTF16("shipping.address.addressLine2");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line1");
@@ skipping 25 matching lines @@
 // indicate a suite or apartment number.  We interpret this as address line 2.
 // And the following "Street address second line" we interpret as address line
 // 3 and discard.
 // See http://crbug.com/48197 for details.
 TEST(FormStructureTest, ThreeAddressLinesExpedia) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Street:");
   field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_ads1");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Suite or Apt:");
   field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adap");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Street address second line");
@@ skipping 22 matching lines @@
 
 // This example comes from ebay.com where the word "suite" appears in the label
 // and the name "address2" clearly indicates that this is the address line 2.
 // See http://crbug.com/48197 for details.
 TEST(FormStructureTest, TwoAddressLinesEbay) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Address Line1");
   field.name = ASCIIToUTF16("address1");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Floor number, suite number, etc");
   field.name = ASCIIToUTF16("address2");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City:");
@@ skipping 13 matching lines @@
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(2)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsStateWithProvince) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Address Line1");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line2");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("State/Province/Region");
@@ skipping 14 matching lines @@
   EXPECT_EQ(ADDRESS_HOME_STATE, form_structure->field(2)->heuristic_type());
 }
 
 // This example comes from lego.com's checkout page.
 TEST(FormStructureTest, HeuristicsWithBilling) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name*:");
   field.name = ASCIIToUTF16("editBillingAddress$firstNameBox");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name*:");
   field.name = ASCIIToUTF16("editBillingAddress$lastNameBox");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Company Name:");
@@ skipping 52 matching lines @@
             form_structure->field(9)->heuristic_type());
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(10)->heuristic_type());
 }
 
 TEST(FormStructureTest, ThreePartPhoneNumber) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Phone:");
   field.name = ASCIIToUTF16("dayphone1");
   field.max_length = 0;
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("-");
   field.name = ASCIIToUTF16("dayphone2");
   field.max_length = 3;  // Size of prefix is 3.
   form.fields.push_back(field);
@@ skipping 27 matching lines @@
   // Unknown.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(3)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsInfernoCC) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("billing_address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Card Number");
@@ skipping 28 matching lines @@
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(4)->heuristic_type());
 }
 
 TEST(FormStructureTest, CVCCodeClash) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card number");
   field.name = ASCIIToUTF16("ccnumber");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("First name");
   field.name = ASCIIToUTF16("first_name");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last name");
@@ skipping 33 matching lines @@
             form_structure->field(4)->heuristic_type());
   // CVC code should not match.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(5)->heuristic_type());
 }
 
 TEST(FormStructureTest, EncodeQueryRequest) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("billing_address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Card Number");
@@ skipping 94 matching lines @@
 
 TEST(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<FieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  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.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.back().insert(NAME_LAST);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
-  field.form_control_type = ASCIIToUTF16("email");
+  field.form_control_type = "email";
   form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(EMAIL_ADDRESS);
 
   field.label = ASCIIToUTF16("Phone");
   field.name = ASCIIToUTF16("phone");
-  field.form_control_type = ASCIIToUTF16("number");
+  field.form_control_type = "number";
   form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(PHONE_HOME_WHOLE_NUMBER);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
-  field.form_control_type = ASCIIToUTF16("select-one");
+  field.form_control_type = "select-one";
   form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
   form_structure.reset(new FormStructure(form));
 
   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;
@@ skipping 32 matching lines @@
             "<field signature=\"1029417091\" autofilltype=\"9\"/>"
             "<field signature=\"466116101\" autofilltype=\"14\"/>"
             "<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 = ASCIIToUTF16("text");
+    field.form_control_type = "text";
     form.fields.push_back(field);
     possible_field_types.push_back(FieldTypeSet());
     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));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
@@ skipping 19 matching lines @@
             "<field signature=\"509334676\" autofilltype=\"31\"/>"
             "<field signature=\"509334676\" autofilltype=\"37\"/>"
             "<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 = ASCIIToUTF16("text");
+    field.form_control_type = "text";
     form.fields.push_back(field);
     possible_field_types.push_back(FieldTypeSet());
     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));
   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));
 }
 
 // Check that we compute the "datapresent" string correctly for the given
 // |available_types|.
 TEST(FormStructureTest, CheckDataPresence) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("last");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
@@ skipping 233 matching lines @@
   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;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  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.back().insert(EMAIL_ADDRESS);
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
   form.fields.push_back(field);
@@ skipping 85 matching lines @@
             encoded_xml);
 }
 
 TEST(FormStructureTest, CheckFormSignature) {
   // Check that form signature is created correctly.
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  field.form_control_type = ASCIIToUTF16("text");
+  field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
@@ skipping 13 matching lines @@
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.name = ASCIIToUTF16("login_form");
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 }