| Index: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
|
| diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
|
| index 38a3644d495742fca8f7feb02019dcb1013525ef..1a30d35e7d69905d21ba0a1806ce6ec7fad5d4c8 100644
|
| --- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
|
| +++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
|
| @@ -12,8 +12,8 @@
|
| #include "ash/root_window_controller.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_shell.h"
|
| #include "ash/wm_window.h"
|
| #include "base/command_line.h"
|
| #include "base/memory/ptr_util.h"
|
| @@ -168,7 +168,7 @@ TEST_F(AshPopupAlignmentDelegateTest, DisplayResize) {
|
|
|
| TEST_F(AshPopupAlignmentDelegateTest, DockedMode) {
|
| // TODO: needs unified mode. http://crbug.com/698024.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| const gfx::Rect toast_size(0, 0, 10, 10);
|
| @@ -223,7 +223,7 @@ TEST_F(AshPopupAlignmentDelegateTest, Extended) {
|
|
|
| TEST_F(AshPopupAlignmentDelegateTest, Unified) {
|
| // TODO: needs unified mode. http://crbug.com/698024.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| display_manager()->SetUnifiedDesktopEnabled(true);
|
|
|