Add account_type into AccountId

chromeos/cryptohome/cryptohome_parameters.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 "chromeos/cryptohome/cryptohome_parameters.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "chromeos/dbus/cryptohome/key.pb.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/known_user.h"
 
 namespace cryptohome {
 namespace {
 
 // Subsystem name for GaiaId migration status.
 const char kCryptohome[] = "cryptohome";
 
 const std::string GetCryptohomeId(const AccountId& account_id) {
   // Guest/kiosk/managed/public accounts have empty GaiaId. Default to email.
-  if (account_id.GetGaiaId().empty())
+  if (account_id.GetAccountType() == AccountType::GOOGLE &&
+      !account_id.HasAccountIdKey())
     return account_id.GetUserEmail();  // Migrated
 
   if (GetGaiaIdMigrationStatus(account_id))
     return account_id.GetAccountIdKey();
 
   return account_id.GetUserEmail();  // Migrated
 }
 
 }  //  anonymous namespace
 
@@ skipping 16 matching lines @@
   return id_ < right.id_;
 }
 
 AccountId Identification::GetAccountId() const {
   const std::vector<AccountId> known_account_ids =
       user_manager::known_user::GetKnownAccountIds();
 
   // A LOT of tests start with --login_user <user>, and not registing this user
   // before. So we might have "known_user" entry without gaia_id.
   for (const AccountId& known_id : known_account_ids) {
-    if (!known_id.GetGaiaId().empty() && known_id.GetAccountIdKey() == id_) {
+    if (known_id.HasAccountIdKey() && known_id.GetAccountIdKey() == id_) {
       return known_id;
     }
   }
 
   for (const AccountId& known_id : known_account_ids) {
     if (known_id.GetUserEmail() == id_) {
       return known_id;
     }
   }
 
-  return user_manager::known_user::GetAccountId(id_,
-                                                std::string() /* gaia_id */);
+  return user_manager::known_user::GetAccountId(id_, std::string() /* id */,
+                                                AccountType::UNKNOWN);
 }
 
 KeyDefinition::AuthorizationData::Secret::Secret() : encrypt(false),
                                                      sign(false),
                                                      wrapped(false) {
 }
 
 KeyDefinition::AuthorizationData::Secret::Secret(
     bool encrypt,
     bool sign,
@@ skipping 173 matching lines @@
 }  // namespace cryptohome
 
 namespace BASE_HASH_NAMESPACE {
 
 std::size_t hash<cryptohome::Identification>::operator()(
     const cryptohome::Identification& cryptohome_id) const {
   return hash<std::string>()(cryptohome_id.id());
 }
 
 }  // namespace BASE_HASH_NAMESPACE