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..28aa35ccd2b5b603c7a9ace7ad8a82d368d07f87 100644
--- a/chrome/browser/chromeos/policy/affiliation_test_helper.cc
+++ b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
@@ -44,11 +44,13 @@ const char kFakeRefreshToken[] = "fake-refresh-token";
 const char kEnterpriseUser[] = "testuser@example.com";
 
 void SetUserKeys(policy::UserPolicyBuilder* user_policy) {
-  std::string username = user_policy->policy_data().username();
+  const AccountId account_id =
+      AccountId::FromUserEmail(user_policy->policy_data().username());
   base::FilePath user_keys_dir;
   ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
   const std::string sanitized_username =
-      chromeos::CryptohomeClient::GetStubSanitizedUsername(username);
+      chromeos::CryptohomeClient::GetStubSanitizedUsername(
+          cryptohome::Identification(account_id));
   const base::FilePath user_key_file =
       user_keys_dir.AppendASCII(sanitized_username).AppendASCII("policy.pub");
   std::vector<uint8_t> user_key_bits;
@@ -84,14 +86,15 @@ void SetUserAffiliationIDs(
     chromeos::FakeSessionManagerClient* fake_session_manager_client,
     const std::string& user_email,
     const std::set<std::string>& user_affiliation_ids) {
+  const AccountId account_id = AccountId::FromUserEmail(user_email);
   user_policy->policy_data().set_username(user_email);
   SetUserKeys(user_policy);
   for (const auto& user_affiliation_id : user_affiliation_ids) {
     user_policy->policy_data().add_user_affiliation_ids(user_affiliation_id);
   }
   user_policy->Build();
-  fake_session_manager_client->set_user_policy(user_email,
-                                               user_policy->GetBlob());
+  fake_session_manager_client->set_user_policy(
+      cryptohome::Identification(account_id), user_policy->GetBlob());
 }
 
 void PreLoginUser(const std::string& user_id) {
@@ -105,8 +108,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);