Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(953)

Unified Diff: chrome/browser/chromeos/login/fake_user_manager.cc

Issue 117263002: Prevent ONC-pushed certificates from being used with multiprofiles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Philipps suggestion, another test Created 7 years 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
Index: chrome/browser/chromeos/login/fake_user_manager.cc
diff --git a/chrome/browser/chromeos/login/fake_user_manager.cc b/chrome/browser/chromeos/login/fake_user_manager.cc
index 851256a6018deb24421c4ef6b41ce4ebca7f5e03..023a51aeb0146c9a0ee9e4cf87b39cafb84332f4 100644
--- a/chrome/browser/chromeos/login/fake_user_manager.cc
+++ b/chrome/browser/chromeos/login/fake_user_manager.cc
@@ -27,11 +27,12 @@ FakeUserManager::~FakeUserManager() {
}
}
-void FakeUserManager::AddUser(const std::string& email) {
+const User* FakeUserManager::AddUser(const std::string& email) {
User* user = User::CreateRegularUser(email);
user->set_username_hash(email + kUserIdHashSuffix);
user->SetStubImage(User::kProfileImageIndex, false);
user_list_.push_back(user);
+ return user;
}
void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) {
@@ -44,6 +45,10 @@ void FakeUserManager::LoginUser(const std::string& email) {
UserLoggedIn(email, email + kUserIdHashSuffix, false);
}
+void FakeUserManager::SetProfileForUser(const User* user, Profile* profile) {
+ user_to_profile_[user] = profile;
+}
+
const UserList& FakeUserManager::GetUsers() const {
return user_list_;
}
@@ -173,8 +178,9 @@ User* FakeUserManager::GetUserByProfile(Profile* profile) const {
}
Profile* FakeUserManager::GetProfileByUser(const User* user) const {
- NOTIMPLEMENTED();
- return NULL;
+ std::map<const User*, Profile*>::const_iterator it =
+ user_to_profile_.find(user);
+ return it == user_to_profile_.end() ? NULL : it->second;
}
base::string16 FakeUserManager::GetUserDisplayName(

Powered by Google App Engine
This is Rietveld 408576698