WIP: The Bookmark Position Megapatch

sync/syncable/syncable_enum_conversions.cc

 // 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.
 
 // Keep this file in sync with entry_kernel.h.
 
 #include "sync/syncable/syncable_enum_conversions.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 54 matching lines @@
     ENUM_CASE(SERVER_MTIME);
     ENUM_CASE(CTIME);
     ENUM_CASE(SERVER_CTIME);
     case TIME_FIELDS_END: break;
   }
   NOTREACHED();
   return "";
 }
 
 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();
   return "";
 }
 
 const char* GetIndexedBitFieldString(IndexedBitField indexed_bit_field) {
   ASSERT_ENUM_BOUNDS(IS_UNSYNCED, IS_UNAPPLIED_UPDATE,
                      BIT_FIELDS_BEGIN, INDEXED_BIT_FIELDS_END - 1);
   switch (indexed_bit_field) {
@@ skipping 48 matching lines @@
   switch (proto_field) {
     ENUM_CASE(SPECIFICS);
     ENUM_CASE(SERVER_SPECIFICS);
     ENUM_CASE(BASE_SERVER_SPECIFICS);
     case PROTO_FIELDS_END: break;
   }
   NOTREACHED();
   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 "";
 }
 
 const char* GetBitTempString(BitTemp bit_temp) {
   ASSERT_ENUM_BOUNDS(SYNCING, SYNCING,
                      BIT_TEMPS_BEGIN, BIT_TEMPS_END - 1);
   switch (bit_temp) {
     ENUM_CASE(SYNCING);
     case BIT_TEMPS_END: break;
   }
   NOTREACHED();
   return "";
 }
 
 #undef ENUM_CASE
 #undef ASSERT_ENUM_BOUNDS
 
 }  // namespace syncable
 }  // namespace syncer