ChromeOS cryptohome should be able to use gaia id as user identifier.

chrome/browser/chromeos/policy/affiliation_test_helper.cc

Index: chrome/browser/chromeos/policy/affiliation_test_helper.cc
diff --git a/chrome/browser/chromeos/policy/affiliation_test_helper.cc b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
index 9a309867bc299809d15b2bfb9f2912afc44a7fd9..8c908eb2b7b744e6321a7bdc253a911ffc4fb6b5 100644
--- a/chrome/browser/chromeos/policy/affiliation_test_helper.cc
+++ b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
@@ -105,8 +105,8 @@ void LoginUser(const std::string& user_id) {
       chromeos::UserSessionManager::GetInstance());
   session_manager_test_api.SetShouldObtainTokenHandleInTests(false);
 
-  chromeos::UserContext user_context(AccountId::FromUserEmail(user_id));
-  user_context.SetGaiaID("gaia-id-" + user_id);
+  chromeos::UserContext user_context(
+      AccountId::FromUserEmailGaiaId(user_id, "gaia-id-" + user_id));
   user_context.SetKey(chromeos::Key("password"));
   if (user_id == kEnterpriseUser) {
     user_context.SetRefreshToken(kFakeRefreshToken);