Index: chrome/browser/chromeos/login/users/mock_user_manager.cc |
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.cc b/chrome/browser/chromeos/login/users/mock_user_manager.cc |
index 5a00c44adece7cdfdad3b51305ceb3aa488d8749..1cea376ce29dcfdd83ff245296392a21ef65a169 100644 |
--- a/chrome/browser/chromeos/login/users/mock_user_manager.cc |
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.cc |
@@ -4,9 +4,11 @@ |
#include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
+#include "base/stl_util.h" |
#include "base/task_runner.h" |
#include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
+#include "chrome/test/base/testing_profile.h" |
namespace { |
@@ -105,6 +107,11 @@ user_manager::User* MockUserManager::CreatePublicAccountUser( |
user_manager::User* user = user_manager::User::CreatePublicAccountUser(email); |
user_list_.push_back(user); |
ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); |
+ |
+ TestingProfile* profile = new TestingProfile(); |
+ profile->set_profile_name(email); |
Marc Treib
2014/12/08 16:59:34
You probably want to add |profile| to |profile_lis
merkulova
2014/12/10 11:55:44
Done.
|
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile); |
+ |
return user_list_.back(); |
} |
@@ -112,6 +119,10 @@ void MockUserManager::AddUser(const std::string& email) { |
user_manager::User* user = user_manager::User::CreateRegularUser(email); |
user_list_.push_back(user); |
ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); |
+ |
+ TestingProfile* profile = new TestingProfile(); |
+ profile->set_profile_name(email); |
Marc Treib
2014/12/08 16:59:34
Here too.
merkulova
2014/12/10 11:55:44
Done.
|
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile); |
} |
void MockUserManager::ClearUserList() { |
@@ -120,6 +131,8 @@ void MockUserManager::ClearUserList() { |
for (user = user_list_.begin(); user != user_list_.end(); ++user) |
delete *user; |
user_list_.clear(); |
+ |
+ STLDeleteElements(&profile_list_); |
} |
} // namespace chromeos |