ExtensionSystem cleanup part 2

extensions/browser/extensions_browser_client.h

Index: extensions/browser/extensions_browser_client.h
diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
index 722bdde512db281db17fb9774299b66742adaed1..dc75e919c6eee8752b7ec182ef2b5e6edafb6358 100644
--- a/extensions/browser/extensions_browser_client.h
+++ b/extensions/browser/extensions_browser_client.h
@@ -10,7 +10,6 @@
 
 #include "base/memory/scoped_ptr.h"
 
-class BrowserContextKeyedServiceFactory;
 class CommandLine;
 class PrefService;
 
@@ -27,6 +26,7 @@ class AppSorting;
 class Extension;
 class ExtensionHost;
 class ExtensionSystem;
+class ExtensionSystemProvider;
 
 // Interface to allow the extensions module to make browser-process-specific
 // queries of the embedder. Should be Set() once in the browser process.
@@ -119,13 +119,9 @@ class ExtensionsBrowserClient {
   virtual ApiActivityMonitor* GetApiActivityMonitor(
       content::BrowserContext* context) = 0;
 
-  // Returns the dependencies of ExtensionSystem. May return an empty list.
-  virtual std::vector<BrowserContextKeyedServiceFactory*>
-      GetExtensionSystemDependencies() = 0;
-
-  // Creates a new ExtensionSystem for |context|.
-  virtual ExtensionSystem* CreateExtensionSystem(
-      content::BrowserContext* context) = 0;
+  // Returns the factory that provides an ExtensionSystem to be returned from
+  // ExtensionSystem::Get.
+  virtual ExtensionSystemProvider* GetExtensionSystemFactory() = 0;
 
   // Returns the single instance of |this|.
   static ExtensionsBrowserClient* Get();