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..c6edbf3b86aec9fa6a2537375b210c26de93c7a0 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -19,7 +19,6 @@ AutofillExternalDelegate::AutofillExternalDelegate(
     AutofillDriver* autofill_driver)
     : autofill_manager_(autofill_manager),
       autofill_driver_(autofill_driver),
-      password_autofill_manager_(autofill_driver),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_autofill_suggestion_(false),
@@ -111,32 +110,6 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
   }
 }
 
-void AutofillExternalDelegate::OnShowPasswordSuggestions(
-    const std::vector<base::string16>& suggestions,
-    const std::vector<base::string16>& realms,
-    const FormFieldData& field,
-    const gfx::RectF& element_bounds) {
-  autofill_query_field_ = field;
-  element_bounds_ = element_bounds;
-
-  if (suggestions.empty()) {
-    autofill_manager_->delegate()->HideAutofillPopup();
-    return;
-  }
-
-  std::vector<base::string16> empty(suggestions.size());
-  std::vector<int> password_ids(suggestions.size(),
-                                POPUP_ITEM_ID_PASSWORD_ENTRY);
-  autofill_manager_->delegate()->ShowAutofillPopup(
-      element_bounds_,
-      autofill_query_field_.text_direction,
-      suggestions,
-      realms,
-      empty,
-      password_ids,
-      GetWeakPtr());
-}
-
 void AutofillExternalDelegate::SetCurrentDataListValues(
     const std::vector<base::string16>& data_list_values,
     const std::vector<base::string16>& data_list_labels) {
@@ -179,9 +152,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(
-        autofill_query_field_, value);
-    DCHECK(success);
+    NOTREACHED();  // Should be handled elsewhere.
   } else if (identifier == POPUP_ITEM_ID_DATALIST_ENTRY) {
     autofill_driver_->RendererShouldAcceptDataListSuggestion(value);
   } else if (identifier == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
@@ -216,14 +187,6 @@ void AutofillExternalDelegate::ClearPreviewedForm() {
 
 void AutofillExternalDelegate::Reset() {
   autofill_manager_->delegate()->HideAutofillPopup();
-
-  password_autofill_manager_.Reset();
-}
-
-void AutofillExternalDelegate::AddPasswordFormMapping(
-      const FormFieldData& username_field,
-      const PasswordFormFillData& fill_data) {
-  password_autofill_manager_.AddPasswordFormMapping(username_field, fill_data);
 }
 
 base::WeakPtr<AutofillExternalDelegate> AutofillExternalDelegate::GetWeakPtr() {