Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3060)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename to ImeKeyboard & rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('k') | chrome/browser/chromeos/input_method/mock_input_method_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3f3f21219840f01dc967f21b3dada494a853c662..f99dc8d41bb858803d5a964afd92de540f7118e2 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
@@ -19,8 +19,8 @@
#include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_engine.h"
#include "chromeos/ime/extension_ime_util.h"
+#include "chromeos/ime/fake_ime_keyboard.h"
#include "chromeos/ime/fake_input_method_delegate.h"
-#include "chromeos/ime/fake_xkeyboard.h"
#include "chromeos/ime/mock_component_extension_ime_manager_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accelerators/accelerator.h"
@@ -68,7 +68,7 @@ class InputMethodManagerImplTest : public testing::Test {
InputMethodManagerImplTest()
: delegate_(NULL),
candidate_window_controller_(NULL),
- xkeyboard_(NULL) {
+ keyboard_(NULL) {
}
virtual ~InputMethodManagerImplTest() {}
@@ -80,8 +80,8 @@ class InputMethodManagerImplTest : public testing::Test {
candidate_window_controller_ = new MockCandidateWindowController;
manager_->SetCandidateWindowControllerForTesting(
candidate_window_controller_);
- xkeyboard_ = new FakeXKeyboard;
- manager_->SetXKeyboardForTesting(xkeyboard_);
+ keyboard_ = new FakeImeKeyboard;
+ manager_->SetImeKeyboardForTesting(keyboard_);
mock_engine_handler_.reset(new MockIMEEngineHandler());
IMEBridge::Initialize();
IMEBridge::Get()->SetCurrentEngineHandler(mock_engine_handler_.get());
@@ -213,7 +213,7 @@ class InputMethodManagerImplTest : public testing::Test {
virtual void TearDown() OVERRIDE {
delegate_ = NULL;
candidate_window_controller_ = NULL;
- xkeyboard_ = NULL;
+ keyboard_ = NULL;
manager_.reset();
IMEBridge::Get()->SetCurrentEngineHandler(NULL);
@@ -244,7 +244,7 @@ class InputMethodManagerImplTest : public testing::Test {
FakeInputMethodDelegate* delegate_;
MockCandidateWindowController* candidate_window_controller_;
scoped_ptr<MockIMEEngineHandler> mock_engine_handler_;
- FakeXKeyboard* xkeyboard_;
+ FakeImeKeyboard* keyboard_;
base::MessageLoop message_loop_;
MockComponentExtIMEManagerDelegate* mock_delegate_;
std::vector<ComponentExtensionIME> ime_list_;
@@ -306,9 +306,9 @@ class TestCandidateWindowObserver
};
} // namespace
-TEST_F(InputMethodManagerImplTest, TestGetXKeyboard) {
- EXPECT_TRUE(manager_->GetXKeyboard());
- EXPECT_EQ(xkeyboard_, manager_->GetXKeyboard());
+TEST_F(InputMethodManagerImplTest, TestGetImeKeyboard) {
+ EXPECT_TRUE(manager_->GetImeKeyboard());
+ EXPECT_EQ(keyboard_, manager_->GetImeKeyboard());
}
TEST_F(InputMethodManagerImplTest, TestCandidateWindowObserver) {
@@ -501,7 +501,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableTwoLayouts) {
// called.
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Disable Dvorak.
ids.erase(ids.begin());
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
@@ -509,7 +509,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableTwoLayouts) {
EXPECT_EQ(2, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), // colemak
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(colemak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(colemak)", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -527,12 +527,12 @@ TEST_F(InputMethodManagerImplTest, TestEnableThreeLayouts) {
EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Switch to Dvorak.
manager_->SwitchToNextInputMethod();
EXPECT_EQ(2, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Disable Dvorak.
ids.erase(ids.begin() + 1);
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
@@ -540,7 +540,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableThreeLayouts) {
EXPECT_EQ(3, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), // US Qwerty
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -556,18 +556,18 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme) {
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Switch to Mozc
manager_->SwitchToNextInputMethod();
EXPECT_EQ(2, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Disable Mozc.
ids.erase(ids.begin() + 1);
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
}
TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme2) {
@@ -582,7 +582,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme2) {
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Disable Dvorak.
ids.erase(ids.begin());
@@ -590,7 +590,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutAndIme2) {
EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId(ids[0]), // Mozc
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -605,7 +605,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableImes) {
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -638,30 +638,30 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayoutsThenLock) {
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Switch to Dvorak.
manager_->SwitchToNextInputMethod();
EXPECT_EQ(2, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Lock screen
manager_->SetState(InputMethodManager::STATE_LOCK_SCREEN);
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId(ids[1]), // still Dvorak
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Switch back to Qwerty.
manager_->SwitchToNextInputMethod();
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Unlock screen. The original state, Dvorak, is restored.
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -680,30 +680,30 @@ TEST_F(InputMethodManagerImplTest, SwitchInputMethodTest) {
EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Switch to Mozc.
manager_->SwitchToNextInputMethod();
EXPECT_EQ(2, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Lock screen
manager_->SetState(InputMethodManager::STATE_LOCK_SCREEN);
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); // Qwerty+Dvorak.
EXPECT_EQ(XkbId("xkb:us:dvorak:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_EQ(XkbId("xkb:us::eng"), // The hardware keyboard layout.
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// 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(XkbId(ids[1]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -719,27 +719,27 @@ TEST_F(InputMethodManagerImplTest, TestXkbSetting) {
ids.push_back(kNaclMozcUsId);
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(4U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ(1, xkeyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ(1, keyboard_->set_current_keyboard_layout_by_name_count_);
// See input_methods.txt for an expected XKB layout name.
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
- EXPECT_EQ(2, xkeyboard_->set_current_keyboard_layout_by_name_count_);
- EXPECT_EQ("us(colemak)", xkeyboard_->last_layout_);
+ EXPECT_EQ(2, keyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ("us(colemak)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
- EXPECT_EQ(3, xkeyboard_->set_current_keyboard_layout_by_name_count_);
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ(3, keyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
- EXPECT_EQ(4, xkeyboard_->set_current_keyboard_layout_by_name_count_);
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ(4, keyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
- EXPECT_EQ(5, xkeyboard_->set_current_keyboard_layout_by_name_count_);
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ(5, keyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Disable Dvorak.
ids.erase(ids.begin());
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(3U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ(6, xkeyboard_->set_current_keyboard_layout_by_name_count_);
- EXPECT_EQ("us(colemak)", xkeyboard_->last_layout_);
+ EXPECT_EQ(6, keyboard_->set_current_keyboard_layout_by_name_count_);
+ EXPECT_EQ("us(colemak)", keyboard_->last_layout_);
}
TEST_F(InputMethodManagerImplTest, TestActivateInputMethodMenuItem) {
@@ -830,30 +830,30 @@ TEST_F(InputMethodManagerImplTest, TestNextInputMethod) {
manager_->EnableLoginLayouts("en-US", keyboard_layouts);
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:intl:eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(intl)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:altgr-intl:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(altgr-intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(altgr-intl)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:dvorak:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:colemak:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(colemak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(colemak)", keyboard_->last_layout_);
manager_->SwitchToNextInputMethod();
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -873,47 +873,47 @@ TEST_F(InputMethodManagerImplTest, TestPreviousInputMethod) {
manager_->EnableLoginLayouts("en-US", keyboard_layouts);
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToNextInputMethod());
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:intl:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(intl)", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:intl:eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(intl)", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToNextInputMethod());
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:intl:eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(intl)", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToNextInputMethod());
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:altgr-intl:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(altgr-intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(altgr-intl)", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:intl:eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(intl)", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_TRUE(observer.last_show_message_);
EXPECT_EQ(XkbId("xkb:us:altgr-intl:eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(altgr-intl)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(altgr-intl)", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -952,7 +952,7 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithUsLayouts) {
manager_->EnableLoginLayouts("en-US", keyboard_layouts);
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(expect_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Henkan, Muhenkan, ZenkakuHankaku should be ignored when no Japanese IMEs
// and keyboards are enabled.
@@ -960,19 +960,19 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithUsLayouts) {
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_FALSE(observer.last_show_message_);
EXPECT_EQ(expect_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(expect_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(expect_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(expect_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
manager_->RemoveObserver(&observer);
}
@@ -991,27 +991,27 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) {
manager_->EnableLoginLayouts("ja", keyboard_layouts);
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keydown_accelerator));
EXPECT_TRUE(manager_->SwitchToPreviousInputMethod(keyup_accelerator));
EXPECT_EQ(XkbId("xkb:us::eng"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
}
TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
@@ -1022,45 +1022,45 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
ids.push_back(kNaclMozcJpId);
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(kNaclMozcJpId, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ(kNaclMozcJpId, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ(kNaclMozcJpId, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
// Add Dvorak.
ids.push_back(XkbId("xkb:us:dvorak:eng"));
EXPECT_TRUE(manager_->ReplaceEnabledInputMethods(ids));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(kNaclMozcJpId, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(XkbId("xkb:jp::jpn"), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("jp", xkeyboard_->last_layout_);
+ EXPECT_EQ("jp", keyboard_->last_layout_);
}
TEST_F(InputMethodManagerImplTest, TestAddRemoveExtensionInputMethods) {
@@ -1075,7 +1075,7 @@ TEST_F(InputMethodManagerImplTest, TestAddRemoveExtensionInputMethods) {
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Add two Extension IMEs.
std::vector<std::string> layouts;
@@ -1156,7 +1156,7 @@ TEST_F(InputMethodManagerImplTest, TestAddExtensionInputThenLockScreen) {
EXPECT_EQ(1U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(1, observer.input_method_changed_count_);
EXPECT_EQ(XkbId(ids[0]), manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Add an Extension IME.
std::vector<std::string> layouts;
@@ -1190,20 +1190,20 @@ TEST_F(InputMethodManagerImplTest, TestAddExtensionInputThenLockScreen) {
manager_->SwitchToNextInputMethod();
EXPECT_EQ(3, observer.input_method_changed_count_);
EXPECT_EQ(ext_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
// Lock the screen. This is for crosbug.com/27049.
manager_->SetState(InputMethodManager::STATE_LOCK_SCREEN);
EXPECT_EQ(1U, manager_->GetNumActiveInputMethods()); // Qwerty. No Ext. IME
EXPECT_EQ(XkbId("xkb:us::eng"),
manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us", xkeyboard_->last_layout_);
+ EXPECT_EQ("us", keyboard_->last_layout_);
// Unlock the screen.
manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
EXPECT_EQ(ext_id, manager_->GetCurrentInputMethod().id());
- EXPECT_EQ("us(dvorak)", xkeyboard_->last_layout_);
+ EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
{
// This is for crosbug.com/27052.
scoped_ptr<InputMethodDescriptors> methods(
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('k') | chrome/browser/chromeos/input_method/mock_input_method_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698