Re-land r248110 with ASAN error fixed.

chrome/browser/ui/autofill/tab_autofill_manager_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 "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 126 matching lines @@
 void TabAutofillManagerDelegate::UpdateAutofillPopupDataListValues(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {
   if (popup_controller_.get())
     popup_controller_->UpdateDataListValues(values, labels);
 }
 
 void TabAutofillManagerDelegate::HideAutofillPopup() {
   if (popup_controller_.get())
     popup_controller_->Hide();
+
+  // Password generation popups behave in the same fashion and should also
+  // be hidden.
+  PasswordGenerationManager* generation_manager =
+      PasswordGenerationManager::FromWebContents(web_contents_);
+  if (generation_manager)
+    generation_manager->HidePopup();
 }
 
 bool TabAutofillManagerDelegate::IsAutocompleteEnabled() {
   // For browser, Autocomplete is always enabled as part of Autofill.
   return GetPrefs()->GetBoolean(prefs::kAutofillEnabled);
 }
 
 void TabAutofillManagerDelegate::HideRequestAutocompleteDialog() {
   if (dialog_controller_.get())
     dialog_controller_->Hide();
@@ skipping 22 matching lines @@
 
 void TabAutofillManagerDelegate::DetectAccountCreationForms(
     const std::vector<autofill::FormStructure*>& forms) {
   PasswordGenerationManager* manager =
       PasswordGenerationManager::FromWebContents(web_contents_);
   if (manager)
     manager->DetectAccountCreationForms(forms);
 }
 
 }  // namespace autofill