This CL replaces user_manager::UserID with AccountId.

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

 // Copyright 2014 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/login/users/supervised_user_manager_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 131 matching lines @@
 
 std::string SupervisedUserManagerImpl::GenerateUserId() {
   int counter = g_browser_process->local_state()->
       GetInteger(kSupervisedUsersNextId);
   std::string id;
   bool user_exists;
   do {
     id = base::StringPrintf(
         "%d@%s", counter, chromeos::login::kSupervisedUserDomain);
     counter++;
-    user_exists = (NULL != owner_->FindUser(id));
+    user_exists = (nullptr != owner_->FindUser(AccountId::FromUserEmail(id)));
     DCHECK(!user_exists);
     if (user_exists) {
       LOG(ERROR) << "Supervised user with id " << id << " already exists.";
     }
   } while (user_exists);
 
   g_browser_process->local_state()->
       SetInteger(kSupervisedUsersNextId, counter);
 
   g_browser_process->local_state()->CommitPendingWrite();
@@ skipping 16 matching lines @@
 
 const user_manager::User* SupervisedUserManagerImpl::CreateUserRecord(
     const std::string& manager_id,
     const std::string& local_user_id,
     const std::string& sync_user_id,
     const base::string16& display_name) {
   const user_manager::User* user = FindByDisplayName(display_name);
   DCHECK(!user);
   if (user)
     return user;
-  const user_manager::User* manager = owner_->FindUser(manager_id);
+  const user_manager::User* manager =
+      owner_->FindUser(AccountId::FromUserEmail(manager_id));
   CHECK(manager);
 
   PrefService* local_state = g_browser_process->local_state();
 
-  user_manager::User* new_user =
-      user_manager::User::CreateSupervisedUser(local_user_id);
+  user_manager::User* new_user = user_manager::User::CreateSupervisedUser(
+      AccountId::FromUserEmail(local_user_id));
 
   owner_->AddUserRecord(new_user);
 
   ListPrefUpdate prefs_new_users_update(local_state,
                                         kSupervisedUsersFirstRun);
   DictionaryPrefUpdate sync_id_update(local_state, kSupervisedUserSyncId);
   DictionaryPrefUpdate manager_update(local_state, kSupervisedUserManagers);
   DictionaryPrefUpdate manager_name_update(local_state,
                                            kSupervisedUserManagerNames);
   DictionaryPrefUpdate manager_email_update(
       local_state,
       kSupervisedUserManagerDisplayEmails);
 
   prefs_new_users_update->Insert(0, new base::StringValue(local_user_id));
 
   sync_id_update->SetWithoutPathExpansion(local_user_id,
       new base::StringValue(sync_user_id));
   manager_update->SetWithoutPathExpansion(local_user_id,
       new base::StringValue(manager->email()));
   manager_name_update->SetWithoutPathExpansion(local_user_id,
       new base::StringValue(manager->GetDisplayName()));
   manager_email_update->SetWithoutPathExpansion(local_user_id,
       new base::StringValue(manager->display_email()));
 
-  owner_->SaveUserDisplayName(local_user_id, display_name);
+  owner_->SaveUserDisplayName(AccountId::FromUserEmail(local_user_id),
+                              display_name);
 
   g_browser_process->local_state()->CommitPendingWrite();
   return new_user;
 }
 
 std::string SupervisedUserManagerImpl::GetUserSyncId(const std::string& user_id)
     const {
   std::string result;
   GetUserStringValue(user_id, kSupervisedUserSyncId, &result);
   return result;
@@ skipping 204 matching lines @@
 
   if (gaia::ExtractDomainName(user_id) !=
       chromeos::login::kSupervisedUserDomain) {
     LOG(WARNING) << "Clean up transaction for  non-supervised user found :"
                  << user_id << ", will not remove data";
     prefs->ClearPref(kSupervisedUserCreationTransactionDisplayName);
     prefs->ClearPref(kSupervisedUserCreationTransactionUserId);
     prefs->CommitPendingWrite();
     return;
   }
-  owner_->RemoveNonOwnerUserInternal(user_id, NULL);
+  owner_->RemoveNonOwnerUserInternal(AccountId::FromUserEmail(user_id),
+                                     nullptr);
 
   prefs->ClearPref(kSupervisedUserCreationTransactionDisplayName);
   prefs->ClearPref(kSupervisedUserCreationTransactionUserId);
   prefs->CommitPendingWrite();
 }
 
 void SupervisedUserManagerImpl::RemoveNonCryptohomeData(
     const std::string& user_id) {
   PrefService* prefs = g_browser_process->local_state();
   ListPrefUpdate prefs_new_users_update(prefs, kSupervisedUsersFirstRun);
@@ skipping 64 matching lines @@
 }
 
 void SupervisedUserManagerImpl::ConfigureSyncWithToken(
     Profile* profile,
     const std::string& token) {
   if (!token.empty())
     SupervisedUserServiceFactory::GetForProfile(profile)->InitSync(token);
 }
 
 }  // namespace chromeos