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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/history/core/browser/history_backend_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
« components/favicon/core/favicon_service.h ('K') | « components/history/core/browser/history_backend.cc ('k') | components/history/core/browser/history_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/history/core/browser/history_backend_unittest.cc
diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc
index 164552909095460d638c42b9cbc84526992ab192..a36d93961584716fd99709c1adb5b38d7f82c8b4 100644
--- a/components/history/core/browser/history_backend_unittest.cc
+++ b/components/history/core/browser/history_backend_unittest.cc
@@ -669,8 +669,8 @@ TEST_F(HistoryBackendTest, DeleteAll) {
// We should have a favicon and favicon bitmaps for the first URL only. We
// look them up by favicon URL since the IDs may have changed.
favicon_base::FaviconID out_favicon1 =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- favicon_url1, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(favicon_url1,
+ favicon_base::FAVICON);
EXPECT_TRUE(out_favicon1);
std::vector<FaviconBitmap> favicon_bitmaps;
@@ -695,8 +695,8 @@ TEST_F(HistoryBackendTest, DeleteAll) {
EXPECT_EQ(kLargeSize, favicon_bitmap2.pixel_size);
favicon_base::FaviconID out_favicon2 =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- favicon_url2, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(favicon_url2,
+ favicon_base::FAVICON);
EXPECT_FALSE(out_favicon2) << "Favicon not deleted";
// The remaining URL should still reference the same favicon, even if its
@@ -868,9 +868,8 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
backend_->db_->GetVisitsForURL(row2_id, &visits);
EXPECT_EQ(0U, visits.size());
// The favicon should still be valid.
- EXPECT_EQ(favicon2,
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- favicon_url2, favicon_base::FAVICON, NULL));
+ EXPECT_EQ(favicon2, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
+ favicon_url2, favicon_base::FAVICON));
// Unstar row2.
history_client_.DelBookmark(row2.url());
@@ -884,9 +883,8 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
// The URL should still not exist.
EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), NULL));
// And the favicon should be deleted.
- EXPECT_EQ(0,
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- favicon_url2, favicon_base::FAVICON, NULL));
+ EXPECT_EQ(0, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
+ favicon_url2, favicon_base::FAVICON));
// Unstar row 1.
history_client_.DelBookmark(row1.url());
@@ -906,9 +904,8 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
EXPECT_EQ(1U, visits.size());
// The favicon should still be valid.
- EXPECT_EQ(favicon1,
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- favicon_url1, favicon_base::FAVICON, NULL));
+ EXPECT_EQ(favicon1, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
+ favicon_url1, favicon_base::FAVICON));
}
// Tests a handful of assertions for a navigation with a type of
@@ -1957,8 +1954,8 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {
backend_->SetFavicons(page_url, favicon_base::FAVICON, icon_url, bitmaps);
favicon_base::FaviconID original_favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url,
+ favicon_base::FAVICON);
EXPECT_NE(0, original_favicon_id);
FaviconBitmap original_favicon_bitmap;
EXPECT_TRUE(
@@ -1972,8 +1969,8 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {
backend_->SetFavicons(page_url, favicon_base::FAVICON, icon_url, bitmaps);
favicon_base::FaviconID updated_favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url,
+ favicon_base::FAVICON);
EXPECT_NE(0, updated_favicon_id);
FaviconBitmap updated_favicon_bitmap;
EXPECT_TRUE(
@@ -1987,7 +1984,7 @@ TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {
backend_->SetFavicons(page_url, favicon_base::FAVICON, icon_url, bitmaps);
updated_favicon_id = backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ icon_url, favicon_base::FAVICON);
EXPECT_NE(0, updated_favicon_id);
EXPECT_TRUE(
GetOnlyFaviconBitmap(updated_favicon_id, &updated_favicon_bitmap));
@@ -2014,15 +2011,10 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {
backend_->SetFavicons(page_url1, favicon_base::FAVICON, icon_url, bitmaps);
- std::vector<GURL> icon_urls;
- icon_urls.push_back(icon_url);
-
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(page_url2,
- icon_urls,
- favicon_base::FAVICON,
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
+ backend_->UpdateFaviconMappingsAndFetch(
+ page_url2, icon_url, favicon_base::FAVICON, GetEdgeSizesSmallAndLarge(),
+ &bitmap_results);
// Check that the same FaviconID is mapped to both page URLs.
std::vector<IconMapping> icon_mappings;
@@ -2085,8 +2077,8 @@ TEST_F(HistoryBackendTest, SetLastResortFaviconsForEmptyDB) {
icon_url, bitmaps));
favicon_base::FaviconID favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url,
+ favicon_base::FAVICON);
EXPECT_NE(0, favicon_id);
FaviconBitmap favicon_bitmap;
@@ -2109,8 +2101,8 @@ TEST_F(HistoryBackendTest, SetLastResortFaviconsForPageInDB) {
// Add bitmap to the database.
backend_->SetFavicons(page_url, favicon_base::FAVICON, icon_url1, bitmaps);
favicon_base::FaviconID original_favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url1, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url1,
+ favicon_base::FAVICON);
ASSERT_NE(0, original_favicon_id);
// Call SetLastResortFavicons() with a different icon URL and bitmap data.
@@ -2118,7 +2110,7 @@ TEST_F(HistoryBackendTest, SetLastResortFaviconsForPageInDB) {
EXPECT_FALSE(backend_->SetLastResortFavicons(page_url, favicon_base::FAVICON,
icon_url2, bitmaps));
EXPECT_EQ(0, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url2, favicon_base::FAVICON, NULL));
+ icon_url2, favicon_base::FAVICON));
FaviconBitmap favicon_bitmap;
ASSERT_TRUE(GetOnlyFaviconBitmap(original_favicon_id, &favicon_bitmap));
@@ -2140,8 +2132,8 @@ TEST_F(HistoryBackendTest, SetLastResortFaviconsForIconInDB) {
// Add bitmap to the database.
backend_->SetFavicons(old_page_url, favicon_base::FAVICON, icon_url, bitmaps);
favicon_base::FaviconID original_favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url,
+ favicon_base::FAVICON);
ASSERT_NE(0, original_favicon_id);
// Call SetLastResortFavicons() with a different bitmap.
@@ -2151,7 +2143,7 @@ TEST_F(HistoryBackendTest, SetLastResortFaviconsForIconInDB) {
EXPECT_EQ(original_favicon_id,
backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL));
+ icon_url, favicon_base::FAVICON));
FaviconBitmap favicon_bitmap;
ASSERT_TRUE(GetOnlyFaviconBitmap(original_favicon_id, &favicon_bitmap));
@@ -2359,8 +2351,8 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {
page_url2, icon_url, favicon_base::FAVICON, bitmap_data, kSmallSize);
favicon_base::FaviconID favicon_id =
- backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url,
+ favicon_base::FAVICON);
EXPECT_NE(0, favicon_id);
EXPECT_TRUE(GetOnlyFaviconBitmap(favicon_id, &favicon_bitmap));
@@ -2377,7 +2369,7 @@ TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {
page_url3, icon_url, favicon_base::FAVICON, bitmap_data, kSmallSize);
favicon_id = backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
- icon_url, favicon_base::FAVICON, NULL);
+ icon_url, favicon_base::FAVICON);
EXPECT_NE(0, favicon_id);
EXPECT_TRUE(GetOnlyFaviconBitmap(favicon_id, &favicon_bitmap));
@@ -2585,11 +2577,9 @@ TEST_F(HistoryBackendTest, FaviconChangedNotificationIconMappingChanged) {
// Map |page_url3| to |icon_url1| so that the test does not delete the
// favicon at |icon_url1|.
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(page_url3,
- std::vector<GURL>(1u, icon_url1),
- favicon_base::FAVICON,
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
+ backend_->UpdateFaviconMappingsAndFetch(
+ page_url3, icon_url1, favicon_base::FAVICON,
+ GetEdgeSizesSmallAndLarge(), &bitmap_results);
ClearBroadcastedNotifications();
}
@@ -2612,11 +2602,8 @@ TEST_F(HistoryBackendTest, FaviconChangedNotificationIconMappingChanged) {
{
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
backend_->UpdateFaviconMappingsAndFetch(
- page_url1,
- std::vector<GURL>(1u, icon_url2),
- favicon_base::FAVICON,
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
+ page_url1, icon_url2, favicon_base::FAVICON,
+ GetEdgeSizesSmallAndLarge(), &bitmap_results);
ASSERT_EQ(1u, favicon_changed_notifications_page_urls().size());
EXPECT_EQ(page_url1, favicon_changed_notifications_page_urls()[0]);
EXPECT_EQ(0u, favicon_changed_notifications_icon_urls().size());
@@ -2646,11 +2633,9 @@ TEST_F(HistoryBackendTest,
// Map |page_url3| to |icon_url1| so that the test does not delete the
// favicon at |icon_url1|.
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(page_url3,
- std::vector<GURL>(1u, icon_url1),
- favicon_base::FAVICON,
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
+ backend_->UpdateFaviconMappingsAndFetch(
+ page_url3, icon_url1, favicon_base::FAVICON,
+ GetEdgeSizesSmallAndLarge(), &bitmap_results);
ClearBroadcastedNotifications();
}
@@ -2795,11 +2780,9 @@ TEST_F(HistoryBackendTest, NoFaviconChangedNotifications) {
// UpdateFaviconMappingsAndFetch()
{
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(page_url,
- std::vector<GURL>(1u, icon_url),
- favicon_base::FAVICON,
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
+ backend_->UpdateFaviconMappingsAndFetch(
+ page_url, icon_url, favicon_base::FAVICON, GetEdgeSizesSmallAndLarge(),
+ &bitmap_results);
}
EXPECT_EQ(0u, favicon_changed_notifications_page_urls().size());
@@ -2904,60 +2887,6 @@ TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFaviconEvenItSmaller) {
EXPECT_EQ(favicon_base::FAVICON, result.icon_type);
}
-// Test UpdateFaviconMappingsAndFetch() when multiple icon types are passed in.
-TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {
- GURL page_url1("http://www.google.com");
- GURL page_url2("http://news.google.com");
- GURL page_url3("http://mail.google.com");
- GURL icon_urla("http://www.google.com/favicon1.ico");
- GURL icon_urlb("http://www.google.com/favicon2.ico");
- std::vector<SkBitmap> bitmaps;
- bitmaps.push_back(CreateBitmap(SK_ColorBLUE, kSmallEdgeSize));
-
- // |page_url1| is mapped to |icon_urla| which if of type TOUCH_ICON.
- backend_->SetFavicons(
- page_url1, favicon_base::TOUCH_ICON, icon_urla, bitmaps);
-
- // |page_url2| is mapped to |icon_urlb| which is of type
- // TOUCH_PRECOMPOSED_ICON.
- backend_->SetFavicons(
- page_url2, favicon_base::TOUCH_PRECOMPOSED_ICON, icon_urlb, bitmaps);
-
- std::vector<GURL> icon_urls;
- icon_urls.push_back(icon_urla);
- icon_urls.push_back(icon_urlb);
-
- std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(
- page_url3,
- icon_urls,
- (favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON),
- GetEdgeSizesSmallAndLarge(),
- &bitmap_results);
-
- // |page_url1| and |page_url2| should still be mapped to the same icon URLs.
- std::vector<IconMapping> icon_mappings;
- EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url1,
- &icon_mappings));
- EXPECT_EQ(1u, icon_mappings.size());
- EXPECT_EQ(icon_urla, icon_mappings[0].icon_url);
- EXPECT_EQ(favicon_base::TOUCH_ICON, icon_mappings[0].icon_type);
-
- icon_mappings.clear();
- EXPECT_TRUE(GetSortedIconMappingsForPageURL(page_url2, &icon_mappings));
- EXPECT_EQ(1u, icon_mappings.size());
- EXPECT_EQ(icon_urlb, icon_mappings[0].icon_url);
- EXPECT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON, icon_mappings[0].icon_type);
-
- // |page_url3| should be mapped only to |icon_urlb| as TOUCH_PRECOMPOSED_ICON
- // is the largest IconType.
- icon_mappings.clear();
- EXPECT_TRUE(GetSortedIconMappingsForPageURL(page_url3, &icon_mappings));
- EXPECT_EQ(1u, icon_mappings.size());
- EXPECT_EQ(icon_urlb, icon_mappings[0].icon_url);
- EXPECT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON, icon_mappings[0].icon_type);
-}
-
// Test the results of GetFaviconsFromDB() when there are no found favicons.
TEST_F(HistoryBackendTest, GetFaviconsFromDBEmpty) {
const GURL page_url("http://www.google.com/");
@@ -3099,9 +3028,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoDB) {
std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
- backend_->UpdateFaviconMappingsAndFetch(GURL(),
- std::vector<GURL>(),
- favicon_base::FAVICON,
+ backend_->UpdateFaviconMappingsAndFetch(GURL(), GURL(), favicon_base::FAVICON,
GetEdgeSizesSmallAndLarge(),
&bitmap_results);
« components/favicon/core/favicon_service.h ('K') | « components/history/core/browser/history_backend.cc ('k') | components/history/core/browser/history_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698