ash: Fix DesktopBackgroundController getting stuck.

ash/desktop_background/desktop_background_controller.h

 // 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.
 
 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/display/display_controller.h"
 #include "base/basictypes.h"
@@ skipping 91 matching lines @@
   // after loaded. Returns true if the controller started loading the
   // wallpaper and false otherwise (i.e. the appropriate wallpaper was
   // already loading or loaded).
   bool SetDefaultWallpaper(bool is_guest);
 
   // Sets the user selected custom wallpaper. Called when user selected a file
   // from file system or changed the layout of wallpaper.
   void SetCustomWallpaper(const gfx::ImageSkia& image, WallpaperLayout layout);
 
   // Cancels the current wallpaper loading operation.
-  void CancelPendingWallpaperOperation();
+  void CancelDefaultWallpaperLoader();

[DaveMoore, 2013/12/26 21:00:35]

Nit: Is the comment still correct?

[Daniel Erat, 2013/12/26 21:01:52]

Yes, but I'll update it to be a bit clearer. (Only "default" wallpaper gets
loaded by this class -- custom wallpaper is passed in as a gfx::ImageSkia.)

 
   // Creates an empty wallpaper. Some tests require a wallpaper widget is ready
   // when running. However, the wallpaper widgets are now created asynchronously
   // . If loading a real wallpaper, there are cases that these tests crash
   // because the required widget is not ready. This function synchronously
   // creates an empty widget for those tests to prevent crashes. An example test
   // is SystemGestureEventFilterTest.ThreeFingerSwipe.
   void CreateEmptyWallpaper();
 
   // Returns the appropriate wallpaper resolution for all root windows.
@@ skipping 81 matching lines @@
   scoped_ptr<WallpaperResizer> current_wallpaper_;
 
   // If a default wallpaper is stored in |current_wallpaper_|, the path and
   // resource ID that were passed to WallpaperLoader when loading it.
   // Otherwise, empty and -1, respectively.
   base::FilePath current_default_wallpaper_path_;
   int current_default_wallpaper_resource_id_;
 
   gfx::Size current_max_display_size_;
 
-  scoped_refptr<WallpaperLoader> wallpaper_loader_;
+  // Loads default wallpaper from disk.
+  scoped_refptr<WallpaperLoader> default_wallpaper_loader_;
 
   base::WeakPtrFactory<DesktopBackgroundController> weak_ptr_factory_;
 
   base::OneShotTimer<DesktopBackgroundController> timer_;
 
   int wallpaper_reload_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_