Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: components/history/core/browser/thumbnail_database_unittest.cc

Issue 2828173002: [Refactor] Simplify HistoryBackend::UpdateFaviconMappingsAndFetchImpl() signature (Closed)
Patch Set: Merge branch 'master' into icon_type0 Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/history/core/browser/thumbnail_database_unittest.cc
diff --git a/components/history/core/browser/thumbnail_database_unittest.cc b/components/history/core/browser/thumbnail_database_unittest.cc
index b20bbaf3f78998b31d4eba3fa3a6b3ae2d96df74..cd1c83fafcc3d9e84992705ca98c55521be199e4 100644
--- a/components/history/core/browser/thumbnail_database_unittest.cc
+++ b/components/history/core/browser/thumbnail_database_unittest.cc
@@ -369,8 +369,8 @@ TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrls) {
kBlob2));
// The ones not retained should be missing.
- EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl2, false, NULL));
- EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl4, false, NULL));
+ EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl2, nullptr));
+ EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl4, nullptr));
// Schema should be the same.
EXPECT_EQ(original_schema, db.db_.GetSchema());
@@ -391,8 +391,8 @@ TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrlsExpiresRetainedFavicons) {
EXPECT_TRUE(db.RetainDataForPageUrls(std::vector<GURL>(1u, kPageUrl1)));
- favicon_base::FaviconID new_favicon_id = db.GetFaviconIDForFaviconURL(
- kIconUrl1, favicon_base::FAVICON, nullptr);
+ favicon_base::FaviconID new_favicon_id =
+ db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::FAVICON);
ASSERT_NE(0, new_favicon_id);
std::vector<FaviconBitmap> new_favicon_bitmaps;
db.GetFaviconBitmaps(new_favicon_id, &new_favicon_bitmaps);

Powered by Google App Engine
This is Rietveld 408576698