Refactor webkit_glue::FormField to remove hacky methods

chrome/browser/autofill/autofill_merge_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 161 matching lines @@
   for (size_t i = 0; i < lines.size(); ++i) {
     std::string line = lines[i];
 
     if (line != kProfileSeparator) {
       // Add a field to the current profile.
       size_t separator_pos = line.find(kFieldSeparator);
       ASSERT_NE(std::string::npos, separator_pos);
       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);
     }
 
     // The first line is always a profile separator, and the last profile is not
     // followed by an explicit separator.
     if ((i > 0 && line == kProfileSeparator) || i == lines.size() - 1) {
       // Reached the end of a profile.  Try to import it.
       FormStructure form_structure(form);
       for (size_t i = 0; i < form_structure.field_count(); ++i) {
         // Set the heuristic type for each field, which is currently serialized
@@ skipping 15 matching lines @@
     }
   }
 
   *merged_profiles = SerializeProfiles(personal_data_->web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }