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

ios/chrome/browser/suggestions/image_fetcher_impl.mm

Index: ios/chrome/browser/suggestions/image_fetcher_impl.mm
diff --git a/ios/chrome/browser/suggestions/image_fetcher_impl.mm b/ios/chrome/browser/suggestions/image_fetcher_impl.mm
index 553f02cbb1fbd7c15b2c637ffd6d7667a73cdf9a..7eee67b3ad8b4ea59a4111fb50d667c71b0e85e8 100644
--- a/ios/chrome/browser/suggestions/image_fetcher_impl.mm
+++ b/ios/chrome/browser/suggestions/image_fetcher_impl.mm
@@ -11,6 +11,7 @@
 #include "ios/chrome/browser/net/image_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "skia/ext/skia_utils_ios.h"
+#include "ui/gfx/image/image.h"
 
 namespace suggestions {
 
@@ -33,11 +34,12 @@ 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) {
+  gfx::Image image;
   if (image_url.is_empty()) {
-    callback.Run(url, nullptr);
+    callback.Run(url, image);
     if (delegate_) {
-      delegate_->OnImageFetched(url, nullptr);
+      delegate_->OnImageFetched(url, image);
     }
     return;
   }
@@ -47,20 +49,19 @@ void ImageFetcherImpl::StartOrQueueNetworkRequest(
       ^(const GURL& original_url, int response_code, NSData* data) {
       if (data) {
         // Most likely always returns 1x images.
-        UIImage* image = [UIImage imageWithData:data scale:1];
-        if (image) {
-          SkBitmap bitmap =
-              skia::CGImageToSkBitmap(image.CGImage, [image size], YES);
-          callback.Run(page_url, &bitmap);
+        UIImage* ui_image = [UIImage imageWithData:data scale:1];
+        if (ui_image) {
+          image = gfx::Image(ui_image);

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

Define a local variable here for the image. Right now you're capturing in the
block the variable in the function context, which is doing a needless copy.

Blocks are nasty :)

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

I was hoping that this copy is very cheep.

Done.

+          callback.Run(page_url, image);
           if (delegate_) {
-            delegate_->OnImageFetched(page_url, &bitmap);
+            delegate_->OnImageFetched(page_url, image);
           }
           return;
         }
       }
-      callback.Run(page_url, nullptr);
+      callback.Run(page_url, image);
       if (delegate_) {
-        delegate_->OnImageFetched(page_url, nullptr);
+        delegate_->OnImageFetched(page_url, image);
       }
   };
   imageFetcher_->StartDownload(image_url, fetcher_callback);