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

Unified Diff: components/policy/core/common/policy_loader_win.cc

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More fixes (partial Windows fix) Created 4 years, 8 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
Index: components/policy/core/common/policy_loader_win.cc
diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc
index d739a038a030658d6779f0d55432bde312925cf1..4981cf4d18d43e6a1a4cce79571413dcc6238dca 100644
--- a/components/policy/core/common/policy_loader_win.cc
+++ b/components/policy/core/common/policy_loader_win.cc
@@ -166,9 +166,11 @@ void FilterUntrustedPolicy(PolicyMap* policy) {
filtered_values->AppendString(entry);
}
if (invalid_policies) {
- policy->Set(key::kExtensionInstallForcelist,
- map_entry->level, map_entry->scope, map_entry->source,
- filtered_values.release(),
+ policy->Set(key::kExtensionInstallForcelist, map_entry->level,
+ map_entry->scope, map_entry->source,
+ std::move(filtered_values),
+ // TODO(dcheng): Ummm... figure out what this is all about
+ // when I'm more awake.
Andrew T Wilson (Slow) 2016/05/03 11:59:03 What's the concern here?
dcheng 2016/05/03 23:40:40 ExternalDataFetcher is now an owned pointer, so it
map_entry->external_data_fetcher);
const PolicyDetails* details = GetChromePolicyDetails(

Powered by Google App Engine
This is Rietveld 408576698