Create the IOSImageDataFetcher

components/image_fetcher/image_data_fetcher_unittest.cc

Index: components/image_fetcher/image_data_fetcher_unittest.cc
diff --git a/components/image_fetcher/image_data_fetcher_unittest.cc b/components/image_fetcher/image_data_fetcher_unittest.cc
index 949e7d640a0d7a3a7babd61c47f7e02b750a7177..f4117ebcbfa1d4ff829deb1d8bb9dd4ddaab1a7f 100644
--- a/components/image_fetcher/image_data_fetcher_unittest.cc
+++ b/components/image_fetcher/image_data_fetcher_unittest.cc
@@ -33,11 +33,14 @@ class ImageDataFetcherTest : public testing::Test {
         image_data_fetcher_(test_request_context_getter_.get()) {}
   ~ImageDataFetcherTest() override {}
 
-  MOCK_METHOD1(OnImageDataFetched, void(const std::string&));
+  MOCK_METHOD2(OnImageDataFetched,
+               void(const std::string&, const net::URLFetcher* source));
 
-  MOCK_METHOD1(OnImageDataFetchedFailedRequest, void(const std::string&));
+  MOCK_METHOD2(OnImageDataFetchedFailedRequest,
+               void(const std::string&, const net::URLFetcher* source));
 
-  MOCK_METHOD1(OnImageDataFetchedMultipleRequests, void(const std::string&));
+  MOCK_METHOD2(OnImageDataFetchedMultipleRequests,
+               void(const std::string&, const net::URLFetcher* source));
 
  protected:
   base::MessageLoop message_loop_;
@@ -57,7 +60,6 @@ TEST_F(ImageDataFetcherTest, FetchImageData) {
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetched,
                  base::Unretained(this)));
-  EXPECT_CALL(*this, OnImageDataFetched(std::string(kURLResponseData)));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
@@ -66,6 +68,9 @@ TEST_F(ImageDataFetcherTest, FetchImageData) {
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, net::OK));
   test_url_fetcher->SetResponseString(kURLResponseData);
 
+  EXPECT_CALL(*this, OnImageDataFetched(std::string(kURLResponseData),
+                                        test_url_fetcher));
+
   // Call the URLFetcher delegate to continue the test.
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 }
@@ -75,7 +80,6 @@ TEST_F(ImageDataFetcherTest, FetchImageData_FailedRequest) {
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetchedFailedRequest,
                  base::Unretained(this)));
-  EXPECT_CALL(*this, OnImageDataFetchedFailedRequest(std::string()));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
@@ -84,6 +88,9 @@ TEST_F(ImageDataFetcherTest, FetchImageData_FailedRequest) {
       net::URLRequestStatus(net::URLRequestStatus::FAILED,
                             net::ERR_INVALID_URL));
 
+  EXPECT_CALL(*this,
+              OnImageDataFetchedFailedRequest(std::string(), test_url_fetcher));
+
   // Call the URLFetcher delegate to continue the test.
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
 }
@@ -92,7 +99,8 @@ TEST_F(ImageDataFetcherTest, FetchImageData_MultipleRequests) {
   ImageDataFetcher::ImageDataFetcherCallback callback =
       base::Bind(&ImageDataFetcherTest::OnImageDataFetchedMultipleRequests,
                  base::Unretained(this));
-  EXPECT_CALL(*this, OnImageDataFetchedMultipleRequests(testing::_)).Times(2);
+  EXPECT_CALL(*this, OnImageDataFetchedMultipleRequests(testing::_, testing::_))
+      .Times(2);
 
   image_data_fetcher_.FetchImageData(GURL(kImageURL), callback);
   image_data_fetcher_.FetchImageData(GURL(kImageURL), callback);