Separate the NTP app ordering from the app list app ordering

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 6447ad3b399b7ec73fb08f6497e40b40b8ea6bd4..2a753e75578ba9ff5232edcc9d27d48fb17c8317 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1179,6 +1179,7 @@ void ExtensionPrefs::OnExtensionUninstalled(const std::string& extension_id,
                                             const Manifest::Location& location,
                                             bool external_uninstall) {
   extension_sorting_->ClearOrdinals(extension_id);
+  app_list_extension_sorting_->Erase(extension_id);
 
   // For external extensions, we save a preference reminding ourself not to try
   // and install the extension anymore (except when |external_uninstall| is
@@ -1605,6 +1606,8 @@ void ExtensionPrefs::InitPrefStore() {
   MigratePermissions(extension_ids);
   MigrateDisableReasons(extension_ids);
   extension_sorting_->Initialize(extension_ids);
+  app_list_extension_sorting_->Initialize(extension_ids,
+                                          extension_sorting_.get());

[koz (OOO until 15th September), 2013/08/20 07:16:57]

Better to have this take the list of extension ids that is pulled from
extension_sorting_ rather than extension_sorting_ itself. That way you have an
interface that is simpler to test and you don't introduce a dependency on
ExtensionSorting to AppListSorting.

 
   PreferenceAPI::InitExtensionControlledPrefs(this, extension_pref_value_map_);
 
@@ -1669,6 +1672,7 @@ ExtensionPrefs::ExtensionPrefs(
       install_directory_(root_dir),
       extension_pref_value_map_(extension_pref_value_map),
       extension_sorting_(new ExtensionSorting(this)),
+      app_list_extension_sorting_(new AppListExtensionSorting(this)),
       content_settings_store_(new ContentSettingsStore()),
       time_provider_(time_provider.Pass()),
       extensions_disabled_(extensions_disabled) {