| Index: chrome/browser/chromeos/input_method/textinput_test_helper.cc
|
| diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.cc b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
|
| index b4c601a439e7029b382f32a689225e2edae585bb..07bedca65f42cc640175a77973602d833bc258d2 100644
|
| --- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc
|
| +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
|
| @@ -12,16 +12,15 @@
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| -#include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| +#include "ui/aura/window_tree_host.h"
|
| #include "ui/base/ime/input_method_factory.h"
|
|
|
| namespace chromeos {
|
| namespace {
|
| ui::MockInputMethod* GetInputMethod() {
|
| ui::MockInputMethod* input_method = static_cast<ui::MockInputMethod*>(
|
| - ash::Shell::GetPrimaryRootWindow()->GetProperty(
|
| - aura::client::kRootWindowInputMethodKey));
|
| + ash::Shell::GetPrimaryRootWindow()->GetHost()->GetInputMethod());
|
| CHECK(input_method);
|
| return input_method;
|
| }
|
|
|