| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index 7012f4f33aa2bcffbfd6ba162e1444b2e2ffa1cb..100947fcd5c6666a0519c639c63680db6b90c3f3 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -632,10 +632,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
|
| {
|
| EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
|
| EXPECT_TRUE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
|
| EXPECT_TRUE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
|
| }
|
| // ToggleAppList (with spoken feedback enabled)
|
| @@ -643,10 +643,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
|
| ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
|
| delegate->ToggleSpokenFeedback();
|
| EXPECT_FALSE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| delegate->ToggleSpokenFeedback();
|
| EXPECT_TRUE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
|
| }
|
| // DisableCapsLock
|
| {
|
| @@ -705,10 +705,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
|
| delegate->SetCapsLockEnabled(true);
|
| EXPECT_TRUE(delegate->IsCapsLockEnabled());
|
| EXPECT_TRUE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
|
| EXPECT_FALSE(delegate->IsCapsLockEnabled());
|
| EXPECT_TRUE(ProcessWithContext(
|
| - ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
|
| + ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
|
| EXPECT_TRUE(delegate->IsCapsLockEnabled());
|
| }
|
| #if defined(OS_CHROMEOS)
|
|
|