Fix app_shell shutdown crash due to BrowserContextKeyedServices

chrome/browser/extensions/extension_system_factory.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_system_factory.h"
 
 #include "chrome/browser/extensions/extension_prefs_factory.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 34 matching lines @@
 
 BrowserContextKeyedService*
 ExtensionSystemSharedFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new ExtensionSystemImpl::Shared(static_cast<Profile*>(profile));
 }
 
 content::BrowserContext* ExtensionSystemSharedFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Redirected in incognito.
-  return extensions::ExtensionsBrowserClient::Get()->
-      GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 }
 
 // ExtensionSystemFactory
 
 // static
 ExtensionSystem* ExtensionSystemFactory::GetForProfile(Profile* profile) {
   return static_cast<ExtensionSystem*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 ExtensionSystemFactory* ExtensionSystemFactory::GetInstance() {
   return Singleton<ExtensionSystemFactory>::get();
 }
 
 ExtensionSystemFactory::ExtensionSystemFactory()
     : BrowserContextKeyedServiceFactory(
         "ExtensionSystem",
-        BrowserContextDependencyManager::GetInstance()),
-      custom_instance_(NULL) {
-  DependsOn(ExtensionSystemSharedFactory::GetInstance());
+        BrowserContextDependencyManager::GetInstance()) {
+  DCHECK(ExtensionsBrowserClient::Get())
+      << "ExtensionSystemFactory must be initialized after BrowserProcess";
+  std::vector<BrowserContextKeyedServiceFactory*> dependencies =
+      ExtensionsBrowserClient::Get()->GetExtensionSystemDependencies();
+  for (size_t i = 0; i < dependencies.size(); ++i)
+    DependsOn(dependencies[i]);
 }
 
 ExtensionSystemFactory::~ExtensionSystemFactory() {
 }
 
-void ExtensionSystemFactory::SetCustomInstance(
-    ExtensionSystem* extension_system) {
-  custom_instance_ = extension_system;
-}
-
 BrowserContextKeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
-    content::BrowserContext* profile) const {
-  if (custom_instance_)
-    return custom_instance_;
-  return new ExtensionSystemImpl(static_cast<Profile*>(profile));
+    content::BrowserContext* context) const {
+  return ExtensionsBrowserClient::Get()->CreateExtensionSystem(context);
 }
 
 content::BrowserContext* ExtensionSystemFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Separate instance in incognito.
   return context;
 }
 
 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 }  // namespace extensions