chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 656283002: [session_manager] Move user session initialization code out of ExistingUserController

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 656283002: [session_manager] Move user session initialization code out of ExistingUserController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add PerformPreLoginActions, PerformLoginFinishedActions methods Created 6 years, 2 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

« chrome/browser/chromeos/login/existing_user_controller.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/fake_login_utils.cc » ('j') | google_apis/gaia/gaia_auth_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

index af8078cf8c716f4e582a40095b225fbf0be82a8d..6940a354460c47f96161a4ae5b033afe382742df 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -175,7 +175,8 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {

profile_prepared_cb_ =

base::Bind(&ExistingUserController::OnProfilePrepared,

base::Unretained(existing_user_controller()),

- testing_profile_.get());

+ testing_profile_.get(),

+ false);

}

virtual void TearDownOnMainThread() override {

@@ -294,10 +295,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,

StartWizardPtr(WizardController::kEnrollmentScreenName,

_))

.Times(0);

- EXPECT_CALL(*mock_login_display_host_,

- StartWizardPtr(WizardController::kTermsOfServiceScreenName,

- NULL))

- .Times(1);

UserContext user_context(kNewUsername);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(kNewUsername);