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

chrome/renderer/autofill/autofill_agent.h

Index: chrome/renderer/autofill/autofill_agent.h
diff --git a/chrome/renderer/autofill/autofill_agent.h b/chrome/renderer/autofill/autofill_agent.h
index 38a2e5ddc0bc678cb63c07f7ff948981a3264938..85ea7e64dc98853d67c6c9ee09c4549194d63cd1 100644
--- a/chrome/renderer/autofill/autofill_agent.h
+++ b/chrome/renderer/autofill/autofill_agent.h
@@ -18,11 +18,13 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct FormData;
 struct FormDataPredictions;
 struct FormField;
 }
+}
 
 namespace WebKit {
 class WebNode;
@@ -97,9 +99,9 @@ class AutofillAgent : public content::RenderViewObserver,
                              const std::vector<string16>& labels,
                              const std::vector<string16>& icons,
                              const std::vector<int>& unique_ids);
-  void OnFormDataFilled(int query_id, const webkit_glue::FormData& form);
+  void OnFormDataFilled(int query_id, const webkit::forms::FormData& form);
   void OnFieldTypePredictionsAvailable(
-      const std::vector<webkit_glue::FormDataPredictions>& forms);
+      const std::vector<webkit::forms::FormDataPredictions>& forms);
 
   // For external Autofill selection.
   void OnSelectAutofillSuggestionAtIndex(int listIndex);
@@ -141,8 +143,8 @@ class AutofillAgent : public content::RenderViewObserver,
   // |node|. Returns true if the data was found; and false otherwise.
   bool FindFormAndFieldForNode(
       const WebKit::WebNode& node,
-      webkit_glue::FormData* form,
-      webkit_glue::FormField* field) WARN_UNUSED_RESULT;
+      webkit::forms::FormData* form,
+      webkit::forms::FormField* field) WARN_UNUSED_RESULT;
 
   FormCache form_cache_;