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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc	(revision 232150)
+++ chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc	(working copy)
@@ -421,12 +421,9 @@
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_CANCELLED,
                  content::NotificationService::AllSources());
-
-  WallpaperManager::Get()->AddObserver(this);
 }
 
 SigninScreenHandler::~SigninScreenHandler() {
-  WallpaperManager::Get()->RemoveObserver(this);
   weak_factory_.InvalidateWeakPtrs();
   SystemKeyEventListener* key_event_listener =
       SystemKeyEventListener::GetInstance();
@@ -1288,11 +1285,6 @@
     delegate_->LoadWallpaper(email);
 }
 
-void SigninScreenHandler::OnWallpaperAnimationFinished(
-    const std::string& email) {
-  CallJS("login.AccountPickerScreen.onWallpaperLoaded", email);
-}
-
 void SigninScreenHandler::HandleRebootSystem() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }