Revert of Remove WallpaperManager dependency on Cryptohome.

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

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 
 #include <stddef.h>
 
 #include <deque>
@@ skipping 110 matching lines @@
                                  wallpaper::WallpaperLayout layout,
                                  bool update_wallpaper) override;
 
   // Updates current wallpaper. It may switch the size of wallpaper based on the
   // current display's resolution. (asynchronously with zero delay)
   void UpdateWallpaper(bool clear_cache) override;
 
   // 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;
 
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerBrowserTestDefaultWallpaper;
   friend class WallpaperManagerPolicyTest;
 
   WallpaperManager();
 
   // Returns modifiable PendingWallpaper.
   // Returns pending_inactive_ or creates new PendingWallpaper if necessary.
   PendingWallpaper* GetPendingWallpaper(const AccountId& account_id,
                                         bool delayed);
 
   // This is called by PendingWallpaper when load is finished.
   void RemovePendingWallpaperFromList(PendingWallpaper* pending);
 
   // Set wallpaper to |user_image| controlled by policy.  (Takes a UserImage
   // because that's the callback interface provided by UserImageLoader.)
   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;
   bool GetUserWallpaperInfo(const AccountId& account_id,
                             wallpaper::WallpaperInfo* info) const override;
   void OnWallpaperDecoded(
       const AccountId& account_id,
       wallpaper::WallpaperLayout layout,
       bool update_wallpaper,
       wallpaper::MovableOnDestroyCallbackHolder on_finish,
       std::unique_ptr<user_manager::UserImage> user_image) override;
@@ skipping 47 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_