Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

extensions/browser/extension_prefs.h

Index: extensions/browser/extension_prefs.h
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h
index 026a4c65464dd0418ce6e05c118bc0c680c1940b..e89435fdd24db5e848669e97b302f21495ebc0de 100644
--- a/extensions/browser/extension_prefs.h
+++ b/extensions/browser/extension_prefs.h
@@ -134,7 +134,6 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
       PrefService* prefs,
       const base::FilePath& root_dir,
       ExtensionPrefValueMap* extension_pref_value_map,
-      scoped_ptr<AppSorting> app_sorting,
       bool extensions_disabled,
       const std::vector<ExtensionPrefsObserver*>& early_observers);
 
@@ -144,7 +143,6 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
       PrefService* prefs,
       const base::FilePath& root_dir,
       ExtensionPrefValueMap* extension_pref_value_map,
-      scoped_ptr<AppSorting> app_sorting,
       bool extensions_disabled,
       const std::vector<ExtensionPrefsObserver*>& early_observers,
       scoped_ptr<TimeProvider> time_provider);
@@ -154,6 +152,9 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
   // Convenience function to get the ExtensionPrefs for a BrowserContext.
   static ExtensionPrefs* Get(content::BrowserContext* context);
 
+  // Set an ExtensionPrefs instance to be returned from Get() above.
+  static void SetInstanceForTesting(ExtensionPrefs* prefs);
+
   // Returns all installed extensions from extension preferences provided by
   // |pref_service|. This is exposed for ProtectedPrefsWatcher because it needs
   // access to the extension ID list before the ExtensionService is initialized.
@@ -501,7 +502,8 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
   PrefService* pref_service() const { return prefs_; }
 
   // The underlying AppSorting.
-  AppSorting* app_sorting() const { return app_sorting_.get(); }
+  void set_app_sorting(AppSorting* app_sorting) { app_sorting_ = app_sorting; }
+  AppSorting* app_sorting() const { return app_sorting_; }
 
   // Schedules garbage collection of an extension's on-disk data on the next
   // start of this ExtensionService. Applies only to extensions with isolated
@@ -552,7 +554,6 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
   ExtensionPrefs(PrefService* prefs,
                  const base::FilePath& root_dir,
                  ExtensionPrefValueMap* extension_pref_value_map,
-                 scoped_ptr<AppSorting> app_sorting,
                  scoped_ptr<TimeProvider> time_provider,
                  bool extensions_disabled,
                  const std::vector<ExtensionPrefsObserver*>& early_observers);
@@ -682,7 +683,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
 
   // Contains all the logic for handling the order for various extension
   // properties.
-  scoped_ptr<AppSorting> app_sorting_;
+  AppSorting* app_sorting_;
 
   scoped_ptr<TimeProvider> time_provider_;