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

Unified Diff: sync/internal_api/test/fake_model_type_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/internal_api/test/fake_model_type_service.cc
diff --git a/sync/internal_api/test/fake_model_type_service.cc b/sync/internal_api/test/fake_model_type_service.cc
index 01325d1b1fe62721b708306215bd0694339d252e..c5ef783288fe49f147a381433451c689015c0a23 100644
--- a/sync/internal_api/test/fake_model_type_service.cc
+++ b/sync/internal_api/test/fake_model_type_service.cc
@@ -5,6 +5,7 @@
#include "sync/internal_api/public/test/fake_model_type_service.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "sync/internal_api/public/shared_model_type_processor.h"
namespace syncer_v2 {
@@ -18,19 +19,19 @@ FakeModelTypeService::FakeModelTypeService()
FakeModelTypeService::~FakeModelTypeService() {}
-scoped_ptr<MetadataChangeList>
+std::unique_ptr<MetadataChangeList>
FakeModelTypeService::CreateMetadataChangeList() {
- return scoped_ptr<MetadataChangeList>();
+ return std::unique_ptr<MetadataChangeList>();
}
syncer::SyncError FakeModelTypeService::MergeSyncData(
- scoped_ptr<MetadataChangeList> metadata_change_list,
+ std::unique_ptr<MetadataChangeList> metadata_change_list,
EntityDataMap entity_data_map) {
return syncer::SyncError();
}
syncer::SyncError FakeModelTypeService::ApplySyncChanges(
- scoped_ptr<MetadataChangeList> metadata_change_list,
+ std::unique_ptr<MetadataChangeList> metadata_change_list,
EntityChangeList entity_changes) {
return syncer::SyncError();
}
@@ -52,10 +53,10 @@ ModelTypeChangeProcessor* FakeModelTypeService::CreateProcessorForTest(
return processor_;
}
-scoped_ptr<ModelTypeChangeProcessor>
+std::unique_ptr<ModelTypeChangeProcessor>
FakeModelTypeService::CreateProcessorForTestWrapper(syncer::ModelType type,
ModelTypeService* service) {
- return make_scoped_ptr(CreateProcessorForTest(type, service));
+ return base::WrapUnique(CreateProcessorForTest(type, service));
}
SharedModelTypeProcessor* FakeModelTypeService::SetUpProcessor(

Powered by Google App Engine
This is Rietveld 408576698