ash: Fix DesktopBackgroundController getting stuck.

ash/desktop_background/desktop_background_controller.h

Index: ash/desktop_background/desktop_background_controller.h
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index 4cfbc8ea5dfad68de57c45febbe3a28f060ca8d7..447e5e3e00deeff4a78596324d151681ddbbb90a 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -109,7 +109,7 @@ class ASH_EXPORT DesktopBackgroundController
   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
@@ -211,7 +211,8 @@ class ASH_EXPORT DesktopBackgroundController
 
   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_;