Index: chrome/browser/chromeos/login/mock_user_manager.h |
diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h |
index b096fa65f2efde885360c9f96bbce822091c666f..ec8f62a4c81a7eca71e59d5a2a82911f1bbf690e 100644 |
--- a/chrome/browser/chromeos/login/mock_user_manager.h |
+++ b/chrome/browser/chromeos/login/mock_user_manager.h |
@@ -24,11 +24,9 @@ class MockUserManager : public UserManager { |
virtual ~MockUserManager(); |
MOCK_METHOD0(Shutdown, void(void)); |
- MOCK_CONST_METHOD0(GetUsers, const UserList&(void)); |
MOCK_CONST_METHOD0(GetUsersAdmittedForMultiProfile, UserList(void)); |
MOCK_CONST_METHOD0(GetLoggedInUsers, const UserList&(void)); |
MOCK_METHOD0(GetLRULoggedInUsers, const UserList&(void)); |
- MOCK_METHOD0(GetOwnerEmail, const std::string&(void)); |
MOCK_METHOD3(UserLoggedIn, void( |
const std::string&, const std::string&, bool)); |
MOCK_METHOD1(SwitchActiveUser, void(const std::string& email)); |
@@ -103,7 +101,9 @@ class MockUserManager : public UserManager { |
// You can't mock these functions easily because nobody can create |
// User objects but the UserManagerImpl and us. |
+ virtual const UserList& GetUsers() const OVERRIDE; |
virtual const User* GetLoggedInUser() const OVERRIDE; |
+ virtual const std::string& GetOwnerEmail() OVERRIDE; |
virtual User* GetLoggedInUser() OVERRIDE; |
virtual const User* GetActiveUser() const OVERRIDE; |
virtual User* GetActiveUser() OVERRIDE; |
@@ -123,6 +123,7 @@ class MockUserManager : public UserManager { |
User* user_; |
scoped_ptr<MockUserImageManager> user_image_manager_; |
scoped_ptr<UserFlow> user_flow_; |
+ UserList user_list_; |
}; |
} // namespace chromeos |