Quickly close tabs/window with long-running unload handlers.

chrome/browser/unload_browsertest.cc

 // Copyright (c) 2012 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.
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_request_mock_util.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/url_request/url_request_test_util.h"
 
 using base::TimeDelta;
 using content::BrowserThread;
 
@@ skipping 368 matching lines @@
 
   content::WindowedNotificationObserver tab_close_observer(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::NotificationService::AllSources());
   chrome::CloseTab(browser());
   tab_close_observer.Wait();
 
   CheckTitle("only_one_unload");
 }
 
+class FastTabCloseTabStripModelObserver : public TabStripModelObserver {
+ public:
+  FastTabCloseTabStripModelObserver(TabStripModel* model,
+                                    base::RunLoop* run_loop)
+      : model_(model),
+        run_loop_(run_loop) {
+    model_->AddObserver(this);
+  }
+
+  ~FastTabCloseTabStripModelObserver() {
+    model_->RemoveObserver(this);
+  }
+
+  // TabStripModelObserver:
+  virtual void TabDetachedAt(TabContents* contents, int index) {
+    run_loop_->Quit();
+  }
+
+ private:
+  TabStripModel* const model_;
+  base::RunLoop* const run_loop_;
+};
+
+// Test that fast-tab-close works when closing a tab (not the last one) with

[ojan, 2012/10/17 18:09:39]

Can you also add tests for the following cases to ensure they do what you
expect:
1. Two tabs, one with unload handler. Close the entire window. See that the
window does in fact close.
2. One tab with an unload handler and closing it.

+// an unload handler (http://crbug.com/142458).
+IN_PROC_BROWSER_TEST_F(UnloadTest, DetachedUnloadTwoTabs) {
+  ASSERT_TRUE(test_server()->Start());
+
+  GURL url = test_server()->GetURL("files/fast_tab_close/no_listeners.html");
+  ui_test_utils::NavigateToURL(browser(), url);
+  CheckTitle("no_listeners");
+  EXPECT_EQ(1, browser()->tab_count());
+
+  TabContents* initial_tab = chrome::GetActiveTabContents(browser());
+  EXPECT_EQ("", content::GetCookies(initial_tab->profile(), url));
+
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(),
+      test_server()->GetURL("files/fast_tab_close/unload_sets_cookie.html"),
+      NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  CheckTitle("unload_sets_cookie");
+
+  content::RenderViewHostImpl *second_tab_rvh =
+      static_cast<content::RenderViewHostImpl*>(
+          chrome::GetActiveWebContents(browser())->GetRenderViewHost());
+
+  {
+    base::RunLoop run_loop;
+    FastTabCloseTabStripModelObserver observer(
+        browser()->tab_strip_model(), &run_loop);
+    chrome::CloseTab(browser());
+    run_loop.Run();
+  }
+
+  // Check that the browser only has the original tab.
+  CheckTitle("no_listeners");
+  EXPECT_EQ(1, browser()->tab_count());
+
+  // Check that unload has started, but not finished.
+  // We cannot check the cookie here, because is spins the run-loop and
+  // finishes closing the tab.
+  ASSERT_TRUE(second_tab_rvh->is_waiting_for_unload_ack_for_testing());
+
+  // Wait for the web contents to go away.
+  content::WindowedNotificationObserver contents_destroyed_observer(
+      content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
+      content::NotificationService::AllSources());
+  contents_destroyed_observer.Wait();
+
+  // Check that the unload of the second tab set a cookie on the first.
+  EXPECT_EQ("unloaded=ohyeah",
+            content::GetCookies(initial_tab->profile(), url));
+
+  // Browser still has the same tab.
+  CheckTitle("no_listeners");
+  EXPECT_EQ(1, browser()->tab_count());
+}
+
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.