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

Unified Diff: sync/test/fake_server/bookmark_entity.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: Rebase and fix conflicts 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
« no previous file with comments | « sync/test/fake_server/bookmark_entity.h ('k') | sync/test/fake_server/bookmark_entity_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/fake_server/bookmark_entity.cc
diff --git a/sync/test/fake_server/bookmark_entity.cc b/sync/test/fake_server/bookmark_entity.cc
index b14e8642ec0f894916b6c7be64184ea18e6256a6..522f4b4cddb85f52b80fbf47cf7c6bc046d086c4 100644
--- a/sync/test/fake_server/bookmark_entity.cc
+++ b/sync/test/fake_server/bookmark_entity.cc
@@ -29,7 +29,7 @@ bool IsBookmark(const sync_pb::SyncEntity& client_entity) {
BookmarkEntity::~BookmarkEntity() { }
// static
-scoped_ptr<FakeServerEntity> BookmarkEntity::CreateNew(
+std::unique_ptr<FakeServerEntity> BookmarkEntity::CreateNew(
const sync_pb::SyncEntity& client_entity,
const string& parent_id,
const string& client_guid) {
@@ -41,7 +41,7 @@ scoped_ptr<FakeServerEntity> BookmarkEntity::CreateNew(
const string originator_cache_guid = client_guid;
const string originator_client_item_id = client_entity.id_string();
- return scoped_ptr<FakeServerEntity>(new BookmarkEntity(
+ return std::unique_ptr<FakeServerEntity>(new BookmarkEntity(
id, client_entity.version(), client_entity.name(), originator_cache_guid,
originator_client_item_id, client_entity.unique_position(),
client_entity.specifics(), client_entity.folder(), parent_id,
@@ -49,7 +49,7 @@ scoped_ptr<FakeServerEntity> BookmarkEntity::CreateNew(
}
// static
-scoped_ptr<FakeServerEntity> BookmarkEntity::CreateUpdatedVersion(
+std::unique_ptr<FakeServerEntity> BookmarkEntity::CreateUpdatedVersion(
const sync_pb::SyncEntity& client_entity,
const FakeServerEntity& current_server_entity,
const string& parent_id) {
@@ -64,7 +64,7 @@ scoped_ptr<FakeServerEntity> BookmarkEntity::CreateUpdatedVersion(
const string originator_client_item_id =
current_bookmark_entity.originator_client_item_id_;
- return scoped_ptr<FakeServerEntity>(new BookmarkEntity(
+ return std::unique_ptr<FakeServerEntity>(new BookmarkEntity(
client_entity.id_string(), client_entity.version(), client_entity.name(),
originator_cache_guid, originator_client_item_id,
client_entity.unique_position(), client_entity.specifics(),
« no previous file with comments | « sync/test/fake_server/bookmark_entity.h ('k') | sync/test/fake_server/bookmark_entity_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698