Index: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
index ba24c4251aeb32263489ccc4f6f442d5001b5250..a1a4ad82f0939820a8be13734dc622ab4cc12a99 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc |
@@ -1251,73 +1251,6 @@ TEST_F(InputMethodManagerImplTest, TestAddExtensionInputThenLockScreen) { |
} |
TEST_F(InputMethodManagerImplTest, |
- ChangeInputMethodBeforeComponentExtensionInitialization_OneIME) { |
- manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN); |
- std::vector<std::string> ids; |
- ids.push_back(ImeIdFromEngineId(kNaclMozcUsId)); |
- EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids)); |
- EXPECT_EQ(1U, manager_->GetNumActiveInputMethods()); |
- manager_->ChangeInputMethod(ImeIdFromEngineId(kNaclMozcUsId)); |
- |
- InitComponentExtension(); |
- EXPECT_EQ(ImeIdFromEngineId(kNaclMozcUsId), |
- manager_->GetCurrentInputMethod().id()); |
-} |
- |
-TEST_F(InputMethodManagerImplTest, |
- ChangeInputMethodBeforeComponentExtensionInitialization_TwoIME) { |
- manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN); |
- std::vector<std::string> ids; |
- ids.push_back(ImeIdFromEngineId(kNaclMozcUsId)); |
- ids.push_back(ImeIdFromEngineId(kNaclMozcJpId)); |
- EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids)); |
- EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); |
- manager_->ChangeInputMethod(ImeIdFromEngineId(kNaclMozcUsId)); |
- manager_->ChangeInputMethod(ImeIdFromEngineId(kNaclMozcJpId)); |
- |
- InitComponentExtension(); |
- EXPECT_EQ(ImeIdFromEngineId(kNaclMozcJpId), |
- manager_->GetCurrentInputMethod().id()); |
-} |
- |
-TEST_F(InputMethodManagerImplTest, |
- ChangeInputMethodBeforeComponentExtensionInitialization_CompOneIME) { |
- manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN); |
- const std::string ext_id = extension_ime_util::GetComponentInputMethodID( |
- ime_list_[1].id, |
- ime_list_[1].engines[0].engine_id); |
- std::vector<std::string> ids; |
- ids.push_back(ext_id); |
- EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids)); |
- EXPECT_EQ(1U, manager_->GetNumActiveInputMethods()); |
- manager_->ChangeInputMethod(ext_id); |
- |
- InitComponentExtension(); |
- EXPECT_EQ(ext_id, manager_->GetCurrentInputMethod().id()); |
-} |
- |
-TEST_F(InputMethodManagerImplTest, |
- ChangeInputMethodBeforeComponentExtensionInitialization_CompTwoIME) { |
- manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN); |
- const std::string ext_id1 = extension_ime_util::GetComponentInputMethodID( |
- ime_list_[1].id, |
- ime_list_[1].engines[0].engine_id); |
- const std::string ext_id2 = extension_ime_util::GetComponentInputMethodID( |
- ime_list_[2].id, |
- ime_list_[2].engines[0].engine_id); |
- std::vector<std::string> ids; |
- ids.push_back(ext_id1); |
- ids.push_back(ext_id2); |
- EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids)); |
- EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); |
- manager_->ChangeInputMethod(ext_id1); |
- manager_->ChangeInputMethod(ext_id2); |
- |
- InitComponentExtension(); |
- EXPECT_EQ(ext_id2, manager_->GetCurrentInputMethod().id()); |
-} |
- |
-TEST_F(InputMethodManagerImplTest, |
ChangeInputMethod_ComponenteExtensionOneIME) { |
InitComponentExtension(); |
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN); |