[IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs …

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"
 #include "chromeos/ime/component_extension_ime_manager.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
+#include "chromeos/ime/input_method_whitelist.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace chromeos {
 namespace input_method {
@@ skipping 67 matching lines @@
  public:
   ModeIndicatorBrowserTest()
       : InProcessBrowserTest() {}
   virtual ~ModeIndicatorBrowserTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ui::SetUpInputMethodFactoryForTesting();
   }
 
   void InitializeIMF() {
+    InputMethodManager::Get()
+        ->GetInputMethodUtil()
+        ->InitXkbInputMethodsForTesting();
     // Make sure ComponentExtensionIMEManager is initialized.
     // ComponentExtensionIMEManagerImpl::InitializeAsync posts
     // ReadComponentExtensionsInfo to the FILE thread for the
     // initialization.  If it is never initialized for some reasons,
     // the test is timed out and failed.
     ComponentExtensionIMEManager* ceimm =
         InputMethodManager::Get()->GetComponentExtensionIMEManager();
     while (!ceimm->IsInitialized()) {
       content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
     }
@@ skipping 10 matching lines @@
 const int kInnerSize = 43;
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, Bounds) {
   InitializeIMF();
 
   InputMethodManager* imm = InputMethodManager::Get();
   ASSERT_TRUE(imm);
 
   std::vector<std::string> keyboard_layouts;
-  keyboard_layouts.push_back("xkb:fr::fra");
+  keyboard_layouts.push_back(
+      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
   imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   // Check if the size of the mode indicator is expected.
@@ skipping 46 matching lines @@
   }
 }
 
 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("xkb:fr::fra");
+  keyboard_layouts.push_back(
+      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:fr::fra"));
 
   // Add keyboard layouts to enable the mode indicator.
   imm->EnableLoginLayouts("fr", keyboard_layouts);
   ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       chromeos::IMEBridge::Get()->GetCandidateWindowHandler();
   candidate_window->FocusStateChanged(true);
 
   {
     ScopedModeIndicatorObserverForTesting observer;
 
     EXPECT_TRUE(imm->SwitchToNextInputMethod());
     EXPECT_EQ(1UL, observer.max_widget_list_size());
     const views::Widget* widget1 = observer.widget_list()[0];
 
     EXPECT_TRUE(imm->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