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

components/autofill/core/browser/autofill_external_delegate.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
@@ skipping 164 matching lines @@
     registered_keyboard_listener_with_->AddKeyboardListener(listener);
   }
 
   autofill_manager_->OnDidShowAutofillSuggestions(
       has_autofill_suggestion_ && !has_shown_autofill_popup_for_current_edit_);
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_suggestion_;
 }
 
 void AutofillExternalDelegate::OnPopupHidden(
     content::KeyboardListener* listener) {
-  if (registered_keyboard_listener_with_ == web_contents_->GetRenderViewHost())
+  if ((!web_contents_->IsBeingDestroyed()) &&
+      (registered_keyboard_listener_with_ ==
+          web_contents_->GetRenderViewHost())) {
     web_contents_->GetRenderViewHost()->RemoveKeyboardListener(listener);
+  }
 
   registered_keyboard_listener_with_ = NULL;
 }
 
 void AutofillExternalDelegate::DidSelectSuggestion(int identifier) {
   ClearPreviewedForm();
 
   // Only preview the data if it is a profile.
   if (identifier > 0)
     FillAutofillFormData(identifier, true);
@@ skipping 186 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