Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

trunk/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.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 "ash/ime/input_method_menu_item.h"
-#include "ash/ime/input_method_menu_manager.h"
 #include "base/bind_helpers.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/composition_text.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ skipping 773 matching lines @@
         "    id: 'ID4',"
         "    label: 'LABEL4',"
         "    style: 'separator',"
         "    visible: true,"
         "    checked: true"
         "  }]"
         "});";
     ASSERT_TRUE(content::ExecuteScript(
         host->host_contents(), set_menu_item_test_script));
 
-    const ash::ime::InputMethodMenuItemList& props =
-        ash::ime::InputMethodMenuManager::Get()->
-        GetCurrentInputMethodMenuItemList();
+    const InputMethodPropertyList& props =
+        InputMethodManager::Get()->GetCurrentInputMethodProperties();
     ASSERT_EQ(5U, props.size());
 
     EXPECT_EQ("ID0", props[0].key);
     EXPECT_EQ("ID1", props[1].key);
     EXPECT_EQ("ID2", props[2].key);
     EXPECT_EQ("ID3", props[3].key);
     EXPECT_EQ("ID4", props[4].key);
 
     EXPECT_EQ("LABEL1", props[1].label);
     EXPECT_EQ("LABEL2", props[2].label);
@@ skipping 81 matching lines @@
     }
   }
 
   IMEBridge::Get()->SetInputContextHandler(NULL);
   IMEBridge::Get()->SetCandidateWindowHandler(NULL);
 }
 
 }  // namespace
 }  // namespace input_method
 }  // namespace chromeos