Add account_type into AccountId

components/user_manager/known_user.h

Index: components/user_manager/known_user.h
diff --git a/components/user_manager/known_user.h b/components/user_manager/known_user.h
index c0dbd9cdfc89dcb6a43078744f15f3abfc7a0851..245ed573f3872f388bda6525a0fbc0584b588c72 100644
--- a/components/user_manager/known_user.h
+++ b/components/user_manager/known_user.h
@@ -11,6 +11,7 @@
 #include "components/user_manager/user_manager_export.h"
 
 class AccountId;
+enum class AccountType;
 class PrefRegistrySimple;
 
 namespace base {
@@ -74,7 +75,8 @@ std::vector<AccountId> USER_MANAGER_EXPORT GetKnownAccountIds();
 // gaia_id.
 // This is a temporary call while migrating to AccountId.
 AccountId USER_MANAGER_EXPORT GetAccountId(const std::string& user_email,
-                                           const std::string& gaia_id);
+                                           const std::string& id,
+                                           const AccountType& account_type);
 
 // Returns true if |subsystem| data was migrated to GaiaId for the |account_id|.
 bool USER_MANAGER_EXPORT GetGaiaIdMigrationStatus(const AccountId& account_id,
@@ -91,6 +93,10 @@ SetGaiaIdMigrationStatusDone(const AccountId& account_id,
 void USER_MANAGER_EXPORT UpdateGaiaID(const AccountId& account_id,
                                       const std::string& gaia_id);
 
+// Updates |account_id.account_type_| and |account_id.GetGaiaId()| or
+// |account_id.GetObjGuid()| for user with |account_id|.
+void USER_MANAGER_EXPORT UpdateId(const AccountId& account_id);
+
 // Find GAIA ID for user with |account_id|, fill in |out_value| and return
 // true
 // if GAIA ID was found or false otherwise.