[Password Autofill] Fix password Autofill on Facebook and Gmail.

components/autofill/browser/autofill_external_delegate.cc

 // Copyright (c) 2012 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 "base/utf_string_conversions.h"
 #include "components/autofill/browser/autocomplete_history_manager.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 188 matching lines @@
 void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
                                                    int identifier) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
 
   if (identifier == WebAutofillClient::MenuItemIDAutofillOptions) {
     // User selected 'Autofill Options'.
     autofill_manager_->OnShowAutofillDialog();
   } else if (identifier == WebAutofillClient::MenuItemIDClearForm) {
     // User selected 'Clear form'.
     host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
-  } else if (identifier == WebAutofillClient::MenuItemIDPasswordEntry &&
-             password_autofill_manager_.DidAcceptAutofillSuggestion(
-                 autofill_query_field_, value)) {
-    // DidAcceptAutofillSuggestion has already handled the work to fill in
-    // the page as required.
+  } else if (identifier == WebAutofillClient::MenuItemIDPasswordEntry) {
+    bool success = password_autofill_manager_.DidAcceptAutofillSuggestion(
+        autofill_query_field_, value);
+    DCHECK(success);
   } else if (identifier == WebAutofillClient::MenuItemIDDataListEntry) {
     host->Send(new AutofillMsg_AcceptDataListSuggestion(host->GetRoutingID(),
                                                         value));
   } else if (identifier == WebAutofillClient::MenuItemIDAutocompleteEntry) {
     // User selected an Autocomplete, so we fill directly.
     host->Send(new AutofillMsg_SetNodeText(host->GetRoutingID(), value));
   } else {
     FillAutofillFormData(identifier, false);
   }
 
@@ skipping 160 matching lines @@
     if (!*content::Details<bool>(details).ptr())
       autofill_manager_->delegate()->HideAutofillPopup();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     autofill_manager_->delegate()->HideAutofillPopup();
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace autofill