diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 00:44:00 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 00:44:00 +0000 |
| commit | 3d2d809d72cd27d3eb1c84e576c235884eab6dc3 (patch) | |
| tree | 75374b8fe0a49d90d8cec7feea5dc6c1809f4832 | |
| parent | a4cd7a1045712e5e641048302c6af74af951fdff (diff) | |
| download | chromium_src-3d2d809d72cd27d3eb1c84e576c235884eab6dc3.zip chromium_src-3d2d809d72cd27d3eb1c84e576c235884eab6dc3.tar.gz chromium_src-3d2d809d72cd27d3eb1c84e576c235884eab6dc3.tar.bz2 | |
Disable BookmarksTest.CommandAgainGoesBackToBookmarksTab on Mac.
BUG=87200
R=stgao@chromium.org
TBR=arv@chromium.org
Review URL: https://codereview.chromium.org/417863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285087 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/bookmarks_ui_browsertest.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc index e873646..c637169 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( |