Make InputMethodEngine manage its descriptor.

chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

 // Copyright (c) 2012 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/input_method/input_method_manager_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h"
+#include "chrome/browser/chromeos/input_method/mock_input_method_engine.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/fake_input_method_delegate.h"
 #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h"
 #include "chromeos/ime/mock_xkeyboard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/chromeos/mock_ime_engine_handler.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace chromeos {
@@ skipping 171 matching lines @@
   virtual void CandidateWindowClosed(InputMethodManager* manager) OVERRIDE {
     ++candidate_window_closed_count_;
   }
 
   int candidate_window_opened_count_;
   int candidate_window_closed_count_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestCandidateWindowObserver);
 };
-
 }  // namespace
 
 TEST_F(InputMethodManagerImplTest, TestGetXKeyboard) {
   EXPECT_TRUE(manager_->GetXKeyboard());
   EXPECT_EQ(xkeyboard_, manager_->GetXKeyboard());
 }
 
 TEST_F(InputMethodManagerImplTest, TestCandidateWindowObserver) {
   TestCandidateWindowObserver observer;
   candidate_window_controller_->NotifyCandidateWindowOpened();  // nop
@@ skipping 685 matching lines @@
   EXPECT_EQ(1, observer.input_method_changed_count_);
   EXPECT_EQ(ids[0],
             manager_->GetCurrentInputMethod().id());
   EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
 
   // Add two Extension IMEs.
   std::vector<std::string> layouts;
   layouts.push_back("us");
   std::vector<std::string> languages;
   languages.push_back("en-US");
+
   const std::string ext1_id =
       extension_ime_util::GetInputMethodID("deadbeef", "engine_id");
-  manager_->AddInputMethodExtension(
-      ext1_id,
-      "deadbeef input method",
-      layouts,
-      languages,
-      GURL(),
-      GURL(),
-      NULL);
-  IBusBridge::Get()->SetEngineHandler(ext1_id, mock_engine_handler_.get());
+  const InputMethodDescriptor descriptor1(ext1_id,
+                                          "deadbeef input method",
+                                          layouts,
+                                          languages,
+                                          false,  // is_login_keyboard
+                                          GURL(),
+                                          GURL());
+  MockInputMethodEngine engine(descriptor1);
+  manager_->AddInputMethodExtension(ext1_id, &engine);
 
   // Extension IMEs are not enabled by default.
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
 
   std::vector<std::string> extension_ime_ids;
-  extension_ime_ids.push_back(
-      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"));
+  extension_ime_ids.push_back(ext1_id);
   manager_->SetEnabledExtensionImes(&extension_ime_ids);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
 
   {
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     ASSERT_EQ(2U, methods->size());
-    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
-              // Ext IMEs should be at the end of the list.
-              methods->at(1).id());
+    // Ext IMEs should be at the end of the list.
+    EXPECT_EQ(ext1_id, methods->at(1).id());
   }
+
   const std::string ext2_id =
       extension_ime_util::GetInputMethodID("cafebabe", "engine_id");
-  manager_->AddInputMethodExtension(
-      ext2_id,
-      "cafebabe input method",
-      layouts,
-      languages,
-      GURL(),
-      GURL(),
-      NULL);
-  IBusBridge::Get()->SetEngineHandler(ext2_id, mock_engine_handler_.get());
+  const InputMethodDescriptor descriptor2(ext2_id,
+                                          "cafebabe input method",
+                                          layouts,
+                                          languages,
+                                          false,  // is_login_keyboard
+                                          GURL(),
+                                          GURL());
+  MockInputMethodEngine engine2(descriptor2);
+  manager_->AddInputMethodExtension(ext2_id, &engine2);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
 
-  extension_ime_ids.push_back(
-      extension_ime_util::GetInputMethodID("cafebabe", "engine_id"));
+  extension_ime_ids.push_back(ext2_id);
   manager_->SetEnabledExtensionImes(&extension_ime_ids);
   EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
   {
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     ASSERT_EQ(3U, methods->size());
-    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
-              // Ext IMEs should be at the end of the list.
-              methods->at(1).id());
+    // Ext IMEs should be at the end of the list.
+    EXPECT_EQ(ext1_id, methods->at(1).id());
+    EXPECT_EQ(ext2_id, methods->at(2).id());
   }
 
   // Remove them.
