Make image_decoder a Leaky LazyInstance

chrome/common/chrome_utility_messages.h

Index: chrome/common/chrome_utility_messages.h
diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h
index 80ea64c713f88842c0159b1c082edc2c43046b26..52ff8429f7eb7ef97e269903105641b6a6342811 100644
--- a/chrome/common/chrome_utility_messages.h
+++ b/chrome/common/chrome_utility_messages.h
@@ -129,14 +129,16 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseJSON,
                      std::string /* JSON to parse */)
 
 // Tell the utility process to decode the given image data.
-IPC_MESSAGE_CONTROL2(ChromeUtilityMsg_DecodeImage,
+IPC_MESSAGE_CONTROL3(ChromeUtilityMsg_DecodeImage,
                      std::vector<unsigned char> /* encoded image contents */,
-                     bool /* shrink image if needed for IPC msg limit */)
+                     bool /* shrink image if needed for IPC msg limit */,
+                     int /* delegate id */)
 
 // Tell the utility process to decode the given JPEG image data with a robust
 // libjpeg codec.
-IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_RobustJPEGDecodeImage,
-                     std::vector<unsigned char>)  // encoded image contents
+IPC_MESSAGE_CONTROL2(ChromeUtilityMsg_RobustJPEGDecodeImage,
+                     std::vector<unsigned char> /* encoded image contents*/,
+                     int /* delegate id */)
 
 // Tell the utility process to patch the given |input_file| using |patch_file|
 // and place the output in |output_file|. The patch should use the bsdiff
@@ -234,11 +236,13 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackWebResource_Failed,
                      std::string /* error_message, if any */)
 
 // Reply when the utility process has succeeded in decoding the image.
-IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Succeeded,
-                     SkBitmap)  // decoded image
+IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_DecodeImage_Succeeded,
+                     SkBitmap /* decoded image */,
+                     int /* delegate id */)
 
 // Reply when an error occurred decoding the image.
-IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_DecodeImage_Failed)
+IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Failed,
+                     int /* delegate id */)
 
 // Reply when a file has been patched.
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_PatchFile_Finished, int /* result */)