Clean up event flags a bit:

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 <stddef.h>
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
 namespace {
 
 // Converts ui::EventType to state for X*Events.
 unsigned int XEventState(int flags) {
   return
       ((flags & ui::EF_SHIFT_DOWN) ? ShiftMask : 0) |
+      ((flags & ui::EF_CAPS_LOCK_ON) ? LockMask : 0) |
       ((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) |
       ((flags & ui::EF_ALT_DOWN) ? Mod1Mask : 0) |
-      ((flags & ui::EF_NUM_LOCK_DOWN) ? Mod2Mask : 0) |
-      ((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0) |
+      ((flags & ui::EF_NUM_LOCK_ON) ? Mod2Mask : 0) |
+      ((flags & ui::EF_MOD3_DOWN) ? Mod3Mask : 0) |
+      ((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 0) |
       ((flags & ui::EF_ALTGR_DOWN) ? Mod5Mask : 0) |
-      ((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 0) |
-      ((flags & ui::EF_MOD3_DOWN) ? Mod3Mask : 0) |
       ((flags & ui::EF_LEFT_MOUSE_BUTTON) ? Button1Mask: 0) |
       ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ? Button2Mask: 0) |
       ((flags & ui::EF_RIGHT_MOUSE_BUTTON) ? Button3Mask: 0);
 }
 
 // Converts EventType to XKeyEvent type.
 int XKeyEventType(ui::EventType type) {
   switch (type) {
     case ui::ET_KEY_PRESSED:
       return KeyPress;
@@ skipping 285 matching lines @@
 }
 
 void SetUpPointerDevicesForTest(const std::vector<int>& devices) {
   TouchFactory::GetInstance()->SetPointerDeviceForTest(devices);
   ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
   manager->SetDeviceListForTest(std::vector<int>(), std::vector<int>(),
                                 devices);
 }
 
 }  // namespace ui