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

Unified Diff: sync/test/fake_server/permanent_entity.h

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/test/fake_server/permanent_entity.h
diff --git a/sync/test/fake_server/permanent_entity.h b/sync/test/fake_server/permanent_entity.h
index 5a410ac8507f96f3ac7356faa2a7685dbd23f95b..e44d5c4bff16505b679deb1de83d9c12320082e5 100644
--- a/sync/test/fake_server/permanent_entity.h
+++ b/sync/test/fake_server/permanent_entity.h
@@ -20,7 +20,7 @@ class PermanentEntity : public FakeServerEntity {
// Factory function for PermanentEntity. |server_tag| should be a globally
// unique identifier.
- static scoped_ptr<FakeServerEntity> Create(
+ static std::unique_ptr<FakeServerEntity> Create(
const syncer::ModelType& model_type,
const std::string& server_tag,
const std::string& name,
@@ -28,12 +28,12 @@ class PermanentEntity : public FakeServerEntity {
// Factory function for a top level PermanentEntity. Top level means that the
// entity's parent is the root entity (no PermanentEntity exists for root).
- static scoped_ptr<FakeServerEntity> CreateTopLevel(
+ static std::unique_ptr<FakeServerEntity> CreateTopLevel(
const syncer::ModelType& model_type);
// Factory function for creating an updated version of a PermanentEntity.
// This function should only be called for the Nigori entity.
- static scoped_ptr<FakeServerEntity> CreateUpdatedNigoriEntity(
+ static std::unique_ptr<FakeServerEntity> CreateUpdatedNigoriEntity(
const sync_pb::SyncEntity& client_entity,
const FakeServerEntity& current_server_entity);

Powered by Google App Engine
This is Rietveld 408576698