Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_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_get_keys_operation.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
 
 EasyUnlockGetKeysOperation::EasyUnlockGetKeysOperation(
     const UserContext& user_context,
     const GetKeysCallback& callback)
     : user_context_(user_context),
       callback_(callback),
       key_index_(0),
       weak_ptr_factory_(this) {
 }
 
 EasyUnlockGetKeysOperation::~EasyUnlockGetKeysOperation() {
 }
 
 void EasyUnlockGetKeysOperation::Start() {
   // TODO(xiyuan): Use ListKeyEx.
   key_index_ = 0;
   GetKeyData();
 }
 
 void EasyUnlockGetKeysOperation::GetKeyData() {
-  const std::string canonicalized =
-      gaia::CanonicalizeEmail(user_context_.GetAccountId().GetUserEmail());
+  std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context_.GetUserID());
   cryptohome::Identification id(canonicalized);
   cryptohome::HomedirMethods::GetInstance()->GetKeyDataEx(
       id,
       EasyUnlockKeyManager::GetKeyLabel(key_index_),
       base::Bind(&EasyUnlockGetKeysOperation::OnGetKeyData,
                  weak_ptr_factory_.GetWeakPtr()));
 
 }
 
 void EasyUnlockGetKeysOperation::OnGetKeyData(
@@ skipping 52 matching lines @@
                    << entry.name;
     }
   }
   devices_.push_back(device);
 
   ++key_index_;
   GetKeyData();
 }
 
 }  // namespace chromeos