| Index: ash/test/ash_test_base.cc
|
| diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
|
| index 3da727ac4ffd77821867c1dc5b56ce714eaf9f05..27f39cf092827eb16c635e78ec36c843ebb672f8 100644
|
| --- a/ash/test/ash_test_base.cc
|
| +++ b/ash/test/ash_test_base.cc
|
| @@ -358,6 +358,11 @@ void AshTestBase::UnblockUserSession() {
|
| }
|
|
|
| void AshTestBase::DisableIME() {
|
| + // WindowTreeHostManager isn't applicable to mash and IME is routed
|
| + // differently in mash.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| Shell::GetInstance()->RemovePreTargetHandler(
|
| Shell::GetInstance()
|
| ->window_tree_host_manager()
|
|
|