Revert of This CL replaces user_manager::UserID with AccountId.

components/wallpaper/wallpaper_manager_base.cc

Index: components/wallpaper/wallpaper_manager_base.cc
diff --git a/components/wallpaper/wallpaper_manager_base.cc b/components/wallpaper/wallpaper_manager_base.cc
index cd0bf89bd15a1a6686e7514d92bd7f0d6c1fdfc0..8afdc1c6ec95397a08a3d543921f0606f193e77b 100644
--- a/components/wallpaper/wallpaper_manager_base.cc
+++ b/components/wallpaper/wallpaper_manager_base.cc
@@ -501,8 +501,8 @@
 void WallpaperManagerBase::SetPolicyControlledWallpaper(
     const std::string& user_id,
     const user_manager::UserImage& user_image) {
-  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
-      AccountId::FromUserEmail(user_id));
+  const user_manager::User* user =
+      user_manager::UserManager::Get()->FindUser(user_id);
   if (!user) {
     NOTREACHED() << "Unknown user.";
     return;
@@ -886,7 +886,7 @@
     info.location = base::FilePath(user_id_hash).Append(info.location).value();
     bool is_persistent =
         !user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(
-            AccountId::FromUserEmail(user_id));
+            user_id);
     SetUserWallpaperInfo(user_id, info, is_persistent);
   }
 }