Refactoring the ownership of ui::InputMethod.

chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc

 /*
  * Copyright 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 "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/extension.h"
-#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
 
 namespace {
 const base::FilePath::CharType kWebuiTestDir[] = FILE_PATH_LITERAL("webui");
 
 const base::FilePath::CharType kMockController[] =
     FILE_PATH_LITERAL("mock_controller.js");
 
@@ skipping 46 matching lines @@
 
   ASSERT_TRUE(content::ExecuteScript(web_contents, utf8_content_));
 
   // Inject DOM-automation test harness and run tests.
   std::vector<int> resource_ids;
   EXPECT_TRUE(ExecuteWebUIResourceTest(web_contents, resource_ids));
 }
 
 void VirtualKeyboardBrowserTest::ShowVirtualKeyboard() {
   aura::Window* window = ash::Shell::GetPrimaryRootWindow();
-  ui::InputMethod* input_method =
-      window->GetProperty(aura::client::kRootWindowInputMethodKey);
+  ui::InputMethod* input_method = window->GetHost()->GetInputMethod();
   ASSERT_TRUE(input_method);
   input_method->ShowImeIfNeeded();
 }
 
 content::RenderViewHost* VirtualKeyboardBrowserTest::GetKeyboardRenderViewHost(
     const std::string& id) {
   ShowVirtualKeyboard();
   GURL url = extensions::Extension::GetBaseURLFromExtensionId(id);
   scoped_ptr<content::RenderWidgetHostIterator> widgets(
       content::RenderWidgetHost::GetRenderWidgetHosts());
@@ skipping 85 matching lines @@
   bool success = false;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser_rvh,
       "success ? verifyInput('a') : waitForInput('a');",
       &success));
   ASSERT_TRUE(success);
 }
 
 // TODO(kevers|rsadam|bshe):  Add UI tests for remaining virtual keyboard
 // functionality.