Move app_shell specific impl from athena_lib to athena_shell_lib

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 99e8079067235a63b8e31e7b00a2bb155b2ab3e8..fb0ccc11c2d7043e353961c40ca212ea76243475 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -111,7 +111,6 @@
         '../components/components.gyp:web_modal',
         '../extensions/extensions.gyp:extensions_browser',
         '../extensions/extensions.gyp:extensions_common',
-        '../extensions/shell/app_shell.gyp:app_shell_lib',
         '../content/content.gyp:content_browser',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/keyboard/keyboard.gyp:keyboard',
@@ -133,7 +132,8 @@
         'content/delegate/app_content_control_delegate_impl.cc',
         'content/public/app_content_control_delegate.h',
         'content/public/app_registry.h',
-        'content/public/content_activity_factory.h',
+        'content/content_activity_factory.h',
+        'content/public/content_activity_factory_creator.h',
         'content/public/content_app_model_builder.h',
         'content/public/web_contents_view_delegate_creator.h',
         'content/render_view_context_menu_impl.cc',
@@ -154,6 +154,9 @@
         '../extensions/shell/app_shell.gyp:app_shell_lib',
       ],
       'sources': [
+        'content/shell/content_activity_factory.cc',
+        'content/shell/shell_app_activity.cc',
+        'content/shell/shell_app_activity.h',
         'extensions/shell/extensions_delegate_impl.cc',
       ],
     },
@@ -201,6 +204,7 @@
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
+        'athena_app_shell_lib',
         'athena_lib',
         'athena_test_support',
         'main/athena_main.gyp:athena_main_lib',