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

components/suggestions/image_manager_unittest.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 "components/suggestions/image_manager.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/image_fetcher/image_fetcher.h"
 #include "components/image_fetcher/image_fetcher_delegate.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "components/suggestions/image_encoder.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 using image_fetcher::ImageFetcher;
 using image_fetcher::ImageFetcherDelegate;
 
 namespace suggestions {
 
 const char kTestUrl1[] = "http://go.com/";
 const char kTestUrl2[] = "http://goal.com/";
 const char kTestImagePath[] = "files/image_decoding/droids.png";
 const char kInvalidImagePath[] = "files/DOESNOTEXIST";
 
 using leveldb_proto::test::FakeDB;
 
 typedef base::hash_map<std::string, ImageData> EntryMap;
 
 void AddEntry(const ImageData& d, EntryMap* map) { (*map)[d.url()] = d; }
 
 class MockImageFetcher : public ImageFetcher {
  public:
   MockImageFetcher() {}
   virtual ~MockImageFetcher() {}
   MOCK_METHOD3(StartOrQueueNetworkRequest,
                void(const GURL&, const GURL&,
-                    base::Callback<void(const GURL&, const SkBitmap*)>));
+                    base::Callback<void(const GURL&, const gfx::Image&)>));
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
 };
 
 class ImageManagerTest : public testing::Test {
  public:
   ImageManagerTest()
       : mock_image_fetcher_(NULL),
         num_callback_null_called_(0),
         num_callback_valid_called_(0) {}
 
@@ skipping 148 matching lines @@
   image_manager_->GetImageForURL(GURL(kTestUrl1),
                                  base::Bind(&ImageManagerTest::OnImageAvailable,
                                             base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 }  // namespace suggestions