Refactoring the ownership of ui::InputMethod.

chrome/browser/chromeos/input_method/textinput_test_helper.cc

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..f2017b10f64de015738f44d6413c4549cd30fbf1 100644
--- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc
+++ b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
@@ -14,14 +14,14 @@
 #include "content/public/test/browser_test_utils.h"
 #include "ui/aura/client/aura_constants.h"

[James Cook, 2015/06/01 22:21:00]

Here and elsewhere that you've removed aura::client::kRootWindowInputMethodKey
-- do you still need to #include this header?

[Shu Chen, 2015/06/02 04:11:16]

Done.

 #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;
 }