Translate device-local account IDs to user IDs

chrome/browser/chromeos/settings/device_settings_test_helper.h

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index bc137d72b8a03718ea85d39f1adcc12883533885..ed867cd8f0e84e9c45e591eab673db50d231be3a 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -15,7 +15,6 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ -145,7 +144,7 @@ class ScopedDeviceSettingsTestHelper : public DeviceSettingsTestHelper {
 
 // A convenience test base class that initializes a DeviceSettingsService
 // instance for testing and allows for straightforward updating of device
-// settings. |device_settings_service_| starts out in uninitialized state, so
+// settings. The DeviceSettingsService starts out in uninitialized state, so
 // startup code gets tested as well.
 class DeviceSettingsTestBase : public testing::Test {
  protected:
@@ -158,8 +157,8 @@ class DeviceSettingsTestBase : public testing::Test {
   // Flushes any pending device settings operations.
   void FlushDeviceSettings();
 
-  // Triggers an owner key and device settings reload on
-  // |device_settings_service_| and flushes the resulting load operation.
+  // Triggers an owner key and device settings reload on the
+  // DeviceSettingsService and flushes the resulting load operation.
   void ReloadDeviceSettings();
 
   MessageLoop loop_;
@@ -170,9 +169,6 @@ class DeviceSettingsTestBase : public testing::Test {
 
   DeviceSettingsTestHelper device_settings_test_helper_;
   scoped_refptr<MockOwnerKeyUtil> owner_key_util_;
-  // Local DeviceSettingsService instance for tests. Avoid using in combination
-  // with the global instance (DeviceSettingsService::Get()).
-  DeviceSettingsService device_settings_service_;

[Mattias Nissler (ping if slow), 2013/05/15 09:38:47]

And everything moves in the direction of global singletons again. I had a
conversation with stevenjb@ recently about this - it's always easy to make steps
towards using global singletons for everything, whereas introducing proper
ownership graphs is hard and undermined if we move code towards globals. What's
your thoughts on this? If I'm the only one fighting this fight, I'm willing to
just give up.

[bartfab (slow), 2013/05/17 11:14:28]

I agree. For some reason, I thought it would be much harder to mock out things
without global singletons in this case. It was actually quite simple in the end.
Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);