[Sync] Implement encryption-aware conflict resolution.

chrome/browser/sync/syncable/syncable_enum_conversions.cc

 // Copyright (c) 2011 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 syncable.h.
 
 #include "chrome/browser/sync/syncable/syncable_enum_conversions.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 117 matching lines @@
     ENUM_CASE(SERVER_NON_UNIQUE_NAME);
     ENUM_CASE(UNIQUE_SERVER_TAG);
     ENUM_CASE(UNIQUE_CLIENT_TAG);
     case STRING_FIELDS_END: break;
   }
   NOTREACHED();
   return "";
 }
 
 const char* GetProtoFieldString(ProtoField proto_field) {
-  ASSERT_ENUM_BOUNDS(SPECIFICS, SERVER_SPECIFICS,
+  ASSERT_ENUM_BOUNDS(SPECIFICS, BASE_SERVER_SPECIFICS,
                      PROTO_FIELDS_BEGIN, PROTO_FIELDS_END - 1);
   switch (proto_field) {
     ENUM_CASE(SPECIFICS);
     ENUM_CASE(SERVER_SPECIFICS);
+    ENUM_CASE(BASE_SERVER_SPECIFICS);
     case PROTO_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