Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_test_helper.cc

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 664e58cad9efa0e3b92e2ae26887ddde8b1940ec..b2a97858c536f686a3fa889be018b512193e47d3 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -167,14 +167,16 @@ DeviceSettingsTestHelper::PolicyState::PolicyState()
 DeviceSettingsTestHelper::PolicyState::~PolicyState() {}
 
 ScopedDeviceSettingsTestHelper::ScopedDeviceSettingsTestHelper() {
-  DeviceSettingsService::Get()->Initialize(this, new MockOwnerKeyUtil());
+  DeviceSettingsService::Initialize();
+  DeviceSettingsService::Get()->SetSessionManager(this, new MockOwnerKeyUtil());
   DeviceSettingsService::Get()->Load();
   Flush();
 }
 
 ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
   Flush();
-  DeviceSettingsService::Get()->Shutdown();
+  DeviceSettingsService::Get()->UnsetSessionManager();
+  DeviceSettingsService::Shutdown();
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
@@ -193,13 +195,13 @@ void DeviceSettingsTestBase::SetUp() {
   owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
-  device_settings_service_.Initialize(&device_settings_test_helper_,
-                                      owner_key_util_);
+  device_settings_service_.SetSessionManager(&device_settings_test_helper_,
+                                             owner_key_util_);
 }
 
 void DeviceSettingsTestBase::TearDown() {
   FlushDeviceSettings();
-  device_settings_service_.Shutdown();
+  device_settings_service_.UnsetSessionManager();
 }
 
 void DeviceSettingsTestBase::FlushDeviceSettings() {