Make image_decoder a Leaky LazyInstance

chrome/browser/extensions/webstore_install_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/webstore_install_helper.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/values.h"
@@ skipping 78 matching lines @@
     const net::URLFetcher* source) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(source == url_fetcher_.get());
   int response_code =
       source->GetStatus().is_success() ? source->GetResponseCode() : 0;
   if (!source->GetStatus().is_success() ||
       response_code / 100 == 4 || response_code / 100 == 5) {
     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);
     fetched_icon_data_.insert(fetched_icon_data_.begin(),
                               response_data.begin(),
                               response_data.end());
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&WebstoreInstallHelper::StartFetchedImageDecode, this));
   }
   url_fetcher_.reset();
 }
 
 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.

 }
 
 
 bool WebstoreInstallHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebstoreInstallHelper, message)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded,
                         OnDecodeImageSucceeded)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed,
                         OnDecodeImageFailed)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded,
                         OnJSONParseSucceeded)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed,
                         OnJSONParseFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   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;
   parse_error_ = Delegate::ICON_ERROR;
   ReportResultsIfComplete();
 }
 
 void WebstoreInstallHelper::OnJSONParseSucceeded(
     const base::ListValue& wrapper) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 38 matching lines @@
 
 void WebstoreInstallHelper::ReportResultFromUIThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (error_.empty() && parsed_manifest_)
     delegate_->OnWebstoreParseSuccess(id_, icon_, parsed_manifest_.release());
   else
     delegate_->OnWebstoreParseFailure(id_, parse_error_, error_);
 }
 
 }  // namespace extensions