Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_service.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/device_settings_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/owner_key_util.h"
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 #include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 10 matching lines @@
 // the battery is drained.
 int kLoadRetryDelayMs = 1000 * 5;
 // Maximal number of retries before we give up. Calculated to allow for 10 min
 // of retry time.
 int kMaxLoadRetries = (1000 * 60 * 10) / kLoadRetryDelayMs;
 
 }  // namespace
 
 namespace chromeos {
 
-static base::LazyInstance<DeviceSettingsService> g_device_settings_service =
-    LAZY_INSTANCE_INITIALIZER;
-
 OwnerKey::OwnerKey(scoped_ptr<std::vector<uint8> > public_key,
                    scoped_ptr<crypto::RSAPrivateKey> private_key)
     : public_key_(public_key.Pass()),
       private_key_(private_key.Pass()) {}
 
 OwnerKey::~OwnerKey() {}
 
 DeviceSettingsService::Observer::~Observer() {}
 
-DeviceSettingsService::DeviceSettingsService()
-    : session_manager_client_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
-      store_status_(STORE_SUCCESS),
-      load_retries_left_(kMaxLoadRetries) {}
+static DeviceSettingsService*  g_device_settings_service = NULL;

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

nit: spacing

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

Done.

 
-DeviceSettingsService::~DeviceSettingsService() {
-  DCHECK(pending_operations_.empty());
+// static
+void DeviceSettingsService::Initialize() {
+  CHECK(!g_device_settings_service);
+  g_device_settings_service = new DeviceSettingsService();
+}
+
+// static
+void DeviceSettingsService::Shutdown() {
+  CHECK(g_device_settings_service);
+  delete g_device_settings_service;
+  g_device_settings_service = NULL;
 }
 
 // static
 DeviceSettingsService* DeviceSettingsService::Get() {
-  return g_device_settings_service.Pointer();
+  CHECK(g_device_settings_service);
+  return g_device_settings_service;
 }
 
-void DeviceSettingsService::Initialize(
+void DeviceSettingsService::InitializeSessionManager(
     SessionManagerClient* session_manager_client,
     scoped_refptr<OwnerKeyUtil> owner_key_util) {
   DCHECK(session_manager_client);
   DCHECK(owner_key_util.get());
   DCHECK(!session_manager_client_);
   DCHECK(!owner_key_util_.get());
 
   session_manager_client_ = session_manager_client;
   owner_key_util_ = owner_key_util;
 
   session_manager_client_->AddObserver(this);
 
   StartNextOperation();
 }
 
-void DeviceSettingsService::Shutdown() {
+void DeviceSettingsService::ShutdownSessionManager() {
   STLDeleteContainerPointers(pending_operations_.begin(),
                              pending_operations_.end());
   pending_operations_.clear();
 
   if (session_manager_client_)
     session_manager_client_->RemoveObserver(this);
   session_manager_client_ = NULL;
   owner_key_util_ = NULL;
 }
 
@@ skipping 90 matching lines @@
 
 void DeviceSettingsService::PropertyChangeComplete(bool success) {
   if (!success) {
     LOG(ERROR) << "Policy update failed.";
     return;
   }
 
   EnsureReload(false);
 }
 
+DeviceSettingsService::DeviceSettingsService()
+    : session_manager_client_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      store_status_(STORE_SUCCESS),
+      load_retries_left_(kMaxLoadRetries) {
+}
+
+DeviceSettingsService::~DeviceSettingsService() {
+  DCHECK(pending_operations_.empty());
+}
+
 void DeviceSettingsService::Enqueue(SessionManagerOperation* operation) {
   pending_operations_.push_back(operation);
   if (pending_operations_.front() == operation)
     StartNextOperation();
 }
 
 void DeviceSettingsService::EnqueueLoad(bool force_key_load) {
   SessionManagerOperation* operation =
       new LoadSettingsOperation(
           base::Bind(&DeviceSettingsService::HandleCompletedOperation,
@@ skipping 88 matching lines @@
 
   // Only remove the pending operation here, so new operations triggered by any
   // of the callbacks above are queued up properly.
   pending_operations_.pop_front();
   delete operation;
 
   StartNextOperation();
 }
 
 }  // namespace chromeos