Chromium Code Reviews| 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..5519bba953bf8c9b064d4ab8ec20ada9c5796c44 100644 |
| --- a/sync/protocol/proto_value_conversions.cc |
| +++ b/sync/protocol/proto_value_conversions.cc |
| @@ -186,8 +186,8 @@ 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); |
| @@ -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; |
| } |
| @@ -394,6 +393,7 @@ DictionaryValue* EntitySpecificsToValue( |
| SET_FIELD(extension_setting, ExtensionSettingSpecificsToValue); |
| SET_FIELD(nigori, NigoriSpecificsToValue); |
| SET_FIELD(password, PasswordSpecificsToValue); |
| + SET_FIELD(device_info, DeviceInfoSpecificsToValue); |
|
Nicolas Zea
2012/09/13 00:45:55
abc
rlarocque
2012/09/14 01:03:07
Done.
|
| SET_FIELD(preference, PreferenceSpecificsToValue); |
| SET_FIELD(search_engine, SearchEngineSpecificsToValue); |
| SET_FIELD(session, SessionSpecificsToValue); |