chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Unified Diff: chrome/browser/chromeos/login/kiosk_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_browsertest.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7b80284b2d6b88235373cf8a905ab1877845fecf..743d1b347b55953c11230a961b1b5f10400c875c 100644

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

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

@@ -451,6 +451,7 @@ class KioskTest : public OobeBaseTest {

public:

KioskTest()

: settings_helper_(false),

+ test_owner_account_id_(AccountId::FromUserEmail(kTestOwnerEmail)),

achuithb 2015/10/23 00:08:49 in-class member initialization

Alexander Alekseev 2015/10/23 09:11:21 Done.

use_consumer_kiosk_mode_(true),

fake_cws_(new FakeCWS) {

set_exit_when_last_browser_closes(false);

@@ -704,7 +705,7 @@ class KioskTest : public OobeBaseTest {

}

void RunAppLaunchNetworkDownTest() {

- mock_user_manager()->SetActiveUser(kTestOwnerEmail);

+ mock_user_manager()->SetActiveUser(test_owner_account_id_);

AppLaunchSigninScreen::SetUserManagerForTesting(mock_user_manager());

// Mock network could be configured with owner's password.

@@ -788,6 +789,8 @@ class KioskTest : public OobeBaseTest {

ScopedCrosSettingsTestHelper settings_helper_;

scoped_ptr<FakeOwnerSettingsService> owner_settings_service_;

+ const AccountId test_owner_account_id_;

private:

bool use_consumer_kiosk_mode_;

std::string test_app_id_;

@@ -2017,7 +2020,7 @@ class KioskEnterpriseTest : public KioskTest {

void SetUpInProcessBrowserTestFixture() override {

policy::DevicePolicyCrosTestHelper::MarkAsEnterpriseOwnedBy(

- kTestOwnerEmail);

+ test_owner_account_id_.GetUserEmail());

settings_helper_.SetCurrentUserIsOwner(false);

KioskTest::SetUpInProcessBrowserTestFixture();

@@ -2228,7 +2231,7 @@ class KioskHiddenWebUITest : public KioskTest,

IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {

// Add a device owner.

FakeChromeUserManager* user_manager = new FakeChromeUserManager();

- user_manager->AddUser(kTestOwnerEmail);

+ user_manager->AddUser(test_owner_account_id_);

ScopedUserManagerEnabler enabler(user_manager);

// Set kiosk app to autolaunch.