IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/input_method/mode_indicator_browsertest.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 <algorithm>
 
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 108 matching lines @@
   InitializeIMF();
 
   InputMethodManager* imm = InputMethodManager::Get();
   ASSERT_TRUE(imm);
 
   std::vector<std::string> keyboard_layouts;
   keyboard_layouts.push_back(
       extension_ime_util::GetInputMethodIDByEngineID("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
-  imm->EnableLoginLayouts("fr", keyboard_layouts);
-  ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
+  imm->GetActiveIMEState()->EnableLoginLayouts("fr", keyboard_layouts);
+  ASSERT_LT(1UL, imm->GetActiveIMEState()->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   // Check if the size of the mode indicator is expected.
   gfx::Rect cursor1_bounds(100, 100, 1, 20);
   gfx::Rect mi1_bounds;
   {
     ScopedModeIndicatorObserverForTesting observer;
     candidate_window->SetCursorBounds(cursor1_bounds, cursor1_bounds);
-    EXPECT_TRUE(imm->SwitchToNextInputMethod());
+    EXPECT_TRUE(imm->GetActiveIMEState()->SwitchToNextInputMethod());
     mi1_bounds = observer.last_bounds();
     // The bounds should be bigger than the inner size.
     EXPECT_LE(kInnerSize, mi1_bounds.width());
     EXPECT_LE(kInnerSize, mi1_bounds.height());
     EXPECT_TRUE(observer.is_displayed());
   }
 
   // Check if the location of the mode indicator is coresponded to
   // the cursor bounds.
   gfx::Rect cursor2_bounds(50, 200, 1, 20);
   gfx::Rect mi2_bounds;
   {
     ScopedModeIndicatorObserverForTesting observer;
     candidate_window->SetCursorBounds(cursor2_bounds, cursor2_bounds);
-    EXPECT_TRUE(imm->SwitchToNextInputMethod());
+    EXPECT_TRUE(imm->GetActiveIMEState()->SwitchToNextInputMethod());
     mi2_bounds = observer.last_bounds();
     EXPECT_TRUE(observer.is_displayed());
   }
 
   EXPECT_EQ(cursor1_bounds.x() - cursor2_bounds.x(),
             mi1_bounds.x() - mi2_bounds.x());
   EXPECT_EQ(cursor1_bounds.y() - cursor2_bounds.y(),
             mi1_bounds.y() - mi2_bounds.y());
   EXPECT_EQ(mi1_bounds.width(),  mi2_bounds.width());
   EXPECT_EQ(mi1_bounds.height(), mi2_bounds.height());
 
   const gfx::Rect screen_bounds =
       ash::Shell::GetScreen()->GetDisplayMatching(cursor1_bounds).work_area();
 
   // Check if the location of the mode indicator is concidered with
   // the screen size.
   const gfx::Rect cursor3_bounds(100, screen_bounds.bottom() - 25, 1, 20);
   gfx::Rect mi3_bounds;
   {
     ScopedModeIndicatorObserverForTesting observer;
     candidate_window->SetCursorBounds(cursor3_bounds, cursor3_bounds);
-    EXPECT_TRUE(imm->SwitchToNextInputMethod());
+    EXPECT_TRUE(imm->GetActiveIMEState()->SwitchToNextInputMethod());
     mi3_bounds = observer.last_bounds();
     EXPECT_TRUE(observer.is_displayed());
     EXPECT_LT(mi3_bounds.bottom(), screen_bounds.bottom());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, NumOfWidgets) {
   InitializeIMF();
 
   InputMethodManager* imm = InputMethodManager::Get();
   ASSERT_TRUE(imm);
 
   std::vector<std::string> keyboard_layouts;
   keyboard_layouts.push_back(
       extension_ime_util::GetInputMethodIDByEngineID("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
-  imm->EnableLoginLayouts("fr", keyboard_layouts);
-  ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
+  imm->GetActiveIMEState()->EnableLoginLayouts("fr", keyboard_layouts);
+  ASSERT_LT(1UL, imm->GetActiveIMEState()->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   {
     ScopedModeIndicatorObserverForTesting observer;
 
-    EXPECT_TRUE(imm->SwitchToNextInputMethod());
+    EXPECT_TRUE(imm->GetActiveIMEState()->SwitchToNextInputMethod());
     EXPECT_EQ(1UL, observer.max_widget_list_size());
     const views::Widget* widget1 = observer.widget_list()[0];
 
-    EXPECT_TRUE(imm->SwitchToNextInputMethod());
+    EXPECT_TRUE(imm->GetActiveIMEState()->SwitchToNextInputMethod());
     EXPECT_EQ(2UL, observer.max_widget_list_size());
 
     // When a new mode indicator is displayed, the previous one should be
     // closed.
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(1UL, observer.widget_list_size());
     const views::Widget* widget2 = observer.widget_list()[0];
     EXPECT_NE(widget1, widget2);
   }
 }
 }  // namespace input_method
 }  // namespace chromeos