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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 0f5b3f02acae3b747be599a3ad1a0725d27dcc62..86ff5797f2443ff45c38483a86ee181b4e81633c 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -185,7 +185,7 @@
   virtual void HandleGetUsers() = 0;
 
   // Runs an OAuth token validation check for user.
-  virtual void CheckUserStatus(const AccountId& account_id) = 0;
+  virtual void CheckUserStatus(const std::string& user_id) = 0;
 
   // Returns true if user is allowed to log in by domain policy.
   virtual bool IsUserWhitelisted(const std::string& user_id) = 0;
@@ -319,18 +319,18 @@
 
   // WebUI message handlers.
   void HandleGetUsers();
-  void HandleAuthenticateUser(const AccountId& account_id,
+  void HandleAuthenticateUser(const std::string& username,
                               const std::string& password);
   void HandleAttemptUnlock(const std::string& username);
   void HandleLaunchIncognito();
-  void HandleLaunchPublicSession(const AccountId& account_id,
+  void HandleLaunchPublicSession(const std::string& user_id,
                                  const std::string& locale,
                                  const std::string& input_method);
   void HandleOfflineLogin(const base::ListValue* args);
   void HandleShutdownSystem();
-  void HandleLoadWallpaper(const AccountId& account_id);
+  void HandleLoadWallpaper(const std::string& email);
   void HandleRebootSystem();
-  void HandleRemoveUser(const AccountId& account_id);
+  void HandleRemoveUser(const std::string& email);
   void HandleShowAddUser(const base::ListValue* args);
   void HandleToggleEnrollmentScreen();
   void HandleToggleEnableDebuggingScreen();
@@ -342,7 +342,7 @@
   void HandleSignOutUser();
   void HandleOpenProxySettings();
   void HandleLoginVisible(const std::string& source);
-  void HandleCancelPasswordChangedFlow(const AccountId& account_id);
+  void HandleCancelPasswordChangedFlow(const std::string& user_id);
   void HandleCancelUserAdding();
   void HandleMigrateUserData(const std::string& password);
   void HandleResyncUserData();
@@ -351,22 +351,21 @@
   void HandleLoginScreenUpdate();
   void HandleShowLoadingTimeoutError();
   void HandleShowSupervisedUserCreationScreen();
-  void HandleFocusPod(const AccountId& account_id);
+  void HandleFocusPod(const std::string& user_id);
   void HandleHardlockPod(const std::string& user_id);
-  void HandleLaunchKioskApp(const AccountId& app_account_id,
-                            bool diagnostic_mode);
-  void HandleGetPublicSessionKeyboardLayouts(const AccountId& account_id,
+  void HandleLaunchKioskApp(const std::string& app_id, bool diagnostic_mode);
+  void HandleGetPublicSessionKeyboardLayouts(const std::string& user_id,
                                              const std::string& locale);
   void HandleCancelConsumerManagementEnrollment();
   void HandleGetTouchViewState();
   void HandleLogRemoveUserWarningShown();
-  void HandleFirstIncorrectPasswordAttempt(const AccountId& account_id);
-  void HandleMaxIncorrectPasswordAttempts(const AccountId& account_id);
+  void HandleFirstIncorrectPasswordAttempt(const std::string& email);
+  void HandleMaxIncorrectPasswordAttempts(const std::string& email);
 
   // Sends the list of |keyboard_layouts| available for the |locale| that is
   // currently selected for the public session identified by |user_id|.
   void SendPublicSessionKeyboardLayouts(
-      const AccountId& account_id,
+      const std::string& user_id,
       const std::string& locale,
       scoped_ptr<base::ListValue> keyboard_layouts);