summaryrefslogtreecommitdiffstats
path: root/chrome/browser/unload_uitest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:46:12 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:46:12 +0000
commitc5f85ce9cf0c15e62a314929a9ab91434533eb98 (patch)
treefe290b244e3b8dd5e6dc20622a82bd62b082b51b /chrome/browser/unload_uitest.cc
parentbe3df2bcd2502eb0ff563a1fe7b760ed68182eae (diff)
downloadchromium_src-c5f85ce9cf0c15e62a314929a9ab91434533eb98.zip
chromium_src-c5f85ce9cf0c15e62a314929a9ab91434533eb98.tar.gz
chromium_src-c5f85ce9cf0c15e62a314929a9ab91434533eb98.tar.bz2
Marks BrowserCloseNoUnloadListeners flaky.
BUG=47575 TEST=none TBR=jcivelli@chromium.org Review URL: http://codereview.chromium.org/2825024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/unload_uitest.cc')
-rw-r--r--chrome/browser/unload_uitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index f7555e2..a1ec205 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -15,6 +15,13 @@
#include "net/url_request/url_request_unittest.h"
#include "views/event.h"
+#if defined(OS_LINUX)
+// http://crbug.com/47575
+#define MAYBE_BrowserCloseNoUnloadListeners FLAKY_BrowserCloseNoUnloadListeners
+#else
+#define MAYBE_BrowserCloseNoUnloadListeners BrowserCloseNoUnloadListeners
+#endif
+
const std::string NOLISTENERS_HTML =
"<html><head><title>nolisteners</title></head><body></body></html>";
@@ -271,7 +278,7 @@ TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadSync) {
}
// Tests closing the browser on a page with no unload listeners registered.
-TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) {
+TEST_F(UnloadTest, MAYBE_BrowserCloseNoUnloadListeners) {
LoadUrlAndQuitBrowser(NOLISTENERS_HTML, L"nolisteners");
}