Move app_shell specific impl from athena_lib to athena_shell_lib

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 2f5c09b9e861b1f632c8ae0d2999f540f32fafde..521ec9fc4f610a438f142c2eb589c4be270b5be0 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -7,12 +7,11 @@
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
-#include "athena/content/public/content_activity_factory.h"
+#include "athena/content/public/content_activity_factory_creator.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/home/public/home_card.h"
-#include "athena/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
@@ -131,7 +130,7 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
-  StartAthenaSession(new athena::ContentActivityFactory(),
+  StartAthenaSession(athena::CreateContentActivityFactory(),

[Jun Mukai, 2014/08/26 21:33:59]

Thinking about this: I would say ContentAppModelBuilder and
ContentActivityFactory are essentially browser-context-keyed-services, and they
should be created through BCKS factory framework (I don't like factory-factory
patterns though... :(

That sounds a big change, I'm not saying you have to do so. But would you mind
recording a TODO for this refactoring?  (or file a bug?) and assign to me.

[oshima, 2014/08/26 21:56:55]

Good point. We don't need it now, but will be necessary to support incognito
windows and multi-profile. I'll file a bug and work on it
separately.

                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
   athena::HomeCard::Get()->RegisterSearchProvider(