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

chrome/browser/chromeos/login/screens/user_selection_screen.h

Index: chrome/browser/chromeos/login/screens/user_selection_screen.h
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h
index 71dcb9903dee65832341158281980e66a139d835..0c2879b54c222e2f5bfe15628e2590ae7359d243 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h
@@ -16,7 +16,6 @@
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
 #include "components/proximity_auth/screenlock_bridge.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "ui/base/user_activity/user_activity_observer.h"
 
@@ -43,8 +42,9 @@
 
   static const user_manager::UserList PrepareUserListForSending(
       const user_manager::UserList& users,
-      const AccountId& owner,
+      std::string owner,
       bool is_signin_to_add);
+
 
   virtual void Init(const user_manager::UserList& users, bool show_guest);
   void OnUserImageChanged(const user_manager::User& user);
@@ -54,7 +54,7 @@
   void OnPasswordClearTimerExpired();
 
   void HandleGetUsers();
-  void CheckUserStatus(const AccountId& account_id);
+  void CheckUserStatus(const std::string& user_id);
 
   // ui::UserActivityDetector implementation:
   void OnUserActivity(const ui::Event* event) override;
@@ -83,9 +83,9 @@
 
   // UserBoardModel implementation.
   void SendUserList() override;
-  void HardLockPod(const AccountId& account_id) override;
-  void AttemptEasyUnlock(const AccountId& account_id) override;
-  void RecordClickOnLockIcon(const AccountId& account_id) override;
+  void HardLockPod(const std::string& user_id) override;
+  void AttemptEasyUnlock(const std::string& user_id) override;
+  void RecordClickOnLockIcon(const std::string& user_id) override;
 
   // Fills |user_dict| with information about |user|.
   static void FillUserDictionary(
@@ -109,22 +109,18 @@
   static bool ShouldForceOnlineSignIn(const user_manager::User* user);
 
  protected:
-  // This call forms full account id of a known user by email.
-  // This is a temporary call while migrating to AccountId.
-  static AccountId GetAccountIdOfKnownUser(const std::string& user_id);
-
   LoginDisplayWebUIHandler* handler_;
   LoginDisplay::Delegate* login_display_delegate_;
   UserBoardView* view_;
 
-  // Map from public session account IDs to recommended locales set by policy.
-  typedef std::map<AccountId, std::vector<std::string> >
+  // Map from public session user IDs to recommended locales set by policy.
+  typedef std::map<std::string, std::vector<std::string> >
       PublicSessionRecommendedLocaleMap;
   PublicSessionRecommendedLocaleMap public_session_recommended_locales_;
 
  private:
   EasyUnlockService* GetEasyUnlockServiceForUser(
-      const AccountId& account_id) const;
+      const std::string& user_id) const;
 
   void OnUserStatusChecked(const AccountId& account_id,
                            TokenHandleUtil::TokenHandleStatus status);
@@ -138,9 +134,9 @@
   // Set of Users that are visible.
   user_manager::UserList users_;
 
-  // Map of accounnt ids to their current authentication type. If a user is not
+  // Map of usernames to their current authentication type. If a user is not
   // contained in the map, it is using the default authentication type.
-  std::map<AccountId, proximity_auth::ScreenlockBridge::LockHandler::AuthType>
+  std::map<std::string, proximity_auth::ScreenlockBridge::LockHandler::AuthType>
       user_auth_type_map_;
 
   // Timer for measuring idle state duration before password clear.