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

This wasn't enough and was causing compilation error in clean build.

This reverts commit 2a244c81.

BUG=414340
TBR=yoz@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/610093002

Cr-Commit-Position: refs/heads/master@{#297099}

chrome/browser/extensions/BUILD.gn

@@ -104,11 +104,6 @@ static_library("extensions") {
       "api/tabs/ash_panel_contents.h",
     ]
   }
-  if (!use_athena) {
-    sources += rebase_path(
-        gypi_values.chrome_browser_extensions_non_athena_sources,
-        ".", "//chrome")
-  }
 
   if (is_linux) {
     configs += [ "//build/config/linux:fontconfig" ]

chrome/browser/extensions/browser_context_keyed_service_factories.cc

@@ -142,19 +142,15 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::ProcessesAPI::GetFactoryInstance();
   extensions::PushMessagingAPI::GetFactoryInstance();
   extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();
-#if !defined(USE_ATHENA)
   extensions::SessionsAPI::GetFactoryInstance();
-#endif
   extensions::SettingsOverridesAPI::GetFactoryInstance();
   extensions::SignedInDevicesManager::GetFactoryInstance();
 #if defined(ENABLE_SPELLCHECK)
   extensions::SpellcheckAPI::GetFactoryInstance();
 #endif
   extensions::StreamsPrivateAPI::GetFactoryInstance();
-#if !defined(USE_ATHENA)
   extensions::TabCaptureRegistry::GetFactoryInstance();
   extensions::TabsWindowsAPI::GetFactoryInstance();
-#endif
   extensions::TtsAPI::GetFactoryInstance();
   extensions::WebNavigationAPI::GetFactoryInstance();
   extensions::WebRequestAPI::GetFactoryInstance();

chrome/browser/media/media_capture_devices_dispatcher.cc

@@ -654,7 +654,7 @@ void MediaCaptureDevicesDispatcher::ProcessTabCaptureAccessRequest(
   content::MediaStreamDevices devices;
   scoped_ptr<content::MediaStreamUI> ui;
 
-#if defined(ENABLE_EXTENSIONS) && !defined(USE_ATHENA)
+#if defined(ENABLE_EXTENSIONS)
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   extensions::TabCaptureRegistry* tab_capture_registry =

chrome/browser/prefs/browser_prefs.cc

@@ -452,9 +452,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   DriveAppMapping::RegisterProfilePrefs(registry);
   extensions::CommandService::RegisterProfilePrefs(registry);
   extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
-#if !defined(USE_ATHENA)
   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
-#endif
   first_run::RegisterProfilePrefs(registry);
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
   NewTabUI::RegisterProfilePrefs(registry);

chrome/chrome_browser_extensions.gypi

@@ -39,28 +39,6 @@
       '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',
@@ -204,6 +182,8 @@
       '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',
@@ -428,6 +408,10 @@
       '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',
@@ -469,8 +453,22 @@
       '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',
@@ -978,13 +976,6 @@
             '../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', {

chrome/common/extensions/api/schemas.gni

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//build/config/ui.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
@@ -19,9 +18,6 @@ if (is_chromeos) {
 if (enable_webrtc) {
   sources += gypi_values.webrtc_schema_files
 }
-if (!use_athena) {
-  sources += gypi_values.non_athena_schema_files
-}
 
 
 uncompiled_sources = gypi_values.main_non_compiled_schema_files

chrome/common/extensions/api/schemas.gypi

@@ -29,6 +29,7 @@
       'copresence.idl',
       'copresence_private.idl',
       'debugger.json',
+      'desktop_capture.json',
       'developer_private.idl',
       'dial.idl',
       'downloads.idl',
@@ -72,12 +73,15 @@
       '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',
@@ -88,6 +92,7 @@
       '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',
@@ -103,15 +108,7 @@
       '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',
@@ -165,11 +162,6 @@
           '<@(chromeos_schema_files)',
         ],
       }],
-      ['use_athena==0', {
-        'schema_files': [
-          '<@(non_athena_schema_files)',
-        ],
-      }],
       ['enable_extensions==1 and enable_webrtc==1', {
         'schema_files': [
           '<@(webrtc_schema_files)',