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

chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc

Index: chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc
===================================================================
--- chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc	(revision 211372)
+++ chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc	(working copy)
@@ -38,7 +38,11 @@
 }
 
 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() {
@@ -205,4 +209,9 @@
   HideAutocheckoutBubble();
 }
 
+void TabAutofillManagerDelegate::WebContentsDestroyed(
+    content::WebContents* web_contents) {
+  HideAutofillPopup();
+}
+
 }  // namespace autofill