This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.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/easy_unlock/easy_unlock_key_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
+#include "components/signin/core/account_id/account_id.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kKeyBluetoothAddress[] = "bluetoothAddress";
 const char kKeyPermitRecord[] = "permitRecord";
 const char kKeyPermitId[] = "permitRecord.id";
 const char kKeyPermitPermitId[] = "permitRecord.permitId";
 const char kKeyPermitData[] = "permitRecord.data";
@@ skipping 21 matching lines @@
                                        const RefreshKeysCallback& callback) {
   base::Closure do_refresh_keys = base::Bind(
       &EasyUnlockKeyManager::RefreshKeysWithTpmKeyPresent,
       weak_ptr_factory_.GetWeakPtr(),
       user_context,
       base::Owned(remote_devices.DeepCopy()),
       callback);
 
   EasyUnlockTpmKeyManager* tpm_key_manager =
       EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser(
-          user_context.GetUserID());
+          user_context.GetAccountId().GetUserEmail());
   if (!tpm_key_manager) {
     LOG(ERROR) << "No TPM key manager.";
     callback.Run(false);
     return;
   }
 
   // Private TPM key is needed only when adding new keys.
   if (remote_devices.empty() ||
       tpm_key_manager->PrepareTpmKey(false /* check_private_key */,
                                      do_refresh_keys)) {
     do_refresh_keys.Run();
   } else {
     // In case Chrome is supposed to restart to apply user session flags, the
     // Chrome restart will be postponed until Easy Sign-in keys are refreshed.
     // This is to ensure that creating TPM key does not hang if TPM system
     // loading takes too much time. Note that in normal circumstances the
     // chances that TPM slot cannot be loaded should be extremely low.
     // TODO(tbarzic): Add some metrics to measure if the timeout even gets hit.
     tpm_key_manager->StartGetSystemSlotTimeoutMs(2000);
   }
 }
 
 void EasyUnlockKeyManager::RefreshKeysWithTpmKeyPresent(
     const UserContext& user_context,
     base::ListValue* remote_devices,
     const RefreshKeysCallback& callback) {
   EasyUnlockTpmKeyManager* tpm_key_manager =
       EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser(
-          user_context.GetUserID());
-  std::string tpm_public_key =
-      tpm_key_manager->GetPublicTpmKey(user_context.GetUserID());
+          user_context.GetAccountId().GetUserEmail());
+  const std::string tpm_public_key = tpm_key_manager->GetPublicTpmKey(
+      user_context.GetAccountId().GetUserEmail());
 
   EasyUnlockDeviceKeyDataList devices;
   if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices))
     devices.clear();
 
   write_operation_queue_.push_back(new EasyUnlockRefreshKeysOperation(
       user_context, tpm_public_key, devices,
       base::Bind(&EasyUnlockKeyManager::OnKeysRefreshed,
                  weak_ptr_factory_.GetWeakPtr(), callback)));
   RunNextOperation();
@@ skipping 118 matching lines @@
     const EasyUnlockDeviceKeyDataList& fetched_data) {
   if (!callback.is_null())
     callback.Run(fetch_success, fetched_data);
 
   DCHECK(pending_read_operation_);
   pending_read_operation_.reset();
   RunNextOperation();
 }
 
 }  // namespace chromeos