Merge 279991 "[Android] Select text when stylus first button is ..."

ui/events/events.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 306 matching lines @@
         'events',
         'events_base',
       ],
       'sources': [
         'test/cocoa_test_event_utils.h',
         'test/cocoa_test_event_utils.mm',
         'test/events_test_utils.cc',
         'test/events_test_utils.h',
         'test/events_test_utils_x11.cc',
         'test/events_test_utils_x11.h',
+        'test/mock_motion_event.cc',
+        'test/mock_motion_event.h',
         'test/platform_event_waiter.cc',
         'test/platform_event_waiter.h',
         'test/test_event_handler.cc',
         'test/test_event_handler.h',
         'test/test_event_processor.cc',
         'test/test_event_processor.h',
         'test/test_event_target.cc',
         'test/test_event_target.h',
       ],
       'conditions': [
@@ skipping 29 matching lines @@
       'sources': [
         'cocoa/events_mac_unittest.mm',
         'event_dispatcher_unittest.cc',
         'event_processor_unittest.cc',
         'event_rewriter_unittest.cc',
         'event_unittest.cc',
         'gestures/motion_event_aura_unittest.cc',
         'gestures/velocity_calculator_unittest.cc',
         'gesture_detection/bitset_32_unittest.cc',
         'gesture_detection/gesture_provider_unittest.cc',
-        'gesture_detection/mock_motion_event.h',
-        'gesture_detection/mock_motion_event.cc',
         'gesture_detection/velocity_tracker_unittest.cc',
         'gesture_detection/touch_disposition_gesture_filter_unittest.cc',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
         'ozone/evdev/key_event_converter_evdev_unittest.cc',
         'ozone/evdev/touch_event_converter_evdev_unittest.cc',
         'platform/platform_event_source_unittest.cc',
         'x/events_x_unittest.cc',
       ],
       'conditions': [
@@ skipping 37 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }