Apply default wallpaper from customization manifest.

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 219e3c82f360e2cc2fb2be7ed350342b5af7d3d5..9fe72be62e4e678206e029d502214237d7440213 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -36,7 +36,7 @@ enum WallpaperLayout {
   // desktop's size.
   WALLPAPER_LAYOUT_STRETCH,
   // Tile the wallpaper over the background without scaling it.
-  WALLPAPER_LAYOUT_TILE,
+  WALLPAPER_LAYOUT_TILE
 };
 
 const SkColor kLoginWallpaperColor = 0xFEFEFE;
@@ -55,6 +55,10 @@ class ASH_EXPORT DesktopBackgroundController
     BACKGROUND_IMAGE,
   };
 
+  // This is used to initialize Resource ID variables and to denote "no
+  // resource ID" in parameters.
+  static const int ASH_EXPORT kInvalidResourceID;
+
   DesktopBackgroundController();
   virtual ~DesktopBackgroundController();
 
@@ -108,18 +112,20 @@ class ASH_EXPORT DesktopBackgroundController
   // maximum width of all displays, and the maximum height of all displays.
   static gfx::Size GetMaxDisplaySizeInNative();
 
- private:
-  friend class DesktopBackgroundControllerTest;
-  //  friend class chromeos::WallpaperManagerBrowserTestDefaultWallpaper;
-  FRIEND_TEST_ALL_PREFIXES(DesktopBackgroundControllerTest, GetMaxDisplaySize);
-
   // Returns true if the specified wallpaper is already stored
   // in |current_wallpaper_|.
   // If |image| is NULL, resource_id is compared.
+  // If |compare_layouts| is false, layout is ignored.
   bool WallpaperIsAlreadyLoaded(const gfx::ImageSkia* image,
                                 int resource_id,
+                                bool compare_layouts,
                                 WallpaperLayout layout) const;
 
+ private:
+  friend class DesktopBackgroundControllerTest;
+  //  friend class chromeos::WallpaperManagerBrowserTestDefaultWallpaper;
+  FRIEND_TEST_ALL_PREFIXES(DesktopBackgroundControllerTest, GetMaxDisplaySize);
+
   // Creates view for all root windows, or notifies them to repaint if they
   // already exist.
   void SetDesktopBackgroundImageMode();