ExtensionDelegate to abstract extension implementation

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 de4dbc748c62a9d22815d00482ca87375589f87e..035f93de84539e0b1a28986fb2577a8cd7256260 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -8,6 +8,7 @@
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.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"
@@ -126,6 +127,7 @@ void StartAthenaEnv(aura::Window* root_window,
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
+  athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
   StartAthenaSession(new athena::ContentActivityFactory(),
                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
@@ -142,6 +144,7 @@ void StartAthenaSessionWithContext(content::BrowserContext* context) {
 
 void StartAthenaSession(athena::ActivityFactory* activity_factory,

[Jun Mukai, 2014/08/22 16:53:55]

So far, StartAthenaSession() is used for tests only. How about to rename as
StartAthenaSessionForTest()?

Creating a delegate ForTest within seemingly-normal method doesn't look great.

[oshima, 2014/08/22 17:06:23]

You're right. I moved it to athena_test_helper.

                         athena::AppModelBuilder* app_model_builder) {
+  athena::ExtensionsDelegate::CreateExtensionsDelegateForTest();
   athena::HomeCard::Create(app_model_builder);
   athena::ActivityManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
@@ -155,6 +158,7 @@ void ShutdownAthena() {
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
+  athena::ExtensionsDelegate::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }