Group forms-related files in webkit/glue in a forms/ subdirectory.

chrome/browser/webdata/autofill_table.h

Index: chrome/browser/webdata/autofill_table.h
diff --git a/chrome/browser/webdata/autofill_table.h b/chrome/browser/webdata/autofill_table.h
index 4af24b261f8b2592dc2424f843bb3671a7f57a20..b2212c39c886372291fd7400d2ea9ac7c782e324 100644
--- a/chrome/browser/webdata/autofill_table.h
+++ b/chrome/browser/webdata/autofill_table.h
@@ -23,9 +23,11 @@ namespace base {
 class Time;
 }
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct FormField;
 }
+}
 
 // This class manages the various autofill tables within the SQLite database
 // passed to the constructor. It expects the following schemas:
@@ -125,13 +127,13 @@ class AutofillTable : public WebDatabaseTable {
   // Records the form elements in |elements| in the database in the
   // autofill table.  A list of all added and updated autofill entries
   // is returned in the changes out parameter.
-  bool AddFormFieldValues(const std::vector<webkit_glue::FormField>& elements,
+  bool AddFormFieldValues(const std::vector<webkit::forms::FormField>& elements,
                           std::vector<AutofillChange>* changes);
 
   // Records a single form element in the database in the autofill table. A list
   // of all added and updated autofill entries is returned in the changes out
   // parameter.
-  bool AddFormFieldValue(const webkit_glue::FormField& element,
+  bool AddFormFieldValue(const webkit::forms::FormField& element,
                          std::vector<AutofillChange>* changes);
 
   // Retrieves a vector of all values which have been recorded in the autofill
@@ -167,7 +169,7 @@ class AutofillTable : public WebDatabaseTable {
   // Gets the pair_id and count entries from name and value specified in
   // |element|.  Sets *pair_id and *count to 0 if there is no such row in
   // the table.
-  bool GetIDAndCountOfFormElement(const webkit_glue::FormField& element,
+  bool GetIDAndCountOfFormElement(const webkit::forms::FormField& element,
                                   int64* pair_id,
                                   int* count);
 
@@ -179,7 +181,8 @@ class AutofillTable : public WebDatabaseTable {
 
   // Adds a new row to the autofill table with name and value given in
   // |element|.  Sets *pair_id to the pair_id of the new row.
-  bool InsertFormElement(const webkit_glue::FormField& element, int64* pair_id);
+  bool InsertFormElement(const webkit::forms::FormField& element,
+                         int64* pair_id);
 
   // Adds a new row to the autofill_dates table.
   bool InsertPairIDAndDate(int64 pair_id, const base::Time& date_created);
@@ -308,10 +311,10 @@ class AutofillTable : public WebDatabaseTable {
   // Methods for adding autofill entries at a specified time.  For
   // testing only.
   bool AddFormFieldValuesTime(
-      const std::vector<webkit_glue::FormField>& elements,
+      const std::vector<webkit::forms::FormField>& elements,
       std::vector<AutofillChange>* changes,
       base::Time time);
-  bool AddFormFieldValueTime(const webkit_glue::FormField& element,
+  bool AddFormFieldValueTime(const webkit::forms::FormField& element,
                              std::vector<AutofillChange>* changes,
                              base::Time time);