Index: chrome/browser/chromeos/login/users/fake_user_manager.cc |
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/chrome/browser/chromeos/login/users/fake_user_manager.cc |
index f801f8b4cd29e033bfe7090eeae12f6a03ac65c5..14f62ea8569dcc8b7027dd77fc8c9b0dc63787c0 100644 |
--- a/chrome/browser/chromeos/login/users/fake_user_manager.cc |
+++ b/chrome/browser/chromeos/login/users/fake_user_manager.cc |
@@ -14,9 +14,6 @@ |
namespace { |
-// As defined in /chromeos/dbus/cryptohome_client.cc. |
-static const char kUserIdHashSuffix[] = "-hash"; |
- |
class FakeTaskRunner : public base::TaskRunner { |
public: |
virtual bool PostDelayedTask(const tracked_objects::Location& from_here, |
@@ -40,12 +37,9 @@ FakeUserManager::FakeUserManager() |
supervised_user_manager_(new FakeSupervisedUserManager), |
primary_user_(NULL), |
multi_profile_user_controller_(NULL) { |
- ProfileHelper::SetProfileToUserForTestingEnabled(true); |
} |
FakeUserManager::~FakeUserManager() { |
- ProfileHelper::SetProfileToUserForTestingEnabled(false); |
- |
// Can't use STLDeleteElements because of the private destructor of User. |
for (user_manager::UserList::iterator it = user_list_.begin(); |
it != user_list_.end(); |
@@ -56,37 +50,37 @@ FakeUserManager::~FakeUserManager() { |
const user_manager::User* FakeUserManager::AddUser(const std::string& email) { |
user_manager::User* user = user_manager::User::CreateRegularUser(email); |
- user->set_username_hash(email + kUserIdHashSuffix); |
+ user->set_username_hash( |
+ ProfileHelper::GetUserIdHashByUserIdForTesting(email)); |
user->SetStubImage(user_manager::UserImage( |
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
IDR_PROFILE_PICTURE_LOADING)), |
user_manager::User::USER_IMAGE_PROFILE, |
false); |
user_list_.push_back(user); |
- ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); |
return user; |
} |
const user_manager::User* FakeUserManager::AddPublicAccountUser( |
const std::string& email) { |
user_manager::User* user = user_manager::User::CreatePublicAccountUser(email); |
- user->set_username_hash(email + kUserIdHashSuffix); |
+ user->set_username_hash( |
+ ProfileHelper::GetUserIdHashByUserIdForTesting(email)); |
user->SetStubImage(user_manager::UserImage( |
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
IDR_PROFILE_PICTURE_LOADING)), |
user_manager::User::USER_IMAGE_PROFILE, |
false); |
user_list_.push_back(user); |
- ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); |
return user; |
} |
void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) { |
user_manager::User* user = |
user_manager::User::CreateKioskAppUser(kiosk_app_username); |
- user->set_username_hash(kiosk_app_username + kUserIdHashSuffix); |
+ user->set_username_hash( |
+ ProfileHelper::GetUserIdHashByUserIdForTesting(kiosk_app_username)); |
user_list_.push_back(user); |
- ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); |
} |
void FakeUserManager::RemoveUserFromList(const std::string& email) { |
@@ -99,7 +93,8 @@ void FakeUserManager::RemoveUserFromList(const std::string& email) { |
} |
void FakeUserManager::LoginUser(const std::string& email) { |
- UserLoggedIn(email, email + kUserIdHashSuffix, false); |
+ UserLoggedIn( |
+ email, ProfileHelper::GetUserIdHashByUserIdForTesting(email), false); |
} |
const user_manager::UserList& FakeUserManager::GetUsers() const { |
@@ -131,6 +126,7 @@ void FakeUserManager::UserLoggedIn(const std::string& email, |
++it) { |
if ((*it)->username_hash() == username_hash) { |
(*it)->set_is_logged_in(true); |
+ (*it)->set_profile_is_created(); |
logged_in_users_.push_back(*it); |
if (!primary_user_) |
@@ -165,6 +161,8 @@ user_manager::User* FakeUserManager::GetActiveUser() { |
void FakeUserManager::SwitchActiveUser(const std::string& email) { |
active_user_id_ = email; |
+ ProfileHelper::Get()->ActiveUserHashChanged( |
+ ProfileHelper::GetUserIdHashByUserIdForTesting(email)); |
} |
void FakeUserManager::SaveUserDisplayName( |