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

Unified Diff: components/sync/engine_impl/model_type_worker.cc

Issue 2339403004: [Sync] Add two more USS integration tests. (Closed)
Patch Set: Created 4 years, 3 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: components/sync/engine_impl/model_type_worker.cc
diff --git a/components/sync/engine_impl/model_type_worker.cc b/components/sync/engine_impl/model_type_worker.cc
index 5f010373970fffe5a97859d99ffdfd11e737808e..0ad1417b0b97241e8defc625e6cf9cde63ee3831 100644
--- a/components/sync/engine_impl/model_type_worker.cc
+++ b/components/sync/engine_impl/model_type_worker.cc
@@ -148,17 +148,17 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse(
// Check if specifics are encrypted and try to decrypt if so.
if (!specifics.has_encrypted()) {
// No encryption.
- entity->ReceiveUpdate(update_entity->version());
data.specifics = specifics;
response_data.entity = data.PassToPtr();
+ entity->ReceiveUpdate(response_data);
pending_updates_.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->ReceiveUpdate(update_entity->version());
response_data.entity = data.PassToPtr();
response_data.encryption_key_name = specifics.encrypted().key_name();
+ entity->ReceiveUpdate(response_data);
pending_updates_.push_back(response_data);
}
} else if (specifics.has_encrypted() &&

Powered by Google App Engine
This is Rietveld 408576698