Revert of This CL replaces e-mail with AccountId on user selection screen.

chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
index 5a6cb430f3ac177c8a6eaeea7af66a0ac3a27e43..c672a2410c7a5579461e73013af56f35b32a5655 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
@@ -18,7 +18,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "components/login/localized_values_builder.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "google_apis/gaia/gaia_auth_util.h"
@@ -299,14 +298,14 @@
 }
 
 void SupervisedUserCreationScreenHandler::HandleManagerSelected(
-    const AccountId& manager_id) {
-  if (!delegate_)
-    return;
-  WallpaperManager::Get()->SetUserWallpaperNow(manager_id.GetUserEmail());
+    const std::string& manager_id) {
+  if (!delegate_)
+    return;
+  WallpaperManager::Get()->SetUserWallpaperNow(manager_id);
 }
 
 void SupervisedUserCreationScreenHandler::HandleImportUserSelected(
-    const AccountId& account_id) {
+    const std::string& user_id) {
   if (!delegate_)
     return;
 }
@@ -369,37 +368,35 @@
 }
 
 void SupervisedUserCreationScreenHandler::HandleImportSupervisedUser(
-    const AccountId& account_id) {
+    const std::string& user_id) {
   if (!delegate_)
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
-  delegate_->ImportSupervisedUser(account_id.GetUserEmail());
+  delegate_->ImportSupervisedUser(user_id);
 }
 
 void SupervisedUserCreationScreenHandler::
-    HandleImportSupervisedUserWithPassword(const AccountId& account_id,
-                                           const std::string& password) {
+    HandleImportSupervisedUserWithPassword(
+        const std::string& user_id,
+        const std::string& password) {
   if (!delegate_)
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
-  delegate_->ImportSupervisedUserWithPassword(account_id.GetUserEmail(),
-                                              password);
+  delegate_->ImportSupervisedUserWithPassword(user_id, password);
 }
 
 void SupervisedUserCreationScreenHandler::HandleAuthenticateManager(
-    const AccountId& manager_raw_account_id,
+    const std::string& raw_manager_username,
     const std::string& manager_password) {
-  const AccountId manager_account_id = AccountId::FromUserEmailGaiaId(
-      gaia::SanitizeEmail(manager_raw_account_id.GetUserEmail()),
-      manager_raw_account_id.GetGaiaId());
-  delegate_->AuthenticateManager(manager_account_id.GetUserEmail(),
-                                 manager_password);
+  const std::string manager_username =
+      gaia::SanitizeEmail(raw_manager_username);
+  delegate_->AuthenticateManager(manager_username, manager_password);
 }
 
 // TODO(antrim) : this is an explicit code duplications with UserImageScreen.