Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6505)

Unified Diff: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc

Issue 417863002: Disable BookmarksTest.CommandAgainGoesBackToBookmarksTab on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better formatting Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
index e873646431e1cbae642c2b9f07e28fdaae86fb7e..c637169fe9a789a421a6d85f9229300f964dd9fb 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
@@ -58,14 +58,19 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) {
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(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698