Disable BookmarksTest.CommandAgainGoesBackToBookmarksTab on Mac.

chrome/browser/ui/webui/bookmarks_ui_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/test/test_timeouts.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 40 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) {
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // Bring up the bookmarks manager tab.
   OpenBookmarksManager();
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }
 
-// TODO(linux_aura) http://crbug.com/163931
+// TODO(linux_aura): http://crbug.com/163931
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
-#define MAYBE_CommandAgainGoesBackToBookmarksTab DISABLED_CommandAgainGoesBackToBookmarksTab
+#define MAYBE_CommandAgainGoesBackToBookmarksTab \
+  DISABLED_CommandAgainGoesBackToBookmarksTab
+// Flaky on Mac: http://crbug.com/87200
+#elif defined(OS_MACOSX)
+#define MAYBE_CommandAgainGoesBackToBookmarksTab \
+  DISABLED_CommandAgainGoesBackToBookmarksTab
 #else
-#define MAYBE_CommandAgainGoesBackToBookmarksTab CommandAgainGoesBackToBookmarksTab
+#define MAYBE_CommandAgainGoesBackToBookmarksTab \
+  CommandAgainGoesBackToBookmarksTab
 #endif
 
-// If this flakes on Mac, use: http://crbug.com/87200
 IN_PROC_BROWSER_TEST_F(BookmarksTest,
                        MAYBE_CommandAgainGoesBackToBookmarksTab) {
   ui_test_utils::NavigateToURL(
       browser(),
       ui_test_utils::GetTestUrl(base::FilePath(),
                                 base::FilePath().AppendASCII("simple.html")));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // Bring up the bookmarks manager tab.
   OpenBookmarksManager();
@@ skipping 18 matching lines @@
   navigation_observer.Wait();
 
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }