Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2747)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Rebased. Created 5 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_auto_login_unittest.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 babb422595dbc9c04b5f1207402e4b7dc809c31f..cdff2155aac9cae6888dc90523e16e1fd614225a 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -105,7 +105,9 @@ void WaitForPermanentlyUntrustedStatusAndRun(const base::Closure& callback) {
class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
protected:
- ExistingUserControllerTest() : mock_login_display_(NULL) {}
+ ExistingUserControllerTest()
+ : mock_login_display_(NULL),
achuithb 2015/10/23 00:08:49 in-class member initialization
Alexander Alekseev 2015/10/23 09:11:21 Done.
+ account_id_(AccountId::FromUserEmail(kUsername)) {}
ExistingUserController* existing_user_controller() {
return ExistingUserController::current_controller();
@@ -196,8 +198,9 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
return existing_user_controller()->auto_login_timer_.get();
}
- const std::string& auto_login_username() const {
- return existing_user_controller()->public_session_auto_login_username_;
+ const AccountId auto_login_account_id() const {
achuithb 2015/10/23 00:08:49 Return AccountId not const AccountId
Alexander Alekseev 2015/10/23 09:11:21 Done.
+ return AccountId::FromUserEmail(
+ existing_user_controller()->public_session_auto_login_username_);
}
int auto_login_delay() const {
@@ -218,21 +221,23 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
// Mock URLFetcher.
MockURLFetcherFactory<SuccessFetcher> factory_;
+ const AccountId account_id_;
+
private:
DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest);
};
IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, PRE_ExistingUserLogin) {
- RegisterUser(kUsername);
+ RegisterUser(account_id_.GetUserEmail());
}
IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
.Times(2);
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(kUsername);
+ user_context.SetUserIDHash(account_id_.GetUserEmail());
test::UserSessionManagerTestApi session_manager_test_api(
UserSessionManager::GetInstance());
session_manager_test_api.InjectStubUserContext(user_context);
@@ -280,19 +285,19 @@ void ExistingUserControllerUntrustedTest::SetUpSessionManager() {
IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
ExistingUserLoginForbidden) {
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(kUsername);
+ user_context.SetUserIDHash(account_id_.GetUserEmail());
existing_user_controller()->Login(user_context, SigninSpecifics());
}
IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
NewUserLoginForbidden) {
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(kUsername);
+ user_context.SetUserIDHash(account_id_.GetUserEmail());
existing_user_controller()->CompleteLogin(user_context);
}
@@ -305,9 +310,9 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
SupervisedUserLoginForbidden) {
- UserContext user_context(kSupervisedUserID);
+ UserContext user_context(AccountId::FromUserEmail(kSupervisedUserID));
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(kUsername);
+ user_context.SetUserIDHash(account_id_.GetUserEmail());
existing_user_controller()->Login(user_context, SigninSpecifics());
}
@@ -318,7 +323,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
SupervisedUserCreationScreen supervised_user_creation_screen(
&mock_base_screen_delegate, &supervised_user_creation_screen_handler);
- supervised_user_creation_screen.AuthenticateManager(kUsername, kPassword);
+ supervised_user_creation_screen.AuthenticateManager(
+ account_id_.GetUserEmail(), kPassword);
}
MATCHER_P(HasDetails, expected, "") {
@@ -329,10 +335,10 @@ class ExistingUserControllerPublicSessionTest
: public ExistingUserControllerTest {
protected:
ExistingUserControllerPublicSessionTest()
- : public_session_user_id_(policy::GenerateDeviceLocalAccountUserId(
- kPublicSessionAccountId,
- policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) {
- }
+ : public_session_user_id_(
+ AccountId::FromUserEmail(policy::GenerateDeviceLocalAccountUserId(
+ kPublicSessionAccountId,
+ policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION))) {}
void SetUpOnMainThread() override {
ExistingUserControllerTest::SetUpOnMainThread();
@@ -353,7 +359,7 @@ class ExistingUserControllerPublicSessionTest
->platform_part()
->browser_policy_connector_chromeos()
->GetDeviceLocalAccountPolicyService()
- ->GetBrokerForUser(public_session_user_id_)
+ ->GetBrokerForUser(public_session_user_id_.GetUserEmail())
->core()
->store();
if (!store->has_policy()) {
@@ -491,7 +497,7 @@ class ExistingUserControllerPublicSessionTest
run_loop.Run();
}
- const std::string public_session_user_id_;
+ const AccountId public_session_user_id_;
private:
DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerPublicSessionTest);
@@ -500,20 +506,20 @@ class ExistingUserControllerPublicSessionTest
IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
ConfigureAutoLoginUsingPolicy) {
existing_user_controller()->OnSigninScreenReady();
- EXPECT_EQ("", auto_login_username());
+ EXPECT_TRUE(auto_login_account_id().empty());
EXPECT_EQ(0, auto_login_delay());
EXPECT_FALSE(auto_login_timer());
// Set the policy.
SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
- EXPECT_EQ(public_session_user_id_, auto_login_username());
+ EXPECT_EQ(public_session_user_id_, auto_login_account_id());
EXPECT_EQ(kAutoLoginLongDelay, auto_login_delay());
ASSERT_TRUE(auto_login_timer());
EXPECT_TRUE(auto_login_timer()->IsRunning());
// Unset the policy.
SetAutoLoginPolicy("", 0);
- EXPECT_EQ("", auto_login_username());
+ EXPECT_TRUE(auto_login_account_id().empty());
EXPECT_EQ(0, auto_login_delay());
ASSERT_TRUE(auto_login_timer());
EXPECT_FALSE(auto_login_timer()->IsRunning());
@@ -523,8 +529,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
AutoLoginNoDelay) {
// Set up mocks to check login success.
UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- public_session_user_id_);
- user_context.SetUserIDHash(user_context.GetUserID());
+ public_session_user_id_.GetUserEmail());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
ExpectSuccessfulLogin(user_context);
existing_user_controller()->OnSigninScreenReady();
@@ -537,8 +543,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
AutoLoginShortDelay) {
// Set up mocks to check login success.
UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- public_session_user_id_);
- user_context.SetUserIDHash(user_context.GetUserID());
+ public_session_user_id_.GetUserEmail());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
ExpectSuccessfulLogin(user_context);
existing_user_controller()->OnSigninScreenReady();
@@ -569,10 +575,10 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
LoginStopsAutoLogin) {
// Set up mocks to check login success.
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(user_context.GetUserID());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
ExpectSuccessfulLogin(user_context);
existing_user_controller()->OnSigninScreenReady();
@@ -603,7 +609,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
GuestModeLoginStopsAutoLogin) {
EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
.Times(2);
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
test::UserSessionManagerTestApi session_manager_test_api(
@@ -633,10 +639,10 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
CompleteLoginStopsAutoLogin) {
// Set up mocks to check login success.
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(user_context.GetUserID());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
ExpectSuccessfulLogin(user_context);
EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin())
.Times(1);
@@ -668,8 +674,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
PublicSessionLoginStopsAutoLogin) {
// Set up mocks to check login success.
UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- public_session_user_id_);
- user_context.SetUserIDHash(user_context.GetUserID());
+ public_session_user_id_.GetUserEmail());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
ExpectSuccessfulLogin(user_context);
existing_user_controller()->OnSigninScreenReady();
SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
@@ -682,7 +688,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
// Login and check that it stopped the timer.
existing_user_controller()->Login(
UserContext(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- public_session_user_id_),
+ public_session_user_id_.GetUserEmail()),
SigninSpecifics());
EXPECT_TRUE(is_login_in_progress());
@@ -706,10 +712,10 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
// Check that the attempt to start a public session fails with an error.
ExpectLoginFailure();
- UserContext user_context(kUsername);
+ UserContext user_context(account_id_);
user_context.SetGaiaID(kGaiaID);
user_context.SetKey(Key(kPassword));
- user_context.SetUserIDHash(user_context.GetUserID());
+ user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail());
existing_user_controller()->Login(user_context, SigninSpecifics());
}
« chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698