This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

Index: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
index 6d58b793d30c6d7807c8d616cb51cb456a93e8e0..04a620f30fa0cd2c7948be0b0d4308440171dd2b 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
@@ -19,6 +19,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cert/x509_certificate.h"
@@ -81,9 +82,9 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
   }
 
   // Add and log in a user to the session.
-  void UserAddedToSession(const std::string& user) {
-    user_manager()->AddUser(user);
-    user_manager()->LoginUser(user);
+  void UserAddedToSession(std::string user) {
+    user_manager()->AddUser(AccountId::FromUserEmail(user));
+    user_manager()->LoginUser(AccountId::FromUserEmail(user));
   }
 
   // Get the active user.
@@ -101,12 +102,13 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
-    const std::string user_email(kUser);
-    const user_manager::User* user = user_manager()->AddUser(user_email);
+    const AccountId account_id(AccountId::FromUserEmail(kUser));
+    const user_manager::User* user = user_manager()->AddUser(account_id);
 
     // Note that user profiles are created after user login in reality.
-    user_profile_ = profile_manager_->CreateTestingProfile(user_email);
-    user_profile_->set_profile_name(user_email);
+    user_profile_ =
+        profile_manager_->CreateTestingProfile(account_id.GetUserEmail());
+    user_profile_->set_profile_name(account_id.GetUserEmail());
     chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
         user, user_profile_);
   }
@@ -172,8 +174,8 @@ TEST_F(SessionStateDelegateChromeOSTest, MultiProfileDisallowedByUserPolicy) {
   InitForMultiProfile();
   EXPECT_TRUE(
       session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy());
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   EXPECT_TRUE(
       session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy());
 
@@ -188,11 +190,12 @@ TEST_F(SessionStateDelegateChromeOSTest, MultiProfileDisallowedByUserPolicy) {
 TEST_F(SessionStateDelegateChromeOSTest,
        MultiProfileDisallowedByPolicyCertificates) {
   InitForMultiProfile();
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   EXPECT_TRUE(
       session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy());
-  policy::PolicyCertServiceFactory::SetUsedPolicyCertificates(user_email);
+  policy::PolicyCertServiceFactory::SetUsedPolicyCertificates(
+      account_id.GetUserEmail());
   EXPECT_FALSE(
       session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy());
 
@@ -204,8 +207,8 @@ TEST_F(SessionStateDelegateChromeOSTest,
 TEST_F(SessionStateDelegateChromeOSTest,
        MultiProfileDisallowedByPrimaryUserCertificatesInMemory) {
   InitForMultiProfile();
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   EXPECT_TRUE(
       session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy());
   cert_verifier_.reset(new policy::PolicyCertVerifier(base::Closure()));
@@ -239,8 +242,8 @@ TEST_F(SessionStateDelegateChromeOSTest,
 
   EXPECT_TRUE(
       session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   while (session_state_delegate()->NumberOfLoggedInUsers() <
          session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) {
     UserAddedToSession("bb@b.b");
@@ -260,8 +263,8 @@ TEST_F(SessionStateDelegateChromeOSTest,
 
   EXPECT_TRUE(
       session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   UserAddedToSession("bb@b.b");
   EXPECT_FALSE(
       session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
@@ -277,12 +280,12 @@ TEST_F(SessionStateDelegateChromeOSTest,
 
   EXPECT_TRUE(
       session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
-  const std::string user_email(kUser);
-  user_manager()->LoginUser(user_email);
+  const AccountId account_id(AccountId::FromUserEmail(kUser));
+  user_manager()->LoginUser(account_id);
   user_profile_->GetPrefs()->SetString(
       prefs::kMultiProfileUserBehavior,
       chromeos::MultiProfileUserController::kBehaviorNotAllowed);
-  user_manager()->AddUser("bb@b.b");
+  user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b"));
   EXPECT_FALSE(
       session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
   EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_NOT_ALLOWED_PRIMARY_USER,