Clean up event flags a bit:

ui/events/gestures/motion_event_aura_unittest.cc

 // 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 421 matching lines @@
 TEST(MotionEventAuraTest, Flags) {
   int ids[] = {7, 11};
   MotionEventAura event;
 
   TouchEvent press0 = TouchWithType(ET_TOUCH_PRESSED, ids[0]);
   press0.set_flags(EF_CONTROL_DOWN);
   EXPECT_TRUE(event.OnTouch(press0));
   EXPECT_EQ(EF_CONTROL_DOWN, event.GetFlags());
 
   TouchEvent press1 = TouchWithType(ET_TOUCH_PRESSED, ids[1]);
-  press1.set_flags(EF_CONTROL_DOWN | EF_CAPS_LOCK_DOWN);
+  press1.set_flags(EF_CONTROL_DOWN | EF_CAPS_LOCK_ON);
   EXPECT_TRUE(event.OnTouch(press1));
-  EXPECT_EQ(EF_CONTROL_DOWN | EF_CAPS_LOCK_DOWN, event.GetFlags());
+  EXPECT_EQ(EF_CONTROL_DOWN | EF_CAPS_LOCK_ON, event.GetFlags());
 }
 
 // Once crbug.com/446852 is fixed, we should ignore redundant presses.
 TEST(MotionEventAuraTest, DoesntIgnoreRedundantPresses) {
   const int id = 7;
   const int position_1 = 10;
   const int position_2 = 23;
 
   MotionEventAura event;
   TouchEvent press1 = TouchWithPosition(ET_TOUCH_PRESSED, id, position_1,
@@ skipping 62 matching lines @@
     int id = i + kIdOffset;
     TouchEvent release = TouchWithType(ET_TOUCH_RELEASED, id);
     if (i < MotionEvent::MAX_TOUCH_POINT_COUNT)
       EXPECT_TRUE(event.OnTouch(release));
     else
       EXPECT_FALSE(event.OnTouch(release));
   }
 }
 
 }  // namespace ui