diff options
| author | fgorski <fgorski@chromium.org> | 2015-10-05 15:47:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-05 22:48:08 +0000 |
| commit | 9c1bd5dc2637bbf4f3d490818f6d4846ea00cee9 (patch) | |
| tree | d825ab47321cd438ae4e996e3481b559fd7b8403 /components/offline_pages | |
| parent | abe11cb68dd11d5ee153218ba99a3cdba3a3ced6 (diff) | |
| download | chromium_src-9c1bd5dc2637bbf4f3d490818f6d4846ea00cee9.zip chromium_src-9c1bd5dc2637bbf4f3d490818f6d4846ea00cee9.tar.gz chromium_src-9c1bd5dc2637bbf4f3d490818f6d4846ea00cee9.tar.bz2 | |
[Offline pages] Selecting pages for clean
Changes how pages that will be cleaned up to free up space
are selected: using last_access_time instead of creation_time
as a basis for kicking them out.
Also changes a string that is shown in Free Up Space dialog.
BUG=491352
Review URL: https://codereview.chromium.org/1378883002
Cr-Commit-Position: refs/heads/master@{#352451}
Diffstat (limited to 'components/offline_pages')
| -rw-r--r-- | components/offline_pages/offline_page_model.cc | 2 | ||||
| -rw-r--r-- | components/offline_pages/offline_page_model_unittest.cc | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/components/offline_pages/offline_page_model.cc b/components/offline_pages/offline_page_model.cc index a3eac94..17e499b 100644 --- a/components/offline_pages/offline_page_model.cc +++ b/components/offline_pages/offline_page_model.cc @@ -180,7 +180,7 @@ const std::vector<OfflinePageItem> OfflinePageModel::GetPagesToCleanUp() const { std::vector<OfflinePageItem> offline_pages; base::Time now = base::Time::Now(); for (const auto& id_page_pair : offline_pages_) { - if (now - id_page_pair.second.creation_time > kPageCleanUpThreshold) + if (now - id_page_pair.second.last_access_time > kPageCleanUpThreshold) offline_pages.push_back(id_page_pair.second); } return offline_pages; diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc index 0aa80ab..7c35ea8 100644 --- a/components/offline_pages/offline_page_model_unittest.cc +++ b/components/offline_pages/offline_page_model_unittest.cc @@ -714,10 +714,11 @@ TEST_F(OfflinePageModelTest, GetPageByOfflineURL) { // clean up, hence the numbers in time delta. TEST_F(OfflinePageModelTest, GetPagesToCleanUp) { base::Time now = base::Time::Now(); + base::Time forty_days_ago = now - base::TimeDelta::FromDays(40); OfflinePageItem page_1( GURL(kTestUrl), kTestPageBookmarkId1, base::FilePath(FILE_PATH_LITERAL("/test/location/page1.mhtml")), - kTestFileSize, now - base::TimeDelta::FromDays(40)); + kTestFileSize, forty_days_ago); GetStore()->AddOrUpdateOfflinePage( page_1, base::Bind(&OfflinePageModelTest::OnStoreUpdateDone, AsWeakPtr())); @@ -726,7 +727,8 @@ TEST_F(OfflinePageModelTest, GetPagesToCleanUp) { OfflinePageItem page_2( GURL(kTestUrl2), kTestPageBookmarkId2, base::FilePath(FILE_PATH_LITERAL("/test/location/page2.mhtml")), - kTestFileSize, now - base::TimeDelta::FromDays(31)); + kTestFileSize, forty_days_ago); + page_2.last_access_time = now - base::TimeDelta::FromDays(31); GetStore()->AddOrUpdateOfflinePage( page_2, base::Bind(&OfflinePageModelTest::OnStoreUpdateDone, AsWeakPtr())); @@ -735,7 +737,8 @@ TEST_F(OfflinePageModelTest, GetPagesToCleanUp) { OfflinePageItem page_3( GURL("http://test.xyz"), 42, base::FilePath(FILE_PATH_LITERAL("/test/location/page3.mhtml")), - kTestFileSize, now - base::TimeDelta::FromDays(29)); + kTestFileSize, forty_days_ago); + page_3.last_access_time = now - base::TimeDelta::FromDays(29); GetStore()->AddOrUpdateOfflinePage( page_3, base::Bind(&OfflinePageModelTest::OnStoreUpdateDone, AsWeakPtr())); |