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

chrome/common/extensions/api/schemas.gypi

 # Copyright 2014 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.
 
 {
   'sources': [
     '<@(schema_files)',
   ],
   'variables': {
     'main_schema_files': [
@@ skipping 11 matching lines @@
       'chrome_web_view_internal.json',
       'cloud_print_private.json',
       'command_line_private.json',
       'content_settings.json',
       'context_menus_internal.json',
       'context_menus.json',
       'cookies.json',
       'copresence.idl',
       'copresence_private.idl',
       'debugger.json',
+      'desktop_capture.json',
       'developer_private.idl',
       'dial.idl',
       'downloads.idl',
       'downloads_internal.idl',
       'easy_unlock_private.idl',
       'echo_private.json',
       'enterprise_platform_keys_private.json',
       'experience_sampling_private.json',
       'feedback_private.idl',
       'file_manager_private.idl',
@@ skipping 23 matching lines @@
       'networking_private.json',
       'notification_provider.idl',
       'notifications.idl',
       'omnibox.json',
       'page_capture.json',
       'permissions.json',
       'preferences_private.json',
       'push_messaging.idl',
       'reading_list_private.json',
       'screenlock_private.idl',
+      'sessions.json',
       'signed_in_devices.idl',
       'streams_private.idl',
       'synced_notifications_private.idl',
       'sync_file_system.idl',
       'system_indicator.idl',
       'system_private.json',
+      'tab_capture.idl',
+      'tabs.json',
       'terminal_private.json',
       'types.json',
       'virtual_keyboard_private.json',
       'web_navigation.json',
       # Despite the name, this API does not rely on any
       # WebRTC-specific bits and as such does not belong in
       # the enable_webrtc==0 section below.
       'webrtc_audio_private.idl',
       'webrtc_logging_private.idl',
       'webstore_private.json',
+      'windows.json',
     ],
     'main_schema_include_rules': [
       'extensions/common/api:extensions::core_api::%(namespace)s',
     ],
     'main_non_compiled_schema_files': [
       'browsing_data.json',
       'chromeos_info_private.json',
       'extension.json',
       'idltest.idl',
       'infobars.json',
       'media_player_private.json',
       'music_manager_private.idl',
       'principals_private.idl',
       'top_sites.json',
     ],
-    # APIs that are causing crashes on athena.
-    # TODO(oshima): Fix crashes and add them back. crbug.com/414340.
-    'non_athena_schema_files': [
-      'desktop_capture.json',
-      'sessions.json',
-      'tab_capture.idl',
-      'tabs.json',
-      'windows.json',
-    ],
+
     # ChromeOS-specific schemas.
     'chromeos_schema_files': [
       'accessibility_features.json',
       'diagnostics.idl',
       'enterprise_platform_keys.idl',
       'enterprise_platform_keys_internal.idl',
       'file_browser_handler_internal.json',
       'first_run_private.json',
       'log_private.idl',
       'wallpaper.json',
@@ skipping 33 matching lines @@
         'schema_dependencies': [
         ],
         'schema_files': [
         ],
       }],
       ['chromeos==1', {
         'schema_files': [
           '<@(chromeos_schema_files)',
         ],
       }],
-      ['use_athena==0', {
-        'schema_files': [
-          '<@(non_athena_schema_files)',
-        ],
-      }],
       ['enable_extensions==1 and enable_webrtc==1', {
         'schema_files': [
           '<@(webrtc_schema_files)',
         ],
       }],
     ],
     'cc_dir': 'chrome/common/extensions/api',
     'root_namespace': 'extensions::api::%(namespace)s',
     'impl_dir_': 'chrome/browser/extensions/api',
   },
 }