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

chrome/browser/ntp_snippets/download_suggestions_provider_unittest.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 <memory>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 72 matching lines @@
       os << "LOADING_ERROR";
       break;
   }
   return os;
 }
 
 }  // namespace ntp_snippets
 
 namespace {
 
+const int kDefaultMaxDownloadAgeHours = 6 * 7 * 24;
+
+// Tue, 31 Jan 2017 13:00:00 UTC
+const base::Time now = base::Time::FromJavaTime(1485867600000);
+
 // TODO(vitaliii): Move this and outputting functions above to common file and
 // replace remaining |Property(&ContentSuggestion::url, GURL("some_url"))|.
 // See crbug.com/655513.
 MATCHER_P(HasUrl, url, "") {
   *result_listener << "expected URL: " << url
                    << "has URL: " << arg.url().spec();
   return arg.url().spec() == url;
 }
 
 MATCHER_P3(HasDownloadSuggestionExtra,
@@ skipping 34 matching lines @@
 std::vector<OfflinePageItem> CreateDummyOfflinePages(
     const std::vector<int>& ids) {
   std::vector<OfflinePageItem> result;
   for (int id : ids) {
     result.push_back(CreateDummyOfflinePage(id));
   }
 
   return result;
 }
 
-OfflinePageItem CreateDummyOfflinePage(int id, base::Time time) {
-  OfflinePageItem item = CreateDummyOfflinePage(id);
-  item.creation_time = time;
-  return item;
-}
-
 std::unique_ptr<FakeDownloadItem> CreateDummyAssetDownload(int id) {
   std::unique_ptr<FakeDownloadItem> item = base::MakeUnique<FakeDownloadItem>();
   item->SetId(id);
   std::string id_string = base::IntToString(id);
   item->SetTargetFilePath(
       base::FilePath::FromUTF8Unsafe("folder/file" + id_string + ".mhtml"));
   item->SetURL(GURL("http://download.com/redirected" + id_string));
   item->SetOriginalUrl(GURL("http://download.com/" + id_string));
   item->SetStartTime(base::Time::Now());
   item->SetFileExternallyRemoved(false);
@@ skipping 303 matching lines @@
                                             HasUrl("http://dummy.com/2"),
                                             HasUrl("http://download.com/1"),
                                             HasUrl("http://download.com/2"))));
   FireDownloadCreated(asset_downloads[1].get());
 }
 
 TEST_F(DownloadSuggestionsProviderTest, ShouldSortSuggestions) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
-  base::Time now = base::Time::Now();
-  base::Time yesterday = now - base::TimeDelta::FromDays(1);
-  base::Time tomorrow = now + base::TimeDelta::FromDays(1);
-  base::Time next_week = now + base::TimeDelta::FromDays(7);
+  std::vector<OfflinePageItem> offline_pages = CreateDummyOfflinePages({0, 1});
 
-  (*offline_pages_model()->mutable_items())
-      .push_back(CreateDummyOfflinePage(1, yesterday));
-  (*offline_pages_model()->mutable_items())
-      .push_back(CreateDummyOfflinePage(2, tomorrow));
+  offline_pages[0].url = GURL("http://dummy.com/0");
+  offline_pages[0].creation_time = now - base::TimeDelta::FromMinutes(10);
+  offline_pages[0].last_access_time = offline_pages[0].creation_time;
+
+  offline_pages[1].url = GURL("http://dummy.com/1");
+  offline_pages[1].creation_time = now - base::TimeDelta::FromMinutes(5);
+  offline_pages[1].last_access_time = offline_pages[1].creation_time;
+
+  *(offline_pages_model()->mutable_items()) = offline_pages;
+
+  auto test_clock = base::MakeUnique<base::SimpleTestClock>();
+  test_clock->SetNow(now);
+  EXPECT_CALL(*observer(),
+              OnNewSuggestions(_, downloads_category(),
+                               ElementsAre(HasUrl("http://dummy.com/1"),
+                                           HasUrl("http://dummy.com/0"))));
+  CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true,
+                       std::move(test_clock));
+
+  std::vector<std::unique_ptr<FakeDownloadItem>> asset_downloads =
+      CreateDummyAssetDownloads({2, 3});
+
+  asset_downloads[0]->SetURL(GURL("http://download.com/2"));
+  asset_downloads[0]->SetStartTime(now - base::TimeDelta::FromMinutes(3));
+
+  asset_downloads[1]->SetURL(GURL("http://download.com/3"));
+  asset_downloads[1]->SetStartTime(now - base::TimeDelta::FromMinutes(7));
 
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
-                               ElementsAre(HasUrl("http://dummy.com/2"),
-                                           HasUrl("http://dummy.com/1"))));
-  CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true,
-                       base::MakeUnique<base::DefaultClock>());
-
-  std::vector<std::unique_ptr<FakeDownloadItem>> asset_downloads;
-  asset_downloads.push_back(CreateDummyAssetDownload(3, next_week));
-  asset_downloads.push_back(CreateDummyAssetDownload(4, now));
-
-  EXPECT_CALL(*observer(),
-              OnNewSuggestions(_, downloads_category(),
-                               ElementsAre(HasUrl("http://download.com/3"),
-                                           HasUrl("http://dummy.com/2"),
-                                           HasUrl("http://dummy.com/1"))));
+                               ElementsAre(HasUrl("http://download.com/2"),
+                                           HasUrl("http://dummy.com/1"),
+                                           HasUrl("http://dummy.com/0"))));
   FireDownloadCreated(asset_downloads[0].get());
 
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
-                               ElementsAre(HasUrl("http://download.com/3"),
-                                           HasUrl("http://dummy.com/2"),
-                                           HasUrl("http://download.com/4"),
-                                           HasUrl("http://dummy.com/1"))));
+                               ElementsAre(HasUrl("http://download.com/2"),
+                                           HasUrl("http://dummy.com/1"),
+                                           HasUrl("http://download.com/3"),
+                                           HasUrl("http://dummy.com/0"))));
   FireDownloadCreated(asset_downloads[1].get());
 }
 
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldDismissWithoutNotifyingObservers) {
   IgnoreOnCategoryStatusChangedToAvailable();
 
   *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({1, 2});
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1, 2});
   EXPECT_CALL(
@@ skipping 506 matching lines @@
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1});
   // Once the manager has been loaded, the ids should be pruned.
   EXPECT_THAT(GetDismissedSuggestions(), IsEmpty());
 }
 
 TEST_F(DownloadSuggestionsProviderTest, ShouldNotShowOutdatedDownloads) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
 
