| 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 cee4593e12299cc1d904975d6591feb29d6e3d5f..b50ee5d3557674a57c92126ef04569fa5caaa489 100644
|
| --- a/content/browser/service_manager/merge_dictionary.cc
|
| +++ b/content/browser/service_manager/merge_dictionary.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/service_manager/merge_dictionary.h"
|
|
|
| +#include "base/memory/ptr_util.h"
|
| +
|
| namespace content {
|
|
|
| void MergeDictionary(base::DictionaryValue* target,
|
| @@ -36,7 +38,8 @@ void MergeDictionary(base::DictionaryValue* target,
|
| }
|
| }
|
| // All other cases: Make a copy and hook it up.
|
| - target->SetWithoutPathExpansion(it.key(), merge_value->DeepCopy());
|
| + target->SetWithoutPathExpansion(
|
| + it.key(), base::MakeUnique<base::Value>(*merge_value));
|
| }
|
| }
|
|
|
|
|