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

sync/api/sync_data.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 "sync/api/sync_data.h"
 
 #include <ostream>
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 38 matching lines @@
 SyncData::SyncData(int64 id, sync_pb::SyncEntity* entity)
     : is_valid_(true),
       id_(id),
       immutable_entity_(entity) {}
 
 SyncData::~SyncData() {}
 
 // Static.
 SyncData SyncData::CreateLocalDelete(
     const std::string& sync_tag,
-    ModelType datatype) {
+    ModelType datatype,
+    bool is_folder) {
   sync_pb::EntitySpecifics specifics;
   AddDefaultFieldValue(datatype, &specifics);
-  return CreateLocalData(sync_tag, "", specifics);
+  return CreateLocalData(sync_tag, "", specifics, is_folder);
 }
 
 // Static.
 SyncData SyncData::CreateLocalData(
     const std::string& sync_tag,
     const std::string& non_unique_title,
-    const sync_pb::EntitySpecifics& specifics) {
+    const sync_pb::EntitySpecifics& specifics,
+    bool is_folder) {
   sync_pb::SyncEntity entity;
   entity.set_client_defined_unique_tag(sync_tag);
   entity.set_non_unique_name(non_unique_title);
   entity.mutable_specifics()->CopyFrom(specifics);
+  entity.set_folder(is_folder);
   return SyncData(kInvalidId, &entity);
 }
 
 // Static.
 SyncData SyncData::CreateRemoteData(
-    int64 id, const sync_pb::EntitySpecifics& specifics) {
+    int64 id, const sync_pb::EntitySpecifics& specifics, bool is_folder) {
   DCHECK_NE(id, kInvalidId);
   sync_pb::SyncEntity entity;
   entity.mutable_specifics()->CopyFrom(specifics);
+  entity.set_folder(is_folder);
   return SyncData(id, &entity);
 }
 
 bool SyncData::IsValid() const {
   return is_valid_;
 }
 
 const sync_pb::EntitySpecifics& SyncData::GetSpecifics() const {
   return immutable_entity_.Get().specifics();
 }
@@ skipping 15 matching lines @@
 
 int64 SyncData::GetRemoteId() const {
   DCHECK(!IsLocal());
   return id_;
 }
 
 bool SyncData::IsLocal() const {
   return id_ == kInvalidId;
 }
 
+bool SyncData::IsFolder() const {
+  return immutable_entity_.Get().folder();
+}
+
 std::string SyncData::ToString() const {
   if (!IsValid())
     return "<Invalid SyncData>";
 
   std::string type = ModelTypeToString(GetDataType());
   std::string specifics;
   scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(GetSpecifics()));
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &specifics);
 
   if (IsLocal()) {
     return "{ isLocal: true, type: " + type + ", tag: " + GetTag() +
         ", title: " + GetTitle() + ", specifics: " + specifics + "}";
   }
 
   std::string id = base::Int64ToString(GetRemoteId());
   return "{ isLocal: false, type: " + type + ", specifics: " + specifics +
       ", id: " + id + "}";
 }
 
 void PrintTo(const SyncData& sync_data, std::ostream* os) {
   *os << sync_data.ToString();
 }
 
 }  // namespace syncer