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

trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc

Index: trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc	(revision 251193)
+++ trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc	(working copy)
@@ -91,7 +91,7 @@
     const std::string& input_method_id) {
 }
 
-void MockInputMethodManager::ActivateInputMethodMenuItem(
+void MockInputMethodManager::ActivateInputMethodProperty(
     const std::string& key) {
 }
 
@@ -144,6 +144,15 @@
   return descriptor;
 }
 
+InputMethodPropertyList
+MockInputMethodManager::GetCurrentInputMethodProperties() const {
+  return InputMethodPropertyList();
+}
+
+void MockInputMethodManager::SetCurrentInputMethodProperties(
+    const InputMethodPropertyList& property_list) {
+}
+
 XKeyboard* MockInputMethodManager::GetXKeyboard() {
   return &xkeyboard_;
 }