extension_ime_util: Remove unused methods; Privatise legacy at callsite.

Bug: None
Change-Id: I90086d0b1e4c350d0155dc0e39848863dac6298f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437720Reviewed-by: My Nguyen <myy@chromium.org>
Reviewed-by: Keith Lee <keithlee@chromium.org>
Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Bao-Duy Tran <tranbaoduy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812652}

chrome/browser/chromeos/arc/input_method_manager/arc_input_method_manager_service_unittest.cc

@@ -523,8 +523,8 @@ TEST_F(ArcInputMethodManagerServiceTest, OnImeInfoChanged) {
                                    std::get<1>(added_extensions[0])[0].id()));
     EXPECT_EQ(display_name1, std::get<1>(added_extensions[0])[0].name());
     ASSERT_EQ(1u, std::get<1>(added_extensions[0])[0].language_codes().size());
-    EXPECT_TRUE(chromeos::extension_ime_util::IsLanguageForArcIME(
-        (std::get<1>(added_extensions[0])[0].language_codes())[0]));
+    EXPECT_TRUE(chromeos::extension_ime_util::IsArcIME(
+        std::get<1>(added_extensions[0])[0].id()));
 
     // Emulate enabling ARC IME from chrome://settings.
     const std::string& arc_ime_id = std::get<1>(added_extensions[0])[0].id();

ui/base/ime/chromeos/extension_ime_util.cc

@@ -173,15 +173,5 @@ bool IsKeyboardLayoutExtension(const std::string& input_method_id) {
   return false;
 }
 
-bool IsLanguageForArcIME(const std::string& language) {
-  return language == kArcImeLanguage;
-}
-
-std::string MaybeGetLegacyXkbId(const std::string& input_method_id) {
-  if (IsKeyboardLayoutExtension(input_method_id))
-    return GetComponentIDByInputMethodID(input_method_id);
-  return input_method_id;
-}
-
 }  // namespace extension_ime_util
 }  // namespace chromeos

ui/base/ime/chromeos/extension_ime_util.h

@@ -88,35 +88,18 @@ bool COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
 bool COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
     IsArcIME(const std::string& input_method_id);
 
-// Returns true if the |input_method| is a member of |extension_id| of extension
-// IME, otherwise returns false.
-bool COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
-    IsMemberOfExtension(const std::string& input_method_id,
-                        const std::string& extension_id);
-
 // Returns true if the |input_method_id| is the extension based xkb keyboard,
 // otherwise returns false.
 bool COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
     IsKeyboardLayoutExtension(const std::string& input_method_id);
 
-// Returns true if |language| is the fake one for ARC IMEs.
-bool COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
-    IsLanguageForArcIME(const std::string& language);
-
 // Returns input method component id from the extension-based InputMethodID
 // for component IME extensions. This function does not check that
 // |input_method_id| is installed.
 std::string COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
     GetComponentIDByInputMethodID(const std::string& input_method_id);
 
-// Gets legacy xkb id (e.g. xkb:us::eng) from the new extension based xkb id
-// (e.g. _comp_ime_...xkb:us::eng). If the given id is not prefixed with
-// 'xkb:', just return the same as the given id.
-std::string COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
-    MaybeGetLegacyXkbId(const std::string& input_method_id);
-
 }  // namespace extension_ime_util
-
 }  // namespace chromeos
 
 #endif  // UI_BASE_IME_CHROMEOS_EXTENSION_IME_UTIL_H_

ui/base/ime/chromeos/extension_ime_util_unittest.cc

@@ -82,38 +82,4 @@ TEST(ExtensionIMEUtilTest, IsArcIMETest) {
   EXPECT_FALSE(extension_ime_util::IsArcIME("mozc"));
 }
 
-TEST(ExtensionIMEUtilTest, IsMemberOfExtension) {
-  const char* extention1 = "abcdefg";
-  const char* extention2 = "hijklmn";
-  const char* extention3 = "opqrstu";
-  const char* engine_id1 = "12345";
-  const char* engine_id2 = "67890";
-  const char* engine_id3 = "31415";
-
-  const std::string extention_1_engine_1 =
-      extension_ime_util::GetInputMethodID(extention1, engine_id1);
-  const std::string extention_1_engine_2 =
-      extension_ime_util::GetInputMethodID(extention1, engine_id2);
-  const std::string component_3_engine_3 =
-      extension_ime_util::GetComponentInputMethodID(extention3, engine_id3);
-
-  EXPECT_TRUE(extension_ime_util::IsMemberOfExtension(extention_1_engine_1,
-                                                      extention1));
-  EXPECT_TRUE(extension_ime_util::IsMemberOfExtension(extention_1_engine_2,
-                                                      extention1));
-  EXPECT_FALSE(extension_ime_util::IsMemberOfExtension(extention_1_engine_1,
-                                                       extention2));
-  EXPECT_FALSE(extension_ime_util::IsMemberOfExtension(extention_1_engine_2,
-                                                       extention2));
-  EXPECT_FALSE(extension_ime_util::IsMemberOfExtension(component_3_engine_3,
-                                                       extention3));
-}
-
-TEST(ExtensionIMEUtilTest, IsLanguageForArcIMETest) {
-  EXPECT_TRUE(extension_ime_util::IsLanguageForArcIME(
-      extension_ime_util::kArcImeLanguage));
-  EXPECT_FALSE(extension_ime_util::IsLanguageForArcIME(
-      extension_ime_util::kArcImeLanguage + std::string(" ")));
-}
-
 }  // namespace chromeos

ui/base/ime/chromeos/input_method_util.cc

@@ -427,13 +427,21 @@ std::string InputMethodUtil::GetLocalizedDisplayName(
   return disp;
 }
 
+// Gets legacy xkb id (e.g. xkb:us::eng) from the new extension based xkb id
+// (e.g. _comp_ime_...xkb:us::eng). If the given id is not prefixed with
+// 'xkb:', just return the same as the given id.
+std::string MaybeGetLegacyXkbId(const std::string& input_method_id) {
+  if (extension_ime_util::IsKeyboardLayoutExtension(input_method_id))
+    return extension_ime_util::GetComponentIDByInputMethodID(input_method_id);
+  return input_method_id;
+}
+
 bool InputMethodUtil::TranslateStringInternal(
     const std::string& english_string, base::string16 *out_string) const {
   DCHECK(out_string);
   // |english_string| could be an input method id. So legacy xkb id is required
   // to get the translated string.
-  std::string key_string = extension_ime_util::MaybeGetLegacyXkbId(
-      english_string);
+  std::string key_string = MaybeGetLegacyXkbId(english_string);
   auto iter = english_to_resource_id_.find(key_string);
 
   if (iter == english_to_resource_id_.end()) {