Refactor webkit_glue::FormField to remove hacky methods

chrome/test/live_sync/autofill_helper.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 "chrome/test/live_sync/autofill_helper.h"
 
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
@@ skipping 118 matching lines @@
 PersonalDataManager* GetPersonalDataManager(int index) {
   return test()->GetProfile(index)->GetPersonalDataManager();
 }
 
 void AddKeys(int profile,
                              const std::set<AutofillKey>& keys) {
   std::vector<webkit_glue::FormField> form_fields;
   for (std::set<AutofillKey>::const_iterator i = keys.begin();
        i != keys.end();
        ++i) {
-    form_fields.push_back(webkit_glue::FormField(string16(),
-                                                 (*i).name(),
-                                                 (*i).value(),
-                                                 string16(),
-                                                 0,
-                                                 false));
+    webkit_glue::FormField field;
+    field.name = i->name();
+    field.value = i->value();
+    form_fields.push_back(field);
   }
 
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
   EXPECT_CALL(*observer_helper->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event));
   WebDataService* wds = GetWebDataService(profile);
@@ skipping 133 matching lines @@
     if (!ProfilesMatch(0, i)) {
       LOG(ERROR) << "Profile " << i << "does not contain the same autofill "
                                        "profiles as profile 0.";
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill_helper