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

chrome/browser/sync/glue/generic_change_processor.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 "chrome/browser/sync/glue/generic_change_processor.h"
 
 #include "base/location.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 35 matching lines @@
     const syncer::ImmutableChangeRecordList& changes) {
   DCHECK(CalledOnValidThread());
   DCHECK(syncer_changes_.empty());
   for (syncer::ChangeRecordList::const_iterator it =
            changes.Get().begin(); it != changes.Get().end(); ++it) {
     if (it->action == syncer::ChangeRecord::ACTION_DELETE) {
       syncer_changes_.push_back(
           syncer::SyncChange(
               FROM_HERE,
               syncer::SyncChange::ACTION_DELETE,
-              syncer::SyncData::CreateRemoteData(it->id, it->specifics)));
+              syncer::SyncData::CreateRemoteData(it->id, it->specifics,
+                                                 false)));
     } else {
       syncer::SyncChange::SyncChangeType action =
           (it->action == syncer::ChangeRecord::ACTION_ADD) ?
           syncer::SyncChange::ACTION_ADD : syncer::SyncChange::ACTION_UPDATE;
       // Need to load specifics from node.
       syncer::ReadNode read_node(trans);
       if (read_node.InitByIdLookup(it->id) != syncer::BaseNode::INIT_OK) {
         error_handler()->OnSingleDatatypeUnrecoverableError(
             FROM_HERE,
             "Failed to look up data for received change with id " +
                 base::Int64ToString(it->id));
         return;
       }
       syncer_changes_.push_back(
           syncer::SyncChange(
               FROM_HERE,
               action,
               syncer::SyncData::CreateRemoteData(
-                  it->id, read_node.GetEntitySpecifics())));
+                  it->id, read_node.GetEntitySpecifics(),
+                  read_node.GetIsFolder())));
     }
   }
 }
 
 void GenericChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(CalledOnValidThread());
   if (syncer_changes_.empty())
     return;
   if (!local_service_) {
     syncer::ModelType type = syncer_changes_[0].sync_data().GetDataType();
@@ skipping 34 matching lines @@
   while (sync_child_id != syncer::kInvalidId) {
     syncer::ReadNode sync_child_node(&trans);
     if (sync_child_node.InitByIdLookup(sync_child_id) !=
             syncer::BaseNode::INIT_OK) {
       syncer::SyncError error(FROM_HERE,
                       "Failed to fetch child node for type " + type_name + ".",
                        type);
       return error;
     }
     current_sync_data->push_back(syncer::SyncData::CreateRemoteData(
-        sync_child_node.GetId(), sync_child_node.GetEntitySpecifics()));
+        sync_child_node.GetId(), sync_child_node.GetEntitySpecifics(),
+        sync_child_node.GetIsFolder()));
     sync_child_id = sync_child_node.GetSuccessorId();
   }
   return syncer::SyncError();
 }
 
 int GenericChangeProcessor::GetSyncCountForType(syncer::ModelType type) {
   syncer::ReadTransaction trans(FROM_HERE, share_handle());
   syncer::ReadNode root(&trans);
   if (root.InitByTagLookup(syncer::ModelTypeToRootTag(type)) !=
       syncer::BaseNode::INIT_OK)
@@ skipping 365 matching lines @@
 void GenericChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(CalledOnValidThread());
 }
 
 syncer::UserShare* GenericChangeProcessor::share_handle() const {
   DCHECK(CalledOnValidThread());
   return share_handle_;
 }
 
 }  // namespace browser_sync