Index: ash/display/screen_position_controller_unittest.cc |
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc |
index 3c9135c913e70b2137c1eaf97eb4f4c9274cbc40..554b9aac49d84cf6defdb9dd930b185ebb8e2d59 100644 |
--- a/ash/display/screen_position_controller_unittest.cc |
+++ b/ash/display/screen_position_controller_unittest.cc |
@@ -21,27 +21,6 @@ |
#include "ui/display/screen.h" |
#include "ui/events/test/event_generator.h" |
-#if defined(OS_WIN) |
-// TODO(scottmg): RootWindow doesn't get resized immediately on Windows |
-// Ash. http://crbug.com/247916. |
-#define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen |
-#define MAYBE_ConvertHostPointToScreenHiDPI \ |
- DISABLED_ConvertHostPointToScreenHiDPI |
-#define MAYBE_ConvertHostPointToScreenRotate \ |
- DISABLED_ConvertHostPointToScreenRotate |
-#define MAYBE_ConvertHostPointToScreenUIScale \ |
- DISABLED_ConvertHostPointToScreenUIScale |
-#define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ |
- DISABLED_ConvertToScreenWhileRemovingSecondaryDisplay |
-#else |
-#define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen |
-#define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI |
-#define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate |
-#define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale |
-#define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ |
- ConvertToScreenWhileRemovingSecondaryDisplay |
-#endif |
- |
namespace ash { |
namespace test { |
@@ -97,7 +76,7 @@ class ScreenPositionControllerTest : public test::AshTestBase { |
} // namespace |
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) { |
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreen) { |
// Make sure that the point is in host coordinates. (crbug.com/521919) |
UpdateDisplay("100+100-200x200,100+300-200x200"); |
// The point 150,210 should be in host coords, and detected as outside. |
@@ -190,7 +169,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) { |
EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400)); |
} |
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) { |
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenHiDPI) { |
UpdateDisplay("50+50-200x200*2,50+300-300x300"); |
aura::Window::Windows root_windows = Shell::Get()->GetAllRootWindows(); |
@@ -221,7 +200,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) { |
EXPECT_EQ("80,80", ConvertHostPointToScreen(160, 160)); |
} |
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenRotate) { |
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenRotate) { |
// 1st display is rotated 90 clockise, and 2nd display is rotated |
// 270 clockwise. |
UpdateDisplay("100+100-200x200/r,100+500-200x200/l"); |
@@ -253,7 +232,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenRotate) { |
EXPECT_EQ("50,149", ConvertHostPointToScreen(50, -350)); |
} |
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenUIScale) { |
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenUIScale) { |
// 1st display is 2x density with 1.5 UI scale. |
UpdateDisplay("100+100-200x200*2@1.5,100+500-200x200"); |
// Put |window_| to the 1st. |
@@ -321,7 +300,7 @@ class ConvertToScreenEventHandler : public ui::EventHandler { |
// detached from the root window prior to the root window being destroyed. Test |
// that no events are dispatched at this time. |
TEST_F(ScreenPositionControllerTest, |
- MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay) { |
+ ConvertToScreenWhileRemovingSecondaryDisplay) { |
UpdateDisplay("600x600,600x600"); |
RunAllPendingInMessageLoop(); |