Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4970)

Unified Diff: chromeos/login/auth/cryptohome_authenticator.cc

Issue 2593133002: Revert of Add account_type into AccountId (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/cryptohome/cryptohome_parameters.cc ('k') | chromeos/tpm/tpm_token_info_getter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/login/auth/cryptohome_authenticator.cc
diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc
index 389dd6cd84f37d4dab0a8e1be4b7efaa188fceb9..9fc700af4038cee33c1d0e7578114fc20369068c 100644
--- a/chromeos/login/auth/cryptohome_authenticator.cc
+++ b/chromeos/login/auth/cryptohome_authenticator.cc
@@ -220,12 +220,12 @@
}
const bool already_migrated = cryptohome::GetGaiaIdMigrationStatus(
attempt->user_context.GetAccountId());
- const bool has_account_key =
- attempt->user_context.GetAccountId().HasAccountIdKey();
+ const bool has_gaia_id =
+ !attempt->user_context.GetAccountId().GetGaiaId().empty();
bool need_migration = false;
if (!create_if_nonexistent && !already_migrated) {
- if (has_account_key) {
+ if (has_gaia_id) {
need_migration = true;
} else {
LOG(WARNING) << "Account '"
@@ -248,7 +248,7 @@
create_if_nonexistent));
return;
}
- if (!already_migrated && has_account_key) {
+ if (!already_migrated && has_gaia_id) {
// Mark new users migrated.
cryptohome::SetGaiaIdMigrationStatusDone(
attempt->user_context.GetAccountId());
« no previous file with comments | « chromeos/cryptohome/cryptohome_parameters.cc ('k') | chromeos/tpm/tpm_token_info_getter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698