Revert 149888 - Copy aura::Event into ui::Event.

ui/ui_unittests.gypi

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'ui_test_support',
       'type': 'static_library',
       'includes': [
@@ skipping 49 matching lines @@
         'base/animation/animation_unittest.cc',
         'base/animation/multi_animation_unittest.cc',
         'base/animation/slide_animation_unittest.cc',
         'base/clipboard/clipboard_unittest.cc',
         'base/clipboard/custom_data_helper_unittest.cc',
         'base/cocoa/base_view_unittest.mm',
         'base/cocoa/fullscreen_window_manager_unittest.mm',
         'base/cocoa/events_mac_unittest.mm',
         'base/cocoa/focus_tracker_unittest.mm',
         'base/dialogs/select_file_dialog_win_unittest.cc',
-        'base/event_unittest.cc',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
         'base/gtk/menu_label_accelerator_util_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/models/list_model_unittest.cc',
         'base/models/tree_node_iterator_unittest.cc',
         'base/models/tree_node_model_unittest.cc',
         'base/range/range_unittest.cc',
         'base/range/range_mac_unittest.mm',
@@ skipping 115 matching lines @@
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'gfx/render_text_unittest.cc',
           ],
         }],
-        ['toolkit_views==0', {
+        ['OS!="win" or use_aura==0', {
           'sources!': [
             'base/view_prop_unittest.cc',
-            'base/event_unittest.cc',
-          ],
-        }, {
-          'sources': [
-            'base/gestures/velocity_calculator_unittest.cc',
           ],
         }],
         ['use_aura==1', {
           'sources!': [
             'base/dialogs/select_file_dialog_win_unittest.cc',
             'base/dragdrop/os_exchange_data_win_unittest.cc',
             'base/native_theme/native_theme_win_unittest.cc',
             'gfx/screen_unittest.cc',
           ],
         }],
+        ['use_aura==1 or toolkit_views==1', {
+          'sources': [
+            'base/gestures/velocity_calculator_unittest.cc',
+          ],
+        }],
       ],
     },
   ],
   'conditions': [
     # Special target to wrap a gtest_target_type==shared_library
     # ui_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             'ui_unittests',
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
             'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }