Refactor EnableInputMethods() and remove SortInputMethodIdsByNames().

We no longer need to sort input method IDs by names in EnableInputMethods()
as the input method IDs returned from GetInputMethodIdsFromLanguageCode()
are sorted per the whitelist.txt.

BUG=chromium-os:12252
TEST=keyboard switching on the login screen works as before

Review URL: http://codereview.chromium.org/6532016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75239 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 40 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index 3890438..329a7ec 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -165,46 +165,6 @@ TEST_F(InputMethodUtilTest, SortLanguageCodesByNames) {
   ASSERT_EQ("t",  language_codes[3]);  // Others
 }
 
-TEST_F(InputMethodUtilTest, SortInputMethodIdsByNamesInternal) {
-  std::map<std::string, std::string> id_to_language_code_map;
-  id_to_language_code_map.insert(std::make_pair("mozc", "ja"));
-  id_to_language_code_map.insert(std::make_pair("mozc-jp", "ja"));
-  id_to_language_code_map.insert(std::make_pair("xkb:jp::jpn", "ja"));
-  id_to_language_code_map.insert(std::make_pair("xkb:fr::fra", "fr"));
-
-  std::vector<std::string> input_method_ids;
-  // Check if this function can handle an empty list.
-  SortInputMethodIdsByNamesInternal(id_to_language_code_map,
-                                    &input_method_ids);
-
-  input_method_ids.push_back("mozc");           // Japanese
-  input_method_ids.push_back("xkb:fr::fra");    // French
-  SortInputMethodIdsByNamesInternal(id_to_language_code_map,
-                                    &input_method_ids);
-  ASSERT_EQ(2U, input_method_ids.size());
-  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
-  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
-
-  // Add a duplicate entry and see if it works.
-  // Note that SortInputMethodIdsByNamesInternal uses std::stable_sort.
-  input_method_ids.push_back("xkb:jp::jpn");  // also Japanese
-  SortInputMethodIdsByNamesInternal(id_to_language_code_map,
-                                    &input_method_ids);
-  ASSERT_EQ(3U, input_method_ids.size());
-  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
-  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
-  ASSERT_EQ("xkb:jp::jpn", input_method_ids[2]);     // Japanese
-
-  input_method_ids.push_back("mozc-jp");  // also Japanese
-  SortInputMethodIdsByNamesInternal(id_to_language_code_map,
-                                    &input_method_ids);
-  ASSERT_EQ(4U, input_method_ids.size());
-  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
-  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
-  ASSERT_EQ("xkb:jp::jpn", input_method_ids[2]);     // Japanese
-  ASSERT_EQ("mozc-jp", input_method_ids[3]);         // Japanese
-}
-
 TEST_F(InputMethodUtilTest, GetInputMethodIdsForLanguageCode) {
   std::multimap<std::string, std::string> language_code_to_ids_map;
   language_code_to_ids_map.insert(std::make_pair("ja", "mozc"));