Index: chrome/browser/instant/instant_browsertest.cc |
=================================================================== |
--- chrome/browser/instant/instant_browsertest.cc (revision 72525) |
+++ chrome/browser/instant/instant_browsertest.cc (working copy) |
@@ -495,7 +495,14 @@ |
// 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) { |
+#if defined(OS_MACOSX) || defined(OS_LINUX) |
+// Showing as flaky on Mac and linux (chrome os) |
+// http://crbug.com/70810 |
+#define MAYBE_NonSearchToSearchDoesntSupportInstant FLAKY_NonSearchToSearchDoesntSupportInstant |
rohitrao (ping after 24h)
2011/01/25 20:07:33
80char. Use \ to break across lines? Also below.
|
+#else |
+#define MAYBE_NonSearchToSearchDoesntSupportInstant NonSearchToSearchDoesntSupportInstant |
+#endif |
+IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_NonSearchToSearchDoesntSupportInstant) { |
ASSERT_TRUE(test_server()->Start()); |
ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html")); |
GURL url(test_server()->GetURL("files/instant/empty.html")); |