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

sync/sessions/sync_session_unittest.cc

 // Copyright 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.
 
 #include "sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 144 matching lines @@
   scoped_ptr<SyncSession> session(MakeSession());
   std::set<ModelSafeGroup> expected_enabled_groups;
   expected_enabled_groups.insert(GROUP_PASSIVE);
   expected_enabled_groups.insert(GROUP_UI);
   expected_enabled_groups.insert(GROUP_DB);
   EXPECT_EQ(expected_enabled_groups, session->GetEnabledGroups());
 }
 
 TEST_F(SyncSessionTest, SetWriteTransaction) {
   TestDirectorySetterUpper dir_maker;
-  dir_maker.SetUp();
+  dir_maker.SetUp(NULL);
   syncable::Directory* directory = dir_maker.directory();
 
   scoped_ptr<SyncSession> session(MakeSession());
   EXPECT_TRUE(NULL == session->write_transaction());
   {
     WriteTransaction trans(FROM_HERE, syncable::UNITTEST, directory);
     sessions::ScopedSetSessionWriteTransaction set_trans(session.get(), &trans);
     EXPECT_TRUE(&trans == session->write_transaction());
   }
 }
@@ skipping 257 matching lines @@
 
   ASSERT_EQ(3U, invalidation_map.size());
   EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload);
   EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload);
   EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer