Sync: Clear IS_UNSYNCED for deleted local items

sync/syncable/syncable.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/syncable/syncable.h"
 
 #include <algorithm>
 #include <cstring>
 #include <functional>
 #include <iomanip>
@@ skipping 1718 matching lines @@
 
 bool MutableEntry::PutIsDel(bool is_del) {
   DCHECK(kernel_);
   if (is_del == kernel_->ref(IS_DEL)) {
     return true;
   }
   if (is_del) {
     if (!UnlinkFromOrder()) {
       return false;
     }
+    // If this item was deleted before it hit the server, we know that no one
+    // will attempt to undelete it.  It's never going to make it to the server

[Nicolas Zea, 2012/05/11 23:21:25]

"no one will attempt to undelete it" seems a bit misleading. We won't undelete
it via conflict resolution, but we will if another client creates an item with
the same unique client tag. Perhaps mention that?

[rlarocque, 2012/05/15 00:41:55]

Will do.  I was thinking mainly of bookmarks when I wrote that comment.

+    // either.  Mark it as unsynced so we can drop it later in

[Nicolas Zea, 2012/05/11 23:21:25]

Mark it as unsynced -> Unmark it as unsynced

+    // DropDeletedEntries().  See also: crbug.com/125381.
+    if (!Get(ID).ServerKnows()) {
+      Put(IS_UNSYNCED, false);
+    }
   }
 
   {
     ScopedKernelLock lock(dir());
     // Some indices don't include deleted items and must be updated
     // upon a value change.
     ScopedIndexUpdater<ParentIdAndHandleIndexer> updater(lock, kernel_,
         dir()->kernel_->parent_id_child_index);
 
     kernel_->put(IS_DEL, is_del);
@@ skipping 621 matching lines @@
     if (entry->ref(NEXT_ID).IsRoot() ||
         entry->ref(NEXT_ID) != entry->ref(PREV_ID)) {
       return entry;
     }
   }
   // There were no children in the linked list.
   return NULL;
 }
 
 }  // namespace syncable