| Index: sync/protocol/proto_value_conversions.cc
|
| diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
|
| index 91a11e3759536f0153cd62f508e626762665e834..95e12a26df9e7add65b78d77ce56a4961e918b85 100644
|
| --- a/sync/protocol/proto_value_conversions.cc
|
| +++ b/sync/protocol/proto_value_conversions.cc
|
| @@ -515,6 +515,13 @@ base::DictionaryValue* ManagedUserSharedSettingSpecificsToValue(
|
| return value;
|
| }
|
|
|
| +base::DictionaryValue* ManagedUserWhitelistSpecificsToValue(
|
| + const sync_pb::ManagedUserWhitelistSpecifics& proto) {
|
| + base::DictionaryValue* value = new base::DictionaryValue();
|
| + SET(extension, ExtensionSpecificsToValue);
|
| + return value;
|
| +}
|
| +
|
| base::DictionaryValue* NigoriSpecificsToValue(
|
| const sync_pb::NigoriSpecifics& proto) {
|
| base::DictionaryValue* value = new base::DictionaryValue();
|
| @@ -687,6 +694,7 @@ base::DictionaryValue* EntitySpecificsToValue(
|
| SET_FIELD(managed_user_shared_setting,
|
| ManagedUserSharedSettingSpecificsToValue);
|
| SET_FIELD(managed_user, ManagedUserSpecificsToValue);
|
| + SET_FIELD(managed_user_whitelist, ManagedUserWhitelistSpecificsToValue);
|
| SET_FIELD(nigori, NigoriSpecificsToValue);
|
| SET_FIELD(password, PasswordSpecificsToValue);
|
| SET_FIELD(preference, PreferenceSpecificsToValue);
|
|
|