Deselect should maintain previously selected wallpaper and guest should load default guest wallpaper

chrome/browser/chromeos/login/wallpaper_manager.cc

Index: chrome/browser/chromeos/login/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
index b0e59a88a19350c7b4fb479062761fb4b76eed06..5cdd2095d56aee0c7cd8ae43bac308c3a3138fe6 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -359,6 +359,11 @@ void WallpaperManager::SetLastSelectedUser(
 
 void WallpaperManager::SetUserWallpaper(const std::string& email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (email == kGuestUser) {
+    ash::Shell::GetInstance()->desktop_background_controller()->
+      SetDefaultWallpaper(ash::GetGuestWallpaperIndex(), false);
+  }
+
   if (!UserManager::Get()->IsKnownUser(email))
     return;
 
@@ -394,14 +399,6 @@ void WallpaperManager::SetWallpaperFromImageSkia(
       SetCustomWallpaper(wallpaper, layout);
 }
 
-void WallpaperManager::OnUserDeselected() {
-  if (!UserManager::Get()->IsUserLoggedIn()) {
-    // This will set default login wallpaper (#fefefe).
-    ash::Shell::GetInstance()->desktop_background_controller()->
-        SetDefaultWallpaper(ash::GetSolidColorIndex(), false);
-  }
-}
-
 void WallpaperManager::OnUserSelected(const std::string& email) {
   SetUserWallpaper(email);
 }