chrome/browser/chromeos/settings/device_settings_test_helper.cc - Issue 822523003: Implement device-local account policy pushing

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 822523003: Implement device-local account policy pushing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_442800_switch_device_cloud_policy_invalidator

Patch Set: Removed the need to initialize singletons in unit tests. Created 5 years, 11 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/policy/device_local_account_policy_service_unittest.cc ('K') | « chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('k') | no next file » | 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 712b3566c82bfa071c1eb06313fa87fd8cc22eba..cf12dc514557642d9f2b477931b956fccac495e4 100644

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

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

@@ -200,7 +200,8 @@ ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {

}

DeviceSettingsTestBase::DeviceSettingsTestBase()

- : user_manager_(new FakeUserManager()),

+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),

+ user_manager_(new FakeUserManager()),

user_manager_enabler_(user_manager_),

owner_key_util_(new ownership::MockOwnerKeyUtil()) {

OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(