Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/cros_settings.cc

Index: chrome/browser/chromeos/settings/cros_settings.cc
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc
index f0944071549fe51582752db5f5d1e1b7cb4a25eb..b487a170d78457562455e68e7c090b57537be91e 100644
--- a/chrome/browser/chromeos/settings/cros_settings.cc
+++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -6,10 +6,10 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/kiosk_app_local_settings.h"
@@ -24,12 +24,30 @@
 
 namespace chromeos {
 
-static base::LazyInstance<CrosSettings> g_cros_settings =
-    LAZY_INSTANCE_INITIALIZER;
+static CrosSettings*  g_cros_settings = NULL;
 
+// static
+void CrosSettings::Initialize() {
+  CHECK(!g_cros_settings);

[bartfab (slow), 2013/04/17 11:14:10]

Nit: #include "base/logging.h"

[stevenjb, 2013/04/17 16:27:12]

Done.

+  g_cros_settings = new CrosSettings();
+}
+
+// static
+bool CrosSettings::IsInitialized() {
+  return g_cros_settings != NULL;

[bartfab (slow), 2013/04/17 11:14:10]

Nit: No need to check against NULL. A simple |return g_cros_settings| will do.

[stevenjb, 2013/04/17 16:27:12]

Done.

+}
+
+// static
+void CrosSettings::Shutdown() {
+  CHECK(g_cros_settings);
+  delete g_cros_settings;
+  g_cros_settings = NULL;
+}
+
+// static
 CrosSettings* CrosSettings::Get() {
-  // TODO(xiyaun): Use real stuff when underlying libcros is ready.
-  return g_cros_settings.Pointer();
+  CHECK(g_cros_settings);
+  return g_cros_settings;
 }
 
 bool CrosSettings::IsCrosSettings(const std::string& path) {
@@ -310,4 +328,21 @@ void CrosSettings::FireObservers(const std::string& path) {
   }
 }
 
+ScopedTestCrosSettings::ScopedTestCrosSettings()
+    : initialized_device_settings_service_(false) {
+  if (!DeviceSettingsService::IsInitialized()) {
+    DeviceSettingsService::Initialize();
+    initialized_device_settings_service_ = true;
+  }
+  CrosSettings::Initialize();
+}
+
+ScopedTestCrosSettings::~ScopedTestCrosSettings() {
+  // UserManager holds a CrosSettings*, so ensure that it is destroyed.
+  UserManager::Set(NULL);
+  CrosSettings::Shutdown();
+  if (initialized_device_settings_service_)
+    DeviceSettingsService::Shutdown();
+}
+
 }  // namespace chromeos