| Index: sync/test/fake_server/fake_server.cc
|
| diff --git a/sync/test/fake_server/fake_server.cc b/sync/test/fake_server/fake_server.cc
|
| index d5e39af957381f63d381fce59a6e7af88c2c2847..7426a06f353e032011bd61b0c34d16326717ad2c 100644
|
| --- a/sync/test/fake_server/fake_server.cc
|
| +++ b/sync/test/fake_server/fake_server.cc
|
| @@ -192,7 +192,7 @@ bool FakeServer::CreatePermanentBookmarkFolder(const std::string& server_tag,
|
| if (!entity)
|
| return false;
|
|
|
| - SaveEntity(entity.Pass());
|
| + SaveEntity(std::move(entity));
|
| return true;
|
| }
|
|
|
| @@ -211,7 +211,7 @@ bool FakeServer::CreateDefaultPermanentItems() {
|
| if (!top_level_entity) {
|
| return false;
|
| }
|
| - SaveEntity(top_level_entity.Pass());
|
| + SaveEntity(std::move(top_level_entity));
|
|
|
| if (model_type == syncer::BOOKMARKS) {
|
| if (!CreatePermanentBookmarkFolder(kBookmarkBarFolderServerTag,
|
| @@ -409,7 +409,7 @@ string FakeServer::CommitEntity(
|
| }
|
|
|
| const std::string id = entity->GetId();
|
| - SaveEntity(entity.Pass());
|
| + SaveEntity(std::move(entity));
|
| BuildEntryResponseForSuccessfulCommit(id, entry_response);
|
| return id;
|
| }
|
| @@ -532,7 +532,7 @@ scoped_ptr<base::DictionaryValue> FakeServer::GetEntitiesAsDictionaryValue() {
|
| list_value->Append(new base::StringValue(entity.GetName()));
|
| }
|
|
|
| - return dictionary.Pass();
|
| + return dictionary;
|
| }
|
|
|
| std::vector<sync_pb::SyncEntity> FakeServer::GetSyncEntitiesByModelType(
|
| @@ -553,7 +553,7 @@ std::vector<sync_pb::SyncEntity> FakeServer::GetSyncEntitiesByModelType(
|
|
|
| void FakeServer::InjectEntity(scoped_ptr<FakeServerEntity> entity) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - SaveEntity(entity.Pass());
|
| + SaveEntity(std::move(entity));
|
| }
|
|
|
| bool FakeServer::ModifyEntitySpecifics(
|
|
|