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

chrome/browser/chromeos/login/supervised/supervised_user_authenticator.cc

 // Copyright 2014 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/login/supervised/supervised_user_authenticator.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/auth/key.h"
+#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/known_user.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/sha2.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
@@ skipping 33 matching lines @@
 void Mount(SupervisedUserAuthenticator::AuthAttempt* attempt,
            scoped_refptr<SupervisedUserAuthenticator> resolver,
            int flags,
            const std::string& system_salt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker(
       "CryptohomeMount-LMU-Start", false);
 
   Key key(attempt->password);
   key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
+  const AccountId account_id = user_manager::known_user::GetAccountId(
+      attempt->username, std::string() /* gaia_id */);
+  const cryptohome::Identification cryptohome_id(account_id);
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncMount(
-      attempt->username,
-      key.GetSecret(),
-      flags,
-      base::Bind(&TriggerResolveWithLoginTimeMarker,
-                 "CryptohomeMount-LMU-End",
-                 attempt,
-                 resolver));
+      cryptohome_id, key.GetSecret(), flags,
+      base::Bind(&TriggerResolveWithLoginTimeMarker, "CryptohomeMount-LMU-End",
+                 attempt, resolver));
 
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncGetSanitizedUsername(
-      attempt->username,
-      base::Bind(&TriggerResolveResult, attempt, resolver));
+      cryptohome_id, base::Bind(&TriggerResolveResult, attempt, resolver));
 }
 
 // Calls cryptohome's addKey method.
 void AddKey(SupervisedUserAuthenticator::AuthAttempt* attempt,
             scoped_refptr<SupervisedUserAuthenticator> resolver,
             const std::string& plain_text_master_key,
             const std::string& system_salt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker(
       "CryptohomeAddKey-LMU-Start", false);
 
   Key user_key(attempt->password);
   user_key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
   Key master_key(plain_text_master_key);
   master_key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
+  const AccountId account_id = user_manager::known_user::GetAccountId(
+      attempt->username, std::string() /* gaia_id */);
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncAddKey(
-      attempt->username,
-      user_key.GetSecret(),
+      cryptohome::Identification(account_id), user_key.GetSecret(),
       master_key.GetSecret(),
-      base::Bind(&TriggerResolveWithLoginTimeMarker,
-                 "CryptohomeAddKey-LMU-End",
-                 attempt,
-                 resolver));
+      base::Bind(&TriggerResolveWithLoginTimeMarker, "CryptohomeAddKey-LMU-End",
+                 attempt, resolver));
 }
 
 }  // namespace
 
 SupervisedUserAuthenticator::SupervisedUserAuthenticator(
     AuthStatusConsumer* consumer)
     : consumer_(consumer) {}
 
 void SupervisedUserAuthenticator::AuthenticateToMount(
     const std::string& username,
@@ skipping 222 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return hash_obtained_;
 }
 
 std::string SupervisedUserAuthenticator::AuthAttempt::hash() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return hash_;
 }
 
 }  // namespace chromeos