Separate the NTP app ordering from the app list app ordering

chrome/browser/extensions/app_sync_data.cc

Index: chrome/browser/extensions/app_sync_data.cc
diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc
index cb462ed3617f8f8a03aca67be496c2858a91b16a..a309930905b2d4f385d3aa8a63ac04b6c4e9e501 100644
--- a/chrome/browser/extensions/app_sync_data.cc
+++ b/chrome/browser/extensions/app_sync_data.cc
@@ -27,10 +27,12 @@ AppSyncData::AppSyncData(const Extension& extension,
                          bool enabled,
                          bool incognito_enabled,
                          const syncer::StringOrdinal& app_launch_ordinal,
-                         const syncer::StringOrdinal& page_ordinal)
+                         const syncer::StringOrdinal& page_ordinal,
+                         const syncer::StringOrdinal& app_list_ordinal)
     : extension_sync_data_(extension, enabled, incognito_enabled),
       app_launch_ordinal_(app_launch_ordinal),
-      page_ordinal_(page_ordinal) {
+      page_ordinal_(page_ordinal),
+      app_list_ordinal_(app_list_ordinal) {
 }
 
 AppSyncData::~AppSyncData() {}
@@ -56,6 +58,8 @@ void AppSyncData::PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const {
     specifics->set_app_launch_ordinal(app_launch_ordinal_.ToInternalValue());
   if (page_ordinal_.IsValid())
     specifics->set_page_ordinal(page_ordinal_.ToInternalValue());
+  if (app_list_ordinal_.IsValid())
+    specifics->set_app_list_ordinal(app_list_ordinal_.ToInternalValue());
 
   extension_sync_data_.PopulateExtensionSpecifics(
       specifics->mutable_extension());
@@ -67,6 +71,7 @@ void AppSyncData::PopulateFromAppSpecifics(
 
   app_launch_ordinal_ = syncer::StringOrdinal(specifics.app_launch_ordinal());
   page_ordinal_ = syncer::StringOrdinal(specifics.page_ordinal());
+  app_list_ordinal_ = syncer::StringOrdinal(specifics.app_list_ordinal());
 }
 
 void AppSyncData::PopulateFromSyncData(const syncer::SyncData& sync_data) {