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

Unified Diff: chrome/browser/chromeos/login/users/mock_user_manager.h

Issue 417623002: user_manager component: Add UserManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: check for LocalState, update test - make sure that policies are initialized on UserManager creation Created 6 years, 5 months 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/users/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h
index 26aa3e6014c1ce9cdf4583ce06afe3ef2ffe752c..a5ad8de04191168ae6773331bca62358f49374e7 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h
@@ -29,7 +29,7 @@ class MockUserManager : public UserManager {
MOCK_CONST_METHOD0(GetUsersAdmittedForMultiProfile,
user_manager::UserList(void));
MOCK_CONST_METHOD0(GetLoggedInUsers, const user_manager::UserList&(void));
- MOCK_METHOD0(GetLRULoggedInUsers, const user_manager::UserList&(void));
+ MOCK_CONST_METHOD0(GetLRULoggedInUsers, const user_manager::UserList&(void));
MOCK_METHOD3(UserLoggedIn, void(
const std::string&, const std::string&, bool));
MOCK_METHOD1(SwitchActiveUser, void(const std::string& email));
@@ -78,11 +78,11 @@ class MockUserManager : public UserManager {
MOCK_CONST_METHOD0(AreSupervisedUsersAllowed, bool(void));
// You can't mock these functions easily because nobody can create
- // User objects but the UserManagerImpl and us.
+ // User objects but the ChromeUserManager and us.
virtual const user_manager::UserList& GetUsers() const OVERRIDE;
virtual const user_manager::User* GetLoggedInUser() const OVERRIDE;
virtual user_manager::UserList GetUnlockUsers() const OVERRIDE;
- virtual const std::string& GetOwnerEmail() OVERRIDE;
+ virtual const std::string& GetOwnerEmail() const OVERRIDE;
virtual user_manager::User* GetLoggedInUser() OVERRIDE;
virtual const user_manager::User* GetActiveUser() const OVERRIDE;
virtual user_manager::User* GetActiveUser() OVERRIDE;
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/login/users/mock_user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698