Add Malay to the "Languages and Input" configuration screen.

BUG=crosbug.com/p/8288
TEST=manual and ran unit_tests

Review URL: https://chromiumcodereview.appspot.com/10408040

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

chrome/browser/chromeos/input_method/input_method_util.cc

@@ -276,6 +276,8 @@ const ExtraLanguage kExtraLanguages[] = {
   // The code "es-419" comes from l10_util.cc.
   // For Spanish in Latin America, use Latin American keyboard layout.
   { "es-419", "xkb:latam::spa" },
+  // For Malay, use US keyboard layout. crosbug.com/p/8288
+  { "ms", "xkb:us::eng" },
 
   // TODO(yusukes): Add {"sw", "xkb:us::eng"} once Swahili is removed from the
   // blacklist in src/ui/base/l10n/l10n_util_posix.cc.

chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc

@@ -122,7 +122,7 @@ TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
   scoped_ptr<ListValue> list(
       chromeos::options2::CrosLanguageOptionsHandler::GetLanguageList(
           descriptors));
-  ASSERT_EQ(8U, list->GetSize());
+  ASSERT_EQ(9U, list->GetSize());
 
   DictionaryValue* entry = NULL;
   std::string language_code;
@@ -197,6 +197,15 @@ TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
   ASSERT_TRUE(entry->GetString("code", &language_code));
   ASSERT_TRUE(entry->GetString("displayName", &display_name));
   ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
+  EXPECT_EQ("ms", language_code);
+  EXPECT_EQ("Malay", display_name);
+  EXPECT_EQ("Bahasa Melayu", native_display_name);
+
+  // This comes from kExtraLanguages.
+  ASSERT_TRUE(list->GetDictionary(8, &entry));
+  ASSERT_TRUE(entry->GetString("code", &language_code));
+  ASSERT_TRUE(entry->GetString("displayName", &display_name));
+  ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
   EXPECT_EQ("es-419", language_code);
   EXPECT_EQ("Spanish (Latin America)", display_name);
   EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica)", native_display_name);