Refactor Autofill for out of process iframes (OOPIF).

components/password_manager/core/browser/password_autofill_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/password_manager/core/browser/password_autofill_manager.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 42 matching lines @@
   }
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, public:
 
 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) {
 }
 
 PasswordAutofillManager::~PasswordAutofillManager() {
 }
 
 bool PasswordAutofillManager::FillSuggestion(int key,
                                              const base::string16& username) {
   autofill::PasswordFormFillData fill_data;
   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;
 }
 
 bool PasswordAutofillManager::PreviewSuggestion(
     int key,
     const base::string16& username) {
   autofill::PasswordFormFillData fill_data;
   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;
 }
 
 void PasswordAutofillManager::OnAddPasswordFormMapping(
     int key,
     const autofill::PasswordFormFillData& fill_data) {
   if (!autofill::IsValidPasswordFormFillData(fill_data))
     return;
@@ skipping 74 matching lines @@
   DCHECK(success);
   autofill_client_->HideAutofillPopup();
 }
 
 void PasswordAutofillManager::RemoveSuggestion(const base::string16& value,
                                                int identifier) {
   NOTREACHED();
 }
 
 void PasswordAutofillManager::ClearPreviewedForm() {
-  PasswordManagerDriver* driver = password_manager_client_->GetDriver();
-  driver->ClearPreviewedForm();
+  password_manager_driver_->ClearPreviewedForm();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, private:
 
 bool PasswordAutofillManager::GetPasswordForUsername(
     const base::string16& current_username,
     const autofill::PasswordFormFillData& fill_data,
     base::string16* password) {
   // TODO(dubroy): When password access requires some kind of authentication
@@ skipping 37 matching lines @@
     autofill::PasswordFormFillData* found_password) {
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(key);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_password = iter->second;
   return true;
 }
 
 }  //  namespace password_manager