Move extensions BCKS factory creation

apps/shell/browser/shell_browser_main_parts.cc

 // Copyright 2013 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 "apps/shell/browser/shell_browser_main_parts.h"
 
+#include "apps/browser_context_keyed_service_factories.h"
 #include "apps/shell/browser/shell_apps_client.h"
 #include "apps/shell/browser/shell_browser_context.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "apps/shell/browser/shell_extension_system_factory.h"
 #include "apps/shell/browser/shell_extensions_browser_client.h"
 #include "apps/shell/browser/web_view_window.h"
 #include "apps/shell/common/shell_extensions_client.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/common/result_codes.h"
 #include "content/shell/browser/shell_devtools_delegate.h"
 #include "content/shell/browser/shell_net_log.h"
+#include "extensions/browser/context_keyed_service_factories.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/renderer_startup_helper.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/test/wm_test_helper.h"
 
 using content::BrowserContext;
 using extensions::Extension;
 using extensions::ExtensionSystem;
 using extensions::ShellExtensionSystem;
 
-namespace apps {
 namespace {
 
 // Register additional KeyedService factories here. See
 // ChromeBrowserMainExtraPartsProfiles for details.
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  extensions::RendererStartupHelperFactory::GetInstance();
+  apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   extensions::ShellExtensionSystemFactory::GetInstance();
 }
 
 // A ViewsDelegate to attach new unparented windows to app_shell's root window.
 class ShellViewsDelegate : public views::TestViewsDelegate {
  public:
   explicit ShellViewsDelegate(aura::Window* root_window)
       : root_window_(root_window) {}
   virtual ~ShellViewsDelegate() {}
 
   // views::ViewsDelegate implementation.
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
     if (!params->parent)
       params->parent = root_window_;
   }
 
  private:
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
 };
 
 }  // namespace
 
+namespace apps {
+
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : extension_system_(NULL) {
 }
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
   // TODO(jamescook): Initialize touch here?
@@ skipping 30 matching lines @@
   extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
 
   apps_client_.reset(new ShellAppsClient(browser_context_.get()));
   AppsClient::Set(apps_client_.get());
 
   // Create our custom ExtensionSystem first because other
   // KeyedServices depend on it.
   // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   CreateExtensionSystem();
 
-  EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
   devtools_delegate_.reset(
       new content::ShellDevToolsDelegate(browser_context_.get()));
 
   CreateRootWindow();
   CreateViewsDelegate();
 
   const std::string kAppSwitch = "app";
@@ skipping 73 matching lines @@
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace apps