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

chrome/browser/password_manager/native_backend_kwallet_x.h

Index: chrome/browser/password_manager/native_backend_kwallet_x.h
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h
index b40d3d8e49060241bd5a3529b4e2ee3242db9617..23d259b331f2ccbbea6b911fde393649ca63c405 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.h
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.h
@@ -17,9 +17,11 @@
 class Pickle;
 class PrefService;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 namespace base {
 class WaitableEvent;
@@ -40,12 +42,12 @@ class NativeBackendKWallet : public PasswordStoreX::NativeBackend {
   virtual bool Init() OVERRIDE;
 
   // Implements NativeBackend interface.
-  virtual bool AddLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool UpdateLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool RemoveLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
+  virtual bool AddLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool UpdateLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool RemoveLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
   virtual bool RemoveLoginsCreatedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
-  virtual bool GetLogins(const webkit_glue::PasswordForm& form,
+  virtual bool GetLogins(const webkit::forms::PasswordForm& form,
                          PasswordFormList* forms) OVERRIDE;
   virtual bool GetLoginsCreatedBetween(const base::Time& get_begin,
                                        const base::Time& get_end,
@@ -113,8 +115,8 @@ class NativeBackendKWallet : public PasswordStoreX::NativeBackend {
   // If |update_check| is false, we only check the fields that are checked by
   // LoginDatabase::UpdateLogin() when updating logins; otherwise, we check the
   // fields that are checked by LoginDatabase::RemoveLogin() for removing them.
-  static bool CompareForms(const webkit_glue::PasswordForm& a,
-                           const webkit_glue::PasswordForm& b,
+  static bool CompareForms(const webkit::forms::PasswordForm& a,
+                           const webkit::forms::PasswordForm& b,
                            bool update_check);
 
   // Serializes a list of PasswordForms to be stored in the wallet.