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

sync/engine/sync_scheduler_whitebox_unittest.cc

 // 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.
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "sync/engine/backoff_delay_provider.h"
 #include "sync/engine/sync_scheduler_impl.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/engine/polling_constants.h"
@@ skipping 11 matching lines @@
 
 namespace syncer {
 using sessions::SyncSession;
 using sessions::SyncSessionContext;
 using sessions::SyncSourceInfo;
 using sync_pb::GetUpdatesCallerInfo;
 
 class SyncSchedulerWhiteboxTest : public testing::Test {
  public:
   virtual void SetUp() {
-    dir_maker_.SetUp();
+    dir_maker_.SetUp(NULL);
     Syncer* syncer = new Syncer();
 
     ModelSafeRoutingInfo routes;
     routes[BOOKMARKS] = GROUP_UI;
     routes[NIGORI] = GROUP_PASSIVE;
 
     workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
     workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_PASSIVE)));
 
     std::vector<ModelSafeWorker*> workers;
@@ skipping 213 matching lines @@
                      TimeTicks::Now(), scoped_ptr<SyncSession>(),
                      ConfigurationParams(), FROM_HERE);
 
   job.GrantCanaryPrivilege();
   SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
 
 }  // namespace syncer