IME refactoring: ChromeOS introduce input methods State.

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"
@@ skipping 53 matching lines @@
                                                     false);
     extension_ = LoadExtensionWithType("input_ime", GetParam());
     ASSERT_TRUE(extension_);
     ASSERT_TRUE(ime_ready_listener.WaitUntilSatisfied());
 
     // Extension IMEs are not enabled by default.
     std::vector<std::string> extension_ime_ids;
     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.
     // Note: Even extension is loaded by LoadExtensionAsComponent as above, the
     // IME does not managed by ComponentExtensionIMEManager or it's id won't
     // start with __comp__. The component extension IME is whitelisted and
     // managed by ComponentExtensionIMEManager, but its framework is same as
     // normal extension IME.
     EXPECT_EQ(3U, extension_imes.size());
   }
@@ skipping 50 matching lines @@
                         InputMethodEngineBrowserTest,
                         ::testing::Values(kTestTypeIncognito));
 INSTANTIATE_TEST_CASE_P(InputMethodEngineComponentExtensionBrowserTest,
                         InputMethodEngineBrowserTest,
                         ::testing::Values(kTestTypeComponent));
 
 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());
   scoped_ptr<MockIMECandidateWindowHandler> mock_candidate_window(
       new MockIMECandidateWindowHandler());
 
   IMEBridge::Get()->SetInputContextHandler(mock_input_context.get());
   IMEBridge::Get()->SetCandidateWindowHandler(mock_candidate_window.get());
 
   IMEEngineHandlerInterface* engine_handler =
@@ skipping 59 matching lines @@
   ASSERT_TRUE(disabled_listener.was_satisfied());
 
   IMEBridge::Get()->SetInputContextHandler(NULL);
   IMEBridge::Get()->SetCandidateWindowHandler(NULL);
 }
 
 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());
   scoped_ptr<MockIMECandidateWindowHandler> mock_candidate_window(
       new MockIMECandidateWindowHandler());
 
   IMEBridge::Get()->SetInputContextHandler(mock_input_context.get());
   IMEBridge::Get()->SetCandidateWindowHandler(mock_candidate_window.get());
 
   IMEEngineHandlerInterface* engine_handler =
@@ skipping 685 matching lines @@
     }
   }
 
   IMEBridge::Get()->SetInputContextHandler(NULL);
   IMEBridge::Get()->SetCandidateWindowHandler(NULL);
 }
 
 }  // namespace
 }  // namespace input_method
 }  // namespace chromeos