Index: ash/wallpaper/wallpaper_controller_unittest.cc |
diff --git a/ash/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc |
index 8d395f64faef073cb64e42e3c58e27a7de1ac369..90e7a6dac2fb681843035afc83b6c7c0f43f5da7 100644 |
--- a/ash/wallpaper/wallpaper_controller_unittest.cc |
+++ b/ash/wallpaper/wallpaper_controller_unittest.cc |
@@ -8,6 +8,7 @@ |
#include <cstdlib> |
#include "ash/ash_switches.h" |
+#include "ash/public/cpp/config.h" |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/root_window_controller.h" |
#include "ash/session/session_controller.h" |
@@ -404,7 +405,7 @@ TEST_F(WallpaperControllerTest, GetMaxDisplaySize) { |
WallpaperController::GetMaxDisplaySizeInNative().ToString()); |
// TODO: mash doesn't support rotation yet, http://crbug.com/695556. |
- if (!ShellPort::Get()->IsRunningInMash()) { |
+ if (Shell::GetAshConfig() != Config::MASH) { |
// Rotated display should return the rotated size. |
UpdateDisplay("1000x300*2/r"); |
EXPECT_EQ("300x1000", |