Move forms/ out of webkit/.

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
+#include "chrome/common/form_data.h"
+#include "chrome/common/form_field_data.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
-#include "webkit/forms/form_data.h"
-#include "webkit/forms/form_field.h"
 
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 using WebKit::WebInputElement;
 
-namespace webkit {
-namespace forms {
+namespace content {
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {
   os << UTF16ToUTF8(form.name)
      << " "
      << UTF16ToUTF8(form.method)
      << " "
      << form.origin.spec()
      << " "
      << form.action.spec()
      << " ";
 
-  for (std::vector<webkit::forms::FormField>::const_iterator iter =
+  for (std::vector<FormFieldData>::const_iterator iter =
            form.fields.begin();
        iter != form.fields.end(); ++iter) {
     os << *iter
        << " ";
   }
 
   return os;
 }
 
-}  // namespace forms
-}  // namespace webkit_glue
+}  // namespace content
 
 class FormStructureTest {
  public:
   static std::string Hash64Bit(const std::string& str) {
     return FormStructure::Hash64Bit(str);
   }
 };
 
 TEST(FormStructureTest, FieldCount) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 23 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 53 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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.
   field.label = ASCIIToUTF16("First Name");
@@ skipping 52 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 48 matching lines @@
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
 // Verify that we can correctly process the |autocompletetype| attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetype) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData field;
   field.form_control_type = ASCIIToUTF16("text");
 
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
   field.autocomplete_type = ASCIIToUTF16("given-name");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field2");
   field.autocomplete_type = ASCIIToUTF16("surname");
@@ skipping 17 matching lines @@
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
 }
 
 // Verify that we can correctly process the |autocompletetype| attribute for
 // phone number types (especially phone prefixes and suffixes).
 TEST(FormStructureTest, HeuristicsAutocompletetypePhones) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData field;
   field.form_control_type = ASCIIToUTF16("text");
 
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
   field.autocomplete_type = ASCIIToUTF16("phone-local");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field2");
   field.autocomplete_type = ASCIIToUTF16("phone-local-prefix");
@@ skipping 23 matching lines @@
 }
 
 // If at least one field includes the |autocompletetype| attribute, we should
 // not try to apply any other heuristics.
 TEST(FormStructureTest, AutocompletetypeOverridesOtherHeuristics) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   // Start with a regular contact form.
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 28 matching lines @@
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
 }
 
 // Verify that we can correctly process sections listed in the |autocomplete|
 // attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetypeWithSections) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData field;
   field.form_control_type = ASCIIToUTF16("text");
 
   // We expect "shipping" and "billing" to be the most common sections.
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
   field.autocomplete_type = ASCIIToUTF16("section-shipping given-name");
   form.fields.push_back(field);
 
   // Some field will have no section specified.  These fall into the default
   // section, with an empty name.
@@ skipping 51 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("shipping-cc"), form_structure->field(5)->section());
 }
 
 // Verify that we can correctly process fallback types listed in the
 // |autocompletetype| attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetypeWithFallbacks) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData field;
   field.form_control_type = ASCIIToUTF16("text");
 
   // Skip over any sections and "x"-prefixed types.
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
   field.autocomplete_type =
       ASCIIToUTF16("section-full-name x-given-name-initial given-name");
   form.fields.push_back(field);
 
   // Stop processing once we see a known type.
@@ skipping 27 matching lines @@
             form_structure->field(2)->heuristic_type());
   EXPECT_EQ(ASCIIToUTF16("shipping-default"),
             form_structure->field(2)->section());
 }
 
 TEST(FormStructureTest, HeuristicsSample8) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 58 matching lines @@
       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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 35 matching lines @@
   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.
+// for matching.  This works because FormFieldData labels are matched in the
+// case that input element ids (or |name| fields) are missing.
 TEST(FormStructureTest, HeuristicsLabelsOnly) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 45 matching lines @@
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(6)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 33 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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.
   field.label = ASCIIToUTF16("Card Type");
   field.name = ASCIIToUTF16("card_type");
@@ skipping 41 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 21 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 25 matching lines @@
 // 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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 22 matching lines @@
 }
 
 // This example comes from ebay.com where the word "suite" appears in the label
 // and the name "address2" clearly indicates that this is the address line 2.
 // See http://crbug.com/48197 for details.
 TEST(FormStructureTest, TwoAddressLinesEbay) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 13 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 14 matching lines @@
   // 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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 52 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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.
@@ skipping 27 matching lines @@
             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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 28 matching lines @@
   // 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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 33 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 94 matching lines @@
 }
 
 TEST(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<FieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
-  FormField field;
+  FormFieldData 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);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
@@ skipping 125 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 233 matching lines @@
   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");
 
-  FormField field;
+  FormFieldData 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);
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
@@ skipping 85 matching lines @@
             "</autofillupload>",
             encoded_xml);
 }
 
 TEST(FormStructureTest, CheckFormSignature) {
   // Check that form signature is created correctly.
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
-  FormField field;
+  FormFieldData 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);
 
@@ skipping 14 matching lines @@
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.name = ASCIIToUTF16("login_form");
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 }