FYI: Control Data + Per-Device Metadata

sync/protocol/proto_value_conversions.cc

Index: sync/protocol/proto_value_conversions.cc
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index cee21396559d653cb25c72c3cc0919ef8bf56c96..a3065a200b9d7cc772ca9586ebf7099872c7fde2 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -308,7 +308,6 @@ DictionaryValue* NigoriSpecificsToValue(
   SET_BOOL(encrypt_apps);
   SET_BOOL(encrypt_search_engines);
   SET_BOOL(encrypt_everything);
-  SET_REP(device_information, DeviceInformationToValue);
   SET_BOOL(sync_tab_favicons);
   return value;
 }
@@ -320,6 +319,19 @@ DictionaryValue* PasswordSpecificsToValue(
   return value;
 }
 
+DictionaryValue* PerDeviceSpecificsToValue(
+    const sync_pb::PerDeviceSpecifics& proto) {
+  DictionaryValue* value = new DictionaryValue();
+  SET(device_information, DeviceInformationToValue);
+  return value;
+}
+
+DictionaryValue* PerUserSpecificsToValue(
+    const sync_pb::PerUserSpecifics& proto) {
+  DictionaryValue* value = new DictionaryValue();
+  return value;
+}
+
 DictionaryValue* PreferenceSpecificsToValue(
     const sync_pb::PreferenceSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
@@ -394,6 +406,8 @@ DictionaryValue* EntitySpecificsToValue(
   SET_FIELD(extension_setting, ExtensionSettingSpecificsToValue);
   SET_FIELD(nigori, NigoriSpecificsToValue);
   SET_FIELD(password, PasswordSpecificsToValue);
+  SET_FIELD(per_device_metadata, PerDeviceSpecificsToValue);
+  SET_FIELD(per_user_metadata, PerUserSpecificsToValue);
   SET_FIELD(preference, PreferenceSpecificsToValue);
   SET_FIELD(search_engine, SearchEngineSpecificsToValue);
   SET_FIELD(session, SessionSpecificsToValue);