chrome/browser/chromeos/settings/device_settings_test_helper.h - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

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.h

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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.h

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

index f19e271b681fc73b89728fee866706001690e75f..d689947725deb29193d852905f791e8714f97d7f 100644

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

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

@@ -167,6 +167,8 @@ class DeviceSettingsTestBase : public testing::Test {

DeviceSettingsTestHelper device_settings_test_helper_;

scoped_refptr<MockOwnerKeyUtil> owner_key_util_;

+ // Local DeviceSettingsService instance for tests. Avoid using in combination

+ // with the global instance (DeviceSettingsService::Get()).

DeviceSettingsService device_settings_service_;

private: