| Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
|
| index 24e588637001e31b1d4f9fd35806c5f900faf862..fed7034528326c12e993d53ebd398fbd7674ee26 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
|
| @@ -197,6 +197,8 @@ DeviceSettingsTestBase::DeviceSettingsTestBase()
|
| : user_manager_(new FakeUserManager()),
|
| user_manager_enabler_(user_manager_),
|
| owner_key_util_(new ownership::MockOwnerKeyUtil()) {
|
| + OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
|
| + &device_settings_service_);
|
| OwnerSettingsServiceChromeOSFactory::GetInstance()->SetOwnerKeyUtilForTesting(
|
| owner_key_util_);
|
| }
|
| @@ -218,13 +220,11 @@ void DeviceSettingsTestBase::SetUp() {
|
| device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
|
| device_settings_service_.SetSessionManager(&device_settings_test_helper_,
|
| owner_key_util_);
|
| - OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(
|
| - &device_settings_service_);
|
| profile_.reset(new TestingProfile());
|
| }
|
|
|
| void DeviceSettingsTestBase::TearDown() {
|
| - OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(NULL);
|
| + OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(NULL);
|
| FlushDeviceSettings();
|
| device_settings_service_.UnsetSessionManager();
|
| DBusThreadManager::Shutdown();
|
|
|