Refactoring the ownership of ui::InputMethod.

chrome/browser/chromeos/input_method/textinput_test_helper.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #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"

[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;
 }
 }  // namespace
 
 void TextInputTestBase::SetUpInProcessBrowserTestFixture() {
   ui::SetUpInputMethodFactoryForTesting();
 }
 
 TextInputTestHelper::TextInputTestHelper()
@@ skipping 166 matching lines @@
   mouse_event.y = rect.CenterPoint().y();
   mouse_event.clickCount = 1;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
 
   mouse_event.type = blink::WebInputEvent::MouseUp;
   tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
   return true;
 }
 
 } // namespace chromeos