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

chrome/browser/chromeos/policy/affiliation_test_helper.cc

 // Copyright 2015 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 "chrome/browser/chromeos/policy/affiliation_test_helper.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 namespace affiliation_test_helper {
 
 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;
   ASSERT_TRUE(user_policy->GetSigningKey()->ExportPublicKey(&user_key_bits));
   ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName()));
   ASSERT_EQ(base::WriteFile(user_key_file,
                             reinterpret_cast<const char*>(user_key_bits.data()),
                             user_key_bits.size()),
             static_cast<int>(user_key_bits.size()));
 }
@@ skipping 15 matching lines @@
 
   fake_session_manager_client->set_device_policy(device_policy->GetBlob());
   fake_session_manager_client->OnPropertyChangeComplete(true);
 }
 
 void SetUserAffiliationIDs(
     policy::UserPolicyBuilder* user_policy,
     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) {
   ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers");
   users_pref->AppendIfNotPresent(new base::StringValue(user_id));
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 void LoginUser(const std::string& user_id) {
   chromeos::test::UserSessionManagerTestApi session_manager_test_api(
       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);
   }
   chromeos::ExistingUserController* controller =
       chromeos::ExistingUserController::current_controller();
   CHECK(controller);
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
@@ skipping 11 matching lines @@
 }
 
 void AppendCommandLineSwitchesForLoginManager(base::CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
 }
 
 }  // namespace affiliation_test_helper
 
 }  // namespace policy