[NTP::Downloads] Consider recently visited offline pages not outdated.

chrome/browser/ntp_snippets/download_suggestions_provider.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 503 matching lines @@
   }
 
   std::vector<DownloadItem*> all_downloads;
   download_manager_->GetAllDownloads(&all_downloads);
   std::set<std::string> old_dismissed_ids = ReadAssetDismissedIDsFromPrefs();
   std::set<std::string> retained_dismissed_ids;
   cached_asset_downloads_.clear();
   for (DownloadItem* item : all_downloads) {
     std::string within_category_id =
         GetAssetDownloadPerCategoryID(item->GetId());
+    // TODO(vitaliii): Provide proper last access time here once it is collected
+    // for asset downloads.
     if (old_dismissed_ids.count(within_category_id)) {
       retained_dismissed_ids.insert(within_category_id);
     } else if (IsAssetDownloadCompleted(*item) &&
-               !IsDownloadOutdated(GetAssetDownloadPublishedTime(*item))) {
+               !IsDownloadOutdated(GetAssetDownloadPublishedTime(*item),
+                                   base::Time())) {
       cached_asset_downloads_.push_back(item);
       // We may already observe this item and, therefore, we remove the
       // observer first.
       item->RemoveObserver(this);
       item->AddObserver(this);
     }
   }
 
   if (old_dismissed_ids.size() != retained_dismissed_ids.size()) {
     StoreAssetDismissedIDsToPrefs(retained_dismissed_ids);
@@ skipping 84 matching lines @@
       base::UTF8ToUTF16(download_item.GetURL().host()));
   auto extra = base::MakeUnique<ntp_snippets::DownloadSuggestionExtra>();
   extra->target_file_path = download_item.GetTargetFilePath();
   extra->mime_type = download_item.GetMimeType();
   extra->is_download_asset = true;
   suggestion.set_download_suggestion_extra(std::move(extra));
   return suggestion;
 }
 
 bool DownloadSuggestionsProvider::IsDownloadOutdated(
-    const base::Time& published_time) {
-  // TODO(vitaliii): Also consider last access time here once it is collected
-  // for asset downloads.
-  return published_time <
+    const base::Time& published_time,
+    const base::Time& last_visited_time) {
+  DCHECK(last_visited_time == base::Time() ||
+         last_visited_time >= published_time);
+  const base::Time& last_interaction_time =
+      (last_visited_time == base::Time() ? published_time : last_visited_time);
+  return last_interaction_time <
          clock_->Now() - base::TimeDelta::FromHours(GetMaxDownloadAgeHours());
 }
 
 bool DownloadSuggestionsProvider::CacheAssetDownloadIfNeeded(
     const content::DownloadItem* item) {
   if (!IsAssetDownloadCompleted(*item)) {
     return false;
   }
 
   if (base::ContainsValue(cached_asset_downloads_, item)) {
@@ skipping 94 matching lines @@
       ReadOfflinePageDismissedIDsFromPrefs();
   std::set<std::string> retained_dismissed_ids;
   std::vector<const OfflinePageItem*> items;
   // Filtering out dismissed items and pruning dismissed IDs.
   for (const OfflinePageItem& item : all_download_offline_pages) {
     std::string id_within_category =
         GetOfflinePagePerCategoryID(item.offline_id);
     if (old_dismissed_ids.count(id_within_category)) {
       retained_dismissed_ids.insert(id_within_category);
     } else {
-      if (!IsDownloadOutdated(GetOfflinePagePublishedTime(item))) {
+      if (!IsDownloadOutdated(GetOfflinePagePublishedTime(item),
+                              item.last_access_time)) {
         items.push_back(&item);
       }
     }
   }
 
   const int max_suggestions_count = GetMaxSuggestionsCount();
   if (static_cast<int>(items.size()) > max_suggestions_count) {
     // Partially sorts |items| such that:
     // 1) The element at the index |max_suggestions_count| is changed to the
     //    element which would occur on this position if |items| was sorted;
@@ skipping 90 matching lines @@
 void DownloadSuggestionsProvider::UnregisterDownloadItemObservers() {
   DCHECK_NE(download_manager_, nullptr);
 
   std::vector<DownloadItem*> all_downloads;
   download_manager_->GetAllDownloads(&all_downloads);
 
   for (DownloadItem* item : all_downloads) {
     item->RemoveObserver(this);
   }
 }