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

chrome/browser/search/suggestions/image_fetcher_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_
 #define CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "components/image_fetcher/image_fetcher.h"
-#include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
+namespace gfx {
+class Image;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }
 
+

[Marc Treib, 2016/05/13 15:53:59]

nit: remove the extra empty line

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

Done.

 namespace suggestions {
 
-// A class used to fetch server images. It can be called from any thread and the
-// callback will be called on the thread which initiated the fetch.
+// ImageFetcher implementation.

[Marc Treib, 2016/05/13 15:53:59]

nit: I'd specify "image_fetcher::ImageFetcher"

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

Done.

 class ImageFetcherImpl : public image_fetcher::ImageFetcher,
                          public chrome::BitmapFetcherDelegate {
  public:
   explicit ImageFetcherImpl(net::URLRequestContextGetter* url_request_context);
   ~ImageFetcherImpl() override;
 
   void SetImageFetcherDelegate(
       image_fetcher::ImageFetcherDelegate* delegate) override;
 
   void StartOrQueueNetworkRequest(
       const GURL& url,
       const GURL& image_url,
-      base::Callback<void(const GURL&, const SkBitmap*)> callback) override;
+      base::Callback<void(const GURL&, const gfx::Image&)> callback) override;
 
  private:
   // Inherited from BitmapFetcherDelegate.
   void OnFetchComplete(const GURL& image_url, const SkBitmap* bitmap) override;
 
-  typedef std::vector<base::Callback<void(const GURL&, const SkBitmap*)> >
+  typedef std::vector<base::Callback<void(const GURL&, const gfx::Image&)> >
       CallbackVector;
 
   // State related to an image fetch (associated website url, image_url,
   // fetcher, pending callbacks).
   struct ImageRequest {
     ImageRequest();
     // Struct takes ownership of |f|.
     explicit ImageRequest(chrome::BitmapFetcher* f);
     ImageRequest(const ImageRequest& other);
     ~ImageRequest();
@@ skipping 22 matching lines @@
   image_fetcher::ImageFetcherDelegate* delegate_;
 
   net::URLRequestContextGetter* url_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageFetcherImpl);
 };
 
 }  // namespace suggestions
 
 #endif  // CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_