ExtensionSystem cleanup part 2

apps/shell/browser/shell_browser_main_parts.cc

Index: apps/shell/browser/shell_browser_main_parts.cc
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index 9afadd09a0bdc0418ff079e5e8c2982faf4ec28f..5e5112fa57bafe47b009e5c68fd6070d31ba0ece 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -40,6 +41,7 @@ namespace {
 // ChromeBrowserMainExtraPartsProfiles for details.
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::RendererStartupHelperFactory::GetInstance();
+  extensions::ShellExtensionSystemFactory::GetInstance();
 }
 
 // A ViewsDelegate to attach new unparented windows to app_shell's root window.
@@ -107,6 +109,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 
   // Create our custom ExtensionSystem first because other
   // BrowserContextKeyedServices depend on it.
+  // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   CreateExtensionSystem();
 
   EnsureBrowserContextKeyedServiceFactoriesBuilt();