This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_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_remove_keys_operation.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chromeos/cryptohome/homedir_methods.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
@@ skipping 29 matching lines @@
 }
 
 void EasyUnlockRemoveKeysOperation::OnGetSystemSalt(
     const std::string& system_salt) {
   user_context_.GetKey()->Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF,
                                     system_salt);
   RemoveKey();
 }
 
 void EasyUnlockRemoveKeysOperation::RemoveKey() {
   std::string canonicalized =

[achuithb, 2015/10/28 23:11:44]

const

[Alexander Alekseev, 2015/10/29 02:00:40]

Done.

-      gaia::CanonicalizeEmail(user_context_.GetUserID());
+      gaia::CanonicalizeEmail(user_context_.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const auth_key = user_context_.GetKey();
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
 
   // TODO(xiyuan): Use ListKeyEx and delete by label instead of by index.
   cryptohome::HomedirMethods::GetInstance()->RemoveKeyEx(
       id,
       auth,
       EasyUnlockKeyManager::GetKeyLabel(key_index_),
       base::Bind(&EasyUnlockRemoveKeysOperation::OnKeyRemoved,
@@ skipping 14 matching lines @@
   if (return_code == cryptohome::MOUNT_ERROR_KEY_FAILURE) {
     callback_.Run(true);
   } else {
     LOG(ERROR) << "Easy unlock remove keys operation failed, code="
                << return_code;
     callback_.Run(false);
   }
 }
 
 }  // namespace chromeos