Sync: Clear IS_UNSYNCED for deleted local items

sync/engine/get_commit_ids_command.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/get_commit_ids_command.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 109 matching lines @@
     // provided the most recent passphrase).
     DVLOG(1) << "Excluding entry from commit due to lack of encryption "
              << entry;
     return false;
   }
 
   // Look at the 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)) {
     CHECK(id.IsRoot()) << "Non-root item is self parenting." << entry;
     // If the root becomes unsynced it can cause us problems.
     NOTREACHED() << "Root item became unsynced " << entry;
     return false;
   }
 
   if (entry.IsRoot()) {
@@ skipping 277 matching lines @@
   // delete trees.
 
   // Add moves and creates, and prepend their uncommitted parents.
   AddCreatesAndMoves(write_transaction, routes, ready_unsynced_set);
 
   // Add all deletes.
   AddDeletes(write_transaction, ready_unsynced_set);
 }
 
 }  // namespace browser_sync