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

chrome/browser/password_manager/password_form_data.h

Index: chrome/browser/password_manager/password_form_data.h
diff --git a/chrome/browser/password_manager/password_form_data.h b/chrome/browser/password_manager/password_form_data.h
index f48d0c81cd442862a053eec5b9d201644713c8c4..455a39c215fab01947c1b1327c191a51110a010e 100644
--- a/chrome/browser/password_manager/password_form_data.h
+++ b/chrome/browser/password_manager/password_form_data.h
@@ -9,12 +9,12 @@
 #include <ostream>
 
 #include "testing/gmock/include/gmock/gmock.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 // Struct used for creation of PasswordForms from static arrays of data.
 // Note: This is only meant to be used in unit test.
 struct PasswordFormData {
-  const webkit_glue::PasswordForm::Scheme scheme;
+  const webkit::forms::PasswordForm::Scheme scheme;
   const char* signon_realm;
   const char* origin;
   const char* action;
@@ -30,23 +30,23 @@ struct PasswordFormData {
 
 // Creates and returns a new PasswordForm built from form_data. Caller is
 // responsible for deleting the object when finished with it.
-webkit_glue::PasswordForm* CreatePasswordFormFromData(
+webkit::forms::PasswordForm* CreatePasswordFormFromData(
     const PasswordFormData& form_data);
 
 // Checks whether two vectors of PasswordForms contain equivalent elements,
 // regardless of order.
 bool ContainsSamePasswordFormsPtr(
-    const std::vector<webkit_glue::PasswordForm*>& first,
-    const std::vector<webkit_glue::PasswordForm*>& second);
+    const std::vector<webkit::forms::PasswordForm*>& first,
+    const std::vector<webkit::forms::PasswordForm*>& second);
 
 bool ContainsSamePasswordForms(
-    std::vector<webkit_glue::PasswordForm>& first,
-    std::vector<webkit_glue::PasswordForm>& second);
+    std::vector<webkit::forms::PasswordForm>& first,
+    std::vector<webkit::forms::PasswordForm>& second);
 
 // Pretty-prints the contents of a PasswordForm.
 // TODO(sync): This file must eventually be refactored away -- crbug.com/87185.
 std::ostream& operator<<(std::ostream& os,
-                         const webkit_glue::PasswordForm& form);
+                         const webkit::forms::PasswordForm& form);
 
 // This gmock matcher is used to check that the |arg| contains exactly the same
 // PasswordForms as |forms|, regardless of order.