Allow Caps Lock to be remapped [part 2 of 2]

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/stringprintf.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/events/event.h"
 
 #if defined(OS_CHROMEOS)
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>
 
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
@@ skipping 1480 matching lines @@
                                       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_);
 }
 
+TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockWithFlag) {
+  // TODO(yusukes): Reenable the test once build servers are upgraded.
+  TestingPrefService prefs;
+  chromeos::Preferences::RegisterUserPrefs(&prefs);
+
+  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, TestRewriteCapsLockToControl) {
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
   control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
   control.SetValue(chromeos::input_method::kControlKey);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
@@ skipping 34 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.
+  TestingPrefService prefs;
+  chromeos::Preferences::RegisterUserPrefs(&prefs);
+  IntegerPrefMember control;
+  control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+  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.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
   control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
   control.SetValue(chromeos::input_method::kControlKey);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
@@ skipping 193 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