commit 09e987354f7113ab5ba670613d9f42271c76337d
author spqchan <spqchan@chromium.org> Wed Jun 13 20:28:30 2018
committer Commit Bot <commit-bot@chromium.org> Wed Jun 13 20:28:30 2018
tree f9c6532cd73d8322f418bf31498890e376d73ffc
parent 9e6471cbcd8905ab142a1cac1089de5029f414ba

[Mac] Fix for BrowserWindowTouchBar crash

Currently when BrowserTouchBarNotificationBridge is
destroyed, it will try to update the touch bar buttons,
which might have been destroyed.

This CL fixes the issue by having it just remove the
observer.

Bug: 852222
Change-Id: I8eae99985ea21c5b9f6ea5a3ffdf3998b80394e9
Reviewed-on: https://chromium-review.googlesource.com/1099483
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Sarah Chan <spqchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566970}

chrome/browser/ui/cocoa/browser_window_touch_bar.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
index 907b35c..ffc0926 100644
--- a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
+++ b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
@@ -151,7 +151,8 @@
     if (model)
       model->RemoveObserver(this);
 
-    UpdateWebContents(nullptr);
+    if (contents_)
+      BookmarkTabHelper::FromWebContents(contents_)->RemoveObserver(this);
   }
 
   void UpdateTouchBar() { [owner_ invalidateTouchBar]; }