Merge 232142 "Revert 230138 "Delay wallpaper load by 2 * average..."

chrome/browser/chromeos/login/wallpaper_manager.cc

Index: chrome/browser/chromeos/login/wallpaper_manager.cc
===================================================================
--- chrome/browser/chromeos/login/wallpaper_manager.cc	(revision 232150)
+++ chrome/browser/chromeos/login/wallpaper_manager.cc	(working copy)
@@ -312,7 +312,6 @@
       break;
     }
     case chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED: {
-      NotifyAnimationFinished();
       if (should_cache_wallpaper_) {
         BrowserThread::PostDelayedTask(
             BrowserThread::UI, FROM_HERE,
@@ -606,19 +605,6 @@
   SetUserWallpaper(last_selected_user_);
 }
 
-void WallpaperManager::AddObserver(WallpaperManager::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void WallpaperManager::RemoveObserver(WallpaperManager::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void WallpaperManager::NotifyAnimationFinished() {
-  FOR_EACH_OBSERVER(
-      Observer, observers_, OnWallpaperAnimationFinished(last_selected_user_));
-}
-
 // WallpaperManager, private: --------------------------------------------------
 
 void WallpaperManager::CacheUsersWallpapers() {