From db73b05e98b6e857c8bc722526834eb319c9ce6d Mon Sep 17 00:00:00 2001 From: "kmadhusu@chromium.org" Date: Wed, 30 May 2012 23:45:15 +0000 Subject: 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 --- chrome/browser/ui/browser_browsertest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'chrome/browser/ui/browser_browsertest.cc') 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); -- cgit v1.1