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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

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 5a37eecd013e32fe787aad47112581fddf9cb184..94de587ae22979dcab44c406bd127479aad969bc 100644

--- a/chrome/browser/chromeos/login/mock_user_manager.h

+++ b/chrome/browser/chromeos/login/mock_user_manager.h

@@ -38,6 +38,7 @@ 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_METHOD1(FindUserAndModify, User*(const std::string&));

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

User::OAuthTokenStatus));

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