This CL replaces user_manager::UserID with AccountId.

chrome/browser/supervised_user/chromeos/manager_password_service.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/supervised_user/chromeos/manager_password_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
@@ skipping 113 matching lines @@
           &encryption_key)) {
     LOG(WARNING) << "Can not apply password change to " << user_id
                  << ": no signature / encryption keys.";
     UMA_HISTOGRAM_ENUMERATION(
         "ManagedUsers.ChromeOS.PasswordChange",
         SupervisedUserAuthentication::PASSWORD_CHANGE_FAILED_NO_SIGNATURE_KEY,
         SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
     return;
   }
 
-  UserContext manager_key(user_id);
+  UserContext manager_key(AccountId::FromUserEmail(user_id));
   manager_key.SetKey(Key(master_key));
   manager_key.SetIsUsingOAuth(false);
 
   // As master key can have old label, leave label field empty - it will work
   // as wildcard.
 
   std::string new_key;
   int revision;
 
   bool has_data = password_data->GetStringWithoutPathExpansion(
@@ skipping 88 matching lines @@
       master_key_context,
       new_master_key,
       true /* replace existing */,
       base::Bind(&ManagerPasswordService::OnNewManagerKeySuccess,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_master_key_context));
 }
 
 void ManagerPasswordService::OnNewManagerKeySuccess(
     const UserContext& master_key_context) {
-  VLOG(1) << "Added new master key for " << master_key_context.GetUserID();
+  VLOG(1) << "Added new master key for "
+          << master_key_context.GetAccountId().GetUserEmail();
   authenticator_->RemoveKey(
       master_key_context,
       kLegacyCryptohomeSupervisedUserKeyLabel,
       base::Bind(&ManagerPasswordService::OnOldSupervisedUserKeyDeleted,
                  weak_ptr_factory_.GetWeakPtr(),
                  master_key_context));
 }
 
 void ManagerPasswordService::OnOldSupervisedUserKeyDeleted(
     const UserContext& master_key_context) {
   VLOG(1) << "Removed old supervised user key for "
-          << master_key_context.GetUserID();
+          << master_key_context.GetAccountId().GetUserEmail();
   authenticator_->RemoveKey(
       master_key_context,
       kLegacyCryptohomeMasterKeyLabel,
       base::Bind(&ManagerPasswordService::OnOldManagerKeyDeleted,
                  weak_ptr_factory_.GetWeakPtr(),
                  master_key_context));
 }
 
 void ManagerPasswordService::OnOldManagerKeyDeleted(
     const UserContext& master_key_context) {
-  VLOG(1) << "Removed old master key for " << master_key_context.GetUserID();
+  VLOG(1) << "Removed old master key for "
+          << master_key_context.GetAccountId().GetUserEmail();
 }
 
 void ManagerPasswordService::Shutdown() {
   settings_service_subscription_.reset();
 }
 
 }  // namespace chromeos