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

components/wallpaper/wallpaper_manager_base.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 "components/wallpaper/wallpaper_manager_base.h"
 
 #include <numeric>
 #include <vector>
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 483 matching lines @@
 
 WallpaperManagerBase::~WallpaperManagerBase() {
   // TODO(bshe): Lifetime of WallpaperManagerBase needs more consideration.
   // http://crbug.com/171694
   weak_factory_.InvalidateWeakPtrs();
 }
 
 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;
   }
 
   if (user->username_hash().empty()) {
     cryptohome::AsyncMethodCaller::GetInstance()->AsyncGetSanitizedUsername(
         user_id,
         base::Bind(&WallpaperManagerBase::SetCustomWallpaperOnSanitizedUsername,
                    weak_factory_.GetWeakPtr(), user_id, user_image.image(),
@@ skipping 363 matching lines @@
     const std::string& user_id,
     const std::string& user_id_hash) {
   WallpaperInfo info;
   GetUserWallpaperInfo(user_id, &info);
   if (info.type == user_manager::User::CUSTOMIZED) {
     // New file field should include user id hash in addition to file name.
     // This is needed because at login screen, user id hash is not available.
     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);
   }
 }
 
 void WallpaperManagerBase::MoveLoggedInUserCustomWallpaper() {
   const user_manager::User* logged_in_user =
       user_manager::UserManager::Get()->GetLoggedInUser();
   if (logged_in_user) {
     task_runner_->PostTask(
         FROM_HERE,
@@ skipping 156 matching lines @@
 void WallpaperManagerBase::CreateSolidDefaultWallpaper() {
   loaded_wallpapers_for_test_++;
   SkBitmap bitmap;
   bitmap.allocN32Pixels(1, 1);
   bitmap.eraseColor(kDefaultWallpaperColor);
   const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   default_wallpaper_image_.reset(new user_manager::UserImage(image));
 }
 
 }  // namespace wallpaper