diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:45:15 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:45:15 +0000 |
| commit | db73b05e98b6e857c8bc722526834eb319c9ce6d (patch) | |
| tree | 2d276f4e3ef5ac07b6194e13a194190387e470b8 /chrome/browser/ui/browser_browsertest.cc | |
| parent | 8b5f787003144aae8a54a6932d05fb24678bfb94 (diff) | |
| download | chromium_src-db73b05e98b6e857c8bc722526834eb319c9ce6d.zip chromium_src-db73b05e98b6e857c8bc722526834eb319c9ce6d.tar.gz chromium_src-db73b05e98b6e857c8bc722526834eb319c9ce6d.tar.bz2 | |
Disable BrowserTest.BeforeUnloadVsBeforeReload on Windows.
TBR=dmazzoni@chromium.org
BUG=130411
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10449082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index dcc5af2..abc3dc4 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -510,9 +510,17 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) { alert->native_dialog()->AcceptAppModalDialog(); } +// BrowserTest.BeforeUnloadVsBeforeReload times out on Windows. +// http://crbug.com/130411 +#if defined(OS_WIN) +#define MAYBE_BeforeUnloadVsBeforeReload DISABLED_BeforeUnloadVsBeforeReload +#else +#define MAYBE_BeforeUnloadVsBeforeReload BeforeUnloadVsBeforeReload +#endif + // Test that when a page has an onunload handler, reloading a page shows a // different dialog than navigating to a different page. -IN_PROC_BROWSER_TEST_F(BrowserTest, BeforeUnloadVsBeforeReload) { +IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_BeforeUnloadVsBeforeReload) { GURL url(std::string("data:text/html,") + kBeforeUnloadHTML); ui_test_utils::NavigateToURL(browser(), url); |