| Index: ash/system/overview/overview_button_tray_unittest.cc
|
| diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
|
| index 5c3c67c02e9b9ff75c6dca906c110ec6ac655f31..45cd98af79c4b5eddf5d9d69e075c705e98d6271 100644
|
| --- a/ash/system/overview/overview_button_tray_unittest.cc
|
| +++ b/ash/system/overview/overview_button_tray_unittest.cc
|
| @@ -10,13 +10,13 @@
|
| #include "ash/rotator/screen_rotation_animator.h"
|
| #include "ash/session/session_controller.h"
|
| #include "ash/shell.h"
|
| +#include "ash/shell_port.h"
|
| #include "ash/system/status_area_widget.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/test/ash_test_helper.h"
|
| #include "ash/test/status_area_widget_test_helper.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "ash/wm/overview/window_selector_controller.h"
|
| -#include "ash/wm_shell.h"
|
| #include "base/command_line.h"
|
| #include "base/test/user_action_tester.h"
|
| #include "base/time/time.h"
|
| @@ -112,7 +112,7 @@ TEST_F(OverviewButtonTrayTest, PerformAction) {
|
| // Tests that tapping on the control will record the user action Tray_Overview.
|
| TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
|
| // TODO: investigate failure in mash, http://crbug.com/698129.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| ASSERT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
|
| @@ -213,7 +213,7 @@ TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
|
| TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletes) {
|
| // TODO: disabled as ScreenRotationAnimator does not work in mash,
|
| // http://crbug.com/696754.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
|
| @@ -251,7 +251,7 @@ TEST_F(OverviewButtonTrayTest, VisibilityChangesForSystemModalWindow) {
|
| window->Show();
|
| ParentWindowInPrimaryRootWindow(window.get());
|
|
|
| - ASSERT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
|
| + ASSERT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
|
| Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
|
| true);
|
| EXPECT_TRUE(GetTray()->visible());
|
|
|