summaryrefslogtreecommitdiffstats
path: root/sync/engine/model_type_worker.cc
diff options
context:
space:
mode:
authorskym <skym@chromium.org>2016-02-11 17:07:34 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-12 01:09:13 +0000
commit79ecce1aa60055c80936b135b1cf0f107bd716f2 (patch)
tree5ff8aec8b2e977c3fa1ea8ecfe56ef3328c38c0b /sync/engine/model_type_worker.cc
parent61af6e1cdaa35e293518abc1b24a679c434db75e (diff)
downloadchromium_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/model_type_worker.cc')
-rw-r--r--sync/engine/model_type_worker.cc8
1 files changed, 4 insertions, 4 deletions
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();