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

chrome/browser/sync/test/integration/passwords_helper.h

Index: chrome/browser/sync/test/integration/passwords_helper.h
diff --git a/chrome/browser/sync/test/integration/passwords_helper.h b/chrome/browser/sync/test/integration/passwords_helper.h
index 197b7a07b2dd434d159434bc395e58843d702dca..7de3cf981b7881006dc54070f44a99a4354ff9e8 100644
--- a/chrome/browser/sync/test/integration/passwords_helper.h
+++ b/chrome/browser/sync/test/integration/passwords_helper.h
@@ -11,7 +11,7 @@
 #include "base/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 class PasswordStore;
 
@@ -20,21 +20,21 @@ namespace passwords_helper {
 // Adds the login held in |form| to the password store |store|. Even though
 // logins are normally added asynchronously, this method will block until the
 // login is added.
-void AddLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
+void AddLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 
 // Update the data held in password store |store| with a modified |form|.
 // This method blocks until the operation is complete.
-void UpdateLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
+void UpdateLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 
 // Searches |store| for all logins matching a fake signon realm used only by
 // LivePasswordsSyncTest and adds the results to |matches|. Note that the
 // caller is responsible for deleting the forms added to |matches|.
 void GetLogins(PasswordStore* store,
-               std::vector<webkit_glue::PasswordForm>& matches);
+               std::vector<webkit::forms::PasswordForm>& matches);
 
 // Removes the login held in |form| from the password store |store|.  This
 // method blocks until the operation is complete.
-void RemoveLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
+void RemoveLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 
 // Removes all password forms from the password store |store|.
 void RemoveLogins(PasswordStore* store);
@@ -73,7 +73,7 @@ int GetVerifierPasswordCount();
 
 // Creates a test password form with a well known fake signon realm used only
 // by LivePasswordsSyncTest based on |index|.
-webkit_glue::PasswordForm CreateTestPasswordForm(int index);
+webkit::forms::PasswordForm CreateTestPasswordForm(int index);
 
 }  // namespace passwords_helper