This CL replaces user_manager::UserID with AccountId.

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

 // Copyright 2014 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_SCREENS_USER_SELECTION_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
 #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/user_manager/user.h"
-#include "components/user_manager/user_id.h"
 #include "ui/base/user_activity/user_activity_observer.h"
 
+class AccountId;
 class EasyUnlockService;
 
 namespace chromeos {
 
 class LoginDisplayWebUIHandler;
 class UserBoardView;
 
 // This class represents User Selection screen: user pod-based login screen.
 class UserSelectionScreen
     : public ui::UserActivityObserver,
@@ skipping 82 matching lines @@
 
   // 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 std::string& user_id) const;
 
-  void OnUserStatusChecked(const user_manager::UserID& user_id,
+  void OnUserStatusChecked(const AccountId& account_id,
                            TokenHandleUtil::TokenHandleStatus status);
 
   // Whether to show guest login.
   bool show_guest_;
 
   // Purpose of the screen (see constants in OobeUI).
   const std::string display_type_;
 
   // Set of Users that are visible.
   user_manager::UserList users_;
@@ skipping 10 matching lines @@
   scoped_ptr<TokenHandleUtil> token_handle_util_;
 
   base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_