summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:53:01 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:53:01 +0000
commit6685ab557a94e066bf35ff09cb504286befcca67 (patch)
tree09b19990b31e76917fc4fd40198e82f0fb7f4f15 /chrome/browser/instant
parent75d0b9edce0717c573a05f85bfdb30b4a10d4005 (diff)
downloadchromium_src-6685ab557a94e066bf35ff09cb504286befcca67.zip
chromium_src-6685ab557a94e066bf35ff09cb504286befcca67.tar.gz
chromium_src-6685ab557a94e066bf35ff09cb504286befcca67.tar.bz2
Re-disable NonSearchToSearchDoesntSupportInstant on Linux
TBR=rtenneti@chromium.org BUG=70810 TEST=none Review URL: http://codereview.chromium.org/6639003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 8011049..839ab58 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -529,8 +529,8 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SearchServerDoesntSupportInstant) {
// Verifies transitioning from loading a non-search string to a search string
// with the provider not supporting instant works (meaning we don't display
// anything).
-#if defined(OS_MACOSX)
-// Showing as flaky on Mac
+#if defined(OS_MACOSX) || define(OS_LINUX)
+// Showing as flaky on Mac and Linux/ChromeOS
// http://crbug.com/70810
#define MAYBE_NonSearchToSearchDoesntSupportInstant \
DISABLED_NonSearchToSearchDoesntSupportInstant