Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/app_mode/kiosk_app_data.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_data.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
index 93b45f374faa078f3b088bc515d9223e49acd2d0..f6f90b9e21da17ddd08b05f5319cb6643a8ba067 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
@@ -232,9 +232,8 @@ class KioskAppData::IconLoader : public ImageDecoder::Delegate {
     }
     raw_icon_ = base::RefCountedString::TakeString(&data);
 
-    scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
-        this, raw_icon_->data(), ImageDecoder::DEFAULT_CODEC);
-    image_decoder->Start(task_runner_);
+    ImageDecoder::GetInstance()->Start(
+        this, raw_icon_->data(), ImageDecoder::DEFAULT_CODEC, task_runner_);
   }
 
   void ReportResultOnBlockingPool(LoadResult result) {
@@ -266,14 +265,13 @@ class KioskAppData::IconLoader : public ImageDecoder::Delegate {
   }
 
   // ImageDecoder::Delegate overrides:
-  void OnImageDecoded(const ImageDecoder* decoder,
-                      const SkBitmap& decoded_image) override {
+  void OnImageDecoded(const SkBitmap& decoded_image) override {
     icon_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
     icon_.MakeThreadSafe();
     ReportResultOnBlockingPool(SUCCESS);
   }
 
-  void OnDecodeImageFailed(const ImageDecoder* decoder) override {
+  void OnDecodeImageFailed() override {
     ReportResultOnBlockingPool(FAILED_TO_DECODE);
   }