-  const int kDefaultMaxDownloadAgeHours = 6 * 7 * 24;
-
-  base::Time now;
-  ASSERT_TRUE(base::Time::FromString("Tue, 31 Jan 2017 13:00:00", &now));
   const base::Time not_outdated =
       now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
       base::TimeDelta::FromSeconds(1);
   const base::Time outdated =
       now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
       base::TimeDelta::FromSeconds(1);
+
   *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({0, 1});
+
   offline_pages_model()->mutable_items()->at(0).url =
       GURL("http://dummy.com/0");
   offline_pages_model()->mutable_items()->at(0).creation_time = not_outdated;
+  offline_pages_model()->mutable_items()->at(0).last_access_time = not_outdated;
+
   offline_pages_model()->mutable_items()->at(1).url =
       GURL("http://dummy.com/1");
   offline_pages_model()->mutable_items()->at(1).creation_time = outdated;
+  offline_pages_model()->mutable_items()->at(1).last_access_time = outdated;
+
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({0, 1});
+
   downloads_manager()->mutable_items()->at(0)->SetURL(
       GURL("http://download.com/0"));
   downloads_manager()->mutable_items()->at(0)->SetStartTime(not_outdated);
+
   downloads_manager()->mutable_items()->at(1)->SetURL(
       GURL("http://download.com/1"));
   downloads_manager()->mutable_items()->at(1)->SetStartTime(outdated);
 
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://dummy.com/0"),
                                             HasUrl("http://download.com/0"))));
   auto test_clock = base::MakeUnique<base::SimpleTestClock>();
   test_clock->SetNow(now);
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true,
                        std::move(test_clock));
 }
+
+TEST_F(DownloadSuggestionsProviderTest,
+       ShouldShowRecentlyVisitedOfflinePageDownloads) {
+  IgnoreOnCategoryStatusChangedToAvailable();
+  IgnoreOnSuggestionInvalidated();
+
+  const base::Time not_outdated =
+      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) +
+      base::TimeDelta::FromSeconds(1);
+  const base::Time outdated =
+      now - base::TimeDelta::FromHours(kDefaultMaxDownloadAgeHours) -
+      base::TimeDelta::FromSeconds(1);
+
+  std::vector<OfflinePageItem> offline_pages = CreateDummyOfflinePages({0, 1});
+
+  offline_pages[0].url = GURL("http://dummy.com/0");
+  offline_pages[0].creation_time = outdated;
+  offline_pages[0].last_access_time = not_outdated;
+
+  offline_pages[1].url = GURL("http://dummy.com/1");
+  offline_pages[1].creation_time = outdated;
+  offline_pages[1].last_access_time = offline_pages[1].creation_time;
+
+  *(offline_pages_model()->mutable_items()) = offline_pages;
+
+  // Even though page 0 was created long time ago, it should be reported because
+  // it has been visited recently.
+  EXPECT_CALL(
+      *observer(),
+      OnNewSuggestions(_, downloads_category(),
+                       UnorderedElementsAre(HasUrl("http://dummy.com/0"))));
+  auto test_clock = base::MakeUnique<base::SimpleTestClock>();
+  test_clock->SetNow(now);
+  CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true,
+                 std::move(test_clock));
+}