This CL replaces user_manager::UserID with AccountId.

components/user_manager/user.cc

 // 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.
 
 #include "components/user_manager/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chromeos/login/user_names.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace user_manager {
 
 namespace {
 
 // Returns account name portion of an email.
 std::string GetUserName(const std::string& email) {
   std::string::size_type i = email.find('@');
   if (i == 0 || i == std::string::npos) {
     return email;
   }
   return email.substr(0, i);
 }
 
 }  // namespace
 
 // static
 bool User::TypeHasGaiaAccount(UserType user_type) {
   return user_type == USER_TYPE_REGULAR ||
          user_type == USER_TYPE_CHILD;
 }
 
+const std::string& User::email() const {
+  return account_id_.GetUserEmail();
+}
+
 // Also used for regular supervised users.
 class RegularUser : public User {
  public:
-  explicit RegularUser(const std::string& email);
+  explicit RegularUser(const AccountId& account_id);
   ~RegularUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
   bool CanSyncImage() const override;
   void SetIsChild(bool is_child) override;
 
  private:
   bool is_child_;

[achuithb, 2015/10/28 23:11:46]

= false

[Alexander Alekseev, 2015/10/29 02:00:42]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(RegularUser);
 };
 
 class GuestUser : public User {
  public:
   GuestUser();
   ~GuestUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GuestUser);
 };
 
 class KioskAppUser : public User {
  public:
-  explicit KioskAppUser(const std::string& app_id);
+  explicit KioskAppUser(const AccountId& kiosk_app_account_id);
   ~KioskAppUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KioskAppUser);
 };
 
 class SupervisedUser : public User {
  public:
-  explicit SupervisedUser(const std::string& username);
+  explicit SupervisedUser(const AccountId& account_id);
   ~SupervisedUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
   std::string display_email() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
 };
 
 class PublicAccountUser : public User {
  public:
-  explicit PublicAccountUser(const std::string& email);
+  explicit PublicAccountUser(const AccountId& account_id);
   ~PublicAccountUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
 };
 
 std::string User::GetEmail() const {
   return display_email();
 }
 
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ? base::UTF8ToUTF16(GetAccountName(true))
                                : display_name_;
 }
 
 base::string16 User::GetGivenName() const {
   return given_name_;
 }
 
 const gfx::ImageSkia& User::GetImage() const {
   return user_image_.image();
 }
 
-UserID User::GetUserID() const {
-  return gaia::CanonicalizeEmail(gaia::SanitizeEmail(email()));
+AccountId User::GetAccountId() const {
+  return AccountId::FromUserEmail(
+      gaia::CanonicalizeEmail(gaia::SanitizeEmail(email())));
 }
 
 void User::SetIsChild(bool is_child) {
   VLOG(1) << "Ignoring SetIsChild call with param " << is_child;
   if (is_child) {
     NOTREACHED() << "Calling SetIsChild(true) for base User class."
                  << "Base class cannot be set as child";
   }
 }
 
 bool User::HasGaiaAccount() const {
   return TypeHasGaiaAccount(GetType());
 }
 
 bool User::IsSupervised() const {
   UserType type = GetType();
   return  type == USER_TYPE_SUPERVISED ||
           type == USER_TYPE_CHILD;
 }
 
 std::string User::GetAccountName(bool use_display_email) const {
   if (use_display_email && !display_email_.empty())
     return GetUserName(display_email_);
   else
-    return GetUserName(email_);
+    return GetUserName(account_id_.GetUserEmail());
 }
 
 bool User::HasDefaultImage() const {
   return image_index_ >= 0 && image_index_ < kDefaultImagesCount;
 }
 
 bool User::CanSyncImage() const {
   return false;
 }
 
@@ skipping 10 matching lines @@
 }
 
 bool User::is_logged_in() const {
   return is_logged_in_;
 }
 
 bool User::is_active() const {
   return is_active_;
 }
 
