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); |
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); |