| Index: ash/shelf/shelf_tooltip_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc
|
| index 0af95f60444954ea6a94eac116a24917fd81f44c..18464f379766f24d23c16c55774f853eb2946cd0 100644
|
| --- a/ash/shelf/shelf_tooltip_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc
|
| @@ -8,10 +8,10 @@
|
| #include "ash/shelf/shelf_model.h"
|
| #include "ash/shelf/shelf_view.h"
|
| #include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shell_port.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/test/shelf_view_test_api.h"
|
| #include "ash/test/test_shelf_item_delegate.h"
|
| -#include "ash/wm_shell.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/events/test/event_generator.h"
|
| @@ -167,7 +167,7 @@ TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHideHidden) {
|
|
|
| TEST_F(ShelfTooltipManagerTest, HideForEvents) {
|
| // TODO: investigate failure in mash. http://crbug.com/695563.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| ui::test::EventGenerator& generator = GetEventGenerator();
|
| @@ -203,7 +203,7 @@ TEST_F(ShelfTooltipManagerTest, HideForEvents) {
|
|
|
| TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
|
| // TODO: investigate failure in mash. http://crbug.com/695563.
|
| - if (WmShell::Get()->IsRunningInMash())
|
| + if (ShellPort::Get()->IsRunningInMash())
|
| return;
|
|
|
| ui::test::EventGenerator& generator = GetEventGenerator();
|
|
|