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

chrome/browser/chromeos/login/signin_screen_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_SCREEN_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_SCREEN_CONTROLLER_H_
 
 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ skipping 25 matching lines @@
   // TODO(antrim): replace with querying for this data.
   void Init(const user_manager::UserList& users, bool show_guest);
 
   // Called when signin screen is ready.
   void OnSigninScreenReady();
 
   // Query to send list of users to user selection screen.
   void SendUserList();
 
   // Runs OAauth token validity check.
-  void CheckUserStatus(const std::string& user_id);
+  void CheckUserStatus(const AccountId& account_id);
 
   // Query to remove user with specified id.
   // TODO(antrim): move to user selection screen handler.
   void RemoveUser(const std::string& user_id);
 
   // user_manager::RemoveUserDelegate implementation:
   void OnBeforeUserRemoved(const std::string& username) override;
   void OnUserRemoved(const std::string& username) override;
 
   // content::NotificationObserver implementation.
@@ skipping 14 matching lines @@
 
   // Used for notifications during the login process.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SignInScreenController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_SCREEN_CONTROLLER_H_