chrome/browser/chromeos/login/users/fake_chrome_user_manager.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/login/users/fake_chrome_user_manager.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/login/users/fake_chrome_user_manager.h ('k') | chrome/browser/chromeos/login/users/mock_user_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 54f80e5366146fab35b47c41e9f7b8f8c2aa876b..2ce8c7a8377180c9a5e94d83768c0c2bb1208f08 100644

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

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

@@ -5,6 +5,7 @@

#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

#include "base/command_line.h"

+#include "base/memory/ptr_util.h"

#include "base/sys_info.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager_util.h"

@@ -48,7 +49,7 @@ const user_manager::User* FakeChromeUserManager::AddUserWithAffiliation(

user->SetAffiliation(is_affiliated);

user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(

account_id.GetUserEmail()));

- user->SetStubImage(make_scoped_ptr(new user_manager::UserImage(

+ user->SetStubImage(base::WrapUnique(new user_manager::UserImage(

*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_PROFILE_PICTURE_LOADING))),

user_manager::User::USER_IMAGE_PROFILE, false);

@@ -63,7 +64,7 @@ const user_manager::User* FakeChromeUserManager::AddPublicAccountUser(

user_manager::User::CreatePublicAccountUser(account_id);