Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1157)

Unified Diff: content/browser/service_manager/merge_dictionary.cc

Issue 2884933002: Remove raw base::DictionaryValue::SetWithoutPathExpansion (Closed)
Patch Set: Include Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/wifi/wifi_service_mac.mm ('k') | dbus/values_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
}
« no previous file with comments | « components/wifi/wifi_service_mac.mm ('k') | dbus/values_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698