Index: components/favicon/core/large_icon_service_unittest.cc |
diff --git a/components/favicon/core/large_icon_service_unittest.cc b/components/favicon/core/large_icon_service_unittest.cc |
index 67fcdd7a07f5616aead5bd26fd49884e164189ce..122f200a5d171b31726b081a601bcdc1339e7ba4 100644 |
--- a/components/favicon/core/large_icon_service_unittest.cc |
+++ b/components/favicon/core/large_icon_service_unittest.cc |
@@ -108,10 +108,11 @@ class MockImageFetcher : public image_fetcher::ImageFetcher { |
MOCK_METHOD1(SetImageDownloadLimit, |
void(base::Optional<int64_t> max_download_bytes)); |
MOCK_METHOD1(SetDesiredImageFrameSize, void(const gfx::Size& size)); |
- MOCK_METHOD3(StartOrQueueNetworkRequest, |
+ MOCK_METHOD4(StartOrQueueNetworkRequest, |
void(const std::string&, |
const GURL&, |
- const ImageFetcherCallback&)); |
+ const ImageFetcherCallback&, |
+ const net::NetworkTrafficAnnotationTag&)); |
MOCK_METHOD0(GetImageDecoder, image_fetcher::ImageDecoder*()); |
}; |
@@ -147,7 +148,7 @@ TEST_F(LargeIconServiceTest, ShouldGetFromGoogleServer) { |
base::MockCallback<base::Callback<void(bool success)>> callback; |
EXPECT_CALL(*mock_image_fetcher_, |
- StartOrQueueNetworkRequest(_, kExpectedServerUrl, _)) |
+ StartOrQueueNetworkRequest(_, kExpectedServerUrl, _, _)) |
.WillOnce(PostFetchReply(gfx::Image::CreateFrom1xBitmap( |
CreateTestSkBitmap(64, 64, kTestColor)))); |
EXPECT_CALL(mock_favicon_service_, |
@@ -177,7 +178,7 @@ TEST_F(LargeIconServiceTest, ShouldGetFromGoogleServerWithCustomUrl) { |
base::MockCallback<base::Callback<void(bool success)>> callback; |
EXPECT_CALL(*mock_image_fetcher_, |
- StartOrQueueNetworkRequest(_, kExpectedServerUrl, _)) |
+ StartOrQueueNetworkRequest(_, kExpectedServerUrl, _, _)) |
.WillOnce(PostFetchReply(gfx::Image::CreateFrom1xBitmap( |
CreateTestSkBitmap(64, 64, kTestColor)))); |
EXPECT_CALL(mock_favicon_service_, |
@@ -203,7 +204,7 @@ TEST_F(LargeIconServiceTest, ShouldGetFromGoogleServerWithOriginalUrl) { |
image_fetcher::RequestMetadata expected_metadata; |
expected_metadata.content_location_header = kExpectedOriginalUrl.spec(); |
EXPECT_CALL(*mock_image_fetcher_, |
- StartOrQueueNetworkRequest(_, kExpectedServerUrl, _)) |
+ StartOrQueueNetworkRequest(_, kExpectedServerUrl, _, _)) |
.WillOnce(PostFetchReplyWithMetadata( |
gfx::Image::CreateFrom1xBitmap( |
CreateTestSkBitmap(64, 64, kTestColor)), |
@@ -230,7 +231,7 @@ TEST_F(LargeIconServiceTest, ShouldTrimQueryParametersForGoogleServer) { |
"&url=http://www.example.com/"); |
EXPECT_CALL(*mock_image_fetcher_, |
- StartOrQueueNetworkRequest(_, kExpectedServerUrl, _)) |
+ StartOrQueueNetworkRequest(_, kExpectedServerUrl, _, _)) |
.WillOnce(PostFetchReply(gfx::Image::CreateFrom1xBitmap( |
CreateTestSkBitmap(64, 64, kTestColor)))); |
// Verify that the non-trimmed page URL is used when writing to the database. |
@@ -248,7 +249,7 @@ TEST_F(LargeIconServiceTest, ShouldTrimQueryParametersForGoogleServer) { |
TEST_F(LargeIconServiceTest, ShouldNotQueryGoogleServerIfInvalidScheme) { |
const GURL kDummyFtpUrl("ftp://www.example.com"); |
- EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _)) |
+ EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _, _)) |
.Times(0); |
base::MockCallback<base::Callback<void(bool success)>> callback; |
@@ -276,7 +277,7 @@ TEST_F(LargeIconServiceTest, ShouldReportUnavailableIfFetchFromServerFails) { |
base::MockCallback<base::Callback<void(bool success)>> callback; |
EXPECT_CALL(*mock_image_fetcher_, |
- StartOrQueueNetworkRequest(_, kExpectedServerUrl, _)) |
+ StartOrQueueNetworkRequest(_, kExpectedServerUrl, _, _)) |
.WillOnce(PostFetchReply(gfx::Image())); |
EXPECT_CALL(mock_favicon_service_, |
UnableToDownloadFavicon(kExpectedServerUrl)); |
@@ -302,7 +303,7 @@ TEST_F(LargeIconServiceTest, ShouldNotGetFromGoogleServerIfUnavailable) { |
.WillByDefault(Return(true)); |
EXPECT_CALL(mock_favicon_service_, UnableToDownloadFavicon(_)).Times(0); |
- EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _)) |
+ EXPECT_CALL(*mock_image_fetcher_, StartOrQueueNetworkRequest(_, _, _, _)) |
.Times(0); |
EXPECT_CALL(mock_favicon_service_, SetLastResortFavicons(_, _, _, _, _)) |
.Times(0); |