Only show a beforeunload dialog if a frame has had a user gesture since its load.

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/bind.h"
 #include "base/command_line.h"
@@ skipping 186 matching lines @@
   void ClickModalDialogButton(bool accept) {
     app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
     ASSERT_TRUE(dialog->IsJavaScriptModalDialog());
     app_modal::JavaScriptAppModalDialog* js_dialog =
         static_cast<app_modal::JavaScriptAppModalDialog*>(dialog);
     if (accept)
       js_dialog->native_dialog()->AcceptAppModalDialog();
     else
       js_dialog->native_dialog()->CancelAppModalDialog();
   }
+
+  void PrepareForDialog(Browser* browser) {
+    for (int i = 0; i < browser->tab_strip_model()->count(); i++) {
+      content::PrepContentsForBeforeUnloadTest(
+          browser->tab_strip_model()->GetWebContentsAt(i));
+    }
+  }
 };
 
 // Navigate to a page with an infinite unload handler.
 // Then two async crosssite requests to ensure
 // we don't get confused and think we're closing the tab.
 //
 // This test is flaky on the valgrind UI bots. http://crbug.com/39057
 IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadAsync) {
   // Tests makes no sense in single-process mode since the renderer is hung.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 58 matching lines @@
 // Tests closing the browser on a page with an unload listener registered.
 // Test marked as flaky in http://crbug.com/51698
 IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseUnload) {
   LoadUrlAndQuitBrowser(UNLOAD_HTML, "unload");
 }
 
 // Tests closing the browser with a beforeunload handler and clicking
 // OK in the beforeunload confirm dialog.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   ClickModalDialogButton(true);
   window_observer.Wait();
 }
 
 // Tests closing the browser with a beforeunload handler and clicking
 // CANCEL in the beforeunload confirm dialog.
 // If this test flakes, reopen http://crbug.com/123110
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
-
+  PrepareForDialog(browser());
   chrome::CloseWindow(browser());
 
   // We wait for the title to change after cancelling the closure of browser
   // window, to ensure that in-flight IPCs from the renderer reach the browser.
   // Otherwise the browser won't put up the beforeunload dialog because it's
   // waiting for an ack from the renderer.
   base::string16 expected_title = base::ASCIIToUTF16("cancelled");
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
   ClickModalDialogButton(false);
@@ skipping 25 matching lines @@
       false);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with a
 // beforeunload handler and clicking Leave in the beforeunload confirm dialog.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadOK) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
   ClickModalDialogButton(true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with a
 // beforeunload handler and clicking Stay in the beforeunload confirm dialog.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
 
   // We wait for the title to change after cancelling the closure of browser
   // window, to ensure that in-flight IPCs from the renderer reach the browser.
@@ skipping 15 matching lines @@
         content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   ClickModalDialogButton(true);
   window_observer.Wait();
 }
 
 // Tests double calls to BrowserList::CloseAllBrowsersWithProfile, with a
 // beforeunload handler and clicking Leave in the beforeunload confirm dialog.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListDoubleCloseBeforeUnloadOK) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
   ClickModalDialogButton(true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 // Tests double calls to BrowserList::CloseAllBrowsersWithProfile, with a
 // beforeunload handler and clicking Stay in the beforeunload confirm dialog.
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListDoubleCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
@@ skipping 30 matching lines @@
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
   EXPECT_EQ(kill(base::GetCurrentProcessHandle(), SIGTERM), 0);
 }
 #endif
 
 // Tests closing the browser and clicking OK in the beforeunload confirm dialog
 // if an inner frame has the focus.
 // If this flakes, use http://crbug.com/32615 and http://crbug.com/45675
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseWithInnerFocusedFrame) {
   NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, "innerframewithfocus");
-  // Disable the hang monitor, otherwise there will be a race between the
-  // beforeunload dialog and the beforeunload hang timer.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetMainFrame()
-      ->DisableBeforeUnloadHangMonitorForTesting();
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   ClickModalDialogButton(true);
   window_observer.Wait();
 }
 
 // Tests closing the browser with a beforeunload handler that takes forever
@@ skipping 354 matching lines @@
     WindowCloseAfterBeforeUnloadCrash
 #endif
 IN_PROC_BROWSER_TEST_F(FastUnloadTest,
                        MAYBE_WindowCloseAfterBeforeUnloadCrash) {
   // Tests makes no sense in single-process mode since the renderer is hung.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess))
     return;
 
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
+  PrepareForDialog(browser());
   content::WebContents* beforeunload_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   content::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   CrashTab(beforeunload_contents);
   window_observer.Wait();
 }
@@ skipping 12 matching lines @@
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 IN_PROC_BROWSER_TEST_F(FastUnloadTest,
                        BrowserListForceCloseWithBeforeUnloadWithFastUnload) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::NotificationService::AllSources());
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 IN_PROC_BROWSER_TEST_F(FastUnloadTest,
                        BrowserListForceCloseAfterNormalCloseWithFastUnload) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
+  PrepareForDialog(browser());
 
   content::WindowedNotificationObserver window_observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::NotificationService::AllSources());
   UnloadResults unload_results;
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       false);
   BrowserList::CloseAllBrowsersWithProfile(
       browser()->profile(),
       base::Bind(&UnloadResults::AddSuccess, base::Unretained(&unload_results)),
       base::Bind(&UnloadResults::AddAbort, base::Unretained(&unload_results)),
       true);
   window_observer.Wait();
   EXPECT_EQ(1, unload_results.get_successes());
   EXPECT_EQ(0, unload_results.get_aborts());
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.