Make sure bubbles in Views default to close before their RenderFrameHosts.

chrome/browser/ui/chrome_bubble_manager.cc

 // Copyright 2015 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 "chrome/browser/ui/chrome_bubble_manager.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/bubble/bubble_controller.h"
@@ skipping 79 matching lines @@
       return;
     case BUBBLE_CLOSE_FULLSCREEN_TOGGLED:
       UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.FullscreenToggled", bubble_id);
       return;
     case BUBBLE_CLOSE_ACCEPTED:
       UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.Accepted", bubble_id);
       return;
     case BUBBLE_CLOSE_CANCELED:
       UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.Canceled", bubble_id);
       return;
+    case BUBBLE_CLOSE_FRAME_DESTROYED:
+      UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.FrameDestroyed", bubble_id);
+      return;
   }
 
   NOTREACHED();
 }
 
 }  // namespace
 
 ChromeBubbleManager::ChromeBubbleManager(TabStripModel* tab_strip_model)
     : tab_strip_model_(tab_strip_model) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 22 matching lines @@
   CloseAllBubbles(BUBBLE_CLOSE_TABSWITCHED);
 }
 
 void ChromeBubbleManager::ActiveTabChanged(content::WebContents* old_contents,
                                            content::WebContents* new_contents,
                                            int index,
                                            int reason) {
   Observe(new_contents);
 }
 
+void ChromeBubbleManager::FrameDeleted(
+    content::RenderFrameHost* render_frame_host) {
+  // When a frame is destroyed, bubbles spawned by that frame should default to
+  // being closed, so that they can't traverse any references they hold to the
+  // destroyed frame.
+  CloseBubblesOwnedBy(render_frame_host);
+}
+
 void ChromeBubbleManager::DidToggleFullscreenModeForTab(
     bool entered_fullscreen, bool will_cause_resize) {
   CloseAllBubbles(BUBBLE_CLOSE_FULLSCREEN_TOGGLED);
   // Any bubble that didn't close should update its anchor position.
   UpdateAllBubbleAnchors();
 }
 
 void ChromeBubbleManager::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   CloseAllBubbles(BUBBLE_CLOSE_NAVIGATED);
 }
 
 void ChromeBubbleManager::ChromeBubbleMetrics::OnBubbleNeverShown(
     BubbleReference bubble) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.NeverShown", GetBubbleId(bubble));
 }
 
 void ChromeBubbleManager::ChromeBubbleMetrics::OnBubbleClosed(
     BubbleReference bubble, BubbleCloseReason reason) {
   // Log the amount of time the bubble was visible.
   base::TimeDelta visible_time = bubble->GetVisibleTime();
   UMA_HISTOGRAM_LONG_TIMES("Bubbles.DisplayTime.All", visible_time);
 
   LogBubbleCloseReason(bubble, reason);
 }