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

components/autofill/core/browser/autofill_external_delegate.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/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 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),
       has_shown_autofill_popup_for_current_edit_(false),
       weak_ptr_factory_(this) {
   DCHECK(autofill_manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
@@ skipping 139 matching lines @@
 
 void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
                                                    int identifier) {
   if (identifier == POPUP_ITEM_ID_AUTOFILL_OPTIONS) {
     // User selected 'Autofill Options'.
     autofill_manager_->ShowAutofillSettings();
   } else if (identifier == POPUP_ITEM_ID_CLEAR_FORM) {
     // User selected 'Clear form'.
     autofill_driver_->RendererShouldClearFilledForm();
   } else if (identifier == POPUP_ITEM_ID_PASSWORD_ENTRY) {
-    bool success = password_autofill_manager_.DidAcceptAutofillSuggestion(
+    password_autofill_manager_->DidAcceptAutofillSuggestion(
         autofill_query_field_, value);
-    DCHECK(success);
   } else if (identifier == POPUP_ITEM_ID_DATALIST_ENTRY) {
     autofill_driver_->RendererShouldAcceptDataListSuggestion(value);
   } else if (identifier == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
     // User selected an Autocomplete, so we fill directly.
     autofill_driver_->RendererShouldSetNodeText(value);
   } else {
     FillAutofillFormData(identifier, false);
   }
 
   autofill_manager_->delegate()->HideAutofillPopup();
@@ skipping 14 matching lines @@
 
   has_shown_autofill_popup_for_current_edit_ = false;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
   autofill_driver_->RendererShouldClearPreviewedForm();
 }
 
 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() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
   // If the selected element is a warning we don't want to do anything.
   if (unique_id == POPUP_ITEM_ID_WARNING_MESSAGE)
@@ skipping 107 matching lines @@
   // Set the values that all datalist elements share.
   autofill_icons->insert(autofill_icons->begin(),
                          data_list_values_.size(),
                          base::string16());
   autofill_unique_ids->insert(autofill_unique_ids->begin(),
                               data_list_values_.size(),
                               POPUP_ITEM_ID_DATALIST_ENTRY);
 }
 
 }  // namespace autofill