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 86ff5797f2443ff45c38483a86ee181b4e81633c..faecdd335e4fe09e23a4f6193a7a1bf202b411e6 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -319,7 +319,7 @@ class SigninScreenHandler
 
   // WebUI message handlers.
   void HandleGetUsers();
-  void HandleAuthenticateUser(const std::string& username,
+  void HandleAuthenticateUser(const std::string& user_id,
                               const std::string& password);
   void HandleAttemptUnlock(const std::string& username);
   void HandleLaunchIncognito();
@@ -359,13 +359,13 @@ class SigninScreenHandler
   void HandleCancelConsumerManagementEnrollment();
   void HandleGetTouchViewState();
   void HandleLogRemoveUserWarningShown();
-  void HandleFirstIncorrectPasswordAttempt(const std::string& email);
-  void HandleMaxIncorrectPasswordAttempts(const std::string& email);
+  void HandleFirstIncorrectPasswordAttempt(const std::string& user_id);
+  void HandleMaxIncorrectPasswordAttempts(const std::string& user_id);
 
   // 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 std::string& user_id,
+      const AccountId& account_id,
       const std::string& locale,
       scoped_ptr<base::ListValue> keyboard_layouts);