Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: sync/api/fake_syncable_service.cc

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/api/fake_syncable_service.cc
diff --git a/sync/api/fake_syncable_service.cc b/sync/api/fake_syncable_service.cc
index 3f103cbeefb17eeaafe1afcb2e1148515e8e37f1..9e8a2dee718167796867c0ac3697b0872365854d 100644
--- a/sync/api/fake_syncable_service.cc
+++ b/sync/api/fake_syncable_service.cc
@@ -28,7 +28,7 @@ void FakeSyncableService::set_process_sync_changes_error(
}
void FakeSyncableService::set_attachment_store(
- scoped_ptr<AttachmentStore> attachment_store) {
+ std::unique_ptr<AttachmentStore> attachment_store) {
attachment_store_ = std::move(attachment_store);
}
@@ -44,8 +44,8 @@ bool FakeSyncableService::syncing() const {
SyncMergeResult FakeSyncableService::MergeDataAndStartSyncing(
ModelType type,
const SyncDataList& initial_sync_data,
- scoped_ptr<SyncChangeProcessor> sync_processor,
- scoped_ptr<SyncErrorFactory> sync_error_factory) {
+ std::unique_ptr<SyncChangeProcessor> sync_processor,
+ std::unique_ptr<SyncErrorFactory> sync_error_factory) {
SyncMergeResult merge_result(type);
sync_processor_ = std::move(sync_processor);
type_ = type;
@@ -72,14 +72,14 @@ SyncError FakeSyncableService::ProcessSyncChanges(
return process_sync_changes_error_;
}
-scoped_ptr<AttachmentStoreForSync>
+std::unique_ptr<AttachmentStoreForSync>
FakeSyncableService::GetAttachmentStoreForSync() {
return attachment_store_ ? attachment_store_->CreateAttachmentStoreForSync()
- : scoped_ptr<AttachmentStoreForSync>();
+ : std::unique_ptr<AttachmentStoreForSync>();
}
void FakeSyncableService::SetAttachmentService(
- scoped_ptr<AttachmentService> attachment_service) {
+ std::unique_ptr<AttachmentService> attachment_service) {
attachment_service_ = std::move(attachment_service);
}

Powered by Google App Engine
This is Rietveld 408576698