Make image_decoder a Leaky LazyInstance

chrome/browser/extensions/webstore_install_helper.cc

Index: chrome/browser/extensions/webstore_install_helper.cc
diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
index 47926c6954258886f6a7ae4154a9f3638552dccc..450a68af184bf48787b47ad8c6a6f8ffdd3e9434 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -94,9 +94,9 @@ void WebstoreInstallHelper::OnURLFetchComplete(
   if (!source->GetStatus().is_success() ||
       response_code / 100 == 4 || response_code / 100 == 5) {
     BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(&WebstoreInstallHelper::OnDecodeImageFailed, this));
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&WebstoreInstallHelper::OnDecodeImageFailed, this,
+                   chromeutility::DUMMY_IMAGE_DELEGATE_ID));
   } else {
     std::string response_data;
     source->GetResponseAsString(&response_data);
@@ -114,8 +114,8 @@ void WebstoreInstallHelper::OnURLFetchComplete(
 void WebstoreInstallHelper::StartFetchedImageDecode() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   CHECK(utility_host_.get());
-  utility_host_->Send(new ChromeUtilityMsg_DecodeImage(fetched_icon_data_,
-                                                       false));
+  utility_host_->Send(new ChromeUtilityMsg_DecodeImage(
+      fetched_icon_data_, false, chromeutility::DUMMY_IMAGE_DELEGATE_ID));
 }
 
 
@@ -135,16 +135,16 @@ bool WebstoreInstallHelper::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-
 void WebstoreInstallHelper::OnDecodeImageSucceeded(
-    const SkBitmap& decoded_image) {
+    const SkBitmap& decoded_image,
+    int id) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   icon_ = decoded_image;
   icon_decode_complete_ = true;
   ReportResultsIfComplete();
 }
 
-void WebstoreInstallHelper::OnDecodeImageFailed() {
+void WebstoreInstallHelper::OnDecodeImageFailed(int id) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   icon_decode_complete_ = true;
   error_ = kImageDecodeError;