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

chrome/browser/search/thumbnail_source.h

 // Copyright (c) 2012 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_THUMBNAIL_SOURCE_H_
 #define CHROME_BROWSER_SEARCH_THUMBNAIL_SOURCE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/url_data_source.h"
+#include "ui/gfx/image/image.h"

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

nit: You can forward-declare this, no need to include

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

Done.

 #include "url/gurl.h"
 
 class Profile;
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace image_fetcher {
@@ skipping 29 matching lines @@
   void ExtractPageAndThumbnailUrls(const std::string& path,
                                    GURL* page_url,
                                    GURL* fallback_thumbnail_url);
 
  private:
   // Returns a JPEG-encoded |bitmap| to the |callback| if valid, or the default
   // thumbnail.
   void SendFetchedUrlImage(
       const content::URLDataSource::GotDataCallback& callback,
       const GURL& url,
-      const SkBitmap* bitmap);
+      const gfx::Image& image);
 
   // Raw PNG representation of the thumbnail to show when the thumbnail
   // database doesn't have a thumbnail for a webpage.
   scoped_refptr<base::RefCountedMemory> default_thumbnail_;
 
   // ThumbnailService.
   scoped_refptr<thumbnails::ThumbnailService> thumbnail_service_;
 
   // ImageFetcher.
   std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher_;
 
   // Indicate that, when a URL for which we don't have a thumbnail is requested
   // from this source, then Chrome should capture a thumbnail next time it
   // navigates to this URL. This is useful when the thumbnail URLs are generated
   // by an external service rather than TopSites, so Chrome can learn about the
   // URLs for which it should get thumbnails. Sources that capture thumbnails
   // are also be more lenient when matching thumbnail URLs by checking for
   // existing thumbnails in the database that contain a URL matching the prefix
   // of the requested URL.
   const bool capture_thumbnails_;
 
   base::WeakPtrFactory<ThumbnailSource> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThumbnailSource);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_THUMBNAIL_SOURCE_H_