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 d689947725deb29193d852905f791e8714f97d7f..fc7c7b31e0dbc3e6ae8b9cb297efc88c5d1b2b19 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"
@@ -142,7 +141,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:
@@ -155,8 +154,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_;
@@ -167,9 +166,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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);