Use IOSImageDataFetcherWrapper for favicon

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..ce02ea9895f479f0dd6c3f6b7c76282908d063a6 100644
--- a/components/image_fetcher/image_data_fetcher_unittest.cc
+++ b/components/image_fetcher/image_data_fetcher_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
+#include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
@@ -33,11 +34,13 @@ 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&, int response_code));
 
-  MOCK_METHOD1(OnImageDataFetchedFailedRequest, void(const std::string&));
+  MOCK_METHOD2(OnImageDataFetchedFailedRequest,
+               void(const std::string&, int response_code));
 
-  MOCK_METHOD1(OnImageDataFetchedMultipleRequests, void(const std::string&));
+  MOCK_METHOD2(OnImageDataFetchedMultipleRequests,
+               void(const std::string&, int response_code));
 
  protected:
   base::MessageLoop message_loop_;
@@ -57,7 +60,8 @@ TEST_F(ImageDataFetcherTest, FetchImageData) {
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetched,
                  base::Unretained(this)));
-  EXPECT_CALL(*this, OnImageDataFetched(std::string(kURLResponseData)));
+  EXPECT_CALL(*this,
+              OnImageDataFetched(std::string(kURLResponseData), net::HTTP_OK));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
@@ -65,6 +69,7 @@ TEST_F(ImageDataFetcherTest, FetchImageData) {
   test_url_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, net::OK));
   test_url_fetcher->SetResponseString(kURLResponseData);
+  test_url_fetcher->set_response_code(net::HTTP_OK);
 
   // Call the URLFetcher delegate to continue the test.
   test_url_fetcher->delegate()->OnURLFetchComplete(test_url_fetcher);
@@ -75,7 +80,9 @@ TEST_F(ImageDataFetcherTest, FetchImageData_FailedRequest) {
       GURL(kImageURL),
       base::Bind(&ImageDataFetcherTest::OnImageDataFetchedFailedRequest,
                  base::Unretained(this)));
-  EXPECT_CALL(*this, OnImageDataFetchedFailedRequest(std::string()));
+  EXPECT_CALL(*this,
+              OnImageDataFetchedFailedRequest(
+                  std::string(), net::URLFetcher::RESPONSE_CODE_INVALID));
 
   // Get and configure the TestURLFetcher.
   net::TestURLFetcher* test_url_fetcher = fetcher_factory_.GetFetcherByID(0);
@@ -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);