Remove ExtraLanguage entries from InputMethodUtil.

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_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/ui/webui/options/language_options_handler.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
@@ skipping 17 matching lines @@
     chromeos::input_method::Shutdown();
   }
 
  protected:
   InputMethodDescriptors CreateInputMethodDescriptors() {
     InputMethodDescriptors descriptors;
     descriptors.push_back(GetDesc("xkb:us::eng", "us", "en-US"));
     descriptors.push_back(GetDesc("xkb:fr::fra", "fr", "fr"));
     descriptors.push_back(GetDesc("xkb:be::fra", "be", "fr"));
     descriptors.push_back(GetDesc("xkb:is::ice", "is", "is"));
-    descriptors.push_back(GetDesc("mozc", "us", "ja"));
     return descriptors;
   }
 
  private:
   InputMethodDescriptor GetDesc(const std::string& id,
                                 const std::string& raw_layout,
                                 const std::string& language_code) {
     std::vector<std::string> layouts;
     layouts.push_back(raw_layout);
     std::vector<std::string> languages;
     languages.push_back(language_code);
     return InputMethodDescriptor(id,
                                  "",  // name
                                  layouts,
                                  languages,
                                  GURL());  // options page url
   }
 };
 
 }  // namespace
 
 TEST_F(CrosLanguageOptionsHandlerTest, GetInputMethodList) {
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<ListValue> list(
       chromeos::options::CrosLanguageOptionsHandler::GetInputMethodList(
           descriptors));
-  ASSERT_EQ(5U, list->GetSize());
+  ASSERT_EQ(4U, list->GetSize());
 
   DictionaryValue* entry = NULL;
   DictionaryValue *language_code_set = NULL;
   std::string input_method_id;
   std::string display_name;
   std::string language_code;
 
   // As shown below, the list should be input method ids should appear in
   // the same order of the descriptors.
   ASSERT_TRUE(list->GetDictionary(0, &entry));
   ASSERT_TRUE(entry->GetString("id", &input_method_id));
   ASSERT_TRUE(entry->GetString("displayName", &display_name));
   ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
   EXPECT_EQ("xkb:us::eng", input_method_id);
   // Commented out as it depends on translation in generated_resources.grd
   // (i.e. makes the test fragile).
   // EXPECT_EQ("English (USA) keyboard layout", display_name);
   ASSERT_TRUE(language_code_set->HasKey("en-US"));
-  ASSERT_TRUE(language_code_set->HasKey("id"));  // From kExtraLanguages.
-  ASSERT_TRUE(language_code_set->HasKey("fil"));  // From kExtraLanguages.
 
   ASSERT_TRUE(list->GetDictionary(1, &entry));
   ASSERT_TRUE(entry->GetString("id", &input_method_id));
   ASSERT_TRUE(entry->GetString("displayName", &display_name));
   ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
   EXPECT_EQ("xkb:fr::fra", input_method_id);
   // Commented out. See above.
   // EXPECT_EQ("French keyboard layout", display_name);
   ASSERT_TRUE(language_code_set->HasKey("fr"));
 
   ASSERT_TRUE(list->GetDictionary(2, &entry));
   ASSERT_TRUE(entry->GetString("id", &input_method_id));
   ASSERT_TRUE(entry->GetString("displayName", &display_name));
   ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
   EXPECT_EQ("xkb:be::fra", input_method_id);
   // Commented out. See above.
   // EXPECT_EQ("Belgian keyboard layout", display_name);
   ASSERT_TRUE(language_code_set->HasKey("fr"));
 
   ASSERT_TRUE(list->GetDictionary(3, &entry));
   ASSERT_TRUE(entry->GetString("id", &input_method_id));
   ASSERT_TRUE(entry->GetString("displayName", &display_name));
   ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
   EXPECT_EQ("xkb:is::ice", input_method_id);
   // Commented out. See above.
   // EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
   ASSERT_TRUE(language_code_set->HasKey("is"));
-
-  ASSERT_TRUE(list->GetDictionary(4, &entry));
-  ASSERT_TRUE(entry->GetString("id", &input_method_id));
-  ASSERT_TRUE(entry->GetString("displayName", &display_name));
-  ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
-  EXPECT_EQ("mozc", input_method_id);
-  // Commented out. See above.
-  // EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
-  ASSERT_TRUE(language_code_set->HasKey("ja"));
 }
 
 TEST_F(CrosLanguageOptionsHandlerTest, GetUILanguageList) {
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<ListValue> list(
       chromeos::options::CrosLanguageOptionsHandler::GetUILanguageList(
           descriptors));
 
   for (size_t i = 0; i < list->GetSize(); ++i) {
     base::DictionaryValue* dict;
     ASSERT_TRUE(list->GetDictionary(i, &dict));
     std::string code;
     ASSERT_TRUE(dict->GetString("code", &code));
     EXPECT_NE("is", code)
         << "Icelandic is an example language which has input method "
         << "but can't use it as UI language.";
   }
 }