Short-term fix for CapsLock remapping on chromebooks with external keyboard

chrome/browser/ui/ash/event_rewriter_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 "chrome/browser/ui/ash/event_rewriter.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/stringprintf.h"
@@ skipping 1566 matching lines @@
                                       ui::EF_NONE,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U));
 
   // Confirm that calling RewriteForTesting() does not change the state of
   // |xkeyboard|. In this case, X Window system itself should change the
   // Caps Lock state, not ash::EventRewriter.
   EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
 
-  // Press Caps Lock (on an external keyboard).
+  // Release Caps Lock (on an external keyboard).
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_NONE,
                                       ui::ET_KEY_RELEASED,
                                       keycode_caps_lock_,
                                       LockMask,
                                       KeyRelease),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_RELEASED,
@@ skipping 25 matching lines @@
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_F16,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_launch7_,
                                       0U));
   EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
 }
 
-TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockWithFlag) {
-  // TODO(yusukes): Reenable the test once build servers are upgraded.
-  TestingPrefServiceSyncable prefs;
-  chromeos::Preferences::RegisterUserPrefs(prefs.registry());
-
-  chromeos::input_method::MockXKeyboard xkeyboard;
-  EventRewriter rewriter;
-  rewriter.set_pref_service_for_testing(&prefs);
-  rewriter.set_xkeyboard_for_testing(&xkeyboard);
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
-
-  // F16 should work as CapsLock even when --has-chromeos-keyboard is specified.
-  const CommandLine original_cl(*CommandLine::ForCurrentProcess());
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kHasChromeOSKeyboard, "");
-
-  EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
-                                      ui::EF_CAPS_LOCK_DOWN,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_caps_lock_,
-                                      0U,
-                                      KeyPress),
-            GetRewrittenEventAsString(&rewriter,
-                                      ui::VKEY_F16,
-                                      0,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_launch7_,
-                                      0U));
-  EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
-
-  *CommandLine::ForCurrentProcess() = original_cl;
-}
-
 TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKey) {
   // TODO(yusukes): Reenable the test once build servers are upgraded.
 
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterUserPrefs(prefs.registry());
 
   chromeos::input_method::MockXKeyboard xkeyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
@@ skipping 169 matching lines @@
                                       Mod1Mask | ControlMask,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_A,
                                       ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod1Mask | Mod3Mask));
 }
 
-TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockToControlWithFlag) {
-  // TODO(yusukes): Reenable the test once build servers are upgraded.
-  TestingPrefServiceSyncable prefs;
-  chromeos::Preferences::RegisterUserPrefs(prefs.registry());
-  IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
-  control.SetValue(chromeos::input_method::kControlKey);
-
-  EventRewriter rewriter;
-  rewriter.set_pref_service_for_testing(&prefs);
-
-  // The prefs::kLanguageRemapCapsLockKeyTo pref should be ignored when
-  // --has-chromeos-keyboard is set.
-  const CommandLine original_cl(*CommandLine::ForCurrentProcess());
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kHasChromeOSKeyboard, "");
-
-  EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
-                                      ui::EF_CAPS_LOCK_DOWN,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_caps_lock_,
-                                      0U,
-                                      KeyPress),
-            GetRewrittenEventAsString(&rewriter,
-                                      ui::VKEY_F16,
-                                      0,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_launch7_,
-                                      0U));
-
-  EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_A,
-                                      0,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_a_,
-                                      Mod3Mask,
-                                      KeyPress),
-            GetRewrittenEventAsString(&rewriter,
-                                      ui::VKEY_A,
-                                      0,
-                                      ui::ET_KEY_PRESSED,
-                                      keycode_a_,
-                                      Mod3Mask));
-
-  *CommandLine::ForCurrentProcess() = original_cl;
-}
-
 TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
   // Remap CapsLock to Control.
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterUserPrefs(prefs.registry());
   IntegerPrefMember control;
   control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
   control.SetValue(chromeos::input_method::kControlKey);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
@@ skipping 454 matching lines @@
   // flag in the event is True.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             rewritten_event);
 }
 #endif  // OS_CHROMEOS