WIP: The Bookmark Position Megapatch

sync/syncable/syncable_enum_conversions.cc

Index: sync/syncable/syncable_enum_conversions.cc
diff --git a/sync/syncable/syncable_enum_conversions.cc b/sync/syncable/syncable_enum_conversions.cc
index b4425a6750b8950d55720094ae64628d91a72ac6..4c711fbab20870a48acf80883d26b63050f99447 100644
--- a/sync/syncable/syncable_enum_conversions.cc
+++ b/sync/syncable/syncable_enum_conversions.cc
@@ -72,14 +72,12 @@ const char* GetTimeFieldString(TimeField time_field) {
 }
 
 const char* GetIdFieldString(IdField id_field) {
-  ASSERT_ENUM_BOUNDS(ID, NEXT_ID,
+  ASSERT_ENUM_BOUNDS(ID, SERVER_PARENT_ID,
                      ID_FIELDS_BEGIN, ID_FIELDS_END - 1);
   switch (id_field) {
     ENUM_CASE(ID);
     ENUM_CASE(PARENT_ID);
     ENUM_CASE(SERVER_PARENT_ID);
-    ENUM_CASE(PREV_ID);
-    ENUM_CASE(NEXT_ID);
     case ID_FIELDS_END: break;
   }
   NOTREACHED();
@@ -148,12 +146,26 @@ const char* GetProtoFieldString(ProtoField proto_field) {
   return "";
 }
 
-const char* GetOrdinalFieldString(OrdinalField ordinal_field) {
-  ASSERT_ENUM_BOUNDS(SERVER_ORDINAL_IN_PARENT, SERVER_ORDINAL_IN_PARENT,
-                     ORDINAL_FIELDS_BEGIN, ORDINAL_FIELDS_END - 1);
-  switch(ordinal_field) {
-    ENUM_CASE(SERVER_ORDINAL_IN_PARENT);
-    case ORDINAL_FIELDS_END: break;
+const char* GetUniquePositionFieldString(UniquePositionField position_field) {
+  ASSERT_ENUM_BOUNDS(SERVER_UNIQUE_POSITION, UNIQUE_POSITION,
+                     UNIQUE_POSITION_FIELDS_BEGIN,
+                     UNIQUE_POSITION_FIELDS_END - 1);
+  switch(position_field) {
+    ENUM_CASE(SERVER_UNIQUE_POSITION);
+    ENUM_CASE(UNIQUE_POSITION);
+    case UNIQUE_POSITION_FIELDS_END: break;
+  }
+  NOTREACHED();
+  return "";
+}
+
+const char* GetBytesFieldString(BytesField bytes_field) {
+  ASSERT_ENUM_BOUNDS(UNIQUE_BOOKMARK_TAG, UNIQUE_BOOKMARK_TAG,
+                     BYTES_FIELDS_BEGIN,
+                     BYTES_FIELDS_END - 1);
+  switch(bytes_field) {
+    ENUM_CASE(UNIQUE_BOOKMARK_TAG);
+    case BYTES_FIELDS_END: break;
   }
   NOTREACHED();
   return "";