diff options
| author | lushnikov@chromium.org <lushnikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 13:51:00 +0000 |
|---|---|---|
| committer | lushnikov@chromium.org <lushnikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 13:51:00 +0000 |
| commit | a78991807688088d82280b88f0482b7dcb48cca3 (patch) | |
| tree | fe79d763d165019fc386d133c20b153120013a47 /chrome/browser/lifetime/browser_close_manager_browsertest.cc | |
| parent | 890532098034c8547f43e752bf88f22bfc8dc122 (diff) | |
| download | chromium_src-a78991807688088d82280b88f0482b7dcb48cca3.zip chromium_src-a78991807688088d82280b88f0482b7dcb48cca3.tar.gz chromium_src-a78991807688088d82280b88f0482b7dcb48cca3.tar.bz2 | |
This patch is a preparation step before landing
https://codereview.chromium.org/31093002/
It disables chromium tests that will fail as the
BeforeUnload behavior is going to be changed on the
Blink-side. These tests will be fixed and reenabled
after the blink roll.
BUG=286301
TBR=Mike West
Review URL: https://codereview.chromium.org/37163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/lifetime/browser_close_manager_browsertest.cc')
| -rw-r--r-- | chrome/browser/lifetime/browser_close_manager_browsertest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc index 3023e55..ea3acd6 100644 --- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc +++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc @@ -328,7 +328,8 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSessionRestore) { // Test that browser windows are only closed if all browsers are ready to close // and that all beforeunload dialogs are shown again after a cancel. -IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) { +IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, + DISABLED_TestMultipleWindows) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( @@ -467,7 +468,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Test that a window created during shutdown with a beforeunload handler can // cancel the shutdown. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, - TestAddWindowWithBeforeUnloadDuringShutdown) { + DISABLED_TestAddWindowWithBeforeUnloadDuringShutdown) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -520,7 +521,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Test that tabs created during shutdown with beforeunload handlers can cancel // the shutdown. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, - TestAddTabWithBeforeUnloadDuringShutdown) { + DISABLED_TestAddTabWithBeforeUnloadDuringShutdown) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( @@ -773,7 +774,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Test shutdown with downloads in progress and beforeunload handlers. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, - TestBeforeUnloadAndDownloads) { + DISABLED_TestBeforeUnloadAndDownloads) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( |