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

Unified Diff: ash/common/wallpaper/wallpaper_controller_unittest.cc

Issue 2713923002: chromeos: moves a bunch of tests to common_unittests (Closed)
Patch Set: feedback Created 3 years, 10 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/common/test/ash_test.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_controller_unittest.cc
diff --git a/ash/common/wallpaper/wallpaper_controller_unittest.cc b/ash/common/wallpaper/wallpaper_controller_unittest.cc
index b05bf4a462ac68d48fd264d3b71130b67c0dd725..d7aac9f79c9e599a0e763b354e62ea8b0dff72a0 100644
--- a/ash/common/wallpaper/wallpaper_controller_unittest.cc
+++ b/ash/common/wallpaper/wallpaper_controller_unittest.cc
@@ -375,10 +375,13 @@ TEST_F(WallpaperControllerTest, GetMaxDisplaySize) {
EXPECT_EQ("1000x300",
WallpaperController::GetMaxDisplaySizeInNative().ToString());
- // Rotated display should return the rotated size.
- UpdateDisplay("1000x300*2/r");
- EXPECT_EQ("300x1000",
- WallpaperController::GetMaxDisplaySizeInNative().ToString());
+ // TODO: mash doesn't support rotation yet, http://crbug.com/695556.
+ if (!WmShell::Get()->IsRunningInMash()) {
+ // Rotated display should return the rotated size.
+ UpdateDisplay("1000x300*2/r");
+ EXPECT_EQ("300x1000",
+ WallpaperController::GetMaxDisplaySizeInNative().ToString());
+ }
// UI Scaling shouldn't affect the native size.
UpdateDisplay("1000x300*2@1.5");
« no previous file with comments | « ash/common/test/ash_test.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698