Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/extension_system_impl.h

Index: chrome/browser/extensions/extension_system_impl.h
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index 0a3226a1a7bb6a06f20056587884a5d0c58d94ee..d66e2d238fb8eb9faf032fbbb4986becc304088f 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -9,15 +9,12 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/one_shot_event.h"
 
-class DeclarativeUserScriptManager;
 class Profile;
 
 namespace extensions {
 
-class ContentVerifier;
 class ExtensionSystemSharedFactory;
 class NavigationObserver;
-class SharedUserScriptMaster;
 class StateStoreNotificationObserver;
 
 // The ExtensionSystem for ProfileImpl and OffTheRecordProfileImpl.
@@ -43,6 +40,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
   StateStore* rules_store() override;                              // shared
   InfoMap* info_map() override;                                    // shared
   QuotaService* quota_service() override;  // shared
+  AppSorting* app_sorting() override;  // shared
 
   void RegisterExtensionWithRequestContexts(
       const Extension* extension,
@@ -84,6 +82,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     SharedUserScriptMaster* shared_user_script_master();
     InfoMap* info_map();
     QuotaService* quota_service();
+    AppSorting* app_sorting();
     const OneShotEvent& ready() const { return ready_; }
     ContentVerifier* content_verifier();
 
@@ -107,6 +106,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     // extension_info_map_ needs to outlive process_manager_.
     scoped_refptr<InfoMap> extension_info_map_;
     scoped_ptr<QuotaService> quota_service_;
+    scoped_ptr<AppSorting> app_sorting_;
 
     // For verifying the contents of extensions read from disk.
     scoped_refptr<ContentVerifier> content_verifier_;