disable CommitWhenShownInFullHeightWithoutFocus on Mac

chrome/browser/ui/search/instant_extended_browsertest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1114 matching lines @@
   // Instant controller sees it as.
   omnibox()->model()->OnWillKillFocus(NULL);
   omnibox()->model()->OnKillFocus();
 
   // Confirm that the overlay has been committed.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(overlay, active_tab);
 }
 
+#if defined(OS_MACOSX)
+// http://crbug.com/227076
+#define MAYBE_CommitWhenShownInFullHeightWithoutFocus \
+        DISABLED_CommitWhenShownInFullHeightWithoutFocus

[xhwang, 2013/04/05 18:07:32]

nit: should it be 4-space indent here and below?

[scottmg, 2013/04/05 18:08:42]

ah, i was copying the one above. i can change it if you like.

[xhwang, 2013/04/05 18:25:07]

sg, consistency overrules other rules :)

+#else
+#define MAYBE_CommitWhenShownInFullHeightWithoutFocus \
+        CommitWhenShownInFullHeightWithoutFocus
+#endif
+
 // Test that the overlay is committed when shown at 100% height without focus
 // in the omnibox.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
-                       CommitWhenShownInFullHeightWithoutFocus) {
+                       MAYBE_CommitWhenShownInFullHeightWithoutFocus) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
   FocusOmniboxAndWaitForInstantExtendedSupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
 
   // Create an observer to wait for the commit.
@@ skipping 199 matching lines @@
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_native_suggestions_calls_);
 
   SetOmniboxTextAndWaitForOverlayToShow("railroad");
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(1, on_native_suggestions_calls_);
 }