| Index: chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
|
| diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
|
| index e0eccaf28c9bfff08e9a37f9fa6661dd54695b95..c9d87d3fd509f387ce27e3339ac87889d551070c 100644
|
| --- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
|
| +++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
|
| @@ -325,13 +325,31 @@ TEST_F(XKeyboardTest, TestSetCapsLockAndNumLockAtTheSameTime) {
|
| EXPECT_EQ(initial_caps_lock_state, c);
|
| EXPECT_EQ(!initial_num_lock_state, n);
|
|
|
| - // Flip Num Lock to restore the initial state.
|
| + // Flip both.
|
| + xkey_->SetLockedModifiers(
|
| + initial_caps_lock_state ? kDisableLock : kEnableLock,
|
| + initial_num_lock_state ? kEnableLock : kDisableLock);
|
| + EXPECT_EQ(!initial_caps_lock_state,
|
| + TestableXKeyboard::CapsLockIsEnabled());
|
| + EXPECT_EQ(initial_num_lock_state,
|
| + TestableXKeyboard::NumLockIsEnabled(num_lock_mask));
|
| +
|
| + // Flip Num Lock.
|
| xkey_->SetLockedModifiers(
|
| kDontChange,
|
| - initial_caps_lock_state ? kEnableLock : kDisableLock);
|
| + initial_num_lock_state ? kDisableLock : kEnableLock);
|
| TestableXKeyboard::GetLockedModifiers(num_lock_mask, &c, &n);
|
| - EXPECT_EQ(initial_caps_lock_state, c);
|
| - EXPECT_EQ(initial_num_lock_state, n);
|
| + EXPECT_EQ(!initial_caps_lock_state, c);
|
| + EXPECT_EQ(!initial_num_lock_state, n);
|
| +
|
| + // Flip both to restore the initial state.
|
| + xkey_->SetLockedModifiers(
|
| + initial_caps_lock_state ? kEnableLock : kDisableLock,
|
| + initial_num_lock_state ? kEnableLock : kDisableLock);
|
| + EXPECT_EQ(initial_caps_lock_state,
|
| + TestableXKeyboard::CapsLockIsEnabled());
|
| + EXPECT_EQ(initial_num_lock_state,
|
| + TestableXKeyboard::NumLockIsEnabled(num_lock_mask));
|
|
|
| // No-op SetLockedModifiers call.
|
| xkey_->SetLockedModifiers(kDontChange, kDontChange);
|
|
|