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 b662b4537f18f1e81c044f4cd06ae4d4126915d1..23d5c55b0ea424b178516f6728b2be3edbbc05b0 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/chrome_notification_types.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::OnExtensionUninstalled(const Extension* extension) {
   model_->DeleteAt(index);
 }
 
-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_sorting()->
+      FixSyncCollisions();
   std::sort(apps.begin(), apps.end(), &AppPrecedes);
 
   for (size_t i = 0; i < apps.size(); ++i)
@@ -203,7 +195,7 @@ void AppsModelBuilder::ResortApps() {
   Apps invalid_ordinal_apps;
   for (size_t i = 0; i < model_->item_count(); ++i) {
     ExtensionAppItem* app = GetAppAt(i);
-    if (app->GetPageOrdinal().IsValid() && app->GetAppLaunchOrdinal().IsValid())
+    if (app->ExistsInSorting())
       apps.push_back(app);
     else
       invalid_ordinal_apps.push_back(app);