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..ab6ec9d25b110ed2e6406c4ae1a950d95daffe46 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -96,7 +96,8 @@ void WebstoreInstallHelper::OnURLFetchComplete(
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
-        base::Bind(&WebstoreInstallHelper::OnDecodeImageFailed, this));
+        base::Bind(&WebstoreInstallHelper::OnDecodeImageFailed, this,
+                   chromeutility::DUMMY_IMAGE_DELEGATE_ID));
   } else {
     std::string response_data;
     source->GetResponseAsString(&response_data);
@@ -114,8 +115,9 @@ 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));

[dcheng, 2015/02/27 16:47:17]

Should this/can this be cleaned up to use ImageDecoder in the future? This
seems... unfortunate.

[Theresa, 2015/03/04 03:10:06]

I think it should be, but it may be a little tricky. This class is still going
to need its utility_host to send ParseJSON and DecodeImageBase64 messages. I
think extensions_hander.cc handles DecodeImageBase64 messages. ExtensionsHandler
sends new ChromeUtilityHost messages for DecodeImage_Failed and
DecodeImageAndSend in OnDecodeImageBase64, so I think webstore_install_helper.cc
stills needs IPCHandler logic for OnDecodeImageFailed and
OnDecodeImageSucceeded. Maybe DecodeImageBase64 could be rolled into the
ImageDecoder?

I'm not familiar enough with the extensions code (or how to build it and test
it) to make the change, but I can certainly file a bug if that's all right.

 }
 
 
@@ -137,14 +139,14 @@ bool WebstoreInstallHelper::OnMessageReceived(const IPC::Message& message) {
 
 
 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;