WIP: The Bookmark Position Megapatch

sync/engine/syncer_util.h

Index: sync/engine/syncer_util.h
diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h
index 108622cacf1db97ffef3ddea86c9730e3a1e1aac..ea947abcf3732eafcdcd656d07c7c3d208ff49a1 100644
--- a/sync/engine/syncer_util.h
+++ b/sync/engine/syncer_util.h
@@ -48,6 +48,21 @@ UpdateAttemptResponse AttemptToUpdateEntry(
     syncable::MutableEntry* const entry,
     Cryptographer* cryptographer);
 
+// Returns the most accurate position information available in this update.  It
+// prefers to use the unique_position() field, but will fall back to using the
+// int64-based position_in_parent if necessary.
+//
+// The suffix parameter is the unique bookmark tag for the item being updated.
+//
+// Will return an invalid position if no valid position can be constructed, or
+// if this type does not support positioning.
+UniquePosition GetUpdatePosition(const sync_pb::SyncEntity& update,
+                                 const std::string& suffix);
+
+// Fetch the cache_guid and item_id-based unique bookmark tag from an update.
+// Will return an empty string if someting unexpected happens.
+std::string GetUniqueBookmarkTagFromUpdate(const sync_pb::SyncEntity& update);
+
 // Pass in name to avoid redundant UTF8 conversion.
 void UpdateServerFieldsFromUpdate(
     syncable::MutableEntry* local_entry,
@@ -58,10 +73,6 @@ void UpdateServerFieldsFromUpdate(
 void CreateNewEntry(syncable::WriteTransaction *trans,
                     const syncable::Id& id);
 
-void SplitServerInformationIntoNewEntry(
-    syncable::WriteTransaction* trans,
-    syncable::MutableEntry* entry);
-
 // This function is called on an entry when we can update the user-facing data
 // from the server data.
 void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,
@@ -88,32 +99,6 @@ VerifyResult VerifyUndelete(syncable::WriteTransaction* trans,
                             const sync_pb::SyncEntity& update,
                             syncable::MutableEntry* target);
 
-// Append |item|, followed by a chain of its predecessors selected by
-// |inclusion_filter|, to the |commit_ids| vector and tag them as included by
-// storing in the set |inserted_items|.  |inclusion_filter| (typically one of
-// IS_UNAPPLIED_UPDATE or IS_UNSYNCED) selects which type of predecessors to
-// include.  Returns true if |item| was added, and false if it was already in
-// the list.
-//
-// Use AddPredecessorsThenItem instead of this method if you want the
-// item to be the last, rather than first, item appended.
-bool AddItemThenPredecessors(
-    syncable::BaseTransaction* trans,
-    syncable::Entry* item,
-    syncable::IndexedBitField inclusion_filter,
-    syncable::MetahandleSet* inserted_items,
-    std::vector<syncable::Id>* commit_ids);
-
-// Exactly like AddItemThenPredecessors, except items are appended in the
-// reverse (and generally more useful) order: a chain of predecessors from
-// far to near, and finally the item.
-void AddPredecessorsThenItem(
-    syncable::BaseTransaction* trans,
-    syncable::Entry* item,
-    syncable::IndexedBitField inclusion_filter,
-    syncable::MetahandleSet* inserted_items,
-    std::vector<syncable::Id>* commit_ids);
-
 void MarkDeletedChildrenSynced(
     syncable::Directory* dir,
     std::set<syncable::Id>* deleted_folders);