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

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

Index: chrome/browser/ui/webui/options2/password_manager_handler.h
diff --git a/chrome/browser/ui/webui/options2/password_manager_handler.h b/chrome/browser/ui/webui/options2/password_manager_handler.h
index 389f1aff37fc60bf296349e149b2f240e8bfc2e2..475c4310c7fe300bca5e5d4285efd06db12c87f5 100644
--- a/chrome/browser/ui/webui/options2/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options2/password_manager_handler.h
@@ -14,6 +14,12 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
+namespace webkit {
+namespace forms {
+struct PasswordForm;
+}
+}
+
 class PasswordManagerHandler : public OptionsPage2UIHandler,
                                public PasswordStore::Observer {
  public:
@@ -75,7 +81,7 @@ class PasswordManagerHandler : public OptionsPage2UIHandler,
     // 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 +99,7 @@ class PasswordManagerHandler : public OptionsPage2UIHandler,
     // 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 +113,15 @@ class PasswordManagerHandler : public OptionsPage2UIHandler,
     // 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_;