ExtensionDelegate to abstract extension implementation

athena/main/athena_launcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/main/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #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"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/public/system_ui.h"
@@ skipping 98 matching lines @@
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(delegate, root_window);
   athena::WindowManager::Create();
   SetupBackgroundImage();
 
   athena::ScreenManager::Get()->GetContext()->SetProperty(
       kAthenaEnvStateKey, env_state);
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
+  athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
   StartAthenaSession(new athena::ContentActivityFactory(),
                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
   athena::HomeCard::Get()->RegisterSearchProvider(
       new athena::UrlSearchProvider(context));
   AthenaEnvState* env_state =
       athena::ScreenManager::Get()->GetContext()->GetProperty(
           kAthenaEnvStateKey);
 
   env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
   CreateTestPages(context);
   CreateDebugWindow();
 }
 
 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);
 }
 
 void ShutdownAthena() {
   athena::ActivityFactory::Shutdown();
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
+  athena::ExtensionsDelegate::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena