Translate device-local account IDs to user IDs

chrome/browser/chromeos/settings/device_settings_test_helper.cc

 // 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.
 
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ skipping 165 matching lines @@
 ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
   Flush();
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
     : loop_(MessageLoop::TYPE_UI),
       ui_thread_(content::BrowserThread::UI, &loop_),
       file_thread_(content::BrowserThread::FILE, &loop_),
-      owner_key_util_(new MockOwnerKeyUtil()) {}
+      owner_key_util_(new MockOwnerKeyUtil()) {
+  DeviceSettingsService::Initialize();
+}
 
 DeviceSettingsTestBase::~DeviceSettingsTestBase() {
   base::RunLoop().RunUntilIdle();
+  DeviceSettingsService::Shutdown();
 }
 
 void DeviceSettingsTestBase::SetUp() {
   device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
       false);
   owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
-  device_settings_service_.SetSessionManager(&device_settings_test_helper_,
-                                             owner_key_util_);
+  DeviceSettingsService::Get()->SetSessionManager(&device_settings_test_helper_,
+                                                  owner_key_util_);
 }
 
 void DeviceSettingsTestBase::TearDown() {
   FlushDeviceSettings();
-  device_settings_service_.UnsetSessionManager();
+  DeviceSettingsService::Get()->UnsetSessionManager();
 }
 
 void DeviceSettingsTestBase::FlushDeviceSettings() {
   device_settings_test_helper_.Flush();
 }
 
 void DeviceSettingsTestBase::ReloadDeviceSettings() {
-  device_settings_service_.OwnerKeySet(true);
+  DeviceSettingsService::Get()->OwnerKeySet(true);
   FlushDeviceSettings();
 }
 
 }  // namespace chromeos