ChromeOS: Fix removeUser button on signin screen.

components/user_manager/user_manager_base.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 "components/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 81 matching lines @@
 const char kGAPSCookie[] = "gaps_cookie";
 
 // Key of the reason for re-auth.
 const char kReauthReasonKey[] = "reauth_reason";
 
 // Upper bound for a histogram metric reporting the amount of time between
 // one regular user logging out and a different regular user logging in.
 const int kLogoutToLoginDelayMaxSec = 1800;
 
 // Callback that is called after user removal is complete.
-void OnRemoveUserComplete(const std::string& user_email,
+void OnRemoveUserComplete(const AccountId& account_id,
                           bool success,
                           cryptohome::MountError return_code) {
   // Log the error, but there's not much we can do.
   if (!success) {
-    LOG(ERROR) << "Removal of cryptohome for " << user_email
+    LOG(ERROR) << "Removal of cryptohome for " << account_id.Serialize()
                << " failed, return code: " << return_code;
   }
 }
 
 // Runs on SequencedWorkerPool thread. Passes resolved locale to UI thread.
 void ResolveLocale(const std::string& raw_locale,
                    std::string* resolved_locale) {
   ignore_result(l10n_util::CheckAndResolveLocale(raw_locale, resolved_locale));
 }
 
@@ skipping 228 matching lines @@
 }
 
 void UserManagerBase::RemoveUserInternal(const AccountId& account_id,
                                          RemoveUserDelegate* delegate) {
   RemoveNonOwnerUserInternal(account_id, delegate);
 }
 
 void UserManagerBase::RemoveNonOwnerUserInternal(const AccountId& account_id,
                                                  RemoveUserDelegate* delegate) {
   if (delegate)
-    delegate->OnBeforeUserRemoved(account_id.GetUserEmail());
+    delegate->OnBeforeUserRemoved(account_id);
   RemoveUserFromList(account_id);
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncRemove(
-      account_id.GetUserEmail(),
-      base::Bind(&OnRemoveUserComplete, account_id.GetUserEmail()));
+      account_id.GetUserEmail(), base::Bind(&OnRemoveUserComplete, account_id));
 
   if (delegate)
-    delegate->OnUserRemoved(account_id.GetUserEmail());
+    delegate->OnUserRemoved(account_id);
 }
 
 void UserManagerBase::RemoveUserFromList(const AccountId& account_id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   RemoveNonCryptohomeData(account_id);
   if (user_loading_stage_ == STAGE_LOADED) {
     DeleteUser(RemoveRegularOrSupervisedUserFromList(account_id));
   } else if (user_loading_stage_ == STAGE_LOADING) {
     DCHECK(gaia::ExtractDomainName(account_id.GetUserEmail()) ==
                chromeos::login::kSupervisedUserDomain ||
@@ skipping 1015 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = nullptr;
 }
 
 }  // namespace user_manager