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

before assocating bookmark model and sync model.

 

BUG=121928


Review URL: https://chromiumcodereview.appspot.com/11533008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178157 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 8 deletions

diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc
index ee0e240..f45c0e5 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;
diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h
index 24372b8..587236a 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.