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

Unified Diff: chrome/browser/chromeos/policy/login_profile_policy_provider.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: another-fix Created 4 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
Index: chrome/browser/chromeos/policy/login_profile_policy_provider.cc
diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
index 2b802d01b720e527276b522543b33e9422314403..b37524ebbf343fcce6817076abed6d86c0ff176e 100644
--- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
@@ -62,12 +62,9 @@ void ApplyDevicePolicyAsRecommendedPolicy(const std::string& device_policy,
PolicyMap* user_policy_map) {
const base::Value* value = device_policy_map.GetValue(device_policy);
if (value) {
- user_policy_map->Set(user_policy,
- POLICY_LEVEL_RECOMMENDED,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- value->DeepCopy(),
- NULL);
+ user_policy_map->Set(user_policy, POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ value->CreateDeepCopy(), nullptr);
}
}
@@ -77,12 +74,8 @@ void ApplyValueAsMandatoryPolicy(const base::Value* value,
const std::string& user_policy,
PolicyMap* user_policy_map) {
if (value) {
- user_policy_map->Set(user_policy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- value->DeepCopy(),
- NULL);
+ user_policy_map->Set(user_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, value->CreateDeepCopy(), nullptr);
}
}

Powered by Google App Engine
This is Rietveld 408576698