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 f8442b03c6538716aa3edd7a24edbaab630a6e4d..e15475de6ad7d08617e8e7a1306d8c7c8ccecf7a 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1175,6 +1175,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
@@ -1631,6 +1632,11 @@ void ExtensionPrefs::InitPrefStore() {
   MigrateDisableReasons(extension_ids);
   extension_sorting_->Initialize(extension_ids);
 
+  extensions::ExtensionIdList ntp_sorted_extension_ids;
+  extension_sorting_->GetOrderedExtensionIds(&ntp_sorted_extension_ids);
+  app_list_extension_sorting_->Initialize(extension_ids,
+                                          ntp_sorted_extension_ids);
+
   PreferenceAPI::InitExtensionControlledPrefs(this, extension_pref_value_map_);
 
   extension_pref_value_map_->NotifyInitializationCompleted();
@@ -1694,6 +1700,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) {