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

sync/test/engine/test_directory_setter_upper.h

Index: sync/test/engine/test_directory_setter_upper.h
diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h
index 24372b87f4e66aa49af5df96199ea4c6062e242d..587236a125977f62a0828be68f2b22b0290b6ec0 100644
--- a/sync/test/engine/test_directory_setter_upper.h
+++ b/sync/test/engine/test_directory_setter_upper.h
@@ -42,8 +42,9 @@
 namespace syncer {
 
 namespace syncable {
-  class Directory;
-  class TestTransactionObserver;
+class Directory;
+class DirectoryBackingStore;
+class TestTransactionObserver;
 }
 
 class TestDirectorySetterUpper {
@@ -54,6 +55,11 @@ class TestDirectorySetterUpper {
   // Create a Directory instance open it.
   virtual void SetUp();
 
+  // Create a Directory instance using |directory_store| as backend storage.
+  // Takes ownership of |directory_store|.
+  virtual void SetUpWith(
+      syncer::syncable::DirectoryBackingStore* directory_store);
+
   // Undo everything done by SetUp(): close the directory and delete the
   // backing files. Before closing the directory, this will run the directory
   // invariant checks and perform the SaveChanges action on the directory.