This CL replaces user_manager::UserID with AccountId.

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/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
@@ skipping 228 matching lines @@
 
 void DeviceSettingsTestBase::FlushDeviceSettings() {
   device_settings_test_helper_.Flush();
 }
 
 void DeviceSettingsTestBase::ReloadDeviceSettings() {
   device_settings_service_.OwnerKeySet(true);
   FlushDeviceSettings();
 }
 
-void DeviceSettingsTestBase::InitOwner(const std::string& user_id,
+void DeviceSettingsTestBase::InitOwner(const AccountId& account_id,
                                        bool tpm_is_ready) {
-  const user_manager::User* user = user_manager_->FindUser(user_id);
+  const user_manager::User* user = user_manager_->FindUser(account_id);
   if (!user) {
-    user = user_manager_->AddUser(user_id);
-    profile_->set_profile_name(user_id);
+    user = user_manager_->AddUser(account_id);
+    profile_->set_profile_name(account_id.GetUserEmail());
 
     ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
                                                             profile_.get());
     ProfileHelper::Get()->SetProfileToUserMappingForTesting(
         const_cast<user_manager::User*>(user));
   }
   OwnerSettingsServiceChromeOS* service =
       OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
   CHECK(service);
   if (tpm_is_ready)
     service->OnTPMTokenReady(true /* token is enabled */);
 }
 
 }  // namespace chromeos