This changelist represents the necessary merger of two others:...

chrome/chrome.gyp

 # Copyright (c) 2009 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,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
@@ skipping 415 matching lines @@
         'common/chrome_paths_win.cc',
         'common/chrome_plugin_api.h',
         'common/chrome_plugin_lib.cc',
         'common/chrome_plugin_lib.h',
         'common/chrome_plugin_util.cc',
         'common/chrome_plugin_util.h',
         'common/chrome_switches.cc',
         'common/chrome_switches.h',
         'common/classfactory.cc',
         'common/classfactory.h',
-        'common/cocoa_utils.mm',
-        'common/cocoa_utils.h',
         'common/common_glue.cc',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
         'common/css_colors.h',
         'common/db_message_filter.cc',
         'common/db_message_filter.h',
         'common/debug_flags.cc',
         'common/debug_flags.h',
         'common/devtools_messages.h',
         'common/devtools_messages_internal.h',
@@ skipping 411 matching lines @@
         'browser/cocoa/download_shelf_controller.mm',
         'browser/cocoa/download_shelf_mac.h',
         'browser/cocoa/download_shelf_mac.mm',
         'browser/cocoa/download_shelf_view.h',
         'browser/cocoa/download_shelf_view.mm',
         'browser/cocoa/download_started_animation_mac.mm',
         'browser/cocoa/download_util_mac.h',
         'browser/cocoa/download_util_mac.mm',
         'browser/cocoa/encoding_menu_controller_delegate_mac.h',
         'browser/cocoa/encoding_menu_controller_delegate_mac.mm',
+        'browser/cocoa/event_utils.h',
+        'browser/cocoa/event_utils.mm',
         'browser/cocoa/find_bar_bridge.h',
         'browser/cocoa/find_bar_bridge.mm',
         'browser/cocoa/find_bar_cocoa_controller.h',
         'browser/cocoa/find_bar_cocoa_controller.mm',
         'browser/cocoa/find_bar_view.h',
         'browser/cocoa/find_bar_view.mm',
         'browser/cocoa/first_run_dialog.h',
         'browser/cocoa/first_run_dialog.mm',
         'browser/cocoa/fullscreen_window.h',
         'browser/cocoa/fullscreen_window.mm',
@@ skipping 2933 matching lines @@
         'browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm',
         'browser/cocoa/bookmark_name_folder_controller_unittest.mm',
         'browser/cocoa/browser_window_cocoa_unittest.mm',
         'browser/cocoa/browser_window_controller_unittest.mm',
         'browser/cocoa/clear_browsing_data_controller_unittest.mm',
         'browser/cocoa/command_observer_bridge_unittest.mm',
         'browser/cocoa/custom_home_pages_model_unittest.mm',
         'browser/cocoa/download_shelf_mac_unittest.mm',
         'browser/cocoa/download_shelf_view_unittest.mm',
         'browser/cocoa/download_util_mac_unittest.mm',
+        'browser/cocoa/event_utils_unittest.mm',
         'browser/cocoa/find_bar_bridge_unittest.mm',
         'browser/cocoa/find_bar_cocoa_controller_unittest.mm',
         'browser/cocoa/find_bar_view_unittest.mm',
         'browser/cocoa/fullscreen_window_unittest.mm',
         'browser/cocoa/hung_renderer_controller_unittest.mm',
         'browser/cocoa/infobar_container_controller_unittest.mm',
         'browser/cocoa/infobar_controller_unittest.mm',
         'browser/cocoa/infobar_gradient_view_unittest.mm',
         'browser/cocoa/infobar_text_field_unittest.mm',
         'browser/cocoa/location_bar_view_mac_unittest.mm',
         'browser/cocoa/gradient_button_cell_unittest.mm',
         'browser/cocoa/history_menu_bridge_unittest.mm',
         'browser/cocoa/history_menu_cocoa_controller_unittest.mm',
         'browser/cocoa/nsimage_cache_unittest.mm',
         'browser/cocoa/page_info_window_controller_unittest.mm',
         'browser/cocoa/preferences_window_controller_unittest.mm',
         'browser/cocoa/rwhvm_editcommand_helper_unittest.mm',
         'browser/cocoa/sad_tab_view_unittest.mm',
         'browser/cocoa/search_engine_list_model_unittest.mm',
         'browser/cocoa/status_bubble_mac_unittest.mm',
         'browser/cocoa/tab_cell_unittest.mm',
         'browser/cocoa/tab_controller_unittest.mm',
         'browser/cocoa/tab_strip_controller_unittest.mm',
         'browser/cocoa/tab_strip_view_unittest.mm',
         'browser/cocoa/tab_view_unittest.mm',
+        'browser/cocoa/test_event_utils.h',
+        'browser/cocoa/test_event_utils.mm',
         'browser/cocoa/throbber_view_unittest.mm',
         'browser/cocoa/toolbar_button_cell_unittest.mm',
         'browser/cocoa/toolbar_controller_unittest.mm',
         'browser/cocoa/toolbar_view_unittest.mm',
         'browser/cocoa/view_resizer_pong.h',
         'browser/cocoa/view_resizer_pong.mm',
         'browser/cocoa/web_drop_target_unittest.mm',
         'browser/command_updater_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/dom_ui/dom_ui_theme_source_unittest.cc',
@@ skipping 108 matching lines @@
         'browser/utility_process_host_unittest.cc',
         'browser/views/bookmark_context_menu_test.cc',
         'browser/views/bookmark_editor_view_unittest.cc',
         'browser/views/sync/sync_setup_wizard_unittest.cc',
         'browser/visitedlink_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/window_sizer_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
         'common/chrome_plugin_unittest.cc',
-        'common/cocoa_utils_unittest.mm',
         'common/common_param_traits_unittest.cc',
         'common/extensions/extension_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
         'common/id_map_unittest.cc',
         'common/important_file_writer_unittest.cc',
         'common/json_value_serializer_unittest.cc',
         'common/mru_cache_unittest.cc',
         'common/net/url_util_unittest.cc',
         'common/notification_service_unittest.cc',
@@ skipping 1654 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }