Makes instant run before unload listeners.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index a42483c3f885e76c240e26971aebdb56d9059fe9..8794fcd7869a6e234d65d13ca169af1f3b752154 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -57,6 +57,7 @@
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/instant/instant_unload_handler.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -183,13 +184,6 @@ const float kPopupMaxWidthFactor = 0.5;
 const float kPopupMaxHeightFactor = 0.6;
 #endif
 
-// Returns true if the specified TabContents has unload listeners registered.
-bool TabHasUnloadListener(TabContents* contents) {
-  return contents->notify_disconnection() &&
-      !contents->showing_interstitial_page() &&
-      !contents->render_view_host()->SuddenTerminationAllowed();
-}
-
 }  // namespace
 
 extern bool g_log_bug53991;
@@ -839,7 +833,7 @@ bool Browser::ShouldCloseWindow() {
 
   for (int i = 0; i < tab_count(); ++i) {
     TabContents* contents = GetTabContentsAt(i);
-    if (TabHasUnloadListener(contents))
+    if (contents->NeedToFireBeforeUnload())
       tabs_needing_before_unload_fired_.insert(contents);
   }
 
@@ -2057,11 +2051,11 @@ bool Browser::RunUnloadEventsHelper(TabContents* contents) {
   // handler we can fire even if the TabContents has an unload listener.
   // One case where we hit this is in a tab that has an infinite loop
   // before load.
-  if (TabHasUnloadListener(contents)) {
+  if (contents->NeedToFireBeforeUnload()) {
     // If the page has unload listeners, then we tell the renderer to fire
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
-    // with the HasUnloadListener bit cleared.
+    // with the NeedToFireBeforeUnload bit cleared.
     contents->render_view_host()->FirePageBeforeUnload(false);
     return true;
   }
@@ -3337,7 +3331,8 @@ void Browser::Observe(NotificationType type,
         if (!InstantController::IsEnabled(profile())) {
           if (instant()) {
             instant()->DestroyPreviewContents();
-            instant_.reset(NULL);
+            instant_.reset();
+            instant_unload_handler_.reset();
           }
         } else {
           CreateInstantIfNecessary();
@@ -3397,8 +3392,11 @@ void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
   preview_contents->controller().CopyStateFromAndPrune(
       &tab_contents->controller());
   // TabStripModel takes ownership of preview_contents.
-  tab_handler_->GetTabStripModel()->ReplaceTabContentsAt(
-      index, preview_contents);
+  TabContentsWrapper* old_contents =
+      tab_handler_->GetTabStripModel()->ReplaceTabContentsAt(
+          index, preview_contents);
+  // InstantUnloadHandler takes ownership of old_contents.
+  instant_unload_handler_->RunUnloadListenersOrDestroy(old_contents, index);
 }
 
 void Browser::SetSuggestedText(const string16& text) {
@@ -4166,5 +4164,6 @@ void Browser::CreateInstantIfNecessary() {
   if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(profile_, this));
+    instant_unload_handler_.reset(new InstantUnloadHandler(this));
   }
 }