summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 22:39:04 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 22:39:04 +0000
commitb013fce259a37a211b9d42bd051bb0a0bd3747d5 (patch)
treece021926b61c0f0f1f2370956712096981f5dd4e
parentfe8bcae9c4e18928df89571e43c04dfe7a4ebeda (diff)
downloadchromium_src-b013fce259a37a211b9d42bd051bb0a0bd3747d5.zip
chromium_src-b013fce259a37a211b9d42bd051bb0a0bd3747d5.tar.gz
chromium_src-b013fce259a37a211b9d42bd051bb0a0bd3747d5.tar.bz2
Disable NonSearchToSearchDoesntSupportInstant because it crashes and causes timeout.
TEST=none BUG=70810 Review URL: http://codereview.chromium.org/6260020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72555 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/instant/instant_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 33c4b51..2264c2e 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -499,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, SearchServerDoesntSupportInstant) {
// Showing as flaky on Mac and linux (chrome os)
// http://crbug.com/70810
#define MAYBE_NonSearchToSearchDoesntSupportInstant \
- FLAKY_NonSearchToSearchDoesntSupportInstant
+ DISABLED_NonSearchToSearchDoesntSupportInstant
#else
#define MAYBE_NonSearchToSearchDoesntSupportInstant \
NonSearchToSearchDoesntSupportInstant