Fix crash that permission_prompt#reset is called during destruction

1. Per crash stack, the crash is caused by that weakRef#reset is called during destruction. Calling permission_prompt_->Closing() will destroy the object, and then statements after this can be sometimes dangerous. 2. polish PermissionPromptAndroid by removing unused header Bug: 1303047 Change-Id: I613418e07989390317852c37419fc572845d8834 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3514638 Reviewed-by: Balazs Engedy <engedy@chromium.org> Commit-Queue: Lijin Shen <lazzzis@google.com> Cr-Commit-Position: refs/heads/main@{#980818}
Denger-Network · Mar 14, 2022 · 7615a8e · 7615a8e
1 parent ad8124f
commit 7615a8e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/chrome/browser/permissions/notification_blocked_message_delegate_android.cc b/chrome/browser/permissions/notification_blocked_message_delegate_android.cc
@@ -177,7 +177,6 @@ void NotificationBlockedMessageDelegate::Delegate::Closing() {
   if (!permission_prompt_)
     return;
   permission_prompt_->Closing();
-  permission_prompt_.reset();
 }
 
 void NotificationBlockedMessageDelegate::Delegate::SetManageClicked() {

diff --git a/components/permissions/android/permission_prompt_android.cc b/components/permissions/android/permission_prompt_android.cc
@@ -47,7 +47,6 @@ PermissionPromptAndroid::PermissionPromptAndroid(
 
 PermissionPromptAndroid::~PermissionPromptAndroid() {
   if (message_delegate_) {
-    message_delegate_.reset();
     return;
   }
   infobars::InfoBarManager* infobar_manager =

diff --git a/components/permissions/android/permission_prompt_android.h b/components/permissions/android/permission_prompt_android.h
@@ -12,7 +12,6 @@
 #include "base/memory/weak_ptr.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/infobars/core/infobar_manager.h"
-#include "components/messages/android/message_wrapper.h"
 #include "components/permissions/permission_prompt.h"
 #include "components/permissions/permission_uma_util.h"
 #include "components/permissions/permissions_client.h"