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

chrome/browser/search/thumbnail_source.cc

 // 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.
 
 #include "chrome/browser/search/thumbnail_source.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/suggestions/image_fetcher_impl.h"
 #include "chrome/browser/thumbnails/thumbnail_service.h"
 #include "chrome/browser/thumbnails/thumbnail_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/suggestions/image_encoder.h"
 #include "net/url_request/url_request.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 // The delimiter between the first url and the fallback url passed to
 // StartDataRequest.
 const char kUrlDelimiter[] = "?fb=";
 
 // Set ThumbnailService now as Profile isn't thread safe.
 ThumbnailSource::ThumbnailSource(Profile* profile, bool capture_thumbnails)
     : thumbnail_service_(ThumbnailServiceFactory::GetForProfile(profile)),
       capture_thumbnails_(capture_thumbnails),
@@ skipping 43 matching lines @@
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 base::MessageLoop* ThumbnailSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // TopSites can be accessed from the IO thread. Otherwise, the URLs should be
   // accessed on the UI thread.
   return thumbnail_service_.get()
-             ? NULL
+             ? nullptr
              : content::URLDataSource::MessageLoopForRequestPath(path);
 }
 
 bool ThumbnailSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
   if (request->url().SchemeIs(chrome::kChromeSearchScheme))
     return InstantIOContext::ShouldServiceRequest(request);
   return URLDataSource::ShouldServiceRequest(request);
 }
 
@@ skipping 10 matching lines @@
     fallback_thumbnail_url_str = path.substr(pos + strlen(kUrlDelimiter));
   }
 
   *page_url = GURL(page_url_str);
   *fallback_thumbnail_url = GURL(fallback_thumbnail_url_str);
 }
 
 void ThumbnailSource::SendFetchedUrlImage(
     const content::URLDataSource::GotDataCallback& callback,
     const GURL& url,
-    const SkBitmap* bitmap) {
-  if (!bitmap) {
+    const gfx::Image& image) {
+  // In case the image could not be retrieved an empty image is returned.
+  if (image.IsEmpty()) {
     callback.Run(default_thumbnail_.get());
     return;
   }
 
+  const SkBitmap* bitmap = image.ToSkBitmap();
   scoped_refptr<base::RefCountedBytes> encoded_data(
       new base::RefCountedBytes());
   if (!suggestions::EncodeSkBitmapToJPEG(*bitmap, &encoded_data->data())) {
     callback.Run(default_thumbnail_.get());
     return;
   }
 
   callback.Run(encoded_data.get());
 }