This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.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/users/avatar/user_image_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 392 matching lines @@
     const user_manager::UserImage& user_image) {
   user_image_ = user_image;
   UpdateUser();
   if (save)
     SaveImageAndUpdateLocalState();
   else
     NotifyJobDone();
 }
 
 void UserImageManagerImpl::Job::UpdateUser() {
-  user_manager::User* user =
-      parent_->user_manager_->FindUserAndModify(user_id());
+  user_manager::User* user = parent_->GetUserAndModify();
   if (!user)
     return;
 
   if (!user_image_.image().isNull()) {
     user->SetImage(user_image_, image_index_);
   } else {
     user->SetStubImage(
         user_manager::UserImage(
             *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                 IDR_PROFILE_PICTURE_LOADING)),
@@ skipping 19 matching lines @@
 
 void UserImageManagerImpl::Job::OnSaveImageDone(bool success) {
   if (success || image_index_ == user_manager::User::USER_IMAGE_PROFILE)
     UpdateLocalState();
   NotifyJobDone();
 }
 
 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);
   entry->Set(kImagePathNodeName, new base::StringValue(image_path_.value()));
   entry->Set(kImageIndexNodeName, new base::FundamentalValue(image_index_));
   if (!image_url_.is_empty())
     entry->Set(kImageURLNodeName, new base::StringValue(image_url_.spec()));
   DictionaryPrefUpdate update(g_browser_process->local_state(),
                               kUserImageProperties);
   update->SetWithoutPathExpansion(user_id(), entry.release());
@@ skipping 297 matching lines @@
 }
 
 void UserImageManagerImpl::OnProfileDownloadSuccess(
     ProfileDownloader* downloader) {
   // Ensure that the |profile_downloader_| is deleted when this method returns.
   scoped_ptr<ProfileDownloader> profile_downloader(
       profile_downloader_.release());
   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;
 
   ProfileDownloadResult result = kDownloadFailure;
   switch (downloader->GetProfilePictureStatus()) {
     case ProfileDownloader::PICTURE_SUCCESS:
       result = kDownloadSuccess;
       break;
     case ProfileDownloader::PICTURE_CACHED:
@@ skipping 224 matching lines @@
   // If the currently logged-in user's user image is managed, the sync observer
   // must not be started so that the policy-set image does not get synced out.
   if (!user_image_sync_observer_ &&
       user && user->CanSyncImage() &&
       !IsUserImageManaged()) {
     user_image_sync_observer_.reset(new UserImageSyncObserver(user));
   }
 }
 
 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 {
   const user_manager::User* user = GetUser();
   if (!user)
     return false;
   return user->is_logged_in() && user->HasGaiaAccount();
 }
 
 }  // namespace chromeos