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

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

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.h
diff --git a/chrome/browser/chromeos/login/fake_user_manager.h b/chrome/browser/chromeos/login/fake_user_manager.h
index 4e5d0eaec69e13bd31dce6fb742cd8443b33349e..31ab13656e8d6b0fba0d063464debf3c4f34d026 100644
--- a/chrome/browser/chromeos/login/fake_user_manager.h
+++ b/chrome/browser/chromeos/login/fake_user_manager.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_FAKE_USER_MANAGER_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_FAKE_USER_MANAGER_H_
+#include <map>
#include <string>
#include "base/memory/scoped_ptr.h"
@@ -25,7 +26,7 @@ class FakeUserManager : public UserManager {
virtual ~FakeUserManager();
// Create and add a new user.
- void AddUser(const std::string& email);
+ const User* AddUser(const std::string& email);
// Create and add a kiosk app user.
void AddKioskAppUser(const std::string& kiosk_app_username);
@@ -33,6 +34,9 @@ class FakeUserManager : public UserManager {
// Calculates the user name hash and calls UserLoggedIn to login a user.
void LoginUser(const std::string& email);
+ // Associates |profile| with |user|, for GetProfileByUser().
+ void SetProfileForUser(const User* user, Profile* profile);
+
// UserManager overrides.
virtual const UserList& GetUsers() const OVERRIDE;
virtual UserList GetUsersAdmittedForMultiProfile() const OVERRIDE;
@@ -136,6 +140,7 @@ class FakeUserManager : public UserManager {
UserList logged_in_users_;
std::string owner_email_;
User* primary_user_;
+ std::map<const User*, Profile*> user_to_profile_;
// If set this is the active user. If empty, the first created user is the
// active user.

Powered by Google App Engine
This is Rietveld 408576698