app_sorting() calls should go via ExtensionSystem intsead of prefs.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2013 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_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 87 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/install_limiter.h"
 #include "storage/browser/fileapi/file_system_backend.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using extensions::APIPermission;
+using extensions::AppSorting;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionIdSet;
 using extensions::ExtensionInfo;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
 using extensions::FeatureSwitch;
 using extensions::InstallVerifier;
 using extensions::ManagementPolicy;
 using extensions::Manifest;
@@ skipping 1383 matching lines @@
               extension->id(), Extension::DISABLE_REMOTE_INSTALL));
     }
   } else if (reloading) {
     // Replace the old extension with the new version.
     CHECK(!registry_->AddDisabled(extension));
     EnableExtension(extension->id());
   } else {
     // All apps that are displayed in the launcher are ordered by their ordinals
     // so we must ensure they have valid ordinals.
     if (extension->RequiresSortOrdinal()) {
-      extension_prefs_->app_sorting()->SetExtensionVisible(
+      AppSorting* app_sorting =
+          extensions::ExtensionSystem::Get(GetBrowserContext())->app_sorting();
+      app_sorting->SetExtensionVisible(
           extension->id(),
           extension->ShouldDisplayInNewTabPage() &&
               !extension_prefs_->IsEphemeralApp(extension->id()));
       if (!extension_prefs_->IsEphemeralApp(extension->id())) {
-        extension_prefs_->app_sorting()->EnsureValidOrdinals(
-            extension->id(), syncer::StringOrdinal());
+        app_sorting->EnsureValidOrdinals(extension->id(),
+                                         syncer::StringOrdinal());
       }
     }
 
     registry_->AddEnabled(extension);
     NotifyExtensionLoaded(extension);
   }
   system_->runtime_data()->SetBeingUpgraded(extension->id(), false);
 }
 
 void ExtensionService::AddComponentExtension(const Extension* extension) {
@@ skipping 430 matching lines @@
   if (SharedModuleInfo::IsSharedModule(extension))
     MaybeFinishDelayedInstallations();
 }
 
 void ExtensionService::PromoteEphemeralApp(
     const extensions::Extension* extension, bool is_from_sync) {
   DCHECK(GetInstalledExtension(extension->id()) &&
          extension_prefs_->IsEphemeralApp(extension->id()));
 
   if (extension->RequiresSortOrdinal()) {
-    extension_prefs_->app_sorting()->SetExtensionVisible(
-        extension->id(), extension->ShouldDisplayInNewTabPage());
+    AppSorting* app_sorting =
+        extensions::ExtensionSystem::Get(GetBrowserContext())->app_sorting();
+    app_sorting->SetExtensionVisible(extension->id(),
+                                     extension->ShouldDisplayInNewTabPage());
 
     if (!is_from_sync) {
       // Reset the sort ordinals of the app to ensure it is added to the default
       // position, like newly installed apps would.
-      extension_prefs_->app_sorting()->ClearOrdinals(extension->id());
+      app_sorting->ClearOrdinals(extension->id());
     }
 
-    extension_prefs_->app_sorting()->EnsureValidOrdinals(
-        extension->id(), syncer::StringOrdinal());
+    app_sorting->EnsureValidOrdinals(extension->id(), syncer::StringOrdinal());
   }
 
   // Remove the ephemeral flags from the preferences.
   extension_prefs_->OnEphemeralAppPromoted(extension->id());
 
   // Fire install-related events to allow observers to handle the promotion
   // of the ephemeral app.
   extensions::InstalledExtensionInfo details(
       extension,
       true /* is update */,
@@ skipping 562 matching lines @@
 }
 
 void ExtensionService::OnProfileDestructionStarted() {
   ExtensionIdSet ids_to_unload = registry_->enabled_extensions().GetIDs();
   for (ExtensionIdSet::iterator it = ids_to_unload.begin();
        it != ids_to_unload.end();
        ++it) {
     UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
   }
 }