Extract Extension IME related utility.

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/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/mock_ibus_daemon_controller.h"
 #include "chromeos/ime/mock_input_method_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 namespace chromeos {
 
-extern const char* kExtensionImePrefix;
-
 namespace input_method {
 namespace {
 
 class InputMethodManagerImplTest :  public testing::Test {
  public:
   InputMethodManagerImplTest()
       : delegate_(NULL),
         controller_(NULL),
         candidate_window_controller_(NULL),
         xkeyboard_(NULL) {
@@ skipping 844 matching lines @@
   EXPECT_EQ(0, mock_ibus_daemon_controller_->start_count());
   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");
   manager_->AddInputMethodExtension(
-      std::string(kExtensionImePrefix) + "deadbeef",
+      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
       "deadbeef input method",
       layouts,
       "en-US",
       NULL);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
 
   // should be started.
   EXPECT_EQ(1, mock_ibus_daemon_controller_->start_count());
   {
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     ASSERT_EQ(2U, methods->size());
-    EXPECT_EQ(std::string(kExtensionImePrefix) + "deadbeef",
+    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
               // Ext IMEs should be at the end of the list.
               methods->at(1).id());
   }
   manager_->AddInputMethodExtension(
-      std::string(kExtensionImePrefix) + "cafebabe",
+      extension_ime_util::GetInputMethodID("cafebabe", "engine_id"),
       "cafebabe input method",
       layouts,
       "en-US",
       NULL);
   EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
   {
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     ASSERT_EQ(3U, methods->size());
-    EXPECT_EQ(std::string(kExtensionImePrefix) + "deadbeef",
+    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
               // Ext IMEs should be at the end of the list.
               methods->at(1).id());
   }
 
   // Remove them.
   manager_->RemoveInputMethodExtension(
-      std::string(kExtensionImePrefix) + "deadbeef");
+      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"));
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   manager_->RemoveInputMethodExtension(
-      std::string(kExtensionImePrefix) + "cafebabe");
+      extension_ime_util::GetInputMethodID("cafebabe", "engine_id"));
   EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
   // Currently, to work around  a crash issue at crosbug.com/27051,
   // controller_->Stop(); is NOT called when all (extension) IMEs are disabled.
   EXPECT_EQ(0, mock_ibus_daemon_controller_->stop_count());
 
   manager_->RemoveObserver(&observer);
 }
 
 TEST_F(InputMethodManagerImplTest, TestAddExtensionInputThenLockScreen) {
   TestObserver observer;
   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)");
   manager_->AddInputMethodExtension(
-      std::string(kExtensionImePrefix) + "deadbeef",
+      extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
       "deadbeef input method",
       layouts,
       "en-US",
       NULL);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, observer.input_method_changed_count_);
 
   // Switch to the IME.
   manager_->SwitchToNextInputMethod();
   EXPECT_EQ(2, observer.input_method_changed_count_);
-  EXPECT_EQ(std::string(kExtensionImePrefix) + "deadbeef",
+  EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_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_);
   EXPECT_EQ(0, mock_ibus_daemon_controller_->stop_count());
 
   // Unlock the screen.
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
-  EXPECT_EQ(std::string(kExtensionImePrefix) + "deadbeef",
+  EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_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(std::string(kExtensionImePrefix) + "deadbeef",
+    EXPECT_EQ(extension_ime_util::GetInputMethodID("deadbeef", "engine_id"),
               // Ext. IMEs should be at the end of the list.
               methods->at(1).id());
   }
   manager_->RemoveObserver(&observer);
 }
 
 TEST_F(InputMethodManagerImplTest, TestReset) {
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   std::vector<std::string> ids;
   ids.push_back("xkb:us::eng");
   ids.push_back("mozc");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
   manager_->ChangeInputMethod("mozc");
   EXPECT_EQ(1, controller_->change_input_method_count_);
   EXPECT_EQ("mozc", controller_->change_input_method_id_);
   EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
   manager_->ChangeInputMethod("xkb:us::eng");
   EXPECT_EQ(2, controller_->change_input_method_count_);
   EXPECT_EQ("mozc", controller_->change_input_method_id_);
   EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
 }
 
 }  // namespace input_method
 }  // namespace chromeos