Translate device-local account IDs to user IDs

chrome/browser/chromeos/settings/cros_settings.h

Index: chrome/browser/chromeos/settings/cros_settings.h
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h
index 8a312aa54403ae1756817472d1ea0b77d21ed695..610d54a7217a76b307cef6c89b04212fe19149fc 100644
--- a/chrome/browser/chromeos/settings/cros_settings.h
+++ b/chrome/browser/chromeos/settings/cros_settings.h
@@ -24,6 +24,8 @@ class Value;
 
 namespace chromeos {
 
+class DeviceSettingsService;
+
 // This class manages per-device/global settings.
 class CrosSettings : public base::NonThreadSafe {
  public:
@@ -33,6 +35,11 @@ class CrosSettings : public base::NonThreadSafe {
   static void Shutdown();
   static CrosSettings* Get();
 
+  // Creates a device settings service instance. This is meant for unit tests,
+  // production code uses the singleton returned by Get() above.
+  explicit CrosSettings(DeviceSettingsService* device_settings_service);
+  virtual ~CrosSettings();
+
   // Helper function to test if the given |path| is a valid cros setting.
   static bool IsCrosSettings(const std::string& path);
 
@@ -99,9 +106,6 @@ class CrosSettings : public base::NonThreadSafe {
  private:
   friend class CrosSettingsTest;
 
-  CrosSettings();
-  virtual ~CrosSettings();
-
   // Fires system setting change notification.
   void FireObservers(const std::string& path);