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

chrome/browser/sync/test/integration/sync_app_helper.cc

 // Copyright (c) 2012 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/sync/test/integration/sync_app_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_set.h"
 
+using extensions::AppSorting;
 using extensions::ExtensionPrefs;
+using extensions::ExtensionSystem;
 
 namespace {
 
 struct AppState {
   AppState();
   ~AppState();
   bool IsValid() const;
   bool Equals(const AppState& other) const;
 
   syncer::StringOrdinal app_launch_ordinal;
@@ skipping 23 matching lines @@
          launch_web_url == other.launch_web_url &&
          description == other.description && name == other.name &&
          from_bookmark == other.from_bookmark;
 }
 
 // Load all the app specific values for |id| into |app_state|.
 void LoadApp(content::BrowserContext* context,
              const std::string& id,
              AppState* app_state) {
   ExtensionPrefs* prefs = ExtensionPrefs::Get(context);
-  app_state->app_launch_ordinal = prefs->app_sorting()->GetAppLaunchOrdinal(id);
-  app_state->page_ordinal = prefs->app_sorting()->GetPageOrdinal(id);
+  AppSorting* app_sorting = ExtensionSystem::Get(context)->app_sorting();
+  app_state->app_launch_ordinal = app_sorting->GetAppLaunchOrdinal(id);
+  app_state->page_ordinal = app_sorting->GetPageOrdinal(id);
   app_state->launch_type = extensions::GetLaunchTypePrefValue(prefs, id);
   ExtensionService* service =
       extensions::ExtensionSystem::Get(context)->extension_service();
   const extensions::Extension* extension = service->GetInstalledExtension(id);
   // GetInstalledExtension(id) returns null if |id| is for a pending extension.
   // In case of running tests against real backend servers, pending apps won't
   // be installed.
   if (extension) {
     app_state->launch_web_url =
         extensions::AppLaunchInfo::GetLaunchWebURL(extension);
@@ skipping 98 matching lines @@
     ++it1;
     ++it2;
   }
 
   return true;
 }
 
 syncer::StringOrdinal SyncAppHelper::GetPageOrdinalForApp(
     Profile* profile,
     const std::string& name) {
-  return ExtensionPrefs::Get(profile)->app_sorting()->GetPageOrdinal(
+  return ExtensionSystem::Get(profile)->app_sorting()->GetPageOrdinal(
       crx_file::id_util::GenerateId(name));
 }
 
 void SyncAppHelper::SetPageOrdinalForApp(
     Profile* profile,
     const std::string& name,
     const syncer::StringOrdinal& page_ordinal) {
-  ExtensionPrefs::Get(profile)->app_sorting()->SetPageOrdinal(
+  ExtensionSystem::Get(profile)->app_sorting()->SetPageOrdinal(
       crx_file::id_util::GenerateId(name), page_ordinal);
 }
 
 syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name) {
-  return ExtensionPrefs::Get(profile)->app_sorting()->GetAppLaunchOrdinal(
+  return ExtensionSystem::Get(profile)->app_sorting()->GetAppLaunchOrdinal(
       crx_file::id_util::GenerateId(name));
 }
 
 void SyncAppHelper::SetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name,
     const syncer::StringOrdinal& app_launch_ordinal) {
-  ExtensionPrefs::Get(profile)->app_sorting()->SetAppLaunchOrdinal(
+  ExtensionSystem::Get(profile)->app_sorting()->SetAppLaunchOrdinal(
       crx_file::id_util::GenerateId(name), app_launch_ordinal);
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
-  ExtensionPrefs::Get(profile)->app_sorting()->FixNTPOrdinalCollisions();
+  ExtensionSystem::Get(profile)->app_sorting()->FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}