Fix some surprising reverse key mappings.

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 53 matching lines @@
       // The button release X events for mouse wheels are dropped by Aura.
       return XI_ButtonPress;
     case ui::ET_MOUSE_RELEASED:
       return XI_ButtonRelease;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
-// Converts KeyboardCode to XKeyEvent keycode.
-unsigned int XKeyEventKeyCode(ui::KeyboardCode key_code,
-                              int flags,
-                              XDisplay* display) {
-  // 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;
 
   if (flags & ui::EF_LEFT_MOUSE_BUTTON)
     return Button1;
@@ skipping 75 matching lines @@
   event_->xkey.display = display;
   event_->xkey.time = 0;
   event_->xkey.window = 0;
   event_->xkey.root = 0;
   event_->xkey.subwindow = 0;
   event_->xkey.x = 0;
   event_->xkey.y = 0;
   event_->xkey.x_root = 0;
   event_->xkey.y_root = 0;
   event_->xkey.state = XEventState(flags);
-  event_->xkey.keycode = XKeyEventKeyCode(key_code, flags, display);
+  event_->xkey.keycode = XKeyCodeForWindowsKeyCode(key_code, flags, display);
   event_->xkey.same_screen = 1;
 }
 
 void ScopedXI2Event::InitGenericKeyEvent(int deviceid,
                                          EventType type,
                                          KeyboardCode key_code,
                                          int flags) {
   event_.reset(
       CreateXInput2Event(deviceid, XIKeyEventType(type), 0, gfx::Point()));
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event_->xcookie.data);
   CHECK_NE(0, xievent->evtype);
   XDisplay* display = gfx::GetXDisplay();
   event_->xgeneric.display = display;
   xievent->display = display;
   xievent->mods.effective = XEventState(flags);
-  xievent->detail = XKeyEventKeyCode(key_code, flags, display);
+  xievent->detail = XKeyCodeForWindowsKeyCode(key_code, flags, display);
 }
 
 void ScopedXI2Event::InitGenericButtonEvent(int deviceid,
                                             EventType type,
                                             const gfx::Point& location,
                                             int flags) {
   event_.reset(CreateXInput2Event(deviceid,
                                   XIButtonEventType(type), 0, gfx::Point()));
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event_->xcookie.data);
   xievent->mods.effective = XEventState(flags);
@@ skipping 97 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