Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
index 764426b..d2ce436 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
+++ b/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -8,7 +8,6 @@
 #include "base/strings/stringprintf.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"
@@ -17,6 +16,7 @@
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/manifest_handlers/background_info.h"
+#include "extensions/test/extension_test_message_listener.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
 #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h"
 #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h"
@@ -72,10 +72,12 @@ class InputMethodEngineBrowserTest
     extension_ime_ids.push_back(kIdentityIMEID);
     extension_ime_ids.push_back(kToUpperIMEID);
     extension_ime_ids.push_back(kAPIArgumentIMEID);
-    InputMethodManager::Get()->SetEnabledExtensionImes(&extension_ime_ids);
+    InputMethodManager::Get()->GetActiveIMEState()->SetEnabledExtensionImes(
+        &extension_ime_ids);
 
     InputMethodDescriptors extension_imes;
-    InputMethodManager::Get()->GetInputMethodExtensions(&extension_imes);
+    InputMethodManager::Get()->GetActiveIMEState()->GetInputMethodExtensions(
+        &extension_imes);
 
     // Test IME has two input methods, thus InputMethodManager should have two
     // extension IME.
@@ -146,7 +148,8 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
                        BasicScenarioTest) {
   LoadTestInputMethod();
 
-  InputMethodManager::Get()->ChangeInputMethod(kIdentityIMEID);
+  InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
+      kIdentityIMEID, false /* show_message */);
 
   scoped_ptr<MockIMEInputContextHandler> mock_input_context(
       new MockIMEInputContextHandler());
@@ -226,7 +229,8 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
                        APIArgumentTest) {
   LoadTestInputMethod();
 
-  InputMethodManager::Get()->ChangeInputMethod(kAPIArgumentIMEID);
+  InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
+      kAPIArgumentIMEID, false /* show_message */);
 
   scoped_ptr<MockIMEInputContextHandler> mock_input_context(
       new MockIMEInputContextHandler());