We should use UserID object to identify users instead of username.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 14e52554c88e229b853ade2f9272cb49ef37491c..0fddb68757f9203b7ab848c3f97bf609403eaf44 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -189,7 +189,7 @@ ChromeUserManagerImpl::GetMultiProfileUserController() {
 }
 
 UserImageManager* ChromeUserManagerImpl::GetUserImageManager(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   UserImageManagerMap::iterator ui = user_image_managers_.find(user_id);
   if (ui != user_image_managers_.end())
     return ui->second.get();
@@ -218,7 +218,7 @@ user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile()
     if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR &&
         !(*it)->is_logged_in()) {
       MultiProfileUserController::UserAllowedInSessionReason check;
-      multi_profile_user_controller_->IsUserAllowedInSession((*it)->email(),
+      multi_profile_user_controller_->IsUserAllowedInSession((*it)->GetUserID(),
                                                              &check);
       if (check ==
           MultiProfileUserController::NOT_ALLOWED_PRIMARY_USER_POLICY_FORBIDS) {
@@ -299,34 +299,34 @@ void ChromeUserManagerImpl::SessionStarted() {
 }
 
 void ChromeUserManagerImpl::RemoveUserInternal(
-    const std::string& user_email,
+    const user_manager::UserID& user_id,
     user_manager::RemoveUserDelegate* delegate) {
   CrosSettings* cros_settings = CrosSettings::Get();
 
   const base::Closure& callback =
       base::Bind(&ChromeUserManagerImpl::RemoveUserInternal,
                  weak_factory_.GetWeakPtr(),
-                 user_email,
+                 user_id,
                  delegate);
 
-  // Ensure the value of owner email has been fetched.
+  // Ensure the value of owner id has been fetched.
   if (CrosSettingsProvider::TRUSTED !=
       cros_settings->PrepareTrustedValues(callback)) {
-    // Value of owner email is not fetched yet.  RemoveUserInternal will be
+    // Value of owner id is not fetched yet.  RemoveUserInternal will be
     // called again after fetch completion.
     return;
   }
   std::string owner;
   cros_settings->GetString(kDeviceOwner, &owner);
-  if (user_email == owner) {
+  if (user_id == user_manager::UserID::FromUserEmail(owner)) {
     // Owner is not allowed to be removed from the device.
     return;
   }
-  RemoveNonOwnerUserInternal(user_email, delegate);
+  RemoveNonOwnerUserInternal(user_id, delegate);
 }
 
 void ChromeUserManagerImpl::SaveUserOAuthStatus(
-    const std::string& user_id,
+    const user_manager::UserID& user_id,
     user_manager::User::OAuthTokenStatus oauth_token_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ChromeUserManager::SaveUserOAuthStatus(user_id, oauth_token_status);
@@ -335,7 +335,7 @@ void ChromeUserManagerImpl::SaveUserOAuthStatus(
 }
 
 void ChromeUserManagerImpl::SaveUserDisplayName(
-    const std::string& user_id,
+    const user_manager::UserID& user_id,
     const base::string16& display_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ChromeUserManager::SaveUserDisplayName(user_id, display_name);
@@ -395,7 +395,7 @@ void ChromeUserManagerImpl::Observe(
         user->set_profile_is_created();
 
         if (user->HasGaiaAccount()) {
-          UserImageManager* image_manager = GetUserImageManager(user->email());
+          UserImageManager* image_manager = GetUserImageManager(user->GetUserID());
           image_manager->UserProfileCreated();
         }
       }
@@ -411,7 +411,7 @@ void ChromeUserManagerImpl::Observe(
             base::Bind(&ChromeUserManagerImpl::SwitchActiveUser,
                        weak_factory_.GetWeakPtr(),
                        GetPendingUserSwitchID()));
-        SetPendingUserSwitchID(std::string());
+        SetPendingUserSwitchID(user_manager::UserID(std::string(), std::string()));

[Denis Kuznetsov (DE-MUC), 2015/06/10 16:50:46]

EmptyGaiaID() ?

       }
       break;
     }
@@ -421,7 +421,7 @@ void ChromeUserManagerImpl::Observe(
 }
 
 void ChromeUserManagerImpl::OnExternalDataSet(const std::string& policy,
-                                              const std::string& user_id) {
+                                              const user_manager::UserID& user_id) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataSet(policy);
   else if (policy == policy::key::kWallpaperImage)
@@ -431,7 +431,7 @@ void ChromeUserManagerImpl::OnExternalDataSet(const std::string& policy,
 }
 
 void ChromeUserManagerImpl::OnExternalDataCleared(const std::string& policy,
-                                                  const std::string& user_id) {
+                                                  const user_manager::UserID& user_id) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataCleared(policy);
   else if (policy == policy::key::kWallpaperImage)
@@ -442,7 +442,7 @@ void ChromeUserManagerImpl::OnExternalDataCleared(const std::string& policy,
 
 void ChromeUserManagerImpl::OnExternalDataFetched(
     const std::string& policy,
-    const std::string& user_id,
+    const user_manager::UserID& user_id,
     scoped_ptr<std::string> data) {
   if (policy == policy::key::kUserAvatarImage)
     GetUserImageManager(user_id)->OnExternalDataFetched(policy, data.Pass());
@@ -452,7 +452,7 @@ void ChromeUserManagerImpl::OnExternalDataFetched(
     NOTREACHED();
 }
 
-void ChromeUserManagerImpl::OnPolicyUpdated(const std::string& user_id) {
+void ChromeUserManagerImpl::OnPolicyUpdated(const user_manager::UserID& user_id) {
   const user_manager::User* user = FindUser(user_id);
   if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)
     return;
@@ -470,7 +470,7 @@ bool ChromeUserManagerImpl::CanCurrentUserLock() const {
 }
 
 bool ChromeUserManagerImpl::IsUserNonCryptohomeDataEphemeral(
-    const std::string& user_id) const {
+    const user_manager::UserID& user_id) const {
   // Data belonging to the obsolete public accounts whose data has not been
   // removed yet is not ephemeral.
   bool is_obsolete_public_account = IsPublicAccountMarkedForRemoval(user_id);
@@ -483,7 +483,7 @@ bool ChromeUserManagerImpl::AreEphemeralUsersEnabled() const {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   return GetEphemeralUsersEnabled() &&
-         (connector->IsEnterpriseManaged() || !GetOwnerEmail().empty());
+         (connector->IsEnterpriseManaged() || !GetOwnerID().empty());
 }
 
 const std::string& ChromeUserManagerImpl::GetApplicationLocale() const {
@@ -495,7 +495,7 @@ PrefService* ChromeUserManagerImpl::GetLocalState() const {
 }
 
 void ChromeUserManagerImpl::HandleUserOAuthTokenStatusChange(
-    const std::string& user_id,
+    const user_manager::UserID& user_id,
     user_manager::User::OAuthTokenStatus status) const {
   GetUserFlow(user_id)->HandleOAuthTokenStatusChange(status);
 }
@@ -518,8 +518,9 @@ void ChromeUserManagerImpl::LoadPublicAccounts(
   for (std::vector<std::string>::const_iterator it = public_sessions.begin();
        it != public_sessions.end();
        ++it) {
-    users_.push_back(user_manager::User::CreatePublicAccountUser(*it));
-    UpdatePublicAccountDisplayName(*it);
+    const user_manager::UserID user_id(user_manager::UserID::FromUserEmail(*it));

[Denis Kuznetsov (DE-MUC), 2015/06/10 16:50:47]

auto user_id = ...?

+    users_.push_back(user_manager::User::CreatePublicAccountUser(user_id));
+    UpdatePublicAccountDisplayName(user_id);
   }
 }
 
@@ -538,7 +539,7 @@ void ChromeUserManagerImpl::PerformPostUserListLoadingActions() {
   for (user_manager::UserList::iterator ui = users_.begin(), ue = users_.end();
        ui != ue;
        ++ui) {
-    GetUserImageManager((*ui)->email())->LoadUserImage();
+    GetUserImageManager((*ui)->GetUserID())->LoadUserImage();
   }
 }
 
@@ -550,11 +551,11 @@ void ChromeUserManagerImpl::PerformPostUserLoggedInActions(
       new SessionLengthLimiter(NULL, browser_restart));
 }
 
-bool ChromeUserManagerImpl::IsDemoApp(const std::string& user_id) const {
+bool ChromeUserManagerImpl::IsDemoApp(const user_manager::UserID& user_id) const {
   return DemoAppLauncher::IsDemoAppSession(user_id);
 }
 
-bool ChromeUserManagerImpl::IsKioskApp(const std::string& user_id) const {
+bool ChromeUserManagerImpl::IsKioskApp(const user_manager::UserID& user_id) const {
   policy::DeviceLocalAccount::Type device_local_account_type;
   return policy::IsDeviceLocalAccountUser(user_id,
                                           &device_local_account_type) &&
@@ -563,8 +564,8 @@ bool ChromeUserManagerImpl::IsKioskApp(const std::string& user_id) const {
 }
 
 bool ChromeUserManagerImpl::IsPublicAccountMarkedForRemoval(
-    const std::string& user_id) const {
-  return user_id ==
+    const user_manager::UserID& user_id) const {
+  return user_id.GetUserEmail() ==
          GetLocalState()->GetString(kPublicAccountPendingDataRemoval);
 }
 
@@ -574,7 +575,7 @@ void ChromeUserManagerImpl::RetrieveTrustedDevicePolicies() {
     return;
 
   SetEphemeralUsersEnabled(false);
-  SetOwnerEmail(std::string());
+  SetOwnerID(user_manager::UserID(std::string(), std::string()));

[Denis Kuznetsov (DE-MUC), 2015/06/10 16:50:47]

EmptyGaiaID() ?

 
   // Schedule a callback if device policy has not yet been verified.
   if (CrosSettingsProvider::TRUSTED !=
@@ -591,7 +592,7 @@ void ChromeUserManagerImpl::RetrieveTrustedDevicePolicies() {
 
   std::string owner_email;
   cros_settings_->GetString(kDeviceOwner, &owner_email);
-  SetOwnerEmail(owner_email);
+  SetOwnerID(user_manager::UserID::FromUserEmail(owner_email));
 
   EnsureUsersLoaded();
 
@@ -605,15 +606,15 @@ void ChromeUserManagerImpl::RetrieveTrustedDevicePolicies() {
     prefs_users_update->Clear();
     for (user_manager::UserList::iterator it = users_.begin();
          it != users_.end();) {
-      const std::string user_email = (*it)->email();
-      if ((*it)->HasGaiaAccount() && user_email != GetOwnerEmail()) {
-        RemoveNonCryptohomeData(user_email);
+      const user_manager::UserID user_id = (*it)->GetUserID();
+      if ((*it)->HasGaiaAccount() && user_id != GetOwnerID()) {
+        RemoveNonCryptohomeData(user_id);
         DeleteUser(*it);
         it = users_.erase(it);
         changed = true;
       } else {
         if ((*it)->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)
-          prefs_users_update->Append(new base::StringValue(user_email));
+          prefs_users_update->Append(new base::StringValue(user_id.GetUserEmail()));
         ++it;
       }
     }
@@ -638,10 +639,10 @@ void ChromeUserManagerImpl::GuestUserLoggedIn() {
       false);
 
   // Initializes wallpaper after active_user_ is set.
-  WallpaperManager::Get()->SetUserWallpaperNow(chromeos::login::kGuestUserName);
+  WallpaperManager::Get()->SetUserWallpaperNow(chromeos::login::GetGuestUserID());
 }
 
-void ChromeUserManagerImpl::RegularUserLoggedIn(const std::string& user_id) {
+void ChromeUserManagerImpl::RegularUserLoggedIn(const user_manager::UserID& user_id) {
   ChromeUserManager::RegularUserLoggedIn(user_id);
 
   if (IsCurrentUserNew())
@@ -656,7 +657,7 @@ void ChromeUserManagerImpl::RegularUserLoggedIn(const std::string& user_id) {
 }
 
 void ChromeUserManagerImpl::RegularUserLoggedInAsEphemeral(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ChromeUserManager::RegularUserLoggedInAsEphemeral(user_id);
 
@@ -664,7 +665,7 @@ void ChromeUserManagerImpl::RegularUserLoggedInAsEphemeral(
   WallpaperManager::Get()->SetUserWallpaperNow(user_id);
 }
 
-void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
+void ChromeUserManagerImpl::SupervisedUserLoggedIn(const user_manager::UserID& user_id) {
   // TODO(nkostylev): Refactor, share code with RegularUserLoggedIn().
 
   // Remove the user from the user list.
@@ -687,12 +688,12 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
 
   // Add the user to the front of the user list.
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
-  prefs_users_update->Insert(0, new base::StringValue(user_id));
+  prefs_users_update->Insert(0, new base::StringValue(user_id.GetUserEmail()));
   users_.insert(users_.begin(), active_user_);
 
   // Now that user is in the list, save display name.
   if (IsCurrentUserNew()) {
-    SaveUserDisplayName(GetActiveUser()->email(),
+    SaveUserDisplayName(GetActiveUser()->GetUserID(),
                         GetActiveUser()->GetDisplayName());
   }
 
@@ -704,7 +705,7 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(const std::string& user_id) {
 }
 
 bool ChromeUserManagerImpl::HasPendingBootstrap(
-    const std::string& user_id) const {
+    const user_manager::UserID& user_id) const {
   return bootstrap_manager_->HasPendingBootstrap(user_id);
 }
 
@@ -716,18 +717,19 @@ void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
   // The UserImageManager chooses a random avatar picture when a user logs in
   // for the first time. Tell the UserImageManager that this user is not new to
   // prevent the avatar from getting changed.
-  GetUserImageManager(user->email())->UserLoggedIn(false, true);
+  GetUserImageManager(user->GetUserID())->UserLoggedIn(false, true);
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
 }
 
 void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  const user_manager::UserID app_user_id(user_manager::UserID::FromUserEmail(app_id));
   policy::DeviceLocalAccount::Type device_local_account_type;
-  DCHECK(policy::IsDeviceLocalAccountUser(app_id, &device_local_account_type));
+  DCHECK(policy::IsDeviceLocalAccountUser(app_user_id, &device_local_account_type));
   DCHECK_EQ(policy::DeviceLocalAccount::TYPE_KIOSK_APP,
             device_local_account_type);
 
-  active_user_ = user_manager::User::CreateKioskAppUser(app_id);
+  active_user_ = user_manager::User::CreateKioskAppUser(app_user_id);
   active_user_->SetStubImage(
       user_manager::UserImage(
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ -735,7 +737,7 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
       user_manager::User::USER_IMAGE_INVALID,
       false);
 
-  WallpaperManager::Get()->SetUserWallpaperNow(app_id);
+  WallpaperManager::Get()->SetUserWallpaperNow(app_user_id);
 
   // TODO(bartfab): Add KioskAppUsers to the users_ list and keep metadata like
   // the kiosk_app_id in these objects, removing the need to re-parse the
@@ -747,7 +749,7 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
            device_local_accounts.begin();
        it != device_local_accounts.end();
        ++it) {
-    if (it->user_id == app_id) {
+    if (it->user_id == app_user_id) {
       account = &*it;
       break;
     }
@@ -772,14 +774,14 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) {
 void ChromeUserManagerImpl::DemoAccountLoggedIn() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   active_user_ =
-      user_manager::User::CreateKioskAppUser(DemoAppLauncher::kDemoUserName);
+      user_manager::User::CreateKioskAppUser(DemoAppLauncher::GetDemoUserID());
   active_user_->SetStubImage(
       user_manager::UserImage(
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_PROFILE_PICTURE_LOADING)),
       user_manager::User::USER_IMAGE_INVALID,
       false);
-  WallpaperManager::Get()->SetUserWallpaperNow(DemoAppLauncher::kDemoUserName);
+  WallpaperManager::Get()->SetUserWallpaperNow(DemoAppLauncher::GetDemoUserID());
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(::switches::kForceAppMode);
@@ -818,7 +820,7 @@ void ChromeUserManagerImpl::UpdateOwnership() {
 }
 
 void ChromeUserManagerImpl::RemoveNonCryptohomeData(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   ChromeUserManager::RemoveNonCryptohomeData(user_id);
 
   WallpaperManager::Get()->RemoveUserWallpaperInfo(user_id);
@@ -834,11 +836,11 @@ void ChromeUserManagerImpl::RemoveNonCryptohomeData(
 void
 ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeDataPendingRemoval() {
   PrefService* local_state = GetLocalState();
-  const std::string public_account_pending_data_removal =
-      local_state->GetString(kPublicAccountPendingDataRemoval);
+  const user_manager::UserID public_account_pending_data_removal(user_manager::UserID::FromUserEmail(
+      local_state->GetString(kPublicAccountPendingDataRemoval)));
   if (public_account_pending_data_removal.empty() ||
       (IsUserLoggedIn() &&
-       public_account_pending_data_removal == GetActiveUser()->email())) {
+       public_account_pending_data_removal == GetActiveUser()->GetUserID())) {
     return;
   }
 
@@ -847,27 +849,27 @@ ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeDataPendingRemoval() {
 }
 
 void ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeData(
-    const std::vector<std::string>& old_public_accounts) {
-  std::set<std::string> users;
+    const std::vector<user_manager::UserID>& old_public_accounts) {
+  std::set<user_manager::UserID> users;
   for (user_manager::UserList::const_iterator it = users_.begin();
        it != users_.end();
        ++it)
-    users.insert((*it)->email());
+    users.insert((*it)->GetUserID());
 
   // If the user is logged into a public account that has been removed from the
   // user list, mark the account's data as pending removal after logout.
   if (IsLoggedInAsPublicAccount()) {
-    const std::string active_user_id = GetActiveUser()->email();
+    const user_manager::UserID& active_user_id = GetActiveUser()->GetUserID();
     if (users.find(active_user_id) == users.end()) {
       GetLocalState()->SetString(kPublicAccountPendingDataRemoval,
-                                 active_user_id);
+                                 active_user_id.GetUserEmail());
       users.insert(active_user_id);
     }
   }
 
   // Remove the data belonging to any other public accounts that are no longer
   // found on the user list.
-  for (std::vector<std::string>::const_iterator it =
+  for (std::vector<user_manager::UserID>::const_iterator it =
            old_public_accounts.begin();
        it != old_public_accounts.end();
        ++it) {
@@ -882,16 +884,16 @@ bool ChromeUserManagerImpl::UpdateAndCleanUpPublicAccounts(
   CleanUpPublicAccountNonCryptohomeDataPendingRemoval();
 
   // Get the current list of public accounts.
-  std::vector<std::string> old_public_accounts;
+  std::vector<user_manager::UserID> old_public_accounts;
   for (user_manager::UserList::const_iterator it = users_.begin();
        it != users_.end();
        ++it) {
     if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT)
-      old_public_accounts.push_back((*it)->email());
+      old_public_accounts.push_back((*it)->GetUserID());
   }
 
   // Get the new list of public accounts from policy.
-  std::vector<std::string> new_public_accounts;
+  std::vector<user_manager::UserID> new_public_accounts;
   for (std::vector<policy::DeviceLocalAccount>::const_iterator it =
            device_local_accounts.begin();
        it != device_local_accounts.end();
@@ -918,11 +920,11 @@ bool ChromeUserManagerImpl::UpdateAndCleanUpPublicAccounts(
   // Persist the new list of public accounts in a pref.
   ListPrefUpdate prefs_public_accounts_update(GetLocalState(), kPublicAccounts);
   prefs_public_accounts_update->Clear();
-  for (std::vector<std::string>::const_iterator it =
+  for (std::vector<user_manager::UserID>::const_iterator it =
            new_public_accounts.begin();
        it != new_public_accounts.end();
        ++it) {
-    prefs_public_accounts_update->AppendString(*it);
+    prefs_public_accounts_update->AppendString(it->GetUserEmail());
   }
 
   // Remove the old public accounts from the user list.
@@ -938,11 +940,11 @@ bool ChromeUserManagerImpl::UpdateAndCleanUpPublicAccounts(
   }
 
   // Add the new public accounts to the front of the user list.
-  for (std::vector<std::string>::const_reverse_iterator it =
+  for (std::vector<user_manager::UserID>::const_reverse_iterator it =
            new_public_accounts.rbegin();
        it != new_public_accounts.rend();
        ++it) {
-    if (IsLoggedInAsPublicAccount() && *it == GetActiveUser()->email())
+    if (IsLoggedInAsPublicAccount() && *it == GetActiveUser()->GetUserID())
       users_.insert(users_.begin(), GetLoggedInUser());
     else
       users_.insert(users_.begin(),
@@ -955,7 +957,7 @@ bool ChromeUserManagerImpl::UpdateAndCleanUpPublicAccounts(
            ue = users_.begin() + new_public_accounts.size();
        ui != ue;
        ++ui) {
-    GetUserImageManager((*ui)->email())->LoadUserImage();
+    GetUserImageManager((*ui)->GetUserID())->LoadUserImage();
   }
 
   // Remove data belonging to public accounts that are no longer found on the
@@ -966,7 +968,7 @@ bool ChromeUserManagerImpl::UpdateAndCleanUpPublicAccounts(
 }
 
 void ChromeUserManagerImpl::UpdatePublicAccountDisplayName(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   std::string display_name;
 
   if (device_local_account_policy_service_) {
@@ -984,10 +986,10 @@ UserFlow* ChromeUserManagerImpl::GetCurrentUserFlow() const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!IsUserLoggedIn())
     return GetDefaultUserFlow();
-  return GetUserFlow(GetLoggedInUser()->email());
+  return GetUserFlow(GetLoggedInUser()->GetUserID());
 }
 
-UserFlow* ChromeUserManagerImpl::GetUserFlow(const std::string& user_id) const {
+UserFlow* ChromeUserManagerImpl::GetUserFlow(const user_manager::UserID& user_id) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FlowMap::const_iterator it = specific_flows_.find(user_id);
   if (it != specific_flows_.end())
@@ -995,14 +997,14 @@ UserFlow* ChromeUserManagerImpl::GetUserFlow(const std::string& user_id) const {
   return GetDefaultUserFlow();
 }
 
-void ChromeUserManagerImpl::SetUserFlow(const std::string& user_id,
+void ChromeUserManagerImpl::SetUserFlow(const user_manager::UserID& user_id,
                                         UserFlow* flow) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ResetUserFlow(user_id);
   specific_flows_[user_id] = flow;
 }
 
-void ChromeUserManagerImpl::ResetUserFlow(const std::string& user_id) {
+void ChromeUserManagerImpl::ResetUserFlow(const user_manager::UserID& user_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FlowMap::iterator it = specific_flows_.find(user_id);
   if (it != specific_flows_.end()) {
@@ -1041,21 +1043,21 @@ void ChromeUserManagerImpl::NotifyUserAddedToSession(
   // before the crash.
   if (user_switch_pending &&
       !UserSessionManager::GetInstance()->UserSessionsRestoreInProgress()) {
-    SetPendingUserSwitchID(added_user->email());
+    SetPendingUserSwitchID(added_user->GetUserID());
   }
 
   UpdateNumberOfUsers();
   ChromeUserManager::NotifyUserAddedToSession(added_user, user_switch_pending);
 }
 
-void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
+void ChromeUserManagerImpl::OnUserNotAllowed(const user_manager::UserID& user_id) {
   LOG(ERROR) << "Shutdown session because a user is not allowed to be in the "
                 "current session";
-  chromeos::ShowMultiprofilesSessionAbortedDialog(user_email);
+  chromeos::ShowMultiprofilesSessionAbortedDialog(user_id);
 }
 
 void ChromeUserManagerImpl::RemovePendingBootstrapUser(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   DCHECK(HasPendingBootstrap(user_id));
   RemoveNonOwnerUserInternal(user_id, NULL);
 }