chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

Unified Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv

Patch Set: rebased Created 5 years, 8 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/file_manager/file_manager_browsertest.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | chrome/browser/ui/webui/options/options_ui_browsertest.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 bfc4e3b9517fdaa03f693a745fbfa9d04eef59b9..ca519f1672d99da31e97b90b3fd1aa3ff191a69c 100644

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

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

@@ -71,6 +71,7 @@ namespace chromeos {

namespace {

+const char kGaiaID[] = "12345";

const char kUsername[] = "test_user@gmail.com";

const char kSupervisedUserID[] = "supervised_user@locally-managed.localhost";

const char kPassword[] = "test_password";

@@ -227,6 +228,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {

EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))

.Times(2);

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(kUsername);

test::UserSessionManagerTestApi session_manager_test_api(

@@ -277,6 +279,7 @@ void ExistingUserControllerUntrustedTest::SetUpSessionManager() {

IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,

ExistingUserLoginForbidden) {

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(kUsername);

existing_user_controller()->Login(user_context, SigninSpecifics());

@@ -285,6 +288,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,

IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,

NewUserLoginForbidden) {

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(kUsername);

existing_user_controller()->CompleteLogin(user_context);

@@ -569,6 +573,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,

LoginStopsAutoLogin) {

// Set up mocks to check login success.

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(user_context.GetUserID());

ExpectSuccessfulLogin(user_context);

@@ -602,6 +607,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,

EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))

.Times(2);

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

test::UserSessionManagerTestApi session_manager_test_api(

UserSessionManager::GetInstance());

@@ -631,6 +637,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,

CompleteLoginStopsAutoLogin) {

// Set up mocks to check login success.

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(user_context.GetUserID());

ExpectSuccessfulLogin(user_context);

@@ -703,6 +710,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,

// Check that the attempt to start a public session fails with an error.

ExpectLoginFailure();

UserContext user_context(kUsername);

+ user_context.SetGaiaID(kGaiaID);

user_context.SetKey(Key(kPassword));

user_context.SetUserIDHash(user_context.GetUserID());

existing_user_controller()->Login(user_context, SigninSpecifics());