Move PasswordForm from //content to //autofill.

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 351f6e5fcc29e56e259c8f1c1ef85b52f7371a35..786548d29d806b9e6cb03a4081222d1eb8e42567 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -15,10 +15,10 @@
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/ui/login/login_model.h"
+#include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "content/public/common/password_form.h"
 
 class PasswordManagerDelegate;
 class PasswordManagerTest;
@@ -43,7 +43,7 @@ class PasswordManager : public LoginModel,
       PasswordManagerDelegate* delegate);
   virtual ~PasswordManager();
 
-  typedef base::Callback<void(const content::PasswordForm&)>
+  typedef base::Callback<void(const autofill::PasswordForm&)>
       PasswordSubmittedCallback;
 
   // There is no corresponding remove function as currently all of the
@@ -58,9 +58,9 @@ class PasswordManager : public LoginModel,
 
   // Called by a PasswordFormManager when it decides a form can be autofilled
   // on the page.
-  virtual void Autofill(const content::PasswordForm& form_for_autofill,
-                        const content::PasswordFormMap& best_matches,
-                        const content::PasswordForm& preferred_match,
+  virtual void Autofill(const autofill::PasswordForm& form_for_autofill,
+                        const autofill::PasswordFormMap& best_matches,
+                        const autofill::PasswordForm& preferred_match,
                         bool wait_for_username) const;
 
   // LoginModel implementation.
@@ -68,14 +68,14 @@ class PasswordManager : public LoginModel,
   virtual void RemoveObserver(LoginModelObserver* observer) OVERRIDE;
 
   // Mark this form as having a generated password.
-  void SetFormHasGeneratedPassword(const content::PasswordForm& form);
+  void SetFormHasGeneratedPassword(const autofill::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 content::PasswordForm& form);
+  void ProvisionallySavePassword(const autofill::PasswordForm& form);
 
   // content::WebContentsObserver overrides.
   virtual void DidNavigateMainFrame(
@@ -86,9 +86,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<content::PasswordForm>& forms);
+      const std::vector<autofill::PasswordForm>& forms);
   void OnPasswordFormsRendered(
-      const std::vector<content::PasswordForm>& visible_forms);
+      const std::vector<autofill::PasswordForm>& visible_forms);
 
  protected:
   // Subclassed for unit tests.
@@ -97,7 +97,7 @@ class PasswordManager : public LoginModel,
 
   // Handle notification that a password form was submitted.
   virtual void OnPasswordFormSubmitted(
-      const content::PasswordForm& password_form);
+      const autofill::PasswordForm& password_form);
 
  private:
   friend class content::WebContentsUserData<PasswordManager>;
@@ -123,7 +123,7 @@ class PasswordManager : public LoginModel,
   // of users so we want to include a larger fraction of these users than the
   // normal 10%.
   void PossiblyInitializeUsernamesExperiment(
-      const content::PasswordFormMap& matches) const;
+      const autofill::PasswordFormMap& matches) const;
 
   // Returns true if we can show possible usernames to users in cases where
   // the username for the form is ambigious.