Clean up Extension Action Handlers Pt 1/2

chrome/chrome_common.gypi

 # Copyright (c) 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': {
     # File lists shared with GN build.
     'chrome_common_sources': [
       'common/all_messages.h',
       'common/attrition_experiments.h',
@@ skipping 134 matching lines @@
       'common/web_application_info.cc',
       'common/web_application_info.h',
       'common/worker_thread_ticker.cc',
       'common/worker_thread_ticker.h',
     ],
     'chrome_common_extensions_sources': [
       'common/extensions/api/commands/commands_handler.cc',
       'common/extensions/api/commands/commands_handler.h',
       'common/extensions/api/extension_action/action_info.cc',
       'common/extensions/api/extension_action/action_info.h',
-      'common/extensions/api/extension_action/browser_action_handler.cc',
-      'common/extensions/api/extension_action/browser_action_handler.h',
-      'common/extensions/api/extension_action/page_action_handler.cc',
-      'common/extensions/api/extension_action/page_action_handler.h',
       'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
       'common/extensions/api/file_browser_handlers/file_browser_handler.h',
       'common/extensions/api/i18n/default_locale_handler.cc',
       'common/extensions/api/i18n/default_locale_handler.h',
       'common/extensions/api/identity/oauth2_manifest_handler.cc',
       'common/extensions/api/identity/oauth2_manifest_handler.h',
       'common/extensions/api/input_ime/input_components_handler.cc',
       'common/extensions/api/input_ime/input_components_handler.h',
       'common/extensions/api/notifications/notification_style.cc',
       'common/extensions/api/notifications/notification_style.h',
@@ skipping 20 matching lines @@
       'common/extensions/extension_file_util.cc',
       'common/extensions/extension_file_util.h',
       'common/extensions/manifest_handlers/app_isolation_info.cc',
       'common/extensions/manifest_handlers/app_isolation_info.h',
       'common/extensions/manifest_handlers/app_launch_info.cc',
       'common/extensions/manifest_handlers/app_launch_info.h',
       'common/extensions/manifest_handlers/automation.cc',
       'common/extensions/manifest_handlers/automation.h',
       'common/extensions/manifest_handlers/content_scripts_handler.cc',
       'common/extensions/manifest_handlers/content_scripts_handler.h',
+      'common/extensions/manifest_handlers/extension_action_handler.cc',
+      'common/extensions/manifest_handlers/extension_action_handler.h',
       'common/extensions/manifest_handlers/mime_types_handler.cc',
       'common/extensions/manifest_handlers/mime_types_handler.h',
       'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
       'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
       'common/extensions/manifest_handlers/settings_overrides_handler.cc',
       'common/extensions/manifest_handlers/settings_overrides_handler.h',
       'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc',
       'common/extensions/manifest_handlers/synthesize_browser_action_handler.h',
       'common/extensions/manifest_handlers/theme_handler.cc',
       'common/extensions/manifest_handlers/theme_handler.h',
@@ skipping 230 matching lines @@
         ['enable_mdns==1', {
           'sources' : [
             'common/local_discovery/service_discovery_client_impl.cc',
             'common/local_discovery/service_discovery_client_impl.h',
           ]
         }],
         ['OS=="android"', {
           'sources!': [
             'common/badge_util.cc',
             'common/chrome_version_info_posix.cc',
-            'common/extensions/api/extension_action/browser_action_handler.cc',
-            'common/extensions/api/extension_action/page_action_handler.cc',
             'common/extensions/api/spellcheck/spellcheck_handler.cc',
+            'common/extensions/manifest_handlers/extension_action_handler.cc',
             'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
             'common/icon_with_badge_image_source.cc',
             'common/media_galleries/metadata_types.h',
             'common/net/url_util.cc',
             'common/spellcheck_common.cc',
           ],
         }, {
           # Non-Android.
           'sources': [ '<@(chrome_common_importer_sources)' ]
         }],
@@ skipping 225 matching lines @@
         'common/safe_browsing/csd.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
         'proto_out_dir': 'chrome/common/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }