chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc - Issue 2811673002: Reland: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions

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/login/users/supervised_user_manager_impl.cc

Issue 2811673002: Reland: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)

Patch Set: Workaround with std::move Created 3 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/login/users/avatar/user_image_manager_impl.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

index 90ef44952419873fe848a2b7e601ad011112dd25..baf1eeb9a9e86fa518a32f58c637c028e83e8f8c 100644

--- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

@@ -211,14 +211,15 @@ const user_manager::User* SupervisedUserManagerImpl::CreateUserRecord(

prefs_new_users_update->Insert(0,

base::MakeUnique<base::Value>(local_user_id));

- sync_id_update->SetWithoutPathExpansion(local_user_id,

- new base::Value(sync_user_id));

+ sync_id_update->SetWithoutPathExpansion(

+ local_user_id, base::MakeUnique<base::Value>(sync_user_id));

manager_update->SetWithoutPathExpansion(

- local_user_id, new base::Value(manager->GetAccountId().GetUserEmail()));

+ local_user_id,

+ base::MakeUnique<base::Value>(manager->GetAccountId().GetUserEmail()));

manager_name_update->SetWithoutPathExpansion(

- local_user_id, new base::Value(manager->GetDisplayName()));

+ local_user_id, base::MakeUnique<base::Value>(manager->GetDisplayName()));

manager_email_update->SetWithoutPathExpansion(

- local_user_id, new base::Value(manager->display_email()));

+ local_user_id, base::MakeUnique<base::Value>(manager->display_email()));

owner_->SaveUserDisplayName(AccountId::FromUserEmail(local_user_id),

display_name);

@@ -499,7 +500,7 @@ void SupervisedUserManagerImpl::UpdateManagerName(const std::string& manager_id,

DCHECK(has_manager_id);

if (user_id == manager_id) {

manager_name_update->SetWithoutPathExpansion(

- it.key(), new base::Value(new_display_name));

+ it.key(), base::MakeUnique<base::Value>(new_display_name));

}