summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 12:18:18 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 12:18:18 +0000
commitdf56355336075a236cb0a72457592a14ccac56eb (patch)
tree776d1a987d938e144d84f0f3eb812ef5cfea9ba5 /chrome/browser/instant
parent713a5f2c310760e24319e91f7f6cfe47f6043d12 (diff)
downloadchromium_src-df56355336075a236cb0a72457592a14ccac56eb.zip
chromium_src-df56355336075a236cb0a72457592a14ccac56eb.tar.gz
chromium_src-df56355336075a236cb0a72457592a14ccac56eb.tar.bz2
Mark InstantTest.NonSearchToSearchDoesntSupportInstant as flaky.
TBR=sky BUG=66539 TEST=browser_tests Review URL: http://codereview.chromium.org/5743006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_browsertest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 21f2f2c..0ef8410 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -210,7 +210,9 @@ IN_PROC_BROWSER_TEST_F(InstantTest, 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).
-IN_PROC_BROWSER_TEST_F(InstantTest, NonSearchToSearchDoesntSupportInstant) {
+// Flaky, http://crbug.com/66539.
+IN_PROC_BROWSER_TEST_F(InstantTest,
+ FLAKY_NonSearchToSearchDoesntSupportInstant) {
ASSERT_TRUE(test_server()->Start());
ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
GURL url(test_server()->GetURL("files/instant/empty.html"));