Translate device-local account IDs to user IDs

chrome/browser/chromeos/settings/device_settings_test_helper.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_DEVICE_SETTINGS_TEST_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 // A helper class for tests mocking out session_manager's device settings
 // interface. The pattern is to initialize DeviceSettingsService with the helper
@@ skipping 106 matching lines @@
  public:
   ScopedDeviceSettingsTestHelper();
   virtual ~ScopedDeviceSettingsTestHelper();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedDeviceSettingsTestHelper);
 };
 
 // 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:
   DeviceSettingsTestBase();
   virtual ~DeviceSettingsTestBase();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // 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_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   policy::DevicePolicyBuilder device_policy_;
 
   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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_