Merge 210229 "Hide autofill popup before WebContentsImpl is dest..."

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/autocheckout_whitelist_manager_factory.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
@@ skipping 20 matching lines @@
 namespace autofill {
 
 TabAutofillManagerDelegate::TabAutofillManagerDelegate(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents) {
   DCHECK(web_contents);
 }
 
 TabAutofillManagerDelegate::~TabAutofillManagerDelegate() {
-  HideAutofillPopup();
+  // NOTE: It is too late to clean up the autofill popup; that cleanup process
+  // requires that the WebContents instance still be valid and it is not at
+  // this point (in particular, the WebContentsImpl destructor has already
+  // finished running and we are now in the base class destructor).
+  DCHECK(!popup_controller_);
 }
 
 PersonalDataManager* TabAutofillManagerDelegate::GetPersonalDataManager() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return PersonalDataManagerFactory::GetForProfile(
       profile->GetOriginalProfile());
 }
 
 PrefService* TabAutofillManagerDelegate::GetPrefs() {
@@ skipping 146 matching lines @@
       content::PageTransitionIsRedirect(details.entry->GetTransitionType());
   if (dialog_controller_.get() &&
       (dialog_controller_->dialog_type() == DIALOG_TYPE_REQUEST_AUTOCOMPLETE ||
        (!dialog_controller_->AutocheckoutIsRunning() && !was_redirect))) {
     HideRequestAutocompleteDialog();
   }
 
   HideAutocheckoutBubble();
 }
 
+void TabAutofillManagerDelegate::WebContentsDestroyed(
+    content::WebContents* web_contents) {
+  HideAutofillPopup();
+}
+
 }  // namespace autofill