Make image_decoder a Leaky LazyInstance

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

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 26 matching lines @@
   SkAutoLockPixels second_pixel_lock(*second_bitmap);
   uint8_t* first_data = reinterpret_cast<uint8_t*>(first_bitmap->getPixels());
   uint8_t* second_data = reinterpret_cast<uint8_t*>(second_bitmap->getPixels());
   for (size_t i = 0; i < size; ++i) {
     if (first_data[i] != second_data[i])
       return false;
   }
   return true;
 }
 
-ImageLoader::ImageLoader(const base::FilePath& path) : path_(path) {
+ImageLoader::ImageLoader(const base::FilePath& path)
+    : ImageRequest(base::MessageLoopProxy::current()), path_(path) {
 }
 
 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::StartWithOptions(this, image_data,
+                                 ImageDecoder::ROBUST_JPEG_CODEC, 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();
 }
 
 }  // namespace test
 }  // namespace chromeos