Do not consume keys for DISABLE_CAPS_LOCK when caps lock is off.

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/multi_display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 609 matching lines @@
     EXPECT_FALSE(delegate->IsCapsLockEnabled());
 
     // Do not handle when a shift pressed with other keys.
     delegate->SetCapsLockEnabled(true);
     EXPECT_FALSE(GetController()->Process(
         ui::Accelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
     EXPECT_TRUE(delegate->IsCapsLockEnabled());
     EXPECT_FALSE(GetController()->Process(
         ReleaseAccelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN)));
     EXPECT_TRUE(delegate->IsCapsLockEnabled());
+
+    // Do not consume shift keyup when caps lock is off.
+    delegate->SetCapsLockEnabled(false);
+    EXPECT_FALSE(GetController()->Process(
+        ui::Accelerator(ui::VKEY_LSHIFT, ui::EF_NONE)));
+    EXPECT_FALSE(GetController()->Process(
+        ReleaseAccelerator(ui::VKEY_LSHIFT, ui::EF_NONE)));
+    EXPECT_FALSE(GetController()->Process(
+        ui::Accelerator(ui::VKEY_RSHIFT, ui::EF_NONE)));
+    EXPECT_FALSE(GetController()->Process(
+        ReleaseAccelerator(ui::VKEY_RSHIFT, ui::EF_NONE)));
+    EXPECT_FALSE(GetController()->Process(
+        ui::Accelerator(ui::VKEY_SHIFT, ui::EF_NONE)));
+    EXPECT_FALSE(GetController()->Process(
+        ReleaseAccelerator(ui::VKEY_SHIFT, ui::EF_NONE)));
   }
   // ToggleCapsLock
   {
     CapsLockDelegate* delegate = Shell::GetInstance()->caps_lock_delegate();
     delegate->SetCapsLockEnabled(true);
     EXPECT_TRUE(delegate->IsCapsLockEnabled());
     EXPECT_TRUE(GetController()->Process(
         ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
     EXPECT_FALSE(delegate->IsCapsLockEnabled());
     EXPECT_TRUE(GetController()->Process(
@@ skipping 368 matching lines @@
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_A, ui::EF_NONE)));
 }
 
 }  // namespace test
 }  // namespace ash