Reland "Implement random wallpaper feature"

chrome/browser/chromeos/login/mock_user_manager.h

Index: chrome/browser/chromeos/login/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h
index 7adaf2e52f0716b98658afea41f50129599811ad..6f003e5ad794cac169e1b1b51d10731cd856451b 100644
--- a/chrome/browser/chromeos/login/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/mock_user_manager.h
@@ -35,7 +35,10 @@ class MockUserManager : public UserManager {
                                          User::OAuthTokenStatus));
   MOCK_METHOD2(SaveUserDisplayEmail, void(const std::string&,
                                           const std::string&));
-  MOCK_METHOD1(SaveUserWallpaperIndex, void(int));
+  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 SkBitmap&));
@@ -71,7 +74,7 @@ class MockUserManager : public UserManager {
   // Return an invalid user wallpaper index. No need to load a real wallpaper.
   // When loading wallpaper asynchronously, it may actually cause a crash if
   // test finished before wallpaper loaded.
-  virtual int GetUserWallpaperIndex() OVERRIDE;
+  virtual int GetLoggedInUserWallpaperIndex() OVERRIDE;
 
   User* user_;
 };