Stop using nested message loop for alert() and other JS dialogs

chrome/browser/ui/browser_tab_strip_model_delegate.cc

Index: chrome/browser/ui/browser_tab_strip_model_delegate.cc
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
index fc60f8b8bdbc5ed7471ba080db5fe911bb88e1b2..37eac60d5209901a020c9847d95d05fb9f504da4 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -126,20 +126,12 @@ void BrowserTabStripModelDelegate::CreateHistoricalTab(
 
 bool BrowserTabStripModelDelegate::RunUnloadListenerBeforeClosing(
     content::WebContents* contents) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableFastUnload)) {
-    return chrome::FastUnloadController::RunUnloadEventsHelper(contents);
-  }
-  return chrome::UnloadController::RunUnloadEventsHelper(contents);
+  return browser_->RunUnloadListenerBeforeClosing(contents);
 }
 
 bool BrowserTabStripModelDelegate::ShouldRunUnloadListenerBeforeClosing(
     content::WebContents* contents) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableFastUnload)) {
-    return chrome::FastUnloadController::ShouldRunUnloadEventsHelper(contents);
-  }
-  return chrome::UnloadController::ShouldRunUnloadEventsHelper(contents);
+  return browser_->ShouldRunUnloadListenerBeforeClosing(contents);
 }
 
 bool BrowserTabStripModelDelegate::CanBookmarkAllTabs() const {