Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/test_extension_prefs.cc

Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 70cc667b1ea182ecab8ec7829bc1d0d414c7af26..39044661a17e3b7998e189cc8950ea7161450215 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -16,6 +16,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/chrome_app_sorting.h"
 #include "chrome/browser/prefs/pref_service_mock_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/common/chrome_constants.h"
@@ -116,12 +117,17 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
       pref_service_.get(),
       temp_dir_.path(),
       extension_pref_value_map_.get(),
-      ExtensionsBrowserClient::Get()->CreateAppSorting(nullptr).Pass(),
       extensions_disabled_,
       std::vector<ExtensionPrefsObserver*>(),
       // Guarantee that no two extensions get the same installation time
       // stamp and we can reliably assert the installation order in the tests.
       scoped_ptr<ExtensionPrefs::TimeProvider>(new IncrementalTimeProvider())));
+  ExtensionPrefs::SetInstanceForTesting(prefs_.get());
+  app_sorting_.reset(new ChromeAppSorting(nullptr));
+  ExtensionIdList extensions;
+  prefs_->GetExtensions(&extensions);
+  app_sorting_->Initialize(extensions);
+  prefs_->set_app_sorting(app_sorting_.get());
 }
 
 scoped_refptr<Extension> TestExtensionPrefs::AddExtension(