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 2073106e391b4ef0c4b9539435aa1cada36e06ab..1f908b14a738840ccbdfee6f43978015093a73cd 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -11,6 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "chrome/browser/extensions/admin_policy.h"
+#include "chrome/browser/extensions/app_list_extension_ordering.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_prefs_factory.h"
@@ -1241,6 +1242,7 @@ void ExtensionPrefs::OnExtensionUninstalled(const std::string& extension_id,
                                             const Manifest::Location& location,
                                             bool external_uninstall) {
   extension_sorting_->ClearOrdinals(extension_id);
+  app_list_extension_ordering_->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
@@ -1685,6 +1687,7 @@ void ExtensionPrefs::InitPrefStore() {
   MigratePermissions(extension_ids);
   MigrateDisableReasons(extension_ids);
   extension_sorting_->Initialize(extension_ids);
+  app_list_extension_ordering_->Initialize(extension_ids);
 
   // Store extension controlled preference values in the
   // |extension_pref_value_map_|, which then informs the subscribers
@@ -1890,6 +1893,7 @@ ExtensionPrefs::ExtensionPrefs(
       install_directory_(root_dir),
       extension_pref_value_map_(extension_pref_value_map),
       extension_sorting_(new ExtensionSorting(this, prefs)),
+      app_list_extension_ordering_(new AppListExtensionOrdering(this)),
       content_settings_store_(new ContentSettingsStore()),
       time_provider_(time_provider.Pass()),
       extensions_disabled_(extensions_disabled) {