[Thumbnails DB] Add functionality to clear unused on-demand favicons.

components/history/core/browser/expire_history_backend_unittest.cc

Index: components/history/core/browser/expire_history_backend_unittest.cc
diff --git a/components/history/core/browser/expire_history_backend_unittest.cc b/components/history/core/browser/expire_history_backend_unittest.cc
index 0a554fa88955483b2e1696d453d8d03a05a44636..8e9337faa2b5b8ac82e382ee2025183a9db5a6d1 100644
--- a/components/history/core/browser/expire_history_backend_unittest.cc
+++ b/components/history/core/browser/expire_history_backend_unittest.cc
@@ -20,6 +20,7 @@
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "components/history/core/browser/history_backend_client.h"
 #include "components/history/core/browser/history_backend_notifier.h"
@@ -891,6 +892,70 @@ TEST_F(ExpireHistoryTest, ExpiringVisitsReader) {
   EXPECT_EQ(1U, visits.size());
 }
 

[pkotwicz, 2017/07/07 00:42:38]

Can you please add comments for these test cases

[jkrcal, 2017/07/07 08:45:16]

Done.

+TEST_F(ExpireHistoryTest, ClearOldOnDemandFaviconsDoesDeleteUnstarred) {
+  base::test::ScopedFeatureList feature_list;
+  feature_list.InitAndEnableFeature(internal::kClearOldOnDemandFavicons);
+
+  const unsigned char kBlob1[] =
+      "12346102356120394751634516591348710478123649165419234519234512349134";
+  std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+  scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+  // Icon: old and not bookmarked case.
+  GURL url("http://google.com");
+  favicon_base::FaviconID icon =
+      thumb_db_->AddFavicon(url, favicon_base::FAVICON);
+  ASSERT_NE(0, icon);
+  FaviconBitmapID bitmap = thumb_db_->AddFaviconBitmap(
+      icon, favicon, FaviconBitmapType::ON_DEMAND,
+      base::Time::Now() - base::TimeDelta::FromDays(100), gfx::Size());

[pkotwicz, 2017/07/07 00:42:38]

Can you please use the 6 argument version of ThumbnailDatabase::AddFavicon() ?

[jkrcal, 2017/07/07 08:45:16]

Ah, good point.

I also expanded the second test a bit to check that "at least one starred"
suffices for not deleting.

+  ASSERT_NE(0, bitmap);
+  ASSERT_NE(0, thumb_db_->AddIconMapping(url, icon));
+
+  expirer_.ClearOldOnDemandFavicons(base::Time::Now() -
+                                    base::TimeDelta::FromDays(90));
+
+  // The icon gets deleted.
+  EXPECT_FALSE(thumb_db_->GetIconMappingsForPageURL(url, nullptr));
+  EXPECT_FALSE(thumb_db_->GetFaviconHeader(icon, nullptr, nullptr));
+  EXPECT_FALSE(thumb_db_->GetFaviconBitmaps(icon, nullptr));
+}
+
+TEST_F(ExpireHistoryTest, ClearOldOnDemandFaviconsDoesNotDeleteStarred) {
+  base::test::ScopedFeatureList feature_list;
+  feature_list.InitAndEnableFeature(internal::kClearOldOnDemandFavicons);
+
+  const unsigned char kBlob1[] =
+      "12346102356120394751634516591348710478123649165419234519234512349134";
+  std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
+  scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+  // Icon: old but bookmarked case.
+  GURL url("http://google.com");
+  StarURL(url);
+  favicon_base::FaviconID icon =
+      thumb_db_->AddFavicon(url, favicon_base::FAVICON);
+  ASSERT_NE(0, icon);
+  FaviconBitmapID bitmap = thumb_db_->AddFaviconBitmap(
+      icon, favicon, FaviconBitmapType::ON_DEMAND,
+      base::Time::Now() - base::TimeDelta::FromDays(100), gfx::Size());
+  ASSERT_NE(0, bitmap);
+  ASSERT_NE(0, thumb_db_->AddIconMapping(url, icon));
+
+  expirer_.ClearOldOnDemandFavicons(base::Time::Now() -
+                                    base::TimeDelta::FromDays(90));
+
+  // Nothing gets deleted.
+  EXPECT_TRUE(thumb_db_->GetFaviconHeader(icon, nullptr, nullptr));
+  std::vector<FaviconBitmap> favicon_bitmaps;
+  EXPECT_TRUE(thumb_db_->GetFaviconBitmaps(icon, &favicon_bitmaps));
+  EXPECT_EQ(1u, favicon_bitmaps.size());
+  std::vector<IconMapping> icon_mapping;
+  EXPECT_TRUE(thumb_db_->GetIconMappingsForPageURL(url, &icon_mapping));
+  EXPECT_EQ(1u, icon_mapping.size());
+  EXPECT_EQ(icon, icon_mapping[0].icon_id);
+}
+
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //