Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/test_extension_prefs.h

Index: chrome/browser/extensions/test_extension_prefs.h
diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h
index 94a383ca9757fb28e6e34508640190ab952f297b..64772806de01ed106e9af9fc9c439585c3fde63f 100644
--- a/chrome/browser/extensions/test_extension_prefs.h
+++ b/chrome/browser/extensions/test_extension_prefs.h
@@ -10,6 +10,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/test/base/testing_profile.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionPrefValueMap;
@@ -26,6 +27,7 @@ class PrefRegistrySyncable;
 }
 
 namespace extensions {
+class ChromeAppSorting;
 class Extension;
 class ExtensionPrefs;
 
@@ -37,10 +39,8 @@ class TestExtensionPrefs {
       const scoped_refptr<base::SequencedTaskRunner>& task_runner);
   virtual ~TestExtensionPrefs();
 
-  ExtensionPrefs* prefs() { return prefs_.get(); }
-  const ExtensionPrefs& const_prefs() const {
-      return *prefs_.get();
-  }
+  ExtensionPrefs* prefs();
+
   PrefService* pref_service();
   const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry();
   void ResetPrefRegistry();
@@ -87,17 +87,19 @@ class TestExtensionPrefs {
   // active after calling RecreateExtensionPrefs(). Defaults to false.
   void set_extensions_disabled(bool extensions_disabled);
 
+  ChromeAppSorting* app_sorting();
+
  protected:
   base::ScopedTempDir temp_dir_;
   base::FilePath preferences_file_;
   base::FilePath extensions_dir_;
   scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
   scoped_ptr<PrefServiceSyncable> pref_service_;
-  scoped_ptr<ExtensionPrefs> prefs_;
   scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
   const scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
  private:
+  TestingProfile profile_;
   bool extensions_disabled_;
   DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);
 };