Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

extensions/shell/browser/shell_extension_system.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 "extensions/shell/browser/shell_extension_system.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/notification_types.h"
+#include "extensions/browser/null_app_sorting.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/file_util.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 namespace extensions {
 
@@ skipping 62 matching lines @@
       browser_context_, extension, extensions::SOURCE_UNTRACKED);
 }
 
 void ShellExtensionSystem::Shutdown() {
 }
 
 void ShellExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
   runtime_data_.reset(
       new RuntimeData(ExtensionRegistry::Get(browser_context_)));
   quota_service_.reset(new QuotaService);
+  app_sorting_.reset(new NullAppSorting);
 }
 
 ExtensionService* ShellExtensionSystem::extension_service() {
   return nullptr;
 }
 
 RuntimeData* ShellExtensionSystem::runtime_data() {
   return runtime_data_.get();
 }
 
@@ skipping 16 matching lines @@
 InfoMap* ShellExtensionSystem::info_map() {
   if (!info_map_.get())
     info_map_ = new InfoMap;
   return info_map_.get();
 }
 
 QuotaService* ShellExtensionSystem::quota_service() {
   return quota_service_.get();
 }
 
+AppSorting* ShellExtensionSystem::app_sorting() {
+  return app_sorting_.get();
+}
+
 void ShellExtensionSystem::RegisterExtensionWithRequestContexts(
     const Extension* extension,
     const base::Closure& callback) {
   BrowserThread::PostTaskAndReply(BrowserThread::IO, FROM_HERE,
                                   base::Bind(&InfoMap::AddExtension, info_map(),
                                              make_scoped_refptr(extension),
                                              base::Time::Now(), false, false),
                                   callback);
 }
 
@@ skipping 16 matching lines @@
 }
 
 void ShellExtensionSystem::OnExtensionRegisteredWithRequestContexts(
     scoped_refptr<Extension> extension) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context_);
   registry->AddReady(extension);
   registry->TriggerOnReady(extension.get());
 }
 
 }  // namespace extensions