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

sync/syncable/directory.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/directory.h"
 
 #include "base/debug/trace_event.h"
 #include "base/perftimer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 231 matching lines @@
                                      const std::string & message) {
   DCHECK(trans != NULL);
   unrecoverable_error_set_ = true;
   unrecoverable_error_handler_->OnUnrecoverableError(location,
                                                      message);
 }
 
 void Directory::UpdateDeleteJournals(BaseTransaction* trans,
                                      bool was_deleted,
                                      const EntryKernel* entry) {
-  if (!IsDeleteJournalEnabledForType(entry->GetServerModelType()))
+  if (!IsDeleteJournalEnabled(entry->GetServerModelType()))
     return;
 
   ScopedKernelLock lock(this);
   IdsIndex::const_iterator it =
       kernel_->delete_journals_->find(const_cast<EntryKernel*>(entry));
 
   if (entry->ref(SERVER_IS_DEL)) {
     if (it == kernel_->delete_journals_->end()) {
       // New delete.
       EntryKernel* t = new EntryKernel(*entry);
@@ skipping 1116 matching lines @@
       return false;
   }
 }
 
 ScopedKernelLock::ScopedKernelLock(const Directory* dir)
   :  scoped_lock_(dir->kernel_->mutex), dir_(const_cast<Directory*>(dir)) {
 }
 
 }  // namespace syncable
 }  // namespace syncer