chrome/browser/chromeos/settings/device_settings_test_helper.cc - Issue 14008005: Move proto files back into chrome/browser/policy/proto

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

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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_unittest.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation.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 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"	5 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"

6	6

7 #include "base/message_loop.h"	7 #include "base/message_loop.h"

8 #include "base/run_loop.h"	8 #include "base/run_loop.h"

9 #include "base/threading/sequenced_worker_pool.h"	9 #include "base/threading/sequenced_worker_pool.h"

10 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

11 #include "chrome/browser/chromeos/settings/device_settings_service.h"	10 #include "chrome/browser/chromeos/settings/device_settings_service.h"

12 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"	11 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"

	12 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16	16

17 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}	17 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}

18	18

19 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}	19 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}

20	20

21 void DeviceSettingsTestHelper::FlushLoops() {	21 void DeviceSettingsTestHelper::FlushLoops() {

22 // DeviceSettingsService may trigger operations that hop back and forth	22 // DeviceSettingsService may trigger operations that hop back and forth

(...skipping 184 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
207 void DeviceSettingsTestBase::FlushDeviceSettings() {	207 void DeviceSettingsTestBase::FlushDeviceSettings() {

208 device_settings_test_helper_.Flush();	208 device_settings_test_helper_.Flush();

209 }	209 }

210	210

211 void DeviceSettingsTestBase::ReloadDeviceSettings() {	211 void DeviceSettingsTestBase::ReloadDeviceSettings() {

212 device_settings_service_.OwnerKeySet(true);	212 device_settings_service_.OwnerKeySet(true);

213 FlushDeviceSettings();	213 FlushDeviceSettings();

214 }	214 }

215	215

216 } // namespace chromeos	216 } // namespace chromeos

OLD	NEW