Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #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;
 }
 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 class PolicyData;
 class PolicyFetchResponse;
 }
 
@@ skipping 69 matching lines @@
    public:
     virtual ~Observer();
 
     // Indicates device ownership status changes.
     virtual void OwnershipStatusChanged() = 0;
 
     // Gets call after updates to the device settings.
     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.
   const enterprise_management::PolicyData* policy_data() {
     return policy_data_.get();
   }
   const enterprise_management::ChromeDeviceSettingsProto*
       device_settings() const {
     return device_settings_.get();
   }
@@ skipping 44 matching lines @@
   // Adds an observer.
   void AddObserver(Observer* observer);
   // Removes an observer.
   void RemoveObserver(Observer* observer);
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) OVERRIDE;
   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);
 
   // Enqueues a load operation.
   void EnqueueLoad(bool force_key_load);
 
   // Makes sure there's a reload operation so changes to the settings (and key,
   // in case force_key_load is set) are getting picked up.
   void EnsureReload(bool force_key_load);
@@ skipping 30 matching lines @@
 
   // For recoverable load errors how many retries are left before we give up.
   int load_retries_left_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_