Use delete journal to remove bookmarks that are already deleted in sync model

sync/syncable/mutable_entry.cc

 // Copyright 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/mutable_entry.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "sync/internal_api/public/base/node_ordinal.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/scoped_index_updater.h"
@@ skipping 271 matching lines @@
   return true;
 }
 
 bool MutableEntry::Put(BitField field, bool value) {
   DCHECK(kernel_);
   write_transaction_->SaveOriginal(kernel_);
   bool old_value = kernel_->ref(field);
   if (old_value != value) {
     kernel_->put(field, value);
     kernel_->mark_dirty(GetDirtyIndexHelper());
+  }
 
-    // Update delete journal for existence status change on server side here
-    // instead of in PutIsDel() because IS_DEL may not be updated due to
-    // early returns when processing updates. And because
-    // UpdateDeleteJournalForServerDelete() checks for SERVER_IS_DEL, it has
-    // to be called on sync thread.
-    if (field == SERVER_IS_DEL) {
-      dir()->delete_journal()->UpdateDeleteJournalForServerDelete(
-          write_transaction(), old_value, *kernel_);
-    }
+  // Update delete journal for existence status change on server side here
+  // instead of in PutIsDel() because IS_DEL may not be updated due to
+  // early returns when processing updates. And because
+  // UpdateDeleteJournalForServerDelete() checks for SERVER_IS_DEL, it has
+  // to be called on sync thread.
+  if (field == SERVER_IS_DEL) {
+    dir()->delete_journal()->UpdateDeleteJournalForServerDelete(
+        write_transaction(), old_value, *kernel_);
   }
+
   return true;
 }
 
 MetahandleSet* MutableEntry::GetDirtyIndexHelper() {
   return dir()->kernel_->dirty_metahandles;
 }
 
 bool MutableEntry::PutUniqueClientTag(const string& new_tag) {
   write_transaction_->SaveOriginal(kernel_);
   // There is no SERVER_UNIQUE_CLIENT_TAG. This field is similar to ID.
@@ skipping 136 matching lines @@
   DCHECK_NE(static_cast<MutableEntry*>(NULL), e);
   DCHECK(!e->IsRoot()) << "We shouldn't mark a permanent object for syncing.";
   if (!(e->Put(IS_UNSYNCED, true)))
     return false;
   e->Put(SYNCING, false);
   return true;
 }
 
 }  // namespace syncable
 }  // namespace syncer