Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

extensions/browser/extension_prefs_factory.cc

Index: extensions/browser/extension_prefs_factory.cc
diff --git a/extensions/browser/extension_prefs_factory.cc b/extensions/browser/extension_prefs_factory.cc
index 5908000e5c2bb06a3b443c836b4123b75d4c470c..17c665d73719050d7e85df9142940970b11d779e 100644
--- a/extensions/browser/extension_prefs_factory.cc
+++ b/extensions/browser/extension_prefs_factory.cc
@@ -30,6 +30,7 @@ ExtensionPrefsFactory* ExtensionPrefsFactory::GetInstance() {
 void ExtensionPrefsFactory::SetInstanceForTesting(
     content::BrowserContext* context,
     scoped_ptr<ExtensionPrefs> prefs) {
+  Disassociate(context);
   Associate(context, prefs.Pass());
 }
 
@@ -48,10 +49,9 @@ KeyedService* ExtensionPrefsFactory::BuildServiceInstanceFor(
   std::vector<ExtensionPrefsObserver*> prefs_observers;
   client->GetEarlyExtensionPrefsObservers(context, &prefs_observers);
   return ExtensionPrefs::Create(
-      client->GetPrefServiceForContext(context),
+      context, client->GetPrefServiceForContext(context),
       context->GetPath().AppendASCII(extensions::kInstallDirectoryName),
       ExtensionPrefValueMapFactory::GetForBrowserContext(context),
-      client->CreateAppSorting(context).Pass(),
       client->AreExtensionsDisabled(*base::CommandLine::ForCurrentProcess(),
                                     context),
       prefs_observers);