ExtensionSystem cleanup part 2

chrome/browser/extensions/extension_system_factory.cc

Index: chrome/browser/extensions/extension_system_factory.cc
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index b8e851d1ec30257bc2b43c74617921573dd919be..14485894227486109c8eab24f09cf17dea4efe8e 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -73,15 +73,11 @@ ExtensionSystemFactory* ExtensionSystemFactory::GetInstance() {
 }
 
 ExtensionSystemFactory::ExtensionSystemFactory()
-    : BrowserContextKeyedServiceFactory(
-        "ExtensionSystem",
-        BrowserContextDependencyManager::GetInstance()) {
+    : ExtensionSystemProvider("ExtensionSystem",
+                              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]);
+  DependsOn(ExtensionSystemSharedFactory::GetInstance());
 }
 
 ExtensionSystemFactory::~ExtensionSystemFactory() {
@@ -89,7 +85,7 @@ ExtensionSystemFactory::~ExtensionSystemFactory() {
 
 BrowserContextKeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->CreateExtensionSystem(context);
+  return new ExtensionSystemImpl(static_cast<Profile*>(context));
 }
 
 content::BrowserContext* ExtensionSystemFactory::GetBrowserContextToUse(