Separate athena's startup process from AppShell's

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 836f947d806d811a6ee23d0e137beef39009004d..e59cbea16ac842b1f475e1f0428e8aa10ac15c24 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -48,6 +48,8 @@
         'common/fill_layout_manager.h',
         'common/switches.cc',
         'common/switches.h',
+        'env/athena_env_impl.cc',
+        'env/public/athena_env.h',
         'home/app_list_view_delegate.cc',
         'home/app_list_view_delegate.h',
         'home/athena_start_page_view.cc',
@@ -65,7 +67,6 @@
         'screen/background_controller.cc',
         'screen/background_controller.h',
         'screen/public/screen_manager.h',
-        'screen/public/screen_manager_delegate.h',
         'screen/screen_accelerator_handler.cc',
         'screen/screen_accelerator_handler.h',
         'screen/screen_manager_impl.cc',
@@ -187,8 +188,6 @@
         'test/test_app_content_control_delegate_impl.cc',
         'test/test_app_model_builder.cc',
         'test/test_app_model_builder.h',
-        'test/test_screen_manager_delegate.cc',
-        'test/test_screen_manager_delegate.h',
         'wm/test/window_manager_impl_test_api.cc',
         'wm/test/window_manager_impl_test_api.h',
       ],