Index: ash/wm/workspace/workspace_window_resizer_unittest.cc |
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc |
index 2e07f22097a8252fad5f2fb70375a07c5c61101f..3fd046e3e223f3291e89bcd31f3c6b10da5bec01 100644 |
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc |
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc |
@@ -4,12 +4,12 @@ |
#include "ash/wm/workspace/workspace_window_resizer.h" |
+#include "ash/public/cpp/config.h" |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/screen_util.h" |
#include "ash/shelf/shelf_constants.h" |
#include "ash/shelf/wm_shelf.h" |
#include "ash/shell.h" |
-#include "ash/shell_port.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/wm/window_positioning_utils.h" |
#include "ash/wm/window_state.h" |
@@ -498,7 +498,7 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3_Compress) { |
TEST_F(WorkspaceWindowResizerTest, MouseMoveWithTouchDrag) { |
// TODO: fails because mash doesn't support CursorManager. |
// http://crbug.com/631103. |
- if (ShellPort::Get()->IsRunningInMash()) |
+ if (Shell::GetAshConfig() == Config::MASH) |
return; |
window_->SetBounds(gfx::Rect(0, 300, 400, 300)); |
@@ -802,7 +802,7 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) { |
TEST_F(WorkspaceWindowResizerTest, DontDragOffBottomWithMultiDisplay) { |
// TODO: SetLayoutForCurrentDisplays() needs to ported to mash. |
// http://crbug.com/698043. |
- if (ShellPort::Get()->IsRunningInMash()) |
+ if (Shell::GetAshConfig() == Config::MASH) |
return; |
UpdateDisplay("800x600,800x600"); |