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

Unified Diff: ash/shell_unittest.cc

Issue 23483041: [Cleanup] Remove mac code from aura/ash/views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « ash/shell/window_type_launcher.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 0cc1e4483aa7e6513757ed1189e226ab9b4be92c..79c64f9b7856c539da06931cb458ad4fc12fb020 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -386,13 +386,7 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) {
views::MenuRunner::CONTEXT_MENU));
}
-// Fails on Mac, see http://crbug.com/115662
-#if defined(OS_MACOSX)
-#define MAYBE_ManagedWindowModeBasics DISABLED_ManagedWindowModeBasics
-#else
-#define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
-#endif
-TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
+TEST_F(ShellTest, ManagedWindowModeBasics) {
Shell* shell = Shell::GetInstance();
Shell::TestApi test_api(shell);
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698