Migrates Japanese IME IDs and stop migrating Chinese IME IDs.

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 "ash/ime/input_method_menu_item.h"
 #include "ash/ime/input_method_menu_manager.h"
@@ skipping 21 matching lines @@
 #include "ui/base/ime/chromeos/mock_ime_engine_handler.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace chromeos {
 
 namespace input_method {
 namespace {
 
 const char kNaclMozcUsId[] =
-    "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us";
+    "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_us";
 const char kNaclMozcJpId[] =
-    "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp";
+    "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_jp";
 const char kExt2Engine1Id[] =
     "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopext2_engine1_engine_id";
 const char kExt2Engine2Id[] =
     "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopext2_engine2_engine_id";
-const char kPinyinImeId[] =
-    "_comp_ime_nmblnjkfdkabgdofidlkienfnnbjhnabzh-t-i0-pinyin";
 const char kXkbExtId[] =
 #if defined(OFFICIAL_BUILD)
     "jkghodnilhceideoidjikpgommlajknk";
 #else
     "fgoepimhcoialccpbmpnnblemnepkkao";
 #endif
 
 // Returns true if |descriptors| contain |target|.
 bool Contain(const InputMethodDescriptors& descriptors,
              const InputMethodDescriptor& target) {
@@ skipping 152 matching lines @@
     ComponentExtensionEngine ext_xkb_engine_hu;
     ext_xkb_engine_hu.engine_id = "xkb:hu::hun";
     ext_xkb_engine_hu.display_name = "xkb:hu::hun";
     ext_xkb_engine_hu.language_codes.push_back("hu");
     ext_xkb_engine_hu.layouts.push_back("hu");
     ext_xkb.engines.push_back(ext_xkb_engine_hu);
 
     ime_list_.push_back(ext_xkb);
 
     ComponentExtensionIME ext1;
-    ext1.id = "fpfbhcjppmaeaijcidgiibchfbnhbelj";
+    ext1.id = "gjaehgfemfahhmlgpdfknkhdnemmolop";
     ext1.description = "ext1_description";
     ext1.path = base::FilePath("ext1_file_path");
 
     ComponentExtensionEngine ext1_engine1;
     ext1_engine1.engine_id = "nacl_mozc_us";
     ext1_engine1.display_name = "ext1_engine_1_display_name";
     ext1_engine1.language_codes.push_back("ja");
     ext1_engine1.layouts.push_back("us");
     ext1.engines.push_back(ext1_engine1);
 
@@ skipping 1112 matching lines @@
 
   std::vector<std::string> input_method_ids;
   input_method_ids.push_back("xkb:us::eng");
   input_method_ids.push_back("xkb:fr::fra");
   input_method_ids.push_back(
       std::string("_comp_ime_") + kXkbExtId + "xkb:us::eng");
   input_method_ids.push_back("xkb:fr::fra");
   input_method_ids.push_back(
       std::string("_comp_ime_") + kXkbExtId + "xkb:us::eng");
   input_method_ids.push_back("_comp_ime_asdf_pinyin");
-  input_method_ids.push_back(kPinyinImeId);
+  input_method_ids.push_back(kNaclMozcUsId);
 
-  manager_->MigrateXkbInputMethods(&input_method_ids);
+  manager_->MigrateInputMethods(&input_method_ids);
 
   ASSERT_EQ(4U, input_method_ids.size());
 
   EXPECT_EQ(std::string("_comp_ime_") + kXkbExtId + "xkb:us::eng",
             input_method_ids[0]);
   EXPECT_EQ(std::string("_comp_ime_") + kXkbExtId + "xkb:fr::fra",
             input_method_ids[1]);
   EXPECT_EQ("_comp_ime_asdf_pinyin", input_method_ids[2]);
-  EXPECT_EQ("_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopzh-t-i0-pinyin",
+  EXPECT_EQ("_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_us",
             input_method_ids[3]);
 }
 
 TEST_F(InputMethodManagerImplTest, MigrateInputMethodTest_2) {
   extension_ime_util::ScopedUseExtensionKeyboardFlagForTesting
       scoped_flag(false);
 
   std::vector<std::string> input_method_ids;
   input_method_ids.push_back("xkb:us::eng");
   input_method_ids.push_back("xkb:fr::fra");
   input_method_ids.push_back(
       std::string("_comp_ime_") + kXkbExtId + "xkb:us::eng");
   input_method_ids.push_back("xkb:fr::fra");
   input_method_ids.push_back(
       std::string("_comp_ime_") + kXkbExtId + "xkb:us::eng");
   input_method_ids.push_back("_comp_ime_asdf_pinyin");
 
-  manager_->MigrateXkbInputMethods(&input_method_ids);
+  manager_->MigrateInputMethods(&input_method_ids);
 
   ASSERT_EQ(3U, input_method_ids.size());
 
   EXPECT_EQ("xkb:us::eng", input_method_ids[0]);
   EXPECT_EQ("xkb:fr::fra", input_method_ids[1]);
   EXPECT_EQ("_comp_ime_asdf_pinyin", input_method_ids[2]);
 }
 
 }  // namespace input_method
 }  // namespace chromeos