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 af29edac943f459ecd0bcea887a279dc0328157e..91c1accfb20ad29d01f935ef106fec288a32fb2d 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
@@ -201,7 +201,8 @@ class KioskAppData::IconLoader : public ImageDecoder::Delegate {
 
   IconLoader(const base::WeakPtr<KioskAppData>& client,
              const base::FilePath& icon_path)
-      : client_(client),
+      : Delegate(task_runner_),
+        client_(client),
         icon_path_(icon_path),
         load_result_(SUCCESS) {}
 
@@ -232,9 +233,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::Start(this, raw_icon_->data(), ImageDecoder::DEFAULT_CODEC,
+                        false);
   }
 
   void ReportResultOnBlockingPool(LoadResult result) {
@@ -266,14 +266,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);
   }
 
@@ -307,7 +306,6 @@ class KioskAppData::WebstoreDataParser
         new extensions::WebstoreInstallHelper(this,
                                               app_id,
                                               manifest,
-                                              "",  // No icon data.
                                               icon_url,
                                               context_getter);
     webstore_helper->Start();