[Offline Pages] Removes two-step expiration related.

components/offline_pages/offline_page_storage_manager.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 "components/offline_pages/offline_page_storage_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/time/clock.h"
@@ skipping 46 matching lines @@
   }
   model_->GetAllPages(
       base::Bind(&OfflinePageStorageManager::OnGetAllPagesDoneForClearingPages,
                  weak_ptr_factory_.GetWeakPtr(), callback, stats));
 }
 
 void OfflinePageStorageManager::OnGetAllPagesDoneForClearingPages(
     const ClearStorageCallback& callback,
     const ArchiveManager::StorageStats& stats,
     const MultipleOfflinePageItemResult& pages) {
-  std::vector<int64_t> page_ids_to_expire;
-  std::vector<int64_t> page_ids_to_remove;
-  GetPageIdsToClear(pages, stats, &page_ids_to_expire, &page_ids_to_remove);
-  model_->ExpirePages(
-      page_ids_to_expire, clear_time_,
-      base::Bind(&OfflinePageStorageManager::OnPagesExpired,
+  std::vector<int64_t> page_ids_to_clear;
+  GetPageIdsToClear(pages, stats, &page_ids_to_clear);
+  model_->DeletePagesByOfflineId(
+      page_ids_to_clear,
+      base::Bind(&OfflinePageStorageManager::OnExpiredPagesCleared,
                  weak_ptr_factory_.GetWeakPtr(), callback,
-                 page_ids_to_expire.size(), page_ids_to_remove));
+                 page_ids_to_clear.size()));
 }
 
