chrome/browser/chromeos/login/mock_user_manager.h - Issue 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

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 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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

« no previous file with comments | « chrome/browser/chromeos/login/merge_session_throttle.cc ('k') | chrome/browser/chromeos/login/oauth2_login_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ec8f62a4c81a7eca71e59d5a2a82911f1bbf690e..e6a3dda4b042ccf8ea22a6673734e097c9cf7698 100644

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

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

@@ -69,8 +69,6 @@ class MockUserManager : public UserManager {

MOCK_METHOD1(RemoveSessionStateObserver,

void(UserManager::UserSessionStateObserver*));

MOCK_METHOD0(NotifyLocalStateChanged, void(void));

- MOCK_CONST_METHOD0(GetMergeSessionState, MergeSessionState(void));

- MOCK_METHOD1(SetMergeSessionState, void(MergeSessionState));

MOCK_METHOD2(SetUserFlow, void(const std::string&, UserFlow*));

MOCK_METHOD1(ResetUserFlow, void(const std::string&));

MOCK_METHOD4(CreateLocallyManagedUserRecord, const User*(

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