Replace ExtensionAction with ExtensionAction2.

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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 520 matching lines @@
         'common/desktop_notifications/active_notification_tracker.h',
         'common/desktop_notifications/active_notification_tracker.cc',
         'common/extensions/extension.cc',
         'common/extensions/extension.h',
         'common/extensions/extension_constants.cc',
         'common/extensions/extension_constants.h',
         'common/extensions/extension_error_reporter.cc',
         'common/extensions/extension_error_reporter.h',
         'common/extensions/extension_error_utils.cc',
         'common/extensions/extension_error_utils.h',
-        'common/extensions/extension_action2.cc',
-        'common/extensions/extension_action2.h',
+        'common/extensions/extension_action.cc',
+        'common/extensions/extension_action.h',
         'common/extensions/extension_message_bundle.cc',
         'common/extensions/extension_message_bundle.h',
         'common/extensions/extension_resource.cc',
         'common/extensions/extension_resource.h',
         'common/extensions/extension_unpacker.cc',
         'common/extensions/extension_unpacker.h',
         'common/extensions/update_manifest.cc',
         'common/extensions/update_manifest.h',
         'common/extensions/url_pattern.cc',
         'common/extensions/url_pattern.h',
@@ skipping 4066 matching lines @@
         'browser/views/bookmark_editor_view_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/common_param_traits_unittest.cc',
         'common/extensions/extension_resource_unittest.cc',
         'common/extensions/extension_unittest.cc',
-        'common/extensions/extension_action2_unittest.cc',
+        'common/extensions/extension_action_unittest.cc',
         'common/extensions/extension_message_bundle_unittest.cc',
         'common/extensions/update_manifest_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_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',
         'common/pref_member_unittest.cc',
@@ skipping 2325 matching lines @@
       ],  # targets when browser_sync==1
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: