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

Unified Diff: ash/display/root_window_transformers_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment Created 7 years, 6 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
Index: ash/display/root_window_transformers_unittest.cc
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 631ca95333b7e7004d3f5717068f4a4fd45efb61..c8abe975e0c9bfc47acc347b2e1d12587219a313 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -120,16 +120,13 @@ float GetStoredUIScale(int64 id) {
typedef test::AshTestBase AshRootWindowTransformerTest;
#if defined(OS_WIN)
-// On Win8 bots, the host window can't be resized and
-// SetTransform updates the window using the orignal host window
-// size.
+// TODO(scottmg): RootWindow doesn't get resized on Windows
+// Ash. http://crbug.com/247916.
#define MAYBE_RotateAndMagnify DISABLED_RotateAndMagniy
-#define MAYBE_ScaleAndMagnify DISABLED_ScaleAndMagnify
#define MAYBE_TouchScaleAndMagnify DISABLED_TouchScaleAndMagnify
#define MAYBE_ConvertHostToRootCoords DISABLED_ConvertHostToRootCoords
#else
#define MAYBE_RotateAndMagnify RotateAndMagniy
-#define MAYBE_ScaleAndMagnify ScaleAndMagnify
#define MAYBE_TouchScaleAndMagnify TouchScaleAndMagnify
#define MAYBE_ConvertHostToRootCoords ConvertHostToRootCoords
#endif
@@ -229,7 +226,10 @@ TEST_F(AshRootWindowTransformerTest, MAYBE_RotateAndMagnify) {
Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
}
-TEST_F(AshRootWindowTransformerTest, MAYBE_ScaleAndMagnify) {
+TEST_F(AshRootWindowTransformerTest, ScaleAndMagnify) {
+ if (!SupportsMultipleDisplays())
+ return;
+
TestEventHandler event_handler;
Shell::GetInstance()->AddPreTargetHandler(&event_handler);
« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698