Don't disable Caps Lock when Shift+<non-modifier-key> is pressed and Shift is released first.

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/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 648 matching lines @@
 
     // Do not handle when a shift pressed with other keys.
     delegate->SetCapsLockEnabled(true);
     EXPECT_FALSE(ProcessWithContext(
         ui::Accelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
     EXPECT_TRUE(delegate->IsCapsLockEnabled());
     EXPECT_FALSE(ProcessWithContext(
         ReleaseAccelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
     EXPECT_TRUE(delegate->IsCapsLockEnabled());
 
+    // Do not handle when a shift pressed with other keys, and shift is
+    // released first.
+    delegate->SetCapsLockEnabled(true);
+    EXPECT_FALSE(ProcessWithContext(
+        ui::Accelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+    EXPECT_FALSE(ProcessWithContext(
+        ReleaseAccelerator(ui::VKEY_LSHIFT, ui::EF_NONE)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+
+    EXPECT_FALSE(ProcessWithContext(
+        ui::Accelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+    EXPECT_FALSE(ProcessWithContext(
+        ReleaseAccelerator(ui::VKEY_SHIFT, ui::EF_NONE)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+
+    EXPECT_FALSE(ProcessWithContext(
+        ui::Accelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+    EXPECT_FALSE(ProcessWithContext(
+        ReleaseAccelerator(ui::VKEY_RSHIFT, ui::EF_NONE)));
+    EXPECT_TRUE(delegate->IsCapsLockEnabled());
+
     // Do not consume shift keyup when caps lock is off.
     delegate->SetCapsLockEnabled(false);
     EXPECT_FALSE(ProcessWithContext(
         ui::Accelerator(ui::VKEY_LSHIFT, ui::EF_NONE)));
     EXPECT_FALSE(ProcessWithContext(
         ReleaseAccelerator(ui::VKEY_LSHIFT, ui::EF_NONE)));
     EXPECT_FALSE(ProcessWithContext(
         ui::Accelerator(ui::VKEY_RSHIFT, ui::EF_NONE)));
     EXPECT_FALSE(ProcessWithContext(
         ReleaseAccelerator(ui::VKEY_RSHIFT, ui::EF_NONE)));
@@ skipping 577 matching lines @@
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash