This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/webui/options/chromeos/user_image_source.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/common/url_constants.h"
@@ skipping 19 matching lines @@
                                      net::UnescapeRule::SPACES));
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace options {
 
 // Static.
 base::RefCountedMemory* UserImageSource::GetUserImage(
     const std::string& email,

[stevenjb, 2015/10/22 17:52:36]

It looks like we only call this once, it should take const AccointId&

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

     ui::ScaleFactor scale_factor) {
-  const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(email);
+  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
+      AccountId::FromUserEmail(email));
   if (user) {
     if (user->has_raw_image()) {
       return new base::RefCountedBytes(user->raw_image());
     } else if (user->image_is_stub()) {
       return ResourceBundle::GetSharedInstance().
           LoadDataResourceBytesForScale(IDR_PROFILE_PICTURE_LOADING,
                                         scale_factor);
     } else if (user->HasDefaultImage()) {
       return ResourceBundle::GetSharedInstance().
           LoadDataResourceBytesForScale(
@@ skipping 28 matching lines @@
 }
 
 std::string UserImageSource::GetMimeType(const std::string& path) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 }  // namespace options
 }  // namespace chromeos