ExtensionSystem cleanup part 2

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/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/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 14 matching lines @@
 using extensions::ExtensionSystem;
 using extensions::ShellExtensionSystem;
 
 namespace apps {
 namespace {
 
 // Register additional BrowserContextKeyedService factories here. See
 // ChromeBrowserMainExtraPartsProfiles for details.
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::RendererStartupHelperFactory::GetInstance();
+  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.
@@ skipping 47 matching lines @@
 
   extensions_client_.reset(new ShellExtensionsClient());
   extensions::ExtensionsClient::Set(extensions_client_.get());
 
   extensions_browser_client_.reset(
       new extensions::ShellExtensionsBrowserClient(browser_context_.get()));
   extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
 
   // Create our custom ExtensionSystem first because other
   // BrowserContextKeyedServices depend on it.
+  // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   CreateExtensionSystem();
 
   EnsureBrowserContextKeyedServiceFactoriesBuilt();
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
   CreateRootWindow();
   CreateViewsDelegate();
 
   const std::string kAppSwitch = "app";
@@ skipping 68 matching lines @@
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace apps