Separate the NTP app ordering from the app list app ordering

chrome/browser/ui/app_list/apps_model_builder.cc

Index: chrome/browser/ui/app_list/apps_model_builder.cc
diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc
index 2176d6fd9a0cb0dce0a878f8da031ca912337ddb..6dee9fbd446d59565e514f5bad44b44fe9ad776a 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder.cc
@@ -10,7 +10,6 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
@@ -28,15 +27,7 @@ using extensions::Extension;
 namespace {
 
 bool AppPrecedes(const ExtensionAppItem* app1, const ExtensionAppItem* app2) {
-  const syncer::StringOrdinal& page1 = app1->GetPageOrdinal();
-  const syncer::StringOrdinal& page2 = app2->GetPageOrdinal();
-  if (page1.LessThan(page2))
-    return true;
-
-  if (page1.Equals(page2))
-    return app1->GetAppLaunchOrdinal().LessThan(app2->GetAppLaunchOrdinal());
-
-  return false;
+  return app1->Precedes(app2);
 }
 
 bool ShouldDisplayInAppLauncher(Profile* profile,
@@ -143,7 +134,7 @@ void AppsModelBuilder::OnExtensionDisabled(const Extension* extension) {
   GetAppAt(index)->UpdateIcon();
 }
 
-void AppsModelBuilder::OnAppsReordered() {
+void AppsModelBuilder::OnAppListReordered() {
   ResortApps();
 }
 
@@ -186,7 +177,8 @@ void AppsModelBuilder::PopulateApps() {
   if (apps.empty())
     return;
 
-  service->extension_prefs()->extension_sorting()->FixNTPOrdinalCollisions();
+  service->extension_prefs()->app_list_extension_ordering()->
+      FixSyncCollisions();
   std::sort(apps.begin(), apps.end(), &AppPrecedes);
 
   for (size_t i = 0; i < apps.size(); ++i)