-void OfflinePageStorageManager::OnPagesExpired(
-    const ClearStorageCallback& callback,
-    size_t pages_expired,
-    const std::vector<int64_t>& page_ids_to_remove,
-    bool expiration_succeeded) {
-  // We want to delete the outdated page records regardless the expiration
-  // succeeded or not.
-  model_->DeletePagesByOfflineId(
-      page_ids_to_remove,
-      base::Bind(&OfflinePageStorageManager::OnOutdatedPagesCleared,
-                 weak_ptr_factory_.GetWeakPtr(), callback, pages_expired,
-                 expiration_succeeded));
-}
-
-void OfflinePageStorageManager::OnOutdatedPagesCleared(
+void OfflinePageStorageManager::OnExpiredPagesCleared(
     const ClearStorageCallback& callback,
     size_t pages_cleared,
-    bool expiration_succeeded,
     DeletePageResult result) {
+  last_clear_time_ = clear_time_;
   ClearStorageResult clear_result = ClearStorageResult::SUCCESS;
-  if (!expiration_succeeded) {
-    clear_result = ClearStorageResult::EXPIRE_FAILURE;
-    if (result != DeletePageResult::SUCCESS)
-      clear_result = ClearStorageResult::EXPIRE_AND_DELETE_FAILURES;
-  } else if (result != DeletePageResult::SUCCESS) {
-    clear_result = ClearStorageResult::DELETE_FAILURE;
-  }
-  last_clear_time_ = clear_time_;
+  if (result != DeletePageResult::SUCCESS)
+    clear_result = ClearStorageResult::CLEAR_FAILURE;
   callback.Run(pages_cleared, clear_result);
 }
 
 void OfflinePageStorageManager::GetPageIdsToClear(
     const MultipleOfflinePageItemResult& pages,
     const ArchiveManager::StorageStats& stats,
-    std::vector<int64_t>* page_ids_to_expire,
-    std::vector<int64_t>* page_ids_to_remove) {
+    std::vector<int64_t>* page_ids_to_clear) {
   // TODO(romax): See how persistent should be considered here.
   // Creating a map from namespace to a vector of page items.
   // Sort each vector based on last accessed time and all pages after index
-  // min{size(), page_limit} should be expired. And then start iterating
-  // backwards to expire pages.
+  // min{size(), page_limit} should be deleted.
   std::map<std::string, std::vector<OfflinePageItem>> pages_map;
   std::vector<OfflinePageItem> kept_pages;
   int64_t kept_pages_size = 0;
 
   for (const auto& page : pages) {
-    if (!page.IsExpired()) {
+    if (!IsExpired(page)) {
       pages_map[page.client_id.name_space].push_back(page);
-    } else if (clear_time_ - page.expiration_time >= kRemovePageItemInterval) {
-      page_ids_to_remove->push_back(page.offline_id);
+    } else {
+      page_ids_to_clear->push_back(page.offline_id);
     }
   }
 
   for (auto& iter : pages_map) {
     std::string name_space = iter.first;
     std::vector<OfflinePageItem>& page_list = iter.second;
 
     LifetimePolicy policy =
         policy_controller_->GetPolicy(name_space).lifetime_policy;
 
     std::sort(page_list.begin(), page_list.end(),
               [](const OfflinePageItem& a, const OfflinePageItem& b) -> bool {
                 return a.last_access_time > b.last_access_time;
               });
 
     size_t page_list_size = page_list.size();
     size_t pos = 0;
     while (pos < page_list_size &&
            (policy.page_limit == kUnlimitedPages || pos < policy.page_limit) &&
-           !ShouldBeExpired(page_list.at(pos))) {
+           !IsExpired(page_list.at(pos))) {
       kept_pages_size += page_list.at(pos).file_size;
       kept_pages.push_back(page_list.at(pos));
       pos++;
     }
 
     for (; pos < page_list_size; pos++)
-      page_ids_to_expire->push_back(page_list.at(pos).offline_id);
+      page_ids_to_clear->push_back(page_list.at(pos).offline_id);
   }
 
   // If we're still over the clear threshold, we're going to clear remaining
   // pages from oldest last access time.
   int64_t free_space = stats.free_disk_space;
   int64_t total_size = stats.total_archives_size;
   int64_t space_to_release =
       kept_pages_size -
       (total_size + free_space) * kOfflinePageStorageClearThreshold;
   if (space_to_release > 0) {
     // Here we're sorting the |kept_pages| with oldest first.
     std::sort(kept_pages.begin(), kept_pages.end(),
               [](const OfflinePageItem& a, const OfflinePageItem& b) -> bool {
                 return a.last_access_time < b.last_access_time;
               });
     size_t kept_pages_size = kept_pages.size();
     size_t pos = 0;
     while (pos < kept_pages_size && space_to_release > 0) {
       space_to_release -= kept_pages.at(pos).file_size;
-      page_ids_to_expire->push_back(kept_pages.at(pos).offline_id);
+      page_ids_to_clear->push_back(kept_pages.at(pos).offline_id);
       pos++;
     }
   }
 }
 
 OfflinePageStorageManager::ClearMode
 OfflinePageStorageManager::ShouldClearPages(
     const ArchiveManager::StorageStats& storage_stats) {
   int64_t total_size = storage_stats.total_archives_size;
   int64_t free_space = storage_stats.free_disk_space;
   if (total_size == 0)
     return ClearMode::NOT_NEEDED;
 
   // If the size of all offline pages is more than limit, or it's larger than a
   // specified percentage of all available storage space on the disk we'll clear
   // all offline pages.
   if (total_size >= (total_size + free_space) * kOfflinePageStorageLimit)
     return ClearMode::DEFAULT;
   // If it's been more than the pre-defined interval since the last time we
   // clear the storage, we should clear pages.
   if (last_clear_time_ == base::Time() ||
       clear_time_ - last_clear_time_ >= kClearStorageInterval) {
     return ClearMode::DEFAULT;
   }
   // Otherwise there's no need to clear storage right now.
   return ClearMode::NOT_NEEDED;
 }
 
-bool OfflinePageStorageManager::ShouldBeExpired(
-    const OfflinePageItem& page) const {
+bool OfflinePageStorageManager::IsExpired(const OfflinePageItem& page) const {

[jianli, 2016/11/18 00:15:48]

Do we really need this?

[romax, 2016/11/18 20:50:49]

Yes it's still a helper function to return if the page is expired. WRT 'expire'
I have a comment above.

   const LifetimePolicy& policy =
       policy_controller_->GetPolicy(page.client_id.name_space).lifetime_policy;
   return policy.lifetime_type == LifetimeType::TEMPORARY &&
          clear_time_ - page.last_access_time >= policy.expiration_period;

[jianli, 2016/11/18 00:15:48]

Do you also want to update the policy to remove this field?

[romax, 2016/11/18 20:50:49]

No, there should still be a expiration_period for a given page.

 }
 
 bool OfflinePageStorageManager::IsInProgress() const {
   return clear_time_ > last_clear_time_;
 }
 
 }  // namespace offline_pages