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

chrome/browser/search/suggestions/image_fetcher_impl.cc

Index: chrome/browser/search/suggestions/image_fetcher_impl.cc
diff --git a/chrome/browser/search/suggestions/image_fetcher_impl.cc b/chrome/browser/search/suggestions/image_fetcher_impl.cc
index 86c18a80c81cdf1f223e9972e033c9bc97cc8d69..425cbb05455e3124ef9f658c299a5491771abbfd 100644
--- a/chrome/browser/search/suggestions/image_fetcher_impl.cc
+++ b/chrome/browser/search/suggestions/image_fetcher_impl.cc
@@ -9,6 +9,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "ui/gfx/image/image.h"
 
 namespace suggestions {
 
@@ -36,7 +37,7 @@ void ImageFetcherImpl::SetImageFetcherDelegate(
 
 void ImageFetcherImpl::StartOrQueueNetworkRequest(
     const GURL& url, const GURL& image_url,
-    base::Callback<void(const GURL&, const SkBitmap*)> callback) {
+    base::Callback<void(const GURL&, const gfx::Image&)> callback) {
   // Before starting to fetch the image. Look for a request in progress for
   // |image_url|, and queue if appropriate.
   ImageRequestMap::iterator it = pending_net_requests_.find(image_url);
@@ -70,12 +71,18 @@ void ImageFetcherImpl::OnFetchComplete(const GURL& image_url,
   // un-owned pointer to the registered callbacks.
   for (CallbackVector::iterator callback_iter = request->callbacks.begin();
        callback_iter != request->callbacks.end(); ++callback_iter) {
-    callback_iter->Run(request->url, bitmap);
+    gfx::Image image;
+    if (bitmap != NULL)
+      image = gfx::Image::CreateFrom1xBitmap(*bitmap);

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

Maybe create just one gfx::Image instead of one per callback and delegate?

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

Done.

+    callback_iter->Run(request->url, image);
   }
 
   // Inform the ImageFetcherDelegate.
   if (delegate_) {
-    delegate_->OnImageFetched(request->url, bitmap);
+    gfx::Image image;
+    if (bitmap != NULL)
+      image = gfx::Image::CreateFrom1xBitmap(*bitmap);
+    delegate_->OnImageFetched(request->url, image);
   }
 
   // Erase the completed ImageRequest.