Tab Search: fix CloseBubbleOnTabActivationHelper not reset correctly

Bug: 1147412, 1099917
Change-Id: I121bd2ac5b0377e74e717bfecdf97884e217ac6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527533Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Roman Arora <romanarora@chromium.org>
Commit-Queue: Yuheng Huang <yuhengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826085}

chrome/browser/ui/views/bubble/webui_bubble_manager.cc

@@ -73,6 +73,8 @@ void WebUIBubbleManagerBase::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(bubble_view_->GetWidget(), widget);
   cached_web_view_ = bubble_view_->RemoveWebView();
   observed_bubble_widget_.Remove(bubble_view_->GetWidget());
+  DCHECK(close_bubble_helper_);
+  close_bubble_helper_.reset();
   cache_timer_->Reset();
   bubble_using_cached_webview_ = false;
 }

chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc

@@ -11,12 +11,15 @@
 CloseBubbleOnTabActivationHelper::CloseBubbleOnTabActivationHelper(
     views::BubbleDialogDelegateView* owner_bubble,
     Browser* browser)
-    : owner_bubble_(owner_bubble) {
+    : owner_bubble_(owner_bubble), browser_(browser) {
   DCHECK(owner_bubble_);
-  browser->tab_strip_model()->AddObserver(this);
+  DCHECK(browser_);
+  browser_->tab_strip_model()->AddObserver(this);
 }
 
-CloseBubbleOnTabActivationHelper::~CloseBubbleOnTabActivationHelper() = default;
+CloseBubbleOnTabActivationHelper::~CloseBubbleOnTabActivationHelper() {
+  browser_->tab_strip_model()->RemoveObserver(this);
+}
 
 void CloseBubbleOnTabActivationHelper::OnTabStripModelChanged(
     TabStripModel* tab_strip_model,

chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h

@@ -33,6 +33,7 @@ class CloseBubbleOnTabActivationHelper : public TabStripModelObserver {
 
  private:
   views::BubbleDialogDelegateView* owner_bubble_;  // weak, owns me.
+  Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(CloseBubbleOnTabActivationHelper);
 };