Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/cros_settings.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_CROS_SETTINGS_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_CROS_SETTINGS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/hash_tables.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "content/public/browser/notification_observer.h"
 
 namespace base {
-template <typename T> struct DefaultLazyInstanceTraits;
 class ListValue;
 class Value;
 }
 
 namespace chromeos {
 
 // This class manages per-device/global settings.
 class CrosSettings : public base::NonThreadSafe {
  public:
   // Class factory.

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

This comment is now out of place.

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

Done.

+  static void Initialize();
+  static bool IsInitialized();
+  static void Shutdown();
   static CrosSettings* Get();
 
   // Helper function to test if the given |path| is a valid cros setting.
   static bool IsCrosSettings(const std::string& path);
 
   // Sets |in_value| to given |path| in cros settings.
   void Set(const std::string& path, const base::Value& in_value);
 
   // Returns setting value for the given |path|.
   const base::Value* GetPref(const std::string& path) const;
@@ skipping 44 matching lines @@
   // method with NOTIFICATION_SYSTEM_SETTING_CHANGED.
   void AddSettingsObserver(const char* path,
                            content::NotificationObserver* obs);
   void RemoveSettingsObserver(const char* path,
                               content::NotificationObserver* obs);
 
   // Returns the provider that handles settings with the |path| or prefix.
   CrosSettingsProvider* GetProvider(const std::string& path) const;
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<CrosSettings>;
   friend class CrosSettingsTest;
 
-  // Public for testing.
   CrosSettings();
-  ~CrosSettings();
+  virtual ~CrosSettings();

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

why? nothing is virtual here.

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

PrepareTrustedValues

 
   // Fires system setting change notification.
   void FireObservers(const std::string& path);
 
   // List of ChromeOS system settings providers.
   std::vector<CrosSettingsProvider*> providers_;
 
   // A map from settings names to a list of observers. Observers get fired in
   // the order they are added.
   typedef ObserverList<content::NotificationObserver, true>
       NotificationObserverList;
   typedef base::hash_map<std::string, NotificationObserverList*>
       SettingsObserverMap;
   SettingsObserverMap settings_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CrosSettings);
 };
 
+// Helper class for unit tests. Initializes DeviceSettingsService and
+// CrosSettings for tests that need them.
+class ScopedTestCrosSettings {
+ public:
+  ScopedTestCrosSettings();
+  ~ScopedTestCrosSettings();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ScopedTestCrosSettings);
+};
+
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_CROS_SETTINGS_H_