| Index: ash/tooltips/tooltip_controller_unittest.cc
|
| diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
|
| index 2784cb3cbe4e2b6d25262b4ee544bd587e1cb8e3..bd2f8647b5e7c4311eea28af05dc7173675cd62a 100644
|
| --- a/ash/tooltips/tooltip_controller_unittest.cc
|
| +++ b/ash/tooltips/tooltip_controller_unittest.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "ui/views/corewm/tooltip_controller.h"
|
|
|
| +#include "ash/public/cpp/config.h"
|
| #include "ash/shell.h"
|
| -#include "ash/shell_port.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/aura/env.h"
|
| @@ -115,7 +115,7 @@ TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) {
|
| EXPECT_TRUE(helper_->IsTooltipVisible());
|
|
|
| // TODO: CursorManager not created in mash. http://crbug.com/631103.
|
| - if (ShellPort::Get()->IsRunningInMash())
|
| + if (Shell::GetAshConfig() == Config::MASH)
|
| return;
|
|
|
| // Disable mouse event which hides the cursor and check again.
|
|
|