WIP: The Bookmark Position Megapatch

sync/syncable/syncable_columns.h

Index: sync/syncable/syncable_columns.h
diff --git a/sync/syncable/syncable_columns.h b/sync/syncable/syncable_columns.h
index 6eda0587785cbb4d84d4fa0abbd59015322ad43e..54dc033a5b930309108f03dfb25e3deebd11e7d4 100644
--- a/sync/syncable/syncable_columns.h
+++ b/sync/syncable/syncable_columns.h
@@ -37,8 +37,6 @@ static const ColumnSpec g_metas_columns[] = {
   {"id", "varchar(255) default \"r\""},
   {"parent_id", "varchar(255) default \"r\""},
   {"server_parent_id", "varchar(255) default \"r\""},
-  {"prev_id", "varchar(255) default \"r\""},
-  {"next_id", "varchar(255) default \"r\""},
   //////////////////////////////////////
   // bits
   {"is_unsynced", "bit default 0"},
@@ -59,8 +57,12 @@ static const ColumnSpec g_metas_columns[] = {
   {"server_specifics", "blob"},
   {"base_server_specifics", "blob"},
   //////////////////////////////////////
-  // Blobs (ordinals).
-  {"server_ordinal_in_parent", "blob"},
+  // Blobs (positions).
+  {"server_unique_position", "blob"},
+  {"unique_position", "blob"},
+  //////////////////////////////////////
+  // Blobs (bytes).
+  {"unique_bookmark_tag", "blob"},
 };
 
 // At least enforce that there are equal number of column names and fields.