[EoS] Fix image decoding

This patch fixes a few issues found while trying to hook up image
decoding end-to-end:
* The images are improperly inserted into the database, since binding as
  string uses the text type, which tries to use UTF8 encoding (which
  doesn't work for binary blobs.)
* Decode failures used to cause a DCHECK, now just bail out with an
  error value
* A callback was called one too many times, even after std::move.
* A crash would happen if a category had no images.

Bug: 867488
Change-Id: Ie28c01e28bd746b9a90563c228775ff3b5a8f83f
Reviewed-on: https://chromium-review.googlesource.com/1248041Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595514}

chrome/browser/android/explore_sites/explore_sites_bridge.cc

@@ -55,7 +55,7 @@ void CatalogReady(ScopedJavaGlobalRef<jobject>(j_result_obj),
 
 void ImageReady(ScopedJavaGlobalRef<jobject>(j_callback_obj),
                 std::unique_ptr<SkBitmap> bitmap) {
-  if (!bitmap) {
+  if (!bitmap || bitmap->isNull()) {
     DVLOG(1) << "Site icon is empty.";
     base::android::RunObjectCallbackAndroid(j_callback_obj, nullptr);
     return;

chrome/browser/android/explore_sites/explore_sites_service_impl.cc

@@ -58,8 +58,6 @@ void ExploreSitesServiceImpl::GetCategoryImage(int category_id,
       explore_sites_store_.get(), category_id, kFaviconsPerCategoryImage,
       base::BindOnce(&ExploreSitesServiceImpl::DecodeImageBytes,
                      std::move(callback))));
-  // TODO(dewittj, freedjm): implement.
-  std::move(callback).Run(nullptr);
 }
 
 void ExploreSitesServiceImpl::GetSiteImage(int site_id,
@@ -136,6 +134,8 @@ void ExploreSitesServiceImpl::AddUpdatedCatalog(
 // static
 void ExploreSitesServiceImpl::OnDecodeDone(BitmapCallback callback,
                                            const SkBitmap& decoded_image) {
+  DVLOG(1) << "Decoded images, result "
+           << (decoded_image.isNull() ? "null" : "non-null");
   std::unique_ptr<SkBitmap> bitmap = std::make_unique<SkBitmap>(decoded_image);
   std::move(callback).Run(std::move(bitmap));
 }
@@ -145,8 +145,11 @@ void ExploreSitesServiceImpl::DecodeImageBytes(BitmapCallback callback,
                                                EncodedImageList images) {
   // TODO(freedjm) Fix to handle multiple images when support is added for
   // creating composite images for the NTP tiles.
-  DCHECK(images.size() > 0);
-  std::unique_ptr<EncodedImageBytes> image_data = std::move(images[0]);
+  DVLOG(1) << "Requested decoding for " << images.size() << " images";
+  if (images.size() == 0) {
+    std::move(callback).Run(nullptr);
+    return;
+  }
 
   service_manager::mojom::ConnectorRequest connector_request;
   std::unique_ptr<service_manager::Connector> connector =
@@ -155,7 +158,7 @@ void ExploreSitesServiceImpl::DecodeImageBytes(BitmapCallback callback,
       ->GetConnector()
       ->BindConnectorRequest(std::move(connector_request));
 
-  data_decoder::DecodeImage(connector.get(), *image_data,
+  data_decoder::DecodeImage(connector.get(), *images[0],
                             data_decoder::mojom::ImageCodec::DEFAULT, false,
                             data_decoder::kDefaultMaxSizeInBytes, gfx::Size(),
                             base::BindOnce(&OnDecodeDone, std::move(callback)));

chrome/browser/android/explore_sites/import_catalog_task.cc

@@ -82,7 +82,8 @@ bool ImportCatalogSync(std::string version_token,
     category_statement.BindString(col++, version_token);
     category_statement.BindInt(col++, static_cast<int>(category.type()));
     category_statement.BindString(col++, category.localized_title());
-    category_statement.BindString(col++, category.icon());
+    category_statement.BindBlob(col++, category.icon().data(),
+                                category.icon().length());
 
     category_statement.Run();
 
@@ -96,7 +97,7 @@ bool ImportCatalogSync(std::string version_token,
       site_statement.BindString(col++, site.site_url());
       site_statement.BindInt64(col++, category_id);
       site_statement.BindString(col++, site.title());
-      site_statement.BindString(col++, site.icon());
+      site_statement.BindBlob(col++, site.icon().data(), site.icon().length());
 
       site_statement.Run();
     }