Index: chrome/browser/ui/app_list/app_list_syncable_service.cc |
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc |
index 1ac62ad9a23994c6f404ef044f182550ebe59099..87fe50e835e8a6c798246ced4321237433a2b85b 100644 |
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc |
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc |
@@ -361,7 +361,7 @@ AppListModel* AppListSyncableService::GetModel() { |
return model_.get(); |
} |
-void AppListSyncableService::AddItem(scoped_ptr<AppListItem> app_item) { |
+void AppListSyncableService::AddItem(std::unique_ptr<AppListItem> app_item) { |
SyncItem* sync_item = FindOrAddSyncItem(app_item.get()); |
if (!sync_item) |
return; // Item is not valid. |
@@ -586,8 +586,8 @@ void AppListSyncableService::PruneEmptySyncFolders() { |
syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing( |
syncer::ModelType type, |
const syncer::SyncDataList& initial_sync_data, |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
- scoped_ptr<syncer::SyncErrorFactory> error_handler) { |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) { |
DCHECK(!sync_processor_.get()); |
DCHECK(sync_processor.get()); |
DCHECK(error_handler.get()); |
@@ -930,7 +930,7 @@ void AppListSyncableService::DeleteSyncItemSpecifics( |
std::string AppListSyncableService::FindOrCreateOemFolder() { |
AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId); |
if (!oem_folder) { |
- scoped_ptr<AppListFolderItem> new_folder(new AppListFolderItem( |
+ std::unique_ptr<AppListFolderItem> new_folder(new AppListFolderItem( |
kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM)); |
oem_folder = |
static_cast<AppListFolderItem*>(model_->AddItem(std::move(new_folder))); |