Make CrosSettings and DeviceSettingsService non Lazy instances

chromeos/dbus/dbus_thread_manager.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 "chromeos/dbus/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
@@ skipping 503 matching lines @@
 // static
 bool DBusThreadManager::IsInitialized() {
   return g_dbus_thread_manager != NULL;
 }
 
 // static
 void DBusThreadManager::Shutdown() {
   // If we called InitializeForTesting, this may get called more than once.
   // Ensure that we only shutdown DBusThreadManager once.
   CHECK(g_dbus_thread_manager || g_dbus_thread_manager_set_for_testing);
-  delete g_dbus_thread_manager;
+  DBusThreadManager* dbus_thread_manager = g_dbus_thread_manager;
   g_dbus_thread_manager = NULL;
+  delete dbus_thread_manager;
   VLOG(1) << "DBusThreadManager Shutdown completed";
 }
 
 DBusThreadManager::DBusThreadManager() {
   dbus::statistics::Initialize();
 }
 
 DBusThreadManager::~DBusThreadManager() {
   dbus::statistics::Shutdown();
+  if (g_dbus_thread_manager == NULL)
+    return;  // Called form Shutdown() or local test instance.
+  // There should never be both a global instance and a local instance.

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

Why? This makes writing small unit tests harder!

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

See previouis comment.

+  CHECK(this == g_dbus_thread_manager);
+  if (g_dbus_thread_manager_set_for_testing) {
+    g_dbus_thread_manager = NULL;
+    g_dbus_thread_manager_set_for_testing = false;
+    VLOG(1) << "DBusThreadManager destroyed";
+  } else {
+    LOG(FATAL) << "~DBusThreadManager() called outside of Shutdown()";
+  }
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos