Index: components/policy/core/common/policy_loader_mac.mm |
diff --git a/components/policy/core/common/policy_loader_mac.mm b/components/policy/core/common/policy_loader_mac.mm |
index 195bcf36c76f3bc62375ef7a32629bb53113276b..94e8ebc6ea9a030ffc1ebd9fffe353026144f5ea 100644 |
--- a/components/policy/core/common/policy_loader_mac.mm |
+++ b/components/policy/core/common/policy_loader_mac.mm |
@@ -4,6 +4,8 @@ |
#include "components/policy/core/common/policy_loader_mac.h" |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/callback.h" |
@@ -78,7 +80,7 @@ std::unique_ptr<PolicyBundle> PolicyLoaderMac::Load() { |
base::SysUTF8ToCFStringRef(it.key())); |
base::ScopedCFTypeRef<CFPropertyListRef> value( |
preferences_->CopyAppValue(name, application_id_)); |
- if (!value.get()) |
+ if (!value) |
continue; |
policy_present = true; |
bool forced = preferences_->AppValueIsForced(name, application_id_); |
@@ -88,7 +90,7 @@ std::unique_ptr<PolicyBundle> PolicyLoaderMac::Load() { |
std::unique_ptr<base::Value> policy = PropertyToValue(value); |
if (policy) { |
chrome_policy.Set(it.key(), level, POLICY_SCOPE_USER, |
- POLICY_SOURCE_PLATFORM, policy.release(), nullptr); |
+ POLICY_SOURCE_PLATFORM, std::move(policy), nullptr); |
} else { |
status.Add(POLICY_LOAD_STATUS_PARSE_ERROR); |
} |
@@ -174,7 +176,7 @@ void PolicyLoaderMac::LoadPolicyForComponent( |
base::SysUTF8ToCFStringRef(it.key())); |
base::ScopedCFTypeRef<CFPropertyListRef> value( |
preferences_->CopyAppValue(pref_name, bundle_id)); |
- if (!value.get()) |
+ if (!value) |
continue; |
bool forced = preferences_->AppValueIsForced(pref_name, bundle_id); |
PolicyLevel level = |
@@ -182,7 +184,7 @@ void PolicyLoaderMac::LoadPolicyForComponent( |
std::unique_ptr<base::Value> policy_value = PropertyToValue(value); |
if (policy_value) { |
policy->Set(it.key(), level, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM, |
- policy_value.release(), nullptr); |
+ std::move(policy_value), nullptr); |
} |
} |
} |