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

sync/test/engine/test_directory_setter_upper.h

 // 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.
 //
 // A handy class that takes care of setting up and destroying a
 // syncable::Directory instance for unit tests that require one.
 //
 // The expected usage is to make this a component of your test fixture:
 //
 //   class AwesomenessTest : public testing::Test {
@@ skipping 25 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "sync/test/fake_sync_encryption_handler.h"
 #include "sync/test/null_directory_change_delegate.h"
 #include "sync/util/test_unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
 
 namespace syncable {
   class Directory;
+  class DirectoryBackingStore;
   class TestTransactionObserver;
 }
 
 class TestDirectorySetterUpper {
  public:
   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
   // invariant checks and perform the SaveChanges action on the directory.
   virtual void TearDown();
 
   syncable::Directory* directory() { return directory_.get(); }
 
   SyncEncryptionHandler* encryption_handler() { return &encryption_handler_; }
 
@@ skipping 11 matching lines @@
   FakeSyncEncryptionHandler encryption_handler_;
   scoped_ptr<syncable::Directory> directory_;
   std::string name_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_