Revert of Remove WallpaperManager dependency on Cryptohome.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
index 8a93346bf17b7db29ac8e9411a2523fdc69ec5b3..b277c10be9dba1ba47fbf25a411ae60c096bc086 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
@@ -128,9 +128,9 @@
   // Returns queue size.
   size_t GetPendingListSizeForTesting() const override;
 
-  // Returns wallpaper files id for the |account_id|.
+  // Returns wallpaper files id for the user.
   wallpaper::WallpaperFilesId GetFilesId(
-      const AccountId& account_id) const override;
+      const user_manager::User& user) const override;
 
   // Overridden from user_manager::UserManager::UserSessionStateObserver:
   void UserChangedChildStatus(user_manager::User* user) override;
@@ -156,6 +156,15 @@
   void SetPolicyControlledWallpaper(
       const AccountId& account_id,
       std::unique_ptr<user_manager::UserImage> user_image);
+
+  // Calls SetCustomWallpaper() with |wallpaper_files_id_str| received from
+  // cryptohome.
+  void SetCustomWallpaperOnSanitizedUsername(
+      const AccountId& account_id,
+      const gfx::ImageSkia& image,
+      bool update_wallpaper,
+      bool cryptohome_success,
+      const std::string& wallpaper_files_id_str);
 
   // WallpaperManagerBase overrides:
   void InitializeRegisteredDeviceWallpaper() override;