Revert "Added support for animated/nonanimated user image. There are no"

chrome/browser/chromeos/login/user_manager_impl.h

Index: chrome/browser/chromeos/login/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
index 21e033fcb7a5aa0690328e5503e69007ea0f69f5..a68b333570a87a5c2631c41d513d44017ef82603 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -32,7 +32,6 @@ class ProfileSyncService;
 namespace chromeos {
 
 class RemoveUserDelegate;
-class UserImage;
 
 // Implementation of the UserManager.
 class UserManagerImpl : public UserManager,
@@ -74,7 +73,7 @@ class UserManagerImpl : public UserManager,
   virtual void SaveUserDefaultImageIndex(const std::string& username,
                                          int image_index) OVERRIDE;
   virtual void SaveUserImage(const std::string& username,
-                             const UserImage& user_image) OVERRIDE;
+                             const SkBitmap& image) OVERRIDE;
   virtual void SetLoggedInUserCustomWallpaperLayout(
       ash::WallpaperLayout layout) OVERRIDE;
   virtual void SaveUserImageFromFile(const std::string& username,
@@ -177,7 +176,7 @@ class UserManagerImpl : public UserManager,
   // If |image| is empty, sets a stub image for the user.
   void SetUserImage(const std::string& username,
                     int image_index,
-                    const UserImage& user_image);
+                    const SkBitmap& image);
 
   void GetUserWallpaperProperties(const std::string& username,
                                  User::WallpaperType* type,
@@ -190,7 +189,7 @@ class UserManagerImpl : public UserManager,
   // and sends LOGIN_USER_IMAGE_CHANGED notification.
   void SaveUserImageInternal(const std::string& username,
                              int image_index,
-                             const UserImage& user_image);
+                             const SkBitmap& image);
 
   // Saves wallpaper to file, post task to generate thumbnail and updates local
   // state preferences.
@@ -198,17 +197,17 @@ class UserManagerImpl : public UserManager,
                                  ash::WallpaperLayout layout,
                                  User::WallpaperType type,
                                  WallpaperDelegate* delegate,
-                                 const UserImage& user_image);
+                                 const SkBitmap& image);
 
   // Sets desktop background to custom wallpaper and loads wallpaper thumbnail
   // asynchronously.
   void OnCustomWallpaperLoaded(const std::string& email,
                                ash::WallpaperLayout layout,
-                               const UserImage& wallpaper);
+                               const SkBitmap& wallpaper);
 
   // Caches the loaded wallpaper for the given user.
   void OnCustomWallpaperThumbnailLoaded(const std::string& email,
-                                        const UserImage& user_image);
+                                        const SkBitmap& wallpaper);
 
   // Updates the custom wallpaper thumbnail in wallpaper picker UI.
   void OnThumbnailUpdated(WallpaperDelegate* delegate);
@@ -223,7 +222,7 @@ class UserManagerImpl : public UserManager,
   // notification. Runs on FILE thread. Posts task for saving image info to
   // Local State on UI thread.
   void SaveImageToFile(const std::string& username,
-                       const UserImage& user_image,
+                       const SkBitmap& image,
                        const FilePath& image_path,
                        int image_index);
 
@@ -250,7 +249,7 @@ class UserManagerImpl : public UserManager,
                                  User::WallpaperType type);
 
   // Saves |image| to the specified |image_path|. Runs on FILE thread.
-  bool SaveBitmapToFile(const UserImage& user_image,
+  bool SaveBitmapToFile(const SkBitmap& image,
                         const FilePath& image_path);
 
   // Initializes |downloaded_profile_picture_| with the picture of the logged-in