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

chrome/browser/ui/webui/options/password_manager_handler.h

Index: chrome/browser/ui/webui/options/password_manager_handler.h
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h
index 6588881340024be21db77bc58e5f1615804fe21c..7466b031b08d4b5f8ca20b5b7bc8fab22f9c4952 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -75,7 +75,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
-        const std::vector<webkit_glue::PasswordForm*>& result) = 0;
+        const std::vector<webkit::forms::PasswordForm*>& result) = 0;
 
    protected:
     PasswordManagerHandler* page_;
@@ -93,7 +93,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
-        const std::vector<webkit_glue::PasswordForm*>& result) OVERRIDE;
+        const std::vector<webkit::forms::PasswordForm*>& result) OVERRIDE;
   };
 
   // A short class to mediate requests to the password store for exceptions.
@@ -107,15 +107,15 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
-        const std::vector<webkit_glue::PasswordForm*>& result) OVERRIDE;
+        const std::vector<webkit::forms::PasswordForm*>& result) OVERRIDE;
   };
 
   // Password store consumer for populating the password list and exceptions.
   PasswordListPopulater populater_;
   PasswordExceptionListPopulater exception_populater_;
 
-  ScopedVector<webkit_glue::PasswordForm> password_list_;
-  ScopedVector<webkit_glue::PasswordForm> password_exception_list_;
+  ScopedVector<webkit::forms::PasswordForm> password_list_;
+  ScopedVector<webkit::forms::PasswordForm> password_exception_list_;
 
   // User's pref
   std::string languages_;