FYI: Control Data + Per-Device Metadata

sync/internal_api/public/base/model_type.h

Index: sync/internal_api/public/base/model_type.h
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index 20c8ffa19d0a37d860e9170c706d7e58dca0bcba..a919e3c9307270e0cfd3c1ebd3a2bd0320a0343b 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -83,7 +83,11 @@ enum ModelType {
   EXTENSION_SETTINGS,
   // App notifications.
   APP_NOTIFICATIONS,
-  LAST_REAL_MODEL_TYPE = APP_NOTIFICATIONS,
+  // Client-specific metadata
+  PER_DEVICE_METADATA,

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

Maybe this should be named PER_CLIENT_METADATA?  Would that be more clear?

+  // Account metadata.
+  PER_USER_METADATA,

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

Rename to PER_ACCOUNT_METADATA?

+  LAST_REAL_MODEL_TYPE = PER_USER_METADATA,
 
   // If you are adding a new sync datatype that is exposed to the user via the
   // sync preferences UI, be sure to update the list in
@@ -124,6 +128,16 @@ SYNC_EXPORT ModelType GetModelTypeFromSpecifics(
 // value (sibling ordering) for this item.
 bool ShouldMaintainPosition(ModelType model_type);
 
+// If this returns true, this type belongs in GROUP_CONTROL.  The syncer has
+// special code to deal with its encryption, update application and conflict
+// resolution, so it should not receive any 'generic' processing for those
+// purposes.
+bool IsControlType(ModelType model_type);
+
+ModelTypeSet ControlTypes();
+
+ModelTypeSet EncryptableTypes();
+
 // Determine a model type from the field number of its associated
 // EntitySpecifics field.
 ModelType GetModelTypeFromSpecificsFieldNumber(int field_number);