This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
index dbbf3f5be30ab16c2635959a4b7e2b4824029867..20cbdbac08fe329345fdbf874d4c277ec8fde75a 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
@@ -27,6 +27,7 @@
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -69,12 +70,12 @@ class ChromeUserManagerImpl
   // UserManagerInterface implementation:
   BootstrapManager* GetBootstrapManager() override;
   MultiProfileUserController* GetMultiProfileUserController() override;
-  UserImageManager* GetUserImageManager(const std::string& user_id) override;
+  UserImageManager* GetUserImageManager(const AccountId& account_id) override;
   SupervisedUserManager* GetSupervisedUserManager() override;
   UserFlow* GetCurrentUserFlow() const override;
-  UserFlow* GetUserFlow(const std::string& user_id) const override;
-  void SetUserFlow(const std::string& user_id, UserFlow* flow) override;
-  void ResetUserFlow(const std::string& user_id) override;
+  UserFlow* GetUserFlow(const AccountId& account_id) const override;
+  void SetUserFlow(const AccountId& account_id, UserFlow* flow) override;
+  void ResetUserFlow(const AccountId& account_id) override;
 
   // UserManager implementation:
   void Shutdown() override;
@@ -84,13 +85,13 @@ class ChromeUserManagerImpl
   user_manager::UserList GetUnlockUsers() const override;
   void SessionStarted() override;
   void SaveUserOAuthStatus(
-      const std::string& user_id,
+      const AccountId& account_id,
       user_manager::User::OAuthTokenStatus oauth_token_status) override;
-  void SaveUserDisplayName(const std::string& user_id,
+  void SaveUserDisplayName(const AccountId& account_id,
                            const base::string16& display_name) override;
   bool CanCurrentUserLock() const override;
   bool IsUserNonCryptohomeDataEphemeral(
-      const std::string& user_id) const override;
+      const AccountId& account_id) const override;
   bool AreSupervisedUsersAllowed() const override;
 
   // content::NotificationObserver implementation.
@@ -115,7 +116,7 @@ class ChromeUserManagerImpl
 
   // UserManagerBase implementation:
   bool AreEphemeralUsersEnabled() const override;
-  void OnUserRemoved(const std::string& user_id) override;
+  void OnUserRemoved(const AccountId& account_id) override;
 
   // ChromeUserManager implementation:
   bool ShouldReportUser(const std::string& user_id) const override;
@@ -127,31 +128,31 @@ class ChromeUserManagerImpl
   const std::string& GetApplicationLocale() const override;
   PrefService* GetLocalState() const override;
   void HandleUserOAuthTokenStatusChange(
-      const std::string& user_id,
+      const AccountId& account_id,
       user_manager::User::OAuthTokenStatus status) const override;
   bool IsEnterpriseManaged() const override;
-  void LoadPublicAccounts(std::set<std::string>* users_set) override;
+  void LoadPublicAccounts(std::set<AccountId>* users_set) override;
   void NotifyOnLogin() override;
   void NotifyUserAddedToSession(const user_manager::User* added_user,
                                 bool user_switch_pending) override;
   void PerformPreUserListLoadingActions() override;
   void PerformPostUserListLoadingActions() override;
   void PerformPostUserLoggedInActions(bool browser_restart) override;
-  void RemoveNonCryptohomeData(const std::string& user_id) override;
-  void RemoveUserInternal(const std::string& user_email,
+  void RemoveNonCryptohomeData(const AccountId& account_id) override;
+  void RemoveUserInternal(const AccountId& account_id,
                           user_manager::RemoveUserDelegate* delegate) override;
-  bool IsDemoApp(const std::string& user_id) const override;
-  bool IsKioskApp(const std::string& user_id) const override;
+  bool IsDemoApp(const AccountId& account_id) const override;
+  bool IsKioskApp(const AccountId& account_id) const override;
   bool IsPublicAccountMarkedForRemoval(
-      const std::string& user_id) const override;
+      const AccountId& account_id) const override;
   void DemoAccountLoggedIn() override;
   void GuestUserLoggedIn() override;
-  void KioskAppLoggedIn(const std::string& app_id) override;
+  void KioskAppLoggedIn(const AccountId& kiosk_app_account_id) override;
   void PublicAccountUserLoggedIn(user_manager::User* user) override;
-  void RegularUserLoggedIn(const std::string& user_id) override;
-  void RegularUserLoggedInAsEphemeral(const std::string& user_id) override;
-  void SupervisedUserLoggedIn(const std::string& user_id) override;
-  bool HasPendingBootstrap(const std::string& user_id) const override;
+  void RegularUserLoggedIn(const AccountId& account_id) override;
+  void RegularUserLoggedInAsEphemeral(const AccountId& account_id) override;
+  void SupervisedUserLoggedIn(const AccountId& account_id) override;
+  bool HasPendingBootstrap(const AccountId& account_id) const override;
 
  private:
   friend class SupervisedUserManagerImpl;
@@ -159,8 +160,8 @@ class ChromeUserManagerImpl
   friend class WallpaperManager;
   friend class WallpaperManagerTest;
 
-  typedef base::hash_map<std::string, linked_ptr<UserImageManager> >
-      UserImageManagerMap;
+  using UserImageManagerMap =
+      base::hash_map<AccountId, linked_ptr<UserImageManager> >;
 
   ChromeUserManagerImpl();
 
@@ -237,7 +238,7 @@ class ChromeUserManagerImpl
   // Session length limiter.
   scoped_ptr<SessionLengthLimiter> session_length_limiter_;
 
-  typedef std::map<std::string, UserFlow*> FlowMap;
+  using FlowMap = std::map<AccountId, UserFlow*>;
 
   // Lazy-initialized default flow.
   mutable scoped_ptr<UserFlow> default_flow_;