Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/test_extension_system.h

Index: chrome/browser/extensions/test_extension_system.h
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index 3605626e6a958939b6ce7b148c7709ba279c2048..2be0fc808d0fc8c514b5a0d70401d88981c7379f 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -39,13 +39,6 @@ class TestExtensionSystem : public ExtensionSystem {
   // KeyedService implementation.
   void Shutdown() override;
 
-  // Creates an ExtensionPrefs with the testing profile and returns it.
-  // Useful for tests that need to modify prefs before creating the
-  // ExtensionService.
-  scoped_ptr<ExtensionPrefs> CreateExtensionPrefs(
-      const base::CommandLine* command_line,
-      const base::FilePath& install_directory);
-
   // Creates an ExtensionService initialized with the testing profile and
   // returns it, and creates ExtensionPrefs if it hasn't been created yet.
   ExtensionService* CreateExtensionService(
@@ -66,6 +59,7 @@ class TestExtensionSystem : public ExtensionSystem {
   TestingValueStore* value_store() { return value_store_; }
   InfoMap* info_map() override;
   QuotaService* quota_service() override;
+  AppSorting* app_sorting() override;
   const OneShotEvent& ready() const override;
   ContentVerifier* content_verifier() override;
   scoped_ptr<ExtensionSet> GetDependentExtensions(
@@ -78,6 +72,11 @@ class TestExtensionSystem : public ExtensionSystem {
   // Factory method for tests to use with SetTestingProfile.
   static scoped_ptr<KeyedService> Build(content::BrowserContext* profile);
 
+  // Used by ExtensionPrefsTest to re-create the AppSorting after it has
+  // re-created the ExtensionPrefs instance (this can never happen in non-test
+  // code).
+  void RecreateAppSorting();
+
  protected:
   Profile* profile_;
 
@@ -90,6 +89,7 @@ class TestExtensionSystem : public ExtensionSystem {
   scoped_ptr<ExtensionService> extension_service_;
   scoped_refptr<InfoMap> info_map_;
   scoped_ptr<QuotaService> quota_service_;
+  scoped_ptr<AppSorting> app_sorting_;
   OneShotEvent ready_;
 };