Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/extension_system_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_system_impl.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #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"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/navigation_observer.h"
 #include "chrome/browser/extensions/shared_module_service.h"
@@ skipping 169 matching lines @@
         t(path_list, FILE_PATH_LITERAL(","));
     while (t.GetNext()) {
       // Load the component extension manifest synchronously.
       // Blocking the UI thread is acceptable here since
       // this flag designated for developers.
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       extension_service_->component_loader()->AddOrReplace(
           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.
   content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
 
   quota_service_.reset(new QuotaService);
 
   if (extensions_enabled) {
     // Load any extensions specified with --load-extension.
     // TODO(yoz): Seems like this should move into ExtensionService::Init.
@@ skipping 48 matching lines @@
 InfoMap* ExtensionSystemImpl::Shared::info_map() {
   if (!extension_info_map_.get())
     extension_info_map_ = new InfoMap();
   return extension_info_map_.get();
 }
 
 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();
 }
 
 //
 // ExtensionSystemImpl
 //
 
 ExtensionSystemImpl::ExtensionSystemImpl(Profile* profile)
     : profile_(profile) {
@@ skipping 48 matching lines @@
 InfoMap* ExtensionSystemImpl::info_map() { return shared_->info_map(); }
 
 const OneShotEvent& ExtensionSystemImpl::ready() const {
   return shared_->ready();
 }
 
 QuotaService* ExtensionSystemImpl::quota_service() {
   return shared_->quota_service();
 }
 
+AppSorting* ExtensionSystemImpl::app_sorting() {
+  return shared_->app_sorting();
+}
+
 ContentVerifier* ExtensionSystemImpl::content_verifier() {
   return shared_->content_verifier();
 }
 
 scoped_ptr<ExtensionSet> ExtensionSystemImpl::GetDependentExtensions(
     const Extension* extension) {
   return extension_service()->shared_module_service()->GetDependentExtensions(
       extension);
 }
 
@@ skipping 28 matching lines @@
 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
     const std::string& extension_id,
     const UnloadedExtensionInfo::Reason reason) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason));
 }
 
 }  // namespace extensions