| Index: chrome/browser/sync/glue/preference_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/preference_model_associator.cc b/chrome/browser/sync/glue/preference_model_associator.cc
|
| index e9fcfdf8e268eb9a0c953e62fe9d8c906261fb19..929b3dd0ef7c9ecf622378ceb5182fbc814ec901 100644
|
| --- a/chrome/browser/sync/glue/preference_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/preference_model_associator.cc
|
| @@ -263,7 +263,7 @@ Value* PreferenceModelAssociator::MergeListValues(const Value& from_value,
|
| DCHECK(to_value.GetType() == Value::TYPE_LIST);
|
| const ListValue& from_list_value = static_cast<const ListValue&>(from_value);
|
| const ListValue& to_list_value = static_cast<const ListValue&>(to_value);
|
| - ListValue* result = static_cast<ListValue*>(to_list_value.DeepCopy());
|
| + ListValue* result = to_list_value.DeepCopy();
|
|
|
| for (ListValue::const_iterator i = from_list_value.begin();
|
| i != from_list_value.end(); ++i) {
|
| @@ -288,8 +288,7 @@ Value* PreferenceModelAssociator::MergeDictionaryValues(
|
| static_cast<const DictionaryValue&>(from_value);
|
| const DictionaryValue& to_dict_value =
|
| static_cast<const DictionaryValue&>(to_value);
|
| - DictionaryValue* result =
|
| - static_cast<DictionaryValue*>(to_dict_value.DeepCopy());
|
| + DictionaryValue* result = to_dict_value.DeepCopy();
|
|
|
| for (DictionaryValue::key_iterator key = from_dict_value.begin_keys();
|
| key != from_dict_value.end_keys(); ++key) {
|
|
|