Marking NonSearchToSearchDoesntSupportInstant as flaky on Mac/Linux....

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 477 matching lines @@
   ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
   EXPECT_FALSE(browser()->instant()->IsShowingInstant());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_TRUE(browser()->instant()->is_active());
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 }
 
 // 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"));
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(UTF8ToWide(url.spec())));
   // The preview should be active and showing.
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->is_active());
   TabContentsWrapper* initial_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(initial_tab);
   RenderWidgetHostView* rwhv =
@@ skipping 150 matching lines @@
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 2 2 a false abcdef true 6 6",
       GetSearchStateAsString(preview_));
 }