Index: ash/system/web_notification/web_notification_tray_unittest.cc |
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc |
index 2677c18a3b617f4dc0f4c4aff227139cb031e81e..61baab58f1f9e689359eee2456b3ad0a5bed9bd4 100644 |
--- a/ash/system/web_notification/web_notification_tray_unittest.cc |
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc |
@@ -11,6 +11,7 @@ |
#include "ash/shelf/shelf_layout_manager.h" |
#include "ash/shelf/wm_shelf.h" |
#include "ash/shell.h" |
+#include "ash/shell_port.h" |
#include "ash/system/screen_layout_observer.h" |
#include "ash/system/status_area_widget.h" |
#include "ash/system/tray/system_tray.h" |
@@ -20,7 +21,6 @@ |
#include "ash/test/status_area_widget_test_helper.h" |
#include "ash/test/test_system_tray_delegate.h" |
#include "ash/wm/window_state.h" |
-#include "ash/wm_shell.h" |
#include "ash/wm_window.h" |
#include "base/memory/ptr_util.h" |
#include "base/strings/stringprintf.h" |
@@ -254,7 +254,7 @@ TEST_F(WebNotificationTrayTest, DISABLED_ManyPopupNotifications) { |
// Verifies if the notification appears on both displays when extended mode. |
TEST_F(WebNotificationTrayTest, PopupShownOnBothDisplays) { |
// TODO: needs ScreenLayoutObserver, http://crbug.com/696752. |
- if (WmShell::Get()->IsRunningInMash()) |
+ if (ShellPort::Get()->IsRunningInMash()) |
return; |
Shell::Get()->screen_layout_observer()->set_show_notifications_for_testing( |