Fix Caps Lock bug

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"
@@ skipping 961 matching lines @@
 
   void TearDown() override {
     chromeos::input_method::InputMethodManager::Shutdown();
     AcceleratorControllerTest::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ToggleCapsLockTest);
 };
 
-// Tests the four combinations of the TOGGLE_CAPS_LOCK accelerator.
+// Tests the five combinations of the TOGGLE_CAPS_LOCK accelerator.
 TEST_F(ToggleCapsLockTest, ToggleCapsLockAccelerators) {
   chromeos::input_method::InputMethodManager* input_method_manager =
       chromeos::input_method::InputMethodManager::Get();
   ASSERT_TRUE(input_method_manager);
   EXPECT_FALSE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
 
   // 1. Press Alt, Press Search, Release Search, Release Alt.
   // Note when you press Alt then press search, the key_code at this point is
   // VKEY_LWIN (for search) and Alt is the modifier.
   const ui::Accelerator press_alt_then_search(ui::VKEY_LWIN, ui::EF_ALT_DOWN);
@@ skipping 19 matching lines @@
   const ui::Accelerator release_alt_before_search(
       CreateReleaseAccelerator(ui::VKEY_MENU, ui::EF_COMMAND_DOWN));
   EXPECT_TRUE(ProcessInController(release_alt_before_search));
   EXPECT_TRUE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
   input_method_manager->GetImeKeyboard()->SetCapsLockEnabled(false);
 
   // 4. Press Search, Press Alt, Release Alt, Release Search.
   EXPECT_FALSE(ProcessInController(press_search_then_alt));
   EXPECT_TRUE(ProcessInController(release_alt_before_search));
   EXPECT_TRUE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
+  input_method_manager->GetImeKeyboard()->SetCapsLockEnabled(false);
+
+  // 5. Press Caps Lock, Release Caps Lock.
+  const ui::Accelerator press_caps_lock(ui::VKEY_CAPITAL, ui::EF_NONE);
+  EXPECT_FALSE(ProcessInController(press_caps_lock));
+  EXPECT_FALSE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
+  const ui::Accelerator release_caps_lock(
+      CreateReleaseAccelerator(ui::VKEY_CAPITAL, ui::EF_NONE));
+  EXPECT_TRUE(ProcessInController(release_caps_lock));
+  EXPECT_TRUE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
 }
 
 class PreferredReservedAcceleratorsTest : public test::AshTestBase {
  public:
   PreferredReservedAcceleratorsTest() {}
   ~PreferredReservedAcceleratorsTest() override {}
 
   // test::AshTestBase:
   void SetUp() override {
     AshTestBase::SetUp();
@@ skipping 328 matching lines @@
     // Expect no notifications from the new accelerators.
     EXPECT_TRUE(IsMessageCenterEmpty());
 
     // If the action is LOCK_SCREEN, we must reset the state by unlocking the
     // screen before we proceed testing the rest of accelerators.
     ResetStateIfNeeded();
   }
 }
 
 }  // namespace ash