Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc
index 7f6664965725013aff4bffc9266e048a72e831e0..65b2325a890071403370396a701761f656b87efc 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc
@@ -53,23 +53,20 @@ ImageLoader::~ImageLoader() {
 scoped_ptr<gfx::ImageSkia> ImageLoader::Load() {
   std::string image_data;
   ReadFileToString(path_, &image_data);
-  scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
-      this,
-      image_data,
-      ImageDecoder::ROBUST_JPEG_CODEC);
-  image_decoder->Start(base::MessageLoopProxy::current());
+  ImageDecoder::GetInstance()->Start(this, image_data,
+                                     ImageDecoder::ROBUST_JPEG_CODEC,
+                                     base::MessageLoopProxy::current(), false);
   run_loop_.Run();
   return decoded_image_.Pass();
 }
 
-void ImageLoader::OnImageDecoded(const ImageDecoder* decoder,
-                                 const SkBitmap& decoded_image) {
+void ImageLoader::OnImageDecoded(const SkBitmap& decoded_image) {
   decoded_image_.reset(
       new gfx::ImageSkia(gfx::ImageSkiaRep(decoded_image, 1.0f)));
   run_loop_.Quit();
 }
 
-void ImageLoader::OnDecodeImageFailed(const ImageDecoder* decoder) {
+void ImageLoader::OnDecodeImageFailed() {
   run_loop_.Quit();
 }