-  manager_->RemoveInputMethodExtension(
-      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"));
+  manager_->RemoveInputMethodExtension(ext1_id);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
-  manager_->RemoveInputMethodExtension(
-      extension_ime_util::GetInputMethodID("cafebabe", "engine_id"));
+  manager_->RemoveInputMethodExtension(ext2_id);
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
 }
 
 TEST_F(InputMethodManagerImplTest, TestAddExtensionInputThenLockScreen) {
   TestObserver observer;
   InitComponentExtension();
   manager_->AddObserver(&observer);
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   std::vector<std::string> ids;
   ids.push_back("xkb:us::eng");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, observer.input_method_changed_count_);
   EXPECT_EQ(ids[0], manager_->GetCurrentInputMethod().id());
   EXPECT_EQ("us", xkeyboard_->last_layout_);
 
   // Add an Extension IME.
   std::vector<std::string> layouts;
   layouts.push_back("us(dvorak)");
   std::vector<std::string> languages;
   languages.push_back("en-US");
+
   const std::string ext_id =
       extension_ime_util::GetInputMethodID("deadbeef", "engine_id");
-  manager_->AddInputMethodExtension(
-      ext_id,
-      "deadbeef input method",
-      layouts,
-      languages,
-      GURL(),
-      GURL(),
-      NULL);
-  IBusBridge::Get()->SetEngineHandler(ext_id, mock_engine_handler_.get());
+  const InputMethodDescriptor descriptor(ext_id,
+                                         "deadbeef input method",
+                                         layouts,
+                                         languages,
+                                         false,  // is_login_keyboard
+                                         GURL(),
+                                         GURL());
+  MockInputMethodEngine engine(descriptor);
+  manager_->AddInputMethodExtension(ext_id, &engine);
 
   // Extension IME is not enabled by default.
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, observer.input_method_changed_count_);
 
   std::vector<std::string> extension_ime_ids;
-  extension_ime_ids.push_back(
-      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"));
+  extension_ime_ids.push_back(ext_id);
   manager_->SetEnabledExtensionImes(&extension_ime_ids);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
 
   // Switch to the IME.
   manager_->SwitchToNextInputMethod();
   EXPECT_EQ(3, observer.input_method_changed_count_);
-  EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
-            manager_->GetCurrentInputMethod().id());
+  EXPECT_EQ(ext_id, manager_->GetCurrentInputMethod().id());
   EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
 
   // Lock the screen. This is for crosbug.com/27049.
   manager_->SetState(InputMethodManager::STATE_LOCK_SCREEN);
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());  // Qwerty. No Ext. IME
   EXPECT_EQ("xkb:us::eng",
             manager_->GetCurrentInputMethod().id());
   EXPECT_EQ("us", xkeyboard_->last_layout_);
 
   // Unlock the screen.
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
-  EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
-            manager_->GetCurrentInputMethod().id());
+  EXPECT_EQ(ext_id, manager_->GetCurrentInputMethod().id());
   EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
   {
     // This is for crosbug.com/27052.
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     ASSERT_EQ(2U, methods->size());
-    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
-              // Ext. IMEs should be at the end of the list.
-              methods->at(1).id());
+    // Ext. IMEs should be at the end of the list.
+    EXPECT_EQ(ext_id, methods->at(1).id());
   }
   manager_->RemoveObserver(&observer);
 }
 
 TEST_F(InputMethodManagerImplTest,
        ChangeInputMethodBeforeComponentExtensionInitialization_OneIME) {
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   std::vector<std::string> ids;
   ids.push_back(kNaclMozcUsId);
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
@@ skipping 85 matching lines @@
   ids.push_back(ext_id2);
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(ext_id1, manager_->GetCurrentInputMethod().id());
   manager_->ChangeInputMethod(ext_id2);
   EXPECT_EQ(ext_id2, manager_->GetCurrentInputMethod().id());
 }
 
 }  // namespace input_method
 }  // namespace chromeos