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

chrome/browser/password_manager/native_backend_gnome_x.h

Index: chrome/browser/password_manager/native_backend_gnome_x.h
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h
index 3f5319b36dacfc5f70ecb5a0f95cdce9f799b9b5..6e44daec0649eb1811a047b494551136007e900a 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.h
+++ b/chrome/browser/password_manager/native_backend_gnome_x.h
@@ -17,9 +17,11 @@
 
 class PrefService;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // Many of the gnome_keyring_* functions use variable arguments, which makes
 // them difficult if not impossible to truly wrap in C. Therefore, we use
@@ -73,12 +75,12 @@ class NativeBackendGnome : 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,
@@ -88,7 +90,7 @@ class NativeBackendGnome : public PasswordStoreX::NativeBackend,
 
  private:
   // Adds a login form without checking for one to replace first.
-  bool RawAddLogin(const webkit_glue::PasswordForm& form);
+  bool RawAddLogin(const webkit::forms::PasswordForm& form);
 
   // Reads PasswordForms from the keyring with the given autofillability state.
   bool GetLoginsList(PasswordFormList* forms, bool autofillable);