chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 11991002: Merge 176800

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/existing_user_controller_browsertest.cc

Issue 11991002: Merge 176800 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

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

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

===================================================================

--- chrome/browser/chromeos/login/existing_user_controller_browsertest.cc (revision 177312)

+++ chrome/browser/chromeos/login/existing_user_controller_browsertest.cc (working copy)

@@ -250,7 +250,7 @@

.Times(1)

.WillOnce(WithArg<0>(Invoke(CreateAuthenticator)));

EXPECT_CALL(*mock_login_utils_,

- PrepareProfile(kUsername, _, kPassword, false, _, _, _))

+ PrepareProfile(kUsername, _, kPassword, _, _, _))

.Times(1)

.WillOnce(InvokeWithoutArgs(&profile_prepared_cb_,

&base::Callback<void(void)>::Run));

@@ -310,7 +310,7 @@

.Times(1)

.WillOnce(WithArg<0>(Invoke(CreateAuthenticatorNewUser)));

EXPECT_CALL(*mock_login_utils_,

- PrepareProfile(kNewUsername, _, kPassword, false, _, _, _))

+ PrepareProfile(kNewUsername, _, kPassword, _, _, _))

.Times(1)

.WillOnce(InvokeWithoutArgs(&profile_prepared_cb_,

&base::Callback<void(void)>::Run));