Separate the NTP app ordering from the app list app ordering

chrome/browser/extensions/app_sync_bundle.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/app_sync_bundle.h"
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 86 matching lines @@
   else
     AddApp(app_sync_data.id());
   extension_service_->ProcessAppSyncData(app_sync_data);
 }
 
 void AppSyncBundle::ProcessSyncChangeList(
     syncer::SyncChangeList sync_change_list) {
   sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list);
   extension_service_->extension_prefs()->extension_sorting()->
       FixNTPOrdinalCollisions();
+  extension_service_->extension_prefs()->app_list_extension_ordering()->
+      FixSyncCollisions();
 }
 
 bool AppSyncBundle::HasExtensionId(const std::string& id) const {
   return synced_apps_.find(id) != synced_apps_.end();
 }
 
 bool AppSyncBundle::HasPendingExtensionId(const std::string& id) const {
   return pending_sync_data_.find(id) != pending_sync_data_.end();
 }
 
@@ skipping 44 matching lines @@
 }
 
 
 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) {
   pending_sync_data_.erase(id);
   synced_apps_.insert(id);
 }
 
 
 }  // namespace extensions