FYI: Control Data + Per-Device Metadata

sync/syncable/nigori_util.cc

Index: sync/syncable/nigori_util.cc
diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc
index 32a5fcfcbf4373e873bbb1976d27f23558b4f895..4954e00ce44562342f37cd4fb7529d1fb3ed0f18 100644
--- a/sync/syncable/nigori_util.cc
+++ b/sync/syncable/nigori_util.cc
@@ -85,8 +85,10 @@ bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
   const ModelType type = GetModelTypeFromSpecifics(specifics);
   if (type == PASSWORDS || type == NIGORI)
     return false;  // These types have their own encryption schemes.
+  if (!syncer::EncryptableTypes().Has(type))

[rlarocque, 2012/08/11 01:31:52]

This is a new concept that I'm introducing.  We already have PASSWORDS and
NIGORI which have special encryption treatment.  I'm adding EncryptableTypes()
to make it easier to define types which we expect will never support encryption.

+    return false;  // These types can never be encrypted.
   if (!encrypted_types.Has(type))
-    return false;  // This type does not require encryption
+    return false;  // This type does not require encryption.
   return !specifics.has_encrypted();
 }