Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/extension_system_impl.cc

Index: chrome/browser/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index b4ef0d9358568e5c40599f6932b797dc3fa445d1..8db5e88c45e2767c71eafaf9ba638eec224b62d2 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/chrome_app_sorting.h"
 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
@@ -201,6 +202,13 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
           base::FilePath(t.token()));
     }
   }
+
+  app_sorting_.reset(new ChromeAppSorting(profile_));
+  ExtensionIdList extensions;
+  ExtensionPrefs::Get(profile_)->GetExtensions(&extensions);
+  app_sorting_->Initialize(extensions);
+  ExtensionPrefs::Get(profile_)->set_app_sorting(app_sorting_.get());

[Marc Treib, 2015/07/29 09:53:32]

This is super ugly :(  But when the ExtensionPrefs is constructed, the
AppSorting doesn't exist yet.
Also a whole bunch of tests fail, basically everything that uses an
ExtensionService without setting up the full ExtensionSystem, because the
AppSorting is null. I think if we wanna go forward with this, then AppSorting
should become a KeyedService, so it'll just be constructed on demand. WDYT?

[not at google - send to devlin, 2015/07/29 18:22:03]

I don't think making something a KeyedService is the best way to solve that.
Could you make TestExtensionSystem return a NullAppSorting?

[Marc Treib, 2015/07/30 14:04:12]

Done. Together with an set_app_sorting call, this seems to fix all the
"unrelated" test failures.

+
   extension_service_->Init();
 
   // Make the chrome://extension-icon/ resource available.
@@ -269,6 +277,10 @@ QuotaService* ExtensionSystemImpl::Shared::quota_service() {
   return quota_service_.get();
 }
 
+AppSorting* ExtensionSystemImpl::Shared::app_sorting() {
+  return app_sorting_.get();
+}
+
 ContentVerifier* ExtensionSystemImpl::Shared::content_verifier() {
   return content_verifier_.get();
 }
@@ -337,6 +349,10 @@ QuotaService* ExtensionSystemImpl::quota_service() {
   return shared_->quota_service();
 }
 
+AppSorting* ExtensionSystemImpl::app_sorting() {
+  return shared_->app_sorting();
+}
+
 ContentVerifier* ExtensionSystemImpl::content_verifier() {
   return shared_->content_verifier();
 }