This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index f9f4a49cc9792db00e637beb0552d039a3c5a33d..df6d304ac957a7345d1a3e7a31cc7030f0cb7a2f 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -410,8 +410,7 @@ void UserImageManagerImpl::Job::OnLoadImageDone(
 }
 
 void UserImageManagerImpl::Job::UpdateUser() {
-  user_manager::User* user =
-      parent_->user_manager_->FindUserAndModify(user_id());
+  user_manager::User* user = parent_->GetUserAndModify();
   if (!user)
     return;
 
@@ -451,7 +450,8 @@ void UserImageManagerImpl::Job::OnSaveImageDone(bool success) {
 void UserImageManagerImpl::Job::UpdateLocalState() {
   // Ignore if data stored or cached outside the user's cryptohome is to be
   // treated as ephemeral.
-  if (parent_->user_manager_->IsUserNonCryptohomeDataEphemeral(user_id()))
+  if (parent_->user_manager_->IsUserNonCryptohomeDataEphemeral(
+          AccountId::FromUserEmail(user_id())))
     return;
 
   scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
@@ -769,10 +769,9 @@ void UserImageManagerImpl::OnProfileDownloadSuccess(
   DCHECK_EQ(downloader, profile_downloader.get());
 
   user_manager_->UpdateUserAccountData(
-      user_id(),
+      AccountId::FromUserEmail(user_id()),
       user_manager::UserManager::UserAccountData(
-          downloader->GetProfileFullName(),
-          downloader->GetProfileGivenName(),
+          downloader->GetProfileFullName(), downloader->GetProfileGivenName(),
           downloader->GetProfileLocale()));
   if (!downloading_profile_image_)
     return;
@@ -1017,11 +1016,11 @@ void UserImageManagerImpl::TryToCreateImageSyncObserver() {
 }
 
 const user_manager::User* UserImageManagerImpl::GetUser() const {
-  return user_manager_->FindUser(user_id());
+  return user_manager_->FindUser(AccountId::FromUserEmail(user_id()));
 }
 
 user_manager::User* UserImageManagerImpl::GetUserAndModify() const {
-  return user_manager_->FindUserAndModify(user_id());
+  return user_manager_->FindUserAndModify(AccountId::FromUserEmail(user_id()));
 }
 
 bool UserImageManagerImpl::IsUserLoggedInAndHasGaiaAccount() const {