Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/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_CROS_SETTINGS_H_
 #define CHROME_BROWSER_CHROMEOS_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/cros_settings_names.h"
 #include "chrome/browser/chromeos/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:
+  // Public for testing.

[pastarmovj, 2012/07/30 13:55:02]

This looks dangerous to me. It gets too easy to instantiate a new instance when
the singleton should have been used.

[Mattias Nissler (ping if slow), 2012/08/02 12:01:52]

Done.

+  CrosSettings();
+  ~CrosSettings();
+
   // Class factory.
   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|.
@@ skipping 44 matching lines @@
   // If the pref at the given |path| changes, we call the observer's Observe
   // 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;
 
-  // Forces all providers to reload their caches from the respective backing
-  // stores if they have any.
-  void ReloadProviders();
-
  private:
-  friend struct base::DefaultLazyInstanceTraits<CrosSettings>;
-
   // 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_;
 
-  CrosSettings();
-  ~CrosSettings();
-
   // Fires system setting change notification.
   void FireObservers(const std::string& path);
 
   DISALLOW_COPY_AND_ASSIGN(CrosSettings);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_H_