Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index 4a3351e5ad479fb008499ff001fcee001c513de9..81a3e62a5e7bd952531508743bf2fbc426487303 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -118,14 +118,10 @@ class RootWindowControllerTest : public test::AshTestBase { |
} |
}; |
-#if defined(OS_WIN) |
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962 |
-#define MAYBE_MoveWindows_Basic DISABLED_MoveWindows_Basic |
-#else |
-#define MAYBE_MoveWindows_Basic MoveWindows_Basic |
-#endif |
- |
-TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Basic) { |
+TEST_F(RootWindowControllerTest, MoveWindows_Basic) { |
+ if (!SupportsMultipleDisplays()) |
+ return; |
+ |
UpdateDisplay("600x600,500x500"); |
Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); |
internal::RootWindowController* controller = |
@@ -241,14 +237,10 @@ TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Basic) { |
EXPECT_EQ(internal::kShellWindowId_PanelContainer, panel->parent()->id()); |
} |
-#if defined(OS_WIN) |
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962 |
-#define MAYBE_MoveWindows_Modal DISABLED_MoveWindows_Modal |
-#else |
-#define MAYBE_MoveWindows_Modal MoveWindows_Modal |
-#endif |
+TEST_F(RootWindowControllerTest, MoveWindows_Modal) { |
+ if (!SupportsMultipleDisplays()) |
+ return; |
-TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Modal) { |
UpdateDisplay("500x500,500x500"); |
Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); |