Replace SkBitmap with gfx::Image in the ImageFetcher API.

components/suggestions/image_manager.cc

 // Copyright 2014 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 "components/suggestions/image_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/task_runner_util.h"
 #include "components/image_fetcher/image_fetcher.h"
 #include "components/suggestions/image_encoder.h"
+#include "ui/gfx/image/image.h"
 
 using leveldb_proto::ProtoDatabase;
 
 namespace {
 
 // Statistics are logged to UMA with this string as part of histogram name. They
 // can all be found under LevelDB.*.ImageManager. Changing this needs to
 // synchronize with histograms.xml, AND will also become incompatible with older
 // browsers still reporting the previous values.
 const char kDatabaseUMAClientName[] = "ImageManager";
 
 std::unique_ptr<SkBitmap> DecodeImage(
     scoped_refptr<base::RefCountedMemory> encoded_data) {
   return suggestions::DecodeJPEGToSkBitmap(encoded_data->front(),
                                            encoded_data->size());
 }
 
+// Wraps an ImageManager callback so that it can be used with the ImageFetcher.
+// ImageManager callbacks expect SkBitmaps while ImageFetcher callbacks expecte
+// gfx::Images. The ImageFetcher used to return NULL when the image could not be
+// loaded. Now an empty image is returned which is mapped to NULL.
+void WrapImageManagerCallback(
+    base::Callback<void(const GURL&, const SkBitmap*)> wrapped_callback,

[noyau (Ping after 24h), 2016/05/13 16:10:09]

Same here.

The rule of thumb is: If you are in components/, this is shared code, and
skBitmap use must be eradicated…

[markusheintz_, 2016/05/17 13:08:23]

Same as the other. This will be changed. Just in a separate CL.

+    const GURL& url,
+    const gfx::Image& image) {
+  const SkBitmap* bitmap = NULL;
+  if (!image.IsEmpty()) {
+    bitmap = image.ToSkBitmap();
+  }
+  wrapped_callback.Run(url, bitmap);
+}
+
 }  // namespace
 
 namespace suggestions {
 
 ImageManager::ImageManager() : weak_ptr_factory_(this) {}
 
 ImageManager::ImageManager(
     std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher,
     std::unique_ptr<ProtoDatabase<ImageData>> database,
     const base::FilePath& database_dir,
@@ skipping 49 matching lines @@
   if (database_.get() && !database_ready_) {
     // Once database is initialized, it will serve pending requests from either
     // cache or network.
     QueueCacheRequest(url, image_url, callback);
     return;
   }
 
   ServeFromCacheOrNetwork(url, image_url, callback);
 }
 
-void ImageManager::OnImageFetched(const GURL& url, const SkBitmap* bitmap) {
-  if (bitmap)  // |bitmap| can be nullptr if image fetch was unsuccessful.
-    SaveImage(url, *bitmap);
+void ImageManager::OnImageFetched(const GURL& url, const gfx::Image& image) {
+  // |image| can be empty if image fetch was unsuccessful.
+  if (!image.IsEmpty())
+    SaveImage(url, *(image.ToSkBitmap()));
 }
 
 bool ImageManager::GetImageURL(const GURL& url, GURL* image_url) {
   DCHECK(image_url);
   std::map<GURL, GURL>::iterator it = image_url_map_.find(url);
   if (it == image_url_map_.end()) return false;  // Not found.
   *image_url = it->second;
   return true;
 }
 
@@ skipping 15 matching lines @@
 }
 
 void ImageManager::OnCacheImageDecoded(
     const GURL& url,
     const GURL& image_url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback,
     std::unique_ptr<SkBitmap> bitmap) {
   if (bitmap.get()) {
     callback.Run(url, bitmap.get());
   } else {
-    image_fetcher_->StartOrQueueNetworkRequest(url, image_url, callback);
+    image_fetcher_->StartOrQueueNetworkRequest(
+        url, image_url, base::Bind(&WrapImageManagerCallback, callback));
   }
 }
 
 scoped_refptr<base::RefCountedMemory> ImageManager::GetEncodedImageFromCache(
     const GURL& url) {
   ImageMap::iterator image_iter = image_map_.find(url.spec());
   if (image_iter != image_map_.end()) {
     return image_iter->second;
   }
   return nullptr;
 }
 
 void ImageManager::ServeFromCacheOrNetwork(
     const GURL& url,
     const GURL& image_url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
   scoped_refptr<base::RefCountedMemory> encoded_data =
       GetEncodedImageFromCache(url);
   if (encoded_data.get()) {
     base::PostTaskAndReplyWithResult(
         background_task_runner_.get(), FROM_HERE,
         base::Bind(&DecodeImage, encoded_data),
         base::Bind(&ImageManager::OnCacheImageDecoded,
                    weak_ptr_factory_.GetWeakPtr(), url, image_url, callback));
   } else {
-    image_fetcher_->StartOrQueueNetworkRequest(url, image_url, callback);
+    image_fetcher_->StartOrQueueNetworkRequest(
+        url, image_url, base::Bind(&WrapImageManagerCallback, callback));
   }
 }
 
 void ImageManager::SaveImage(const GURL& url, const SkBitmap& bitmap) {
   scoped_refptr<base::RefCountedBytes> encoded_data(
       new base::RefCountedBytes());
   if (!EncodeSkBitmapToJPEG(bitmap, &encoded_data->data())) {
     return;
   }
 
@@ skipping 67 matching lines @@
        it != pending_cache_requests_.end(); ++it) {
     const ImageCacheRequest& request = it->second;
     for (CallbackVector::const_iterator callback_it = request.callbacks.begin();
          callback_it != request.callbacks.end(); ++callback_it) {
       ServeFromCacheOrNetwork(request.url, request.image_url, *callback_it);
     }
   }
 }
 
 }  // namespace suggestions