This CL replaces user_manager::UserID with AccountId.

components/user_manager/user.h

Index: components/user_manager/user.h
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index d961acf316a53428c1a40815dacb8dde0ab569cd..3309d717b6a4fee933b873357b792a7514069dcd 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "components/user_manager/user_id.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager_export.h"
@@ -83,7 +83,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   virtual UserType GetType() const = 0;
 
   // The email the user used to log in.
-  const std::string& email() const { return email_; }
+  const std::string& email() const;

[achuithb, 2015/10/23 00:08:52]

Add a TODO to rename this to GetUserEmail()

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

 
   // The displayed user name.
   base::string16 display_name() const { return display_name_; }
@@ -96,7 +96,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   base::string16 GetDisplayName() const override;
   base::string16 GetGivenName() const override;
   const gfx::ImageSkia& GetImage() const override;
-  UserID GetUserID() const override;
+  AccountId GetUserID() const override;

[achuithb, 2015/10/23 00:08:52]

GetAccountID()

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

 
   // Allows managing child status of the user. Used for RegularUser.
   virtual void SetIsChild(bool is_child);
@@ -182,13 +182,13 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   friend class chromeos::UserAddingScreenTest;
 
   // Do not allow anyone else to create new User instances.
-  static User* CreateRegularUser(const UserID& email);
+  static User* CreateRegularUser(const AccountId& user_id);

[achuithb, 2015/10/23 00:08:52]

account_id, here and below

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

   static User* CreateGuestUser();
-  static User* CreateKioskAppUser(const UserID& kiosk_app_username);
-  static User* CreateSupervisedUser(const UserID& username);
-  static User* CreatePublicAccountUser(const UserID& email);
+  static User* CreateKioskAppUser(const AccountId& kiosk_app_username);

[achuithb, 2015/10/23 00:08:52]

kiosk_app_account_id

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

+  static User* CreateSupervisedUser(const AccountId& user_id);
+  static User* CreatePublicAccountUser(const AccountId& user_id);
 
-  explicit User(const std::string& email);
+  explicit User(const AccountId& email);

[achuithb, 2015/10/23 00:08:52]

account_id

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

   ~User() override;
 
   const std::string* GetAccountLocale() const { return account_locale_.get(); }
@@ -251,7 +251,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   }
 
  private:
-  std::string email_;
+  AccountId account_id_;
   base::string16 display_name_;
   base::string16 given_name_;
   // The displayed user email, defaults to |email_|.