Refactor webkit_glue::FormField to remove hacky methods

chrome/renderer/autofill/password_autofill_manager_browsertest.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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/test/base/render_view_test.h"
@@ skipping 62 matching lines @@
     RenderViewTest::SetUp();
 
     // Add a preferred login and an additional login to the FillData.
     username1_ = ASCIIToUTF16(kAliceUsername);
     password1_ = ASCIIToUTF16(kAlicePassword);
     username2_ = ASCIIToUTF16(kBobUsername);
     password2_ = ASCIIToUTF16(kBobPassword);
     username3_ = ASCIIToUTF16(kCarolUsername);
     password3_ = ASCIIToUTF16(kCarolPassword);
 
-    fill_data_.basic_data.fields.push_back(
-        FormField(string16(), ASCIIToUTF16(kUsernameName),
-                  username1_, string16(), 0, false));
-    fill_data_.basic_data.fields.push_back(
-        FormField(string16(), ASCIIToUTF16(kPasswordName),
-                  password1_, string16(), 0, false));
+    FormField username_field;
+    username_field.name = ASCIIToUTF16(kUsernameName);
+    username_field.value = username1_;
+    fill_data_.basic_data.fields.push_back(username_field);
+
+    FormField password_field;
+    password_field.name = ASCIIToUTF16(kPasswordName);
+    password_field.value = password1_;
+    fill_data_.basic_data.fields.push_back(password_field);
+
     fill_data_.additional_logins[username2_] = password2_;
     fill_data_.additional_logins[username3_] = password3_;
 
     // We need to set the origin so it matches the frame URL and the action so
     // it matches the form action, otherwise we won't autocomplete.
     std::string origin("data:text/html;charset=utf-8,");
     origin += kFormHTML;
     fill_data_.basic_data.origin = GURL(origin);
     fill_data_.basic_data.action = GURL("http://www.bidule.com");
 
@@ skipping 312 matching lines @@
   // To simulate accepting an item in the suggestion drop-down we just mimic
   // what the WebView does: it sets the element value then calls
   // didSelectAutofillSuggestion on the renderer.
   autofill_agent_->didSelectAutofillSuggestion(username_element_,
                                                ASCIIToUTF16(kAliceUsername),
                                                WebKit::WebString(),
                                                0);
   // Autocomplete should not have kicked in.
   CheckTextFieldsState("", false, "", false);
 }