Disable InstantTest.OnCancelEvent and InstantTest.PreloadsInstant

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2012 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/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 309 matching lines @@
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 1 true d false defghi true 3 3",
             GetSearchStateAsString(preview_tab, true));
 
   // Make sure the searchbox values were reset.
   EXPECT_EQ("true 1 0 1 true d false  false 0 0",
             GetSearchStateAsString(preview_tab, false));
 }
 
 // Verify that the oncancel event is dispatched upon losing focus.
-IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(OnCancelEvent)) {
+IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_OnCancelEvent) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   EXPECT_TRUE(preview());
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
@@ skipping 380 matching lines @@
       browser(), test_server()->GetURL("files/empty.html"));
 
   ASSERT_TRUE(GetStringFromJavascript(browser()->GetSelectedWebContents(),
       "window.chrome.searchBox.value", &value));
   EXPECT_EQ("", value);
 }
 
 // Tests that instant search is preloaded whenever the omnibox gets focus.
 // PreloadsInstant fails on linux_chromeos trybots all the time, possibly
 // because of http://crbug.com/80118.
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_PreloadsInstant) {
 #else
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(PreloadsInstant)) {
 #endif
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
 
   // The omnibox gets focus before the test begins. At that time, there was no
   // instant controller (which was only created after EnableInstant()), so no
@@ skipping 261 matching lines @@
   // Press <Enter> in the omnibox, causing the preview to be committed.
   WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
   EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }