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

components/autofill/core/browser/autofill_external_delegate.cc

Index: components/autofill/core/browser/autofill_external_delegate.cc
diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index e4a5c039b064b3079d09596af936d441586a63b8..297bfb460cf99fff3692c384f747d75554721223 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -16,10 +16,11 @@ namespace autofill {
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     AutofillManager* autofill_manager,
-    AutofillDriver* autofill_driver)
+    AutofillDriver* autofill_driver,
+    PasswordAutofillManager* password_autofill_manager)
     : autofill_manager_(autofill_manager),
       autofill_driver_(autofill_driver),
-      password_autofill_manager_(autofill_driver),
+      password_autofill_manager_(password_autofill_manager),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_autofill_suggestion_(false),
@@ -179,7 +180,7 @@ void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
     // User selected 'Clear form'.
     autofill_driver_->RendererShouldClearFilledForm();
   } else if (identifier == POPUP_ITEM_ID_PASSWORD_ENTRY) {
-    bool success = password_autofill_manager_.DidAcceptAutofillSuggestion(
+    bool success = password_autofill_manager_->DidAcceptAutofillSuggestion(
         autofill_query_field_, value);
     DCHECK(success);
   } else if (identifier == POPUP_ITEM_ID_DATALIST_ENTRY) {
@@ -216,14 +217,13 @@ void AutofillExternalDelegate::ClearPreviewedForm() {
 
 void AutofillExternalDelegate::Reset() {
   autofill_manager_->delegate()->HideAutofillPopup();
-
-  password_autofill_manager_.Reset();
+  password_autofill_manager_->Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
       const FormFieldData& username_field,
       const PasswordFormFillData& fill_data) {
-  password_autofill_manager_.AddPasswordFormMapping(username_field, fill_data);
+  password_autofill_manager_->AddPasswordFormMapping(username_field, fill_data);
 }
 
 base::WeakPtr<AutofillExternalDelegate> AutofillExternalDelegate::GetWeakPtr() {