Revert 128663 - Linux ChromiumOS Tester crashing in OnDesktopBackgroundChanged() from GetUserWallpa…

chrome/browser/chromeos/login/user_manager_impl.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/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 896 matching lines @@
   SaveUserDefaultImageIndex(username, image_id);
 }
 
 int UserManagerImpl::GetUserWallpaper(const std::string& username) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PrefService* local_state = g_browser_process->local_state();
   const DictionaryValue* user_wallpapers =
       local_state->GetDictionary(UserManager::kUserWallpapers);
   int index = ash::GetDefaultWallpaperIndex();
-  if (!user_wallpapers->GetIntegerWithoutPathExpansion(username, &index))
-    SaveWallpaperDefaultIndex(username, index);
+  user_wallpapers->GetIntegerWithoutPathExpansion(username,
+                                                  &index);
   return index;
 }
 
 void UserManagerImpl::SaveWallpaperDefaultIndex(const std::string& username,
                                                 int wallpaper_index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate wallpapers_update(local_state,
                                          UserManager::kUserWallpapers);
@@ skipping 289 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos