Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_test_helper.cc

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years 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
OLDNEW
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/message_loop.h" 7 #include "base/message_loop/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"
10 #include "chrome/browser/chromeos/settings/device_settings_service.h" 11 #include "chrome/browser/chromeos/settings/device_settings_service.h"
11 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h" 12 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
12 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/network/network_handler.h" 14 #include "chromeos/network/network_handler.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {} 19 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}
20 20
21 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {} 21 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}
22 22
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 void DeviceSettingsTestBase::FlushDeviceSettings() { 230 void DeviceSettingsTestBase::FlushDeviceSettings() {
231 device_settings_test_helper_.Flush(); 231 device_settings_test_helper_.Flush();
232 } 232 }
233 233
234 void DeviceSettingsTestBase::ReloadDeviceSettings() { 234 void DeviceSettingsTestBase::ReloadDeviceSettings() {
235 device_settings_service_.OwnerKeySet(true); 235 device_settings_service_.OwnerKeySet(true);
236 FlushDeviceSettings(); 236 FlushDeviceSettings();
237 } 237 }
238 238
239 } // namespace chromeos 239 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698