Always create OEM folder, update position after sync

chrome/browser/ui/app_list/app_list_syncable_service.h

Index: chrome/browser/ui/app_list/app_list_syncable_service.h
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.h b/chrome/browser/ui/app_list/app_list_syncable_service.h
index 7b5a929b86059814f690b695371b6f2c9e43e9ad..d609214e36d15d9e696865bbfa13591bf6f11f5b 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.h
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.h
@@ -180,10 +180,8 @@ class AppListSyncableService : public syncer::SyncableService,
   void DeleteSyncItemSpecifics(const sync_pb::AppListSpecifics& specifics);
 
   // Creates the OEM folder and sets its name if necessary. Returns the OEM
-  // folder id or an empty string if the folder can not be created. |item_id|
-  // is the item that needs to be placed in the folder, used only for tracking
-  // if the folder can not be created.
-  std::string FindOrCreateOemFolder(const std::string& item_id);
+  // folder id.
+  std::string FindOrCreateOemFolder();
 
   // Gets the location for the OEM folder. Called when the folder is first
   // created.
@@ -205,7 +203,6 @@ class AppListSyncableService : public syncer::SyncableService,
   syncer::SyncableService::StartSyncFlare flare_;
   bool first_app_list_sync_;
   std::string oem_folder_name_;
-  std::vector<std::string> oem_folder_item_ids_;
 
   // Provides integration with Drive apps.
   scoped_ptr<DriveAppProvider> drive_app_provider_;