| 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");
|
|
|