Remove remainder of Athena related code from Chrome

chrome/chrome_browser_extensions.gypi

Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index e1053d3cc5a0913737b142e98e68fb9c75d8af4d..8d04918a9790a094ae1832c0664c3beef26ad094 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -464,6 +464,7 @@
       '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',
@@ -563,6 +564,8 @@
       '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',
@@ -659,6 +662,7 @@
       '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',
@@ -879,18 +883,6 @@
       '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
@@ -1003,12 +995,6 @@
             '../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', {