Show native language names in the add language overlay.

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

 // Copyright (c) 2010 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_util.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 124 matching lines @@
   EXPECT_EQ("rs", GetKeyboardLayoutName("xkb:rs::srp"));
   EXPECT_EQ("ch", GetKeyboardLayoutName("xkb:ch::ger"));
   EXPECT_EQ("ru", GetKeyboardLayoutName("xkb:ru::rus"));
   EXPECT_EQ("tr", GetKeyboardLayoutName("xkb:tr::tur"));
   EXPECT_EQ("ua", GetKeyboardLayoutName("xkb:ua::ukr"));
   EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us::eng"));
   EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us:dvorak:eng"));
 }
 
 TEST(InputMethodUtilTest, GetLanguageDisplayNameFromCode) {
-  EXPECT_EQ(L"French", GetLanguageDisplayNameFromCode("fr"));
+  EXPECT_EQ(L"Finnish", GetLanguageDisplayNameFromCode("fi"));
   // MaybeRewriteLanguageName() should be applied.
   EXPECT_EQ(l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_OTHERS),
             GetLanguageDisplayNameFromCode("t"));
 }
 
+TEST(InputMethodUtilTest, GetLanguageNativeDisplayNameFromCode) {
+  EXPECT_EQ(L"suomi", GetLanguageNativeDisplayNameFromCode("fi"));
+  // MaybeRewriteLanguageName() should be applied.
+  EXPECT_EQ(l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_OTHERS),
+            GetLanguageNativeDisplayNameFromCode("t"));
+}
+
 TEST(InputMethodUtilTest, SortLanguageCodesByNames) {
   std::vector<std::string> language_codes;
   // Check if this function can handle an empty list.
   SortLanguageCodesByNames(&language_codes);
 
   language_codes.push_back("ja");
   language_codes.push_back("fr");
   language_codes.push_back("t");
   SortLanguageCodesByNames(&language_codes);
   ASSERT_EQ(3U, language_codes.size());
@@ skipping 135 matching lines @@
   EXPECT_EQ("xkb:fr:fra", result[0]);
 
   EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
       language_code_to_ids_map, "invalid_lang", kAllInputMethods, &result));
   EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
       language_code_to_ids_map, "invalid_lang", kKeyboardLayoutsOnly, &result));
 }
 
 }  // namespace input_method
 }  // namespace chromeos