This CL replaces user_manager::UserID with AccountId.

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

Index: chrome/browser/ui/webui/options/chromeos/user_image_source.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 71a03b71f729db6bf3023771b27475d2d2252aaa..46572be08236c9d265a510e8e475c0b36b77b505 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/common/url_constants.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_manager.h"
 #include "grit/theme_resources.h"
@@ -37,10 +38,10 @@ namespace options {
 
 // Static.
 base::RefCountedMemory* UserImageSource::GetUserImage(
-    const std::string& email,
+    const AccountId& account_id,
     ui::ScaleFactor scale_factor) {
   const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(email);
+      user_manager::UserManager::Get()->FindUser(account_id);
   if (user) {
     if (user->has_raw_image()) {
       return new base::RefCountedBytes(user->raw_image());
@@ -78,7 +79,8 @@ void UserImageSource::StartDataRequest(
   std::string email;
   GURL url(chrome::kChromeUIUserImageURL + path);
   ParseRequest(url, &email);
-  callback.Run(GetUserImage(email, ui::SCALE_FACTOR_100P));
+  const AccountId account_id(AccountId::FromUserEmail(email));
+  callback.Run(GetUserImage(account_id, ui::SCALE_FACTOR_100P));
 }
 
 std::string UserImageSource::GetMimeType(const std::string& path) const {