Remove USE_ATHENA ifdef from chrome/browser/chromeos

BUG=448836
TEST=None
R=oshima

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

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

1 files changed, 24 insertions, 38 deletions

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index d2fb7c7..34c186d 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -13,6 +13,8 @@
         'browser/chromeos/accessibility/accessibility_manager.h',
         'browser/chromeos/accessibility/accessibility_util.cc',
         'browser/chromeos/accessibility/accessibility_util.h',
+        'browser/chromeos/accessibility/magnification_manager.cc',
+        'browser/chromeos/accessibility/magnification_manager.h',
         'browser/chromeos/app_mode/app_session_lifetime.cc',
         'browser/chromeos/app_mode/app_session_lifetime.h',
         'browser/chromeos/app_mode/app_launch_utils.cc',
@@ -35,6 +37,8 @@
         'browser/chromeos/app_mode/kiosk_diagnosis_runner.h',
         'browser/chromeos/app_mode/kiosk_external_update_validator.cc',
         'browser/chromeos/app_mode/kiosk_external_update_validator.h',
+        'browser/chromeos/app_mode/kiosk_external_updater.cc',
+        'browser/chromeos/app_mode/kiosk_external_updater.h',
         'browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc',
         'browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h',
         'browser/chromeos/app_mode/kiosk_profile_loader.cc',
@@ -49,6 +53,8 @@
         'browser/chromeos/attestation/platform_verification_dialog.h',
         'browser/chromeos/attestation/platform_verification_flow.cc',
         'browser/chromeos/attestation/platform_verification_flow.h',
+        'browser/chromeos/background/ash_user_wallpaper_delegate.cc',
+        'browser/chromeos/background/ash_user_wallpaper_delegate.h',
         'browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc',
         'browser/chromeos/bluetooth/bluetooth_pairing_dialog.h',
         'browser/chromeos/base/locale_util.cc',
@@ -601,8 +607,14 @@
         'browser/chromeos/login/supervised/supervised_user_creation_screen.h',
         'browser/chromeos/login/supervised/supervised_user_login_flow.cc',
         'browser/chromeos/login/supervised/supervised_user_login_flow.h',
+        'browser/chromeos/login/ui/captive_portal_view.cc',
+        'browser/chromeos/login/ui/captive_portal_view.h',
+        'browser/chromeos/login/ui/captive_portal_window_proxy.cc',
+        'browser/chromeos/login/ui/captive_portal_window_proxy.h',
         'browser/chromeos/login/ui/input_events_blocker.cc',
         'browser/chromeos/login/ui/input_events_blocker.h',
+        'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.cc',
+        'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h',
         'browser/chromeos/login/ui/lock_window.cc',
         'browser/chromeos/login/ui/lock_window.h',
         'browser/chromeos/login/ui/lock_window_aura.cc',
@@ -618,6 +630,8 @@
         'browser/chromeos/login/ui/models/user_board_model.h',
         'browser/chromeos/login/ui/oobe_display.h',
         'browser/chromeos/login/ui/proxy_settings_dialog.cc',
+        'browser/chromeos/login/ui/simple_web_view_dialog.cc',
+        'browser/chromeos/login/ui/simple_web_view_dialog.h',
         'browser/chromeos/login/ui/user_adding_screen.cc',
         'browser/chromeos/login/ui/user_adding_screen.h',
         'browser/chromeos/login/ui/user_adding_screen_input_methods_controller.cc',
@@ -650,6 +664,8 @@
         'browser/chromeos/login/users/supervised_user_manager.h',
         'browser/chromeos/login/users/supervised_user_manager_impl.cc',
         'browser/chromeos/login/users/supervised_user_manager_impl.h',
+        'browser/chromeos/login/users/wallpaper/wallpaper_manager.cc',
+        'browser/chromeos/login/users/wallpaper/wallpaper_manager.h',
         'browser/chromeos/login/version_info_updater.cc',
         'browser/chromeos/login/version_info_updater.h',
         'browser/chromeos/login/views/user_board_view.h',
@@ -947,6 +963,8 @@
         'browser/chromeos/ui/idle_app_name_notification_view.h',
         'browser/chromeos/ui/inline_login_dialog.cc',
         'browser/chromeos/ui/inline_login_dialog.h',
