Refactor Autofill for out of process iframes (OOPIF).

components/password_manager/core/browser/password_manager.h

Index: components/password_manager/core/browser/password_manager.h
diff --git a/components/password_manager/core/browser/password_manager.h b/components/password_manager/core/browser/password_manager.h
index 3d3473d1ad979d64fdbeff5fd37ba9a892b42b29..b2076db43f68fc67e5ae7cdbffe6563f7ac12c85 100644
--- a/components/password_manager/core/browser/password_manager.h
+++ b/components/password_manager/core/browser/password_manager.h
@@ -68,7 +68,8 @@ class PasswordManager : public LoginModel {
 
   // Called by a PasswordFormManager when it decides a form can be autofilled
   // on the page.
-  virtual void Autofill(const autofill::PasswordForm& form_for_autofill,
+  virtual void Autofill(password_manager::PasswordManagerDriver* driver,
+                        const autofill::PasswordForm& form_for_autofill,
                         const autofill::PasswordFormMap& best_matches,
                         const autofill::PasswordForm& preferred_match,
                         bool wait_for_username) const;
@@ -78,7 +79,9 @@ class PasswordManager : public LoginModel {
   void RemoveObserver(LoginModelObserver* observer) override;
 
   // Mark this form as having a generated password.
-  void SetFormHasGeneratedPassword(const autofill::PasswordForm& form);
+  void SetFormHasGeneratedPassword(
+      password_manager::PasswordManagerDriver* driver,
+      const autofill::PasswordForm& form);
 
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
@@ -91,16 +94,18 @@ class PasswordManager : public LoginModel {
   void DidNavigateMainFrame(bool is_in_page);
 
   // Handles password forms being parsed.
-  void OnPasswordFormsParsed(
-      const std::vector<autofill::PasswordForm>& forms);
+  void OnPasswordFormsParsed(password_manager::PasswordManagerDriver* driver,
+                             const std::vector<autofill::PasswordForm>& forms);
 
   // Handles password forms being rendered.
   void OnPasswordFormsRendered(
+      password_manager::PasswordManagerDriver* driver,
       const std::vector<autofill::PasswordForm>& visible_forms,
       bool did_stop_loading);
 
   // Handles a password form being submitted.
   virtual void OnPasswordFormSubmitted(
+      password_manager::PasswordManagerDriver* driver,
       const autofill::PasswordForm& password_form);
 
   PasswordManagerClient* client() { return client_; }
@@ -152,6 +157,7 @@ class PasswordManager : public LoginModel {
   // Checks for every from in |forms| whether |pending_login_managers_| already
   // contain a manager for that form. If not, adds a manager for each such form.
   void CreatePendingLoginManagers(
+      password_manager::PasswordManagerDriver* driver,
       const std::vector<autofill::PasswordForm>& forms);
 
   // Note about how a PasswordFormManager can transition from
@@ -181,9 +187,6 @@ class PasswordManager : public LoginModel {
   // The embedder-level client. Must outlive this class.
   PasswordManagerClient* const client_;
 
-  // The platform-level driver. Must outlive this class.
-  PasswordManagerDriver* const driver_;
-
   // Set to false to disable password saving (will no longer ask if you
   // want to save passwords but will continue to fill passwords).
   BooleanPrefMember saving_passwords_enabled_;