This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc
index ebce3abcc06faeb71e96dc7d9f08b9127a5d68b7..3badfbea15f7e912c477a4f571108cb3bddecf1e 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc
@@ -37,8 +37,9 @@ EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::Get(
 
 EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::GetForUser(
     const std::string& user_id) {
-  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
-      AccountId::FromUserEmail(user_id));
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+  const user_manager::User* user = user_manager->FindUser(
+      user_manager->GetKnownUserAccountId(user_id, std::string()));
   if (!user)
     return NULL;
   Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
@@ -63,7 +64,7 @@ KeyedService* EasyUnlockTpmKeyManagerFactory::BuildServiceInstanceFor(
   if (!chromeos::ProfileHelper::IsSigninProfile(profile))
     user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
   return new EasyUnlockTpmKeyManager(
-      user ? user->email() : std::string(),
+      user ? user->GetAccountId() : EmptyAccountId(),
       user ? user->username_hash() : std::string(), GetLocalState());
 }