chrome/browser/chromeos/settings/device_settings_test_helper.cc - Issue 398753004: [cros] Move User class to user_manager component.

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 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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:

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 e979d86833e47b6656d902232832ee6346a74b64..e214b434f0a22280341ec9108f0c0380bd5558ff 100644

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

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

@@ -252,7 +252,7 @@ void DeviceSettingsTestBase::ReloadDeviceSettings() {

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

bool tpm_is_ready) {

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

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

if (!user) {

user = user_manager_->AddUser(user_id);

profile_->set_profile_name(user_id);