Add/resurrect support for bundles of WebStore items.

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..b05f8e296916519d5da8a5061cfe9b0baab3e095 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -82,7 +82,12 @@ void WebstoreInstallHelper::StartWorkOnIOThread() {
     utility_host_->Send(
         new ChromeUtilityMsg_DecodeImageBase64(icon_base64_data_));
 
-  utility_host_->Send(new ChromeUtilityMsg_ParseJSON(manifest_));
+  if (!manifest_.empty())

[asargent_no_longer_on_chrome, 2015/03/16 17:48:22]

Why would the manifest be empty?

[Marc Treib, 2015/03/17 12:18:27]

It is empty in the bundle install case. I'm (ab)using the WebstoreInstallHelper
to get an actual icon from the icon URL, but the bundle doesn't have a manifest.

[asargent_no_longer_on_chrome, 2015/03/24 23:34:00]

Hmm, this seems like a risky approach, since all the other code which uses this
class passes a real manifest, so it seems like it would be easy for future
changes to accidentally assume manifest is non-empty and break your usage. 

When https://codereview.chromium.org/931993002/ lands, we'll have a class which
abstracts the work of sandboxed image processing (see the
chrome/browser/image_decoder.h class in that CL). At that point it might make
sense to just have the URLFetcher in your class, and use a ImageDecoder with the
data you fetch. 

In the mean time, it might be best to create a new class named something like
"SafeImageFetcher" with a method something like this:

typedef base::Callback<const SkBitmap*, std::string error> GetImageCallback;

// Tries to fetch and parse the image at |image_url|, returning either a valid
// image to the callback or an error describing what went wrong.
void GetImage(const GURL& image_url, const GetImageCallback& callback);

Then you can use this inside the implementation of WebstoreInstallHelper, and
directory in your API implementation. 

[Marc Treib, 2015/03/25 11:21:59]

Ack re risky.
Actually, http://crrev.com/931993002 seems almost ready to land. So rather than
messing with WebstoreInstallHelper here (and causing lots of merge conflicts), I
think I'll just wait for it to land and rebase on top of it.

[Marc Treib, 2015/03/26 15:49:25]

931993002 has landed (yay!) and I've rebased this on top of it. I've also
created a SafeImageFetcher class as suggested, which combines fetching the URL
and decoding the image. It's used by WebstoreInstallHelper and by the new
InstallBundle function. Consequently, WebstoreInstallHelper requires a non-empty
manifest again.

+    utility_host_->Send(new ChromeUtilityMsg_ParseJSON(manifest_));
+  else
+    manifest_parse_complete_ = true;
+
+  ReportResultsIfComplete();
 }
 
 void WebstoreInstallHelper::OnURLFetchComplete(
@@ -196,7 +201,7 @@ void WebstoreInstallHelper::ReportResultsIfComplete() {
 
 void WebstoreInstallHelper::ReportResultFromUIThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (error_.empty() && parsed_manifest_)
+  if (error_.empty() && (parsed_manifest_ || manifest_.empty()))
     delegate_->OnWebstoreParseSuccess(id_, icon_, parsed_manifest_.release());
   else
     delegate_->OnWebstoreParseFailure(id_, parse_error_, error_);