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 799d87139af00917f930e036ab230ef17a21c24d..6d1862703e4db615a7a40257726179bc52456531 100644 |
--- a/chrome/browser/chromeos/login/mock_user_manager.h |
+++ b/chrome/browser/chromeos/login/mock_user_manager.h |
@@ -27,8 +27,8 @@ class MockUserManager : public UserManager { |
MOCK_METHOD1(RemoveUserFromList, void(const std::string&)); |
MOCK_CONST_METHOD1(IsKnownUser, bool(const std::string&)); |
MOCK_CONST_METHOD1(FindUser, const User*(const std::string&)); |
- MOCK_CONST_METHOD0(logged_in_user, const User&(void)); |
- MOCK_METHOD0(logged_in_user, User&(void)); |
+ MOCK_CONST_METHOD0(GetLoggedInUser, const User&(void)); |
+ MOCK_METHOD0(GetLoggedInUser, User&(void)); |
MOCK_CONST_METHOD1(IsDisplayNameUnique, bool(const std::string&)); |
MOCK_METHOD2(SaveUserOAuthStatus, void(const std::string&, |
User::OAuthTokenStatus)); |
@@ -41,16 +41,15 @@ class MockUserManager : public UserManager { |
const FilePath&)); |
MOCK_METHOD1(SaveUserImageFromProfileImage, void(const std::string&)); |
MOCK_METHOD1(DownloadProfileImage, void(const std::string&)); |
- MOCK_CONST_METHOD0(current_user_is_owner, bool(void)); |
- MOCK_METHOD1(set_current_user_is_owner, void(bool)); |
- MOCK_CONST_METHOD0(current_user_is_new, bool(void)); |
- MOCK_CONST_METHOD0(user_is_logged_in, bool(void)); |
+ MOCK_CONST_METHOD0(IsCurrentUserOwner, bool(void)); |
+ MOCK_CONST_METHOD0(IsCurrentUserNew, bool(void)); |
+ MOCK_CONST_METHOD0(IsUserLoggedIn, bool(void)); |
MOCK_CONST_METHOD0(IsLoggedInAsDemoUser, bool(void)); |
MOCK_CONST_METHOD0(IsLoggedInAsGuest, bool(void)); |
MOCK_METHOD1(AddObserver, void(UserManager::Observer*)); |
MOCK_METHOD1(RemoveObserver, void(UserManager::Observer*)); |
MOCK_METHOD0(NotifyLocalStateChanged, void(void)); |
- MOCK_CONST_METHOD0(downloaded_profile_image, const SkBitmap& (void)); |
+ MOCK_CONST_METHOD0(DownloadedProfileImage, const SkBitmap& (void)); |
}; |
} // namespace chromeos |