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

Unified Diff: sync/engine/get_commit_ids_command.cc

Issue 10389103: Sync: Clear IS_UNSYNCED for deleted local items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix check_deps issue by moving ChangeEntryIDAndUpdateChildren Created 8 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/process_commit_response_command.cc » ('j') | sync/engine/syncer_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/get_commit_ids_command.cc
diff --git a/sync/engine/get_commit_ids_command.cc b/sync/engine/get_commit_ids_command.cc
index 55d7e232b12941228f9e9108bdae0f58148da53e..ecc5cf9def31a56604600f998846ad5244774d5a 100644
--- a/sync/engine/get_commit_ids_command.cc
+++ b/sync/engine/get_commit_ids_command.cc
@@ -127,14 +127,6 @@ bool IsEntryReadyForCommit(syncable::ModelTypeSet throttled_types,
if (throttled_types.Has(type))
return false;
- // Drop deleted uncommitted entries.
- if (entry.Get(syncable::IS_DEL) && !entry.Get(syncable::ID).ServerKnows()) {
- // TODO(zea): These will remain unsynced indefinitely. This is harmless,
- // but we should clean them up somewhere.
- DVLOG(1) << "Ignoring deleted and uncommitted item." << entry;
- return false;
- }
-
// Extra validity checks.
syncable::Id id = entry.Get(syncable::ID);
if (id == entry.Get(syncable::PARENT_ID)) {
« no previous file with comments | « no previous file | sync/engine/process_commit_response_command.cc » ('j') | sync/engine/syncer_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698