+        'browser/chromeos/ui/kiosk_external_update_notification.cc',
+        'browser/chromeos/ui/kiosk_external_update_notification.h',
         'browser/chromeos/ui/mobile_config_ui.cc',
         'browser/chromeos/ui/mobile_config_ui.h',
         'browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc',
@@ -966,26 +984,6 @@
         'browser/supervised_user/chromeos/supervised_user_password_service_factory.cc',
         'browser/supervised_user/chromeos/supervised_user_password_service_factory.h',
     ],
-    'browser_chromeos_non_athena_sources': [
-        'browser/chromeos/accessibility/magnification_manager.cc',
-        'browser/chromeos/accessibility/magnification_manager.h',
-        'browser/chromeos/app_mode/kiosk_external_updater.cc',
-        'browser/chromeos/app_mode/kiosk_external_updater.h',
-        'browser/chromeos/background/ash_user_wallpaper_delegate.cc',
-        'browser/chromeos/background/ash_user_wallpaper_delegate.h',
-       'browser/chromeos/login/ui/captive_portal_view.cc',
-        'browser/chromeos/login/ui/captive_portal_view.h',
-        'browser/chromeos/login/ui/captive_portal_window_proxy.cc',
-        'browser/chromeos/login/ui/captive_portal_window_proxy.h',
-        'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.cc',
-        'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h',
-        'browser/chromeos/login/ui/simple_web_view_dialog.cc',
-        'browser/chromeos/login/ui/simple_web_view_dialog.h',
-        'browser/chromeos/login/users/wallpaper/wallpaper_manager.cc',
-        'browser/chromeos/login/users/wallpaper/wallpaper_manager.h',
-        'browser/chromeos/ui/kiosk_external_update_notification.cc',
-        'browser/chromeos/ui/kiosk_external_update_notification.h',
-    ],
     # These files lists are shared with the GN build.
     'browser_chromeos_extension_sources': [
             # Only extension API implementations should go here.
@@ -1028,18 +1026,16 @@
             'browser/chromeos/extensions/input_method_api.h',
             'browser/chromeos/extensions/media_player_api.cc',
             'browser/chromeos/extensions/media_player_api.h',
+            'browser/chromeos/extensions/wallpaper_api.h',
+            'browser/chromeos/extensions/wallpaper_api.cc',
+            'browser/chromeos/extensions/wallpaper_function_base.h',
+            'browser/chromeos/extensions/wallpaper_function_base.cc',
             'browser/chromeos/extensions/wallpaper_manager_util.cc',
             'browser/chromeos/extensions/wallpaper_manager_util.h',
+            'browser/chromeos/extensions/wallpaper_private_api.cc',
+            'browser/chromeos/extensions/wallpaper_private_api.h',
 
     ],
-    'browser_chromeos_extension_non_athena_sources': [
-        'browser/chromeos/extensions/wallpaper_api.h',
-        'browser/chromeos/extensions/wallpaper_api.cc',
-        'browser/chromeos/extensions/wallpaper_function_base.h',
-        'browser/chromeos/extensions/wallpaper_function_base.cc',
-        'browser/chromeos/extensions/wallpaper_private_api.cc',
-        'browser/chromeos/extensions/wallpaper_private_api.h',
-    ],
   },
   'targets': [
     {
@@ -1169,21 +1165,11 @@
       ],
       'sources': [ '<@(browser_chromeos_sources)' ],
       'conditions': [
-        ['use_athena==1', {
-          'defines': ['USE_ATHENA=1'],
-        }, { # use_athena==0
-          'sources': [ '<@(browser_chromeos_non_athena_sources)' ],
-        }],
         ['enable_extensions==1', {
           'dependencies': [
             '../ui/file_manager/file_manager.gyp:file_manager',
           ],
           'sources': [ '<@(browser_chromeos_extension_sources)' ],
-          'conditions': [
-            ['use_athena==0', {
-              'sources': [ '<@(browser_chromeos_extension_non_athena_sources)' ],
-            }],
-          ],
         }],
         ['use_x11==0', {
           'sources!': [