chrome/browser/chromeos/policy/user_policy_test_helper.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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: chrome/browser/chromeos/policy/user_policy_test_helper.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/chromeos/policy/user_policy_test_helper.h ('k') | chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_policy_test_helper.cc

diff --git a/chrome/browser/chromeos/policy/user_policy_test_helper.cc b/chrome/browser/chromeos/policy/user_policy_test_helper.cc

index 5f6d28f964c60268efa7eca29ff919fbf2a2fd2d..656f653df1e30cde088c2d586001a77149ef6db2 100644

--- a/chrome/browser/chromeos/policy/user_policy_test_helper.cc

+++ b/chrome/browser/chromeos/policy/user_policy_test_helper.cc

@@ -37,13 +37,14 @@ std::string BuildPolicy(const base::DictionaryValue& mandatory,

const base::DictionaryValue& recommended,

const std::string& policyType,

const std::string& account_id) {

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

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

+ new base::DictionaryValue);

policy_type_dict->SetWithoutPathExpansion("mandatory",

mandatory.CreateDeepCopy());

policy_type_dict->SetWithoutPathExpansion("recommended",

recommended.CreateDeepCopy());

- scoped_ptr<base::ListValue> managed_users_list(new base::ListValue);

+ std::unique_ptr<base::ListValue> managed_users_list(new base::ListValue);

managed_users_list->AppendString("*");

base::DictionaryValue root_dict;