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

chrome/browser/password_manager/password_store.h

Index: chrome/browser/password_manager/password_store.h
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
index eb656bfb6804f504dcf09c751a6e0b8c85e5c5e4..222d198b9eb7ea7105a7d5c850c9ac3c112e446d 100644
--- a/chrome/browser/password_manager/password_store.h
+++ b/chrome/browser/password_manager/password_store.h
@@ -24,17 +24,19 @@ namespace browser_sync {
 class PasswordDataTypeController;
 class PasswordModelAssociator;
 class PasswordModelWorker;
-};
+}
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
-};
+}
+}
 
 namespace passwords_helper {
-void AddLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
-void RemoveLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
-void UpdateLogin(PasswordStore* store, const webkit_glue::PasswordForm& form);
-};
+void AddLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
+void RemoveLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
+void UpdateLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
+}
 
 // Interface for storing form passwords in a platform-specific secure way.
 // The login request/manipulation API is not threadsafe and must be used
@@ -44,7 +46,7 @@ class PasswordStore
       public CancelableRequestProvider {
  public:
   typedef Callback2<Handle,
-                    const std::vector<webkit_glue::PasswordForm*>&>::Type
+                    const std::vector<webkit::forms::PasswordForm*>&>::Type
       GetLoginsCallback;
 
   // PasswordForm vector elements are meant to be owned by the
@@ -56,7 +58,7 @@ class PasswordStore
   // provide a destructor, which cleans up after canceled requests by deleting
   // vector elements.
   class GetLoginsRequest : public CancelableRequest1<
-    GetLoginsCallback, std::vector<webkit_glue::PasswordForm*> > {
+    GetLoginsCallback, std::vector<webkit::forms::PasswordForm*> > {
    public:
     explicit GetLoginsRequest(GetLoginsCallback* callback);
     virtual ~GetLoginsRequest();
@@ -86,13 +88,13 @@ class PasswordStore
   virtual void Shutdown();
 
   // Adds the given PasswordForm to the secure password store asynchronously.
-  virtual void AddLogin(const webkit_glue::PasswordForm& form);
+  virtual void AddLogin(const webkit::forms::PasswordForm& form);
 
   // Updates the matching PasswordForm in the secure password store (async).
-  void UpdateLogin(const webkit_glue::PasswordForm& form);
+  void UpdateLogin(const webkit::forms::PasswordForm& form);
 
   // Removes the matching PasswordForm from the secure password store (async).
-  void RemoveLogin(const webkit_glue::PasswordForm& form);
+  void RemoveLogin(const webkit::forms::PasswordForm& form);
 
   // Removes all logins created in the given date range.
   void RemoveLoginsCreatedBetween(const base::Time& delete_begin,
@@ -101,7 +103,7 @@ class PasswordStore
   // Searches for a matching PasswordForm and returns a handle so the async
   // request can be tracked. Implement the PasswordStoreConsumer interface to be
   // notified on completion.
-  virtual Handle GetLogins(const webkit_glue::PasswordForm& form,
+  virtual Handle GetLogins(const webkit::forms::PasswordForm& form,
                            PasswordStoreConsumer* consumer);
 
   // Gets the complete list of PasswordForms that are not blacklist entries--and
@@ -130,11 +132,11 @@ class PasswordStore
   friend class browser_sync::PasswordModelAssociator;
   friend class browser_sync::PasswordModelWorker;
   friend void passwords_helper::AddLogin(PasswordStore*,
-                                         const webkit_glue::PasswordForm&);
+                                         const webkit::forms::PasswordForm&);
   friend void passwords_helper::RemoveLogin(PasswordStore*,
-                                            const webkit_glue::PasswordForm&);
+                                            const webkit::forms::PasswordForm&);
   friend void passwords_helper::UpdateLogin(PasswordStore*,
-                                            const webkit_glue::PasswordForm&);
+                                            const webkit::forms::PasswordForm&);
 
   virtual ~PasswordStore();
 
@@ -151,11 +153,11 @@ class PasswordStore
   // Synchronous implementation that reports usage metrics.
   virtual void ReportMetricsImpl() = 0;
   // Synchronous implementation to add the given login.
-  virtual void AddLoginImpl(const webkit_glue::PasswordForm& form) = 0;
+  virtual void AddLoginImpl(const webkit::forms::PasswordForm& form) = 0;
   // Synchronous implementation to update the given login.
-  virtual void UpdateLoginImpl(const webkit_glue::PasswordForm& form) = 0;
+  virtual void UpdateLoginImpl(const webkit::forms::PasswordForm& form) = 0;
   // Synchronous implementation to remove the given login.
-  virtual void RemoveLoginImpl(const webkit_glue::PasswordForm& form) = 0;
+  virtual void RemoveLoginImpl(const webkit::forms::PasswordForm& form) = 0;
   // Synchronous implementation to remove the given logins.
   virtual void RemoveLoginsCreatedBetweenImpl(const base::Time& delete_begin,
                                               const base::Time& delete_end) = 0;
@@ -163,7 +165,7 @@ class PasswordStore
   // will then be scored by the PasswordFormManager. Once they are found
   // (or not), the consumer should be notified.
   virtual void GetLoginsImpl(GetLoginsRequest* request,
-                             const webkit_glue::PasswordForm& form) = 0;
+                             const webkit::forms::PasswordForm& form) = 0;
   // Finds all non-blacklist PasswordForms, and notifies the consumer.
   virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) = 0;
   // Finds all blacklist PasswordForms, and notifies the consumer.
@@ -171,10 +173,10 @@ class PasswordStore
 
   // Finds all non-blacklist PasswordForms, and fills the vector.
   virtual bool FillAutofillableLogins(
-      std::vector<webkit_glue::PasswordForm*>* forms) = 0;
+      std::vector<webkit::forms::PasswordForm*>* forms) = 0;
   // Finds all blacklist PasswordForms, and fills the vector.
   virtual bool FillBlacklistLogins(
-      std::vector<webkit_glue::PasswordForm*>* forms) = 0;
+      std::vector<webkit::forms::PasswordForm*>* forms) = 0;
 
   // Dispatches the result to the PasswordStoreConsumer on the original caller's
   // thread so the callback can be executed there.  This should be the UI