components/policy/core/common/policy_service_impl.cc - Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments and use namespace alias 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

« no previous file with comments | « components/policy/core/common/policy_map_unittest.cc ('k') | components/policy/core/common/policy_service_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/policy_service_impl.cc

diff --git a/components/policy/core/common/policy_service_impl.cc b/components/policy/core/common/policy_service_impl.cc

index 3f8650b3e405aebe36d82c3e2834321b203bd6e4..c6116c7119edc3b53d89c7f245b06fbef5b87552 100644

--- a/components/policy/core/common/policy_service_impl.cc

+++ b/components/policy/core/common/policy_service_impl.cc

@@ -46,7 +46,8 @@ void FixDeprecatedPolicies(PolicyMap* policies) {

// first, and then only policies with those exact attributes are merged.

PolicyMap::Entry current_priority; // Defaults to the lowest priority.

PolicySource inherited_source = POLICY_SOURCE_ENTERPRISE_DEFAULT;

- scoped_ptr<base::DictionaryValue> proxy_settings(new base::DictionaryValue);

+ std::unique_ptr<base::DictionaryValue> proxy_settings(

+ new base::DictionaryValue);

for (size_t i = 0; i < arraysize(kProxyPolicies); ++i) {

const PolicyMap::Entry* entry = policies->Get(kProxyPolicies[i]);

if (entry) {