Enable robust decoding of custom wallpaper and allow custom wallpaper on login page

chrome/browser/chromeos/login/wallpaper_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 92 matching lines @@
 // WallpaperManager, public: ---------------------------------------------------
 
 // static
 WallpaperManager* WallpaperManager::Get() {
   if (!g_wallpaper_manager)
     g_wallpaper_manager = new WallpaperManager();
   return g_wallpaper_manager;
 }
 
 WallpaperManager::WallpaperManager()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_(new UserImageLoader)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_(
+          new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC))),
       current_user_wallpaper_type_(User::UNKNOWN),
       ALLOW_THIS_IN_INITIALIZER_LIST(current_user_wallpaper_index_(
           ash::GetInvalidWallpaperIndex())),
       should_cache_wallpaper_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   RestartTimer();
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
@@ skipping 378 matching lines @@
   } else {
     User::WallpaperType type;
     int index;
     base::Time date;
     GetUserWallpaperProperties(email, &type, &index, &date);
     if (type == User::DAILY && date != base::Time::Now().LocalMidnight()) {
       index = ash::GetNextWallpaperIndex(index);
       SetUserWallpaperProperties(email, User::DAILY, index,
                                  ShouldPersistDataForUser(email));
     } else if (type == User::CUSTOMIZED) {
-      // For security reason, use default wallpaper instead of custom wallpaper
-      // at login screen. The security issue is tracked in issue 143198. Once it
-      // fixed, we should then only use custom wallpaper.
-      if (!UserManager::Get()->IsUserLoggedIn()) {
-        index = ash::GetDefaultWallpaperIndex();
-      } else {
-        GetCustomWallpaper(email);
-        return;
-      }
+      GetCustomWallpaper(email);
+      return;
     }
     ash::Shell::GetInstance()->desktop_background_controller()->
         SetDefaultWallpaper(index, false);
     if (new_wallpaper_ui_enabled)
       MigrateBuiltInWallpaper(email);
   }
   SetLastSelectedUser(email);
 }
 
 void WallpaperManager::SetWallpaperFromImageSkia(
@@ skipping 517 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos