Chromium Code Reviews| 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 0e5742e3aabdd187f218634ab98599b2415815de..71f7edd4aad4021d14d9de5aca287cec8b7eca15 100644 |
| --- a/chrome/browser/chromeos/settings/device_settings_test_helper.h |
| +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h |
| @@ -18,6 +18,7 @@ |
| #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
| #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
| #include "chrome/browser/chromeos/policy/device_policy_builder.h" |
| +#include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" |
| #include "chromeos/dbus/session_manager_client.h" |
| @@ -186,6 +187,9 @@ class DeviceSettingsTestBase : public testing::Test { |
| // Local DeviceSettingsService instance for tests. Avoid using in combination |
| // with the global instance (DeviceSettingsService::Get()). |
| DeviceSettingsService device_settings_service_; |
| + // Local CrosSettings instance for tests. Avoid using in combination |
| + // with the global instance (CrosSettings::Get()). |
| + CrosSettings cros_settings_; |
|
Mattias Nissler (ping if slow)
2015/03/16 08:51:42
Sigh, all this cruft in here :) Not your fault.
|
| scoped_ptr<TestingProfile> profile_; |
| scoped_ptr<DBusThreadManagerSetter> dbus_setter_; |