Revert "Tempolarily exclude extensions API that are causing crash on Athena"

chrome/chrome_browser_extensions.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': {
     'chrome_browser_extensions_chromeos_sources': [
       'browser/extensions/api/diagnostics/diagnostics_api.cc',
       'browser/extensions/api/diagnostics/diagnostics_api.h',
       'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc',
@@ skipping 21 matching lines @@
       'browser/extensions/updater/extension_cache_impl.h',
       'browser/extensions/updater/local_extension_cache.cc',
       'browser/extensions/updater/local_extension_cache.h',
     ],
     'chrome_browser_extensions_non_chromeos_sources': [
       'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc',
       'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
       'browser/extensions/api/image_writer_private/operation_nonchromeos.cc',
       'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc',
     ],
-    'chrome_browser_extensions_non_athena_sources': [
-      'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
-      'browser/extensions/api/desktop_capture/desktop_capture_api.h',
-      'browser/extensions/api/sessions/session_id.cc',
-      'browser/extensions/api/sessions/session_id.h',
-      'browser/extensions/api/sessions/sessions_api.cc',
-      'browser/extensions/api/sessions/sessions_api.h',
-      'browser/extensions/api/tab_capture/tab_capture_api.cc',
-      'browser/extensions/api/tab_capture/tab_capture_api.h',
-      'browser/extensions/api/tab_capture/tab_capture_registry.cc',
-      'browser/extensions/api/tab_capture/tab_capture_registry.h',
-      'browser/extensions/api/tabs/tabs_api.cc',
-      'browser/extensions/api/tabs/tabs_api.h',
-      'browser/extensions/api/tabs/tabs_event_router.cc',
-      'browser/extensions/api/tabs/tabs_event_router.h',
-      'browser/extensions/api/tabs/tabs_windows_api.cc',
-      'browser/extensions/api/tabs/tabs_windows_api.h',
-      'browser/extensions/api/tabs/windows_event_router.cc',
-      'browser/extensions/api/tabs/windows_event_router.h',
-      'browser/extensions/api/tabs/windows_util.cc',
-      'browser/extensions/api/tabs/windows_util.h',
-    ],
     'chrome_browser_extensions_enabled_sources': [
       'browser/apps/app_launch_for_metro_restart_win.cc',
       'browser/apps/app_launch_for_metro_restart_win.h',
       'browser/apps/app_url_redirector.cc',
       'browser/apps/app_url_redirector.h',
       'browser/apps/app_window_registry_util.cc',
       'browser/apps/app_window_registry_util.h',
       'browser/apps/ephemeral_app_launcher.cc',
       'browser/apps/ephemeral_app_launcher.h',
       'browser/apps/ephemeral_app_service.cc',
@@ skipping 123 matching lines @@
       'browser/extensions/api/debugger/debugger_api_constants.cc',
       'browser/extensions/api/debugger/debugger_api_constants.h',
       'browser/extensions/api/declarative_content/content_action.cc',
       'browser/extensions/api/declarative_content/content_action.h',
       'browser/extensions/api/declarative_content/content_condition.cc',
       'browser/extensions/api/declarative_content/content_condition.h',
       'browser/extensions/api/declarative_content/content_constants.cc',
       'browser/extensions/api/declarative_content/content_constants.h',
       'browser/extensions/api/declarative_content/chrome_content_rules_registry.cc',
       'browser/extensions/api/declarative_content/chrome_content_rules_registry.h',
+      'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
+      'browser/extensions/api/desktop_capture/desktop_capture_api.h',
       'browser/extensions/api/developer_private/developer_private_api.cc',
       'browser/extensions/api/developer_private/developer_private_api.h',
       'browser/extensions/api/developer_private/entry_picker.cc',
       'browser/extensions/api/developer_private/entry_picker.h',
       'browser/extensions/api/dial/dial_api.cc',
       'browser/extensions/api/dial/dial_api.h',
       'browser/extensions/api/dial/dial_api_factory.cc',
       'browser/extensions/api/dial/dial_api_factory.h',
       'browser/extensions/api/dial/dial_device_data.cc',
       'browser/extensions/api/dial/dial_device_data.h',
@@ skipping 204 matching lines @@
       'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc',
       'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h',
       'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h',
       'browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h',
       'browser/extensions/api/reading_list_private/reading_list_private_api.cc',
       'browser/extensions/api/reading_list_private/reading_list_private_api.h',
       'browser/extensions/api/runtime/chrome_runtime_api_delegate.cc',
       'browser/extensions/api/runtime/chrome_runtime_api_delegate.h',
       'browser/extensions/api/screenlock_private/screenlock_private_api.cc',
       'browser/extensions/api/screenlock_private/screenlock_private_api.h',
+      'browser/extensions/api/sessions/session_id.cc',
+      'browser/extensions/api/sessions/session_id.h',
+      'browser/extensions/api/sessions/sessions_api.cc',
+      'browser/extensions/api/sessions/sessions_api.h',
       'browser/extensions/api/settings_overrides/settings_overrides_api.cc',
       'browser/extensions/api/settings_overrides/settings_overrides_api.h',
       'browser/extensions/api/signed_in_devices/id_mapping_helper.cc',
       'browser/extensions/api/signed_in_devices/id_mapping_helper.h',
       'browser/extensions/api/signed_in_devices/signed_in_devices_api.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_api.h',
       'browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h',
       'browser/extensions/api/spellcheck/spellcheck_api.cc',
       'browser/extensions/api/spellcheck/spellcheck_api.h',
@@ skipping 21 matching lines @@
       'browser/extensions/api/synced_notifications_private/synced_notifications_private_api.h',
       'browser/extensions/api/synced_notifications_private/synced_notifications_shim.cc',
       'browser/extensions/api/synced_notifications_private/synced_notifications_shim.h',
       'browser/extensions/api/system_indicator/system_indicator_api.h',
       'browser/extensions/api/system_indicator/system_indicator_manager.cc',
       'browser/extensions/api/system_indicator/system_indicator_manager.h',
       'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
       'browser/extensions/api/system_indicator/system_indicator_manager_factory.h',
       'browser/extensions/api/system_private/system_private_api.cc',
       'browser/extensions/api/system_private/system_private_api.h',
+      'browser/extensions/api/tab_capture/tab_capture_api.cc',
+      'browser/extensions/api/tab_capture/tab_capture_api.h',
+      'browser/extensions/api/tab_capture/tab_capture_registry.cc',
+      'browser/extensions/api/tab_capture/tab_capture_registry.h',
+      'browser/extensions/api/tabs/tabs_api.cc',
+      'browser/extensions/api/tabs/tabs_api.h',
       'browser/extensions/api/tabs/tabs_constants.cc',
       'browser/extensions/api/tabs/tabs_constants.h',
+      'browser/extensions/api/tabs/tabs_event_router.cc',
+      'browser/extensions/api/tabs/tabs_event_router.h',
+      'browser/extensions/api/tabs/tabs_windows_api.cc',
+      'browser/extensions/api/tabs/tabs_windows_api.h',
+      'browser/extensions/api/tabs/windows_event_router.cc',
+      'browser/extensions/api/tabs/windows_event_router.h',
+      'browser/extensions/api/tabs/windows_util.cc',
+      'browser/extensions/api/tabs/windows_util.h',
       'browser/extensions/api/top_sites/top_sites_api.cc',
       'browser/extensions/api/top_sites/top_sites_api.h',
       'browser/extensions/api/web_navigation/frame_navigation_state.cc',
       'browser/extensions/api/web_navigation/frame_navigation_state.h',
       'browser/extensions/api/web_navigation/web_navigation_api.cc',
       'browser/extensions/api/web_navigation/web_navigation_api.h',
       'browser/extensions/api/web_navigation/web_navigation_api_constants.cc',
       'browser/extensions/api/web_navigation/web_navigation_api_constants.h',
       'browser/extensions/api/web_navigation/web_navigation_api_helpers.cc',
       'browser/extensions/api/web_navigation/web_navigation_api_helpers.h',
@@ skipping 487 matching lines @@
             'browser/extensions/api/tabs/ash_panel_contents.cc',
             'browser/extensions/api/tabs/ash_panel_contents.h',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
           ],
         }],
-        ['use_athena==1', {
-          'defines': ['USE_ATHENA=1'],
-        }, {  # use_athena==0
-          'sources': [
-            '<@(chrome_browser_extensions_non_athena_sources)',
-          ],
-        }],
         ['OS=="linux"', {
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
             # x11 build
@@ skipping 99 matching lines @@
           ],
         }, {  # use_brlapi==0
           'sources': [
             'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
           ],
         }],
       ],
     },
   ],
 }