WIP: The Bookmark Position Megapatch

sync/syncable/entry.h

Index: sync/syncable/entry.h
diff --git a/sync/syncable/entry.h b/sync/syncable/entry.h
index eec8051b51530b697de30d01acf54cbffa27e881..1055cc455b96080c8dfdebe5f58912d7bb1c2d7d 100644
--- a/sync/syncable/entry.h
+++ b/sync/syncable/entry.h
@@ -92,10 +92,11 @@ class Entry {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
-  inline const NodeOrdinal& Get(OrdinalField field) const {
+  inline const UniquePosition& Get(UniquePositionField field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
+  const std::string& Get(BytesField field) const;
   inline bool Get(BitTemp field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
@@ -104,6 +105,10 @@ class Entry {
   ModelType GetServerModelType() const;
   ModelType GetModelType() const;
 
+  Id GetPredecessorId() const;
+  Id GetSuccessorId() const;
+  Id GetFirstChildId() const;
+
   inline bool ExistsOnClientBecauseNameIsNonEmpty() const {
     DCHECK(kernel_);
     return !kernel_->ref(NON_UNIQUE_NAME).empty();
@@ -120,12 +125,6 @@ class Entry {
     return *kernel_;
   }
 
-  // Compute a local predecessor position for |update_item|, based on its
-  // absolute server position.  The returned ID will be a valid predecessor
-  // under SERVER_PARENT_ID that is consistent with the
-  // SERVER_POSITION_IN_PARENT ordering.
-  Id ComputePrevIdFromServerPosition(const Id& parent_id) const;
-
   // Dumps all entry info into a DictionaryValue and returns it.
   // Transfers ownership of the DictionaryValue to the caller.
   base::DictionaryValue* ToValue(Cryptographer* cryptographer) const;