IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

 // Copyright (c) 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 "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 170 matching lines @@
   return GetPrefs()->GetBoolean(prefs::kAccessibilityAutoclickEnabled);
 }
 
 int GetAutoclickDelayFromPref() {
   return GetPrefs()->GetInteger(prefs::kAccessibilityAutoclickDelayMs);
 }
 
 bool IsBrailleImeActive() {
   InputMethodManager* imm = InputMethodManager::Get();
   scoped_ptr<InputMethodDescriptors> descriptors =
-      imm->GetActiveInputMethods();
+      imm->GetActiveIMEState()->GetActiveInputMethods();
   for (InputMethodDescriptors::const_iterator i = descriptors->begin();
        i != descriptors->end();
        ++i) {
     if (i->id() == extension_misc::kBrailleImeEngineId)
       return true;
   }
   return false;
 }
 
 bool IsBrailleImeCurrent() {
   InputMethodManager* imm = InputMethodManager::Get();
-  return imm->GetCurrentInputMethod().id() ==
+  return imm->GetActiveIMEState()->GetCurrentInputMethod().id() ==
          extension_misc::kBrailleImeEngineId;
 }
 }  // anonymous namespace
 
 class AccessibilityManagerTest : public InProcessBrowserTest {
  protected:
   AccessibilityManagerTest() : default_autoclick_delay_(0) {}
   virtual ~AccessibilityManagerTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 393 matching lines @@
 IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
   // Logs in.
   const char* user_name = GetParam();
   user_manager::UserManager::Get()->UserLoggedIn(user_name, user_name, true);
   user_manager::UserManager::Get()->SessionStarted();
   // This object watches for IME preference changes and reflects those in
   // the IME framework state.
   chromeos::Preferences prefs;
   prefs.InitUserPrefsForTesting(
       PrefServiceSyncable::FromProfile(GetProfile()),
-      user_manager::UserManager::Get()->GetActiveUser());
+      user_manager::UserManager::Get()->GetActiveUser(),
+      UserSessionManager::GetInstance()->GetDefaultIMEState(GetProfile()));
 
   // Make sure we start in the expected state.
   EXPECT_FALSE(IsBrailleImeActive());
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
 
   // Signal the accessibility manager that a braille display was connected.
   SetBrailleDisplayAvailability(true);
 
   // Now, both spoken feedback and the Braille IME should be enabled.
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
@@ skipping 60 matching lines @@
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 
   // Check on-screen keyboard.
   SetVirtualKeyboardEnabled(true);
   EXPECT_TRUE(ShouldShowAccessibilityMenu());
   SetVirtualKeyboardEnabled(false);
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 }
 
 }  // namespace chromeos