Remove remainder of Athena related code from Chrome

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 446 matching lines @@
       '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.h',
+      'browser/extensions/api/tabs/tabs_api.cc',
       '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',
@@ skipping 79 matching lines @@
       'browser/extensions/data_deleter.cc',
       'browser/extensions/data_deleter.h',
       'browser/extensions/declarative_user_script_manager.cc',
       'browser/extensions/declarative_user_script_manager.h',
       'browser/extensions/declarative_user_script_master.cc',
       'browser/extensions/declarative_user_script_master.h',
       'browser/extensions/dev_mode_bubble_controller.cc',
       'browser/extensions/dev_mode_bubble_controller.h',
       'browser/extensions/devtools_util.cc',
       'browser/extensions/devtools_util.h',
+      'browser/extensions/display_info_provider_chromeos.cc',
+      'browser/extensions/display_info_provider_chromeos.h',
       'browser/extensions/display_info_provider_mac.cc',
       'browser/extensions/display_info_provider_mac.h',
       'browser/extensions/display_info_provider_win.cc',
       'browser/extensions/display_info_provider_win.h',
       'browser/extensions/error_console/error_console.cc',
       'browser/extensions/error_console/error_console.h',
       'browser/extensions/event_router_forwarder.cc',
       'browser/extensions/event_router_forwarder.h',
       'browser/extensions/extension_action.cc',
       'browser/extensions/extension_action.h',
@@ skipping 76 matching lines @@
       'browser/extensions/extension_sync_data.cc',
       'browser/extensions/extension_sync_data.h',
       'browser/extensions/extension_sync_service.cc',
       'browser/extensions/extension_sync_service.h',
       'browser/extensions/extension_sync_service_factory.cc',
       'browser/extensions/extension_sync_service_factory.h',
       'browser/extensions/extension_system_factory.cc',
       'browser/extensions/extension_system_factory.h',
       'browser/extensions/extension_system_impl.cc',
       'browser/extensions/extension_system_impl.h',
+      'browser/extensions/extension_tab_util.cc',
       'browser/extensions/extension_tab_util.h',
       'browser/extensions/extension_toolbar_model.cc',
       'browser/extensions/extension_toolbar_model.h',
       'browser/extensions/extension_toolbar_model_factory.cc',
       'browser/extensions/extension_toolbar_model_factory.h',
       'browser/extensions/extension_ui_util.cc',
       'browser/extensions/extension_ui_util.h',
       'browser/extensions/extension_uninstall_dialog.cc',
       'browser/extensions/extension_uninstall_dialog.h',
       'browser/extensions/extension_util.cc',
@@ skipping 200 matching lines @@
       'browser/extensions/api/braille_display_private/brlapi_connection.h',
       'browser/extensions/api/braille_display_private/brlapi_keycode_map.cc',
       'browser/extensions/api/braille_display_private/brlapi_keycode_map.h',
     ],
     'chrome_browser_extensions_policy_sources': [
       'browser/extensions/api/storage/managed_value_store_cache.cc',
       'browser/extensions/api/storage/managed_value_store_cache.h',
       'browser/extensions/api/storage/policy_value_store.cc',
       'browser/extensions/api/storage/policy_value_store.h',
     ],
-    'chrome_browser_extensions_non_athena_sources': [
-      'browser/extensions/api/tabs/tabs_api.cc',
-      'browser/extensions/display_info_provider_chromeos.cc',
-      'browser/extensions/display_info_provider_chromeos.h',
-      'browser/extensions/extension_tab_util.cc',
-    ],
-    'chrome_browser_extensions_athena_sources': [
-      'browser/extensions/api/tabs/tabs_api_athena.cc',
-      'browser/extensions/display_info_provider_athena.cc',
-      'browser/extensions/display_info_provider_athena.h',
-      'browser/extensions/extension_tab_util_athena.cc',
-    ],
   },
   # ----------------------------------------------------------------------------
   # Note on GN build: everything below here is duplicated in
   # chrome/browser/BUILD.gn. If you change anything, you will also have to
   # update that file. Some short and probably rarely-changing file lists are
   # duplicated between the builds. If a list gets longer or is changed it is
   # probably worth sharing.
   'targets': [
     {
       # GN version: //chrome/browser/extensions
@@ skipping 92 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'],
-          'sources': ['<@(chrome_browser_extensions_athena_sources)'],
-        }, {
-          '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 100 matching lines @@
           ],
         }, {  # use_brlapi==0
           'sources': [
             'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
           ],
         }],
       ],
     },
   ],
 }