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

 // 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/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h"
 
 #include "ash/audio/sounds.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/url_constants.h"
 #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"
 #include "grit/browser_resources.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 const char kJsScreenPath[] = "login.SupervisedUserCreationScreen";
@@ skipping 260 matching lines @@
     HandleAbortLocalSupervisedUserCreation() {
   delegate_->AbortFlow();
 }
 
 void SupervisedUserCreationScreenHandler::
     HandleHideLocalSupervisedUserCreation() {
   delegate_->HideFlow();
 }
 
 void SupervisedUserCreationScreenHandler::HandleManagerSelected(
-    const AccountId& manager_id) {
+    const std::string& manager_id) {
   if (!delegate_)
     return;
-  WallpaperManager::Get()->SetUserWallpaperNow(manager_id.GetUserEmail());
+  WallpaperManager::Get()->SetUserWallpaperNow(manager_id);
 }
 
 void SupervisedUserCreationScreenHandler::HandleImportUserSelected(
-    const AccountId& account_id) {
+    const std::string& user_id) {
   if (!delegate_)
     return;
 }
 
 void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName(
     const base::string16& name) {
   std::string user_id;
   if (NULL !=
       ChromeUserManager::Get()->GetSupervisedUserManager()->FindByDisplayName(
           base::CollapseWhitespace(name, true))) {
@@ skipping 42 matching lines @@
     return;
   }
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
   delegate_->CreateSupervisedUser(new_user_name, new_user_password);
 }
 
 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.
 // It should be removed by issue 251179.
 void SupervisedUserCreationScreenHandler::HandleGetImages() {
   base::ListValue image_urls;
   for (int i = user_manager::kFirstDefaultImageIndex;
        i < user_manager::kDefaultImagesCount;
        ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
@@ skipping 50 matching lines @@
 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) {
   CallJS("setCameraPresent", present);
 }
 
 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers(
     const base::ListValue* users) {
   CallJS("setExistingSupervisedUsers", *users);
 }
 
 }  // namespace chromeos