Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index ad71d1c1540fd28f9c9490e2b95c4c507eead2f0..9ddb13a9eca712f30a95ad6545d3f5f182b903c5 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/predictor.h"
@@ -290,6 +291,8 @@ class LoginUtilsTest : public testing::Test,
     cryptohome_client_ = mock_dbus_thread_manager_.mock_cryptohome_client();
     EXPECT_CALL(*cryptohome_client_, IsMounted(_));
 
+    test_cros_settings_.reset(new ScopedTestCrosSettings);
+
     browser_process_->SetProfileManager(
         new ProfileManagerWithoutInit(scoped_temp_dir_.path()));
     connector_ = browser_process_->browser_policy_connector();
@@ -529,6 +532,10 @@ class LoginUtilsTest : public testing::Test,
   policy::BrowserPolicyConnector* connector_;
   MockCryptohomeLibrary* cryptohome_;
   MockCryptohomeClient* cryptohome_client_;
+
+  // Initialized after |mock_dbus_thread_manager_| and |croptohome_| are set up.

[Mattias Nissler (ping if slow), 2013/04/16 16:09:51]

fix typo

[stevenjb, 2013/04/16 16:49:43]

Done.

+  scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;
+
   Profile* prepared_profile_;
 
   base::Closure rlz_initialized_cb_;