Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / input_method / mock_input_method_manager.cc

diff --git a/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
index fa3e170..eef2bf0 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
+++ b/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
@@ -10,7 +10,7 @@ namespace input_method {
 MockInputMethodManager::MockInputMethodManager()
     : add_observer_count_(0),
       remove_observer_count_(0),
-      util_(&delegate_, whitelist_.GetSupportedInputMethods()),
+      util_(&delegate_),
       mod3_used_(false) {
   active_input_method_ids_.push_back("xkb:us::eng");
 }
@@ -18,6 +18,10 @@ MockInputMethodManager::MockInputMethodManager()
 MockInputMethodManager::~MockInputMethodManager() {
 }
 
+InputMethodManager::State MockInputMethodManager::GetState() {
+  return InputMethodManager::STATE_BROWSER_SCREEN;
+}
+
 void MockInputMethodManager::AddObserver(
     InputMethodManager::Observer* observer) {
   ++add_observer_count_;
@@ -97,11 +101,13 @@ void MockInputMethodManager::ActivateInputMethodMenuItem(
 }
 
 void MockInputMethodManager::AddInputMethodExtension(
-    const std::string& id,
+    const std::string& extension_id,
+    const InputMethodDescriptors& descriptors,
     InputMethodEngineInterface* instance) {
 }
 
-void MockInputMethodManager::RemoveInputMethodExtension(const std::string& id) {
+void MockInputMethodManager::RemoveInputMethodExtension(
+    const std::string& extension_id) {
 }
 
 void MockInputMethodManager::GetInputMethodExtensions(