-User* User::CreateRegularUser(const std::string& email) {
-  return new RegularUser(email);
+User* User::CreateRegularUser(const AccountId& account_id) {
+  return new RegularUser(account_id);
 }
 
 User* User::CreateGuestUser() {
   return new GuestUser;
 }
 
-User* User::CreateKioskAppUser(const std::string& kiosk_app_username) {
-  return new KioskAppUser(kiosk_app_username);
+User* User::CreateKioskAppUser(const AccountId& kiosk_app_account_id) {
+  return new KioskAppUser(kiosk_app_account_id);
 }
 
-User* User::CreateSupervisedUser(const std::string& username) {
-  return new SupervisedUser(username);
+User* User::CreateSupervisedUser(const AccountId& account_id) {
+  return new SupervisedUser(account_id);
 }
 
-User* User::CreatePublicAccountUser(const std::string& email) {
-  return new PublicAccountUser(email);
+User* User::CreatePublicAccountUser(const AccountId& account_id) {
+  return new PublicAccountUser(account_id);
 }
 
-User::User(const std::string& email)
-    : email_(email),
-      oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN),
-      force_online_signin_(false),
-      image_index_(USER_IMAGE_INVALID),
-      image_is_stub_(false),
-      image_is_loading_(false),
-      can_lock_(false),
-      is_logged_in_(false),
-      is_active_(false),
-      profile_is_created_(false),
-      is_affiliated_(false){
-}
+User::User(const AccountId& account_id) : account_id_(account_id) {}
 
 User::~User() {
 }
 
 void User::SetAccountLocale(const std::string& resolved_account_locale) {
   account_locale_.reset(new std::string(resolved_account_locale));
 }
 
 void User::SetImage(const UserImage& user_image, int image_index) {
   user_image_ = user_image;
   image_index_ = image_index;
   image_is_stub_ = false;
   image_is_loading_ = false;
   DCHECK(HasDefaultImage() || user_image.has_raw_image());
 }
 
 void User::SetImageURL(const GURL& image_url) {
   user_image_.set_url(image_url);
 }
 
 void User::SetStubImage(const UserImage& stub_user_image,
                         int image_index,
                         bool is_loading) {
   user_image_ = stub_user_image;
   image_index_ = image_index;
   image_is_stub_ = true;
   image_is_loading_ = is_loading;
 }
 
-RegularUser::RegularUser(const std::string& email)
-    : User(email), is_child_(false) {
+RegularUser::RegularUser(const AccountId& account_id)
+    : User(account_id), is_child_(false) {
   set_can_lock(true);
-  set_display_email(email);
+  set_display_email(account_id.GetUserEmail());
 }
 
 RegularUser::~RegularUser() {
 }
 
 UserType RegularUser::GetType() const {
   return is_child_ ? user_manager::USER_TYPE_CHILD :
                      user_manager::USER_TYPE_REGULAR;
 }
 
 bool RegularUser::CanSyncImage() const {
   return true;
 }
 
 void RegularUser::SetIsChild(bool is_child) {
   VLOG(1) << "Setting user is child to " << is_child;
   is_child_ = is_child;
 }
 
-GuestUser::GuestUser() : User(chromeos::login::kGuestUserName) {
+GuestUser::GuestUser() : User(chromeos::login::GuestAccountId()) {
   set_display_email(std::string());
 }
 
 GuestUser::~GuestUser() {
 }
 
 UserType GuestUser::GetType() const {
   return user_manager::USER_TYPE_GUEST;
 }
 
-KioskAppUser::KioskAppUser(const std::string& kiosk_app_username)
-    : User(kiosk_app_username) {
-  set_display_email(kiosk_app_username);
+KioskAppUser::KioskAppUser(const AccountId& kiosk_app_account_id)
+    : User(kiosk_app_account_id) {
+  set_display_email(kiosk_app_account_id.GetUserEmail());
 }
 
 KioskAppUser::~KioskAppUser() {
 }
 
 UserType KioskAppUser::GetType() const {
   return user_manager::USER_TYPE_KIOSK_APP;
 }
 
-SupervisedUser::SupervisedUser(const std::string& username) : User(username) {
+SupervisedUser::SupervisedUser(const AccountId& account_id) : User(account_id) {
   set_can_lock(true);
 }
 
 SupervisedUser::~SupervisedUser() {
 }
 
 UserType SupervisedUser::GetType() const {
   return user_manager::USER_TYPE_SUPERVISED;
 }
 
 std::string SupervisedUser::display_email() const {
   return base::UTF16ToUTF8(display_name());
 }
 
-PublicAccountUser::PublicAccountUser(const std::string& email) : User(email) {
-}
+PublicAccountUser::PublicAccountUser(const AccountId& account_id)
+    : User(account_id) {}
 
 PublicAccountUser::~PublicAccountUser() {
 }
 
 UserType PublicAccountUser::GetType() const {
   return user_manager::USER_TYPE_PUBLIC_ACCOUNT;
 }
 
 bool User::has_gaia_account() const {
   static_assert(user_manager::NUM_USER_TYPES == 7,
                 "NUM_USER_TYPES should equal 7");
   switch (GetType()) {
     case user_manager::USER_TYPE_REGULAR:
     case user_manager::USER_TYPE_CHILD:
       return true;
     case user_manager::USER_TYPE_GUEST:
     case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager