Fixing valgrind problem with wallpaper animation

chrome/browser/chromeos/login/wallpaper_manager.cc

 // Copyright (c) 2013 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 <numeric>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 684 matching lines @@
   ScheduleSetUserWallpaper(email, true);
 }
 
 void WallpaperManager::SetUserWallpaperNow(const std::string& email) {
   ScheduleSetUserWallpaper(email, false);
 }
 
 void WallpaperManager::ScheduleSetUserWallpaper(const std::string& email,
                                                 bool delayed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // Some unit tests come here without a UserManager.
-  if (!UserManager::IsInitialized())
+  // Some unit tests come here without a UserManager or without a pref system.
+  if (!UserManager::IsInitialized() || !g_browser_process->local_state())
     return;
   // There is no visible background in  kiosk mode.
   if (UserManager::Get()->IsLoggedInAsKioskApp())
     return;
   // Guest user, regular user in ephemeral mode, or kiosk app.
   const User* user = UserManager::Get()->FindUser(email);
   if (UserManager::Get()->IsUserNonCryptohomeDataEphemeral(email) ||
       (user != NULL && user->GetType() == User::USER_TYPE_KIOSK_APP)) {
     InitInitialUserWallpaper(email, false);
     GetPendingWallpaper(email, delayed)->ResetSetDefaultWallpaper();
@@ skipping 312 matching lines @@
     // crosbug.com/38429.
     LOG(ERROR) << "Wallpaper reverts to default unexpected.";
     DoSetDefaultWallpaper(on_finish.Pass());
   }
 }
 
 bool WallpaperManager::GetUserWallpaperInfo(const std::string& email,
                                             WallpaperInfo* info){
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // Some unit tests come here with no browser local state attached.
-  if (UserManager::Get()->IsUserNonCryptohomeDataEphemeral(email) ||
-      !g_browser_process->local_state()) {
+  if (UserManager::Get()->IsUserNonCryptohomeDataEphemeral(email)) {
     // Default to the values cached in memory.
     *info = current_user_wallpaper_info_;
 
     // Ephemeral users do not save anything to local state. But we have got
     // wallpaper info from memory. Returns true.
     return true;
   }
 
   const base::DictionaryValue* user_wallpapers =
       g_browser_process->local_state()->
@@ skipping 281 matching lines @@
     loading_.push_back(new WallpaperManager::PendingWallpaper(
         (delayed ? GetWallpaperLoadDelay()
                  : base::TimeDelta::FromMilliseconds(0)),
         username));
     pending_inactive_ = loading_.back();
   }
   return pending_inactive_;
 }
 
 }  // namespace chromeos