Move forms/ out of webkit/.

chrome/renderer/autofill/form_autofill_util.h

Index: chrome/renderer/autofill/form_autofill_util.h
diff --git a/chrome/renderer/autofill/form_autofill_util.h b/chrome/renderer/autofill/form_autofill_util.h
index 99253b841dc3513120893e2c41238cc4014f1a2c..b63424f502b2d247904dc38f6327f75404d64046 100644
--- a/chrome/renderer/autofill/form_autofill_util.h
+++ b/chrome/renderer/autofill/form_autofill_util.h
@@ -9,12 +9,8 @@
 
 #include "base/string16.h"
 
-namespace webkit {
-namespace forms {
 struct FormData;
-struct FormField;
-}
-}
+struct FormFieldData;
 
 namespace WebKit {
 class WebFormElement;
@@ -72,7 +68,7 @@ void ExtractAutofillableElements(
 void WebFormControlElementToFormField(
     const WebKit::WebFormControlElement& element,
     ExtractMask extract_mask,
-    webkit::forms::FormField* field);
+    FormFieldData* field);
 
 // Fills |form| with the FormData object corresponding to the |form_element|.
 // If |field| is non-NULL, also fills |field| with the FormField object
@@ -86,25 +82,25 @@ bool WebFormElementToFormData(
     const WebKit::WebFormControlElement& form_control_element,
     RequirementsMask requirements,
     ExtractMask extract_mask,
-    webkit::forms::FormData* form,
-    webkit::forms::FormField* field);
+    FormData* form,
+    FormFieldData* field);
 
 // Finds the form that contains |element| and returns it in |form|.  Fills
 // |field| with the |FormField| representation for element.
 // Returns false if the form is not found or cannot be serialized.
 bool FindFormAndFieldForInputElement(const WebKit::WebInputElement& element,
-                                     webkit::forms::FormData* form,
-                                     webkit::forms::FormField* field,
+                                     FormData* form,
+                                     FormFieldData* field,
                                      RequirementsMask requirements);
 
 // Fills the form represented by |form|.  |element| is the input element that
 // initiated the auto-fill process.
-void FillForm(const webkit::forms::FormData& form,
+void FillForm(const FormData& form,
               const WebKit::WebInputElement& element);
 
 // Previews the form represented by |form|.  |element| is the input element that
 // initiated the preview process.
-void PreviewForm(const webkit::forms::FormData& form,
+void PreviewForm(const FormData& form,
                  const WebKit::WebInputElement& element);
 
 // Clears the placeholder values and the auto-filled background for any fields