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

sync/api/sync_data.h

 // 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.
 
 #ifndef SYNC_API_SYNC_DATA_H_
 #define SYNC_API_SYNC_DATA_H_
 
 #include <iosfwd>
 #include <string>
 #include <vector>
@@ skipping 23 matching lines @@
   // The sync tag must be a string unique to this datatype and is used as a node
   // identifier server-side.
   // For deletes: |datatype| must specify the datatype who node is being
   // deleted.
   // For adds/updates: the specifics must be valid and the non-unique title (can
   // be the same as sync tag) must be specfied.
   // Note: the non_unique_title is primarily for debug purposes, and will be
   // overwritten if the datatype is encrypted.
   static SyncData CreateLocalDelete(
       const std::string& sync_tag,
-      ModelType datatype);
+      ModelType datatype,
+      bool is_folder);
   static 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);
 
   // Helper method for creating SyncData objects originating from the syncer.
   static SyncData CreateRemoteData(
-      int64 id, const sync_pb::EntitySpecifics& specifics);
+      int64 id, const sync_pb::EntitySpecifics& specifics, bool is_folder);
 
   // Whether this SyncData holds valid data. The only way to have a SyncData
   // without valid data is to use the default constructor.
   bool IsValid() const;
 
   // Return the datatype we're holding information about. Derived from the sync
   // datatype specifics.
   ModelType GetDataType() const;
 
   // Return the current sync datatype specifics.
   const sync_pb::EntitySpecifics& GetSpecifics() const;
 
   // Returns the value of the unique client tag. This is only set for data going
   // TO the syncer, not coming from.
   const std::string& GetTag() const;
 
   // Returns the non unique title (for debugging). Currently only set for data
   // going TO the syncer, not from.
   const std::string& GetTitle() const;
 
   // Should only be called by sync code when IsLocal() is false.
   int64 GetRemoteId() const;
 
   // Whether this sync data is for local data or data coming from the syncer.
   bool IsLocal() const;
 
+  bool IsFolder() const;
+
   std::string ToString() const;
 
   // TODO(zea): Query methods for other sync properties: parent, successor, etc.
 
  private:
   // Necessary since we forward-declare sync_pb::SyncEntity; see
   // comments in immutable.h.
   struct ImmutableSyncEntityTraits {
     typedef sync_pb::SyncEntity* Wrapper;
 
@@ skipping 13 matching lines @@
 
   // Clears |entity|.
   SyncData(int64 id, sync_pb::SyncEntity* entity);
 
   // Whether this SyncData holds valid data.
   bool is_valid_;
 
   // Equal to kInvalidId iff this is local.
   int64 id_;
 
+  bool is_folder_;
+
   // The actual shared sync entity being held.
   ImmutableSyncEntity immutable_entity_;
 };
 
+typedef std::vector<syncer::SyncData> SyncDataList;
+
 // gmock printer helper.
 void PrintTo(const SyncData& sync_data, std::ostream* os);
 
 }  // namespace syncer
 
 #endif  // SYNC_API_SYNC_DATA_H_