chrome/browser/chromeos/login/mock_user_manager.h - Issue 69863006: Address races in UserImageManagerImpl

Side by Side Diff: chrome/browser/chromeos/login/mock_user_manager.h

Issue 69863006: Address races in UserImageManagerImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix WallpaperManager browser tests now that UserImageLoader contains a DCHECK(success). Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/fake_user_manager.cc ('k') | chrome/browser/chromeos/login/user_image_loader.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_	6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/files/file_path.h"	10 #include "base/files/file_path.h"

(...skipping 20 matching lines...) Expand all Loading...
31 MOCK_METHOD0(GetLRULoggedInUsers, const UserList&(void));	31 MOCK_METHOD0(GetLRULoggedInUsers, const UserList&(void));

32 MOCK_METHOD3(UserLoggedIn, void(	32 MOCK_METHOD3(UserLoggedIn, void(

33 const std::string&, const std::string&, bool));	33 const std::string&, const std::string&, bool));

34 MOCK_METHOD1(SwitchActiveUser, void(const std::string& email));	34 MOCK_METHOD1(SwitchActiveUser, void(const std::string& email));

35 MOCK_METHOD0(SessionStarted, void(void));	35 MOCK_METHOD0(SessionStarted, void(void));

36 MOCK_METHOD0(RestoreActiveSessions, void(void));	36 MOCK_METHOD0(RestoreActiveSessions, void(void));

37 MOCK_METHOD2(RemoveUser, void(const std::string&, RemoveUserDelegate*));	37 MOCK_METHOD2(RemoveUser, void(const std::string&, RemoveUserDelegate*));

38 MOCK_METHOD1(RemoveUserFromList, void(const std::string&));	38 MOCK_METHOD1(RemoveUserFromList, void(const std::string&));

39 MOCK_CONST_METHOD1(IsKnownUser, bool(const std::string&));	39 MOCK_CONST_METHOD1(IsKnownUser, bool(const std::string&));

40 MOCK_CONST_METHOD1(FindUser, const User*(const std::string&));	40 MOCK_CONST_METHOD1(FindUser, const User*(const std::string&));

	41 MOCK_METHOD1(FindUserAndModify, User*(const std::string&));

41 MOCK_METHOD2(SaveUserOAuthStatus, void(const std::string&,	42 MOCK_METHOD2(SaveUserOAuthStatus, void(const std::string&,

42 User::OAuthTokenStatus));	43 User::OAuthTokenStatus));

43 MOCK_METHOD2(SaveUserDisplayName, void(const std::string&,	44 MOCK_METHOD2(SaveUserDisplayName, void(const std::string&,

44 const string16&));	45 const string16&));

45 MOCK_METHOD3(UpdateUserAccountData,	46 MOCK_METHOD3(UpdateUserAccountData,

46 void(const std::string&, const string16&, const std::string&));	47 void(const std::string&, const string16&, const std::string&));

47 MOCK_CONST_METHOD1(GetUserDisplayName, string16(const std::string&));	48 MOCK_CONST_METHOD1(GetUserDisplayName, string16(const std::string&));

48 MOCK_METHOD2(SaveUserDisplayEmail, void(const std::string&,	49 MOCK_METHOD2(SaveUserDisplayEmail, void(const std::string&,

49 const std::string&));	50 const std::string&));

50 MOCK_CONST_METHOD1(GetUserDisplayEmail, std::string(const std::string&));	51 MOCK_CONST_METHOD1(GetUserDisplayEmail, std::string(const std::string&));

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123	124

124 scoped_ptr<UserFlow> user_flow_;	125 scoped_ptr<UserFlow> user_flow_;

125 scoped_ptr<MockUserImageManager> user_image_manager_;	126 scoped_ptr<MockUserImageManager> user_image_manager_;

126 scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;	127 scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;

127 UserList user_list_;	128 UserList user_list_;

128 };	129 };

129	130

130 } // namespace chromeos	131 } // namespace chromeos

131	132

132 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_	133 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_

OLD	NEW