summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:32:30 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:32:30 +0000
commite00ccc92315ebbe11497f0f8265991d5b4a26910 (patch)
treec827d768bcb91e841a121f343e38593044e07c0b /ash/shell_unittest.cc
parenta6a7ced56b518de42dab6d3ac18de490fb494696 (diff)
downloadchromium_src-e00ccc92315ebbe11497f0f8265991d5b4a26910.zip
chromium_src-e00ccc92315ebbe11497f0f8265991d5b4a26910.tar.gz
chromium_src-e00ccc92315ebbe11497f0f8265991d5b4a26910.tar.bz2
GTTF: remove FAILS_ prefix, part 1
See http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium/handling-a-failing-test and https://groups.google.com/a/chromium.org/d/topic/chromium-dev/_OwJ_GWfOaY/discussion BUG=none Review URL: https://codereview.chromium.org/11293028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 0502741..b762abb 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -267,7 +267,7 @@ TEST_F(ShellTest, IsScreenLocked) {
// Fails on Mac, see http://crbug.com/115662
#if defined(OS_MACOSX)
-#define MAYBE_ManagedWindowModeBasics FAILS_ManagedWindowModeBasics
+#define MAYBE_ManagedWindowModeBasics DISABLED_ManagedWindowModeBasics
#else
#define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
#endif