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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_service.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_

6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_	6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_

7	7

8 #include <map>	8 #include <map>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 void ReloadDeviceSettings();	160 void ReloadDeviceSettings();

161	161

162 MessageLoop loop_;	162 MessageLoop loop_;

163 content::TestBrowserThread ui_thread_;	163 content::TestBrowserThread ui_thread_;

164 content::TestBrowserThread file_thread_;	164 content::TestBrowserThread file_thread_;

165	165

166 policy::DevicePolicyBuilder device_policy_;	166 policy::DevicePolicyBuilder device_policy_;

167	167

168 DeviceSettingsTestHelper device_settings_test_helper_;	168 DeviceSettingsTestHelper device_settings_test_helper_;

169 scoped_refptr<MockOwnerKeyUtil> owner_key_util_;	169 scoped_refptr<MockOwnerKeyUtil> owner_key_util_;

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

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

170 DeviceSettingsService device_settings_service_;	172 DeviceSettingsService device_settings_service_;

171	173

172 private:	174 private:

173 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);	175 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);

174 };	176 };

175	177

176 } // namespace chromeos	178 } // namespace chromeos

177	179

178 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_	180 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_

OLD	NEW