Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin_screen_controller.cc

 // Copyright (c) 2012 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/signin_screen_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
@@ skipping 41 matching lines @@
 
 void SignInScreenController::OnSigninScreenReady() {
   gaia_screen_->MaybePreloadAuthExtension();
   user_selection_screen_->InitEasyUnlock();
   if (ScreenLocker::default_screen_locker()) {
     ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
   }
 }
 
 void SignInScreenController::RemoveUser(const std::string& user_id) {
-  user_manager::UserManager::Get()->RemoveUser(
-      AccountId::FromUserEmail(user_id), this);
+  user_manager::UserManager::Get()->RemoveUser(user_id, this);
 }
 
 void SignInScreenController::OnBeforeUserRemoved(const std::string& username) {
   user_selection_screen_->OnBeforeUserRemoved(username);
 }
 
 void SignInScreenController::OnUserRemoved(const std::string& username) {
   user_selection_screen_->OnUserRemoved(username);
 }
 
@@ skipping 24 matching lines @@
     registrar_.RemoveAll();
     return;
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
     user_selection_screen_->OnUserImageChanged(
         *content::Details<user_manager::User>(details).ptr());
     return;
   }
 }
 
 }  // namespace chromeos