Handle Caps Lock short cut (Shift+Search) in ash [part 2 of 2].

chrome/browser/chromeos/system_key_event_listener_browsertest.cc

 // Copyright (c) 2011 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 <X11/keysym.h>
 #include <X11/Xlib.h>
 #undef Bool
 #undef None
 #undef Status
 
 #include <cstring>
 
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/x/x11_util.h"
 
 #if defined(USE_VIRTUAL_KEYBOARD)
 // Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
 // skip the tests for now.
 #define TestInputMethod DISABLED_TestInputMethod
 #define TestInputMethodWithNumLock DISABLED_TestInputMethodWithNumLock
 #define TestKoreanInputMethod DISABLED_TestKoreanInputMethod
 #endif
 
+#if defined(USE_AURA)
+// When Aura is in use, the short cut is handled in ash/.

[Daniel Erat, 2012/01/18 15:44:31]

nit: same as last comment

[Yusuke Sato, 2012/01/23 06:53:49]

Done.

+#define TestCapsLock DISABLED_TestCapsLock
+#define TestCapsLockWithNumLock DISABLED_TestCapsLockWithNumLock
+#endif
+
 namespace chromeos {
 namespace {
 
 static const char* active_input_methods[] = {
   "xkb:us::eng",  // The first one should be US Qwerty.
 #if !defined(USE_VIRTUAL_KEYBOARD)
   "xkb:us:dvorak:eng",
   "xkb:kr:kr104:kor",  // for testing XK_space with ShiftMask.
   // TODO(yusukes): Add "mozc-jp", "xkb:jp::jpn", and "mozc-hangul" to test
   // more IME hot keys once build bots start supporting ibus-daemon.
@@ skipping 314 matching lines @@
   // TODO(yusukes): Add tests for input method specific hot keys like XK_Henkan,
   // XK_Muhenkan, XK_ZenkakuHankaku, and XK_Hangul. This is not so easy since 1)
   // we have to enable "mozc-jp" and "mozc-hangul" that require ibus-daemon, and
   // 2) to let XKeysymToKeycode() handle e.g. XK_Henkan etc, we have to change
   // the XKB layout to "jp" first.
 
   manager_->RemoveObserver(&input_method_observer_);
 }
 
 }  // namespace chromeos