chrome/browser/chromeos/settings/session_manager_operation_unittest.cc - Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager

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/session_manager_operation_unittest.cc

Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)

Patch Set: Re-enable tests Created 4 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

« chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc ('K') | « chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc ('k') | chrome/browser/chromeos/system/device_disabling_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a04ee7c398114ac28f8f97245c96f39a970a9e65..fbdd11afe2a77567c53736d1c7534af37c9005fc 100644

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

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

@@ -47,7 +47,7 @@ class SessionManagerOperationTest : public testing::Test {

: ui_thread_(content::BrowserThread::UI, &message_loop_),

file_thread_(content::BrowserThread::FILE, &message_loop_),

owner_key_util_(new ownership::MockOwnerKeyUtil()),

- user_manager_(new user_manager::FakeUserManager()),

+ user_manager_(new chromeos::FakeChromeUserManager()),

user_manager_enabler_(user_manager_),

validated_(false) {

OwnerSettingsServiceChromeOSFactory::GetInstance()

@@ -93,7 +93,7 @@ class SessionManagerOperationTest : public testing::Test {

DeviceSettingsTestHelper device_settings_test_helper_;

scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;

- user_manager::FakeUserManager* user_manager_;

+ chromeos::FakeChromeUserManager* user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

std::unique_ptr<TestingProfile> profile_;