Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_service.h

Index: chrome/browser/chromeos/settings/device_settings_service.h
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h
index aa30fb5708b237e35748ecb48de0124c157085bf..4df98868c619f5af8ad5b82050e1aebad97ed940 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.h
+++ b/chrome/browser/chromeos/settings/device_settings_service.h
@@ -17,10 +17,6 @@
 #include "chrome/browser/policy/cloud/cloud_policy_validator.h"
 #include "chromeos/dbus/session_manager_client.h"
 
-namespace base {
-template <typename T> struct DefaultLazyInstanceTraits;
-}
-
 namespace crypto {
 class RSAPrivateKey;
 }
@@ -110,21 +106,18 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
     virtual void DeviceSettingsUpdated() = 0;
   };
 
-  // Creates a device settings service instance. This is meant for unit tests,
-  // production code uses the singleton returned by Get() below.
-  DeviceSettingsService();
-  ~DeviceSettingsService();
-
-  // Returns the singleton instance.
+  // Class factory.
+  static void Initialize();
+  static void Shutdown();
   static DeviceSettingsService* Get();
 
   // To be called on startup once threads are initialized and DBus is ready.
-  void Initialize(SessionManagerClient* session_manager_client,
-                  scoped_refptr<OwnerKeyUtil> owner_key_util);
+  void InitializeSessionManager(SessionManagerClient* session_manager_client,

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

This function name is unfortunate, the function doesn't actually initialize
session_manager.

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

->Set

+                                scoped_refptr<OwnerKeyUtil> owner_key_util);
 
   // Prevents the service from making further calls to session_manager_client
   // and stops any pending operations.
-  void Shutdown();
+  void ShutdownSessionManager();

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

ditto

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

->Unset

 
   // Returns the currently active device settings. Returns NULL if the device
   // settings have not been retrieved from session_manager yet.
@@ -189,6 +182,9 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
   virtual void PropertyChangeComplete(bool success) OVERRIDE;
 
  private:
+  DeviceSettingsService();
+  virtual ~DeviceSettingsService();

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

Why? Nothing is virtual here.

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

SessionManagerClient::Observer methods 

[Mattias Nissler (ping if slow), 2013/04/16 18:04:13]

Ah, good point.

+
   // Enqueues a new operation. Takes ownership of |operation| and starts it
   // right away if there is no active operation currently.
   void Enqueue(SessionManagerOperation* operation);