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

sync/syncable/directory.h

Index: sync/syncable/directory.h
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index fdb1b8a1e773979823cb7e50c1fde86adb8d59c2..5f2ae906050a0aed1fa8f3b26cc01ab1076d3de6 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -23,6 +23,7 @@
 namespace syncer {
 
 class Cryptographer;
+class TestUserShare;
 class UnrecoverableErrorHandler;
 
 namespace syncable {
@@ -130,6 +131,7 @@ class SYNC_EXPORT Directory {
   friend class ScopedKernelUnlock;
   friend class WriteTransaction;
   friend class SyncableDirectoryTest;
+  friend class syncer::TestUserShare;
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest, ManageDeleteJournals);
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
                            TakeSnapshotGetsAllDirtyHandlesTest);
@@ -307,6 +309,8 @@ class SYNC_EXPORT Directory {
                             const tracked_objects::Location& location,
                             const std::string & message);
 
+  DeleteJournal* delete_journal();
+
  protected:  // for friends, mainly used by Entry constructors
   virtual EntryKernel* GetEntryByHandle(int64 handle);
   virtual EntryKernel* GetEntryByHandle(int64 metahandle,
@@ -333,8 +337,6 @@ class SYNC_EXPORT Directory {
       DirectoryChangeDelegate* delegate,
       const WeakHandle<TransactionObserver>& transaction_observer);
 
-  DeleteJournal* delete_journal();
-
  private:
   // These private versions expect the kernel lock to already be held
   // before calling.