Make image_decoder a Leaky LazyInstance

chrome/browser/image_decoder.cc

Index: chrome/browser/image_decoder.cc
diff --git a/chrome/browser/image_decoder.cc b/chrome/browser/image_decoder.cc
index 2f9e83b7ab8953f41eb2d5a4bfc091e8f7e81ce7..3bf7533339d268702b2f0c57af73a9615b99bed7 100644
--- a/chrome/browser/image_decoder.cc
+++ b/chrome/browser/image_decoder.cc
@@ -54,13 +54,14 @@ bool ImageDecoder::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) {
+void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image,
+                                          int id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (delegate_)
     delegate_->OnImageDecoded(this, decoded_image);
 }
 
-void ImageDecoder::OnDecodeImageFailed() {
+void ImageDecoder::OnDecodeImageFailed(int id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (delegate_)
     delegate_->OnDecodeImageFailed(this);
@@ -73,9 +74,12 @@ void ImageDecoder::DecodeImageInSandbox(
   utility_process_host = UtilityProcessHost::Create(this, task_runner_.get());
   if (image_codec_ == ROBUST_JPEG_CODEC) {
     utility_process_host->Send(
-        new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data));
+        new ChromeUtilityMsg_RobustJPEGDecodeImage(
+            image_data, chromeutility::DUMMY_IMAGE_DELEGATE_ID));
   } else {
     utility_process_host->Send(
-        new ChromeUtilityMsg_DecodeImage(image_data, shrink_to_fit_));
+        new ChromeUtilityMsg_DecodeImage(
+            image_data, shrink_to_fit_,
+            chromeutility::DUMMY_IMAGE_DELEGATE_ID));
   }
 }