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

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/settings/device_settings_test_helper.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: Fix Win GN build. Created 5 years, 1 month 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/settings/device_settings_test_helper.h ('k') | chrome/browser/chromeos/status/data_promo_notification_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc

index 45236d809bf3fcabebbb08de4da849ba3a75ff21..f61155c8e35503ddc55366127771634cc4d8eb5c 100644

--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc

+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc

@@ -246,12 +246,12 @@ void DeviceSettingsTestBase::ReloadDeviceSettings() {

FlushDeviceSettings();

}

-void DeviceSettingsTestBase::InitOwner(const std::string& user_id,

+void DeviceSettingsTestBase::InitOwner(const AccountId& account_id,

bool tpm_is_ready) {

- const user_manager::User* user = user_manager_->FindUser(user_id);

+ const user_manager::User* user = user_manager_->FindUser(account_id);

if (!user) {

- user = user_manager_->AddUser(user_id);

- profile_->set_profile_name(user_id);

+ user = user_manager_->AddUser(account_id);

+ profile_->set_profile_name(account_id.GetUserEmail());

ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,

profile_.get());