Clean up event flags a bit:

ui/events/test/events_test_utils_x11.cc

Index: ui/events/test/events_test_utils_x11.cc
diff --git a/ui/events/test/events_test_utils_x11.cc b/ui/events/test/events_test_utils_x11.cc
index f6c8e043eb3822a952fca78748038aaf99bfac99..f4320db0bbf938d6c210670ce5db2a5caa06a9a7 100644
--- a/ui/events/test/events_test_utils_x11.cc
+++ b/ui/events/test/events_test_utils_x11.cc
@@ -23,13 +23,13 @@ namespace {
 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_ALTGR_DOWN) ? Mod5Mask : 0) |
-      ((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 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_LEFT_MOUSE_BUTTON) ? Button1Mask: 0) |
       ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ? Button2Mask: 0) |
       ((flags & ui::EF_RIGHT_MOUSE_BUTTON) ? Button3Mask: 0);