| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 | 178 |
| 179 content::TestBrowserThreadBundle thread_bundle_; | 179 content::TestBrowserThreadBundle thread_bundle_; |
| 180 | 180 |
| 181 policy::DevicePolicyBuilder device_policy_; | 181 policy::DevicePolicyBuilder device_policy_; |
| 182 | 182 |
| 183 DeviceSettingsTestHelper device_settings_test_helper_; | 183 DeviceSettingsTestHelper device_settings_test_helper_; |
| 184 // Note that FakeUserManager is used by ProfileHelper, which some of the | 184 // Note that FakeUserManager is used by ProfileHelper, which some of the |
| 185 // tested classes depend on implicitly. | 185 // tested classes depend on implicitly. |
| 186 FakeUserManager* user_manager_; | 186 FakeUserManager* user_manager_; |
| 187 ScopedUserManagerEnabler user_manager_enabler_; | 187 ScopedUserManagerEnabler user_manager_enabler_; |
| 188 scoped_ptr<TestingProfile> profile_; | |
| 189 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_; | 188 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_; |
| 190 // Local DeviceSettingsService instance for tests. Avoid using in combination | 189 // Local DeviceSettingsService instance for tests. Avoid using in combination |
| 191 // with the global instance (DeviceSettingsService::Get()). | 190 // with the global instance (DeviceSettingsService::Get()). |
| 192 DeviceSettingsService device_settings_service_; | 191 DeviceSettingsService device_settings_service_; |
| 192 scoped_ptr<TestingProfile> profile_; |
| 193 | 193 |
| 194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_; | 194 scoped_ptr<DBusThreadManagerSetter> dbus_setter_; |
| 195 | 195 |
| 196 private: | 196 private: |
| 197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); | 197 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); |
| 198 }; | 198 }; |
| 199 | 199 |
| 200 } // namespace chromeos | 200 } // namespace chromeos |
| 201 | 201 |
| 202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ | 202 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ |
| OLD | NEW |