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

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

Issue 2903573002: [Thumbnails DB] Add functionality to clear unused on-demand favicons. (Closed)
Patch Set: Implementation variants + unit-tests Created 3 years, 6 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 4dbd0c6f64e00039c9c134db30ee9858dd1d6d3f..62d7968b071a4190ac0f7c1d477b6178b51cf549 100644
--- a/components/history/core/browser/thumbnail_database_unittest.cc
+++ b/components/history/core/browser/thumbnail_database_unittest.cc
@@ -12,16 +12,22 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted_memory.h"
#include "base/path_service.h"
+#include "base/strings/stringprintf.h"
+#include "components/history/core/browser/history_backend_client.h"
#include "components/history/core/browser/thumbnail_database.h"
#include "components/history/core/test/database_test_utils.h"
#include "sql/connection.h"
#include "sql/recovery.h"
#include "sql/test/scoped_error_expecter.h"
#include "sql/test/test_helpers.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/sqlite/sqlite3.h"
#include "url/gurl.h"
+using testing::StrictMock;
+using testing::Return;
+
namespace history {
namespace {
@@ -169,6 +175,26 @@ void SortMappingsByIconUrl(std::vector<IconMapping>* mappings) {
std::sort(mappings->begin(), mappings->end(), &CompareIconMappingIconUrl);
}
+class MockHistoryBackendClient : public HistoryBackendClient {
+ public:
+ // MOCK_METHOD0(~HistoryBackendClient, void());
+ MOCK_METHOD1(IsBookmarked, bool(const GURL& url));
+ MOCK_METHOD1(GetBookmarks, void(std::vector<URLAndTitle>* bookmarks));
+ MOCK_METHOD0(ShouldReportDatabaseError, bool());
+ MOCK_METHOD1(IsWebSafe, bool(const GURL& url));
+
+#if defined(OS_ANDROID)
+ MOCK_METHOD4(OnHistoryBackendInitialized,
+ void(HistoryBackend* history_backend,
+ HistoryDatabase* history_database,
+ ThumbnailDatabase* thumbnail_database,
+ const base::FilePath& history_dir));
+ MOCK_METHOD2(OnHistoryBackendDestroyed,
+ void(HistoryBackend* history_backend,
+ const base::FilePath& history_dir));
+#endif // defined(OS_ANDROID)
+};
+
} // namespace
class ThumbnailDatabaseTest : public testing::Test {
@@ -367,6 +393,278 @@ TEST_F(ThumbnailDatabaseTest, TouchDoesNotUpdateStandardFavicons) {
EXPECT_EQ(base::Time(), last_requested); // No update.
}
+const int kOnDemandIcons = 20;
+const int kPagesPerIcon = 10;
+
+const int kRepetitions = 50;
+
+const int kOnVisitIcons = kOnDemandIcons * 10;
+
+void FillInOnDemandIcons(ThumbnailDatabase* db,
+ MockHistoryBackendClient* mock_client,
+ const base::Time start) {
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ for (int x = 0; x < kOnDemandIcons; ++x) {
+ // Icon: old unused case (not bookmarked).
+ GURL icon_url(base::StringPrintf("http://google.com/%d/favicon.png", x));
+ favicon_base::FaviconID icon =
+ db->AddFavicon(icon_url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db->AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_DEMAND, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+
+ for (int y = 0; y < kPagesPerIcon; ++y) {
+ GURL page_url(base::StringPrintf("http://google.com/%d/%d", x, y));
+ ASSERT_NE(0, db->AddIconMapping(page_url, icon));
+ EXPECT_CALL(*mock_client, IsBookmarked(page_url)).WillOnce(Return(false));
+ }
+ }
+}
+
+void FillInOnVisitIcons(ThumbnailDatabase* db,
+ MockHistoryBackendClient* mock_client,
+ const base::Time start) {
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ for (int x = 0; x < kOnVisitIcons; ++x) {
+ // Icon: old unused case (not bookmarked).
+ GURL icon_url(base::StringPrintf("http://google.com/%d/favicon.png", x));
+ favicon_base::FaviconID icon =
+ db->AddFavicon(icon_url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db->AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_VISIT, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+
+ for (int y = 0; y < kPagesPerIcon; ++y) {
+ GURL page_url(base::StringPrintf("http://google.com/%d/%d", x, y));
+ ASSERT_NE(0, db->AddIconMapping(page_url, icon));
+ }
+ }
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsPerformanceVanilla) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+
+ FillInOnVisitIcons(&db, &mock_client, start);
+
+ base::TimeDelta time_sum;
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+
+ for (int i = 0; i < kRepetitions; ++i) {
+ FillInOnDemandIcons(&db, &mock_client, start);
+
+ base::Time start_test = base::Time::Now();
+ db.ClearOldOnDemandFavicons(delete_older_than);
+ time_sum += (base::Time::Now() - start_test);
+ DLOG(WARNING) << "Take " << (i + 1) << ": "
+ << (base::Time::Now() - start_test);
+ }
+
+ DLOG(WARNING) << "Average: " << (time_sum / kRepetitions);
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsPerformanceOneByOne) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+
+ FillInOnVisitIcons(&db, &mock_client, start);
+
+ base::TimeDelta time_sum;
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+
+ for (int i = 0; i < kRepetitions; ++i) {
+ FillInOnDemandIcons(&db, &mock_client, start);
+
+ base::Time start_test = base::Time::Now();
+ db.ClearOldOnDemandFaviconsOneByOne(delete_older_than);
+ time_sum += (base::Time::Now() - start_test);
+ DLOG(WARNING) << "Take " << (i + 1) << ": "
+ << (base::Time::Now() - start_test);
+ }
+
+ DLOG(WARNING) << "Average: " << (time_sum / kRepetitions);
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsPerformanceNoJoin) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+
+ FillInOnVisitIcons(&db, &mock_client, start);
+
+ base::TimeDelta time_sum;
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+
+ for (int i = 0; i < kRepetitions; ++i) {
+ FillInOnDemandIcons(&db, &mock_client, start);
+
+ base::Time start_test = base::Time::Now();
+ db.ClearOldOnDemandFaviconsNoJoin(delete_older_than);
+ time_sum += (base::Time::Now() - start_test);
+ DLOG(WARNING) << "Take " << (i + 1) << ": "
+ << (base::Time::Now() - start_test);
+ }
+
+ DLOG(WARNING) << "Average: " << (time_sum / kRepetitions);
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsSuccess) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ // Icon: old unused case (not bookmarked).
+ GURL url("http://google.com");
+ EXPECT_CALL(mock_client, IsBookmarked(url)).WillOnce(Return(false));
+ favicon_base::FaviconID icon = db.AddFavicon(url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db.AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_DEMAND, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+ ASSERT_NE(0, db.AddIconMapping(url, icon));
+
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+ db.ClearOldOnDemandFavicons(delete_older_than);
+
+ // The icon gets deleted.
+ EXPECT_FALSE(db.GetIconMappingsForPageURL(url, nullptr));
+ EXPECT_FALSE(db.GetFaviconHeader(icon, nullptr, nullptr));
+ EXPECT_FALSE(db.GetFaviconBitmaps(icon, nullptr));
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsDoesNotDeleteFreshOne) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ // Icon: freshly used case.
+ GURL url("http://google.com");
+ favicon_base::FaviconID icon = db.AddFavicon(url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db.AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_DEMAND, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+ ASSERT_NE(0, db.AddIconMapping(url, icon));
+
+ // Touch the icon 3 weeks later.
+ base::Time now = start + base::TimeDelta::FromDays(21);
+ EXPECT_TRUE(db.TouchOnDemandFavicon(url, now));
+
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+ db.ClearOldOnDemandFavicons(delete_older_than);
+
+ // Nothing gets deleted.
+ EXPECT_TRUE(db.GetFaviconHeader(icon, nullptr, nullptr));
+ std::vector<FaviconBitmap> favicon_bitmaps;
+ EXPECT_TRUE(db.GetFaviconBitmaps(icon, &favicon_bitmaps));
+ EXPECT_EQ(1u, favicon_bitmaps.size());
+ std::vector<IconMapping> icon_mapping;
+ EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+ EXPECT_EQ(1u, icon_mapping.size());
+ EXPECT_EQ(icon, icon_mapping[0].icon_id);
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsDoesNotDeleteBookmarked) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ // Icon: unused but bookmarked case.
+ GURL url("http://google.com");
+ EXPECT_CALL(mock_client, IsBookmarked(url)).WillOnce(Return(true));
+ favicon_base::FaviconID icon = db.AddFavicon(url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db.AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_DEMAND, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+ ASSERT_NE(0, db.AddIconMapping(url, icon));
+
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+ db.ClearOldOnDemandFavicons(delete_older_than);
+
+ // Nothing gets deleted.
+ EXPECT_TRUE(db.GetFaviconHeader(icon, nullptr, nullptr));
+ std::vector<FaviconBitmap> favicon_bitmaps;
+ EXPECT_TRUE(db.GetFaviconBitmaps(icon, &favicon_bitmaps));
+ EXPECT_EQ(1u, favicon_bitmaps.size());
+ std::vector<IconMapping> icon_mapping;
+ EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+ EXPECT_EQ(1u, icon_mapping.size());
+ EXPECT_EQ(icon, icon_mapping[0].icon_id);
+}
+
+TEST_F(ThumbnailDatabaseTest, ClearOldOnDemandFaviconsDoesNotDeleteStandard) {
+ StrictMock<MockHistoryBackendClient> mock_client;
+ ThumbnailDatabase db(&mock_client);
+ ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+ db.BeginTransaction();
+
+ base::Time start;
+ ASSERT_TRUE(base::Time::FromUTCExploded({2017, 5, 0, 1, 0, 0, 0, 0}, &start));
+ std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+ scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+ // Icon: standard favicon (not on-demand).
+ GURL url("http://google.com");
+ favicon_base::FaviconID icon = db.AddFavicon(url, favicon_base::FAVICON);
+ ASSERT_NE(0, icon);
+ FaviconBitmapID bitmap = db.AddFaviconBitmap(
+ icon, favicon, FaviconBitmapType::ON_VISIT, start, gfx::Size());
+ ASSERT_NE(0, bitmap);
+ ASSERT_NE(0, db.AddIconMapping(url, icon));
+
+ base::Time delete_older_than = start + base::TimeDelta::FromDays(7);
+ db.ClearOldOnDemandFavicons(delete_older_than);
+
+ // Nothing gets deleted.
+ EXPECT_TRUE(db.GetFaviconHeader(icon, nullptr, nullptr));
+ std::vector<FaviconBitmap> favicon_bitmaps;
+ EXPECT_TRUE(db.GetFaviconBitmaps(icon, &favicon_bitmaps));
+ EXPECT_EQ(1u, favicon_bitmaps.size());
+ std::vector<IconMapping> icon_mapping;
+ EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+ EXPECT_EQ(1u, icon_mapping.size());
+ EXPECT_EQ(icon, icon_mapping[0].icon_id);
+}
+
TEST_F(ThumbnailDatabaseTest, DeleteIconMappings) {
ThumbnailDatabase db(NULL);
ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));

Powered by Google App Engine
This is Rietveld 408576698