| Index: content/browser/service_manager/merge_dictionary.cc
|
| diff --git a/content/browser/service_manager/merge_dictionary.cc b/content/browser/service_manager/merge_dictionary.cc
|
| index 231264b5656a1115fda84d591693b6a484b81375..cee4593e12299cc1d904975d6591feb29d6e3d5f 100644
|
| --- a/content/browser/service_manager/merge_dictionary.cc
|
| +++ b/content/browser/service_manager/merge_dictionary.cc
|
| @@ -12,7 +12,7 @@ void MergeDictionary(base::DictionaryValue* target,
|
| it.Advance()) {
|
| const base::Value* merge_value = &it.value();
|
| // Check whether we have to merge dictionaries.
|
| - if (merge_value->IsType(base::Value::TYPE_DICTIONARY)) {
|
| + if (merge_value->IsType(base::Value::Type::DICTIONARY)) {
|
| base::DictionaryValue* sub_dict;
|
| if (target->GetDictionaryWithoutPathExpansion(it.key(), &sub_dict)) {
|
| MergeDictionary(
|
| @@ -21,7 +21,7 @@ void MergeDictionary(base::DictionaryValue* target,
|
| continue;
|
| }
|
| }
|
| - if (merge_value->IsType(base::Value::TYPE_LIST)) {
|
| + if (merge_value->IsType(base::Value::Type::LIST)) {
|
| const base::ListValue* merge_list = nullptr;
|
| if (merge_value->GetAsList(&merge_list)) {
|
| base::ListValue* target_list = nullptr;
|
|
|