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

chrome/browser/ui/webui/ntp/app_launcher_handler.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/ui/webui/ntp/app_launcher_handler.h"
 
 #include <vector>
 
 #include "apps/metrics_names.h"
 #include "base/auto_reset.h"
@@ skipping 55 matching lines @@
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 using extensions::AppSorting;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
+using extensions::ExtensionSystem;
 
 namespace {
 
 void RecordAppLauncherPromoHistogram(
       apps::AppLauncherPromoHistogramValues value) {
   DCHECK_LT(value, apps::APP_LAUNCHER_PROMO_MAX);
   UMA_HISTOGRAM_ENUMERATION(
       "Apps.AppLauncherPromo", value, apps::APP_LAUNCHER_PROMO_MAX);
 }
 
@@ skipping 83 matching lines @@
   value->SetBoolean("icon_small_exists", icon_small_exists);
   value->SetInteger("launch_container",
                     extensions::AppLaunchInfo::GetLaunchContainer(extension));
   ExtensionPrefs* prefs = ExtensionPrefs::Get(service->profile());
   value->SetInteger("launch_type", extensions::GetLaunchType(prefs, extension));
   value->SetBoolean("is_component",
                     extension->location() == extensions::Manifest::COMPONENT);
   value->SetBoolean("is_webstore",
       extension->id() == extensions::kWebStoreAppId);
 
-  AppSorting* sorting = prefs->app_sorting();
+  AppSorting* sorting = ExtensionSystem::Get(service->profile())->app_sorting();
   syncer::StringOrdinal page_ordinal = sorting->GetPageOrdinal(extension->id());
   if (!page_ordinal.IsValid()) {
     // Make sure every app has a page ordinal (some predate the page ordinal).
     // The webstore app should be on the first page.
     page_ordinal = extension->id() == extensions::kWebStoreAppId ?
         sorting->CreateFirstAppPageOrdinal() :
         sorting->GetNaturalAppPageOrdinal();
     sorting->SetPageOrdinal(extension->id(), page_ordinal);
   }
   value->SetInteger("page_index",
@@ skipping 242 matching lines @@
     base::Closure callback = base::Bind(
         &AppLauncherHandler::OnExtensionPreferenceChanged,
         base::Unretained(this));
     extension_pref_change_registrar_.Init(
         ExtensionPrefs::Get(profile)->pref_service());
     extension_pref_change_registrar_.Add(
         extensions::pref_names::kExtensions, callback);
     extension_pref_change_registrar_.Add(prefs::kNtpAppPageNames, callback);
 
     ExtensionRegistry::Get(profile)->AddObserver(this);
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_APP_LAUNCHER_REORDERED,
+    registrar_.Add(this, chrome::NOTIFICATION_APP_LAUNCHER_REORDERED,
                    content::Source<AppSorting>(
-                       ExtensionPrefs::Get(profile)->app_sorting()));
+                       ExtensionSystem::Get(profile)->app_sorting()));
     registrar_.Add(this,
                    extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                    content::Source<CrxInstaller>(NULL));
     registrar_.Add(this,
                    extensions::NOTIFICATION_EXTENSION_LOAD_ERROR,
                    content::Source<Profile>(profile));
   }
 
   has_loaded_apps_ = true;
 }
@@ skipping 173 matching lines @@
         CHECK(app_order->GetString(i + 1, &successor_to_moved_ext));
       break;
     }
   }
 
   // Don't update the page; it already knows the apps have been reordered.
   base::AutoReset<bool> auto_reset(&ignore_changes_, true);
   ExtensionPrefs* extension_prefs =
       ExtensionPrefs::Get(extension_service_->GetBrowserContext());
   extension_prefs->SetAppDraggedByUser(dragged_app_id);
-  extension_prefs->app_sorting()->OnExtensionMoved(
-      dragged_app_id, predecessor_to_moved_ext, successor_to_moved_ext);
+  ExtensionSystem::Get(extension_service_->GetBrowserContext())
+      ->app_sorting()
+      ->OnExtensionMoved(dragged_app_id, predecessor_to_moved_ext,
+                         successor_to_moved_ext);
 }
 
 void AppLauncherHandler::HandleSetPageIndex(const base::ListValue* args) {
   AppSorting* app_sorting =
-      ExtensionPrefs::Get(extension_service_->profile())->app_sorting();
-
+      ExtensionSystem::Get(extension_service_->profile())->app_sorting();
   std::string extension_id;
   double page_index;
   CHECK(args->GetString(0, &extension_id));
   CHECK(args->GetDouble(1, &page_index));
   const syncer::StringOrdinal& page_ordinal =
       app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index));
 
   // Don't update the page; it already knows the apps have been reordered.
   base::AutoReset<bool> auto_reset(&ignore_changes_, true);
   app_sorting->SetPageOrdinal(extension_id, page_ordinal);
@@ skipping 17 matching lines @@
   std::string url;
   CHECK(args->GetString(0, &url));
   GURL launch_url(url);
 
   base::string16 title;
   CHECK(args->GetString(1, &title));
 
   double page_index;
   CHECK(args->GetDouble(2, &page_index));
   AppSorting* app_sorting =
-      ExtensionPrefs::Get(extension_service_->profile())->app_sorting();
+      ExtensionSystem::Get(extension_service_->profile())->app_sorting();
   const syncer::StringOrdinal& page_ordinal =
       app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index));
 
   Profile* profile = Profile::FromWebUI(web_ui());
   favicon::FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile,
                                            ServiceAccessType::EXPLICIT_ACCESS);
   if (!favicon_service) {
     LOG(ERROR) << "No favicon service";
     return;
@@ skipping 150 matching lines @@
       base::FundamentalValue(!extension_id_prompting_.empty()));
 }
 
 bool AppLauncherHandler::ShouldShow(const Extension* extension) const {
   if (ignore_changes_ || !has_loaded_apps_ || !extension->is_app())
     return false;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   return extensions::ui_util::ShouldDisplayInNewTabPage(extension, profile);
 }