Move forms/ out of webkit/.

chrome/browser/autofill/autofill_common_test.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/browser/autofill/autofill_common_test.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/prefs/pref_service_base.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/form_field_data.h"
 #include "chrome/common/pref_names.h"
-#include "webkit/forms/form_field.h"
 
 namespace autofill_test {
 
 void CreateTestFormField(const char* label,
                          const char* name,
                          const char* value,
                          const char* type,
-                         webkit::forms::FormField* field) {
+                         FormFieldData* field) {
   field->label = ASCIIToUTF16(label);
   field->name = ASCIIToUTF16(name);
   field->value = ASCIIToUTF16(value);
   field->form_control_type = ASCIIToUTF16(type);
 }
 
 inline void check_and_set(
     FormGroup* profile, AutofillFieldType type, const char* value) {
   if (value)
     profile->SetInfo(type, UTF8ToUTF16(value));
@@ skipping 49 matching lines @@
 
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
   if (profile) {
     PrefServiceBase::FromBrowserContext(profile)->SetBoolean(
         prefs::kAutofillAuxiliaryProfilesEnabled, false);
   }
 }
 
 }  // namespace autofill_test