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

chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc

 // 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.
 
 #include "chrome/browser/search/suggestions/image_fetcher_impl.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/image_fetcher/image_fetcher_delegate.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 class SkBitmap;
 
 using image_fetcher::ImageFetcher;
 using image_fetcher::ImageFetcherDelegate;
 
 namespace suggestions {
 
 namespace {
 
 const char kTestUrl[] = "http://go.com/";
 const char kTestImagePath[] = "/image_decoding/droids.png";
 const char kInvalidImagePath[] = "/DOESNOTEXIST";
 
 const base::FilePath::CharType kDocRoot[] =
     FILE_PATH_LITERAL("chrome/test/data");
 
 class TestImageFetcherDelegate : public ImageFetcherDelegate {
  public:
   TestImageFetcherDelegate()
     : num_delegate_valid_called_(0),
       num_delegate_null_called_(0) {}
   ~TestImageFetcherDelegate() override{};
 
   // Perform additional tasks when an image has been fetched.
-  void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override {
-    if (bitmap) {
+  void OnImageFetched(const GURL& url, const gfx::Image& image) override {
+    if (!image.IsEmpty()) {
       num_delegate_valid_called_++;
     } else {
       num_delegate_null_called_++;
     }
   };
 
   int num_delegate_valid_called() { return num_delegate_valid_called_; }
   int num_delegate_null_called() { return num_delegate_null_called_; }
 
  private:
   int num_delegate_valid_called_;
   int num_delegate_null_called_;
 };
 
-}  // end namespace
+} // namespace

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

nitty nit: style guide says two spaces before comment

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

Done.

 
 class ImageFetcherImplBrowserTest : public InProcessBrowserTest {
  protected:
   ImageFetcherImplBrowserTest()
       : num_callback_valid_called_(0), num_callback_null_called_(0) {
     test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot));
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(test_server_.Start());
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }
 
   ImageFetcherImpl* CreateImageFetcher() {
     ImageFetcherImpl* fetcher =
         new ImageFetcherImpl(browser()->profile()->GetRequestContext());
     fetcher->SetImageFetcherDelegate(&delegate_);
     return fetcher;
   }
 
   void OnImageAvailable(base::RunLoop* loop,
                         const GURL& url,
-                        const SkBitmap* bitmap) {
-    if (bitmap) {
+                        const gfx::Image& image) {
+    if (!image.IsEmpty()) {
       num_callback_valid_called_++;
     } else {
       num_callback_null_called_++;
     }
     loop->Quit();
   }
 
   void StartOrQueueNetworkRequestHelper(const GURL& image_url) {
     std::unique_ptr<ImageFetcherImpl> image_fetcher_(CreateImageFetcher());
 
@@ skipping 42 matching lines @@
   GURL invalid_image_url(test_server_.GetURL(kInvalidImagePath).spec());
   StartOrQueueNetworkRequestHelper(invalid_image_url);
 
   EXPECT_EQ(0, num_callback_valid_called_);
   EXPECT_EQ(1, num_callback_null_called_);
   EXPECT_EQ(0, delegate_.num_delegate_valid_called());
   EXPECT_EQ(1, delegate_.num_delegate_null_called());
 }
 
 }  // namespace suggestions