Refactor webkit_glue::FormField to remove hacky methods

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 "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
 using webkit_glue::FormData;
+using webkit_glue::FormField;
 using WebKit::WebInputElement;
 
 namespace webkit_glue {
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {
   os << UTF16ToUTF8(form.name)
      << " "
      << UTF16ToUTF8(form.method)
      << " "
      << form.origin.spec()
@@ skipping 18 matching lines @@
   static std::string Hash64Bit(const std::string& str) {
     return FormStructure::Hash64Bit(str);
   }
 };
 
 namespace {
 
 TEST(FormStructureTest, FieldCount) {
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
-                                               ASCIIToUTF16("password"),
-                                               string16(),
-                                               ASCIIToUTF16("password"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");
+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("password");
+  field.name = ASCIIToUTF16("password");
+  field.form_control_type = ASCIIToUTF16("password");
+  form.fields.push_back(field);
+
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
-                                               ASCIIToUTF16("password"),
-                                               string16(),
-                                               ASCIIToUTF16("password"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("state"),
-                                               ASCIIToUTF16("state"),
-                                               string16(),
-                                               ASCIIToUTF16("select-one"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");
+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("password");
+  field.name = ASCIIToUTF16("password");
+  field.form_control_type = ASCIIToUTF16("password");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("state");
+  field.name = ASCIIToUTF16("state");
+  field.form_control_type = ASCIIToUTF16("select-one");
+  form.fields.push_back(field);
+
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
-                                               ASCIIToUTF16("password"),
-                                               string16(),
-                                               ASCIIToUTF16("password"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");
+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("password");
+  field.name = ASCIIToUTF16("password");
+  field.form_control_type = ASCIIToUTF16("password");
+  form.fields.push_back(field);
+
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("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.
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               ASCIIToUTF16("firstname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               ASCIIToUTF16("lastname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("First Name");
+  field.name = ASCIIToUTF16("firstname");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Last Name");
+  field.name = ASCIIToUTF16("lastname");
+  field.form_control_type = ASCIIToUTF16("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.
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Email"),
-                                               ASCIIToUTF16("email"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("Email");
+  field.name = ASCIIToUTF16("email");
+  field.form_control_type = ASCIIToUTF16("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));
   form_structure->DetermineHeuristicTypes();
   EXPECT_FALSE(form_structure->IsAutofillable(true));
@@ skipping 12 matching lines @@
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 }
 
 TEST(FormStructureTest, ShouldBeParsed) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   // We need at least three text fields to be parseable.
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.label = ASCIIToUTF16("username");
+  field.name = ASCIIToUTF16("username");
+  field.form_control_type = ASCIIToUTF16("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.
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               ASCIIToUTF16("firstname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               ASCIIToUTF16("lastname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  field.label = ASCIIToUTF16("First Name");
+  field.name = ASCIIToUTF16("firstname");
+  field.form_control_type = ASCIIToUTF16("text");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Last Name");
+  field.name = ASCIIToUTF16("lastname");
+  field.form_control_type = ASCIIToUTF16("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();
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Email"),
-                                               ASCIIToUTF16("email"),
-                                               string16(),
-                                               ASCIIToUTF16("email"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("State"),
-                                               ASCIIToUTF16("state"),
-                                               string16(),
-                                               ASCIIToUTF16("select-one"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Country"),
-                                               ASCIIToUTF16("country"),
-                                               string16(),
-                                               ASCIIToUTF16("select-one"),
-                                               0,
-                                               false));
+
+  field.label = ASCIIToUTF16("Email");
+  field.name = ASCIIToUTF16("email");
+  field.form_control_type = ASCIIToUTF16("email");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("State");
+  field.name = ASCIIToUTF16("state");
+  field.form_control_type = ASCIIToUTF16("select-one");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Country");
+  field.name = ASCIIToUTF16("country");
+  field.form_control_type = ASCIIToUTF16("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_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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               ASCIIToUTF16("firstname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               ASCIIToUTF16("lastname"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("EMail"),
-                                               ASCIIToUTF16("email"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Phone"),
-                                               ASCIIToUTF16("phone"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Fax"),
-                                               ASCIIToUTF16("fax"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                               ASCIIToUTF16("address"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("City"),
-                                               ASCIIToUTF16("city"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Zip code"),
-                                               ASCIIToUTF16("zipcode"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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);
+
+  field.label = ASCIIToUTF16("Phone");
+  field.name = ASCIIToUTF16("phone");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Fax");
+  field.name = ASCIIToUTF16("fax");
+  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("zipcode");
+  form.fields.push_back(field);
+
+  field.label = string16();
+  field.name = ASCIIToUTF16("Submit");
+  field.form_control_type = ASCIIToUTF16("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(9U, form_structure->field_count());
   ASSERT_EQ(8U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
@@ skipping 12 matching lines @@
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(6)->heuristic_type());
   // Zip.
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(7)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(8)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsSample8) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
+  form.method = ASCIIToUTF16("post");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Your First Name:"),
-                             ASCIIToUTF16("bill.first"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Your Last Name:"),
-                             ASCIIToUTF16("bill.last"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Street Address Line 1:"),
-                             ASCIIToUTF16("bill.street1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Street Address Line 2:"),
-                             ASCIIToUTF16("bill.street2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City:"),
-                             ASCIIToUTF16("bill.city"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("State (U.S.):"),
-                             ASCIIToUTF16("bill.state"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Zip/Postal Code:"),
-                             ASCIIToUTF16("BillTo.PostalCode"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Country:"),
-                             ASCIIToUTF16("bill.country"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Phone Number:"),
-                             ASCIIToUTF16("BillTo.Phone"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(string16(),
-                             ASCIIToUTF16("Submit"),
-                             string16(),
-                             ASCIIToUTF16("submit"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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:");
+  field.name = ASCIIToUTF16("bill.street1");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Street Address Line 2:");
+  field.name = ASCIIToUTF16("bill.street2");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("City");
+  field.name = ASCIIToUTF16("bill.city");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("State (U.S.):");
+  field.name = ASCIIToUTF16("bill.state");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Zip/Postal Code:");
+  field.name = ASCIIToUTF16("BillTo.PostalCode");
+  form.fields.push_back(field);
+
+  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");
+  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());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
@@ skipping 13 matching lines @@
   // Phone.
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
       form_structure->field(8)->heuristic_type());
   // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("E-mail address"),
-                             ASCIIToUTF16("email"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Full name"),
-                             ASCIIToUTF16("name"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Company"),
-                             ASCIIToUTF16("company"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address"),
-                             ASCIIToUTF16("address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City"),
-                             ASCIIToUTF16("city"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  // TODO(jhawkins): Add state select control.
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Zip Code"),
-                             ASCIIToUTF16("Home.PostalCode"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  // TODO(jhawkins): Phone number.
-  form.fields.push_back(
-      webkit_glue::FormField(string16(),
-                             ASCIIToUTF16("Submit"),
-                             ASCIIToUTF16("continue"),
-                             ASCIIToUTF16("submit"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  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());
   // Full name.
   EXPECT_EQ(NAME_FULL, form_structure->field(1)->heuristic_type());
   // Company
   EXPECT_EQ(COMPANY_NAME, form_structure->field(2)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(3)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(4)->heuristic_type());
   // Zip.
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(5)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(6)->heuristic_type());
 }
 
 // Tests a sequence of FormFields where only labels are supplied to heuristics
 // for matching.  This works because FormField 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("EMail"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Phone"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Fax"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Zip code"),
-                                               string16(),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = string16();
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Phone");
+  field.name = string16();
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Fax");
+  field.name = string16();
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Address");
+  field.name = string16();
+  form.fields.push_back(field);
+
+  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");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(9U, form_structure->field_count());
   ASSERT_EQ(8U, 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());
@@ skipping 10 matching lines @@
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(6)->heuristic_type());
   // Zip.
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(7)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(8)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
+  form.method = ASCIIToUTF16("post");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
-                                               ASCIIToUTF16("name on card"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16("card_number"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Exp Month"),
-                                               ASCIIToUTF16("ccmonth"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
-                                               ASCIIToUTF16("ccyear"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Verification"),
-                                               ASCIIToUTF16("verification"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
-                                               ASCIIToUTF16("name on card"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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.
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card Type"),
-                                               ASCIIToUTF16("card_type"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16("card_number"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Exp Month"),
-                                               ASCIIToUTF16("ccmonth"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
-                                               ASCIIToUTF16("ccyear"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Verification"),
-                                               ASCIIToUTF16("verification"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0,
-                                               false));
+  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");
+  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());
   // Credit card type.  This is an unknown type but related to the credit card.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   // Credit card number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(2)->heuristic_type());
   // Credit card expiration month.
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(3)->heuristic_type());
   // Credit card expiration year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(4)->heuristic_type());
   // We don't determine CVV.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(5)->heuristic_type());
   // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line1"),
-                             ASCIIToUTF16("Address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line2"),
-                             ASCIIToUTF16("Address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line3"),
-                             ASCIIToUTF16("Address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City"),
-                             ASCIIToUTF16("city"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("Address");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("City");
+  field.name = ASCIIToUTF16("city");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(3)->heuristic_type());
 }
 
 // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line1"),
-                             ASCIIToUTF16("shipping.address.addressLine1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line2"),
-                             ASCIIToUTF16("shipping.address.addressLine2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line1"),
-                             ASCIIToUTF16("billing.address.addressLine1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line2"),
-                             ASCIIToUTF16("billing.address.addressLine2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("billing.address.addressLine1");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Address Line2");
+  field.name = ASCIIToUTF16("billing.address.addressLine2");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 1.
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(2)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_BILLING_LINE2, form_structure->field(3)->heuristic_type());
 }
 
 
 // This example comes from expedia.com where they use a "Suite" label to
 // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Street:"),
-                             ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_ads1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Suite or Apt:"),
-                             ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adap"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Street address second line"),
-                             ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_ads2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City:"),
-                             ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adct"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_ads2");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("City:");
+  field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adct");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   EXPECT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Suite / Apt.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(3)->heuristic_type());
 }
 
 // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line1"),
-                             ASCIIToUTF16("address1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Floor number, suite number, etc"),
-                             ASCIIToUTF16("address2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City"),
-                             ASCIIToUTF16("city"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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:");
+  field.name = ASCIIToUTF16("city");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // 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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line1"),
-                             ASCIIToUTF16("Address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address Line2"),
-                             ASCIIToUTF16("Address"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("State/Province/Region"),
-                             ASCIIToUTF16("State"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("State");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // State.
   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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("First Name*:"),
-                             ASCIIToUTF16("editBillingAddress$firstNameBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Last Name*:"),
-                             ASCIIToUTF16("editBillingAddress$lastNameBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Company Name:"),
-                             ASCIIToUTF16("editBillingAddress$companyBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Address*:"),
-                             ASCIIToUTF16("editBillingAddress$addressLine1Box"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Apt/Suite :"),
-                             ASCIIToUTF16("editBillingAddress$addressLine2Box"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("City*:"),
-                             ASCIIToUTF16("editBillingAddress$cityBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("State/Province*:"),
-                             ASCIIToUTF16("editBillingAddress$stateDropDown"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Country*:"),
-                             ASCIIToUTF16("editBillingAddress$countryDropDown"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Postal Code*:"),
-                             ASCIIToUTF16("editBillingAddress$zipCodeBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Phone*:"),
-                             ASCIIToUTF16("editBillingAddress$phoneBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Email Address*:"),
-                             ASCIIToUTF16("email$emailBox"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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:");
+  field.name = ASCIIToUTF16("editBillingAddress$companyBox");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Address*:");
+  field.name = ASCIIToUTF16("editBillingAddress$addressLine1Box");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Apt/Suite :");
+  field.name = ASCIIToUTF16("editBillingAddress$addressLine2Box");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("City*:");
+  field.name = ASCIIToUTF16("editBillingAddress$cityBox");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("State/Province*:");
+  field.name = ASCIIToUTF16("editBillingAddress$stateDropDown");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Country*:");
+  field.name = ASCIIToUTF16("editBillingAddress$countryDropDown");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Postal Code*:");
+  field.name = ASCIIToUTF16("editBillingAddress$zipCodeBox");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Phone*:");
+  field.name = ASCIIToUTF16("editBillingAddress$phoneBox");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Email Address*:");
+  field.name = ASCIIToUTF16("email$emailBox");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(11U, form_structure->field_count());
   ASSERT_EQ(11U, 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(COMPANY_NAME, form_structure->field(2)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(3)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE2, form_structure->field(4)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_CITY, form_structure->field(5)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_STATE, form_structure->field(6)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_COUNTRY,
             form_structure->field(7)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_ZIP, form_structure->field(8)->heuristic_type());
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
             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");
 
-  form.method = ASCIIToUTF16("post");
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("Phone:"),
-                             ASCIIToUTF16("dayphone1"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("-"),
-                             ASCIIToUTF16("dayphone2"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             3,  // Size of prefix is 3.
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("-"),
-                             ASCIIToUTF16("dayphone3"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             4,  // Size of suffix is 4. If unlimited size is
-                                 // passed, phone will be parsed as
-                                 // <country code> - <area code> - <phone>.
-                             false));
-  form.fields.push_back(
-      webkit_glue::FormField(ASCIIToUTF16("ext.:"),
-                             ASCIIToUTF16("dayphone4"),
-                             string16(),
-                             ASCIIToUTF16("text"),
-                             0,
-                             false));
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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);
+
+  field.label = ASCIIToUTF16("-");
+  field.name = ASCIIToUTF16("dayphone3");
+  field.max_length = 4;  // Size of suffix is 4.  If unlimited size is
+                         // passed, phone will be parsed as
+                         // <country code> - <area code> - <phone>.
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("ext.:");
+  field.name = ASCIIToUTF16("dayphone4");
+  field.max_length = 0;
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Area code.
   EXPECT_EQ(PHONE_HOME_CITY_CODE, form_structure->field(0)->heuristic_type());
   // Phone number suffix.
   EXPECT_EQ(PHONE_HOME_NUMBER,
             form_structure->field(1)->heuristic_type());
   // Phone number suffix.
   EXPECT_EQ(PHONE_HOME_NUMBER,
             form_structure->field(2)->heuristic_type());
   // 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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
-                                               ASCIIToUTF16("name_on_card"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                               ASCIIToUTF16("billing_address"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16("card_number"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration Date"),
-                                               ASCIIToUTF16("expiration_month"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration Year"),
-                                               ASCIIToUTF16("expiration_year"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("card_number");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Expiration Date");
+  field.name = ASCIIToUTF16("expiration_month");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Expiration Year");
+  field.name = ASCIIToUTF16("expiration_year");
+  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(5U, form_structure->field_count());
   EXPECT_EQ(5U, form_structure->autofill_count());
 
   // Name on Card.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(1)->heuristic_type());
   // Card Number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(2)->heuristic_type());
   // Expiration Date.
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(3)->heuristic_type());
   // Expiration Year.
   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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card number"),
-                                               ASCIIToUTF16("ccnumber"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First name"),
-                                               ASCIIToUTF16("first_name"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last name"),
-                                               ASCIIToUTF16("last_name"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration date"),
-                                               ASCIIToUTF16("ccexpiresmonth"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16(""),
-                                               ASCIIToUTF16("ccexpiresyear"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("cvc number"),
-                                               ASCIIToUTF16("csc"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("last_name");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Expiration date");
+  field.name = ASCIIToUTF16("ccexpiresmonth");
+  form.fields.push_back(field);
+
+  field.label = string16();
+  field.name = ASCIIToUTF16("ccexpiresyear");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("cvc number");
+  field.name = ASCIIToUTF16("csc");
+  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(6U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Card Number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(0)->heuristic_type());
   // First name, taken as name on card.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(1)->heuristic_type());
   // Last name is not merged.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
   // Expiration Date.
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(3)->heuristic_type());
   // Expiration Year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Name on Card"),
-                                               ASCIIToUTF16("name_on_card"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                               ASCIIToUTF16("billing_address"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Card Number"),
-                                               ASCIIToUTF16("card_number"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration Date"),
-                                               ASCIIToUTF16("expiration_month"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration Year"),
-                                               ASCIIToUTF16("expiration_year"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0,
-                                               false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("card_number");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Expiration Date");
+  field.name = ASCIIToUTF16("expiration_month");
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("Expiration Year");
+  field.name = ASCIIToUTF16("expiration_year");
+  form.fields.push_back(field);
+
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
   const char * const kSignature1 = "11337937696949187602";
   const char * const kResponse1 =
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillquery "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"e\"><form "
       "signature=\"11337937696949187602\"><field signature=\"412125936\"/>"
       "<field signature=\"1917667676\"/><field signature=\"2226358947\"/>"
       "<field signature=\"747221617\"/><field signature=\"4108155786\"/></form>"
       "</autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(forms, &encoded_signatures,
                                                 &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[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, &encoded_signatures,
                                                 &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[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) {
-    form.fields.push_back(
-        webkit_glue::FormField(ASCIIToUTF16("Address"),
-                               ASCIIToUTF16("address"),
-                               string16(),
-                               ASCIIToUTF16("text"),
-                               0,
-                               false));
+    field.label = ASCIIToUTF16("Address");
+    field.name = ASCIIToUTF16("address");
+    form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(forms, &encoded_signatures,
                                                 &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   const char * const kSignature2 = "8308881815906226214";
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
   const char * const kResponse2 =
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillquery "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"e\"><form "
       "signature=\"11337937696949187602\"><field signature=\"412125936\"/>"
       "<field signature=\"1917667676\"/><field signature=\"2226358947\"/>"
       "<field signature=\"747221617\"/><field signature=\"4108155786\"/></form>"
       "<form signature=\"8308881815906226214\"><field signature=\"412125936\"/>"
       "<field signature=\"1917667676\"/><field signature=\"2226358947\"/>"
       "<field signature=\"747221617\"/><field signature=\"4108155786\"/><field "
       "signature=\"509334676\"/><field signature=\"509334676\"/><field "
       "signature=\"509334676\"/><field signature=\"509334676\"/><field "
       "signature=\"509334676\"/></form></autofillquery>";
   EXPECT_EQ(kResponse2, encoded_xml);
 
   // 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) {
-    form.fields.push_back(
-        webkit_glue::FormField(ASCIIToUTF16("Address"),
-                               ASCIIToUTF16("address"),
-                               string16(),
-                               ASCIIToUTF16("text"),
-                               0,
-                               false));
+    field.label = ASCIIToUTF16("Address");
+    field.name = ASCIIToUTF16("address");
+    form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(forms, &encoded_signatures,
                                                 &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   EXPECT_EQ(kSignature2, encoded_signatures[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(form));
   EXPECT_FALSE(FormStructure::EncodeQueryRequest(bad_forms, &encoded_signatures,
                                                  &encoded_xml));
   EXPECT_EQ(0U, encoded_signatures.size());
   EXPECT_EQ("", encoded_xml);
 }
 
 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();
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                        ASCIIToUTF16("firstname"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                        ASCIIToUTF16("lastname"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  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);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("EMail"),
-                        ASCIIToUTF16("email"),
-                        string16(),
-                        ASCIIToUTF16("email"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Email");
+  field.name = ASCIIToUTF16("email");
+  field.form_control_type = ASCIIToUTF16("email");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(EMAIL_ADDRESS);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Phone"),
-                        ASCIIToUTF16("phone"),
-                        string16(),
-                        ASCIIToUTF16("number"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Phone");
+  field.name = ASCIIToUTF16("phone");
+  field.form_control_type = ASCIIToUTF16("number");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(PHONE_HOME_WHOLE_NUMBER);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Country"),
-                        ASCIIToUTF16("country"),
-                        string16(),
-                        ASCIIToUTF16("select-one"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Country");
+  field.name = ASCIIToUTF16("country");
+  field.form_control_type = ASCIIToUTF16("select-one");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Fax"),
-                        ASCIIToUTF16("fax"),
-                        string16(),
-                        ASCIIToUTF16("tel"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Fax");
+  field.name = ASCIIToUTF16("fax");
+  field.form_control_type = ASCIIToUTF16("tel");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(PHONE_FAX_WHOLE_NUMBER);
   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->set_possible_types(i, possible_field_types[i]);
 
   FieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
@@ skipping 32 matching lines @@
             "<field signature=\"3494530716\" autofilltype=\"5\"/>"
             "<field signature=\"1029417091\" autofilltype=\"9\"/>"
             "<field signature=\"466116101\" autofilltype=\"14\"/>"
             "<field signature=\"2799270304\" autofilltype=\"36\"/>"
             "<field signature=\"1876771436\" autofilltype=\"24\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // Add 2 address fields - this should be still a valid form.
   for (size_t i = 0; i < 2; ++i) {
-    form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                                 ASCIIToUTF16("address"),
-                                                 string16(),
-                                                 ASCIIToUTF16("text"),
-                                                 0,
-                                                 false));
+    field.label = ASCIIToUTF16("Address");
+    field.name = ASCIIToUTF16("address");
+    field.form_control_type = ASCIIToUTF16("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)
@@ skipping 17 matching lines @@
             "<field signature=\"509334676\" autofilltype=\"38\"/>"
             "<field signature=\"509334676\" autofilltype=\"30\"/>"
             "<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) {
-    form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                                                 ASCIIToUTF16("address"),
-                                                 string16(),
-                                                 ASCIIToUTF16("text"),
-                                                 0,
-                                                 false));
+    field.label = ASCIIToUTF16("Address");
+    field.name = ASCIIToUTF16("address");
+    field.form_control_type = ASCIIToUTF16("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->set_possible_types(i, 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");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                        ASCIIToUTF16("first"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                        ASCIIToUTF16("last"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email"),
-                        ASCIIToUTF16("email"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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");
+  field.name = ASCIIToUTF16("email");
+  form.fields.push_back(field);
 
   FormStructure form_structure(form);
 
   FieldTypeSet unknown_type;
   unknown_type.insert(UNKNOWN_TYPE);
   for (size_t i = 0; i < form_structure.field_count(); ++i)
     form_structure.set_possible_types(i, unknown_type);
 
   // No available types.
   // datapresent should be "" == trimmmed(0x0000000000000000) ==
@@ skipping 239 matching lines @@
   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;
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email"),
-                        ASCIIToUTF16("email"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                        ASCIIToUTF16("first"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("First Name");
+  field.name = ASCIIToUTF16("first");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
-                        ASCIIToUTF16("last"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Last Name");
+  field.name = ASCIIToUTF16("last");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(NAME_LAST);
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
-                        ASCIIToUTF16("address"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  field.label = ASCIIToUTF16("Address");
+  field.name = ASCIIToUTF16("address");
+  form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_LINE1);
+
   form_structure.reset(new FormStructure(form));
 
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->set_possible_types(i, possible_field_types[i]);
   std::string encoded_xml;
 
   // Now we matched both fields singularly.
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
@@ skipping 60 matching lines @@
             "<field signature=\"509334676\" autofilltype=\"60\"/>"
             "</autofillupload>",
             encoded_xml);
 }
 
 TEST(FormStructureTest, CheckFormSignature) {
   // Check that form signature is created correctly.
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("email"),
-                        ASCIIToUTF16("email"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
-                        ASCIIToUTF16("first"),
-                        string16(),
-                        ASCIIToUTF16("text"),
-                        0,
-                        false));
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("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));
 
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("://&&email&first")),
       form_structure->FormSignature());
 
   form.origin = GURL(std::string("http://www.facebook.com"));
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("http://www.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.action = GURL(std::string("https://login.facebook.com/path"));
   form_structure.reset(new FormStructure(form));
   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());
 }
 
 }  // namespace