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

sync/syncable/delete_journal.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/delete_journal.h"
 
 #include "base/stl_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace syncer {
@@ skipping 50 matching lines @@
     } else if (was_deleted) {
       delete_journals_to_purge_.insert(entry.ref(META_HANDLE));
     }
   }
 }
 
 void DeleteJournal::GetDeleteJournals(BaseTransaction* trans,
                                       ModelType type,
                                       EntryKernelSet* deleted_entries) {
   DCHECK(trans);
-  DCHECK(!passive_delete_journal_types_.Has(type));
   for (JournalIndex::const_iterator it = delete_journals_.begin();
       it != delete_journals_.end(); ++it) {
     if ((*it)->GetServerModelType() == type ||
         GetModelTypeFromSpecifics((*it)->ref(SPECIFICS)) == type) {
       deleted_entries->insert(*it);
     }
   }
   passive_delete_journal_types_.Put(type);
 }
 
@@ skipping 53 matching lines @@
   switch (type) {
     case BOOKMARKS:
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace syncable
 }  // namespace syncer