FYI: Control Data + Per-Device Metadata

sync/protocol/sync.proto

Index: sync/protocol/sync.proto
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto
index 8f4482326ee489efa2bfbf6d10b2c55d10c34689..58975cbaa11dee33a5c0d2e1a887c982889b82de 100644
--- a/sync/protocol/sync.proto
+++ b/sync/protocol/sync.proto
@@ -19,20 +19,22 @@ import "app_setting_specifics.proto";
 import "app_specifics.proto";
 import "autofill_specifics.proto";
 import "bookmark_specifics.proto";
-import "get_updates_caller_info.proto";
+import "client_commands.proto";
+import "client_debug_info.proto";
+import "encryption.proto";
 import "extension_setting_specifics.proto";
 import "extension_specifics.proto";
+import "get_updates_caller_info.proto";
 import "nigori_specifics.proto";
 import "password_specifics.proto";
+import "per_device_specifics.proto";
+import "per_user_specifics.proto";
 import "preference_specifics.proto";
 import "search_engine_specifics.proto";
 import "session_specifics.proto";
+import "sync_enums.proto";
 import "theme_specifics.proto";
 import "typed_url_specifics.proto";
-import "encryption.proto";
-import "sync_enums.proto";
-import "client_commands.proto";
-import "client_debug_info.proto";
 
 // Used for inspecting how long we spent performing operations in different
 // backends. All times must be in millis.
@@ -97,6 +99,8 @@ message EntitySpecifics {
   optional SearchEngineSpecifics search_engine = 88610;
   optional ExtensionSettingSpecifics extension_setting = 96159;
   optional AppSettingSpecifics app_setting = 103656;
+  optional PerDeviceSpecifics per_device_metadata = 149062;
+  optional PerUserSpecifics per_user_metadata = 150763;
 }
 
 message SyncEntity {