summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 23:18:25 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 23:18:25 +0000
commit422cc248f0b3a8dbb1df3f6d7e1ea96f131b0393 (patch)
treeb0f6f1a71716d948c25277c354d8fca469ef68bf /chrome
parent24bd38e50dfcd1eefcbe5441bf11d422a4cee64f (diff)
downloadchromium_src-422cc248f0b3a8dbb1df3f6d7e1ea96f131b0393.zip
chromium_src-422cc248f0b3a8dbb1df3f6d7e1ea96f131b0393.tar.gz
chromium_src-422cc248f0b3a8dbb1df3f6d7e1ea96f131b0393.tar.bz2
Mark Instant OnSubmitEvent test flaky for all platform, because it seems to be.
TBR=sky@chromium.org BUG=85387 TEST= Review URL: http://codereview.chromium.org/7698009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/instant/instant_browsertest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 708ec27..09d5db5 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -724,12 +724,10 @@ IN_PROC_BROWSER_TEST_F(InstantTest, HideOn403) {
// DISABLED http://crbug.com/80118
#if defined(OS_LINUX)
IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_OnSubmitEvent) {
-#elif defined(OS_MACOSX)
+#else
// http://crbug.com/85387
IN_PROC_BROWSER_TEST_F(InstantTest, FLAKY_OnSubmitEvent) {
-#else
-IN_PROC_BROWSER_TEST_F(InstantTest, OnSubmitEvent) {
-#endif // OS_LINUX
+#endif // !OS_LINUX
ASSERT_TRUE(test_server()->Start());
EnableInstant();
ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));