Split out InputMethodMenuManager from InputMethodManager

chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

Index: chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
index 69a602ae25859efe94d871b6f2253a938bf618c0..220836c6f54f999e00150699e6bb29ec1c2cfef2 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/ime/input_method_menu_item.h"
+#include "ash/ime/input_method_menu_manager.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ -786,8 +788,9 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(), set_menu_item_test_script));
 
-    const InputMethodPropertyList& props =
-        InputMethodManager::Get()->GetCurrentInputMethodProperties();
+    const ash::ime::InputMethodMenuItemList& props =
+        ash::ime::InputMethodMenuManager::Get()->
+        GetCurrentInputMethodMenuItemList();
     ASSERT_EQ(5U, props.size());
 
     EXPECT_EQ("ID0", props[0].key);