Reland - cros: Add CHECK for screen unlock problem

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 252 matching lines @@
 }
 
 void WallpaperManager::InitializeWallpaper() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UserManager* user_manager = UserManager::Get();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
     WizardController::SetZeroDelays();
 
   // Zero delays is also set in autotests.
-  if (WizardController::IsZeroDelayEnabled())
+  if (WizardController::IsZeroDelayEnabled()) {
+    // Ensure tests have some sort of wallpaper.
+    ash::Shell::GetInstance()->desktop_background_controller()->
+        CreateEmptyWallpaper();
     return;
+  }
 
   bool disable_new_oobe = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableNewOobe);
   bool disable_boot_animation = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableBootAnimation);
 
   if (!user_manager->IsUserLoggedIn()) {
     if (!disable_new_oobe) {
       if (!WizardController::IsDeviceRegistered()) {
         ash::Shell::GetInstance()->desktop_background_controller()->
@@ skipping 825 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos