This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.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_create_keys_operation.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 328 matching lines @@
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNamePsk, device->psk));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNamePubKey, device->public_key));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNameChallenge, device->challenge));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNameWrappedSecret, device->wrapped_secret));
 
   // Add cryptohome key.
-  std::string canonicalized =
-      gaia::CanonicalizeEmail(user_context_.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context_.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
 
   scoped_ptr<Key> auth_key(new Key(*user_context_.GetKey()));
   if (auth_key->GetKeyType() == Key::KEY_TYPE_PASSWORD_PLAIN)
     auth_key->Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
 
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
   cryptohome::HomedirMethods::GetInstance()->AddKeyEx(
       id,
       auth,
@@ skipping 24 matching lines @@
       user_context_.GetKey()->GetLabel() ==
           EasyUnlockKeyManager::GetKeyLabel(key_creation_index_)) {
     user_context_.SetKey(user_key);
   }
 
   ++key_creation_index_;
   CreateKeyForDeviceAtIndex(key_creation_index_);
 }
 
 }  // namespace chromeos