diff options
| author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 22:07:11 +0000 |
|---|---|---|
| committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 22:07:11 +0000 |
| commit | c4b9f62118ca994ba8a7baa98c2cc35171607415 (patch) | |
| tree | 45031dc67734f2e26248f2d74b7473c4fc130efc | |
| parent | 47ff5cbb31ea0299eaa5e9bd89495069bca7c6e9 (diff) | |
| download | chromium_src-c4b9f62118ca994ba8a7baa98c2cc35171607415.zip chromium_src-c4b9f62118ca994ba8a7baa98c2cc35171607415.tar.gz chromium_src-c4b9f62118ca994ba8a7baa98c2cc35171607415.tar.bz2 | |
Disable two ui_tests on linux after a WebKit merge.
BUG=22696
TEST=Covered by ui_tests.
Review URL: http://codereview.chromium.org/211053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26868 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/unload_uitest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index 8a61bcc..b79a356 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -239,6 +239,7 @@ TEST_F(UnloadTest, BrowserCloseUnload) { // Tests closing the browser with a beforeunload handler and clicking // OK in the beforeunload confirm dialog. +#if !defined(OS_LINUX) TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload"); @@ -265,6 +266,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { WaitForBrowserClosed(); EXPECT_FALSE(IsBrowserRunning()); } +#endif // !defined(OS_LINUX) // Tests closing the browser with a beforeunload handler that takes // two seconds to run. |