Clean up event flags a bit:

ui/views/test/event_generator_delegate_mac.mm

 // Copyright 2014 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.
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
@@ skipping 29 matching lines @@
   // assume that the contentRect of |target| is at the top-left corner of the
   // screen.
   NSRect content_rect = [target contentRectForFrameRect:[target frame]];
   return NSMakePoint(point_in_root.x(),
                      NSHeight(content_rect) - point_in_root.y());
 }
 
 // Inverse of ui::EventFlagsFromModifiers().
 NSUInteger EventFlagsToModifiers(int flags) {
   NSUInteger modifiers = 0;
-  modifiers |= (flags & ui::EF_CAPS_LOCK_DOWN) ? NSAlphaShiftKeyMask : 0;
   modifiers |= (flags & ui::EF_SHIFT_DOWN) ? NSShiftKeyMask : 0;
   modifiers |= (flags & ui::EF_CONTROL_DOWN) ? NSControlKeyMask : 0;
   modifiers |= (flags & ui::EF_ALT_DOWN) ? NSAlternateKeyMask : 0;
   modifiers |= (flags & ui::EF_COMMAND_DOWN) ? NSCommandKeyMask : 0;
+  modifiers |= (flags & ui::EF_CAPS_LOCK_ON) ? NSAlphaShiftKeyMask : 0;
   // ui::EF_*_MOUSE_BUTTON not handled here.
   // NSFunctionKeyMask, NSNumericPadKeyMask and NSHelpKeyMask not mapped.
   return modifiers;
 }
 
 // Picks the corresponding mouse event type for the buttons set in |flags|.
 NSEventType PickMouseEventType(int flags,
                                NSEventType left,
                                NSEventType right,
                                NSEventType other) {
@@ skipping 418 matching lines @@
 - (NSEvent*)currentEvent {
   if (g_current_event)
     return g_current_event;
 
   // Find the original implementation and invoke it.
   IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
   return original(self, _cmd);
 }
 
 @end