This CL replaces user_manager::UserID with AccountId.

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

Index: chrome/browser/chromeos/login/users/mock_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.cc b/chrome/browser/chromeos/login/users/mock_user_manager.cc
index 0e79f653b2c2480f152826e8634aa0dff21f33ff..0decd1d5df8f132f11a565de930751231cc729a4 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.cc
@@ -31,7 +31,8 @@ namespace chromeos {
 MockUserManager::MockUserManager()
     : ChromeUserManager(new FakeTaskRunner(), new FakeTaskRunner()),
       user_flow_(new DefaultUserFlow()),
-      supervised_user_manager_(new FakeSupervisedUserManager()) {
+      supervised_user_manager_(new FakeSupervisedUserManager()),
+      temporary_owner_id_(EmptyAccountId()) {
   ProfileHelper::SetProfileToUserForTestingEnabled(true);
 }
 
@@ -56,8 +57,9 @@ user_manager::UserList MockUserManager::GetUnlockUsers() const {
   return user_list_;
 }
 
-const std::string& MockUserManager::GetOwnerEmail() const {
-  return GetLoggedInUser()->email();
+const AccountId& MockUserManager::GetOwnerId() const {
+  temporary_owner_id_ = GetLoggedInUser()->GetUserID();
+  return temporary_owner_id_;
 }
 
 const user_manager::User* MockUserManager::GetActiveUser() const {
@@ -81,7 +83,7 @@ MultiProfileUserController* MockUserManager::GetMultiProfileUserController() {
 }
 
 UserImageManager* MockUserManager::GetUserImageManager(
-    const std::string& user_id) {
+    const AccountId& user_id) {
   return NULL;
 }
 
@@ -90,43 +92,44 @@ SupervisedUserManager* MockUserManager::GetSupervisedUserManager() {
 }
 
 // Creates a new User instance.
-void MockUserManager::SetActiveUser(const std::string& email) {
+void MockUserManager::SetActiveUser(const AccountId& user_id) {
   ClearUserList();
-  AddUser(email);
+  AddUser(user_id);
 }
 
 UserFlow* MockUserManager::GetCurrentUserFlow() const {
   return user_flow_.get();
 }
 
-UserFlow* MockUserManager::GetUserFlow(const std::string&) const {
+UserFlow* MockUserManager::GetUserFlow(const AccountId&) const {
   return user_flow_.get();
 }
 
 user_manager::User* MockUserManager::CreatePublicAccountUser(
-    const std::string& email) {
+    const AccountId& user_id) {
   ClearUserList();
-  user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
+  user_manager::User* user =
+      user_manager::User::CreatePublicAccountUser(user_id);
   user_list_.push_back(user);
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
   return user_list_.back();
 }
 
 user_manager::User* MockUserManager::CreateKioskAppUser(
-    const std::string& email) {
+    const AccountId& user_id) {
   ClearUserList();
-  user_list_.push_back(user_manager::User::CreateKioskAppUser(email));
+  user_list_.push_back(user_manager::User::CreateKioskAppUser(user_id));
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user_list_.back());
   return user_list_.back();
 }
 
-void MockUserManager::AddUser(const std::string& email) {
-  AddUserWithAffiliation(email, false);
+void MockUserManager::AddUser(const AccountId& user_id) {
+  AddUserWithAffiliation(user_id, false);
 }
 
-void MockUserManager::AddUserWithAffiliation(const std::string& email,
+void MockUserManager::AddUserWithAffiliation(const AccountId& user_id,
                                              bool is_affiliated) {
-  user_manager::User* user = user_manager::User::CreateRegularUser(email);
+  user_manager::User* user = user_manager::User::CreateRegularUser(user_id);
   user->set_affiliation(is_affiliated);
   user_list_.push_back(user);
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
@@ -142,7 +145,7 @@ void MockUserManager::ClearUserList() {
 
 bool MockUserManager::ShouldReportUser(const std::string& user_id) const {
   for (const auto& user : user_list_) {
-    if (user->GetUserID() == user_id) {
+    if (user->email() == user_id) {
       return user->is_affiliated();
     }
   }