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

Unified Diff: sync/engine/commit_util.cc

Issue 298503002: sync: Enable typed tombstones commits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add tests for AddDefaultFieldValues Created 6 years, 7 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 | « no previous file | sync/engine/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit_util.cc
diff --git a/sync/engine/commit_util.cc b/sync/engine/commit_util.cc
index 45bc2bbf1e219f71fb5ea4b4ce5f07486fed9357..36b7c06b9c8c0dd9557ff53b57ac4910960a1532 100644
--- a/sync/engine/commit_util.cc
+++ b/sync/engine/commit_util.cc
@@ -182,6 +182,10 @@ void BuildCommitItem(
// Deletion is final on the server, let's move things and then delete them.
if (meta_entry.GetIsDel()) {
sync_entry->set_deleted(true);
+
+ sync_pb::EntitySpecifics type_only_specifics;
+ AddDefaultFieldValue(meta_entry.GetModelType(),
+ sync_entry->mutable_specifics());
} else {
SetEntrySpecifics(meta_entry, sync_entry);
}
« no previous file with comments | « no previous file | sync/engine/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698