Set site engagement timestamps to privacy-respectful values when history is cleared.

components/history/core/browser/history_backend_unittest.cc

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 a99b360a27662dcb4f3bad37e1d076e06ea2b113..39998525b17bc6873530ea84cd0428655bd35fcd 100644
--- a/components/history/core/browser/history_backend_unittest.cc
+++ b/components/history/core/browser/history_backend_unittest.cc
@@ -3163,33 +3163,49 @@ TEST_F(HistoryBackendTest, RecordTopHostsMetrics) {
               ElementsAre(base::Bucket(1, 1), base::Bucket(51, 1)));
 }
 
-TEST_F(HistoryBackendTest, GetCountsForOrigins) {
-  std::vector<GURL> urls;
-  urls.push_back(GURL("http://cnn.com/us"));
-  urls.push_back(GURL("http://cnn.com/intl"));
-  urls.push_back(GURL("https://cnn.com/intl"));
-  urls.push_back(GURL("http://cnn.com:8080/path"));
-  urls.push_back(GURL("http://dogtopia.com/pups?q=poods"));
-  for (const GURL& url : urls) {
-    backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
-                           history::SOURCE_BROWSED);
-  }
+TEST_F(HistoryBackendTest, GetCountsAndLastVisitForOrigins) {
+  base::Time now = base::Time::Now();
+  base::Time tomorrow = now + base::TimeDelta::FromDays(1);
+  base::Time yesterday = now - base::TimeDelta::FromDays(1);
+  base::Time last_week = now - base::TimeDelta::FromDays(7);
+
+  backend_->AddPageVisit(GURL("http://cnn.com/intl"), yesterday, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+  backend_->AddPageVisit(GURL("http://cnn.com/us"), last_week, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+  backend_->AddPageVisit(GURL("http://cnn.com/ny"), now, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+  backend_->AddPageVisit(GURL("https://cnn.com/intl"), yesterday, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+  backend_->AddPageVisit(GURL("http://cnn.com:8080/path"), yesterday, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+  backend_->AddPageVisit(GURL("http://dogtopia.com/pups?q=poods"), now, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
 
   std::set<GURL> origins;
   origins.insert(GURL("http://cnn.com/"));
-  EXPECT_THAT(backend_->GetCountsForOrigins(origins),
-              ElementsAre(std::make_pair(GURL("http://cnn.com/"), 2)));
+  EXPECT_THAT(backend_->GetCountsAndLastVisitForOrigins(origins),
+              ElementsAre(std::make_pair(GURL("http://cnn.com/"),
+                                         std::make_pair(3, now))));
 
   origins.insert(GURL("http://dogtopia.com/"));
   origins.insert(GURL("http://cnn.com:8080/"));
   origins.insert(GURL("https://cnn.com/"));
   origins.insert(GURL("http://notpresent.com/"));
-  EXPECT_THAT(backend_->GetCountsForOrigins(origins),
-              ElementsAre(std::make_pair(GURL("http://cnn.com/"), 2),
-                          std::make_pair(GURL("http://cnn.com:8080/"), 1),
-                          std::make_pair(GURL("http://dogtopia.com/"), 1),
-                          std::make_pair(GURL("http://notpresent.com/"), 0),
-                          std::make_pair(GURL("https://cnn.com/"), 1)));
+  backend_->AddPageVisit(GURL("http://cnn.com/"), tomorrow, 0,
+                         ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+
+  EXPECT_THAT(
+      backend_->GetCountsAndLastVisitForOrigins(origins),
+      ElementsAre(
+          std::make_pair(GURL("http://cnn.com/"), std::make_pair(4, tomorrow)),
+          std::make_pair(GURL("http://cnn.com:8080/"),
+                         std::make_pair(1, yesterday)),
+          std::make_pair(GURL("http://dogtopia.com/"), std::make_pair(1, now)),
+          std::make_pair(GURL("http://notpresent.com/"),
+                         std::make_pair(0, base::Time())),
+          std::make_pair(GURL("https://cnn.com/"),
+                         std::make_pair(1, yesterday))));
 }
 
 TEST_F(HistoryBackendTest, UpdateVisitDuration) {