Refactor Autofill for out of process iframes (OOPIF).

components/password_manager/core/browser/password_autofill_manager.cc

Index: components/password_manager/core/browser/password_autofill_manager.cc
diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc
index 1a45c185369fe414e9cefb2eeb8a86b5299d039f..208ddf6f73acebe1c796c2e4699d904a26ab115c 100644
--- a/components/password_manager/core/browser/password_autofill_manager.cc
+++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -60,8 +60,10 @@ void GetSuggestions(const autofill::PasswordFormFillData& fill_data,
 
 PasswordAutofillManager::PasswordAutofillManager(
     PasswordManagerClient* password_manager_client,
+    PasswordManagerDriver* password_manager_driver,
     autofill::AutofillClient* autofill_client)
     : password_manager_client_(password_manager_client),
+      password_manager_driver_(password_manager_driver),
       autofill_client_(autofill_client),
       weak_ptr_factory_(this) {
 }
@@ -75,8 +77,7 @@ bool PasswordAutofillManager::FillSuggestion(int key,
   base::string16 password;
   if (FindLoginInfo(key, &fill_data) &&
       GetPasswordForUsername(username, fill_data, &password)) {
-    PasswordManagerDriver* driver = password_manager_client_->GetDriver();
-    driver->FillSuggestion(username, password);
+    password_manager_driver_->FillSuggestion(username, password);
     return true;
   }
   return false;
@@ -89,8 +90,7 @@ bool PasswordAutofillManager::PreviewSuggestion(
   base::string16 password;
   if (FindLoginInfo(key, &fill_data) &&
       GetPasswordForUsername(username, fill_data, &password)) {
-    PasswordManagerDriver* driver = password_manager_client_->GetDriver();
-    driver->PreviewSuggestion(username, password);
+    password_manager_driver_->PreviewSuggestion(username, password);
     return true;
   }
   return false;
@@ -185,8 +185,7 @@ void PasswordAutofillManager::RemoveSuggestion(const base::string16& value,
 }
 
 void PasswordAutofillManager::ClearPreviewedForm() {
-  PasswordManagerDriver* driver = password_manager_client_->GetDriver();
-  driver->ClearPreviewedForm();
+  password_manager_driver_->ClearPreviewedForm();
 }
 
 ////////////////////////////////////////////////////////////////////////////////