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..0599433624753388dc37c862932672ff3e17db41 100644 |
--- a/sync/protocol/proto_value_conversions.cc |
+++ b/sync/protocol/proto_value_conversions.cc |
@@ -186,13 +186,13 @@ DictionaryValue* PasswordSpecificsDataToValue( |
return value; |
} |
-DictionaryValue* DeviceInformationToValue( |
- const sync_pb::DeviceInformation& proto) { |
+DictionaryValue* DeviceInfoSpecificsToValue( |
+ const sync_pb::DeviceInfoSpecifics& proto) { |
DictionaryValue* value = new DictionaryValue(); |
SET_STR(cache_guid); |
- SET_STR(name); |
- SET_STR(platform); |
- SET_STR(chrome_version); |
+ SET_STR(client_name); |
+ SET_ENUM(device_type, GetDeviceTypeString); |
+ SET_STR(sync_user_agent); |
return value; |
} |
@@ -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; |
} |
@@ -390,6 +389,7 @@ DictionaryValue* EntitySpecificsToValue( |
SET_FIELD(autofill, AutofillSpecificsToValue); |
SET_FIELD(autofill_profile, AutofillProfileSpecificsToValue); |
SET_FIELD(bookmark, BookmarkSpecificsToValue); |
+ SET_FIELD(device_info, DeviceInfoSpecificsToValue); |
SET_FIELD(extension, ExtensionSpecificsToValue); |
SET_FIELD(extension_setting, ExtensionSettingSpecificsToValue); |
SET_FIELD(nigori, NigoriSpecificsToValue); |