Gets correct KeyboardCode from XEvent for non-US layouts.

ui/events/test/events_test_utils_x11.cc

 // Copyright 2013 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 "ui/events/test/events_test_utils_x11.h"
 
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 45 matching lines @@
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 // Converts KeyboardCode to XKeyEvent keycode.
 unsigned int XKeyEventKeyCode(ui::KeyboardCode key_code,
                               int flags,
                               XDisplay* display) {
-  const int keysym = XKeysymForWindowsKeyCode(key_code,
-                                              flags & ui::EF_SHIFT_DOWN);
-  // Tests assume the keycode for XK_less is equal to the one of XK_comma,
-  // but XKeysymToKeycode returns 94 for XK_less while it returns 59 for
-  // XK_comma. Here we convert the value for XK_less to the value for XK_comma.
-  return (keysym == XK_less) ? 59 : XKeysymToKeycode(display, keysym);
+  // XKeyEvent keycode is hardware keycode which doesn't consider SHIFT state.
+  // There are bugs in XKeysymToKeycode that it returns wrong keycode for keysym
+  // with SHIFT state. e.g. XK_less should return 59 but returns 94;
+  // XK_parenright should return 19 but returns 188; etc.
+  return XKeysymToKeycode(display, XKeysymForWindowsKeyCode(key_code, false));
 }
 
 // Converts Aura event type and flag to X button event.
 unsigned int XButtonEventButton(ui::EventType type,
                                 int flags) {
   // Aura events don't keep track of mouse wheel button, so just return
   // the first mouse wheel button.
   if (type == ui::ET_MOUSEWHEEL)
     return Button4;
 
@@ skipping 196 matching lines @@
   manager->SetDeviceListForTest(std::vector<unsigned int>(), device_list);
 }
 
 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices) {
   TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
   ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
   manager->SetDeviceListForTest(devices, std::vector<unsigned int>());
 }
 
 }  // namespace ui