chrome/browser/chromeos/login/user_manager_unittest.cc - Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given.

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/login/user_manager_unittest.cc

Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Further test fixes. Created 8 years, 6 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/login_browsertest.cc ('K') | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | chrome/browser/chromeos/system/drm_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 63e98bb84ec0ccc68eedaae1553d76a1ce3b06c6..a0e9ef0c7a990e9138c89dd9a86a328e9e3ce7cb 100644

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

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

@@ -62,7 +62,6 @@ class UserManagerTest : public testing::Test {

UserManager::RegisterPrefs(local_state_.get());

old_user_manager_ = UserManager::Get();

- // A stub user is automatically logged in by UserManager. Reset this.

ResetUserManager();

}

@@ -101,11 +100,6 @@ class UserManagerTest : public testing::Test {

void ResetUserManager() {

user_manager_impl.reset(new UserManagerImpl());

- // Clean up the stub user that gets created in the UserManagerImpl

- // constructor.

- delete user_manager_impl->logged_in_user_;

- user_manager_impl->logged_in_user_ = NULL;

- user_manager_impl->is_current_user_ephemeral_ = false;

UserManager::Set(user_manager_impl.get());

}