Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/cros_settings.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 "chrome/browser/chromeos/settings/cros_settings.h"
 
 #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"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/system_settings_provider.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 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);
+  g_cros_settings = new CrosSettings();
+}
+
+// static
+bool CrosSettings::IsInitialized() {
+  return g_cros_settings != NULL;
+}
+
+// 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.

[xiyuan, 2013/04/16 16:07:31]

This TODO is obsolete. It is the real stuff. :)

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

I think this comment is entirely obsolete by now.

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

Done.

-  return g_cros_settings.Pointer();
+  CHECK(g_cros_settings);
+  return g_cros_settings;
 }
 
 bool CrosSettings::IsCrosSettings(const std::string& path) {
   return StartsWithASCII(path, kCrosSettingsPrefix, true);
 }
 
 void CrosSettings::Set(const std::string& path, const base::Value& in_value) {
   DCHECK(CalledOnValidThread());
   CrosSettingsProvider* provider;
   provider = GetProvider(path);
@@ skipping 260 matching lines @@
 
   NotificationObserverList::Iterator it(*(observer_iterator->second));
   content::NotificationObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     observer->Observe(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED,
                       content::Source<CrosSettings>(this),
                       content::Details<const std::string>(&path));
   }
 }
 
+ScopedTestCrosSettings::ScopedTestCrosSettings() {
+  chromeos::DeviceSettingsService::Initialize();
+  chromeos::CrosSettings::Initialize();

[xiyuan, 2013/04/16 16:07:31]

nit: no need to have chromeos:: since the code is in namespace chromeos.

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

Done.

+}
+
+ScopedTestCrosSettings::~ScopedTestCrosSettings() {
+  // UserManager holds a CrosSettings*, so ensure that it is destroyed.
+  chromeos::UserManager::Set(NULL);
+  chromeos::CrosSettings::Shutdown();
+  chromeos::DeviceSettingsService::Shutdown();
+}
+
 }  // namespace chromeos