Always create OEM folder, update position after sync

chrome/browser/ui/app_list/app_list_syncable_service.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 162 matching lines @@
 
   // Creates a new sync item for |item_id|.
   SyncItem* CreateSyncItem(
       const std::string& item_id,
       sync_pb::AppListSpecifics::AppListItemType item_type);
 
   // Deletes a SyncItem matching |specifics|.
   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.
   syncer::StringOrdinal GetOemFolderPos();
 
   // Returns true if an extension matching |id| exists and was installed by
   // an OEM (extension->was_installed_by_oem() is true).
   bool AppIsOem(const std::string& id);
 
   Profile* profile_;
   extensions::ExtensionSystem* extension_system_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<AppListModel> model_;
   scoped_ptr<ModelObserver> model_observer_;
   scoped_ptr<ExtensionAppModelBuilder> apps_builder_;
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncErrorFactory> sync_error_handler_;
   SyncItemMap sync_items_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListSyncableService);
 };
 
 }  // namespace app_list
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_