Skip to content

Commit

Permalink
Remove mozc from whitelist.
Browse files Browse the repository at this point in the history 
BUG=236747
TEST=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198379 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nona@chromium.org committed May 6, 2013
1 parent 7c625c2 commit 12d5e64
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 87 deletions.
9 changes: 7 additions & 2 deletions chrome/browser/chromeos/input_method/input_method_manager_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ namespace input_method {

namespace {

const char nacl_mozc_us_id[] =
"_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us";
const char nacl_mozc_jp_id[] =
"_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp";

bool Contains(const std::vector<std::string>& container,
const std::string& value) {
return std::find(container.begin(), container.end(), value) !=
Expand Down Expand Up @@ -578,14 +583,14 @@ bool InputMethodManagerImpl::SwitchInputMethod(
std::vector<std::string> input_method_ids_to_switch;
switch (accelerator.key_code()) {
case ui::VKEY_CONVERT: // Henkan key on JP106 keyboard
input_method_ids_to_switch.push_back("mozc-jp");
input_method_ids_to_switch.push_back(nacl_mozc_jp_id);
break;
case ui::VKEY_NONCONVERT: // Muhenkan key on JP106 keyboard
input_method_ids_to_switch.push_back("xkb:jp::jpn");
break;
case ui::VKEY_DBE_SBCSCHAR: // ZenkakuHankaku key on JP106 keyboard
case ui::VKEY_DBE_DBCSCHAR:
input_method_ids_to_switch.push_back("mozc-jp");
input_method_ids_to_switch.push_back(nacl_mozc_jp_id);
input_method_ids_to_switch.push_back("xkb:jp::jpn");
break;
case ui::VKEY_HANGUL: // Hangul (or right Alt) key on Korean keyboard
Expand Down
67 changes: 40 additions & 27 deletions chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ namespace chromeos {
namespace input_method {
namespace {

const char nacl_mozc_us_id[] =
"_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us";
const char nacl_mozc_jp_id[] =
"_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp";

// Returns true if |descriptors| contain |target|.
bool Contain(const InputMethodDescriptors& descriptors,
const InputMethodDescriptor& target) {
Expand Down Expand Up @@ -76,17 +81,24 @@ class InputMethodManagerImplTest : public testing::Test {
ime_list_.clear();

ComponentExtensionIME ext1;
ext1.id = "ext1_id";
ext1.id = "fpfbhcjppmaeaijcidgiibchfbnhbelj";
ext1.description = "ext1_description";
ext1.path = base::FilePath("ext1_file_path");

ComponentExtensionEngine ext1_engine1;
ext1_engine1.engine_id = "ext1_engine1_engine_id";
ext1_engine1.engine_id = "nacl_mozc_us";
ext1_engine1.display_name = "ext1_engine_1_display_name";
ext1_engine1.language_code = "en";
ext1_engine1.language_code = "ja";
ext1_engine1.layouts.push_back("us");
ext1.engines.push_back(ext1_engine1);

ComponentExtensionEngine ext1_engine2;
ext1_engine2.engine_id = "nacl_mozc_jp";
ext1_engine2.display_name = "ext1_engine_1_display_name";
ext1_engine2.language_code = "ja";
ext1_engine2.layouts.push_back("jp");
ext1.engines.push_back(ext1_engine2);

ime_list_.push_back(ext1);

ComponentExtensionIME ext2;
Expand Down Expand Up @@ -253,7 +265,8 @@ TEST_F(InputMethodManagerImplTest, TestGetSupportedInputMethods) {
// Try to find random 4-5 layuts and IMEs to make sure the returned list is
// correct.
const InputMethodDescriptor* id_to_find =
manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId("mozc");
manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
nacl_mozc_us_id);
id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
"mozc-chewing");
EXPECT_TRUE(Contain(*methods.get(), *id_to_find));
Expand Down Expand Up @@ -410,7 +423,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:us:dvorak:eng");
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(1, mock_ibus_daemon_controller_->start_count());
EXPECT_EQ(1, observer.input_method_changed_count_);
Expand Down Expand Up @@ -445,7 +458,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme2) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:us:dvorak:eng");
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(1, mock_ibus_daemon_controller_->start_count());
EXPECT_EQ(1, observer.input_method_changed_count_);
Expand Down Expand Up @@ -543,7 +556,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndImeThenLock) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:us:dvorak:eng");
ids.push_back("mozc-dv");
ids.push_back("pinyin-dv");
ids.push_back("mozc-chewing");
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
Expand Down Expand Up @@ -571,7 +584,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndImeThenLock) {
manager_->GetCurrentInputMethod().id());
EXPECT_EQ("us", xkeyboard_->last_layout_);

// Unlock screen. The original state, mozc-dv, is restored.
// Unlock screen. The original state, pinyin-dv, is restored.
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
EXPECT_EQ(3U, manager_->GetNumActiveInputMethods()); // Dvorak and 2 IMEs.
EXPECT_EQ(ids[1], manager_->GetCurrentInputMethod().id());
Expand All @@ -587,8 +600,8 @@ TEST_F(InputMethodManagerImplTest, TestXkbSetting) {
std::vector<std::string> ids;
ids.push_back("xkb:us:dvorak:eng");
ids.push_back("xkb:us:colemak:eng");
ids.push_back("mozc-jp");
ids.push_back("mozc");
ids.push_back(nacl_mozc_jp_id);
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(4U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, xkeyboard_->set_current_keyboard_layout_by_name_count_);
Expand Down Expand Up @@ -630,11 +643,11 @@ TEST_F(InputMethodManagerImplTest, TestGetCurrentInputMethodProperties) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:us::eng");
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_TRUE(manager_->GetCurrentInputMethodProperties().empty());
manager_->ChangeInputMethod("mozc");
manager_->ChangeInputMethod(nacl_mozc_us_id);

InputMethodPropertyList current_property_list;
current_property_list.push_back(InputMethodProperty("key",
Expand Down Expand Up @@ -663,7 +676,7 @@ TEST_F(InputMethodManagerImplTest, TestGetCurrentInputMethodPropertiesTwoImes) {

manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("mozc"); // Japanese
ids.push_back(nacl_mozc_us_id); // Japanese
ids.push_back("mozc-chewing"); // T-Chinese
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
Expand Down Expand Up @@ -864,25 +877,25 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:jp::jpn");
ids.push_back("mozc-jp");
ids.push_back(nacl_mozc_jp_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
EXPECT_EQ(nacl_mozc_jp_id, manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
EXPECT_EQ(nacl_mozc_jp_id, manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
EXPECT_EQ(nacl_mozc_jp_id, manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
Expand All @@ -900,7 +913,7 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
EXPECT_EQ(nacl_mozc_jp_id, manager_->GetCurrentInputMethod().id());
EXPECT_EQ("jp", xkeyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
Expand Down Expand Up @@ -1070,44 +1083,44 @@ TEST_F(InputMethodManagerImplTest, TestReset) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("xkb:us::eng");
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
manager_->ChangeInputMethod("mozc");
manager_->ChangeInputMethod(nacl_mozc_us_id);
EXPECT_EQ(1, controller_->change_input_method_count_);
EXPECT_EQ("mozc", controller_->change_input_method_id_);
EXPECT_EQ(nacl_mozc_us_id, controller_->change_input_method_id_);
EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
manager_->ChangeInputMethod("xkb:us::eng");
EXPECT_EQ(2, controller_->change_input_method_count_);
EXPECT_EQ("mozc", controller_->change_input_method_id_);
EXPECT_EQ(nacl_mozc_us_id, controller_->change_input_method_id_);
EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
}

TEST_F(InputMethodManagerImplTest,
ChangeInputMethodBeforeComponentExtensionInitialization_OneIME) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
manager_->ChangeInputMethod("mozc");
manager_->ChangeInputMethod(nacl_mozc_us_id);
EXPECT_EQ(0, controller_->change_input_method_count_);

ComponentExtensionInitialize();
EXPECT_EQ(1, controller_->change_input_method_count_);
EXPECT_EQ("mozc", controller_->change_input_method_id_);
EXPECT_EQ(nacl_mozc_us_id, controller_->change_input_method_id_);
}

TEST_F(InputMethodManagerImplTest,
ChangeInputMethodBeforeComponentExtensionInitialization_TwoIME) {
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
std::vector<std::string> ids;
ids.push_back("mozc");
ids.push_back(nacl_mozc_us_id);
ids.push_back("m17n:kn:itrans");
EXPECT_TRUE(manager_->EnableInputMethods(ids));
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
manager_->ChangeInputMethod("mozc");
manager_->ChangeInputMethod(nacl_mozc_us_id);
EXPECT_EQ(0, controller_->change_input_method_count_);
manager_->ChangeInputMethod("m17n:kn:itrans");
EXPECT_EQ(0, controller_->change_input_method_count_);
Expand Down
74 changes: 21 additions & 53 deletions chrome/browser/chromeos/input_method/input_method_util_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,6 @@ TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
InputMethodDescriptor desc = GetDesc("xkb:es:cat:cat", "es(cat)", "ca");
EXPECT_EQ(ASCIIToUTF16("CAS"), util_.GetInputMethodShortName(desc));
}
{
InputMethodDescriptor desc = GetDesc("mozc", "us", "ja");
EXPECT_EQ(UTF8ToUTF16("\xe3\x81\x82"),
util_.GetInputMethodShortName(desc));
}
{
InputMethodDescriptor desc = GetDesc("mozc-jp", "jp", "ja");
EXPECT_EQ(UTF8ToUTF16("\xe3\x81\x82"),
util_.GetInputMethodShortName(desc));
}
{
InputMethodDescriptor desc = GetDesc("pinyin", "us", "zh-CN");
EXPECT_EQ(UTF8ToUTF16("\xe6\x8b\xbc"),
Expand Down Expand Up @@ -178,11 +168,10 @@ TEST_F(InputMethodUtilTest, GetInputMethodMediumNameTest) {
const char * input_method_id[] = {
"m17n:zh:cangjie",
"m17n:zh:quick",
"mozc",
"pinyin",
"mozc-chewing",
"mozc-dv",
"mozc-hangul",
"mozc-jp",
"pinyin",
"pinyin",
"pinyin-dv",
};
Expand Down Expand Up @@ -215,12 +204,8 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
util_.GetInputMethodLongName(desc));
}
{
InputMethodDescriptor desc = GetDesc("mozc", "us", "ja");
#if !defined(GOOGLE_CHROME_BUILD)
EXPECT_EQ(ASCIIToUTF16("Japanese input method (for US keyboard)"),
#else
EXPECT_EQ(ASCIIToUTF16("Google Japanese Input (for US keyboard)"),
#endif // defined(GOOGLE_CHROME_BUILD)
InputMethodDescriptor desc = GetDesc("pinyin", "us", "ja");
EXPECT_EQ(ASCIIToUTF16("Pinyin input method"),
util_.GetInputMethodLongName(desc));
}
{
Expand Down Expand Up @@ -291,29 +276,24 @@ TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
TEST_F(InputMethodUtilTest, TestGetStringUTF8) {
EXPECT_EQ(UTF8ToUTF16("Pinyin input method"),
util_.TranslateString("pinyin"));
#if !defined(GOOGLE_CHROME_BUILD)
EXPECT_EQ(UTF8ToUTF16("Japanese input method (for US Dvorak keyboard)"),
util_.TranslateString("mozc-dv"));
#endif
}

TEST_F(InputMethodUtilTest, TestIsValidInputMethodId) {
EXPECT_TRUE(util_.IsValidInputMethodId("xkb:us:colemak:eng"));
EXPECT_TRUE(util_.IsValidInputMethodId("mozc"));
EXPECT_TRUE(util_.IsValidInputMethodId("pinyin"));
EXPECT_FALSE(util_.IsValidInputMethodId("unsupported-input-method"));
}

TEST_F(InputMethodUtilTest, TestIsKeyboardLayout) {
EXPECT_TRUE(InputMethodUtil::IsKeyboardLayout("xkb:us::eng"));
EXPECT_FALSE(InputMethodUtil::IsKeyboardLayout("mozc"));
EXPECT_FALSE(InputMethodUtil::IsKeyboardLayout("pinyin"));
}

TEST_F(InputMethodUtilTest, TestGetKeyboardLayoutName) {
// Unsupported case.
EXPECT_EQ("", util_.GetKeyboardLayoutName("UNSUPPORTED_ID"));

// Supported cases (samples).
EXPECT_EQ("jp", util_.GetKeyboardLayoutName("mozc-jp"));
EXPECT_EQ("us", util_.GetKeyboardLayoutName("pinyin"));
EXPECT_EQ("us(dvorak)", util_.GetKeyboardLayoutName("pinyin-dv"));
EXPECT_EQ("us", util_.GetKeyboardLayoutName("m17n:ar:kbd"));
Expand Down Expand Up @@ -354,8 +334,8 @@ TEST_F(InputMethodUtilTest, TestGetInputMethodDescriptorFromId) {

TEST_F(InputMethodUtilTest, TestGetInputMethodIdsForLanguageCode) {
std::multimap<std::string, std::string> language_code_to_ids_map;
language_code_to_ids_map.insert(std::make_pair("ja", "mozc"));
language_code_to_ids_map.insert(std::make_pair("ja", "mozc-jp"));
language_code_to_ids_map.insert(std::make_pair("ja", "pinyin"));
language_code_to_ids_map.insert(std::make_pair("ja", "pinyin"));
language_code_to_ids_map.insert(std::make_pair("ja", "xkb:jp:jpn"));
language_code_to_ids_map.insert(std::make_pair("fr", "xkb:fr:fra"));

Expand Down Expand Up @@ -394,41 +374,29 @@ TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_EnUs) {
EXPECT_EQ("xkb:us::eng", input_method_ids[0]);
}

// US keyboard + Japanese UI = US keyboard + mozc.
TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_Ja) {
// US keyboard + Chinese UI = US keyboard + Pinyin IME.
TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Us_And_Zh) {
const InputMethodDescriptor* descriptor =
util_.GetInputMethodDescriptorFromId("xkb:us::eng"); // US keyboard.
ASSERT_TRUE(NULL != descriptor); // ASSERT_NE doesn't compile.
std::vector<std::string> input_method_ids;
util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
util_.GetFirstLoginInputMethodIds("zh-CN", *descriptor, &input_method_ids);
ASSERT_EQ(2U, input_method_ids.size());
EXPECT_EQ("xkb:us::eng", input_method_ids[0]);
EXPECT_EQ("mozc", input_method_ids[1]); // Mozc for US keybaord.
}

// JP keyboard + Japanese UI = JP keyboard + mozc-jp.
TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_JP_And_Ja) {
const InputMethodDescriptor* descriptor =
util_.GetInputMethodDescriptorFromId("xkb:jp::jpn"); // Japanese keyboard
ASSERT_TRUE(NULL != descriptor); // ASSERT_NE doesn't compile.
std::vector<std::string> input_method_ids;
util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
ASSERT_EQ(2U, input_method_ids.size());
EXPECT_EQ("xkb:jp::jpn", input_method_ids[0]);
EXPECT_EQ("mozc-jp", input_method_ids[1]); // Mozc for JP keybaord.
EXPECT_EQ("pinyin", input_method_ids[1]); // Pinyin for US keybaord.
}

// US dvorak keyboard + Japanese UI = US dvorak keyboard + mozc-dv.
TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_Dvorak_And_Ja) {
// Korean keyboard + Korean UI = Korean keyboard + mozc-hangul.
TEST_F(InputMethodUtilTest, TestGetFirstLoginInputMethodIds_KR_And_Ko) {
// Korean keyboard
const InputMethodDescriptor* descriptor =
// US Drovak keyboard.
util_.GetInputMethodDescriptorFromId("xkb:us:dvorak:eng");
util_.GetInputMethodDescriptorFromId("xkb:kr:kr104:kor");
ASSERT_TRUE(NULL != descriptor); // ASSERT_NE doesn't compile.
std::vector<std::string> input_method_ids;
util_.GetFirstLoginInputMethodIds("ja", *descriptor, &input_method_ids);
util_.GetFirstLoginInputMethodIds("ko", *descriptor, &input_method_ids);
ASSERT_EQ(2U, input_method_ids.size());
EXPECT_EQ("xkb:us:dvorak:eng", input_method_ids[0]);
EXPECT_EQ("mozc-dv", input_method_ids[1]); // Mozc for US Dvorak keybaord.
EXPECT_EQ("xkb:kr:kr104:kor", input_method_ids[0]);
EXPECT_EQ("mozc-hangul", input_method_ids[1]); // Mozc for JP keybaord.
}

// US keyboard + Russian UI = US keyboard + Russsian keyboard
Expand Down Expand Up @@ -483,13 +451,13 @@ TEST_F(InputMethodUtilTest, TestGetLanguageCodesFromInputMethodIds) {
std::vector<std::string> input_method_ids;
input_method_ids.push_back("xkb:us::eng"); // English US.
input_method_ids.push_back("xkb:us:dvorak:eng"); // English US Dvorak.
input_method_ids.push_back("mozc-jp"); // Japanese.
input_method_ids.push_back("pinyin"); // Pinyin
input_method_ids.push_back("xkb:fr::fra"); // French France.
std::vector<std::string> language_codes;
util_.GetLanguageCodesFromInputMethodIds(input_method_ids, &language_codes);
ASSERT_EQ(3U, language_codes.size());
EXPECT_EQ("en-US", language_codes[0]);
EXPECT_EQ("ja", language_codes[1]);
EXPECT_EQ("zh-CN", language_codes[1]);
EXPECT_EQ("fr", language_codes[2]);
}

Expand Down
Loading

0 comments on commit 12d5e64

Please sign in to comment.