This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/supervised/supervised_user_authentication.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_authentication.h"
 
 #include "base/base64.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 86 matching lines @@
 SupervisedUserAuthentication::~SupervisedUserAuthentication() {}
 
 SupervisedUserAuthentication::Schema
 SupervisedUserAuthentication::GetStableSchema() {
   return stable_schema_;
 }
 
 UserContext SupervisedUserAuthentication::TransformKey(
     const UserContext& context) {
   UserContext result = context;
-  int user_schema = GetPasswordSchema(context.GetUserID());
+  int user_schema = GetPasswordSchema(context.GetAccountId().GetUserEmail());
   if (user_schema == SCHEMA_PLAIN)
     return result;
 
   if (user_schema == SCHEMA_SALT_HASHED) {
     base::DictionaryValue holder;
     std::string salt;
-    owner_->GetPasswordInformation(context.GetUserID(), &holder);
+    owner_->GetPasswordInformation(context.GetAccountId().GetUserEmail(),
+                                   &holder);
     holder.GetStringWithoutPathExpansion(kSalt, &salt);
     DCHECK(!salt.empty());
     Key* const key = result.GetKey();
     key->Transform(Key::KEY_TYPE_SALTED_PBKDF2_AES256_1234, salt);
     key->SetLabel(kCryptohomeSupervisedUserKeyLabel);
     result.SetIsUsingOAuth(false);
     return result;
   }
-  NOTREACHED() << "Unknown password schema for " << context.GetUserID();
+  NOTREACHED() << "Unknown password schema for "
+               << context.GetAccountId().GetUserEmail();
   return context;
 }
 
 bool SupervisedUserAuthentication::FillDataForNewUser(
     const std::string& user_id,
     const std::string& password,
     base::DictionaryValue* password_data,
     base::DictionaryValue* extra_data) {
   Schema schema = stable_schema_;
   if (schema == SCHEMA_PLAIN)
@@ skipping 82 matching lines @@
                                                 &updated_revision);
   if (updated_schema > local_schema)
     return true;
   DCHECK_EQ(updated_schema, local_schema);
   return updated_revision > local_revision;
 }
 
 void SupervisedUserAuthentication::ScheduleSupervisedPasswordChange(
     const std::string& supervised_user_id,
     const base::DictionaryValue* password_data) {
-  const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(supervised_user_id);
+  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
+      AccountId::FromUserEmail(supervised_user_id));
   base::FilePath profile_path = ProfileHelper::GetProfilePathByUserIdHash(
       user->username_hash());
   JSONFileValueSerializer serializer(profile_path.Append(kPasswordUpdateFile));
   if (!serializer.Serialize(*password_data)) {
     LOG(ERROR) << "Failed to schedule password update for supervised user "
                << supervised_user_id;
     UMA_HISTOGRAM_ENUMERATION(
         "ManagedUsers.ChromeOS.PasswordChange",
         SupervisedUserAuthentication::PASSWORD_CHANGE_FAILED_STORE_DATA,
         SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
@@ skipping 36 matching lines @@
   base::DictionaryValue holder;
   owner_->GetPasswordInformation(user_id, &holder);
   holder.SetBoolean(kHasIncompleteKey, incomplete);
   owner_->SetPasswordInformation(user_id, &holder);
 }
 
 void SupervisedUserAuthentication::LoadPasswordUpdateData(
     const std::string& user_id,
     const PasswordDataCallback& success_callback,
     const base::Closure& failure_callback) {
-  const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(user_id);
+  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
+      AccountId::FromUserEmail(user_id));
   base::FilePath profile_path =
       ProfileHelper::GetProfilePathByUserIdHash(user->username_hash());
   PostTaskAndReplyWithResult(
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
                 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)
           .get(),
       FROM_HERE, base::Bind(&LoadPasswordData, profile_path),
       base::Bind(&OnPasswordDataLoaded, success_callback, failure_callback));
 }
@@ skipping 20 matching lines @@
     LOG(FATAL) << "HMAC::Sign failed";
 
   std::string raw_result(out_bytes, out_bytes + sizeof(out_bytes));
 
   std::string result;
   base::Base64Encode(raw_result, &result);
   return result;
 }
 
 }  // namespace chromeos