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..75034a48ec647e76c8f5c4fc871602b9ec5b1bfb 100644
--- a/sync/test/engine/test_directory_setter_upper.h
+++ b/sync/test/engine/test_directory_setter_upper.h
@@ -43,6 +43,7 @@ namespace syncer {
 
 namespace syncable {
   class Directory;
+  class DirectoryBackingStore;
   class TestTransactionObserver;
 }
 
@@ -51,8 +52,10 @@ class TestDirectorySetterUpper {
   TestDirectorySetterUpper();
   virtual ~TestDirectorySetterUpper();
 
-  // Create a Directory instance open it.
-  virtual void SetUp();
+  // Create a Directory instance and open it. Take ownership of
+  // |directory_store| and use it as backend storage if it's not NULL,
+  // otherwise create an in-memory store.
+  virtual void SetUp(syncer::syncable::DirectoryBackingStore* directory_store);

[tim (not reviewing), 2013/01/14 23:32:48]

Could we have a separate SetUpWith(DBS*) function, and keep the normal SetUp?
Seems like SetUp(NULL) is still the common case.

[haitaol1, 2013/01/15 19:44:31]

Done.

 
   // Undo everything done by SetUp(): close the directory and delete the
   // backing files. Before closing the directory, this will run the directory