diff options
| author | skym <skym@chromium.org> | 2016-02-11 17:07:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 01:09:13 +0000 |
| commit | 79ecce1aa60055c80936b135b1cf0f107bd716f2 (patch) | |
| tree | 5ff8aec8b2e977c3fa1ea8ecfe56ef3328c38c0b /sync/engine | |
| parent | 61af6e1cdaa35e293518abc1b24a679c434db75e (diff) | |
| download | chromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.zip chromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.tar.gz chromium_src-79ecce1aa60055c80936b135b1cf0f107bd716f2.tar.bz2 | |
Renaming EntityData::Pass to PassToPtr to avoid Pass->std::move
presubmit checks.
BUG=586305
Review URL: https://codereview.chromium.org/1692733002
Cr-Commit-Position: refs/heads/master@{#375067}
Diffstat (limited to 'sync/engine')
| -rw-r--r-- | sync/engine/entity_tracker_unittest.cc | 4 | ||||
| -rw-r--r-- | sync/engine/model_type_worker.cc | 8 | ||||
| -rw-r--r-- | sync/engine/model_type_worker_unittest.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sync/engine/entity_tracker_unittest.cc b/sync/engine/entity_tracker_unittest.cc index 2589448..6ba3222 100644 --- a/sync/engine/entity_tracker_unittest.cc +++ b/sync/engine/entity_tracker_unittest.cc @@ -52,7 +52,7 @@ class EntityTrackerTest : public ::testing::Test { data.non_unique_name = kClientTag; CommitRequestData request_data; - request_data.entity = data.Pass(); + request_data.entity = data.PassToPtr(); request_data.sequence_number = sequence_number; request_data.base_version = base_version; return request_data; @@ -64,7 +64,7 @@ class EntityTrackerTest : public ::testing::Test { data.client_tag_hash = kClientTagHash; UpdateResponseData response_data; - response_data.entity = data.Pass(); + response_data.entity = data.PassToPtr(); response_data.response_version = response_version; return response_data; } diff --git a/sync/engine/model_type_worker.cc b/sync/engine/model_type_worker.cc index 5b6e7eb..1dfcf2d8 100644 --- a/sync/engine/model_type_worker.cc +++ b/sync/engine/model_type_worker.cc @@ -163,14 +163,14 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse( // No encryption. entity_tracker->ReceiveUpdate(update_entity->version()); data.specifics = specifics; - response_data.entity = data.Pass(); + response_data.entity = data.PassToPtr(); response_datas.push_back(response_data); } else if (specifics.has_encrypted() && cryptographer_ && cryptographer_->CanDecrypt(specifics.encrypted())) { // Encrypted, but we know the key. if (DecryptSpecifics(cryptographer_.get(), specifics, &data.specifics)) { entity_tracker->ReceiveUpdate(update_entity->version()); - response_data.entity = data.Pass(); + response_data.entity = data.PassToPtr(); response_data.encryption_key_name = specifics.encrypted().key_name(); response_datas.push_back(response_data); } @@ -179,7 +179,7 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse( !cryptographer_->CanDecrypt(specifics.encrypted()))) { // Can't decrypt right now. Ask the entity tracker to handle it. data.specifics = specifics; - response_data.entity = data.Pass(); + response_data.entity = data.PassToPtr(); if (entity_tracker->ReceivePendingUpdate(response_data)) { // Send to the model thread for safe-keeping across restarts if the // tracker decides the update is worth keeping. @@ -426,7 +426,7 @@ void ModelTypeWorker::OnCryptographerUpdated() { decrypted_data.modification_time = data.modification_time; UpdateResponseData decrypted_response; - decrypted_response.entity = decrypted_data.Pass(); + decrypted_response.entity = decrypted_data.PassToPtr(); decrypted_response.response_version = saved_pending.response_version; decrypted_response.encryption_key_name = data.specifics.encrypted().key_name(); diff --git a/sync/engine/model_type_worker_unittest.cc b/sync/engine/model_type_worker_unittest.cc index cd19fc5..f630590 100644 --- a/sync/engine/model_type_worker_unittest.cc +++ b/sync/engine/model_type_worker_unittest.cc @@ -1025,7 +1025,7 @@ TEST_F(ModelTypeWorkerTest, RestorePendingEntries) { EncryptUpdate(GetNthKeyParams(1), &(entity.specifics)); UpdateResponseData update; - update.entity = entity.Pass(); + update.entity = entity.PassToPtr(); update.response_version = 100; // Inject the update during CommitQueue initialization. @@ -1067,7 +1067,7 @@ TEST_F(ModelTypeWorkerTest, RestoreApplicableEntries) { EncryptUpdate(GetNthKeyParams(1), &(entity.specifics)); UpdateResponseData update; - update.entity = entity.Pass(); + update.entity = entity.PassToPtr(); update.response_version = 100; // Inject the update during CommitQueue initialization. |