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

sync/test/engine/test_directory_setter_upper.cc

Index: sync/test/engine/test_directory_setter_upper.cc
diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc
index ee0e24053f106f206a659572360c1fbdcfc949e0..f45c0e5f4498f854d1f1c1466e8ee2219c7de677 100644
--- a/sync/test/engine/test_directory_setter_upper.cc
+++ b/sync/test/engine/test_directory_setter_upper.cc
@@ -27,16 +27,34 @@ void TestDirectorySetterUpper::SetUp() {
   WeakHandle<syncable::TransactionObserver> transaction_observer =
       MakeWeakHandle(test_transaction_observer_->AsWeakPtr());
 
-  directory_.reset(new syncable::Directory(
-      new syncable::InMemoryDirectoryBackingStore(name_),
-      &handler_,
-      NULL,
-      &encryption_handler_,
-      encryption_handler_.cryptographer()));
+  directory_.reset(
+      new syncable::Directory(
+          new syncable::InMemoryDirectoryBackingStore(name_),
+          &handler_,
+          NULL,
+          &encryption_handler_,
+          encryption_handler_.cryptographer()));
   ASSERT_EQ(syncable::OPENED, directory_->Open(
           name_, &delegate_, transaction_observer));
 }
 
+void TestDirectorySetterUpper::SetUpWith(
+    syncer::syncable::DirectoryBackingStore* directory_store) {
+  CHECK(directory_store);
+  test_transaction_observer_.reset(new syncable::TestTransactionObserver());
+  WeakHandle<syncable::TransactionObserver> transaction_observer =
+      MakeWeakHandle(test_transaction_observer_->AsWeakPtr());
+
+  directory_.reset(
+      new syncable::Directory(directory_store,
+                              &handler_,
+                              NULL,
+                              &encryption_handler_,
+                              encryption_handler_.cryptographer()));
+    ASSERT_EQ(syncable::OPENED, directory_->Open(
+          name_, &delegate_, transaction_observer));
+}
+
 void TestDirectorySetterUpper::TearDown() {
   if (!directory()->good())
     return;