Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/user_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstdlib>
 #include <cstring>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 66 matching lines @@
         ->SetLocalState(0);
 
     // Restore the real DeviceSettingsProvider.
     EXPECT_TRUE(
       cros_settings_->RemoveSettingsProvider(&stub_settings_provider_));
     cros_settings_->AddSettingsProvider(device_settings_provider_);
 
     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)
       user_manager_impl->Shutdown();
     UserManager::Get()->Shutdown();
 
     base::RunLoop().RunUntilIdle();
   }
 
   bool GetUserManagerEphemeralUsersEnabled() const {
@@ skipping 41 matching lines @@
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   CrosSettings* cros_settings_;
   CrosSettingsProvider* device_settings_provider_;
   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_;
 };
 
 TEST_F(UserManagerTest, RetrieveTrustedDevicePolicies) {
   SetUserManagerEphemeralUsersEnabled(true);
   SetUserManagerOwnerEmail("");
 
   SetDeviceSettings(false, "owner@invalid.domain");
@@ skipping 38 matching lines @@
   UserManager::Get()->UserLoggedIn(
       "user0@invalid.domain", "user0@invalid.domain", false);
   ResetUserManager();
 
   const UserList* users = &UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
   EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 }  // namespace chromeos