Apply default wallpaper from customization manifest.

chrome/browser/chromeos/login/user_image_loader.cc

Index: chrome/browser/chromeos/login/user_image_loader.cc
diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc
index bbb7c6b31bfacaf7a1909b2c5b2a285cc528eaf6..3b2e07d74b1ffe7b5a21be06b2d459e32baf89f2 100644
--- a/chrome/browser/chromeos/login/user_image_loader.cc
+++ b/chrome/browser/chromeos/login/user_image_loader.cc
@@ -20,9 +20,11 @@
 
 namespace chromeos {
 
-UserImageLoader::ImageInfo::ImageInfo(int size,
+UserImageLoader::ImageInfo::ImageInfo(const std::string& file_path,
+                                      int size,
                                       const LoadedCallback& loaded_cb)
-    : size(size),
+    : file_path(file_path),
+      size(size),
       loaded_cb(loaded_cb) {
 }
 
@@ -47,27 +49,26 @@ void UserImageLoader::Start(const std::string& filepath,
       FROM_HERE,
       base::Bind(&UserImageLoader::ReadAndDecodeImage,
                  this,
-                 filepath,
-                 ImageInfo(size, loaded_cb)));
+                 ImageInfo(filepath, size, loaded_cb)));
 }
 
 void UserImageLoader::Start(scoped_ptr<std::string> data,
                             int size,
                             const LoadedCallback& loaded_cb) {
-  background_task_runner_->PostTask(FROM_HERE,
-                                    base::Bind(&UserImageLoader::DecodeImage,
-                                        this,
-                                        base::Passed(&data),
-                                        ImageInfo(size, loaded_cb)));
+  background_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&UserImageLoader::DecodeImage,
+                 this,
+                 base::Passed(&data),
+                 ImageInfo(std::string(), size, loaded_cb)));
 }
 
-void UserImageLoader::ReadAndDecodeImage(const std::string& filepath,
-                                         const ImageInfo& image_info) {
+void UserImageLoader::ReadAndDecodeImage(const ImageInfo& image_info) {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
 
   scoped_ptr<std::string> data(new std::string);
   const bool success =
-      base::ReadFileToString(base::FilePath(filepath), data.get());
+      base::ReadFileToString(base::FilePath(image_info.file_path), data.get());
   DCHECK(success);
 
   DecodeImage(data.Pass(), image_info);
@@ -92,6 +93,7 @@ void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder,
     NOTREACHED();
     return;
   }
+  const std::string file_path = it->second.file_path;
   const int target_size = it->second.size;
   const LoadedCallback loaded_cb = it->second.loaded_cb;
   image_info_map_.erase(it);
@@ -123,6 +125,7 @@ void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder,
       gfx::ImageSkia::CreateFrom1xBitmap(final_image);
   final_image_skia.MakeThreadSafe();
   UserImage user_image(final_image_skia, decoder->get_image_data());
+  user_image.set_file_path(file_path);
   if (image_codec_ == ImageDecoder::ROBUST_JPEG_CODEC)
     user_image.MarkAsSafe();
   foreground_task_runner_->PostTask(FROM_HERE,