Revert of 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 245ed573f3872f388bda6525a0fbc0584b588c72..c0dbd9cdfc89dcb6a43078744f15f3abfc7a0851 100644
--- a/components/user_manager/known_user.h
+++ b/components/user_manager/known_user.h
@@ -11,7 +11,6 @@
 #include "components/user_manager/user_manager_export.h"
 
 class AccountId;
-enum class AccountType;
 class PrefRegistrySimple;
 
 namespace base {
@@ -75,8 +74,7 @@
 // gaia_id.
 // This is a temporary call while migrating to AccountId.
 AccountId USER_MANAGER_EXPORT GetAccountId(const std::string& user_email,
-                                           const std::string& id,
-                                           const AccountType& account_type);
+                                           const std::string& gaia_id);
 
 // Returns true if |subsystem| data was migrated to GaiaId for the |account_id|.
 bool USER_MANAGER_EXPORT GetGaiaIdMigrationStatus(const AccountId& account_id,
@@ -92,10 +90,6 @@
 // (crbug.com/548926).
 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