Commit f1726643 authored by Meredith Lane's avatar Meredith Lane Committed by Commit Bot

Revert "Fix message_center::MessageView::OnSlideOut UAF"

This reverts commit af5c4bc1.

Reason for revert: Deterministically crashes MSAN and debug CrOS builds, first failure here: https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests/17319

Original change's description:
> Fix message_center::MessageView::OnSlideOut UAF
> 
> Bug: 983009
> Change-Id: Ie285c4035bfc4c45e27e5f3fd6c34280d9f4c2d2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2001943
> Reviewed-by: Peter Beverloo <peter@chromium.org>
> Commit-Queue: Matthew Denton <mpdenton@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#732131}

TBR=peter@chromium.org,tengs@chromium.org,mpdenton@chromium.org

Change-Id: Ib8a7cfeaa6c81fca58cee2cbff7102a20ca1a474
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 983009
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003167Reviewed-by: default avatarMeredith Lane <meredithl@chromium.org>
Commit-Queue: Meredith Lane <meredithl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732224}
parent f632824e
...@@ -348,12 +348,11 @@ void MessageView::RemoveSlideObserver(MessageView::SlideObserver* observer) { ...@@ -348,12 +348,11 @@ void MessageView::RemoveSlideObserver(MessageView::SlideObserver* observer) {
} }
void MessageView::OnSlideOut() { void MessageView::OnSlideOut() {
for (auto& observer : slide_observers_)
observer.OnSlideOut(notification_id_);
// RemoveNotification() may delete |this|.
MessageCenter::Get()->RemoveNotification(notification_id_, MessageCenter::Get()->RemoveNotification(notification_id_,
true /* by_user */); true /* by_user */);
for (auto& observer : slide_observers_)
observer.OnSlideOut(notification_id_);
} }
void MessageView::OnWillChangeFocus(views::View* before, views::View* now) {} void MessageView::OnWillChangeFocus(views::View* before, views::View* now) {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment