Refactor webkit_glue::FormField to remove hacky methods

chrome/browser/autofill/autofill_merge_unittest.cc

Index: chrome/browser/autofill/autofill_merge_unittest.cc
diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc
index 9b8071cd47b42d67ad63d3883bdf3cfb9a649ad7..325cd9222f44d4200069e145cfdb8930342b0d82 100644
--- a/chrome/browser/autofill/autofill_merge_unittest.cc
+++ b/chrome/browser/autofill/autofill_merge_unittest.cc
@@ -179,12 +179,11 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
       string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
       string16 value = UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
 
-      webkit_glue::FormField field(field_type,
-                                   field_type,
-                                   value,
-                                   ASCIIToUTF16("text"),
-                                   WebKit::WebInputElement::defaultMaxLength(),
-                                   false);
+      webkit_glue::FormField field;
+      field.label = field_type;
+      field.name = field_type;
+      field.value = value;
+      field.form_control_type = ASCIIToUTF16("text");
       form.fields.push_back(field);
     }