Autofill: Refactoring to support fetching password after a username is selected

components/autofill/core/browser/password_autofill_manager.h

Index: components/autofill/core/browser/password_autofill_manager.h
diff --git a/components/autofill/core/browser/password_autofill_manager.h b/components/autofill/core/browser/password_autofill_manager.h
index ddde78eb0faa337f9a1ef49f98af8daca681e231..2c3211290ce590e17a69b15788b50002763dbae9 100644
--- a/components/autofill/core/browser/password_autofill_manager.h
+++ b/components/autofill/core/browser/password_autofill_manager.h
@@ -15,6 +15,7 @@
 #include <map>
 
 #include "components/autofill/core/common/password_form_fill_data.h"
+#include "components/password_manager/core/browser/password_manager_driver.h"
 
 namespace autofill {
 
@@ -23,7 +24,7 @@ class AutofillDriver;
 // This class is responsible for filling password forms.
 class PasswordAutofillManager {
  public:
-  explicit PasswordAutofillManager(AutofillDriver* autofill_driver);
+  explicit PasswordAutofillManager(PasswordManagerDriver* driver);
   virtual ~PasswordAutofillManager();
 
   // Fills the password associated with user name |username|. Returns true if
@@ -49,9 +50,10 @@ class PasswordAutofillManager {
 
   // Returns true if |current_username| matches a username for one of the
   // login mappings in |password|.
-  bool WillFillUserNameAndPassword(
+  bool GetPasswordForUsername(
       const base::string16& current_username,
-      const PasswordFormFillData& password);
+      const PasswordFormFillData& fill_data,
+      base::string16* password);
 
   // Finds login information for a |node| that was previously filled.
   bool FindLoginInfo(const FormFieldData& field,
@@ -62,7 +64,7 @@ class PasswordAutofillManager {
 
   // Provides driver-level context to the shared code of the component. Must
   // outlive |this|.
-  AutofillDriver* const autofill_driver_;  // weak
+  PasswordManagerDriver* const driver_;  // weak
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillManager);
 };