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

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

Index: chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
index fd8d52e7c35ac057624e8fb66d17a727dbfb0714..1c85437018562464c46c1797ba959bec7007482c 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
@@ -32,23 +32,23 @@
 
   // Handlers
   void HandleGetUsers();
-  void HandleHardlockPod(const AccountId& account_id);
-  void HandleAttemptUnlock(const AccountId& account_id);
-  void HandleRecordClickOnLockIcon(const AccountId& account_id);
+  void HandleHardlockPod(const std::string& user_id);
+  void HandleAttemptUnlock(const std::string& user_id);
+  void HandleRecordClickOnLockIcon(const std::string& user_id);
 
   // UserBoardView implementation:
-  void SetPublicSessionDisplayName(const AccountId& account_id,
+  void SetPublicSessionDisplayName(const std::string& user_id,
                                    const std::string& display_name) override;
-  void SetPublicSessionLocales(const AccountId& account_id,
+  void SetPublicSessionLocales(const std::string& user_id,
                                scoped_ptr<base::ListValue> locales,
                                const std::string& default_locale,
                                bool multiple_recommended_locales) override;
   void ShowBannerMessage(const base::string16& message) override;
-  void ShowUserPodCustomIcon(const AccountId& account_id,
+  void ShowUserPodCustomIcon(const std::string& user_id,
                              const base::DictionaryValue& icon) override;
-  void HideUserPodCustomIcon(const AccountId& account_id) override;
+  void HideUserPodCustomIcon(const std::string& user_id) override;
   void SetAuthType(
-      const AccountId& account_id,
+      const std::string& user_id,
       proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
       const base::string16& initial_value) override;