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

chrome/browser/chromeos/login/mock_user_manager.h

 // Copyright (c) 2012 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_MOCK_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
-#include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
 class MockUserManager : public UserManager {
  public:
   MockUserManager();
   virtual ~MockUserManager();
 
@@ skipping 12 matching lines @@
   MOCK_METHOD2(SaveUserOAuthStatus, void(const std::string&,
                                          User::OAuthTokenStatus));
   MOCK_METHOD2(SaveUserDisplayEmail, void(const std::string&,
                                           const std::string&));
   MOCK_METHOD2(GetLoggedInUserWallpaperProperties, void(User::WallpaperType*,
                                                         int*));
   MOCK_METHOD2(SaveLoggedInUserWallpaperProperties, void(User::WallpaperType,
                                                          int));
   MOCK_CONST_METHOD1(GetUserDisplayEmail, std::string(const std::string&));
   MOCK_METHOD2(SaveUserDefaultImageIndex, void(const std::string&, int));
-  MOCK_METHOD2(SaveUserImage, void(const std::string&, const UserImage&));
+  MOCK_METHOD2(SaveUserImage, void(const std::string&, const SkBitmap&));
   MOCK_METHOD1(SetLoggedInUserCustomWallpaperLayout,void(
       ash::WallpaperLayout));
   MOCK_METHOD2(SaveUserImageFromFile, void(const std::string&,
                                            const FilePath&));
   MOCK_METHOD4(SaveUserWallpaperFromFile, void(const std::string&,
                                                const FilePath&,
                                                ash::WallpaperLayout,
                                                WallpaperDelegate*));
   MOCK_METHOD1(SaveUserImageFromProfileImage, void(const std::string&));
   MOCK_METHOD1(DownloadProfileImage, void(const std::string&));
@@ skipping 39 matching lines @@
   MockUserManager* user_manager();
 
  private:
   UserManager* old_user_manager_;
   scoped_ptr<MockUserManager> user_manager_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_