Move forms/ out of webkit/.

chrome/browser/password_manager/password_manager.h

Index: chrome/browser/password_manager/password_manager.h
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index 6b990dca777231a216340d82b33764513dbd2522..544546d011d369319c8a02139723abf6f596fb45 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -13,9 +13,9 @@
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/ui/login/login_model.h"
+#include "chrome/common/password_form_fill_data.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "webkit/forms/password_form.h"
-#include "webkit/forms/password_form_dom_manager.h"
+#include "content/public/common/password_form.h"
 
 class PasswordManagerDelegate;
 class PasswordManagerTest;
@@ -44,23 +44,23 @@ class PasswordManager : public LoginModel,
 
   // Called by a PasswordFormManager when it decides a form can be autofilled
   // on the page.
-  virtual void Autofill(const webkit::forms::PasswordForm& form_for_autofill,
-                        const webkit::forms::PasswordFormMap& best_matches,
-                        const webkit::forms::PasswordForm& preferred_match,
+  virtual void Autofill(const content::PasswordForm& form_for_autofill,
+                        const content::PasswordFormMap& best_matches,
+                        const content::PasswordForm& preferred_match,
                         bool wait_for_username) const;
 
   // LoginModel implementation.
   virtual void SetObserver(LoginModelObserver* observer) OVERRIDE;
 
   // Mark this form as having a generated password.
-  void SetFormHasGeneratedPassword(const webkit::forms::PasswordForm& form);
+  void SetFormHasGeneratedPassword(const content::PasswordForm& form);
 
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
   // When a form is submitted, we prepare to save the password but wait
   // until we decide the user has successfully logged in. This is step 1
   // of 2 (see SavePassword).
-  void ProvisionallySavePassword(const webkit::forms::PasswordForm& form);
+  void ProvisionallySavePassword(const content::PasswordForm& form);
 
   // content::WebContentsObserver overrides.
   virtual void DidNavigateAnyFrame(
@@ -71,9 +71,9 @@ class PasswordManager : public LoginModel,
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
   void OnPasswordFormsParsed(
-      const std::vector<webkit::forms::PasswordForm>& forms);
+      const std::vector<content::PasswordForm>& forms);
   void OnPasswordFormsRendered(
-      const std::vector<webkit::forms::PasswordForm>& visible_forms);
+      const std::vector<content::PasswordForm>& visible_forms);
 
  private:
   // Is password autofill enabled for the current profile?