Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/user_manager_unittest.cc

Index: chrome/browser/chromeos/login/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index acdd052d08bf9b23401dafb6c04dd7edbc39ad78..1998af3e9d79fe4f574fd27ec74b15e8748b314f 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -84,7 +84,7 @@ class UserManagerTest : public testing::Test {
     UserManager::Set(old_user_manager_);
 
     // Shut down the DeviceSettingsService.
-    DeviceSettingsService::Get()->Shutdown();
+    DeviceSettingsService::Get()->UnsetSessionManager();
 
     // Shut down the remaining UserManager instances.
     if (user_manager_impl)
@@ -146,8 +146,8 @@ class UserManagerTest : public testing::Test {
   StubCrosSettingsProvider stub_settings_provider_;
   scoped_ptr<TestingPrefServiceSimple> local_state_;
 
-  // Initializes / shuts down a stub CrosLibrary.
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedTestCrosSettings test_cros_settings_;
 
   scoped_ptr<UserManagerImpl> user_manager_impl;
   UserManager* old_user_manager_;