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_service.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 delete operation; | 360 delete operation; |
361 | 361 |
362 StartNextOperation(); | 362 StartNextOperation(); |
363 } | 363 } |
364 | 364 |
365 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() { | 365 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() { |
366 DeviceSettingsService::Initialize(); | 366 DeviceSettingsService::Initialize(); |
367 } | 367 } |
368 | 368 |
369 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { | 369 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { |
| 370 // Clean pending operations. |
| 371 DeviceSettingsService::Get()->UnsetSessionManager(); |
370 DeviceSettingsService::Shutdown(); | 372 DeviceSettingsService::Shutdown(); |
371 } | 373 } |
372 | 374 |
373 } // namespace chromeos | 375 } // namespace chromeos |
OLD | NEW |